diff --git a/.tx/config b/.tx/config
new file mode 100644
index 0000000000..f03047d448
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,12 @@
+[main]
+host = https://www.transifex.com
+
+[one.sunstone]
+file_filter = src/sunstone/locale/languages/<lang>.po
+source_file = src/sunstone/locale/messages.pot
+source_lang = en_US
+
+[one.self-service]
+file_filter = translations/one.self-service/<lang>.po
+source_lang = en
+
diff --git a/src/sunstone/locale/languages/ca_datatable.txt b/src/sunstone/locale/languages/ca_datatable.txt
index 429730bf47..90c2219f13 100644
--- a/src/sunstone/locale/languages/ca_datatable.txt
+++ b/src/sunstone/locale/languages/ca_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Processant...",
-    "sLengthMenu":   "Mostra _MENU_ registres",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "No s'han trobat registres.",
     "sInfo":         "Mostrant de _START_ a _END_ de _TOTAL_ registres",
     "sInfoEmpty":    "Mostrant de 0 a 0 de 0 registres",
diff --git a/src/sunstone/locale/languages/cs_datatable.txt b/src/sunstone/locale/languages/cs_datatable.txt
index 1f81b4945f..9afa816aff 100644
--- a/src/sunstone/locale/languages/cs_datatable.txt
+++ b/src/sunstone/locale/languages/cs_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Provádím...",
-    "sLengthMenu":   "Zobraz záznamů _MENU_",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Žádné záznamy nebyly nalezeny",
     "sInfo":         "Zobrazuji _START_ až _END_ z celkem _TOTAL_ záznamů",
     "sInfoEmpty":    "Zobrazuji 0 až 0 z 0 záznamů",
diff --git a/src/sunstone/locale/languages/da_datatable.txt b/src/sunstone/locale/languages/da_datatable.txt
index ce31d2828a..8d32bff0fc 100644
--- a/src/sunstone/locale/languages/da_datatable.txt
+++ b/src/sunstone/locale/languages/da_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Henter...",
-    "sLengthMenu":   "Vis _MENU_ linjer",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Ingen linjer matcher s&oslash;gningen",
     "sInfo":         "Viser _START_ til _END_ af _TOTAL_ linjer",
     "sInfoEmpty":    "Viser 0 til 0 af 0 linjer",
diff --git a/src/sunstone/locale/languages/de_datatable.txt b/src/sunstone/locale/languages/de_datatable.txt
index 0f00c9303a..85fdc139c5 100644
--- a/src/sunstone/locale/languages/de_datatable.txt
+++ b/src/sunstone/locale/languages/de_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Bitte warten...",
-    "sLengthMenu":   "_MENU_ Einträge anzeigen",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Keine Einträge vorhanden.",
     "sInfo":         "_START_ bis _END_ von _TOTAL_ Einträgen",
     "sInfoEmpty":    "0 bis 0 von 0 Einträgen",
diff --git a/src/sunstone/locale/languages/el_datatable.txt b/src/sunstone/locale/languages/el_datatable.txt
index d43575ef90..cd4c59dcc9 100644
--- a/src/sunstone/locale/languages/el_datatable.txt
+++ b/src/sunstone/locale/languages/el_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Επεξεργασία...",
-    "sLengthMenu":   "Δείξε _MENU_ εγγραφές",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Δεν βρέθηκαν εγγραφές που να ταιριάζουν",
     "sInfo":         "Δείχνοντας _START_ εως _END_ από _TOTAL_ εγγραφές",
     "sInfoEmpty":    "Δείχνοντας 0 εως 0 από 0 εγγραφές",
diff --git a/src/sunstone/locale/languages/en_datatable.txt b/src/sunstone/locale/languages/en_datatable.txt
index b3486ec5d9..bc22258acb 100644
--- a/src/sunstone/locale/languages/en_datatable.txt
+++ b/src/sunstone/locale/languages/en_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Processing...",
-    "sLengthMenu":   "Show _MENU_ entries",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "No matching records found",
     "sInfo":         "Showing _START_ to _END_ of _TOTAL_ entries",
     "sInfoEmpty":    "Showing 0 to 0 of 0 entries",
diff --git a/src/sunstone/locale/languages/es_datatable.txt b/src/sunstone/locale/languages/es_datatable.txt
index fb48fd561b..24a607863a 100644
--- a/src/sunstone/locale/languages/es_datatable.txt
+++ b/src/sunstone/locale/languages/es_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Procesando...",
-    "sLengthMenu":   "Número de elementos",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "No hay elementos",
     "sInfo":         "Mostrando del _START_ al _END_ de _TOTAL_",
     "sInfoEmpty":    "No hay elementos",
