diff --git a/lang/ar.json b/lang/ar.json
index 7266fef05452b8d49af6c31117abde99f3b0e2e3..eb100c1564e59e4ec8fceac42aa892f77fc4cfd1 100644
--- a/lang/ar.json
+++ b/lang/ar.json
@@ -160,16 +160,16 @@
         "CheckForUpdates": "بحث عن تحديثات",
         "CheckPiwikOut": "تفحص بايويك!",
         "DataForThisReportHasBeenPurged": "بيانات هذا التقرير أقدم من %s شهور وتم التخلص منها.",
-        "DataTableExcludeAggregateRows_js": "صفوف الإجمالي معروضة، %s اخفها",
+        "DataTableExcludeAggregateRows": "صفوف الإجمالي معروضة، %s اخفها",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "الافتراضي",
         "DonateCall1": "لن يكلفك بايويك قرشاً في استخدامه أبداً، ولكن ذلك لا يعني أنه لا يكلفنا شيئاً في تطويره.",
         "DonateCall2": "يحتاج بايويك إلى دعمك المستمر لينمو ويزدهر.",
         "DonateCall3": "إذا شعرت أن بايويك قد أضاف قيمة كبيرة إلى أعمالك، %1$sنرجو منك التبرع!%2$s",
         "DonateFormInstructions": "انقر على الشريط لاختيار مبلغ، ثم انقر على اشتراك للتبرع.",
-        "ExcludeRowsWithLowPopulation_js": "كافة الصفوف معروضة %s استثني الكثافات المنخفضة",
+        "ExcludeRowsWithLowPopulation": "كافة الصفوف معروضة %s استثني الكثافات المنخفضة",
         "FlattenDataTable_js": "التقرير هيكلي %s اجعله بمستوى واحد",
-        "IncludeRowsWithLowPopulation_js": "الصفوف ذات الأعداد المنخفضة مخفية %s عرض كافة الصفوف",
+        "IncludeRowsWithLowPopulation": "الصفوف ذات الأعداد المنخفضة مخفية %s عرض كافة الصفوف",
         "InjectedHostEmailSubject": "تم الوصول إلى بايويك باستخدام مضيف غير معروف: %s",
         "InjectedHostSuperUserWarning": "قد تكون إعدادات بايويك غير مضبوطة بشكل صحيح (مثلاً، أن يكون قد تم نقله إلى ملقم جديد مؤخراً). يمكنك إما %1$sالنقر هنا وإضافة مضيف%2$s صالح جديد (إذا كنت تثق به)%3$s، أو %4$sانقر هنا لزيارة %5$s بايويك بأمان%6$s.",
         "JavascriptDisabled": "يجب تفعيل برمجيات جافا في سبيل استخدام Piwik في الوضع القياسي.<br\/> ومع ذلك، يبدو أن برمجيات جافا إما معطلة أو غير مدعمة في متصفح ويب الخاص بك.<br\/>لاستخدام العرض القياسي، قم بتفعيل JavaScript من خلال تغيير إعدادات متصفحك، ثم %1$sحاول مرة أخرى%2$s.<br\/>",
diff --git a/lang/bg.json b/lang/bg.json
index d48816d3de376a3e922a2ff5dbc0bf283bc62818..718ee0fbef139f06a9eb01be773a58659baa97b1 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -116,14 +116,14 @@
         "CheckForUpdates": "Провери за ъпдейти",
         "CloseWidgetDirections": "Можете да затворите тази джаджа, като кликнете на 'Х' иконата в горната част на джаджата.",
         "DataForThisReportHasBeenPurged": "Датата на този доклад е стара с %s месеца и ще бъде изтрита.",
-        "DataTableExcludeAggregateRows_js": "Сумарните редове са показани %s Скрий ги",
-        "DataTableIncludeAggregateRows_js": "Сумарните редове са скрити %s Покажи ги",
+        "DataTableExcludeAggregateRows": "Сумарните редове са показани %s Скрий ги",
+        "DataTableIncludeAggregateRows": "Сумарните редове са скрити %s Покажи ги",
         "Default_js": "подразбиране",
         "DonateFormInstructions": "Изберете стойност посредством плъзгача, след което натиснете на абониране за да направите дарение.",
-        "ExcludeRowsWithLowPopulation_js": "Всички редове са показани %s С изключение на тези с ниски стойности",
+        "ExcludeRowsWithLowPopulation": "Всички редове са показани %s С изключение на тези с ниски стойности",
         "FlattenDataTable_js": "Този доклад е йерархичен %s Направете го плосък",
         "HowMuchIsPiwikWorth": "Каква стойност има Piwik за вас?",
-        "IncludeRowsWithLowPopulation_js": "Редове с ниски стойности са скрити %s Покажи всички редове",
+        "IncludeRowsWithLowPopulation": "Редове с ниски стойности са скрити %s Покажи всички редове",
         "JavascriptDisabled": "JavaScript трябва да бъде разрешен за да използвате Piwik в стандартен изглед.<br \/>Същото е ако JavaScript не е разрешен или браузъра не го поддържа.<br \/>За да използвате стандартен изглед разрешете JavaScript от настройките на Вашия браузър и %1$sопитайте отново%2$s.<br \/>",
         "MakeADifference": "Открийте разликата: %1$sДарете%2$s за фонд Piwik 2.0!",
         "MakeOneTimeDonation": "Направете еднократно дарение",
@@ -149,7 +149,7 @@
         "UnFlattenDataTable_js": "Този доклад е плосък %s Направете го йерархичен",
         "ViewAllPiwikVideoTutorials": "Виж всички Piwik помощни клипове",
         "WebAnalyticsReports": "Уеб Анализи Доклади",
-        "YouAreUsingTheLatestVersion_js": "Вие използвате последна версия на Piwik!"
+        "YouAreUsingTheLatestVersion": "Вие използвате последна версия на Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Действие",
@@ -456,7 +456,7 @@
         "GraphHelp": "Повече информация за показаните графики в Piwik.",
         "HelloUser": "Здравей, %s!",
         "Help": "Помощ",
-        "Hide_js": "скрий",
+        "Hide": "скрий",
         "HoursMinutes": "%1$s часа %2$s мин.",
         "Id": "ИД",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Ако приемем, архивирането е бързо за Вашата настройка, можете да настроите crontab да се стартира по-често.",
@@ -654,7 +654,7 @@
         "ShortMonth_8_js": "Авг",
         "ShortMonth_9": "Сеп",
         "ShortMonth_9_js": "Сеп",
-        "Show_js": "покажи",
+        "Show": "покажи",
         "SmallTrafficYouCanLeaveDefault": "За сайтове с малък трафик, може да оставите по подразбиране %s секунди, както и достъп до всички доклади в реално време.",
         "SmtpEncryption": "SMTP криптиране",
         "SmtpPassword": "SMTP парола",
@@ -706,7 +706,7 @@
         "YearlyReport": "годишно",
         "YearlyReports": "Годишни доклади",
         "YearsDays": "%1$s години %2$s дни",
-        "YearShort_js": "г.",
+        "YearShort": "г.",
         "Yes": "Да",
         "Yesterday": "Вчера",
         "YouAreCurrentlyUsing": "Вие използвате Piwik %s.",
diff --git a/lang/ca.json b/lang/ca.json
index f83e9e9f873eea616b44cb9af6337b527ae9c664..8eacf0a8fdfb67ba6a8a801d59a8ecc4f755cedc 100644
--- a/lang/ca.json
+++ b/lang/ca.json
@@ -141,13 +141,13 @@
         "CategoryNoData": "No hi ha dades en aquesta categoria. Proveu d'<em>incloure tota la població<\/em>.",
         "CheckForUpdates": "Cerca actualitzacions",
         "DataForThisReportHasBeenPurged": "La informació d'aquest informés és anterior a %s mesos d'antiguitat i s'ha purgat.",
-        "DataTableExcludeAggregateRows_js": "Es mostren les files aggrupades %s Amaga-ho",
-        "DataTableIncludeAggregateRows_js": "No es mostren les files agrupades %s Mostra-les",
+        "DataTableExcludeAggregateRows": "Es mostren les files aggrupades %s Amaga-ho",
+        "DataTableIncludeAggregateRows": "No es mostren les files agrupades %s Mostra-les",
         "DateFormat": "%longDay%, %day% de %longMonth% de %longYear%",
         "Default_js": "per defecte",
-        "ExcludeRowsWithLowPopulation_js": "Es mostren totes les files %s No mostris la població inferior",
+        "ExcludeRowsWithLowPopulation": "Es mostren totes les files %s No mostris la població inferior",
         "FlattenDataTable_js": "L'informe es jeràrquic %s Feu-lo pla.",
-        "IncludeRowsWithLowPopulation_js": "No es mostren les files amb polbació inferior %s Mostra totes les files",
+        "IncludeRowsWithLowPopulation": "No es mostren les files amb polbació inferior %s Mostra totes les files",
         "InjectedHostEmailBody": "Hola, He provat d'accedir al Piwik avui i m'he trobat amb l'avís de nom de la màquina desconegut.",
         "InjectedHostEmailSubject": "S'ha accedit al piwik amb un nom de màquina desconegut: %s",
         "InjectedHostNonSuperUserWarning": "%1$sClick here to access Piwik safely%2$s i eliminar aaquest avíst. Potse també voldreu contractar amb l'administrador del vostre Piwik i notificar-li aquesta incidència (%3$sclick here to email%4$s).",
@@ -179,7 +179,7 @@
         "ThereIsNoDataForThisReport": "No hi ha informació per aquest informe.",
         "UnFlattenDataTable_js": "Aquest informe es pla %s Feu-lo jeràrquic",
         "WebAnalyticsReports": "Informe d'analítica web",
-        "YouAreUsingTheLatestVersion_js": "Esteu fent servir l'última versió de Piwik!"
+        "YouAreUsingTheLatestVersion": "Esteu fent servir l'última versió de Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Acció",
diff --git a/lang/cs.json b/lang/cs.json
index d7450eeb3a19ace4a5189f23dd357b88d5fc1502..bc09ba7132618b6a2f4bc8d6987ad73ba0529eb9 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -125,7 +125,7 @@
         "ThereIsNoDataForThisReport": "Pro toto hlášení nejsou k dispozici žádná data",
         "ViewAllPiwikVideoTutorials": "Zobrazit všechny návody Piwik",
         "WebAnalyticsReports": "Hlášení",
