[tx-robot] updated from transifex

122 files changed, 12 insertions, 294 deletions

diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index a1e7649b925..6e6ef7c4c46 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -44,7 +44,6 @@ OC.L10N.register(
     "Yes" : "Ja",
     "Choose" : "Kies",
     "Ok" : "OK",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "One file conflict" : "Een lêer konflik",
     "New Files" : "Nuwe lêers",
     "Already existing files" : "Bestaande lêers",
@@ -86,13 +85,11 @@ OC.L10N.register(
     "Warning" : "Waarskuwing",
     "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
     "Add" : "Voeg by",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
     "New password" : "Nuwe wagwoord",
     "Reset password" : "Herstel wagwoord",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Persoonlik",
     "Users" : "Gebruikers",
     "Apps" : "Toepassings",
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index c2e6b148ae5..c6c41e0dd11 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -42,7 +42,6 @@
     "Yes" : "Ja",
     "Choose" : "Kies",
     "Ok" : "OK",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "One file conflict" : "Een lêer konflik",
     "New Files" : "Nuwe lêers",
     "Already existing files" : "Bestaande lêers",
@@ -84,13 +83,11 @@
     "Warning" : "Waarskuwing",
     "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
     "Add" : "Voeg by",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
     "New password" : "Nuwe wagwoord",
     "Reset password" : "Herstel wagwoord",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Persoonlik",
     "Users" : "Gebruikers",
     "Apps" : "Toepassings",
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index 40f6d871b08..a5de135bbff 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -33,7 +33,6 @@ OC.L10N.register(
     "Choose" : "اختيار",
     "Ok" : "موافق",
     "read-only" : "قراءة فقط",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
     "New Files" : "ملفات جديدة",
     "Already existing files" : "المفات موجودة مسبقاً",
     "Which files do you want to keep?" : "ماهي الملفات التي ترغب في إبقاءها ؟",
@@ -88,13 +87,11 @@ OC.L10N.register(
     "Enter new" : "إدخال جديد",
     "Delete" : "إلغاء",
     "Add" : "اضف",
-    "_download %n file_::_download %n files_" : ["","","","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
     "New password" : "كلمات سر جديدة",
     "Reset password" : "تعديل كلمة السر",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","","","",""],
     "Personal" : "شخصي",
     "Users" : "المستخدمين",
     "Apps" : "التطبيقات",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index e9ca9bf366f..10f39fdbeb4 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -31,7 +31,6 @@
     "Choose" : "اختيار",
     "Ok" : "موافق",
     "read-only" : "قراءة فقط",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
     "New Files" : "ملفات جديدة",
     "Already existing files" : "المفات موجودة مسبقاً",
     "Which files do you want to keep?" : "ماهي الملفات التي ترغب في إبقاءها ؟",
@@ -86,13 +85,11 @@
     "Enter new" : "إدخال جديد",
     "Delete" : "إلغاء",
     "Add" : "اضف",
-    "_download %n file_::_download %n files_" : ["","","","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
     "New password" : "كلمات سر جديدة",
     "Reset password" : "تعديل كلمة السر",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","","","",""],
     "Personal" : "شخصي",
     "Users" : "المستخدمين",
     "Apps" : "التطبيقات",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index 3151227e440..baf953b7be8 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -104,7 +104,6 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetes",
     "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
     "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
     "Please reload the page." : "Por favor, recarga la páxina",
     "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
@@ -116,7 +115,6 @@ OC.L10N.register(
     "New password" : "Contraseña nueva",
     "New Password" : "Contraseña nueva",
     "Reset password" : "Restablecer contraseña",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 56f1b2be642..ff7d10c2e0e 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -102,7 +102,6 @@
     "Edit tags" : "Editar etiquetes",
     "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
     "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
     "Please reload the page." : "Por favor, recarga la páxina",
     "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
@@ -114,7 +113,6 @@
     "New password" : "Contraseña nueva",
     "New Password" : "Contraseña nueva",
     "Reset password" : "Restablecer contraseña",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index 0b71c440759..7b5e004a12a 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -34,7 +34,6 @@ OC.L10N.register(
     "Yes" : "Bəli",
     "Choose" : "Seç",
     "Ok" : "Oldu",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Dayandır",
     "Very weak password" : "Çox asan şifrə",
     "Weak password" : "Asan şifrə",
@@ -56,9 +55,7 @@ OC.L10N.register(
     "Warning" : "Xəbərdarlıq",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "Yeni şifrə",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Şəxsi",
     "Users" : "İstifadəçilər",
     "Admin" : "İnzibatçı",
diff --git a/core/l10n/az.json b/core/l10n/az.json
index 3eef33835ac..d6ed10f0fb1 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -32,7 +32,6 @@
     "Yes" : "Bəli",
     "Choose" : "Seç",
     "Ok" : "Oldu",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Dayandır",
     "Very weak password" : "Çox asan şifrə",
     "Weak password" : "Asan şifrə",
@@ -54,9 +53,7 @@
     "Warning" : "Xəbərdarlıq",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "Yeni şifrə",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Şəxsi",
     "Users" : "İstifadəçilər",
     "Admin" : "İnzibatçı",
diff --git a/core/l10n/be.js b/core/l10n/be.js
index e95df95f284..a5ed364dc51 100644
--- a/core/l10n/be.js
+++ b/core/l10n/be.js
@@ -25,11 +25,8 @@ OC.L10N.register(
     "Yes" : "Так",
     "Choose" : "Выбар",
     "Ok" : "Добра",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
     "Error" : "Памылка",
     "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
-    "_download %n file_::_download %n files_" : ["","","",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","",""],
     "Finish setup" : "Завяршыць ўстаноўку."
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/be.json b/core/l10n/be.json
index bc77754270a..1c65371e88c 100644
--- a/core/l10n/be.json
+++ b/core/l10n/be.json
@@ -23,11 +23,8 @@
     "Yes" : "Так",
     "Choose" : "Выбар",
     "Ok" : "Добра",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
     "Error" : "Памылка",
     "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
-    "_download %n file_::_download %n files_" : ["","","",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","",""],
     "Finish setup" : "Завяршыць ўстаноўку."
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index 1fff5530a73..990e6cd456b 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -76,13 +76,11 @@ OC.L10N.register(
     "Delete" : "মুছে",
     "Add" : "যোগ কর",
     "Edit tags" : "ট্যাগ সম্পাদনা",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
     "New password" : "নতুন কূটশব্দ",
     "New Password" : "নতুন কূটশব্দ",
     "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "ব্যক্তিগত",
     "Users" : "ব্যবহারকারী",
     "Apps" : "অ্যাপ",
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 6ce95ab28a6..34e59d4e974 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -74,13 +74,11 @@
     "Delete" : "মুছে",
     "Add" : "যোগ কর",
     "Edit tags" : "ট্যাগ সম্পাদনা",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
     "New password" : "নতুন কূটশব্দ",
     "New Password" : "নতুন কূটশব্দ",
     "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "ব্যক্তিগত",
     "Users" : "ব্যবহারকারী",
     "Apps" : "অ্যাপ",
diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js
index 9e4c7b4046c..69c51dab414 100644
--- a/core/l10n/bn_IN.js
+++ b/core/l10n/bn_IN.js
@@ -3,15 +3,12 @@ OC.L10N.register(
     {
     "Settings" : "সেটিংস",
     "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "বাতিল করা",
     "Share" : "শেয়ার",
     "Error" : "ভুল",
     "Warning" : "সতর্কীকরণ",
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Username" : "ইউজারনেম",
     "Search" : "অনুসন্ধান"
 },
diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json
index 186e41b1b21..f0f53afe5ad 100644
--- a/core/l10n/bn_IN.json
+++ b/core/l10n/bn_IN.json
@@ -1,15 +1,12 @@
 { "translations": {
     "Settings" : "সেটিংস",
     "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "বাতিল করা",
     "Share" : "শেয়ার",
     "Error" : "ভুল",
     "Warning" : "সতর্কীকরণ",
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Username" : "ইউজারনেম",
     "Search" : "অনুসন্ধান"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index e84498c554a..f19ad1a2e1b 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -45,7 +45,6 @@ OC.L10N.register(
     "Ok" : "Ok",
     "Error loading message template: {error}" : "Pogrešno učitavanje šablona za poruke: {error}",
     "read-only" : "samo-čitljivo",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "One file conflict" : "Konflikt jedne datoteke",
     "New Files" : "Nove datoteke",
     "Already existing files" : "Postojeće datoteke",
@@ -114,7 +113,6 @@ OC.L10N.register(
     "Hello world!" : "Halo svijete!",
     "sunny" : "sunčan",
     "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}",
-    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molim, ponovno učitajte stranicu",
     "The update was unsuccessful. " : "Ažuriranje nije uspjelo.",
@@ -127,7 +125,6 @@ OC.L10N.register(
     "New password" : "Nova lozinka",
     "New Password" : "Nova Lozinka",
     "Reset password" : "Resetuj lozinku",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Osobno",
     "Users" : "Korisnici",
     "Apps" : "Aplikacije",
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index ce9c1479f99..c13453afa21 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -43,7 +43,6 @@
     "Ok" : "Ok",
     "Error loading message template: {error}" : "Pogrešno učitavanje šablona za poruke: {error}",
     "read-only" : "samo-čitljivo",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "One file conflict" : "Konflikt jedne datoteke",
     "New Files" : "Nove datoteke",
     "Already existing files" : "Postojeće datoteke",
@@ -112,7 +111,6 @@
     "Hello world!" : "Halo svijete!",
     "sunny" : "sunčan",
     "Hello {name}, the weather is {weather}" : "Halo {name}, vrijeme je {weather}",
-    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Ažuriranje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molim, ponovno učitajte stranicu",
     "The update was unsuccessful. " : "Ažuriranje nije uspjelo.",
@@ -125,7 +123,6 @@
     "New password" : "Nova lozinka",
     "New Password" : "Nova Lozinka",
     "Reset password" : "Resetuj lozinku",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Osobno",
     "Users" : "Korisnici",
     "Apps" : "Aplikacije",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index 8d24afb3df6..59219a671cc 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
     "Ok" : "Iawn",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
     "Cancel" : "Diddymu",
     "Shared" : "Rhannwyd",
     "Share" : "Rhannu",
@@ -59,12 +58,10 @@ OC.L10N.register(
     "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
     "Delete" : "Dileu",
     "Add" : "Ychwanegu",
-    "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
     "New password" : "Cyfrinair newydd",
     "Reset password" : "Ailosod cyfrinair",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","",""],
     "Personal" : "Personol",
     "Users" : "Defnyddwyr",
     "Apps" : "Pecynnau",
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index 687dad85c2a..0fc86a7f4e3 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -24,7 +24,6 @@
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
     "Ok" : "Iawn",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
     "Cancel" : "Diddymu",
     "Shared" : "Rhannwyd",
     "Share" : "Rhannu",
@@ -57,12 +56,10 @@
     "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
     "Delete" : "Dileu",
     "Add" : "Ychwanegu",
-    "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
     "New password" : "Cyfrinair newydd",
     "Reset password" : "Ailosod cyfrinair",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","",""],
     "Personal" : "Personol",
     "Users" : "Defnyddwyr",
     "Apps" : "Pecynnau",
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
index 6360bbb6253..360ddbeae90 100644
--- a/core/l10n/de_AT.js
+++ b/core/l10n/de_AT.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Abbrechen",
     "Continue" : "Weiter",
     "Share" : "Freigeben",
@@ -33,8 +32,6 @@ OC.L10N.register(
     "can edit" : "kann bearbeiten",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Persönlich",
     "Help" : "Hilfe"
 },
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
index 21cb4b16102..5acbc0a888f 100644
--- a/core/l10n/de_AT.json
+++ b/core/l10n/de_AT.json
@@ -19,7 +19,6 @@
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Abbrechen",
     "Continue" : "Weiter",
     "Share" : "Freigeben",
@@ -31,8 +30,6 @@
     "can edit" : "kann bearbeiten",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Persönlich",
     "Help" : "Hilfe"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js
index 5a383c104cb..a95205b439b 100644
--- a/core/l10n/de_CH.js
+++ b/core/l10n/de_CH.js
@@ -30,7 +30,6 @@ OC.L10N.register(
     "Yes" : "Ja",
     "Choose" : "Auswählen",
     "Ok" : "OK",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "New Files" : "Neue Dateien",
     "Cancel" : "Abbrechen",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
@@ -67,7 +66,6 @@ OC.L10N.register(
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
diff --git a/core/l10n/de_CH.json b/core/l10n/de_CH.json
index aa69c7355e0..8d84ade00cd 100644
--- a/core/l10n/de_CH.json
+++ b/core/l10n/de_CH.json
@@ -28,7 +28,6 @@
     "Yes" : "Ja",
     "Choose" : "Auswählen",
     "Ok" : "OK",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "New Files" : "Neue Dateien",
     "Cancel" : "Abbrechen",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
@@ -65,7 +64,6 @@
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
diff --git a/core/l10n/en@pirate.js b/core/l10n/en@pirate.js
index 6a402a35323..adc62c8c962 100644
--- a/core/l10n/en@pirate.js
+++ b/core/l10n/en@pirate.js
@@ -1,9 +1,6 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Password" : "Passcode",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Password" : "Passcode"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en@pirate.json b/core/l10n/en@pirate.json
index fff4266c5da..6f74658eb82 100644
--- a/core/l10n/en@pirate.json
+++ b/core/l10n/en@pirate.json
@@ -1,7 +1,4 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Password" : "Passcode",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Password" : "Passcode"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index 5a976068a16..96525cb5723 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -81,13 +81,11 @@ OC.L10N.register(
     "Add" : "Aldoni",
     "Edit tags" : "Redakti etikedojn",
     "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
     "New password" : "Nova pasvorto",
     "Reset password" : "Rekomenci la pasvorton",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Persona",
     "Users" : "Uzantoj",
     "Apps" : "Aplikaĵoj",
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index bf5f2bbb69c..4eaa7845ef3 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -79,13 +79,11 @@
     "Add" : "Aldoni",
     "Edit tags" : "Redakti etikedojn",
     "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
     "New password" : "Nova pasvorto",
     "Reset password" : "Rekomenci la pasvorton",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Persona",
     "Users" : "Uzantoj",
     "Apps" : "Aplikaĵoj",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index bf58122b2df..207bfa1ed8e 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -171,6 +171,7 @@ OC.L10N.register(
     "Technical details" : "Detalles técnicos",
     "Remote Address: %s" : "Dirección remota: %s",
     "Request ID: %s" : "ID de la solicitud: %s",
+    "Type: %s" : "Tipo: %s",
     "Code: %s" : "Código: %s",
     "Message: %s" : "Mensaje: %s",
     "File: %s" : "Archivo: %s",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 2aedc25d61d..63911646f44 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -169,6 +169,7 @@
     "Technical details" : "Detalles técnicos",
     "Remote Address: %s" : "Dirección remota: %s",
     "Request ID: %s" : "ID de la solicitud: %s",
+    "Type: %s" : "Tipo: %s",
     "Code: %s" : "Código: %s",
     "Message: %s" : "Mensaje: %s",
     "File: %s" : "Archivo: %s",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index 14b10e67899..2707d446766 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -92,14 +92,12 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
     "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Por favor, recargue la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
     "New password" : "Nueva contraseña:",
     "Reset password" : "Restablecer contraseña",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Apps",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 10dfc88803a..f995dbbb8b7 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -90,14 +90,12 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
     "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Por favor, recargue la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
     "New password" : "Nueva contraseña:",
     "Reset password" : "Restablecer contraseña",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Apps",
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
index f915955b18b..e143b3cb08e 100644
--- a/core/l10n/es_CL.js
+++ b/core/l10n/es_CL.js
@@ -27,7 +27,6 @@ OC.L10N.register(
     "Yes" : "Si",
     "Choose" : "Choose",
     "Ok" : "Ok",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Cancelar",
     "Shared" : "Compartido",
     "Share" : "Compartir",
@@ -37,8 +36,6 @@ OC.L10N.register(
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "Password" : "Clave",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Admin" : "Administración",
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
index 0fbd3ac4609..996aeb75ac7 100644
--- a/core/l10n/es_CL.json
+++ b/core/l10n/es_CL.json
@@ -25,7 +25,6 @@
     "Yes" : "Si",
     "Choose" : "Choose",
     "Ok" : "Ok",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Cancelar",
     "Shared" : "Compartido",
     "Share" : "Compartir",
@@ -35,8 +34,6 @@
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "Password" : "Clave",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Admin" : "Administración",
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 7cd5f989f95..16f55486397 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -86,14 +86,12 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Vuelva a cargar la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
     "New password" : "Nueva contraseña",
     "Reset password" : "Restablecer contraseña",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index d5dd6de56d4..4f7ce4d2612 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -84,14 +84,12 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Vuelva a cargar la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
     "New password" : "Nueva contraseña",
     "Reset password" : "Restablecer contraseña",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 7ca18bbb023..28fa21902f3 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -122,7 +122,6 @@ OC.L10N.register(
     "New password" : "Uus parool",
     "New Password" : "Uus parool",
     "Reset password" : "Nulli parool",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
     "Apps" : "Rakendused",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 9b8f5c9b356..e1f66362a17 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -120,7 +120,6 @@
     "New password" : "Uus parool",
     "New Password" : "Uus parool",
     "Reset password" : "Nulli parool",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Isiklik",
     "Users" : "Kasutajad",
     "Apps" : "Rakendused",
diff --git a/core/l10n/eu_ES.js b/core/l10n/eu_ES.js
index e1895b17f86..847f4cc5da0 100644
--- a/core/l10n/eu_ES.js
+++ b/core/l10n/eu_ES.js
@@ -1,10 +1,8 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Ezeztatu",
     "Delete" : "Ezabatu",
-    "_download %n file_::_download %n files_" : ["",""],
     "Personal" : "Pertsonala"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu_ES.json b/core/l10n/eu_ES.json
index 7f28faebc14..0f7c86a7b9e 100644
--- a/core/l10n/eu_ES.json
+++ b/core/l10n/eu_ES.json
@@ -1,8 +1,6 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Ezeztatu",
     "Delete" : "Ezabatu",
-    "_download %n file_::_download %n files_" : ["",""],
     "Personal" : "Pertsonala"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index 834bf276874..cc4de38d724 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -41,7 +41,6 @@ OC.L10N.register(
     "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
     "Ok" : "قبول",
     "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "One file conflict" : "یک فایل متضاد",
     "New Files" : "فایل های جدید",
     "Already existing files" : "فایل های موجود در حال حاضر ",
@@ -94,12 +93,10 @@ OC.L10N.register(
     "Delete" : "حذف",
     "Add" : "افزودن",
     "Edit tags" : "ویرایش تگ ها",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
     "New password" : "گذرواژه جدید",
     "Reset password" : "تنظیم مجدد رمز عبور",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Apps" : "  برنامه ها",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index b25e1ce61f2..f83b75a5eae 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -39,7 +39,6 @@
     "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
     "Ok" : "قبول",
     "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "One file conflict" : "یک فایل متضاد",
     "New Files" : "فایل های جدید",
     "Already existing files" : "فایل های موجود در حال حاضر ",
@@ -92,12 +91,10 @@
     "Delete" : "حذف",
     "Add" : "افزودن",
     "Edit tags" : "ویرایش تگ ها",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
     "New password" : "گذرواژه جدید",
     "Reset password" : "تنظیم مجدد رمز عبور",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Apps" : "  برنامه ها",
diff --git a/core/l10n/fi.js b/core/l10n/fi.js
index 96793fe434e..84301350b9b 100644
--- a/core/l10n/fi.js
+++ b/core/l10n/fi.js
@@ -5,14 +5,12 @@ OC.L10N.register(
     "No" : "EI",
     "Yes" : "KYLLÄ",
     "Choose" : "Valitse",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Peruuta",
     "Error" : "Virhe",
     "Share link" : "Jaa linkki",
     "Password" : "Salasana",
     "Delete" : "Poista",
     "Add" : "Lisää",
-    "_download %n file_::_download %n files_" : ["",""],
     "Help" : "Apua",
     "Username" : "Käyttäjätunnus",
     "Log in" : "Kirjaudu sisään"
diff --git a/core/l10n/fi.json b/core/l10n/fi.json
index ab23e1e7e9f..d9a8d572f51 100644
--- a/core/l10n/fi.json
+++ b/core/l10n/fi.json
@@ -3,14 +3,12 @@
     "No" : "EI",
     "Yes" : "KYLLÄ",
     "Choose" : "Valitse",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Peruuta",
     "Error" : "Virhe",
     "Share link" : "Jaa linkki",
     "Password" : "Salasana",
     "Delete" : "Poista",
     "Add" : "Lisää",
-    "_download %n file_::_download %n files_" : ["",""],
     "Help" : "Apua",
     "Username" : "Käyttäjätunnus",
     "Log in" : "Kirjaudu sisään"
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 3908a0e372e..06c079fc19e 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "כן",
     "Choose" : "בחירה",
     "Ok" : "בסדר",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "New Files" : "קבצים חדשים",
     "Cancel" : "ביטול",
     "Shared" : "שותף",
@@ -62,12 +61,10 @@ OC.L10N.register(
     "The object type is not specified." : "סוג הפריט לא צוין.",
     "Delete" : "מחיקה",
     "Add" : "הוספה",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
     "New password" : "ססמה חדשה",
     "Reset password" : "איפוס ססמה",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "אישי",
     "Users" : "משתמשים",
     "Apps" : "יישומים",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 988e193b015..8e584f38d05 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -24,7 +24,6 @@
     "Yes" : "כן",
     "Choose" : "בחירה",
     "Ok" : "בסדר",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "New Files" : "קבצים חדשים",
     "Cancel" : "ביטול",
     "Shared" : "שותף",
@@ -60,12 +59,10 @@
     "The object type is not specified." : "סוג הפריט לא צוין.",
     "Delete" : "מחיקה",
     "Add" : "הוספה",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
     "New password" : "ססמה חדשה",
     "Reset password" : "איפוס ססמה",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "אישי",
     "Users" : "משתמשים",
     "Apps" : "יישומים",
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
index bc4eba4e83e..91c1b36294c 100644
--- a/core/l10n/hi.js
+++ b/core/l10n/hi.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "दिसम्बर",
     "Settings" : "सेटिंग्स",
     "Saving..." : "सहेज रहे हैं...",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "रद्द करें ",
     "Share" : "साझा करें",
     "Error" : "त्रुटि",
@@ -32,10 +31,8 @@ OC.L10N.register(
     "Email sent" : "ईमेल भेज दिया गया है ",
     "Warning" : "चेतावनी ",
     "Add" : "डाले",
-    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
     "New password" : "नया पासवर्ड",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "यक्तिगत",
     "Users" : "उपयोगकर्ता",
     "Apps" : "Apps",
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
index 80926b9b190..77d6c9a71e4 100644
--- a/core/l10n/hi.json
+++ b/core/l10n/hi.json
@@ -20,7 +20,6 @@
     "December" : "दिसम्बर",
     "Settings" : "सेटिंग्स",
     "Saving..." : "सहेज रहे हैं...",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "रद्द करें ",
     "Share" : "साझा करें",
     "Error" : "त्रुटि",
@@ -30,10 +29,8 @@
     "Email sent" : "ईमेल भेज दिया गया है ",
     "Warning" : "चेतावनी ",
     "Add" : "डाले",
-    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
     "New password" : "नया पासवर्ड",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "यक्तिगत",
     "Users" : "उपयोगकर्ता",
     "Apps" : "Apps",
diff --git a/core/l10n/hy.js b/core/l10n/hy.js
index fc37a9be206..bebec67e8a2 100644
--- a/core/l10n/hy.js
+++ b/core/l10n/hy.js
@@ -20,9 +20,6 @@ OC.L10N.register(
     "October" : "Հոկտեմբեր",
     "November" : "Նոյեմբեր",
     "December" : "Դեկտեմբեր",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Delete" : "Ջնջել",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Delete" : "Ջնջել"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hy.json b/core/l10n/hy.json
index 342ea522cf2..819972fdba5 100644
--- a/core/l10n/hy.json
+++ b/core/l10n/hy.json
@@ -18,9 +18,6 @@
     "October" : "Հոկտեմբեր",
     "November" : "Նոյեմբեր",
     "December" : "Դեկտեմբեր",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Delete" : "Ջնջել",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Delete" : "Ջնջել"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index 8362076165a..5f7df68fdbc 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -94,7 +94,6 @@ OC.L10N.register(
     "Delete" : "Deler",
     "Add" : "Adder",
     "Edit tags" : "Modifica etiquettas",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Pro favor recarga le pagina.",
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
     "%s password reset" : "%s contrasigno re-fixate",
@@ -102,7 +101,6 @@ OC.L10N.register(
     "New password" : "Nove contrasigno",
     "New Password" : "Nove contrasigno",
     "Reset password" : "Reinitialisar contrasigno",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usatores",
     "Apps" : "Applicationes",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index ab325860b19..1063be8af1f 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -92,7 +92,6 @@
     "Delete" : "Deler",
     "Add" : "Adder",
     "Edit tags" : "Modifica etiquettas",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Pro favor recarga le pagina.",
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
     "%s password reset" : "%s contrasigno re-fixate",
@@ -100,7 +99,6 @@
     "New password" : "Nove contrasigno",
     "New Password" : "Nove contrasigno",
     "Reset password" : "Reinitialisar contrasigno",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usatores",
     "Apps" : "Applicationes",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 0764e72cdfe..de1cd53ac1a 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "Já",
     "Choose" : "Veldu",
     "Ok" : "Í lagi",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Hætta við",
     "Shared" : "Deilt",
     "Share" : "Deila",
@@ -58,12 +57,10 @@ OC.L10N.register(
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Delete" : "Eyða",
     "Add" : "Bæta við",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
     "New password" : "Nýtt lykilorð",
     "Reset password" : "Endursetja lykilorð",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 1789d6358bc..e3b3c3a7a2c 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -24,7 +24,6 @@
     "Yes" : "Já",
     "Choose" : "Veldu",
     "Ok" : "Í lagi",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Hætta við",
     "Shared" : "Deilt",
     "Share" : "Deila",
@@ -56,12 +55,10 @@
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Delete" : "Eyða",
     "Add" : "Bæta við",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
     "New password" : "Nýtt lykilorð",
     "Reset password" : "Endursetja lykilorð",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index d87f7dfcc48..bcb36086514 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "კი",
     "Choose" : "არჩევა",
     "Ok" : "დიახ",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "New Files" : "ახალი ფაილები",
     "Cancel" : "უარყოფა",
     "Shared" : "გაზიარებული",
@@ -61,12 +60,10 @@ OC.L10N.register(
     "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
     "Delete" : "წაშლა",
     "Add" : "დამატება",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
     "New password" : "ახალი პაროლი",
     "Reset password" : "პაროლის შეცვლა",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "პირადი",
     "Users" : "მომხმარებელი",
     "Apps" : "აპლიკაციები",
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index 02d818c343a..8870b78a7d5 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -24,7 +24,6 @@
     "Yes" : "კი",
     "Choose" : "არჩევა",
     "Ok" : "დიახ",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "New Files" : "ახალი ფაილები",
     "Cancel" : "უარყოფა",
     "Shared" : "გაზიარებული",
@@ -59,12 +58,10 @@
     "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
     "Delete" : "წაშლა",
     "Add" : "დამატება",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
     "New password" : "ახალი პაროლი",
     "Reset password" : "პაროლის შეცვლა",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "პირადი",
     "Users" : "მომხმარებელი",
     "Apps" : "აპლიკაციები",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index 2708045b078..a89bac783f2 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -28,7 +28,6 @@ OC.L10N.register(
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
     "Ok" : "ព្រម",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "New Files" : "ឯកសារ​ថ្មី",
     "Already existing files" : "មាន​ឯកសារ​នេះ​រួច​ហើយ",
     "Cancel" : "លើកលែង",
@@ -69,11 +68,9 @@ OC.L10N.register(
     "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
     "Delete" : "លុប",
     "Add" : "បញ្ចូល",
-    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
     "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Users" : "អ្នកប្រើ",
     "Apps" : "កម្មវិធី",
diff --git a/core/l10n/km.json b/core/l10n/km.json
index 2f8057ced21..4990fdf65b1 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -26,7 +26,6 @@
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
     "Ok" : "ព្រម",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "New Files" : "ឯកសារ​ថ្មី",
     "Already existing files" : "មាន​ឯកសារ​នេះ​រួច​ហើយ",
     "Cancel" : "លើកលែង",
@@ -67,11 +66,9 @@
     "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
     "Delete" : "លុប",
     "Add" : "បញ្ចូល",
-    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
     "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Users" : "អ្នកប្រើ",
     "Apps" : "កម្មវិធី",
diff --git a/core/l10n/kn.js b/core/l10n/kn.js
index 67f6759cb2f..727ea7b4a68 100644
--- a/core/l10n/kn.js
+++ b/core/l10n/kn.js
@@ -44,7 +44,6 @@ OC.L10N.register(
     "Choose" : "ಆಯ್ಕೆ",
     "Ok" : "ಸರಿ",
     "read-only" : "ಓದಲು ಮಾತ್ರ",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "One file conflict" : "ಒಂದು ಕಡತದಲ್ಲಿ ಸಮಸ್ಯೆ ಇದೆ",
     "New Files" : "ಹೊಸ ಕಡತಗಳು",
     "Already existing files" : "ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಕಡತಗಳು",
@@ -122,7 +121,6 @@ OC.L10N.register(
     "New password" : "ಹೊಸ ಗುಪ್ತಪದ",
     "New Password" : "ಹೊಸ ಗುಪ್ತಪದ",
     "Reset password" : "ಗುಪ್ತ ಪದವನ್ನು ಮರುಹೊಂದಿಸಿ",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "ವೈಯಕ್ತಿಕ",
     "Users" : "ಬಳಕೆದಾರರು",
     "Apps" : "ಕಾರ್ಯಕ್ರಮಗಳು",
diff --git a/core/l10n/kn.json b/core/l10n/kn.json
index a124f435de6..2036ab91e8d 100644
--- a/core/l10n/kn.json
+++ b/core/l10n/kn.json
@@ -42,7 +42,6 @@
     "Choose" : "ಆಯ್ಕೆ",
     "Ok" : "ಸರಿ",
     "read-only" : "ಓದಲು ಮಾತ್ರ",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "One file conflict" : "ಒಂದು ಕಡತದಲ್ಲಿ ಸಮಸ್ಯೆ ಇದೆ",
     "New Files" : "ಹೊಸ ಕಡತಗಳು",
     "Already existing files" : "ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಕಡತಗಳು",
@@ -120,7 +119,6 @@
     "New password" : "ಹೊಸ ಗುಪ್ತಪದ",
     "New Password" : "ಹೊಸ ಗುಪ್ತಪದ",
     "Reset password" : "ಗುಪ್ತ ಪದವನ್ನು ಮರುಹೊಂದಿಸಿ",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "ವೈಯಕ್ತಿಕ",
     "Users" : "ಬಳಕೆದಾರರು",
     "Apps" : "ಕಾರ್ಯಕ್ರಮಗಳು",
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
index f7494f17dab..a0aed2bc7b3 100644
--- a/core/l10n/ku_IQ.js
+++ b/core/l10n/ku_IQ.js
@@ -5,17 +5,14 @@ OC.L10N.register(
     "Saving..." : "پاشکه‌وتده‌کات...",
     "No" : "نەخێر",
     "Yes" : "بەڵێ",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "لابردن",
     "Share" : "هاوبەشی کردن",
     "Error" : "هه‌ڵه",
     "Password" : "وشەی تێپەربو",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "وشەی نهێنی نوێ",
     "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Users" : "به‌كارهێنه‌ر",
     "Apps" : "به‌رنامه‌كان",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
index da83726bda1..9c3c18cf137 100644
--- a/core/l10n/ku_IQ.json
+++ b/core/l10n/ku_IQ.json
@@ -3,17 +3,14 @@
     "Saving..." : "پاشکه‌وتده‌کات...",
     "No" : "نەخێر",
     "Yes" : "بەڵێ",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "لابردن",
     "Share" : "هاوبەشی کردن",
     "Error" : "هه‌ڵه",
     "Password" : "وشەی تێپەربو",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "وشەی نهێنی نوێ",
     "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Users" : "به‌كارهێنه‌ر",
     "Apps" : "به‌رنامه‌كان",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index 8f16e887a2a..298c0946970 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Yes" : "Jo",
     "Choose" : "Auswielen",
     "Ok" : "OK",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
     "Cancel" : "Ofbriechen",
     "Continue" : "Weider",
@@ -74,13 +73,11 @@ OC.L10N.register(
     "Delete" : "Läschen",
     "Add" : "Dobäisetzen",
     "Edit tags" : "Tags editéieren",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
     "New password" : "Neit Passwuert",
     "Reset password" : "Passwuert zréck setzen",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 992527aaed9..b78d8229398 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -30,7 +30,6 @@
     "Yes" : "Jo",
     "Choose" : "Auswielen",
     "Ok" : "OK",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
     "Cancel" : "Ofbriechen",
     "Continue" : "Weider",
@@ -72,13 +71,11 @@
     "Delete" : "Läschen",
     "Add" : "Dobäisetzen",
     "Edit tags" : "Tags editéieren",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
     "New password" : "Neit Passwuert",
     "Reset password" : "Passwuert zréck setzen",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index ab17b837098..db08141c3f0 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -86,14 +86,12 @@ OC.L10N.register(
     "Edit tags" : "Redaguoti žymes",
     "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
     "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
-    "_download %n file_::_download %n files_" : ["","",""],
     "Please reload the page." : "Prašome perkrauti puslapį.",
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
     "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
     "New password" : "Naujas slaptažodis",
     "Reset password" : "Atkurti slaptažodį",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Asmeniniai",
     "Users" : "Vartotojai",
     "Apps" : "Programos",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index 9cb067ac93e..0502dd57fa6 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -84,14 +84,12 @@
     "Edit tags" : "Redaguoti žymes",
     "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
     "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
-    "_download %n file_::_download %n files_" : ["","",""],
     "Please reload the page." : "Prašome perkrauti puslapį.",
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
     "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
     "New password" : "Naujas slaptažodis",
     "Reset password" : "Atkurti slaptažodį",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Asmeniniai",
     "Users" : "Vartotojai",
     "Apps" : "Programos",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index f2bad15fee1..a0c9a564ea1 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "Choose" : "Izvēlieties",
     "Ok" : "Labi",
     "read-only" : "tikai-skatīt",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "New Files" : "Jaunās datnes",
     "Cancel" : "Atcelt",
     "(all selected)" : "(visus iezīmētos)",
@@ -76,13 +75,11 @@ OC.L10N.register(
     "The object type is not specified." : "Nav norādīts objekta tips.",
     "Delete" : "Dzēst",
     "Add" : "Pievienot",
-    "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
     "New password" : "Jauna parole",
     "Reset password" : "Mainīt paroli",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Personīgi",
     "Users" : "Lietotāji",
     "Apps" : "Lietotnes",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index 30cb3cff55e..af3c1699e5d 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -33,7 +33,6 @@
     "Choose" : "Izvēlieties",
     "Ok" : "Labi",
     "read-only" : "tikai-skatīt",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "New Files" : "Jaunās datnes",
     "Cancel" : "Atcelt",
     "(all selected)" : "(visus iezīmētos)",
@@ -74,13 +73,11 @@
     "The object type is not specified." : "Nav norādīts objekta tips.",
     "Delete" : "Dzēst",
     "Add" : "Pievienot",
-    "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
     "New password" : "Jauna parole",
     "Reset password" : "Mainīt paroli",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Personīgi",
     "Users" : "Lietotāji",
     "Apps" : "Lietotnes",
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index 9a1030687c2..90e52bda687 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Yes" : "Да",
     "Choose" : "Избери",
     "Ok" : "Во ред",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "One file conflict" : "Конфликт со една датотека",
     "Cancel" : "Откажи",
     "Continue" : "Продолжи",
@@ -81,13 +80,11 @@ OC.L10N.register(
     "Add" : "Додади",
     "Edit tags" : "Уреди ги таговите",
     "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
     "New password" : "Нова лозинка",
     "Reset password" : "Ресетирај лозинка",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Аппликации",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 3b56bd99cd8..9d7ee58eacd 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -30,7 +30,6 @@
     "Yes" : "Да",
     "Choose" : "Избери",
     "Ok" : "Во ред",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "One file conflict" : "Конфликт со една датотека",
     "Cancel" : "Откажи",
     "Continue" : "Продолжи",
@@ -79,13 +78,11 @@
     "Add" : "Додади",
     "Edit tags" : "Уреди ги таговите",
     "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
     "New password" : "Нова лозинка",
     "Reset password" : "Ресетирај лозинка",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Аппликации",
diff --git a/core/l10n/ml_IN.js b/core/l10n/ml_IN.js
index 1830c8d7f5c..986ea54b512 100644
--- a/core/l10n/ml_IN.js
+++ b/core/l10n/ml_IN.js
@@ -1,9 +1,6 @@
 OC.L10N.register(
     "core",
     {
-    "Ok" : "ശരി ",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Ok" : "ശരി "
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ml_IN.json b/core/l10n/ml_IN.json
index 2bfe4dc8e76..fea5389f3ad 100644
--- a/core/l10n/ml_IN.json
+++ b/core/l10n/ml_IN.json
@@ -1,7 +1,4 @@
 { "translations": {
-    "Ok" : "ശരി ",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Ok" : "ശരി "
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/mn.js b/core/l10n/mn.js
index 6286dc4487c..bc1ffe9f8bd 100644
--- a/core/l10n/mn.js
+++ b/core/l10n/mn.js
@@ -9,11 +9,8 @@ OC.L10N.register(
     "Friday" : "Баасан",
     "Saturday" : "Бямба",
     "Settings" : "Тохиргоо",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Share" : "Түгээх",
     "Password" : "Нууц үг",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Username" : "Хэрэглэгчийн нэр"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/mn.json b/core/l10n/mn.json
index a5e3fbd6e51..02a523dc003 100644
--- a/core/l10n/mn.json
+++ b/core/l10n/mn.json
@@ -7,11 +7,8 @@
     "Friday" : "Баасан",
     "Saturday" : "Бямба",
     "Settings" : "Тохиргоо",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Share" : "Түгээх",
     "Password" : "Нууц үг",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Username" : "Хэрэглэгчийн нэр"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index 747c493e729..db09b1bdb5e 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "Batal",
     "Share" : "Kongsi",
     "Error" : "Ralat",
@@ -36,11 +35,9 @@ OC.L10N.register(
     "Warning" : "Amaran",
     "Delete" : "Padam",
     "Add" : "Tambah",
-    "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
     "New password" : "Kata laluan baru",
     "Reset password" : "Penetapan semula kata laluan",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "Peribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index 9f08364d5a8..6edc4ca9785 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -23,7 +23,6 @@
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "Batal",
     "Share" : "Kongsi",
     "Error" : "Ralat",
@@ -34,11 +33,9 @@
     "Warning" : "Amaran",
     "Delete" : "Padam",
     "Add" : "Tambah",
-    "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
     "New password" : "Kata laluan baru",
     "Reset password" : "Penetapan semula kata laluan",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "Peribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index f65594c4e20..6133a6309db 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -17,7 +17,6 @@ OC.L10N.register(
     "Yes" : "ဟုတ်",
     "Choose" : "ရွေးချယ်",
     "Ok" : "အိုကေ",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "ပယ်ဖျက်မည်",
     "Password" : "စကားဝှက်",
     "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
@@ -28,9 +27,7 @@ OC.L10N.register(
     "delete" : "ဖျက်မည်",
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
-    "_download %n file_::_download %n files_" : [""],
     "New password" : "စကားဝှက်အသစ်",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Users" : "သုံးစွဲသူ",
     "Apps" : "Apps",
     "Admin" : "အက်ဒမင်",
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index a64e4346441..4a1c9d456dc 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -15,7 +15,6 @@
     "Yes" : "ဟုတ်",
     "Choose" : "ရွေးချယ်",
     "Ok" : "အိုကေ",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "ပယ်ဖျက်မည်",
     "Password" : "စကားဝှက်",
     "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
@@ -26,9 +25,7 @@
     "delete" : "ဖျက်မည်",
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
-    "_download %n file_::_download %n files_" : [""],
     "New password" : "စကားဝှက်အသစ်",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Users" : "သုံးစွဲသူ",
     "Apps" : "Apps",
     "Admin" : "အက်ဒမင်",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index 887f0a6310e..cdead69db1d 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -83,13 +83,11 @@ OC.L10N.register(
     "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
     "Delete" : "Slett",
     "Add" : "Legg til",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
     "New password" : "Nytt passord",
     "Reset password" : "Nullstill passord",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personleg",
     "Users" : "Brukarar",
     "Apps" : "Program",
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index cabc85d91b1..0d74ec59611 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -81,13 +81,11 @@
     "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
     "Delete" : "Slett",
     "Add" : "Legg til",
-    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
     "New password" : "Nytt passord",
     "Reset password" : "Nullstill passord",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personleg",
     "Users" : "Brukarar",
     "Apps" : "Program",
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index ce4608393dd..fe0fc3d543c 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "Òc",
     "Choose" : "Causís",
     "Ok" : "D'accòrdi",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Annula",
     "Share" : "Parteja",
     "Error" : "Error",
@@ -49,11 +48,9 @@ OC.L10N.register(
     "Error setting expiration date" : "Error setting expiration date",
     "Delete" : "Escafa",
     "Add" : "Ajusta",
-    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
     "New password" : "Senhal novèl",
     "Reset password" : "Senhal tornat botar",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usancièrs",
     "Apps" : "Apps",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index d02a464b5d5..a34d64bf875 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -24,7 +24,6 @@
     "Yes" : "Òc",
     "Choose" : "Causís",
     "Ok" : "D'accòrdi",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Annula",
     "Share" : "Parteja",
     "Error" : "Error",
@@ -47,11 +46,9 @@
     "Error setting expiration date" : "Error setting expiration date",
     "Delete" : "Escafa",
     "Add" : "Ajusta",
-    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
     "New password" : "Senhal novèl",
     "Reset password" : "Senhal tornat botar",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personal",
     "Users" : "Usancièrs",
     "Apps" : "Apps",
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index b1984b3b6d0..40b9ee2734b 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "ਹਾਂ",
     "Choose" : "ਚੁਣੋ",
     "Ok" : "ਠੀਕ ਹੈ",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "ਰੱਦ ਕਰੋ",
     "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Error" : "ਗਲ",
@@ -34,8 +33,6 @@ OC.L10N.register(
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Search" : "ਖੋਜ"
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index a0f3b3a8239..37c6d47c628 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -24,7 +24,6 @@
     "Yes" : "ਹਾਂ",
     "Choose" : "ਚੁਣੋ",
     "Ok" : "ਠੀਕ ਹੈ",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "ਰੱਦ ਕਰੋ",
     "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Error" : "ਗਲ",
@@ -32,8 +31,6 @@
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Search" : "ਖੋਜ"
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index e9a5d248db0..1b4f717bc9d 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -136,7 +136,6 @@ OC.L10N.register(
     "Reset password" : "Zresetuj hasło",
     "Searching other places" : "Przeszukaj inne miejsca",
     "No search result in other places" : "Brak wyników wyszukiwania w innych miejscach",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Osobiste",
     "Users" : "Użytkownicy",
     "Apps" : "Aplikacje",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 83fdbc4e58a..3c9a765e481 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -134,7 +134,6 @@
     "Reset password" : "Zresetuj hasło",
     "Searching other places" : "Przeszukaj inne miejsca",
     "No search result in other places" : "Brak wyników wyszukiwania w innych miejscach",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Osobiste",
     "Users" : "Użytkownicy",
     "Apps" : "Aplikacje",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 182d552158b..c75594f4e71 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -144,7 +144,6 @@ OC.L10N.register(
     "Reset password" : "Redefinir senha",
     "Searching other places" : "Pesquisando em outros lugares",
     "No search result in other places" : "Nenhum resultado da pesquisa em outros lugares",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Pessoal",
     "Users" : "Usuários",
     "Apps" : "Aplicações",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 25bcdfc6b03..08d0372b7cf 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -142,7 +142,6 @@
     "Reset password" : "Redefinir senha",
     "Searching other places" : "Pesquisando em outros lugares",
     "No search result in other places" : "Nenhum resultado da pesquisa em outros lugares",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Pessoal",
     "Users" : "Usuários",
     "Apps" : "Aplicações",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index 693ff9f61df..275a01ab913 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -95,7 +95,6 @@ OC.L10N.register(
     "Enter new" : "Introducere nou",
     "Delete" : "Șterge",
     "Add" : "Adaugă",
-    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
     "Please reload the page." : "Te rugăm să reîncarci pagina.",
     "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
@@ -104,7 +103,6 @@ OC.L10N.register(
     "New password" : "Noua parolă",
     "New Password" : "Noua parolă",
     "Reset password" : "Resetează parola",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Personal",
     "Users" : "Utilizatori",
     "Apps" : "Aplicații",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index fc7ca5cdc1f..83c28507549 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -93,7 +93,6 @@
     "Enter new" : "Introducere nou",
     "Delete" : "Șterge",
     "Add" : "Adaugă",
-    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
     "Please reload the page." : "Te rugăm să reîncarci pagina.",
     "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
@@ -102,7 +101,6 @@
     "New password" : "Noua parolă",
     "New Password" : "Noua parolă",
     "Reset password" : "Resetează parola",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Personal",
     "Users" : "Utilizatori",
     "Apps" : "Aplicații",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 131d25bf8e3..b4e88ed279f 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -171,6 +171,7 @@ OC.L10N.register(
     "Technical details" : "Технические детали",
     "Remote Address: %s" : "Удаленный адрес: %s",
     "Request ID: %s" : "ID Запроса: %s",
+    "Type: %s" : "Тип: %s",
     "Code: %s" : "Код: %s",
     "Message: %s" : "Сообщение: %s",
     "File: %s" : "Файл: %s",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 0ac1d2bb874..4b98c5bdce7 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -169,6 +169,7 @@
     "Technical details" : "Технические детали",
     "Remote Address: %s" : "Удаленный адрес: %s",
     "Request ID: %s" : "ID Запроса: %s",
+    "Type: %s" : "Тип: %s",
     "Code: %s" : "Код: %s",
     "Message: %s" : "Сообщение: %s",
     "File: %s" : "Файл: %s",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index 59062b27912..e0d100b82d8 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
     "Ok" : "හරි",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "එපා",
     "Share" : "බෙදා හදා ගන්න",
     "Error" : "දෝෂයක්",
@@ -46,10 +45,8 @@ OC.L10N.register(
     "Warning" : "අවවාදය",
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "නව මුරපදය",
     "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "පෞද්ගලික",
     "Users" : "පරිශීලකයන්",
     "Apps" : "යෙදුම්",
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 957d888a3e2..23d63d883cc 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -24,7 +24,6 @@
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
     "Ok" : "හරි",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "එපා",
     "Share" : "බෙදා හදා ගන්න",
     "Error" : "දෝෂයක්",
@@ -44,10 +43,8 @@
     "Warning" : "අවවාදය",
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "නව මුරපදය",
     "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "පෞද්ගලික",
     "Users" : "පරිශීලකයන්",
     "Apps" : "යෙදුම්",
diff --git a/core/l10n/sk.js b/core/l10n/sk.js
index 6a57266201e..6d446d19099 100644
--- a/core/l10n/sk.js
+++ b/core/l10n/sk.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "December",
     "Settings" : "Nastavenia",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "Cancel" : "Zrušiť",
     "Share" : "Zdieľať",
     "group" : "skupina",
diff --git a/core/l10n/sk.json b/core/l10n/sk.json
index 3eb33e886af..05064303dac 100644
--- a/core/l10n/sk.json
+++ b/core/l10n/sk.json
@@ -19,7 +19,6 @@
     "November" : "November",
     "December" : "December",
     "Settings" : "Nastavenia",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "Cancel" : "Zrušiť",
     "Share" : "Zdieľať",
     "group" : "skupina",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index 99bf9874c4f..e0482ec7723 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -131,7 +131,6 @@ OC.L10N.register(
     "Reset password" : "Ponastavi geslo",
     "Searching other places" : "Iskanje drugih mest",
     "No search result in other places" : "Ni zadetkov iskanja drugih mest",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","",""],
     "Personal" : "Osebno",
     "Users" : "Uporabniki",
     "Apps" : "Programi",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index fc48d3e1880..e8fe3499e1d 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -129,7 +129,6 @@
     "Reset password" : "Ponastavi geslo",
     "Searching other places" : "Iskanje drugih mest",
     "No search result in other places" : "Ni zadetkov iskanja drugih mest",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","","",""],
     "Personal" : "Osebno",
     "Users" : "Uporabniki",
     "Apps" : "Programi",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index eb0eca0dd5c..a96c26c740b 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -122,7 +122,6 @@ OC.L10N.register(
     "New password" : "Kodi i ri",
     "New Password" : "Fjalëkalim i ri",
     "Reset password" : "Rivendos kodin",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index 057562bb844..a4dfe949665 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -120,7 +120,6 @@
     "New password" : "Kodi i ri",
     "New Password" : "Fjalëkalim i ri",
     "Reset password" : "Rivendos kodin",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index da2a5ec43dc..2b1c20b219e 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -128,7 +128,6 @@ OC.L10N.register(
     "New password" : "Nova lozinka",
     "New Password" : "Nova lozinka",
     "Reset password" : "Resetuj lozinku",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Lično",
     "Users" : "Korisnici",
     "Apps" : "Programi",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index b6e04ee15a8..5d7d0f04cbe 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -126,7 +126,6 @@
     "New password" : "Nova lozinka",
     "New Password" : "Nova lozinka",
     "Reset password" : "Resetuj lozinku",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["","",""],
     "Personal" : "Lično",
     "Users" : "Korisnici",
     "Apps" : "Programi",
diff --git a/core/l10n/ta_IN.js b/core/l10n/ta_IN.js
index b2a01caeb30..6ad6011faeb 100644
--- a/core/l10n/ta_IN.js
+++ b/core/l10n/ta_IN.js
@@ -2,9 +2,6 @@ OC.L10N.register(
     "core",
     {
     "Settings" : "அமைப்புகள்",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Send" : "அனுப்பவும்",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Send" : "அனுப்பவும்"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_IN.json b/core/l10n/ta_IN.json
index b0b605ef270..f426d6a8e2b 100644
--- a/core/l10n/ta_IN.json
+++ b/core/l10n/ta_IN.json
@@ -1,8 +1,5 @@
 { "translations": {
     "Settings" : "அமைப்புகள்",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Send" : "அனுப்பவும்",
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
+    "Send" : "அனுப்பவும்"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index b2c6b0f5cdd..372e2693ed2 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
     "Ok" : "சரி",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "இரத்து செய்க",
     "Share" : "பகிர்வு",
     "Error" : "வழு",
@@ -54,11 +53,9 @@ OC.L10N.register(
     "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
     "Delete" : "நீக்குக",
     "Add" : "சேர்க்க",
-    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
     "New password" : "புதிய கடவுச்சொல்",
     "Reset password" : "மீளமைத்த கடவுச்சொல்",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "தனிப்பட்ட",
     "Users" : "பயனாளர்",
     "Apps" : "செயலிகள்",
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 87b22f4d13b..359a3de826c 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -24,7 +24,6 @@
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
     "Ok" : "சரி",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "இரத்து செய்க",
     "Share" : "பகிர்வு",
     "Error" : "வழு",
@@ -52,11 +51,9 @@
     "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
     "Delete" : "நீக்குக",
     "Add" : "சேர்க்க",
-    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
     "New password" : "புதிய கடவுச்சொல்",
     "Reset password" : "மீளமைத்த கடவுச்சொல்",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "தனிப்பட்ட",
     "Users" : "பயனாளர்",
     "Apps" : "செயலிகள்",
diff --git a/core/l10n/te.js b/core/l10n/te.js
index 57176b9ac0e..423fb764b72 100644
--- a/core/l10n/te.js
+++ b/core/l10n/te.js
@@ -24,7 +24,6 @@ OC.L10N.register(
     "No" : "కాదు",
     "Yes" : "అవును",
     "Ok" : "సరే",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "రద్దుచేయి",
     "Continue" : "కొనసాగించు",
     "Error" : "పొరపాటు",
@@ -35,9 +34,7 @@ OC.L10N.register(
     "Warning" : "హెచ్చరిక",
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "కొత్త సంకేతపదం",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "వ్యక్తిగతం",
     "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
diff --git a/core/l10n/te.json b/core/l10n/te.json
index 3d62c8b103f..cd7b0d9a93f 100644
--- a/core/l10n/te.json
+++ b/core/l10n/te.json
@@ -22,7 +22,6 @@
     "No" : "కాదు",
     "Yes" : "అవును",
     "Ok" : "సరే",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "రద్దుచేయి",
     "Continue" : "కొనసాగించు",
     "Error" : "పొరపాటు",
@@ -33,9 +32,7 @@
     "Warning" : "హెచ్చరిక",
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
-    "_download %n file_::_download %n files_" : ["",""],
     "New password" : "కొత్త సంకేతపదం",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "వ్యక్తిగతం",
     "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index f6cdbe72ace..81553391131 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -26,7 +26,6 @@ OC.L10N.register(
     "Yes" : "ตกลง",
     "Choose" : "เลือก",
     "Ok" : "ตกลง",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "New Files" : "ไฟล์ใหม่",
     "Cancel" : "ยกเลิก",
     "Shared" : "แชร์แล้ว",
@@ -61,12 +60,10 @@ OC.L10N.register(
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Delete" : "ลบ",
     "Add" : "เพิ่ม",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
     "New password" : "รหัสผ่านใหม่",
     "Reset password" : "เปลี่ยนรหัสผ่าน",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 4043813e4e0..c7afd19caa1 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -24,7 +24,6 @@
     "Yes" : "ตกลง",
     "Choose" : "เลือก",
     "Ok" : "ตกลง",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "New Files" : "ไฟล์ใหม่",
     "Cancel" : "ยกเลิก",
     "Shared" : "แชร์แล้ว",
@@ -59,12 +58,10 @@
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Delete" : "ลบ",
     "Add" : "เพิ่ม",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
     "New password" : "รหัสผ่านใหม่",
     "Reset password" : "เปลี่ยนรหัสผ่าน",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
index 46c9f1fad18..97407fb8039 100644
--- a/core/l10n/ug.js
+++ b/core/l10n/ug.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "No" : "ياق",
     "Yes" : "ھەئە",
     "Ok" : "جەزملە",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "ۋاز كەچ",
     "Share" : "ھەمبەھىر",
     "Error" : "خاتالىق",
@@ -37,9 +36,7 @@ OC.L10N.register(
     "Warning" : "ئاگاھلاندۇرۇش",
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
-    "_download %n file_::_download %n files_" : [""],
     "New password" : "يېڭى ئىم",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "شەخسىي",
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
index 7cb51e2aa07..58ed0dbbd17 100644
--- a/core/l10n/ug.json
+++ b/core/l10n/ug.json
@@ -23,7 +23,6 @@
     "No" : "ياق",
     "Yes" : "ھەئە",
     "Ok" : "جەزملە",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "ۋاز كەچ",
     "Share" : "ھەمبەھىر",
     "Error" : "خاتالىق",
@@ -35,9 +34,7 @@
     "Warning" : "ئاگاھلاندۇرۇش",
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
-    "_download %n file_::_download %n files_" : [""],
     "New password" : "يېڭى ئىم",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "شەخسىي",
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
diff --git a/core/l10n/ur.js b/core/l10n/ur.js
index 6f4050f5fd6..442326e9ad7 100644
--- a/core/l10n/ur.js
+++ b/core/l10n/ur.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Error" : "خرابی"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur.json b/core/l10n/ur.json
index a99dca571f3..1c1fc3d16c1 100644
--- a/core/l10n/ur.json
+++ b/core/l10n/ur.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Error" : "خرابی"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index 5d0ccc2f5e5..34f04f662ef 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -84,13 +84,11 @@ OC.L10N.register(
     "Delete" : "حذف کریں",
     "Add" : "شامل کریں",
     "Edit tags" : "ترمیم ٹیگز",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
     "New password" : "نیا پاسورڈ",
     "Reset password" : "ری سیٹ پاسورڈ",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "شخصی",
     "Users" : "صارفین",
     "Apps" : "ایپز",
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index 77bfde9243c..cecfdcbdf8b 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -82,13 +82,11 @@
     "Delete" : "حذف کریں",
     "Add" : "شامل کریں",
     "Edit tags" : "ترمیم ٹیگز",
-    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
     "New password" : "نیا پاسورڈ",
     "Reset password" : "ری سیٹ پاسورڈ",
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""],
     "Personal" : "شخصی",
     "Users" : "صارفین",
     "Apps" : "ایپز",
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index e8717475725..fb47abe33bd 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -86,14 +86,12 @@ OC.L10N.register(
     "Edit tags" : "Sửa thẻ",
     "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
     "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
-    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "Vui lòng tải lại trang.",
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
     "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
     "New password" : "Mật khẩu mới",
     "Reset password" : "Khôi phục mật khẩu",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "Cá nhân",
     "Users" : "Người dùng",
     "Apps" : "Ứng dụng",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index 8671fa857d1..d8508ed9a17 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -84,14 +84,12 @@
     "Edit tags" : "Sửa thẻ",
     "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
     "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
-    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "Vui lòng tải lại trang.",
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
     "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
     "New password" : "Mật khẩu mới",
     "Reset password" : "Khôi phục mật khẩu",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "Cá nhân",
     "Users" : "Người dùng",
     "Apps" : "Ứng dụng",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 3893da6c4ec..ea2239eed97 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -127,7 +127,6 @@ OC.L10N.register(
     "New password" : "新密码",
     "New Password" : "新密码",
     "Reset password" : "重置密码",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "个人",
     "Users" : "用户",
     "Apps" : "应用",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 43512c96d48..7d11e502de5 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -125,7 +125,6 @@
     "New password" : "新密码",
     "New Password" : "新密码",
     "Reset password" : "重置密码",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "个人",
     "Users" : "用户",
     "Apps" : "应用",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index fca79d40520..ab567c72ec2 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "取消",
     "Continue" : "繼續",
     "Shared" : "已分享",
@@ -51,13 +50,11 @@ OC.L10N.register(
     "Warning" : "警告",
     "Delete" : "刪除",
     "Add" : "加入",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
     "New password" : "新密碼",
     "New Password" : "新密碼",
     "Reset password" : "重設密碼",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "個人",
     "Users" : "用戶",
     "Apps" : "軟件",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 8418ac9a705..09a4bd74f47 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -23,7 +23,6 @@
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
-    "_{count} file conflict_::_{count} file conflicts_" : [""],
     "Cancel" : "取消",
     "Continue" : "繼續",
     "Shared" : "已分享",
@@ -49,13 +48,11 @@
     "Warning" : "警告",
     "Delete" : "刪除",
     "Add" : "加入",
-    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
     "New password" : "新密碼",
     "New Password" : "新密碼",
     "Reset password" : "重設密碼",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "個人",
     "Users" : "用戶",
     "Apps" : "軟件",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 8e1bbd0b1f6..e78cfb137ee 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -107,7 +107,6 @@ OC.L10N.register(
     "Edit tags" : "編輯標籤",
     "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
-    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
     "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "New password" : "新密碼",
     "New Password" : "新密碼",
     "Reset password" : "重設密碼",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "個人",
     "Users" : "使用者",
     "Apps" : "應用程式",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index f0aa279dd94..5f0796615c3 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -105,7 +105,6 @@
     "Edit tags" : "編輯標籤",
     "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
-    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
     "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
@@ -117,7 +116,6 @@
     "New password" : "新密碼",
     "New Password" : "新密碼",
     "Reset password" : "重設密碼",
-    "_{count} search result in other places_::_{count} search results in other places_" : [""],
     "Personal" : "個人",
     "Users" : "使用者",
     "Apps" : "應用程式",