diff --git a/src/sunstone/locale/languages/fa_datatable.txt b/src/sunstone/locale/languages/fa_datatable.txt
index 4af955ecdb..a0092a3029 100644
--- a/src/sunstone/locale/languages/fa_datatable.txt
+++ b/src/sunstone/locale/languages/fa_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "درحال پردازش...",
-    "sLengthMenu":   "نمایش محتویات _MENU_",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "موردی یافت نشد",
     "sInfo":         "نمایش _START_ تا _END_ از مجموع _TOTAL_ مورد",
     "sInfoEmpty":    "تهی",
diff --git a/src/sunstone/locale/languages/fr_datatable.txt b/src/sunstone/locale/languages/fr_datatable.txt
index 38fa8347c3..b959a745ca 100644
--- a/src/sunstone/locale/languages/fr_datatable.txt
+++ b/src/sunstone/locale/languages/fr_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "En cours...",
-    "sLengthMenu":   "Affiche _MENU_ éléments",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Pas d'enregistrement",
     "sInfo":         "Affiche de _START_ à _END_ sur _TOTAL_",
     "sInfoEmpty":    "Pas d'enregistrement",
diff --git a/src/sunstone/locale/languages/it_datatable.txt b/src/sunstone/locale/languages/it_datatable.txt
index 2ef7e50156..4abb7bad8d 100644
--- a/src/sunstone/locale/languages/it_datatable.txt
+++ b/src/sunstone/locale/languages/it_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Caricamento...",
-    "sLengthMenu":   "Visualizza _MENU_ elementi",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "La ricerca non ha portato alcun risultato.",
     "sInfo":         "Vista da _START_ a _END_ di _TOTAL_ elementi",
     "sInfoEmpty":    "Vista da 0 a 0 di 0 elementi",
diff --git a/src/sunstone/locale/languages/nl_datatable.txt b/src/sunstone/locale/languages/nl_datatable.txt
index 5d96a808d8..6d84273167 100644
--- a/src/sunstone/locale/languages/nl_datatable.txt
+++ b/src/sunstone/locale/languages/nl_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing": "Bezig...",
-    "sLengthMenu": "_MENU_ resultaten weergeven",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords": "Geen resultaten gevonden",
     "sInfo": "_START_ tot _END_ van _TOTAL_ resultaten",
     "sInfoEmpty": "Geen resultaten om weer te geven",
diff --git a/src/sunstone/locale/languages/pl_datatable.txt b/src/sunstone/locale/languages/pl_datatable.txt
index 9bd1b7c99c..70b0333ba3 100644
--- a/src/sunstone/locale/languages/pl_datatable.txt
+++ b/src/sunstone/locale/languages/pl_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Proszę czekać...",
-    "sLengthMenu":   "Pokaż _MENU_ pozycji",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Nie znaleziono żadnych pasujących indeksów",
     "sInfo":         "Pozycje od _START_ do _END_ z _TOTAL_ łącznie",
     "sInfoEmpty":    "Pozycji 0 z 0 dostępnych",
diff --git a/src/sunstone/locale/languages/pt_datatable.txt b/src/sunstone/locale/languages/pt_datatable.txt
index ce112914ad..d666a08c1c 100644
--- a/src/sunstone/locale/languages/pt_datatable.txt
+++ b/src/sunstone/locale/languages/pt_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "A processar...",
-    "sLengthMenu":   "Mostrar _MENU_ registos",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Não foram encontrados resultados",
     "sInfo":         "Mostrando de _START_ até _END_ de _TOTAL_ registos",
     "sInfoEmpty":    "Mostrando de 0 até 0 de 0 registros",
diff --git a/src/sunstone/locale/languages/ru_datatable.txt b/src/sunstone/locale/languages/ru_datatable.txt
index 7eaaa38852..3eb4988498 100644
--- a/src/sunstone/locale/languages/ru_datatable.txt
+++ b/src/sunstone/locale/languages/ru_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Ждите. Выполняется обработка...",
-    "sLengthMenu":   "Показывать _MENU_ элементов списка",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Список пуст",
     "sInfo":         "Показаны элементы списка с _START_ по _END_ из _TOTAL_",
     "sInfoEmpty":    "Список пуст",