-        "YouAreUsingTheLatestVersion_js": "Používáte poslední verzi Piwik"
+        "YouAreUsingTheLatestVersion": "Používáte poslední verzi Piwik"
     },
     "CorePluginsAdmin": {
         "Action": "Akce",
@@ -406,7 +406,7 @@
         "GraphHelp": "Více informací o zobrazování grafů v Piwiku",
         "HelloUser": "Ahoj, %s!",
         "Help": "Pomoc",
-        "Hide_js": "skrýt",
+        "Hide": "skrýt",
         "HoursMinutes": "%1$s hodin %2$s min.",
         "Id": "ID",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "V případě, že je zálohování dost rychlé, můžete jej spouštět v cronu častěji",
@@ -585,7 +585,7 @@
         "ShortMonth_8_js": "srp",
         "ShortMonth_9": "Zář",
         "ShortMonth_9_js": "zář",
-        "Show_js": "zobrazit",
+        "Show": "zobrazit",
         "SmallTrafficYouCanLeaveDefault": "Pro sídla s malým provozem můžete ponechat výchozích %s sekund a uvidíte všechna hlášení v reálném čase",
         "SmtpEncryption": "SMTP šifrování",
         "SmtpPassword": "Heslo SMTP",
@@ -635,7 +635,7 @@
         "Widgets": "Widgety",
         "YearlyReports": "Roční hlášení",
         "YearsDays": "%1$s roků %2$s dní",
-        "YearShort_js": "yr",
+        "YearShort": "yr",
         "Yes": "Ano",
         "Yesterday": "Včera",
         "YouAreCurrentlyUsing": "Používáte Piwik verze %s.",
diff --git a/lang/da.json b/lang/da.json
index 9fcb83f333fd3af4c4375837dff216e97e0598d3..39d7277062f451e1b417b6232c4653338fdd00d7 100644
--- a/lang/da.json
+++ b/lang/da.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "Tjek Piwik!",
         "CloseWidgetDirections": "Luk modulet ved at klikke på 'X' ikonet øverst.",
         "DataForThisReportHasBeenPurged": "Data til rapporten er is mere end %s måneder gamle og er blevet ryddet op.",
-        "DataTableExcludeAggregateRows_js": "Samlede rækker vises %s Skjul dem",
-        "DataTableIncludeAggregateRows_js": "Samlede rækker er skjult %s Vis dem",
+        "DataTableExcludeAggregateRows": "Samlede rækker vises %s Skjul dem",
+        "DataTableIncludeAggregateRows": "Samlede rækker er skjult %s Vis dem",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "standard",
         "DonateCall1": "Piwik vil altid ikke koste noget at bruge, men det betyder ikke, at det ikke koster os noget at lave.",
         "DonateCall2": "Piwik har brug for din fortsatte støtte til at vokse og trives.",
         "DonateCall3": "Synes du, at Piwik har tilføjet væsentlig merværdi til dig eller din virksomhed, %1$s overvej at donere!%2$s",
         "DonateFormInstructions": "Klik på skyderen for at vælge et beløb, og klik derefter på vælg at donere.",
-        "ExcludeRowsWithLowPopulation_js": "Alle rækker vises %s Udeluk lav population",
+        "ExcludeRowsWithLowPopulation": "Alle rækker vises %s Udeluk lav population",
         "FlattenDataTable_js": "Rapporten er hierarkisk %s lav den ikke hierakisk",
         "HowMuchIsPiwikWorth": "Hvor meget er Piwik værd for dig?",
-        "IncludeRowsWithLowPopulation_js": "Rækker med lav population er skjult %s Vis alle rækker",
+        "IncludeRowsWithLowPopulation": "Rækker med lav population er skjult %s Vis alle rækker",
         "InjectedHostEmailBody": "Hej, jeg forsøgte at få adgang Piwik i dag og stødte på den ukendte værtsnavn advarsel.",
         "InjectedHostEmailSubject": "Piwik blev åbnet fra et ukendt værtsnavn: %s",
         "InjectedHostNonSuperUserWarning": "%1$sKlik her for at få adgang Piwik på en sikker måde%2$s og fjerne denne advarsel. Du kan også vælge at kontakte din Piwik administrator og underrette om problemet (%3$sKlik her for e-mail%4$s).",
@@ -234,7 +234,7 @@
         "UnFlattenDataTable_js": "Rapporten er ikke hierarkisk %s lav den hierakisk",
         "ViewAllPiwikVideoTutorials": "Vis alle Piwik videoselvstudier",
         "WebAnalyticsReports": "Webanalyse-rapporter",
-        "YouAreUsingTheLatestVersion_js": "Du bruger den seneste version af Piwik!"
+        "YouAreUsingTheLatestVersion": "Du bruger den seneste version af Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Handling",
@@ -569,7 +569,7 @@
         "GraphHelp": "Flere oplysninger om visning af diagrammer i Piwik.",
         "HelloUser": "Hej %s!",
         "Help": "Hjælp",
-        "Hide_js": "skjul",
+        "Hide": "skjul",
         "HoursMinutes": "%1$s timer %2$s minutter",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Forudsat arkivering er hurtig på din installation, kan crontab sættes til at køre oftere.",
@@ -775,7 +775,7 @@
         "ShortMonth_8_js": "aug",
         "ShortMonth_9": "sep.",
         "ShortMonth_9_js": "sep",
-        "Show_js": "vis",
+        "Show": "vis",
         "SingleWebsitesDashboard": "Kontrolpanel for en hjemmeside",
         "SmallTrafficYouCanLeaveDefault": "For hjemmesider med lidt trafik brug standard %s sekunder og få adgang til alle rapporter i realtid.",
         "SmtpEncryption": "SMTP-kryptering",
@@ -832,7 +832,7 @@
         "YearlyReport": "Ã¥rligt",
         "YearlyReports": "Ã…rlige rapporter",
         "YearsDays": "%1$s år %2$s dage",
-        "YearShort_js": "Ã¥r",
+        "YearShort": "Ã¥r",
         "Yes": "Ja",
         "Yesterday": "I går",
         "YouAreCurrentlyUsing": "Du bruger i øjeblikket Piwik %s.",
diff --git a/lang/de.json b/lang/de.json
index a5a02142485b1b06b762d7e2d2cd967a176b9db9..cbe2d5eb21cce870c4c7d8dec0b5ecde77576b83 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "Sieh dir Piwik an!",
         "CloseWidgetDirections": "Sie können das Widget schließen, indem Sie auf das 'X' oben im Widget klicken.",
         "DataForThisReportHasBeenPurged": "Die Daten für diesen Bericht sind älter als %s Monate und wurden gelöscht",
-        "DataTableExcludeAggregateRows_js": "Aggregierte Zeilen werden angezeigt %s Ausschließen",
-        "DataTableIncludeAggregateRows_js": "Aggregierte Zeilen sind ausgeschlossen %s Wieder anzeigen",
+        "DataTableExcludeAggregateRows": "Aggregierte Zeilen werden angezeigt %s Ausschließen",
+        "DataTableIncludeAggregateRows": "Aggregierte Zeilen sind ausgeschlossen %s Wieder anzeigen",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "Standard",
         "DonateCall1": "Die Nutzung von Piwik wird immer kostenlos bleiben, was aber nicht heißt, dass es uns nichts kostet es zu erstellen.",
         "DonateCall2": "Piwik braucht Ihre dauerhafte Unterstützung um zu wachsen und zu gedeihen.",
         "DonateCall3": "Finden Sie, dass Piwik einen deutlichen Mehrwert für Sie oder Ihr Unternehmen hat? %1$sBitte spenden Sie!%2$s",
         "DonateFormInstructions": "Klicken Sie auf den Slider um den Betrag zu wählen, dann klicken Sie auf 'Subscribe' um zu spenden.",
-        "ExcludeRowsWithLowPopulation_js": "Alle Zeilen werden angezeigt %s Niedrige Werte ausschließen",
+        "ExcludeRowsWithLowPopulation": "Alle Zeilen werden angezeigt %s Niedrige Werte ausschließen",
         "FlattenDataTable_js": "Der Bericht ist hierarchisch strukturiert %s Flach anzeigen",
         "HowMuchIsPiwikWorth": "Wieviel ist Piwik Ihnen wert?",
-        "IncludeRowsWithLowPopulation_js": "Niedrige Werte sind ausgeschlossen %s Alle Zeilen anzeigen",
+        "IncludeRowsWithLowPopulation": "Niedrige Werte sind ausgeschlossen %s Alle Zeilen anzeigen",
         "InjectedHostEmailBody": "Hallo, ich habe gerade versucht Piwik aufzurufen und erhielt eine Warnung, dass der Hostname unbekannt ist.",
         "InjectedHostEmailSubject": "Piwik wurde mit einem unbekannten Hostnamen aufgerufen: %s",
         "InjectedHostNonSuperUserWarning": "%1$sHier klicken um Piwik sicher zu betreten%2$s und die Warnung zu entfernen. Zusätzlich können Sie den Piwik Administrator kontaktieren und ihn auf dieses Problem hinweisen (%3$sHier klicken um eine E-Mail zu senden%4$s).",
@@ -234,7 +234,7 @@
         "UnFlattenDataTable_js": "Der Bericht ist flach %s Hierarchisch anzeigen",
         "ViewAllPiwikVideoTutorials": "Zeige alle Piwik Video Tutorials an",
         "WebAnalyticsReports": "Web Analytik Berichte",
-        "YouAreUsingTheLatestVersion_js": "Sie verwenden die aktuellste Version von Piwik!"
+        "YouAreUsingTheLatestVersion": "Sie verwenden die aktuellste Version von Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Aktion",
@@ -569,7 +569,7 @@
         "GraphHelp": "Mehr Informationen über die Darstellung von Graphen in Piwik.",
         "HelloUser": "Hallo, %s!",
         "Help": "Hilfe",
-        "Hide_js": "verbergen",
+        "Hide": "verbergen",
         "HoursMinutes": "%1$s Stunden %2$s Minuten",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Wenn der Archivierungsprozess nicht zu viel Zeit in Anspruch nimmt, können Sie den Cronjob so konfigurieren, dass die Archivierung häufiger gemacht wird.",
@@ -775,7 +775,7 @@
         "ShortMonth_8_js": "Aug",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "anzeigen",
+        "Show": "anzeigen",
         "SingleWebsitesDashboard": "Dashboard einer Webseite",
         "SmallTrafficYouCanLeaveDefault": "Für Seiten mit wenig Traffic können Sie den Standard von %s Sekunden beibehalten und alle Berichte in Echtzeit anzeigen.",
         "SmtpEncryption": "SMTP-Verschlüsselung",
@@ -833,7 +833,7 @@
         "YearlyReport": "jährlich",
         "YearlyReports": "Jährliche Berichte",
         "YearsDays": "%1$s Jahre %2$s Tage",
-        "YearShort_js": "j",
+        "YearShort": "j",
         "Yes": "Ja",
         "Yesterday": "Gestern",
         "YouAreCurrentlyUsing": "Sie nutzen Piwik %s.",
diff --git a/lang/el.json b/lang/el.json
index 88fcacd5d7546037dd1926412275ea3e51c7567d..6d5f98cc79ca341ded510e1dd8092416d9c02adf 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -182,18 +182,18 @@
         "CheckPiwikOut": "Δοκιμάστε το Piwik!",
         "CloseWidgetDirections": "Μπορείτε να κλείσετε αυτή τη λειτουργία κάνοντας κλικ στο εικονίδιο 'X' στην κορυφή του widget.",
         "DataForThisReportHasBeenPurged": "Τα δεδομένα για αυτή την αναφορά είναι περισσότερα από %s μήνες και κόπηκαν.",
-        "DataTableExcludeAggregateRows_js": "Συγκεντρωτικές εγγραφές είναι ορατές %s Απόκρυωη",
-        "DataTableIncludeAggregateRows_js": "Συγκεντρωτικές εγγραφές είναι κρυφές %s Προβολή",
+        "DataTableExcludeAggregateRows": "Συγκεντρωτικές εγγραφές είναι ορατές %s Απόκρυωη",
+        "DataTableIncludeAggregateRows": "Συγκεντρωτικές εγγραφές είναι κρυφές %s Προβολή",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "προεπιλογή",
         "DonateCall1": "Το Piwik θα είναι πάντα δωρεάν, αλλά αυτό δεν σημαίνει ότι δεν κοστίζει τίποτα για να φτιαχτεί.",
         "DonateCall2": "Το Piwik χρειάζεται τη συνεχή υποστήριξή σας για να αναπτυχθεί και να ευδοκιμήσει.",
         "DonateCall3": "Εάν θεωρείτε ότι το Piwik έχει προσθέσει σημαντική αξία στην επιχείρηση ή στο εγχείρημά σας, %1$sπαρακαλώ δωρίστε!%2$s",
         "DonateFormInstructions": "Κάντε κλικ στο ρυθμιστικό για να επιλέξετε ένα ποσό, στη συνέχεια, κάντε κλικ στο εγγραφείτε και να κάνετε δωρεά.",
-        "ExcludeRowsWithLowPopulation_js": "Όλε οι εγγραφές προβάλονται %s Εξαίρεση αυτών με μικρό πλήθος",
+        "ExcludeRowsWithLowPopulation": "Όλε οι εγγραφές προβάλονται %s Εξαίρεση αυτών με μικρό πλήθος",
         "FlattenDataTable_js": "Η αναφορά είναι ιεραρχημένη %s Κάντε την επίπεδη",
         "HowMuchIsPiwikWorth": "Πόσο αξίζει το Piwik για σας;",
-        "IncludeRowsWithLowPopulation_js": "Οι εγγραφές με χαμηλό πλήθος είναι κρυφές %s Προβολή όλων",
+        "IncludeRowsWithLowPopulation": "Οι εγγραφές με χαμηλό πλήθος είναι κρυφές %s Προβολή όλων",
         "InjectedHostEmailBody": "Γεια σας, προσπάθησα να έχω σήμερα πρόσβαση στο Piwik και αντιμετώπισα μια προειδοποίηση για άγνωστο όνομα εξυπηρετητή.",
         "InjectedHostEmailSubject": "Το Piwik προσπελάστηκε με ένα άγνωστο όνομα διακομιστή: %s",
         "InjectedHostNonSuperUserWarning": "%1$sΚάντε κλικ εδώ για να αποκτήσετε πρόσβαση με Piwik με ασφάλεια%2$s και να αφαιρέσετε αυτή την προειδοποίηση. Μπορεί επίσης να θέλετε να επικοινωνήσετε με το διαχειριστή του Piwik και τους ανακοινώνει για το θέμα αυτό (%3$sκάντε κλικ εδώ για να στείλετε email%4$s).",
@@ -233,7 +233,7 @@
         "UnFlattenDataTable_js": "Η αναφορά είναι επίπεδη %s Κάντε την ιεραρχημένη",
         "ViewAllPiwikVideoTutorials": "Δείτε όλα τα βίντεο εκμάθησης του Piwik",
         "WebAnalyticsReports": "Αναφορές Στατιστικών Ιστού",
-        "YouAreUsingTheLatestVersion_js": "Χρησιμοποιείτε την τελευταία έκδοση του Piwik!"
+        "YouAreUsingTheLatestVersion": "Χρησιμοποιείτε την τελευταία έκδοση του Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Δραστηριότητα",
@@ -568,7 +568,7 @@
         "GraphHelp": "Περισσότερες πληροφορίες για την προβολή γραφικών στο Piwik.",
         "HelloUser": "Γεια σου, %s!",
         "Help": "Βοήθεια",
-        "Hide_js": "απόκρυψη",
+        "Hide": "απόκρυψη",
         "HoursMinutes": "%1$s ώρες %2$s λεπτά",
         "Id": "Α\/Α",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Υποθέτοντας ότι η αρχειοθέτηση είναι γρήγορη για την εγκατάστασή σας, μπορείτε να εγκαταστήσετε το crontab για να τρέχει πιο συχνά.",
@@ -772,7 +772,7 @@
         "ShortMonth_8_js": "Αυγ",
         "ShortMonth_9": "Σεπ",
         "ShortMonth_9_js": "Σεπ",
-        "Show_js": "εμφάνιση",
+        "Show": "εμφάνιση",
         "SingleWebsitesDashboard": "Κεντρικός Πίνακας Μονής Ιστοσελίδας",
         "SmallTrafficYouCanLeaveDefault": "Για μικρής επισκεψιμότητας ιστοσελίδες, μπορείτε να αφήσετε τα προεπιλεγμένα %s δευτερόλεπτα και να έχετε πρόσβαση σε όλες τις αναφορές σε πραγματικό χρόνο",
         "SmtpEncryption": "Κρυπτογράφηση SMTP",
@@ -828,7 +828,7 @@
         "YearlyReport": "ετήσια",
         "YearlyReports": "Ετήσιες αναφορές",
         "YearsDays": "%1$s έτη %2$s ημέρες",
-        "YearShort_js": "έτος",
+        "YearShort": "έτος",
         "Yes": "Ναι",
         "Yesterday": "Χθες",
         "YouAreCurrentlyUsing": "Χρησιμοποιείτε την έκδοση %s του Piwik.",
diff --git a/lang/en.json b/lang/en.json
index 5d7170f2b827507f2aa943e405c045691e435c66..304910e24b4d25921eccba6ec81fc23fec878eb4 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -369,8 +369,8 @@
         "DownloadPleaseRemoveExisting": "If you want it to be replaced, please remove the existing file.",
         "DownloadFail_HttpRequestFail": "Could not download the file! Something might be wrong with the website you're downloading from. You could try again later or get the file by yourself.",
         "DownloadFail_FileExistsContinue": "Trying to continue the download for %s, but a fully downloaded file already exists!",
-        "Show_js": "show",
-        "Hide_js": "hide",
+        "Show": "show",
+        "Hide": "hide",
         "Donate": "Donate",
         "MoreDetails": "More Details",
         "Source": "Source",
@@ -391,7 +391,7 @@
         "ReadThisToLearnMore": "%1$sRead this to learn more.%2$s",
         "Summary": "Summary",
         "SeeAll": "see all",
-        "YearShort_js": "yr",
+        "YearShort": "yr",
         "DaySu_js": "Su",
         "DayMo_js": "Mo",
         "DayTu_js": "Tu",
@@ -611,7 +611,7 @@
         "InjectedHostEmailSubject": "Piwik was accessed with an unknown hostname: %s",
         "InjectedHostEmailBody": "Hello, I tried to access Piwik today and encountered the unknown hostname warning.",
         "CheckForUpdates": "Check for updates",
-        "YouAreUsingTheLatestVersion_js": "You are using the latest version of Piwik!",
+        "YouAreUsingTheLatestVersion": "You are using the latest version of Piwik!",
         "MakeADifference": "Make a difference: %1$sDonate now%2$s to fund Piwik 2.0!",
         "DonateCall1": "Piwik will always cost you nothing to use, but that doesn't mean it costs us nothing to make.",
         "DonateCall2": "Piwik needs your continued support to grow and thrive.",
@@ -635,10 +635,10 @@
         "DataForThisReportHasBeenPurged": "The data for this report is more than %s months old and has been purged.",
         "CategoryNoData": "No data in this category. Try to \"Include all population\".",
         "ShowJSCode": "Show the JavaScript code to insert",
-        "IncludeRowsWithLowPopulation_js": "Rows with low population are hidden %s Show all rows",
-        "ExcludeRowsWithLowPopulation_js": "All rows are shown %s Exclude low population",
-        "DataTableIncludeAggregateRows_js": "Aggregate rows are hidden %s Show them",
-        "DataTableExcludeAggregateRows_js": "Aggregate rows are shown %s Hide them",
+        "IncludeRowsWithLowPopulation": "Rows with low population are hidden %s Show all rows",
+        "ExcludeRowsWithLowPopulation": "All rows are shown %s Exclude low population",
+        "DataTableIncludeAggregateRows": "Aggregate rows are hidden %s Show them",
+        "DataTableExcludeAggregateRows": "Aggregate rows are shown %s Hide them",
         "Default_js": "default",
         "PageOf_js": "%1$s of %2$s",
         "FlattenDataTable_js": "The report is hierarchical %s Make it flat",
diff --git a/lang/es.json b/lang/es.json
index 8acae2637b3191b732e0938d4643d29a7860f45b..58dcd94f07ee55bbfda448ae2dfc46e3aedae109 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -160,17 +160,17 @@
         "CheckPiwikOut": "Compruebe Piwik fuera!",
         "CloseWidgetDirections": "Puede cerrar este widget haciendo clic en el icono \"X\" en la parte superior del widget.",
         "DataForThisReportHasBeenPurged": "Los datos para este reporte tienen más de %s meses de antigüedad y han sido purgados.",
-        "DataTableExcludeAggregateRows_js": "Mostrar filas acumuladas %s Ocultarlas",
-        "DataTableIncludeAggregateRows_js": "Filas agregadas están ocultas %s Mostrarlas",
+        "DataTableExcludeAggregateRows": "Mostrar filas acumuladas %s Ocultarlas",
+        "DataTableIncludeAggregateRows": "Filas agregadas están ocultas %s Mostrarlas",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "Por defecto",
         "DonateCall1": "Piwik siempre te costará nada de usar, pero eso no significa que no nos cuesta nada para hacer.",
         "DonateCall2": "Piwik necesita su apoyo para crecer y prosperar.",
         "DonateCall3": "Si usted siente que Piwik ha añadido un valor significativo a su negocio o empresa, %1$sPlease considere donar!%2$s",
         "DonateFormInstructions": "Haga clic en el control deslizante para seleccionar una cantidad, luego haga clic en suscribirse para donar.",
-        "ExcludeRowsWithLowPopulation_js": "Mostrar todas las filas %s Excluir baja población",
+        "ExcludeRowsWithLowPopulation": "Mostrar todas las filas %s Excluir baja población",
         "FlattenDataTable_js": "Este reporte es jerárquico %s Hazlo plano",
-        "IncludeRowsWithLowPopulation_js": "Las filas con baja población están ocultas %s Mostrar todas las filas",
+        "IncludeRowsWithLowPopulation": "Las filas con baja población están ocultas %s Mostrar todas las filas",
         "InjectedHostEmailBody": "Hola, traté de acceder a Piwik hoy y encontré una advertencia acerca de que el nombre del servidor es desconocido.",
         "InjectedHostEmailSubject": "Piwik fue contactado desde un servidor desconocido: %s",
         "InjectedHostNonSuperUserWarning": "%1$sClic aquí para acceder de forma segura a Piwik%2$s y quitar esta advertencia. Puede contactarse con su administrador Piwik y notificarlo acerca de este hecho (%3$sclic aquí para enviarle un correo electrónico%4$s)",
@@ -204,7 +204,7 @@
         "ThereIsNoDataForThisReport": "No hay datos para este informe.",
         "UnFlattenDataTable_js": "Este reporte es plano %s Hazlo jerárquico",
         "WebAnalyticsReports": "Informes de Análisis Web",
-        "YouAreUsingTheLatestVersion_js": "Está utilizando la última versión de Piwik!"
+        "YouAreUsingTheLatestVersion": "Está utilizando la última versión de Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Acción",
diff --git a/lang/fa.json b/lang/fa.json
index 2c87f1a3525f8d5b930e018b6eedd386a6281611..4ec673ced4345b208da26081361560a123970d71 100644
--- a/lang/fa.json
+++ b/lang/fa.json
@@ -198,7 +198,7 @@
         "UnFlattenDataTable_js": "این گزارش مسطح است %s آن را سلسله مراتبی کن",
         "ViewAllPiwikVideoTutorials": "تمام ویدئوهای آموزشی پیویک را ببینید",
         "WebAnalyticsReports": "گزارش اطلاعات آماری وب",
-        "YouAreUsingTheLatestVersion_js": "شما در حال استفاده از آخرین ویرایش پیویک هستید!"
+        "YouAreUsingTheLatestVersion": "شما در حال استفاده از آخرین ویرایش پیویک هستید!"
     },
     "CorePluginsAdmin": {
         "Action": "عمل",
@@ -513,7 +513,7 @@
         "GraphHelp": "اطلاعات بیشتر در مورد نمایش نمودارها در Piwik.",
         "HelloUser": "درود, %s!",
         "Help": "راهنما",
-        "Hide_js": "پنهان شود",
+        "Hide": "پنهان شود",
         "Id": "شناسه",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "فرض آرشیو سریع برای راه اندازی خود را، شما می توانید به crontab برای اجرای اغلب موارد راه اندازی است.",
         "InfoFor": "اطلاعات برای%s",
@@ -715,7 +715,7 @@
         "ShortMonth_8_js": "اوگوست",
         "ShortMonth_9": "سپتامبر",
         "ShortMonth_9_js": "سپتامبر",
-        "Show_js": "مشاهده شود",
+        "Show": "مشاهده شود",
         "SingleWebsitesDashboard": "داشبورد یک وبسایت",
         "SmallTrafficYouCanLeaveDefault": "برای وبسایت های با ترافیک پایین ، شما می توانید از پیش فرض %s ثانیه صرف نظر کنید و به تمام گزارش ها در همان لحظه(Real Time) دسترسی داشته باشید.",
         "SmtpEncryption": "رمزگذاری SMTP",
@@ -772,7 +772,7 @@
         "YearlyReport": "سالانه",
         "YearlyReports": "گزارش سالانه",
         "YearsDays": "%1$s سال ها %2$s روز ها",
-        "YearShort_js": "سال",
+        "YearShort": "سال",
         "Yes": "بلی",
         "Yesterday": "دیروز",
         "YouAreCurrentlyUsing": "شما هم اکنون از پیوک %s استفاده می کنید.",
diff --git a/lang/fi.json b/lang/fi.json
index 802f170b54b8a6c351d5b4f1ff5502670eff9327..efb411eece0f7865bb75f039ccefefb4b980bcd5 100644
--- a/lang/fi.json
+++ b/lang/fi.json
@@ -99,13 +99,13 @@
         "CategoryNoData": "Tässä kategoriassa ei ole tietoja. Kokeile linkkiä \"Kaikki esiintymät\".",
         "CheckForUpdates": "Tarkista päivitykset",
         "DataForThisReportHasBeenPurged": "Tämän raportin data on yli %s kuukautta vanhaa ja on poistettu.",
-        "DataTableExcludeAggregateRows_js": "Yhdistetyt rivit ovat näkyvillä %s Piilota",
-        "DataTableIncludeAggregateRows_js": "Yhdistetyt rivit on piilotettu %s Näytä",
+        "DataTableExcludeAggregateRows": "Yhdistetyt rivit ovat näkyvillä %s Piilota",
+        "DataTableIncludeAggregateRows": "Yhdistetyt rivit on piilotettu %s Näytä",
         "DateFormat": "%longDay% %longYear%-%month%-%day%",
         "Default_js": "oletus",
-        "ExcludeRowsWithLowPopulation_js": "Kaikki rivit näytetään %s Piilota vajaat rivit",
+        "ExcludeRowsWithLowPopulation": "Kaikki rivit näytetään %s Piilota vajaat rivit",
         "FlattenDataTable_js": "Tämä raportti on hierarkinen %s Muuta tasaiseksi",
-        "IncludeRowsWithLowPopulation_js": "Vajaat rivit on piilotettu %s Näytä kaikki rivit",
+        "IncludeRowsWithLowPopulation": "Vajaat rivit on piilotettu %s Näytä kaikki rivit",
         "InjectedHostEmailSubject": "Piwikiin otettiin yhteyttä tuntemattomalla osoitteella: %s",
         "JavascriptDisabled": "JavaScriptin täytyy olla käytössä normaalinäkymässä.<br \/>JavaScript ei ole päällä tai ei ole tuettu selaimessasi.<br \/>Ota JavaScript käyttöön selaimesi asetuksista ja %1$syritä uudelleen%2$s.<br\/>",
         "LongMonthFormat": "%longYear%, %longMonth%",
@@ -131,7 +131,7 @@
         "ThereIsNoDataForThisReport": "Tähän raporttiin ei ole tietoja.",
         "UnFlattenDataTable_js": "Tämä raportti on tasainen %s Muuta hierarkiseksi",
         "WebAnalyticsReports": "Raportit",
-        "YouAreUsingTheLatestVersion_js": "Käytössäsi on uusin versio Piwikistä!"
+        "YouAreUsingTheLatestVersion": "Käytössäsi on uusin versio Piwikistä!"
     },
     "CorePluginsAdmin": {
         "Action": "Toiminto",
diff --git a/lang/fr.json b/lang/fr.json
index 7f9e114fced08ba21a231a6964037bbf5d6dcf26..7b7906372740c51802b20ce026976217de2651d8 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "Vérifiez sur Piwik!",
         "CloseWidgetDirections": "Vous pouvez fermer ce gadget en cliquant sur l'icône en forme de \"X\" en haut du gadget.",
         "DataForThisReportHasBeenPurged": "Les données pour ce rapport ont plus de %s mois et ont été purgées.",
-        "DataTableExcludeAggregateRows_js": "Les lignes aggrégées sont affichées %s Les cacher",
-        "DataTableIncludeAggregateRows_js": "Les lignes aggrégées sont cachées %s Les afficher",
+        "DataTableExcludeAggregateRows": "Les lignes aggrégées sont affichées %s Les cacher",
+        "DataTableIncludeAggregateRows": "Les lignes aggrégées sont cachées %s Les afficher",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "par défaut",
         "DonateCall1": "Piwik ne vous coûtera jamais rien à utiliser, mais cela ne veut pas dire que ça ne nous coûte rien pour le réaliser.",
         "DonateCall2": "Piwik a besoin de votre support continu pour croître et prospérer.",
         "DonateCall3": "Si vous pensez que Piwik a ajouté une valeur significative à votre entreprise ou à votre projet, %1$s pensez à faire un don s'il vous plait! %2$s",
         "DonateFormInstructions": "Cliquez sur le curseur pour sélectionner un montant, puis cliquez sur s'abonner à faire un don.",
-        "ExcludeRowsWithLowPopulation_js": "Toutes les lignes sont affichées %s Exclure celles peu significantes",
+        "ExcludeRowsWithLowPopulation": "Toutes les lignes sont affichées %s Exclure celles peu significantes",
         "FlattenDataTable_js": "Le rapport est hiérarchique %s L'applatir",
         "HowMuchIsPiwikWorth": "Combien vaut Piwik pour vous?",
-        "IncludeRowsWithLowPopulation_js": "Les lignes peu significantes sont cachées %s Afficher toutes les lignes",
+        "IncludeRowsWithLowPopulation": "Les lignes peu significantes sont cachées %s Afficher toutes les lignes",
         "InjectedHostEmailBody": "Bonjour, j'ai essayé d'accéder à Piwik aujourd'hui et j'ai rencontré l'avertissement de nom d'hôte inconnu.",
         "InjectedHostEmailSubject": "On a accédé à Piwik avec un nom d'hôte inconnu : %s",
         "InjectedHostNonSuperUserWarning": "%1$sCliquez ici pour accéder à Piwik de manière sécurisé%2$s et supprimer cette alerte. Vous pouvez aussi contacter votre administrateur Piwik and l'avertir de ce problème (%3$sCliquez ici pour envoyer un message%4$s).",
@@ -234,7 +234,7 @@
         "UnFlattenDataTable_js": "Le rapport est plat %s Le rendre hiérarchique",
         "ViewAllPiwikVideoTutorials": "Visualiser tous les tutoriaux vidéo de Piwik",
         "WebAnalyticsReports": "Rapports des statistiques web.",
-        "YouAreUsingTheLatestVersion_js": "Vous utilisez la dernière version de Piwik!"
+        "YouAreUsingTheLatestVersion": "Vous utilisez la dernière version de Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Action",
@@ -569,7 +569,7 @@
         "GraphHelp": "Plus d'informations à propos de l'affichage des graphiques dans Piwik.",
         "HelloUser": "Bonjour, %s",
         "Help": "Aide",
-        "Hide_js": "cacher",
+        "Hide": "cacher",
         "HoursMinutes": "%1$s heures %2$s min",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "En supposant que l'archivage soit rapide pour votre installation, vous pouvez paramétrer la crontab pour qu'elle s'exécute plus fréquemment.",
@@ -774,7 +774,7 @@
         "ShortMonth_8_js": "Aoû",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "afficher",
+        "Show": "afficher",
         "SingleWebsitesDashboard": "Tableau de board d'un seul site",
         "SmallTrafficYouCanLeaveDefault": "Pour les sites à faible trafic, vous pouvez laisser le délais %s secondes par défaut, et ainsi accéder aux rapports en temps réel.",
         "SmtpEncryption": "Chiffrement SMTP",
@@ -831,7 +831,7 @@
         "YearlyReport": "annuel",
         "YearlyReports": "Rapports annuels",
         "YearsDays": "%1$s années %2$s jours",
-        "YearShort_js": "an.",
+        "YearShort": "an.",
         "Yes": "Oui",
         "Yesterday": "Hier",
         "YouAreCurrentlyUsing": "Vous utilisez actuellement Piwik %s",
diff --git a/lang/hi.json b/lang/hi.json
index 69ce96bcf1c50269fd4b62196f4e231d2ca7dc7a..7af76cd3d8f507074f47a05b036442040ef318fd 100644
--- a/lang/hi.json
+++ b/lang/hi.json
@@ -181,18 +181,18 @@
         "CheckPiwikOut": "Piwik जाँच करें!",
         "CloseWidgetDirections": "आप विजेट के शीर्ष पर 'X' आइकन पर क्लिक करके इस विजेट बंद कर सकते हैं.",
         "DataForThisReportHasBeenPurged": "इस रिपोर्ट के लिए डेटा %s महीनोंकी तुलना में अधिक पुराना है और शुद्ध किया गया है.",
-        "DataTableExcludeAggregateRows_js": "कुल पंक्तियों %s को दिखाया जाता है उन्हें छुपाने",
-        "DataTableIncludeAggregateRows_js": "कुल पंक्तियों को छिपा रहे हैं, %s उन्हें दिखाओ",
+        "DataTableExcludeAggregateRows": "कुल पंक्तियों %s को दिखाया जाता है उन्हें छुपाने",
+        "DataTableIncludeAggregateRows": "कुल पंक्तियों को छिपा रहे हैं, %s उन्हें दिखाओ",
         "DateFormat": "% लंबा दिवस% % दिन% % लंबा महीना% % लंबा वर्ष%",
         "Default_js": "डिफ़ॉल्ट",
         "DonateCall1": "Piwik उपयोग करने के लिए आपके कुछ भी खर्च नहीं होंगे, लेकिन यह मतलब नहीं बनाने के लिए कोई खर्च नहीं लगता है.",
         "DonateCall2": "Piwik के बढ़ने और फूलने के लिए आपके निरंतर समर्थन की जरूरत है.",
         "DonateCall3": "आपको लग रहा है Piwik ने आपके व्यवसाय या प्रयास के लिए महत्वपूर्ण मूल्य जोड़ा है, %1$s कृपया दान करने पर विचार करे!%2$s",
         "DonateFormInstructions": "एक राशि का चयन करने के लिए स्लाइडर पर क्लिक करें, फिर दान की सदस्यता पर क्लिक करें.",
-        "ExcludeRowsWithLowPopulation_js": "सभी पंक्तियों %s को दिखाया जाता है कम आबादी बाहर निकालें",
+        "ExcludeRowsWithLowPopulation": "सभी पंक्तियों %s को दिखाया जाता है कम आबादी बाहर निकालें",
         "FlattenDataTable_js": "रिपोर्ट श्रेणीबद्ध %s है यह फ्लैट बनाओ है",
         "HowMuchIsPiwikWorth": "आप के लिए Piwik कितना लायक है?",
-        "IncludeRowsWithLowPopulation_js": "कम आबादी के साथ पंक्तियाँ छिपे %s हुए हैं, सभी पंक्तियों दिखाएँ",
+        "IncludeRowsWithLowPopulation": "कम आबादी के साथ पंक्तियाँ छिपे %s हुए हैं, सभी पंक्तियों दिखाएँ",
         "InjectedHostEmailBody": "नमस्कार, मैं आज Piwik का उपयोग करने की कोशिश की और अज्ञात परिचारक नाम चेतावनी का सामना करना पड़ा.",
         "InjectedHostEmailSubject": "Piwik एक अज्ञात परिचारक नाम से पहुँचा था: %s",
         "InjectedHostNonSuperUserWarning": "सुरक्षित %2$s Piwik का उपयोग और इस चेतावनी को दूर करने के लिए यहां क्लिक %1$s करें. आप भी अपनी Piwik व्यवस्थापक से संपर्क करें और इस मुद्दे (%3$sईमेल के लिए यहां क्लिक %4$s करें) के बारे में उन्हें सूचित करना चाहिए",
@@ -228,7 +228,7 @@
         "UnFlattenDataTable_js": "रिपोर्ट फ्लैट %s है इसे श्रेणीबद्ध करें",
         "ViewAllPiwikVideoTutorials": "सभी Piwik वीडियो ट्यूटोरियल देखें",
         "WebAnalyticsReports": "वेब विश्लेषिकी रिपोर्टें",
-        "YouAreUsingTheLatestVersion_js": "आप Piwik का नवीनतम संस्करण का उपयोग कर रहे हैं!"
+        "YouAreUsingTheLatestVersion": "आप Piwik का नवीनतम संस्करण का उपयोग कर रहे हैं!"
     },
     "CorePluginsAdmin": {
         "Action": "कार्रवाई",
@@ -563,7 +563,7 @@
         "GraphHelp": "Piwik में रेखांकन प्रदर्शित करने के बारे में अधिक जानकारी.",
         "HelloUser": "हैलो, %s!",
         "Help": "मदद",
-        "Hide_js": "छिपाना",
+        "Hide": "छिपाना",
         "HoursMinutes": "%1$s घंटे %2$s मिनट",
         "Id": "पहचान",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "मानते हुए पुरालेखण अपनी स्थापना के लिए तेज हैआप अधिक बार चलाने के लिए crontab स्थापना कर सकते हैं.",
@@ -769,7 +769,7 @@
         "ShortMonth_8_js": "अगस्त",
         "ShortMonth_9": "सितम्बर",
         "ShortMonth_9_js": "सितंबर",
-        "Show_js": "दिखाना",
+        "Show": "दिखाना",
         "SingleWebsitesDashboard": "एकल वेबसाइट डैशबोर्ड",
         "SmallTrafficYouCanLeaveDefault": "छोटे यातायात वेबसाइटों के लिए, यदि आप डिफ़ॉल्ट %sसेकंड हटा देते हैं, और वास्तविक समय में सभी रिपोर्टों का उपयोग कर सकते हैं.",
         "SmtpEncryption": "एसएमटीपी एन्क्रिप्शन",
@@ -825,7 +825,7 @@
         "YearlyReport": "वार्षिक",
         "YearlyReports": "वार्षिक रिपोर्टों में",
         "YearsDays": "%1$s साल %2$s दिन",
-        "YearShort_js": "वर्ष",
+        "YearShort": "वर्ष",
         "Yes": "हां",
         "Yesterday": "कल",
         "YouAreCurrentlyUsing": "आप वर्तमान में Piwik %s का उपयोग कर रहे हैं.",
diff --git a/lang/id.json b/lang/id.json
index 7a8856f0f17717555f496494e56ffbb764b6c7e3..ec348a9b4db27c71997e73acf1f2151e465d90e5 100644
--- a/lang/id.json
+++ b/lang/id.json
@@ -182,18 +182,18 @@
         "CheckPiwikOut": "Periksa Piwik!",
         "CloseWidgetDirections": "Anda dapat menutup gawit ini dengan mengeklik ikon 'X' di atas gawit.",
         "DataForThisReportHasBeenPurged": "Data untuk laporan ini telah berumur lebih dari %s bulan dan telah dibersihkan.",
-        "DataTableExcludeAggregateRows_js": "Keseluruhan baris ditampilkan %s Sembunyikan sekarang",
-        "DataTableIncludeAggregateRows_js": "Keseluruhan baris tersembunyi %s Tampilkan sekarang",
+        "DataTableExcludeAggregateRows": "Keseluruhan baris ditampilkan %s Sembunyikan sekarang",
+        "DataTableIncludeAggregateRows": "Keseluruhan baris tersembunyi %s Tampilkan sekarang",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "asali",
         "DonateCall1": "Piwik akan selalu tidak membebani Anda biaya, tapi bukan berarti bahwa biaya tidak berarti bagi kami.",
         "DonateCall2": "Piwik membutuhkan bantuan berkelanjutan Anda untuk tumbuh dan berkembang.",
         "DonateCall3": "Bila Anda merasa bahwa Piwik memberi nilai berarti dalam bisnis atau usaha Anda, %1$sharap memberi pertimbangkan untuk menyumbang!%2$s",
         "DonateFormInstructions": "Klik pada penggeser untuk memilih jumlah, kemudian klik berlangganan untuk menyumbang.",
-        "ExcludeRowsWithLowPopulation_js": "Seluruh baris telah ditampilkan %s Populasi rendah dikecualikan",
+        "ExcludeRowsWithLowPopulation": "Seluruh baris telah ditampilkan %s Populasi rendah dikecualikan",
         "FlattenDataTable_js": "Laporan ditampilkan berurutan %s Buat tetap",
         "HowMuchIsPiwikWorth": "Seberapa besar nilai Piwik untuk Anda?",
-        "IncludeRowsWithLowPopulation_js": "Baris dengan populasi rendah telah tersembunyi %s Tampilkan seluruh baris",
+        "IncludeRowsWithLowPopulation": "Baris dengan populasi rendah telah tersembunyi %s Tampilkan seluruh baris",
         "InjectedHostEmailBody": "Halo, saya mencoba mengakses Piwik hari ini dan menemukan peringatan nama inang tidak dikenal.",
         "InjectedHostEmailSubject": "Piwik telah diakses menggunakan nama inang tidak dikenal: %s",
         "InjectedHostNonSuperUserWarning": "%1$sKlik di sini untuk mengkases Piwik secara aman%2$s dan menghapus peringatan ini. Anda juga dapat menghubungi pengelola Piwik Anda dan memberi tahu tentang permasalahan ini (%3$sklik di sini untuk surel%4$s).",
@@ -233,7 +233,7 @@
         "UnFlattenDataTable_js": "Laporan ditampilkan tetap %s Buat berurutan",
         "ViewAllPiwikVideoTutorials": "Tampilkan seluruh Video Tutorial Piwik",
         "WebAnalyticsReports": "Laporan Analisis Web",
-        "YouAreUsingTheLatestVersion_js": "Anda menggunakan versi termutakhir Piwik!"
+        "YouAreUsingTheLatestVersion": "Anda menggunakan versi termutakhir Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Tindakan",
@@ -562,7 +562,7 @@
         "GraphHelp": "Informasi lebih lanjut tentang menampilkan grafik di Piwik.",
         "HelloUser": "Halo, %s!",
         "Help": "Bantuan",
-        "Hide_js": "sembunyikan",
+        "Hide": "sembunyikan",
         "HoursMinutes": "%1$s jam %2$s menit",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Dengan anggapan pengarsipan adalah cepat untuk pengaturan Anda, Anda dapat mengatur crontab berjalan lebih sering.",
@@ -766,7 +766,7 @@
         "ShortMonth_8_js": "Agu",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "tampilkan",
+        "Show": "tampilkan",
         "SingleWebsitesDashboard": "Panel Kendali Tunggal",
         "SmallTrafficYouCanLeaveDefault": "Untuk kunjungan kecil, Anda dapat membiarkan dalam %s detik, dan mengakses seluruh laporan dalam waktu nyata.",
         "SmtpEncryption": "Penyandian SMTP",
@@ -822,7 +822,7 @@
         "YearlyReport": "tahunan",
         "YearlyReports": "Laporan tahunan",
         "YearsDays": "%1$s tahun %2$s hari",
-        "YearShort_js": "yr",
+        "YearShort": "yr",
         "Yes": "Ya",
         "Yesterday": "Kemarin",
         "YouAreCurrentlyUsing": "Anda saat ini menggunakan Piwik %s.",
diff --git a/lang/it.json b/lang/it.json
index 858b748c861c46554278355b12a233912d1ede57..abf29dae699bf65463196dd14feb6cdab5d0ae55 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "Controlla Piwik!",
         "CloseWidgetDirections": "Potete chiudere questo widget cliccando sull'icona 'X' nella parte alta del widget stesso.",
         "DataForThisReportHasBeenPurged": "I dati di questo rapporto hanno più di un mese %s e sono stati eliminato.",
-        "DataTableExcludeAggregateRows_js": "Le righe di aggregazione vengono visualizzate %s Nascondile",
-        "DataTableIncludeAggregateRows_js": "Le righe di aggregazione sono nascoste %s Visualizzale",
+        "DataTableExcludeAggregateRows": "Le righe di aggregazione vengono visualizzate %s Nascondile",
+        "DataTableIncludeAggregateRows": "Le righe di aggregazione sono nascoste %s Visualizzale",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "default",
         "DonateCall1": "Piwik non costerà mai nulla a voi per il suo utilizzo, ma ciò non significa che non costi nulla a noi svilupparlo.",
         "DonateCall2": "Piwik ha bisogno del vostro costante supporto per crescere e prosperare.",
         "DonateCall3": "Se ritenete che Piwik abbia aggiunto un valore significativo alla vostra attività, %1$svi preghiamo di considerare una donazione!%2$s",
         "DonateFormInstructions": "Cliccate sullo slider per selezionare una somma, quindi cliccate su sottoscrivi per donare.",
-        "ExcludeRowsWithLowPopulation_js": "Tutte le righe sono visualizzate %s Escludi le piccole popolazioni.",
+        "ExcludeRowsWithLowPopulation": "Tutte le righe sono visualizzate %s Escludi le piccole popolazioni.",
         "FlattenDataTable_js": "Il report è gerarchica %s renderlo piatto",
         "HowMuchIsPiwikWorth": "Che valore ha per voi Piwik?",
-        "IncludeRowsWithLowPopulation_js": "Le righe con popolazione bassa sono nascoste %s Mostra tutte le righe",
+        "IncludeRowsWithLowPopulation": "Le righe con popolazione bassa sono nascoste %s Mostra tutte le righe",
         "InjectedHostEmailBody": "Salve, oggi ho provato ad accedere a Piwik e ho incontrato un avvertimento per nome host sconosciuto.",
         "InjectedHostEmailSubject": "Si sta accedendo a Piwik con un nome host sconosciuto: %s",
         "InjectedHostNonSuperUserWarning": "%1$sClick qui per accedere a Piwik in maniera sicura%2$s e rimuovere questo avvertimento. Potete anche voler contattare il vostro amministratore di Piwik per avvisare di questo problema (%3$sclick qui per inviare un'email%4$s).",
@@ -233,7 +233,7 @@
         "UnFlattenDataTable_js": "Il rapporto è piatta %s Renderlo gerarchico",
         "ViewAllPiwikVideoTutorials": "Vedi tutti i Video Tutorial di Piwik",
         "WebAnalyticsReports": "Report Web Analytics",
-        "YouAreUsingTheLatestVersion_js": "Stai utilizzando l'ultima versione di Piwik!"
+        "YouAreUsingTheLatestVersion": "Stai utilizzando l'ultima versione di Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Azione",
@@ -568,7 +568,7 @@
         "GraphHelp": "Maggiori informazioni su come vedere grafici in Piwik.",
         "HelloUser": "Bentornato, %s!",
         "Help": "Aiuto",
-        "Hide_js": "nascondi",
+        "Hide": "nascondi",
         "HoursMinutes": "%1$s ore %2$s minuti",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Supponendo che l'archiviazione è veloce per l'installazione, potete configurare il crontab per eseguire più frequentemente.",
@@ -774,7 +774,7 @@
         "ShortMonth_8_js": "Ago",
         "ShortMonth_9": "Set",
         "ShortMonth_9_js": "Set",
-        "Show_js": "Mostra",
+        "Show": "Mostra",
         "SingleWebsitesDashboard": "Pannello del singolo sito web",
         "SmallTrafficYouCanLeaveDefault": "Per siti con poco traffico, puoi lasciare i %s secondi impostati di default, e accedere a tutti i report in tempo reale.",
         "SmtpEncryption": "Cifratura SMTP",
@@ -831,7 +831,7 @@
         "YearlyReport": "annualmente",
         "YearlyReports": "Rapporti annuali",
         "YearsDays": "%1$s anni %2$s giorni",
-        "YearShort_js": "aa",
+        "YearShort": "aa",
         "Yes": "Sì",
         "Yesterday": "Ieri",
         "YouAreCurrentlyUsing": "Stai utilizzando %s Piwik.",
diff --git a/lang/ja.json b/lang/ja.json
index 9706154bf306ed811d86946fd37ab6cf9d22c0fb..16719d3a409af0ab35574d7b8dd77ae6ca66287d 100644
--- a/lang/ja.json
+++ b/lang/ja.json
@@ -179,13 +179,13 @@
     "CoreHome": {
         "CategoryNoData": "このカテゴリにデータはありません。 \"すべての母集団（統計の対象とする集団）を含める\" を試してみてください。",
         "DataForThisReportHasBeenPurged": "このリポートのデータは %sヶ月以上古いのでパージされました。",
-        "DataTableExcludeAggregateRows_js": "集計行は表示 %s 隠す",
-        "DataTableIncludeAggregateRows_js": "集計行は非表示 %s 表示する",
+        "DataTableExcludeAggregateRows": "集計行は表示 %s 隠す",
+        "DataTableIncludeAggregateRows": "集計行は非表示 %s 表示する",
         "DateFormat": "%longYear% å¹´ %longMonth% %day%æ—¥ %longDay%",
         "Default_js": "デフォルト",
-        "ExcludeRowsWithLowPopulation_js": "全ての行を表示 %s 少ない数の行を除く",
+        "ExcludeRowsWithLowPopulation": "全ての行を表示 %s 少ない数の行を除く",
         "FlattenDataTable_js": "リポートは階層表示です %s フラットにする",
-        "IncludeRowsWithLowPopulation_js": "数が少ない行は非表示 %s 全ての行を表示",
+        "IncludeRowsWithLowPopulation": "数が少ない行は非表示 %s 全ての行を表示",
         "JavascriptDisabled": "Piwik を標準ビューで使用するには JavaScript が有効である必要がありますが、<br \/>あなたのブラウザでは無効になっているか、サポートされないようです。<br \/>標準ビューで使用するために、ブラウザのオプションを変更して JavaScript を有効にしてから<br \/>%1$s再試行してください%2$s。<br \/>",
         "LongMonthFormat": "%longYear% å¹´ %longMonth%",
         "NoPrivilegesAskPiwikAdmin": "'%s'としてログインしていますが、権限が設定されていないようです。 %s Piwikの管理者(クリックしてEメール)%s に'表示'の権限を与えてもらってください。",
diff --git a/lang/ko.json b/lang/ko.json
index 4ff8ce1f2162af20dfbaf0745576f42184dbd547..5cbe8144bf3a096e97d949129805ab58f90b1948 100644
--- a/lang/ko.json
+++ b/lang/ko.json
@@ -144,18 +144,18 @@
         "CheckPiwikOut": "Piwik 출시 확인!",
         "CloseWidgetDirections": "위젯의 상단에있는 'X'아이콘을 클릭하여 이 위젯을 닫을 수 있습니다.",
         "DataForThisReportHasBeenPurged": "이 보고서의 데이터는 %s 개월 이상 되었기 때문에 제거되었습니다.",
-        "DataTableExcludeAggregateRows_js": "요약 행 표시 %s 숨기기",
-        "DataTableIncludeAggregateRows_js": "요약 행 숨기기 %s 보이기",
+        "DataTableExcludeAggregateRows": "요약 행 표시 %s 숨기기",
+        "DataTableIncludeAggregateRows": "요약 행 숨기기 %s 보이기",
         "DateFormat": "%longYear%년 %longMonth% %day%일 %longDay%",
         "Default_js": "기본",
         "DonateCall1": "Piwik을 사용하는데 당신의 비용이 들지는 않을 것입니다. 그렇다고 우리가 이것을 만드는데 비용이 들지 않다는 의미는 아닙니다.",
         "DonateCall2": "Piwik은 성장하고 번영하기 위해 당신의 지속적인 지원이 필요합니다.",
         "DonateCall3": "Piwik이 당신의 업무나 시도하는 일에 특별한 가치를 더해준다고 느끼신다면, %1$s기부해 주세요!%2$s",
         "DonateFormInstructions": "슬라이더를 클릭하여 금액을 선택하고, 기부에 기명을 클릭합니다.",
-        "ExcludeRowsWithLowPopulation_js": "모든 행을 표시 %s 적은 량의 항목은 제외",
+        "ExcludeRowsWithLowPopulation": "모든 행을 표시 %s 적은 량의 항목은 제외",
         "FlattenDataTable_js": "이 보고서는 계층형입니다. %s 펼치기",
         "HowMuchIsPiwikWorth": "당신에게 Piwik의 가치는 얼마인가요?",
-        "IncludeRowsWithLowPopulation_js": "수가 적은 줄 숨기기 %s 모든 행을 표시",
+        "IncludeRowsWithLowPopulation": "수가 적은 줄 숨기기 %s 모든 행을 표시",
         "InjectedHostEmailBody": "안녕하세요, 오늘 Piwik에 접근 시도했는데 알 수 없는 호스트 경고가 발생했습니다.",
         "InjectedHostEmailSubject": "Piwik에서 알 수 없는 호스트네임을 사용하여 접근함: %s",
         "InjectedHostNonSuperUserWarning": "%1$sPiwik에 안전하게 접근하려면 여기를 클릭%2$s하고 이 경고를 제거합니다. 또한 Piwik 관리자에게 문의하여이 이 문제를 알릴 수 있습니다 (%3$s클릭하여 이메일 발송%4$s).",
@@ -195,7 +195,7 @@
         "UnFlattenDataTable_js": "보고서가 펼쳐져 있습니다 %s 계층으로 표시하기",
         "ViewAllPiwikVideoTutorials": "모든 비디오 튜토리얼 보기",
         "WebAnalyticsReports": "웹 분석 보고서",
-        "YouAreUsingTheLatestVersion_js": "Piwik 최신 버전을 사용하고 있습니다!"
+        "YouAreUsingTheLatestVersion": "Piwik 최신 버전을 사용하고 있습니다!"
     },
     "CorePluginsAdmin": {
         "Action": "동작",
@@ -515,7 +515,7 @@
         "GraphHelp": "Piwik 그래프 정보입니다.",
         "HelloUser": "안녕하세요, %s 님!",
         "Help": "도움말",
-        "Hide_js": "숨기기",
+        "Hide": "숨기기",
         "HoursMinutes": "%1$s시간 %2$s분",
         "Id": "ID",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "아카이브 작업을 더 빨리 수행하려면 cron이 더 자주 실행되도록 crontab을 설정합니다.",
@@ -702,7 +702,7 @@
         "ShortMonth_8_js": "8ì›”",
         "ShortMonth_9": "9ì›”",
         "ShortMonth_9_js": "9ì›”",
-        "Show_js": "보이기",
+        "Show": "보이기",
         "SingleWebsitesDashboard": "단일 웹사이트 대시보드",
         "SmallTrafficYouCanLeaveDefault": "트래픽이 적은 웹사이트에서는 기본 %s초 설정으로 모든 보고서에 실시간 접근할 수 있습니다.",
         "SmtpEncryption": "SMTP 암호화",
@@ -756,7 +756,7 @@
         "Widgets": "위젯",
         "YearlyReports": "연간 보고서",
         "YearsDays": "%1$s년 %2$s일",
-        "YearShort_js": "ë…„",
+        "YearShort": "ë…„",
         "Yes": "예",
         "Yesterday": "어제",
         "YouAreCurrentlyUsing": "현재 Piwik %s를 이용하고 있습니다.",
diff --git a/lang/nb.json b/lang/nb.json
index a132d19f24964fed95df9147fc2744cf3b5b5334..a1f616a9e4b54a336bd25e8ab2434f6c5ce51881 100644
--- a/lang/nb.json
+++ b/lang/nb.json
@@ -114,7 +114,7 @@
         "SupportPiwik": "Støtt Piwik!",
         "ThereIsNoDataForThisReport": "Det fins ingen data for denne rapporten.",
         "WebAnalyticsReports": "Nettstatistikkrapporter",
-        "YouAreUsingTheLatestVersion_js": "Du bruker den nyeste versjonen av Piwik!"
+        "YouAreUsingTheLatestVersion": "Du bruker den nyeste versjonen av Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Handling",
@@ -355,7 +355,7 @@
         "GraphHelp": "Mer informasjon om visning av grafikk i Piwik",
         "HelloUser": "Hallo, %s!",
         "Help": "Hjelp",
-        "Hide_js": "skjul",
+        "Hide": "skjul",
         "HoursMinutes": "%1$s timer %2$s min",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Forutsatt arkivering er raskt for ditt oppsett, kan du sette opp crontab til å kjøre oftere.",
@@ -528,7 +528,7 @@
         "ShortMonth_8_js": "Aug",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "vis",
+        "Show": "vis",
         "SmtpEncryption": "SMTP-kryptering",
         "SmtpPassword": "SMTP-passord",
         "SmtpPort": "SMTP-port",
@@ -566,7 +566,7 @@
         "YearlyReport": "Ã¥rlig",
         "YearlyReports": "Ã…rlige rapporter",
         "YearsDays": "%1$s år %2$s dager",
-        "YearShort_js": "Ã¥r",
+        "YearShort": "Ã¥r",
         "Yes": "Ja",
         "Yesterday": "I går",
         "YouAreCurrentlyUsing": "Du bruker for øyeblikket Piwik %s.",
diff --git a/lang/nl.json b/lang/nl.json
index 363e2878a4fc7fb0a39e398d19980a6a9bd18467..dc271b297f973ac20fcd41b1f396a4e64446b1d3 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "Kijk eens naar Piwik!",
         "CloseWidgetDirections": "Je kunt deze widget sluiten door op het 'X' icoon bovenaan de widget te klikken.",
         "DataForThisReportHasBeenPurged": "De data voor dit rapport was meer dan %s maanden oud en is reeds opgeschoond.",
-        "DataTableExcludeAggregateRows_js": "Geagregeerde rijen worden getoond %s Verberg ze",
-        "DataTableIncludeAggregateRows_js": "Geagregeerde rijen zijn verborgen %s Toon ze",
+        "DataTableExcludeAggregateRows": "Geagregeerde rijen worden getoond %s Verberg ze",
+        "DataTableIncludeAggregateRows": "Geagregeerde rijen zijn verborgen %s Toon ze",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "standaard",
         "DonateCall1": "Piwik zal altijd niks kosten voor gebruik, maar dat wil niet zeggen dat het niks kost om te maken.",
         "DonateCall2": "Piwik heeft uw voortdurende steun nodig om te groeien.",
         "DonateCall3": "Als u vindt dat Piwik een grote hulp is voor uw zaak, %1$s overweeg dan een donatie!%2$s",
         "DonateFormInstructions": "Klik op de schuifbalk om een bedrag te selecteren, en klik dan subscribe om te doneren.",
-        "ExcludeRowsWithLowPopulation_js": "Alle rijen worden getoond %s Verberg de rijen met een lage populatie",
+        "ExcludeRowsWithLowPopulation": "Alle rijen worden getoond %s Verberg de rijen met een lage populatie",
         "FlattenDataTable_js": "De rapportweergave is hierarchisch %s Maak het vlak",
         "HowMuchIsPiwikWorth": "Hoeveel is Piwik waard voor jouw?",
-        "IncludeRowsWithLowPopulation_js": "Rijen met een lage populatie zijn verborgen %s Laat alle rijen zien",
+        "IncludeRowsWithLowPopulation": "Rijen met een lage populatie zijn verborgen %s Laat alle rijen zien",
         "InjectedHostEmailBody": "Hallo, ik probeerde Piwik vandaag te benaderen, en kreeg de onbekende hostnaam waarschuwing.",
         "InjectedHostEmailSubject": "Piwik werd bezocht via een onbekende hostnaam: %s",
         "InjectedHostNonSuperUserWarning": "%1$sKlik hier om Piwik veilig te benaderen%2$s en deze waarschuwing te verwijderen. Je verwittigt best ook je Piwik beheerder en meld hen dit probleem (%3$sKlik hier om te emailen%4$s).",
@@ -234,7 +234,7 @@
         "UnFlattenDataTable_js": "De rapportweergave is vlak %s Maak het hierarchisch",
         "ViewAllPiwikVideoTutorials": "Bekijk alle Piwik Video Tutorials",
         "WebAnalyticsReports": "Web Analyse rapporten",
-        "YouAreUsingTheLatestVersion_js": "Je gebruikt de laatste versie van Piwik!"
+        "YouAreUsingTheLatestVersion": "Je gebruikt de laatste versie van Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Actie",
@@ -569,7 +569,7 @@
         "GraphHelp": "Meer informatie over grafieken weergeven in Piwik.",
         "HelloUser": "Hallo, %s!",
         "Help": "Help",
-        "Hide_js": "verberg",
+        "Hide": "verberg",
         "HoursMinutes": "%1$s uren %2$s minuten",
         "Id": "id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Als de archivering snel is voor uw setup, dan kunt u de crontab wat vaker laten draaien.",
@@ -775,7 +775,7 @@
         "ShortMonth_8_js": "Aug",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "Toon",
+        "Show": "Toon",
         "SingleWebsitesDashboard": "Enkele Website dashboard",
         "SmallTrafficYouCanLeaveDefault": "Voor kleine websites, kunt u de standaardwaarden op %s seconden laten staan en kunt u alle rapporten realtime bekijken.",
         "SmtpEncryption": "SMTP encryptie",
@@ -832,7 +832,7 @@
         "YearlyReport": "jaarlijks",
         "YearlyReports": "Jaarlijkse rapporten",
         "YearsDays": "%1$s jaren %2$s dagen",
-        "YearShort_js": "jr",
+        "YearShort": "jr",
         "Yes": "Ja",
         "Yesterday": "Gisteren",
         "YouAreCurrentlyUsing": "U gebruikt momenteel Piwik %s.",
diff --git a/lang/nn.json b/lang/nn.json
index 493aee3c8befa1add9047b69e593f3eb1c050ddc..e4a71c8888f7a4cfa3425991f3f8605f6db7b1fc 100644
--- a/lang/nn.json
+++ b/lang/nn.json
@@ -69,13 +69,13 @@
     "CoreHome": {
         "CategoryNoData": "Ingen data i denne kategorien. Prøv \"Inkluder heile datasettet\".",
         "DataForThisReportHasBeenPurged": "Data for denne rapporten er meir enn %s månader gammal og er fjerna.",
-        "DataTableExcludeAggregateRows_js": "Samlingsrader er vist %s Skjul dei",
-        "DataTableIncludeAggregateRows_js": "Samlingsrader er skjult %s Vis dei",
+        "DataTableExcludeAggregateRows": "Samlingsrader er vist %s Skjul dei",
+        "DataTableIncludeAggregateRows": "Samlingsrader er skjult %s Vis dei",
         "DateFormat": "%longDay% %day%. %longMonth% %longYear%",
         "Default_js": "standard",
-        "ExcludeRowsWithLowPopulation_js": "Alle rader er vist %s Skjul låg populasjon",
+        "ExcludeRowsWithLowPopulation": "Alle rader er vist %s Skjul låg populasjon",
         "FlattenDataTable_js": "Rapporten er hierarkisk %s Gjer den flat",
-        "IncludeRowsWithLowPopulation_js": "Rader med låg populasjon er skjult %s Vis alle rader",
+        "IncludeRowsWithLowPopulation": "Rader med låg populasjon er skjult %s Vis alle rader",
         "JavascriptDisabled": "JavaScript må vera slegen på for å kunne bruka Piwik i standardvisning.<br \/>Det ser ut til at JavaScript er slegen av eller ikkje støtta i nettlesaren din.<br \/>For å bruka standardvisninga, slå på JavaScript i nettlesaren din, og %1$sprøv igjen%2$s.<br \/>",
         "LongMonthFormat": "%longYear%, %longMonth%",
         "NoPrivilegesAskPiwikAdmin": "Du er innlogga som '%s' men det ser ikkje ut til at du har vidare tilgang til Piwik. %s Spør Piwik-administratoren (klikk for å senda e-post)%s om å gje deg 'vis'-tilgang til ei nettside.",
diff --git a/lang/pt-br.json b/lang/pt-br.json
index c5b03a30b64434742014acfbcbee30b86b7cd96c..bb9bfe5545bab60506a4d52175baac64388ca16f 100644
--- a/lang/pt-br.json
+++ b/lang/pt-br.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "Verificar saída do Piwik",
         "CloseWidgetDirections": "Você pode fechar esta ferramenta clicando no ícone \"X\" na parte superior do widget.",
         "DataForThisReportHasBeenPurged": "Os dados para este relatório possuem mais de %s meses e foram excluídos.",
-        "DataTableExcludeAggregateRows_js": "Agregar linhas é mostrados %s Esconder-los.",
-        "DataTableIncludeAggregateRows_js": "Linhas agregadas estão ocultas %s Clique para exibir",
+        "DataTableExcludeAggregateRows": "Agregar linhas é mostrados %s Esconder-los.",
+        "DataTableIncludeAggregateRows": "Linhas agregadas estão ocultas %s Clique para exibir",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "Padrão",
         "DonateCall1": "Piwik sempre custará nada para usar, mas isso não significa que não nos custa nada para fazê-lo.",
         "DonateCall2": "Piwik precisa do seu apoio continuado para crescer e prosperar.",
         "DonateCall3": "Se você sentir que Piwik tem acrescentado valor significativo para o seu negócio ou empreendimento,%1$sconsidere doar para o projeto!%2$s",
         "DonateFormInstructions": "Clique no controle deslizante para selecionar um valor, clique em subscrever para doar.",
-        "ExcludeRowsWithLowPopulation_js": "Todas as linhas são mostradas %s Excluir população de baixa.",
+        "ExcludeRowsWithLowPopulation": "Todas as linhas são mostradas %s Excluir população de baixa.",
         "FlattenDataTable_js": "O relatório é hierárquico %s Tornar plano",
         "HowMuchIsPiwikWorth": "Quanto é que o Piwik vale para você?",
-        "IncludeRowsWithLowPopulation_js": "Linhas com poucos dados estão ocultas %s Mostrar todas as linhas",
+        "IncludeRowsWithLowPopulation": "Linhas com poucos dados estão ocultas %s Mostrar todas as linhas",
         "InjectedHostEmailBody": "Olá, eu tentei acessar Piwik hoje e encontrei um aviso de hostname desconhecido.",
         "InjectedHostEmailSubject": "Piwik foi acessado por um hostname desconhecido : %s",
         "InjectedHostNonSuperUserWarning": "%1$sClique aqui para acessar com segurança Piwik%2$s e remover esse aviso. Você também pode entrar em contato com o administrador do Piwik e notificá-lo sobre essa questão (%3$sClique aqui para enviar e-mail%4$s).",
@@ -234,7 +234,7 @@
         "UnFlattenDataTable_js": "O relatório é plano %s Tornar hierárquico",
         "ViewAllPiwikVideoTutorials": "Veja todos os Video tutoriais do Piwik",
         "WebAnalyticsReports": "Relatórios Web Analytics",
-        "YouAreUsingTheLatestVersion_js": "Você está usando a última versão do Piwik!"
+        "YouAreUsingTheLatestVersion": "Você está usando a última versão do Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Ação",
@@ -569,7 +569,7 @@
         "GraphHelp": "Mais informações sobre mostrar gráficos em Piwik.",
         "HelloUser": "Olá, %s!",
         "Help": "Ajuda",
-        "Hide_js": "ocultar",
+        "Hide": "ocultar",
         "HoursMinutes": "%1$s horas %2$s minutos",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Assumindo que o arquivamento é rápido para as suas configurações, você pode programar o crontab para funcionar com mais frequência.",
@@ -775,7 +775,7 @@
         "ShortMonth_8_js": "Ago",
         "ShortMonth_9": "Set",
         "ShortMonth_9_js": "Set",
-        "Show_js": "Exibir",
+        "Show": "Exibir",
         "SingleWebsitesDashboard": "Painel único site",
         "SmallTrafficYouCanLeaveDefault": "Para sites com tráfego baixo, você pode deixar o padrão de %s segundos, e acessar todos os relatórios em tempo real.",
         "SmtpEncryption": "Criptografia SMTP",
@@ -832,7 +832,7 @@
         "YearlyReport": "anual",
         "YearlyReports": "Relatórios anuais",
         "YearsDays": "%1$s anos %2$s dias",
-        "YearShort_js": "ano",
+        "YearShort": "ano",
         "Yes": "Sim",
         "Yesterday": "Ontem",
         "YouAreCurrentlyUsing": "Você está usando atualmente Piwik %s.",
diff --git a/lang/ro.json b/lang/ro.json
index 05c07ba6654d355a5386afd7a2e3a24291605f3a..ce8cb604baf435eb5b31bd055dfebdee952efad3 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -145,7 +145,7 @@
         "SupportPiwik": "Susţine Piwik!",
         "ThereIsNoDataForThisReport": "Nu există date pentru acest raport.",
         "WebAnalyticsReports": "Rapoarte de analitică web",
-        "YouAreUsingTheLatestVersion_js": "FoloseÅŸti ultima versiune Piwik!"
+        "YouAreUsingTheLatestVersion": "FoloseÅŸti ultima versiune Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Acţiune",
@@ -432,7 +432,7 @@
         "GraphHelp": "Mai multe informatii despre afisarea graficelor in Piwik",
         "HelloUser": "Să trăieşti, %s!",
         "Help": "Ajutor",
-        "Hide_js": "ascunde",
+        "Hide": "ascunde",
         "HoursMinutes": "%1$s ore %2$s min",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Presupunand ca arhivarea este rapida pentru configurarea dvs., puteti rula crobtab mai frecvent",
@@ -621,7 +621,7 @@
         "ShortMonth_8_js": "Aug",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "arată",
+        "Show": "arată",
         "SmallTrafficYouCanLeaveDefault": "Pentru site-uri cu trafic mic, puteti lasa intervalul %%s secunde si accesa rapoartele in timp real.",
         "SmtpEncryption": "Encriptie SMTP",
         "SmtpPassword": "Parola SMTP",
@@ -674,7 +674,7 @@
         "YearlyReport": "anual",
         "YearlyReports": "Rapoarte anuale",
         "YearsDays": "%1$s ani %2$s zile",
-        "YearShort_js": "an",
+        "YearShort": "an",
         "Yes": "Da",
         "Yesterday": "Ieri",
         "YouAreCurrentlyUsing": "FoloseÅŸti Piwik %s.",
diff --git a/lang/ru.json b/lang/ru.json
index 38727670ce916506a3d53be4653e3e6188a78143..be6c18a207960f4b6f4a6057f90f2e3ea24e6554 100644
--- a/lang/ru.json
+++ b/lang/ru.json
@@ -178,18 +178,18 @@
         "CheckForUpdates": "Проверить на обновления",
         "CloseWidgetDirections": "Вы можете закрыть этот виджет, нажав на значок 'X' в верхней части виджета.",
         "DataForThisReportHasBeenPurged": "Данные для этого отчета хранятся более %s месяцев и были почищены.",
-        "DataTableExcludeAggregateRows_js": "Выбранные строки отображены %s Скрыть их",
-        "DataTableIncludeAggregateRows_js": "Выбранные строки скрыты %s Показать их",
+        "DataTableExcludeAggregateRows": "Выбранные строки отображены %s Скрыть их",
+        "DataTableIncludeAggregateRows": "Выбранные строки скрыты %s Показать их",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "по умолчанию",
         "DonateCall1": "Piwik всегда будет бесплатным для использования, но это не значит, что нам это ничего не стоит.",
         "DonateCall2": "Piwik нуждается в вашей постоянной поддержке, чтобы расти и процветать.",
         "DonateCall3": "Если вы думаете, что Piwik добавил существенное значение для вашего бизнеса или деятельности, %1$sпожалуйста, сделайте пожертвование!%2$s",
         "DonateFormInstructions": "Выберите ползунком нужную сумму, а затем нажмите Subscribe для пожертвования и подписки.",
-        "ExcludeRowsWithLowPopulation_js": "Все строки отображены %s Кроме низких показателей",
+        "ExcludeRowsWithLowPopulation": "Все строки отображены %s Кроме низких показателей",
         "FlattenDataTable_js": "Отчет построен по иерархии %s Сделать его более конкретным",
         "HowMuchIsPiwikWorth": "Определите стоимость Piwik для вас",
-        "IncludeRowsWithLowPopulation_js": "Строки с низкими показателями отображены %s Показать все",
+        "IncludeRowsWithLowPopulation": "Строки с низкими показателями отображены %s Показать все",
         "InjectedHostEmailBody": "Привет, попытался зайти в Piwik сегодня и столкнулся с проблемой неизвестного хоста.",
         "InjectedHostEmailSubject": "В Piwik был получен доступ по неизвестному хосту: %s",
         "InjectedHostNonSuperUserWarning": "%1$sНажмите здесь, чтобы безопасно войти в Piwik%2$s и убрать это предупреждение. Вы также можете связаться с администратором Piwik и уведомить его о проблеме (%3$sотправить ему email%4$s).",
@@ -227,7 +227,7 @@
         "UnFlattenDataTable_js": "Отчет более конкретный %s Построить его по иерархии",
         "ViewAllPiwikVideoTutorials": "Просмотреть все обучающие ролики про Piwik",
         "WebAnalyticsReports": "Отчеты веб аналитики",
-        "YouAreUsingTheLatestVersion_js": "У вас последняя версия Piwik!"
+        "YouAreUsingTheLatestVersion": "У вас последняя версия Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Действие",
@@ -550,7 +550,7 @@
         "GraphHelp": "Больше информации про отображение графиков в Веб-аналитике.",
         "HelloUser": "Привет, %s!",
         "Help": "Помощь",
-        "Hide_js": "скрыть",
+        "Hide": "скрыть",
         "HoursMinutes": "%1$s час %2$s мин",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Если архивация работает достаточно быстро в вашей установке Piwik, вы можете установить crontab на более частый запуск.",
@@ -752,7 +752,7 @@
         "ShortMonth_8_js": "Авг",
         "ShortMonth_9": "Сен",
         "ShortMonth_9_js": "Сен",
-        "Show_js": "показать",
+        "Show": "показать",
         "SingleWebsitesDashboard": "Статистика по сайту",
         "SmallTrafficYouCanLeaveDefault": "Для сайтов с небольшой нагрузкой вы можете оставить %s сек по умолчанию, и просматривать отчеты в реальном времени.",
         "SmtpEncryption": "SMTP шифрование",
@@ -808,7 +808,7 @@
         "YearlyReport": "ежегодно",
         "YearlyReports": "Ежегодные отчеты",
         "YearsDays": "%1$s г. %2$s дн.",
-        "YearShort_js": "г",
+        "YearShort": "г",
         "Yes": "Да",
         "Yesterday": "Вчера",
         "YouAreCurrentlyUsing": "Вы используете версию Piwik %s.",
diff --git a/lang/sl.json b/lang/sl.json
index 8bf76e9b5792a1c99129bb1fe1e738ac51acb3c0..e17a27e46ce331a1bb1a83bc7f0a63216aec6f29 100644
--- a/lang/sl.json
+++ b/lang/sl.json
@@ -596,7 +596,7 @@
         "YearlyReport": "letno",
         "YearlyReports": "Letna poročila",
         "YearsDays": "%1$s let %2$s dni",
-        "YearShort_js": "let",
+        "YearShort": "let",
         "Yes": "Da",
         "Yesterday": "Včeraj",
         "YouAreCurrentlyUsing": "Trenutno uporabljate Piwik %s.",
diff --git a/lang/sr.json b/lang/sr.json
index 4a57709d44eef2b065045e8c98ff650e4d98faba..1463ef3f760aaa55c8789c52179b25790bb32397 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "Proverite!",
         "CloseWidgetDirections": "Možete zatvoriti ovaj vidžet tako što ćete kliknuti na sličicu 'X' na vrhu.",
         "DataForThisReportHasBeenPurged": "Podaci za ovaj izveštaj su više od %s meseci stari te su obrisani.",
-        "DataTableExcludeAggregateRows_js": "Zbirni redovi su prikazani %s Sakrij ih",
-        "DataTableIncludeAggregateRows_js": "Zbirni redovi su sakriveni %s Prikaži ih",
+        "DataTableExcludeAggregateRows": "Zbirni redovi su prikazani %s Sakrij ih",
+        "DataTableIncludeAggregateRows": "Zbirni redovi su sakriveni %s Prikaži ih",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "podrazumevano",
         "DonateCall1": "Piwik vas nikada neće ništa koštati ali to ne znači da nas Piwik ništa ne košta dok ga pravimo.",
         "DonateCall2": "Piwiku je potrebna vaša stalna podrška kako bi rastao i napredovao.",
         "DonateCall3": "Ukoliko imate osećaj da je Piwik u znatnoj meri dodao vrednost vašem biznisu, %1$smolimo vas da razmislite o donaciji%2$s.",
         "DonateFormInstructions": "Kliknite na klizač kako biste odabrali iznos pa onda kliknite na \"subscribe\"",
-        "ExcludeRowsWithLowPopulation_js": "Svi redovi su prikazani %s Sakrij slabu populaciju",
+        "ExcludeRowsWithLowPopulation": "Svi redovi su prikazani %s Sakrij slabu populaciju",
         "FlattenDataTable_js": "Izveštaj je u hijerarhiji %s Poravnaj ga",
         "HowMuchIsPiwikWorth": "Koliko Piwik po vama vredi?",
-        "IncludeRowsWithLowPopulation_js": "Redovi sa slabom populacijom su sakriveni %s Prikaži sve redove",
+        "IncludeRowsWithLowPopulation": "Redovi sa slabom populacijom su sakriveni %s Prikaži sve redove",
         "InjectedHostEmailBody": "Pozdrav. Pokušao\/la sam da pristupim Piwik-u danas i dobio\/la upozorenje o nepoznatom nazivu hosta.",
         "InjectedHostEmailSubject": "Piwik-u je pristupljeno sa nepoznatim nazivom hosta: %s",
         "InjectedHostNonSuperUserWarning": "%1$sKliknite ovde kako biste pristupili Piwik-u bezbedno%2$s i uklonili ovo upozorenje. Takođe možete kontaktirati administratora i obavestiti ga o ovom upozorenju (%3$skliknite ovde kako biste poslali poruku%4$s).",
@@ -234,7 +234,7 @@
         "UnFlattenDataTable_js": "Izveštaj je ravan %s Prikaži hijerarhiju",
         "ViewAllPiwikVideoTutorials": "Prikaži sve Piwik video tutorijale",
         "WebAnalyticsReports": "Izveštaj web analitike",
-        "YouAreUsingTheLatestVersion_js": "Koristite poslednju verziju Piwik-a"
+        "YouAreUsingTheLatestVersion": "Koristite poslednju verziju Piwik-a"
     },
     "CorePluginsAdmin": {
         "Action": "Akcija",
@@ -563,7 +563,7 @@
         "GraphHelp": "Više informacija o prikazivanju grafikona u Piwik",
         "HelloUser": "Pozdrav, %s!",
         "Help": "Pomoć",
-        "Hide_js": "sakrij",
+        "Hide": "sakrij",
         "HoursMinutes": "%1$s sati %2$s minuti",
         "Id": "ID",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Ukoliko je arhiviranje previše brzo, možete podesiti crontab da radi češće",
@@ -767,7 +767,7 @@
         "ShortMonth_8_js": "Avg",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "prikaži",
+        "Show": "prikaži",
         "SingleWebsitesDashboard": "Jedan sajt",
         "SmallTrafficYouCanLeaveDefault": "Za sajtove sa manjim saobraćajem možete ostaviti podrazumevanih %s sekundi i pristupiti svim izveštajima u realnom vremenu",
         "SmtpEncryption": "SMTP enkripcija",
@@ -823,7 +823,7 @@
         "YearlyReport": "godišnje",
         "YearlyReports": "Godišnji izveštaji",
         "YearsDays": "%1$s godine %2$s dani",
-        "YearShort_js": "god",
+        "YearShort": "god",
         "Yes": "Da",
         "Yesterday": "Juče",
         "YouAreCurrentlyUsing": "Trenutno koristite Piwik %s.",
diff --git a/lang/sv.json b/lang/sv.json
index 078f8c3d788a9dff794d9cb1a515a1a676a92cf9..fe8b138185805aa736c8eda6c98d2ba054e54336 100644
--- a/lang/sv.json
+++ b/lang/sv.json
@@ -159,16 +159,16 @@
         "CheckPiwikOut": "Kolla in Piwik!",
         "CloseWidgetDirections": "Du kan stänga widgeten genom att klicka på (X)-ikonen på widgetens topp.",
         "DataForThisReportHasBeenPurged": "Data för denna rapport är mer än %s månader gammal och har tagits bort.",
-        "DataTableExcludeAggregateRows_js": "Aggregerade rader dolda %s Dölj dem",
-        "DataTableIncludeAggregateRows_js": "Aggregerade rader dolda %s Visa dem",
+        "DataTableExcludeAggregateRows": "Aggregerade rader dolda %s Dölj dem",
+        "DataTableIncludeAggregateRows": "Aggregerade rader dolda %s Visa dem",
         "DateFormat": "%longDay% %day% %longMonth% %longYear%",
         "Default_js": "standard",
         "DonateCall1": "Piwik kommer alltid vara gratis att använda men det innebär inte att det inte kostar något att skapa den.",
         "DonateCall2": "Piwik behöver ditt fortsatta stöd för att växa och frodas.",
-        "ExcludeRowsWithLowPopulation_js": "Alla rader visas %s Dölj rader med låga värden",
+        "ExcludeRowsWithLowPopulation": "Alla rader visas %s Dölj rader med låga värden",
         "FlattenDataTable_js": "Rapporten är hierarkisk %s Gör den plan",
         "HowMuchIsPiwikWorth": "Hur mycket är Piwik värt för dig?",
-        "IncludeRowsWithLowPopulation_js": "Rader med låga värden är dolda %s Visa alla rader",
+        "IncludeRowsWithLowPopulation": "Rader med låga värden är dolda %s Visa alla rader",
         "InjectedHostEmailBody": "Hej, jag försökte komma åt Piwik idag och stötte på varningen det okända värdnamnet.",
         "InjectedHostEmailSubject": "Piwik nåddes genom ett okänt värdnamn: %s",
         "InjectedHostNonSuperUserWarning": "%1$sKlicka här för att öppna en säker anslutning till Piwik%2$s och ta bort varningen. Du kan också kontakta administratören för Piwik angående det här problemet (%3$sklicka här för att skicka e-post%4$s).",
@@ -207,7 +207,7 @@
         "UnFlattenDataTable_js": "Rapporten är plan %s Gör den hierarkisk",
         "ViewAllPiwikVideoTutorials": "Visa alla videokurser för Piwik",
         "WebAnalyticsReports": "Webbanalys rapporter",
-        "YouAreUsingTheLatestVersion_js": "Du använder den senaste versionen av Piwik!"
+        "YouAreUsingTheLatestVersion": "Du använder den senaste versionen av Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "Handling",
@@ -536,7 +536,7 @@
         "GraphHelp": "Mer information för visning av grafer i Piwik.",
         "HelloUser": "Hej %s",
         "Help": "Hjälp",
-        "Hide_js": "dölj",
+        "Hide": "dölj",
         "HoursMinutes": "%1$s timmar %2$s min",
         "Id": "Id",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "Om arkiveringen går snabbt med din konfiguration, kan du ställa in crontab för att köra oftare.",
@@ -739,7 +739,7 @@
         "ShortMonth_8_js": "Aug",
         "ShortMonth_9": "Sep",
         "ShortMonth_9_js": "Sep",
-        "Show_js": "visa",
+        "Show": "visa",
         "SingleWebsitesDashboard": "Instrumentpanel för enkel sida",
         "SmallTrafficYouCanLeaveDefault": "För webbplatser med låg trafik så kan du lämna detta som standard (%s sekunder) och komma åt alla rapporter i realtid.",
         "SmtpEncryption": "SMTP kryptering",
@@ -794,7 +794,7 @@
         "YearlyReport": "Ã¥rsvis",
         "YearlyReports": "Ã…rsrapporter",
         "YearsDays": "%1$s år %2$s dagar",
-        "YearShort_js": "Ã¥r",
+        "YearShort": "Ã¥r",
         "Yes": "Ja",
         "Yesterday": "Igår",
         "YouAreCurrentlyUsing": "Du använder för närvarande Piwik %s.",
diff --git a/lang/ta.json b/lang/ta.json
index 5c4204dc563e026c23db1e38949991ab8af99ff1..62f632d1fc1e146f47f7f45fd5ca0766e97ddd93 100644
--- a/lang/ta.json
+++ b/lang/ta.json
@@ -227,7 +227,7 @@
         "ShortMonth_8_js": "ஆக",
         "ShortMonth_9": "செப்.",
         "ShortMonth_9_js": "செப்",
-        "Show_js": "காண்பி",
+        "Show": "காண்பி",
         "SingleWebsitesDashboard": "ஒற்றை இணையதள உதவிப்பலகை",
         "SmtpEncryption": "எஸ்எம்பிடீ மறையாக்கம்",
         "SmtpPassword": "எஸ்எம்பிடீ கடவுச்சொல்",
diff --git a/lang/th.json b/lang/th.json
index 62538d807dd6359cc8505879a644e18dc70195fc..6e68e80b1db063d451024941cadafdd3626ffaab 100644
--- a/lang/th.json
+++ b/lang/th.json
@@ -111,7 +111,7 @@
         "ThereIsNoDataForThisReport": "ไม่มีข้อมูลสำหรับรายงานนี้",
         "ViewAllPiwikVideoTutorials": "ดูคลิปวีดีโอสอน Piwik ทั้งหมด",
         "WebAnalyticsReports": "รายงานการวิเคราะห์เว็บไซต์",
-        "YouAreUsingTheLatestVersion_js": "คุณกำลังใช้งานรุ่นล่าสุดของ Piwik!"
+        "YouAreUsingTheLatestVersion": "คุณกำลังใช้งานรุ่นล่าสุดของ Piwik!"
     },
     "CorePluginsAdmin": {
         "Action": "ดำเนินการ",
@@ -402,7 +402,7 @@
         "GraphHelp": "ข้อมูลเพิ่มเติมเกี่ยวกับการแสดงกราฟใน Piwik",
         "HelloUser": "ยินดีต้อนรับ %s!",
         "Help": "วิธีใช้",
-        "Hide_js": "ซ่อน",
+        "Hide": "ซ่อน",
         "HoursMinutes": "%1$s ชั่วโมง %2$s นาที",
         "Id": "ID",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "สมมติว่าคุณเก็บอย่างรวดเร็ว สำหรับการติดตั้งนี้ คุณสามารถตั้ง crontab ในการทำงานที่บ่อยครั้ง",
@@ -575,7 +575,7 @@
         "ShortMonth_8_js": "ส.ค.",
         "ShortMonth_9": "ก.ย.",
         "ShortMonth_9_js": "ก.ย.",
-        "Show_js": "แสดง",
+        "Show": "แสดง",
         "SmallTrafficYouCanLeaveDefault": "สำหรับเว็บไซต์จราจรขนาดเล็ก คุณสามารถเริ่มต้นจาก %s วินาทีและการเข้าถึงรายงานในเวลาจริง",
         "SmtpEncryption": "เข้ารหัส SMTP",
         "SmtpPassword": "รหัสผ่าน SMTP",
@@ -623,7 +623,7 @@
         "Widgets": "วิดเจ็ต",
         "YearlyReports": "รายงาน รายปี",
         "YearsDays": "%1$s ปี %2$s วัน",
-        "YearShort_js": "ปี",
+        "YearShort": "ปี",
         "Yes": "ใช่",
         "Yesterday": "เมื่อวาน",
         "YouAreCurrentlyUsing": "คุณกำลังใช้ Piwik %s",
diff --git a/lang/tr.json b/lang/tr.json
index cb2bc15a748b102b013134e2ed40c7906b0ed9d3..3a3ccab8e2c8de53ae7eda3191f2b0529d76080c 100644
--- a/lang/tr.json
+++ b/lang/tr.json
@@ -417,7 +417,7 @@
         "GraphHelp": "Piwik'in grafikleri göstermesi hakkında daha fazla bilgi.",
         "HelloUser": "Merhaba, %s!",
         "Help": "Yardım",
-        "Hide_js": "gizle",
+        "Hide": "gizle",
         "HoursMinutes": "%1$s saat %2$s dak",
         "Id": "No",
         "Installed": "Yüklendi",
@@ -578,7 +578,7 @@
         "ShortMonth_8_js": "AÄŸu",
         "ShortMonth_9": "Eyl",
         "ShortMonth_9_js": "Eyl",
-        "Show_js": "göster",
+        "Show": "göster",
         "SmtpEncryption": "SMTP ÅŸifreleme",
         "SmtpPassword": "SMTP parolası",
         "SmtpPort": "SMTP Kapı Numarası",
diff --git a/lang/zh-cn.json b/lang/zh-cn.json
index 42ddd1c202d748b96bfb83dc973c0323680847de..5ae42eb547e0cc15fab45a6a0a2295f9e0bf9edc 100644
--- a/lang/zh-cn.json
+++ b/lang/zh-cn.json
@@ -183,18 +183,18 @@
         "CheckPiwikOut": "访问 Piwik",
         "CloseWidgetDirections": "点击右上角的 'X' 图标可关闭这个小窗口",
         "DataForThisReportHasBeenPurged": "本报表数据超过 %s 个月已被清空。",
-        "DataTableExcludeAggregateRows_js": "汇总行已显示 %s 隐藏汇总",
-        "DataTableIncludeAggregateRows_js": "汇总行已隐藏 %s 显示汇总",
+        "DataTableExcludeAggregateRows": "汇总行已显示 %s 隐藏汇总",
+        "DataTableIncludeAggregateRows": "汇总行已隐藏 %s 显示汇总",
         "DateFormat": "%longDay% %longYear% %longMonth% %day%",
         "Default_js": "默认",
         "DonateCall1": "Piwik 对您来说可以免费使用，但对我们来说并非零成本。",
         "DonateCall2": "Piwik 需要您的不断支持来发展壮大",
         "DonateCall3": "如果 Piwik 对您的业务有很大帮助，%1$s 请考虑捐助!%2$s",
         "DonateFormInstructions": "点击下面的滑动条设定金额，然后点 Subscribe 按钮捐款",
-        "ExcludeRowsWithLowPopulation_js": "显示了所有的数据 %s 不显示低密度数据",
+        "ExcludeRowsWithLowPopulation": "显示了所有的数据 %s 不显示低密度数据",
         "FlattenDataTable_js": "本报表已分级显示 %s 改为不分级显示",
         "HowMuchIsPiwikWorth": "您觉得 Piwik 值多少?",
-        "IncludeRowsWithLowPopulation_js": "没有显示低密度数据 %s 显示所有数据",
+        "IncludeRowsWithLowPopulation": "没有显示低密度数据 %s 显示所有数据",
         "InjectedHostEmailBody": "您好，我今天访问 Piwik 时遇到未知主机名的警告。",
         "InjectedHostEmailSubject": "访问 Piwik 的主机名未知: %s",
         "InjectedHostNonSuperUserWarning": "%1$s点这里安全访问 Piwik %2$s 并关闭警告。您可以联系 Piwik 管理员并报告这个问题 (%3$s点这里发邮件%4$s)。",
@@ -232,7 +232,7 @@
         "UnFlattenDataTable_js": "本报表不分级显示 %s 改为分级显示",
         "ViewAllPiwikVideoTutorials": "查看所有的 Piwik 视频教程",
         "WebAnalyticsReports": "网站分析报表",
-        "YouAreUsingTheLatestVersion_js": "您正在使用最新版的 Piwik！"
+        "YouAreUsingTheLatestVersion": "您正在使用最新版的 Piwik！"
     },
     "CorePluginsAdmin": {
         "Action": "操作",
@@ -566,7 +566,7 @@
         "GraphHelp": "更多关于 Piwik 显示图表的资讯",
         "HelloUser": "您好，%s！",
         "Help": "帮助",
-        "Hide_js": "隐藏",
+        "Hide": "隐藏",
         "HoursMinutes": "%1$s 小时 %2$s 分",
         "Id": "序号",
         "IfArchivingIsFastYouCanSetupCronRunMoreOften": "如果在当前配置下处理速度很快，您可以设置让自动脚本更频繁执行。",
@@ -769,7 +769,7 @@
         "ShortMonth_8_js": "8",
         "ShortMonth_9": "9月",
         "ShortMonth_9_js": "9",
-        "Show_js": "显示",
+        "Show": "显示",
         "SingleWebsitesDashboard": "单个网站报表",
         "SmallTrafficYouCanLeaveDefault": "对于低流量的网站，可以使用默认的%s秒，实时处理所有报表。",
         "SmtpEncryption": "SMTP 加密",
@@ -825,7 +825,7 @@
         "YearlyReport": "每年",
         "YearlyReports": "年报",
         "YearsDays": "%1$s 年 %2$s 天",
-        "YearShort_js": "å¹´",
+        "YearShort": "å¹´",
         "Yes": "是",
         "Yesterday": "昨天",
         "YouAreCurrentlyUsing": "您正在使用 Piwik %s.",
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index 3c9c44d447d0519f83b3f2ca47cd8f0e64508fe7..078a62afeb633bdbd80e9560c76af7c97f8b3c20 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -36,7 +36,7 @@
         <tr>
             <th>{{ 'General_Options'|translate }}</th>
             <th>{{ 'Mobile_Advanced'|translate }}
-                <a href="#" class="section-toggler-link" data-section-id="javascript-advanced-options">({{ 'General_Show_js'|translate }})</a>
+                <a href="#" class="section-toggler-link" data-section-id="javascript-advanced-options">({{ 'General_Show'|translate }})</a>
             </th>
         </tr>
         <tr>
@@ -206,7 +206,7 @@
             <th>{{ 'General_Options'|translate }}</th>
             <th>{{ 'Mobile_Advanced'|translate }}
                 <a href="#" class="section-toggler-link" data-section-id="image-tracker-advanced-options">
-                    ({{ 'General_Show_js'|translate }})
+                    ({{ 'General_Show'|translate }})
                 </a>
             </th>
         </tr>
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 13591bd21a08824d35a50a64305bac573b9f4a8a..f6f1a5a3a3282efa12f0d2bcefbd6d0b808543b9 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -95,5 +95,13 @@ class CoreHome extends \Piwik\Plugin
     {
         $translationKeys[] = 'General_InvalidDateRange';
         $translationKeys[] = 'General_Loading';
+        $translationKeys[] = 'General_Show';
+        $translationKeys[] = 'General_Hide';
+        $translationKeys[] = 'General_YearShort';
+        $translationKeys[] = 'CoreHome_YouAreUsingTheLatestVersion';
+        $translationKeys[] = 'CoreHome_IncludeRowsWithLowPopulation';
+        $translationKeys[] = 'CoreHome_ExcludeRowsWithLowPopulation';
+        $translationKeys[] = 'CoreHome_DataTableIncludeAggregateRows';
+        $translationKeys[] = 'CoreHome_DataTableExcludeAggregateRows';
     }
 }
\ No newline at end of file
diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js
index b80b54e57ac6396df1e12bd0138d48f534357269..bfc7d79b78d2bc0c7108e4b8327e65971b1460df 100755
--- a/plugins/CoreHome/javascripts/corehome.js
+++ b/plugins/CoreHome/javascripts/corehome.js
@@ -36,7 +36,7 @@
                         headerMessage.replaceWith(response);
                     }
                     else {
-                        headerMessage.html(_pk_translate('CoreHome_YouAreUsingTheLatestVersion_js')).show();
+                        headerMessage.html(_pk_translate('CoreHome_YouAreUsingTheLatestVersion')).show();
                         setTimeout(function () {
                             headerMessage.fadeOut('slow', function () {
                                 headerMessage.replaceWith(response);
@@ -65,8 +65,8 @@
         var handleSectionToggle = function (self, showType, doHide) {
             var sectionId = $(self).attr('data-section-id'),
                 section = $('#' + sectionId),
-                showText = _pk_translate('General_Show_js'),
-                hideText = _pk_translate('General_Hide_js');
+                showText = _pk_translate('General_Show'),
+                hideText = _pk_translate('General_Hide');
 
             if (typeof(doHide) == 'undefined') {
                 doHide = section.is(':visible');
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index bdbaccb8e2b257d4cc83b357916417bea3af4bad..3bcae5609fd4e6704db5dba7c1e71652218a72be 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -988,12 +988,12 @@ dataTable.prototype =
                     self.param.enable_filter_excludelowpop = 0;
                 }
                 if (Number(self.param.enable_filter_excludelowpop) != 0) {
-                    var string = getText('CoreHome_IncludeRowsWithLowPopulation_js', true);
+                    var string = getText('CoreHome_IncludeRowsWithLowPopulation', true);
                     self.param.enable_filter_excludelowpop = 1;
                     iconHighlighted = true;
                 }
                 else {
-                    var string = getText('CoreHome_ExcludeRowsWithLowPopulation_js');
+                    var string = getText('CoreHome_ExcludeRowsWithLowPopulation');
                     self.param.enable_filter_excludelowpop = 0;
                 }
                 $(this).html(string);
@@ -1009,8 +1009,8 @@ dataTable.prototype =
 
         $('.dataTableIncludeAggregateRows', domElem)
             .each(function () {
-                setText(this, 'include_aggregate_rows', 'CoreHome_DataTableExcludeAggregateRows_js',
-                    'CoreHome_DataTableIncludeAggregateRows_js');
+                setText(this, 'include_aggregate_rows', 'CoreHome_DataTableExcludeAggregateRows',
+                    'CoreHome_DataTableIncludeAggregateRows');
             })
             .click(generateClickCallback('include_aggregate_rows', function () {
                 if (self.param.include_aggregate_rows == 1) {
diff --git a/plugins/CoreHome/javascripts/donate.js b/plugins/CoreHome/javascripts/donate.js
index bd540109da6c0f8b33ed42c09267f24fae72e111..5d5fdeb33ff056a17d096b2cf30ae64ba4c453af 100755
--- a/plugins/CoreHome/javascripts/donate.js
+++ b/plugins/CoreHome/javascripts/donate.js
@@ -24,7 +24,7 @@
         // set's the correct amount text & smiley face image based on the position of the slider
         var setSmileyFaceAndAmount = function (slider, pos) {
             // set text yearly amount
-            $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort_js'));
+            $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort'));
 
             // set the right smiley face
             $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/images/smileyprog_' + pos + '.png');
diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig
index 5209a579fc8cc35006378bb4c3b102eb315902d8..3140999feda7a0014369cb965b858f982da72e36 100755
--- a/plugins/CoreHome/templates/_donate.twig
+++ b/plugins/CoreHome/templates/_donate.twig
@@ -24,7 +24,7 @@
                 <div class="slider-position"></div>
             </div>
             <div style="display:inline-block;">
-                <div class="slider-donate-amount">$30/{{ 'General_YearShort_js'|translate }}</div>
+                <div class="slider-donate-amount">$30/{{ 'General_YearShort'|translate }}</div>
 
                 <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
             </div>
diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig
index 0d7babbd6ddcd6534a89869127814abb9c42e926..b8e631ceb3504280d7465d3103411ac5b3526f1f 100644
--- a/plugins/Referers/templates/index.twig
+++ b/plugins/Referers/templates/index.twig
@@ -52,7 +52,7 @@
         <br/>
 
         <h2>{{ 'General_MoreDetails'|translate }}&nbsp;
-            <a href="#" class="section-toggler-link" data-section-id="distinctReferrersByType">({{ 'General_Show_js'|translate }})</a>
+            <a href="#" class="section-toggler-link" data-section-id="distinctReferrersByType">({{ 'General_Show'|translate }})</a>
         </h2>
     </div>