diff --git a/src/sunstone/locale/languages/sk_datatable.txt b/src/sunstone/locale/languages/sk_datatable.txt
index 98fdccfa18..cbe832e2d3 100644
--- a/src/sunstone/locale/languages/sk_datatable.txt
+++ b/src/sunstone/locale/languages/sk_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "Pracujem...",
-    "sLengthMenu":   "Zobraz _MENU_ záznamov",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "Neboli nájdené žiadne záznamy",
     "sInfo":         "Záznamy _START_ až _END_ z celkovo _TOTAL_",
     "sInfoEmpty":    "Záznamy 0 až 0 z celkovo 0",
diff --git a/src/sunstone/locale/languages/zh_datatable.txt b/src/sunstone/locale/languages/zh_datatable.txt
index d9b0f355e2..644a266759 100644
--- a/src/sunstone/locale/languages/zh_datatable.txt
+++ b/src/sunstone/locale/languages/zh_datatable.txt
@@ -1,6 +1,6 @@
 {
     "sProcessing":   "處理中...",
-    "sLengthMenu":   "顯示 _MENU_ 項",
+    "sLengthMenu":   "_MENU_",
     "sZeroRecords":  "沒有任何資料",
     "sInfo":         "顯示 _START_ 至 _END_ 項，共 _TOTAL_ 項",
     "sInfoEmpty":    "沒有任何資料",
diff --git a/src/sunstone/public/css/app.css b/src/sunstone/public/css/app.css
index 4fa8e474ed..255499c935 100644
--- a/src/sunstone/public/css/app.css
+++ b/src/sunstone/public/css/app.css
@@ -7163,3 +7163,8 @@ table.policies_table input {
 .detach-vnc-icon:hover {
   color: #222;
 }
+
+/* line 1045, ../sass/app.scss */
+.dataTables_length select {
+  margin-right: 8px;
+}
diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js
index ae3ce594f1..e9d349e0e4 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -2791,11 +2791,12 @@ function setupCreateTemplateDialog(){
           //          $('input.check_item', this).attr('checked','checked');
           //      }
           //  })
-          //}
+          //},
+          "fnInitComplete": function(oSettings) {
+            this.fnFilter("KERNEL", 7)
+          }
         });
 
-        dataTable_template_kernel.fnFilter("KERNEL", 7)
-
         $("#refresh_kernel_table").die();
         $("#refresh_kernel_table").live('click', function(){
             update_datatable_template_files(dataTable_template_kernel)
@@ -2835,7 +2836,8 @@ function setupCreateTemplateDialog(){
                 { "sWidth": "35px", "aTargets": [0,1] },
                 { "bVisible": false, "aTargets": [2,3,5,6,7,9,8,10,11,12]}
             ],
-           //"fnDrawCallback": function(oSettings) {
+           "fnInitComplete": function(oSettings) {
+              this.fnFilter("RAMDISK", 7)
            // var nodes = this.fnGetNodes();
            // $.each(nodes, function(){
            //     if ($(this).find("td:eq(1)").html() == $('#INITRD', kernel_section).text()) {
@@ -2843,10 +2845,10 @@ function setupCreateTemplateDialog(){
            //         $('input.check_item', this).attr('checked','checked');
            //     }
            // })
-           // }
+           }
         });
 
-        datTable_template_initrd.fnFilter("RAMDISK", 7)
+        
 
         $("#refresh_ramdisk_table").die();
         $("#refresh_ramdisk_table").live('click', function(){
@@ -3251,7 +3253,8 @@ function setupCreateTemplateDialog(){
               { "sWidth": "35px", "aTargets": [0,1] },
               { "bVisible": false, "aTargets": [2,3,5,6,7,9,8,10,11,12]}
           ],
-          //"fnDrawCallback": function(oSettings) {
+          "fnInitComplete": function(oSettings) {
+            this.fnFilter("CONTEXT", 7)
           //  var images = []
           //  $.each($( "span.image", $("#selected_files_spans")), function() {
           //    images.push($(this).attr("image_id"));
@@ -3265,10 +3268,10 @@ function setupCreateTemplateDialog(){
           //          $('input.check_item', this).attr('checked','checked');
           //      }
           //  })
-          //}
+          }
       });
 
-        datTable_template_context.fnFilter("CONTEXT", 7)
+        
 
         $("#refresh_context_table").die();
         $("#refresh_context_table").live('click', function(){