fix(l10n): Update translations from Transifex

Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2026-02-20 00:12:30 -05:00 · 2025-05-01 00:23:23 +00:00 · 2025-05-01 00:23:23 +00:00 · ecbcdc43e8
commit ecbcdc43e8
parent d1a2535126
122 changed files with 706 additions and 678 deletions
--- a/apps/files/l10n/ar.js
+++ b/apps/files/l10n/ar.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "هذا المجلد غير متوفر، الرجاء مراجعة سجل الحركات أو الاتصال بمشرف النظام",
    "Storage is temporarily not available" : "وحدة التخزين غير متوفرة",
    "Unexpected error: {error}" : "خطأ غير متوقع: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلدات","{folderCount} مجلد","{folderCount} مجلد"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ملف","{fileCount} ملف","{fileCount} ملف","{fileCount} ملفات","{fileCount} ملف","{fileCount} ملف"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و{folderCount} مجلدات","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملفات و 1 مجلد ","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ملف و {folderCount} مجلد",
-    "_(%n hidden)_::_ (%n hidden)_" : [" (%n مخفية)","(%n مخفية)"," (%n مخفية)"," (%n مخفية)"," (%n مخفية)"," (%n مخفية)"],
+    "_%n file_::_%n files_" : ["لا يوجد ملفات %n","%n ملف","ملفان","%n ملفات","%n ملف","%n ملفات"],
+    "_%n folder_::_%n folders_" : ["لا توجد مجلدات","مجلد واحد","مجلدان","%n مجلدات","%n مجلد","%n مجلدات"],
    "Filename must not be empty." : "يجب ألّا يكون اسم الملف فارغاً.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" غير مسموح به في اسم الملف.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" هو اسم محجوز و لا يجوز استعماله كاسم لملف.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "خطأ أثناء حذف الملف \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "لاتوجد نتائج بحث في مجلدات اخرى ل {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "ادخل حرفين على الاقل للبحث في المجلدات",
-    "_%n folder_::_%n folders_" : ["لا توجد مجلدات","مجلد واحد","مجلدان","%n مجلدات","%n مجلد","%n مجلدات"],
-    "_%n file_::_%n files_" : ["لا يوجد ملفات %n","%n ملف","ملفان","%n ملفات","%n ملف","%n ملفات"],
    "{dirs} and {files}" : "{dirs} و {files}",
    "_including %n hidden_::_including %n hidden_" : ["يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي"],
    "You do not have permission to upload or create files here" : "لا يوجد تخويل برفع أو إنشاء ملفات هنا",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "تحرير الملف محلياً",
    "Edit online" : "التحرير عبر الإنترنت",
    "Create new templates folder" : "إنشيْ مجلد جديد للقوالب",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلدات","{folderCount} مجلد","{folderCount} مجلد"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ملف","{fileCount} ملف","{fileCount} ملف","{fileCount} ملفات","{fileCount} ملف","{fileCount} ملف"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و{folderCount} مجلدات","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملفات و 1 مجلد ","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ملف و {folderCount} مجلد",
    "List of favorites files and folders." : "قائمة الملفات والمجلدات المفضلة.",
    "Personal Files" : "ملفات شخصية",
    "Text file" : "ملف نصي",
--- a/apps/files/l10n/ar.json
+++ b/apps/files/l10n/ar.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "هذا المجلد غير متوفر، الرجاء مراجعة سجل الحركات أو الاتصال بمشرف النظام",
    "Storage is temporarily not available" : "وحدة التخزين غير متوفرة",
    "Unexpected error: {error}" : "خطأ غير متوقع: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلدات","{folderCount} مجلد","{folderCount} مجلد"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ملف","{fileCount} ملف","{fileCount} ملف","{fileCount} ملفات","{fileCount} ملف","{fileCount} ملف"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و{folderCount} مجلدات","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملفات و 1 مجلد ","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ملف و {folderCount} مجلد",
-    "_(%n hidden)_::_ (%n hidden)_" : [" (%n مخفية)","(%n مخفية)"," (%n مخفية)"," (%n مخفية)"," (%n مخفية)"," (%n مخفية)"],
+    "_%n file_::_%n files_" : ["لا يوجد ملفات %n","%n ملف","ملفان","%n ملفات","%n ملف","%n ملفات"],
+    "_%n folder_::_%n folders_" : ["لا توجد مجلدات","مجلد واحد","مجلدان","%n مجلدات","%n مجلد","%n مجلدات"],
    "Filename must not be empty." : "يجب ألّا يكون اسم الملف فارغاً.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" غير مسموح به في اسم الملف.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" هو اسم محجوز و لا يجوز استعماله كاسم لملف.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "خطأ أثناء حذف الملف \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "لاتوجد نتائج بحث في مجلدات اخرى ل {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "ادخل حرفين على الاقل للبحث في المجلدات",
-    "_%n folder_::_%n folders_" : ["لا توجد مجلدات","مجلد واحد","مجلدان","%n مجلدات","%n مجلد","%n مجلدات"],
-    "_%n file_::_%n files_" : ["لا يوجد ملفات %n","%n ملف","ملفان","%n ملفات","%n ملف","%n ملفات"],
    "{dirs} and {files}" : "{dirs} و {files}",
    "_including %n hidden_::_including %n hidden_" : ["يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي","يشمل %n مخفي"],
    "You do not have permission to upload or create files here" : "لا يوجد تخويل برفع أو إنشاء ملفات هنا",
@ -444,6 +438,11 @@
    "Edit file locally" : "تحرير الملف محلياً",
    "Edit online" : "التحرير عبر الإنترنت",
    "Create new templates folder" : "إنشيْ مجلد جديد للقوالب",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلد","{folderCount} مجلدات","{folderCount} مجلد","{folderCount} مجلد"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ملف","{fileCount} ملف","{fileCount} ملف","{fileCount} ملفات","{fileCount} ملف","{fileCount} ملف"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد","1 ملف و{folderCount} مجلدات","1 ملف و {folderCount} مجلد","1 ملف و {folderCount} مجلد"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد","{fileCount} ملفات و 1 مجلد ","{fileCount} ملف و 1 مجلد","{fileCount} ملف و 1 مجلد"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ملف و {folderCount} مجلد",
    "List of favorites files and folders." : "قائمة الملفات والمجلدات المفضلة.",
    "Personal Files" : "ملفات شخصية",
    "Text file" : "ملف نصي",
--- a/apps/files/l10n/ast.js
+++ b/apps/files/l10n/ast.js
@ -230,11 +230,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Esta operación ta prohibida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Esti direutoriu nun ta disponible, revisa'l rexistru o ponte en contautu cola alministración.",
    "Storage is temporarily not available" : "L'almacenamientu nun ta disponible temporalmente",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheru","{fileCount} ficheros"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheru y {folderCount} carpeta","1 ficheru y {folderCount} carpetes"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheru y 1 carpeta","{fileCount} ficheros y 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheros y {folderCount} carpetes",
+    "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
    "No favorites yet" : "Entá nun hai nengún elementu favoritu",
    "Files and folders you mark as favorite will show up here" : "Equí apaecen los ficheros y carpetes que metas en Favoritos",
    "All files" : "Tolos ficheros",
@ -302,8 +299,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Hebo un error al desaniciar «{fileName}»",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nun hai nengún resultáu de busca nes demás carpetes pa: {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduz más de dos carátueres pa buscar nes demás carpetes",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
-    "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
    "{dirs} and {files}" : "{dirs} ya {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n elementu anubríu","incluyendo %n elementos anubríos"],
    "You do not have permission to upload or create files here" : "Nun tienes permisu pa xubir o crear ficheros equí",
@ -340,6 +335,11 @@ OC.L10N.register(
    "Open the files app settings" : "Abrir la configuración de Ficheros",
    "Unable to change the favourite state of the file" : "Nun ye posible camudar l'estáu favoritu del ficheru",
    "Create new templates folder" : "Crear una carpeta de plantíes",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheru","{fileCount} ficheros"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheru y {folderCount} carpeta","1 ficheru y {folderCount} carpetes"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheru y 1 carpeta","{fileCount} ficheros y 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheros y {folderCount} carpetes",
    "List of favorites files and folders." : "Una llista de ficheros y carpetes favoritos.",
    "Personal Files" : "Ficheros personales",
    "Text file" : "Ficheru de testu",
--- a/apps/files/l10n/ast.json
+++ b/apps/files/l10n/ast.json
@ -228,11 +228,8 @@
    "This operation is forbidden" : "Esta operación ta prohibida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Esti direutoriu nun ta disponible, revisa'l rexistru o ponte en contautu cola alministración.",
    "Storage is temporarily not available" : "L'almacenamientu nun ta disponible temporalmente",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheru","{fileCount} ficheros"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheru y {folderCount} carpeta","1 ficheru y {folderCount} carpetes"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheru y 1 carpeta","{fileCount} ficheros y 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheros y {folderCount} carpetes",
+    "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
    "No favorites yet" : "Entá nun hai nengún elementu favoritu",
    "Files and folders you mark as favorite will show up here" : "Equí apaecen los ficheros y carpetes que metas en Favoritos",
    "All files" : "Tolos ficheros",
@ -300,8 +297,6 @@
    "Error deleting file \"{fileName}\"." : "Hebo un error al desaniciar «{fileName}»",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nun hai nengún resultáu de busca nes demás carpetes pa: {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduz más de dos carátueres pa buscar nes demás carpetes",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
-    "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
    "{dirs} and {files}" : "{dirs} ya {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n elementu anubríu","incluyendo %n elementos anubríos"],
    "You do not have permission to upload or create files here" : "Nun tienes permisu pa xubir o crear ficheros equí",
@ -338,6 +333,11 @@
    "Open the files app settings" : "Abrir la configuración de Ficheros",
    "Unable to change the favourite state of the file" : "Nun ye posible camudar l'estáu favoritu del ficheru",
    "Create new templates folder" : "Crear una carpeta de plantíes",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheru","{fileCount} ficheros"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheru y {folderCount} carpeta","1 ficheru y {folderCount} carpetes"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheru y 1 carpeta","{fileCount} ficheros y 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheros y {folderCount} carpetes",
    "List of favorites files and folders." : "Una llista de ficheros y carpetes favoritos.",
    "Personal Files" : "Ficheros personales",
    "Text file" : "Ficheru de testu",
--- a/apps/files/l10n/bg.js
+++ b/apps/files/l10n/bg.js
@ -161,6 +161,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Операцията е забранена",
    "This directory is unavailable, please check the logs or contact the administrator" : "Директорията не е налична. Проверете журнала или се свържете с администратора",
    "Storage is temporarily not available" : "Временно хранилището не е налично",
+    "_%n file_::_%n files_" : ["%n файл","%n файла"],
+    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
    "No favorites yet" : "Няма любими",
    "Files and folders you mark as favorite will show up here" : "Файловете и папките които маркирате като любими ще се показват тук",
    "All files" : "Всички файлове",
@ -216,8 +218,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Грешка при изтриването на файла \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Няма резултати от търсенето в други папки за {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Въведете повече от два знака за търсене в други папки",
-    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
-    "_%n file_::_%n files_" : ["%n файл","%n файла"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["включително %n скрит","включително %n скрити"],
    "You do not have permission to upload or create files here" : "Нямате право да качвате или създавате файлове тук",
--- a/apps/files/l10n/bg.json
+++ b/apps/files/l10n/bg.json
@ -159,6 +159,8 @@
    "This operation is forbidden" : "Операцията е забранена",
    "This directory is unavailable, please check the logs or contact the administrator" : "Директорията не е налична. Проверете журнала или се свържете с администратора",
    "Storage is temporarily not available" : "Временно хранилището не е налично",
+    "_%n file_::_%n files_" : ["%n файл","%n файла"],
+    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
    "No favorites yet" : "Няма любими",
    "Files and folders you mark as favorite will show up here" : "Файловете и папките които маркирате като любими ще се показват тук",
    "All files" : "Всички файлове",
@ -214,8 +216,6 @@
    "Error deleting file \"{fileName}\"." : "Грешка при изтриването на файла \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Няма резултати от търсенето в други папки за {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Въведете повече от два знака за търсене в други папки",
-    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
-    "_%n file_::_%n files_" : ["%n файл","%n файла"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["включително %n скрит","включително %n скрити"],
    "You do not have permission to upload or create files here" : "Нямате право да качвате или създавате файлове тук",
--- a/apps/files/l10n/ca.js
+++ b/apps/files/l10n/ca.js
@ -326,11 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Aquesta carpeta no està disponible. Consulteu els registres o contacteu amb l'administrador",
    "Storage is temporarily not available" : "L'emmagatzematge no està disponible temporalment",
    "Unexpected error: {error}" : "Error inesperat: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fitxer","{fileCount} fitxers"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fitxer i {folderCount} carpeta","1 fitxer i {folderCount} carpetes"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fitxer i 1 carpeta","{fileCount} fitxers i 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxers i {folderCount} carpetes",
+    "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
    "Filename must not be empty." : "El nom del fitxer no ha d'estar buit.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" no és permès dins d'un nom de fitxer.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" és un nom reservat i no és permès per als noms de fitxer.",
@ -404,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "S'ha produït un error en suprimir el fitxer «{fileName}».",
    "No search results in other folders for {tag}{filter}{endtag}" : "No hi ha cap resultat de cerca en altres carpetes per a {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduïu més de dos caràcters per a cercar en altres carpetes",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
-    "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
    "{dirs} and {files}" : "{dirs} i {files}",
    "_including %n hidden_::_including %n hidden_" : ["incloent-hi %n element ocult","incloent-hi %n elements ocults"],
    "You do not have permission to upload or create files here" : "No teniu permís per a pujar o crear fitxers aquí",
@ -445,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Edició del fitxer localment",
    "Edit online" : "Edició en remot",
    "Create new templates folder" : "Crea la carpeta de plantilles",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fitxer","{fileCount} fitxers"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fitxer i {folderCount} carpeta","1 fitxer i {folderCount} carpetes"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fitxer i 1 carpeta","{fileCount} fitxers i 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxers i {folderCount} carpetes",
    "List of favorites files and folders." : "Llista de fitxers i carpetes preferits.",
    "Personal Files" : "FItxers personals",
    "Text file" : "Fitxer de text",
--- a/apps/files/l10n/ca.json
+++ b/apps/files/l10n/ca.json
@ -324,11 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Aquesta carpeta no està disponible. Consulteu els registres o contacteu amb l'administrador",
    "Storage is temporarily not available" : "L'emmagatzematge no està disponible temporalment",
    "Unexpected error: {error}" : "Error inesperat: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fitxer","{fileCount} fitxers"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fitxer i {folderCount} carpeta","1 fitxer i {folderCount} carpetes"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fitxer i 1 carpeta","{fileCount} fitxers i 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxers i {folderCount} carpetes",
+    "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
    "Filename must not be empty." : "El nom del fitxer no ha d'estar buit.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" no és permès dins d'un nom de fitxer.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" és un nom reservat i no és permès per als noms de fitxer.",
@ -402,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "S'ha produït un error en suprimir el fitxer «{fileName}».",
    "No search results in other folders for {tag}{filter}{endtag}" : "No hi ha cap resultat de cerca en altres carpetes per a {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduïu més de dos caràcters per a cercar en altres carpetes",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
-    "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
    "{dirs} and {files}" : "{dirs} i {files}",
    "_including %n hidden_::_including %n hidden_" : ["incloent-hi %n element ocult","incloent-hi %n elements ocults"],
    "You do not have permission to upload or create files here" : "No teniu permís per a pujar o crear fitxers aquí",
@ -443,6 +438,11 @@
    "Edit file locally" : "Edició del fitxer localment",
    "Edit online" : "Edició en remot",
    "Create new templates folder" : "Crea la carpeta de plantilles",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetes"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fitxer","{fileCount} fitxers"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fitxer i {folderCount} carpeta","1 fitxer i {folderCount} carpetes"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fitxer i 1 carpeta","{fileCount} fitxers i 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxers i {folderCount} carpetes",
    "List of favorites files and folders." : "Llista de fitxers i carpetes preferits.",
    "Personal Files" : "FItxers personals",
    "Text file" : "Fitxer de text",
--- a/apps/files/l10n/cs.js
+++ b/apps/files/l10n/cs.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Tento adresář není dostupný, zkontrolujte záznamy událostí nebo se obraťte na správce",
    "Storage is temporarily not available" : "Úložiště je dočasně nedostupné",
    "Unexpected error: {error}" : "Neočekávaná chyby: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} složka","{folderCount} složky","{folderCount} složek","{folderCount} složky"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} soubor","{fileCount} soubory","{fileCount} souborů","{fileCount} soubory"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 soubor a {folderCount} složka","1 soubor a {folderCount} složky","1 soubor a {folderCount} složek","1 soubor a {folderCount} složky"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} soubor a 1 složka","{fileCount} soubory a 1 složka","{fileCount} souborů a 1 složka","{fileCount} soubory a 1 složka"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} souborů a {folderCount} složek",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n skrytý)","(%n skryté)","(%n skrytých)","(%n skryté)"],
+    "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů","%n soubory"],
+    "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek","%n složky"],
    "Filename must not be empty." : "Je třeba vyplnit název souboru.",
    "\"{char}\" is not allowed inside a filename." : "„{char}“ není v názvu souboru možné použít.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}“ je vyhrazeným názvem a není povoleno k použití pro názvy souborů.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Chyba při mazání souboru „{fileName}“.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Žádné výsledky hledání v ostatních složkách pro {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Pokud chcete hledat v ostatních složkách, zadejte více než dva znaky",
-    "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek","%n složky"],
-    "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů","%n soubory"],
    "{dirs} and {files}" : "{dirs} a {files}",
    "_including %n hidden_::_including %n hidden_" : ["včetně %n skrytého","včetně %n skrytých","včetně %n skrytých","včetně %n skrytých"],
    "You do not have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo zde vytvářet soubory",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Upravit soubor lokálně",
    "Edit online" : "Upravit online",
    "Create new templates folder" : "Vytvořit novou složku šablon",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} složka","{folderCount} složky","{folderCount} složek","{folderCount} složky"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} soubor","{fileCount} soubory","{fileCount} souborů","{fileCount} soubory"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 soubor a {folderCount} složka","1 soubor a {folderCount} složky","1 soubor a {folderCount} složek","1 soubor a {folderCount} složky"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} soubor a 1 složka","{fileCount} soubory a 1 složka","{fileCount} souborů a 1 složka","{fileCount} soubory a 1 složka"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} souborů a {folderCount} složek",
    "List of favorites files and folders." : "Seznam oblíbených souborů a složek.",
    "Personal Files" : "Osobní soubory",
    "Text file" : "Textový soubor",
--- a/apps/files/l10n/cs.json
+++ b/apps/files/l10n/cs.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Tento adresář není dostupný, zkontrolujte záznamy událostí nebo se obraťte na správce",
    "Storage is temporarily not available" : "Úložiště je dočasně nedostupné",
    "Unexpected error: {error}" : "Neočekávaná chyby: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} složka","{folderCount} složky","{folderCount} složek","{folderCount} složky"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} soubor","{fileCount} soubory","{fileCount} souborů","{fileCount} soubory"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 soubor a {folderCount} složka","1 soubor a {folderCount} složky","1 soubor a {folderCount} složek","1 soubor a {folderCount} složky"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} soubor a 1 složka","{fileCount} soubory a 1 složka","{fileCount} souborů a 1 složka","{fileCount} soubory a 1 složka"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} souborů a {folderCount} složek",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n skrytý)","(%n skryté)","(%n skrytých)","(%n skryté)"],
+    "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů","%n soubory"],
+    "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek","%n složky"],
    "Filename must not be empty." : "Je třeba vyplnit název souboru.",
    "\"{char}\" is not allowed inside a filename." : "„{char}“ není v názvu souboru možné použít.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}“ je vyhrazeným názvem a není povoleno k použití pro názvy souborů.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Chyba při mazání souboru „{fileName}“.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Žádné výsledky hledání v ostatních složkách pro {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Pokud chcete hledat v ostatních složkách, zadejte více než dva znaky",
-    "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek","%n složky"],
-    "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů","%n soubory"],
    "{dirs} and {files}" : "{dirs} a {files}",
    "_including %n hidden_::_including %n hidden_" : ["včetně %n skrytého","včetně %n skrytých","včetně %n skrytých","včetně %n skrytých"],
    "You do not have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo zde vytvářet soubory",
@ -444,6 +438,11 @@
    "Edit file locally" : "Upravit soubor lokálně",
    "Edit online" : "Upravit online",
    "Create new templates folder" : "Vytvořit novou složku šablon",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} složka","{folderCount} složky","{folderCount} složek","{folderCount} složky"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} soubor","{fileCount} soubory","{fileCount} souborů","{fileCount} soubory"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 soubor a {folderCount} složka","1 soubor a {folderCount} složky","1 soubor a {folderCount} složek","1 soubor a {folderCount} složky"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} soubor a 1 složka","{fileCount} soubory a 1 složka","{fileCount} souborů a 1 složka","{fileCount} soubory a 1 složka"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} souborů a {folderCount} složek",
    "List of favorites files and folders." : "Seznam oblíbených souborů a složek.",
    "Personal Files" : "Osobní soubory",
    "Text file" : "Textový soubor",
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
    "Storage is temporarily not available" : "Lagerplads er midlertidigt ikke tilgængeligt",
    "Unexpected error: {error}" : "Uventet fejl: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mapper","1 fil og {folderCount} mapper"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mapper","{fileCount} filer og 1 mapper"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n skjult)","(%n skjult)"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
    "Filename must not be empty." : "Filnavnet må ikke være tomt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" er ikke tilladt i et filnavn.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" er et reserveret navn og er ikke tilladt til filnavne.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Fejl under sletning af filen \"{fileName}\"",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søgeresultater i andre mapper efter {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Indtast mere end to tegn for at søge i andre mapper",
-    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
-    "_%n file_::_%n files_" : ["%n fil","%n filer"],
    "{dirs} and {files}" : "{dirs} og {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n skujlte inkluderet","%n skujlte inkluderet"],
    "You do not have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Rediger fil lokalt",
    "Edit online" : "Rediger online",
    "Create new templates folder" : "Opsæt ny skabelonmappe",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mapper","1 fil og {folderCount} mapper"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mapper","{fileCount} filer og 1 mapper"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
    "List of favorites files and folders." : "Liste med foretrukne filer og mapper.",
    "Personal Files" : "Personlige filer",
    "Text file" : "Tekstfil",
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
    "Storage is temporarily not available" : "Lagerplads er midlertidigt ikke tilgængeligt",
    "Unexpected error: {error}" : "Uventet fejl: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mapper","1 fil og {folderCount} mapper"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mapper","{fileCount} filer og 1 mapper"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n skjult)","(%n skjult)"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
    "Filename must not be empty." : "Filnavnet må ikke være tomt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" er ikke tilladt i et filnavn.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" er et reserveret navn og er ikke tilladt til filnavne.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Fejl under sletning af filen \"{fileName}\"",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søgeresultater i andre mapper efter {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Indtast mere end to tegn for at søge i andre mapper",
-    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
-    "_%n file_::_%n files_" : ["%n fil","%n filer"],
    "{dirs} and {files}" : "{dirs} og {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n skujlte inkluderet","%n skujlte inkluderet"],
    "You do not have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
@ -444,6 +438,11 @@
    "Edit file locally" : "Rediger fil lokalt",
    "Edit online" : "Rediger online",
    "Create new templates folder" : "Opsæt ny skabelonmappe",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mapper","1 fil og {folderCount} mapper"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mapper","{fileCount} filer og 1 mapper"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
    "List of favorites files and folders." : "Liste med foretrukne filer og mapper.",
    "Personal Files" : "Personlige filer",
    "Text file" : "Tekstfil",
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Dieses Verzeichnis ist nicht verfügbar, bitte die Logdateien überprüfen oder die Administration kontaktieren.",
    "Storage is temporarily not available" : "Speicher ist vorübergehend nicht verfügbar",
    "Unexpected error: {error}" : "Unerwarteter Fehler: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n versteckt)","(%n versteckt)"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
    "Filename must not be empty." : "Dateiname darf nicht leer sein.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ist innerhalb eines Dateinamens nicht zulässig.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ist ein reservierter Name und für Dateinamen nicht zulässig.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Fehler beim Löschen der Datei \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Keine Suchergebnisse in anderen Ordnern für {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Gib mehr als zwei Zeichen ein, um in anderen Ordnern zu suchen.",
-    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
-    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
    "{dirs} and {files}" : "{dirs} und {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n versteckte eingeschlossen","%n versteckte eingeschlossen"],
    "You do not have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Datei lokal bearbeiten",
    "Edit online" : "Online bearbeiten",
    "Create new templates folder" : "Neuen Vorlagenordner erstellen",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
    "List of favorites files and folders." : "Liste der favorisierten Ordner und Dateien",
    "Personal Files" : "Persönliche Dateien",
    "Text file" : "Textdatei",
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Dieses Verzeichnis ist nicht verfügbar, bitte die Logdateien überprüfen oder die Administration kontaktieren.",
    "Storage is temporarily not available" : "Speicher ist vorübergehend nicht verfügbar",
    "Unexpected error: {error}" : "Unerwarteter Fehler: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n versteckt)","(%n versteckt)"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
    "Filename must not be empty." : "Dateiname darf nicht leer sein.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ist innerhalb eines Dateinamens nicht zulässig.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ist ein reservierter Name und für Dateinamen nicht zulässig.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Fehler beim Löschen der Datei \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Keine Suchergebnisse in anderen Ordnern für {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Gib mehr als zwei Zeichen ein, um in anderen Ordnern zu suchen.",
-    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
-    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
    "{dirs} and {files}" : "{dirs} und {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n versteckte eingeschlossen","%n versteckte eingeschlossen"],
    "You do not have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
@ -444,6 +438,11 @@
    "Edit file locally" : "Datei lokal bearbeiten",
    "Edit online" : "Online bearbeiten",
    "Create new templates folder" : "Neuen Vorlagenordner erstellen",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
    "List of favorites files and folders." : "Liste der favorisierten Ordner und Dateien",
    "Personal Files" : "Persönliche Dateien",
    "Text file" : "Textdatei",
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Dieses Verzeichnis ist nicht verfügbar, bitte überprüfen Sie die Protokolldateien oder kontaktieren Sie die Administration",
    "Storage is temporarily not available" : "Speicher ist vorübergehend nicht verfügbar",
    "Unexpected error: {error}" : "Unerwarteter Fehler: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n versteckt)","(%n versteckt)"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
    "Filename must not be empty." : "Dateiname darf nicht leer sein.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ist innerhalb eines Dateinamens nicht zulässig.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ist ein reservierter Name und für Dateinamen nicht zulässig.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Fehler beim Löschen der Datei \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Keine Suchergebnisse in anderen Ordnern für {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Geben Sie mehr als zwei Zeichen ein, um in anderen Ordnern zu suchen",
-    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
-    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
    "{dirs} and {files}" : "{dirs} und {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n versteckte eingeschlossen","%n versteckte eingeschlossen"],
    "You do not have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Datei lokal bearbeiten",
    "Edit online" : "Online bearbeiten",
    "Create new templates folder" : "Neuen Vorlagenordner erstellen",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
    "List of favorites files and folders." : "Liste der favorisierten Ordner und Dateien.",
    "Personal Files" : "Persönliche Dateien",
    "Text file" : "Textdatei",
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Dieses Verzeichnis ist nicht verfügbar, bitte überprüfen Sie die Protokolldateien oder kontaktieren Sie die Administration",
    "Storage is temporarily not available" : "Speicher ist vorübergehend nicht verfügbar",
    "Unexpected error: {error}" : "Unerwarteter Fehler: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n versteckt)","(%n versteckt)"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
    "Filename must not be empty." : "Dateiname darf nicht leer sein.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ist innerhalb eines Dateinamens nicht zulässig.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ist ein reservierter Name und für Dateinamen nicht zulässig.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Fehler beim Löschen der Datei \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Keine Suchergebnisse in anderen Ordnern für {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Geben Sie mehr als zwei Zeichen ein, um in anderen Ordnern zu suchen",
-    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
-    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
    "{dirs} and {files}" : "{dirs} und {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n versteckte eingeschlossen","%n versteckte eingeschlossen"],
    "You do not have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
@ -444,6 +438,11 @@
    "Edit file locally" : "Datei lokal bearbeiten",
    "Edit online" : "Online bearbeiten",
    "Create new templates folder" : "Neuen Vorlagenordner erstellen",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} Ordner","{folderCount} Ordner"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} Datei","{fileCount} Dateien"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 Datei und {folderCount} Ordner","1 Datei und {folderCount} Ordner"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} Datei und 1 Ordner","{fileCount} Dateien und 1 Ordner"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} Dateien und {folderCount} Ordner",
    "List of favorites files and folders." : "Liste der favorisierten Ordner und Dateien.",
    "Personal Files" : "Persönliche Dateien",
    "Text file" : "Textdatei",
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@ -232,11 +232,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Αυτή η λειτουργία απαγορεύεται",
    "This directory is unavailable, please check the logs or contact the administrator" : "Ο κατάλογος δεν είναι διαθέσιμος, παρακαλούμε ελέγξτε τα αρχεία καταγραφής ή επικοινωνήστε με το διαχειριστή",
    "Storage is temporarily not available" : "Μη διαθέσιμος χώρος αποθήκευσης προσωρινά",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} φάκελος","{folderCount} φακέλοι"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} αρχείο","{fileCount} αρχεία"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 αρχείο και {folderCount} φάκελος","1 αρχείο και {folderCount} φακέλοι"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} αρχείο και 1 φάκελος","{fileCount} αρχεία και 1 φάκελος"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} αρχεία και {folderCount} φακέλοι",
+    "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
+    "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
    "Filename must not be empty." : "Το όνομα αρχείου δεν πρέπει να είναι κενό.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" δεν επιτρέπεται μέσα σε όνομα αρχείου.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" είναι δεσμευμένο όνομα και δεν επιτρέπεται για ονόματα αρχείων.",
@ -308,8 +305,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Σφάλμα διαγραφής του \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Κανένα αποτέλεσμα αναζήτησης σε άλλους φακέλους για {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Εισαγάγετε περισσότερους από δύο χαρακτήρες για αναζήτηση σε άλλους φακέλους",
-    "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
-    "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
    "{dirs} and {files}" : "{dirs} και {files}",
    "_including %n hidden_::_including %n hidden_" : ["περιλαμβάνεται %n κρυφό","περιλαμβάνονται %n κρυφά"],
    "You do not have permission to upload or create files here" : "Δεν έχετε δικαιώματα μεταφόρτωσης ή δημιουργίας αρχείων εδώ",
@ -347,6 +342,11 @@ OC.L10N.register(
    "Unable to change the favourite state of the file" : "Αδυναμία αλλαγής αγαπημένης κατάστασης αρχείου",
    "Edit file locally" : "Επεξεργασία αρχείου τοπικά",
    "Create new templates folder" : "Δημιουργία νέου φακέλου προτύπων",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} φάκελος","{folderCount} φακέλοι"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} αρχείο","{fileCount} αρχεία"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 αρχείο και {folderCount} φάκελος","1 αρχείο και {folderCount} φακέλοι"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} αρχείο και 1 φάκελος","{fileCount} αρχεία και 1 φάκελος"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} αρχεία και {folderCount} φακέλοι",
    "List of favorites files and folders." : "Λίστα αγαπημένων αρχείων και φακέλων.",
    "Personal Files" : "Προσωπικά Αρχεία",
    "Text file" : "Αρχείο κειμένου",
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@ -230,11 +230,8 @@
    "This operation is forbidden" : "Αυτή η λειτουργία απαγορεύεται",
    "This directory is unavailable, please check the logs or contact the administrator" : "Ο κατάλογος δεν είναι διαθέσιμος, παρακαλούμε ελέγξτε τα αρχεία καταγραφής ή επικοινωνήστε με το διαχειριστή",
    "Storage is temporarily not available" : "Μη διαθέσιμος χώρος αποθήκευσης προσωρινά",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} φάκελος","{folderCount} φακέλοι"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} αρχείο","{fileCount} αρχεία"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 αρχείο και {folderCount} φάκελος","1 αρχείο και {folderCount} φακέλοι"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} αρχείο και 1 φάκελος","{fileCount} αρχεία και 1 φάκελος"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} αρχεία και {folderCount} φακέλοι",
+    "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
+    "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
    "Filename must not be empty." : "Το όνομα αρχείου δεν πρέπει να είναι κενό.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" δεν επιτρέπεται μέσα σε όνομα αρχείου.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" είναι δεσμευμένο όνομα και δεν επιτρέπεται για ονόματα αρχείων.",
@ -306,8 +303,6 @@
    "Error deleting file \"{fileName}\"." : "Σφάλμα διαγραφής του \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Κανένα αποτέλεσμα αναζήτησης σε άλλους φακέλους για {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Εισαγάγετε περισσότερους από δύο χαρακτήρες για αναζήτηση σε άλλους φακέλους",
-    "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
-    "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
    "{dirs} and {files}" : "{dirs} και {files}",
    "_including %n hidden_::_including %n hidden_" : ["περιλαμβάνεται %n κρυφό","περιλαμβάνονται %n κρυφά"],
    "You do not have permission to upload or create files here" : "Δεν έχετε δικαιώματα μεταφόρτωσης ή δημιουργίας αρχείων εδώ",
@ -345,6 +340,11 @@
    "Unable to change the favourite state of the file" : "Αδυναμία αλλαγής αγαπημένης κατάστασης αρχείου",
    "Edit file locally" : "Επεξεργασία αρχείου τοπικά",
    "Create new templates folder" : "Δημιουργία νέου φακέλου προτύπων",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} φάκελος","{folderCount} φακέλοι"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} αρχείο","{fileCount} αρχεία"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 αρχείο και {folderCount} φάκελος","1 αρχείο και {folderCount} φακέλοι"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} αρχείο και 1 φάκελος","{fileCount} αρχεία και 1 φάκελος"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} αρχεία και {folderCount} φακέλοι",
    "List of favorites files and folders." : "Λίστα αγαπημένων αρχείων και φακέλων.",
    "Personal Files" : "Προσωπικά Αρχεία",
    "Text file" : "Αρχείο κειμένου",
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "This directory is unavailable, please check the logs or contact the administrator",
    "Storage is temporarily not available" : "Storage is temporarily not available",
    "Unexpected error: {error}" : "Unexpected error: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n hidden)"," (%n hidden)"],
+    "_%n file_::_%n files_" : ["%n file","%n files"],
+    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
    "Filename must not be empty." : "Filename must not be empty.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" is not allowed inside a filename.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" is a reserved name and not allowed for filenames.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Error deleting file \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Enter more than two characters to search in other folders",
-    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
-    "_%n file_::_%n files_" : ["%n file","%n files"],
    "{dirs} and {files}" : "{dirs} and {files}",
    "_including %n hidden_::_including %n hidden_" : ["including %n hidden","including %n hidden"],
    "You do not have permission to upload or create files here" : "You do not have permission to upload or create files here",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Edit file locally",
    "Edit online" : "Edit online",
    "Create new templates folder" : "Create new templates folder",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
    "List of favorites files and folders." : "List of favourite files and folders.",
    "Personal Files" : "Personal Files",
    "Text file" : "Text file",
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "This directory is unavailable, please check the logs or contact the administrator",
    "Storage is temporarily not available" : "Storage is temporarily not available",
    "Unexpected error: {error}" : "Unexpected error: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n hidden)"," (%n hidden)"],
+    "_%n file_::_%n files_" : ["%n file","%n files"],
+    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
    "Filename must not be empty." : "Filename must not be empty.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" is not allowed inside a filename.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" is a reserved name and not allowed for filenames.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Error deleting file \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Enter more than two characters to search in other folders",
-    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
-    "_%n file_::_%n files_" : ["%n file","%n files"],
    "{dirs} and {files}" : "{dirs} and {files}",
    "_including %n hidden_::_including %n hidden_" : ["including %n hidden","including %n hidden"],
    "You do not have permission to upload or create files here" : "You do not have permission to upload or create files here",
@ -444,6 +438,11 @@
    "Edit file locally" : "Edit file locally",
    "Edit online" : "Edit online",
    "Create new templates folder" : "Create new templates folder",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
    "List of favorites files and folders." : "List of favourite files and folders.",
    "Personal Files" : "Personal Files",
    "Text file" : "Text file",
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contacte con el administrador",
    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente",
    "Unexpected error: {error}" : "Error inesperado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n oculto)"," (%n ocultos)"," (%n ocultos)"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
    "Filename must not be empty." : "El nombre de archivo no debe estar vacío.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" no está permitido en el nombre de archivo.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" es un nombre reservado y no se permite para los nombres de archivo.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Error al borrar el archivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No hay resultados de búsqueda en otras carpetas para  {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Escriba más de dos caracteres para buscar en otras carpetas",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
-    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
    "{dirs} and {files}" : "{dirs} y {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n oculto","incluyendo %n ocultos","incluyendo %n ocultos"],
    "You do not have permission to upload or create files here" : "No tiene permiso para subir o crear archivos aquí",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Editar archivo localmente",
    "Edit online" : "Editar en línea",
    "Create new templates folder" : "Crear nueva carpeta de plantillas",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
    "List of favorites files and folders." : "Lista de archivos y carpetas favoritos.",
    "Personal Files" : "Archivos Personales",
    "Text file" : "Archivo de texto",
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verifique los registros o contacte con el administrador",
    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente",
    "Unexpected error: {error}" : "Error inesperado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n oculto)"," (%n ocultos)"," (%n ocultos)"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
    "Filename must not be empty." : "El nombre de archivo no debe estar vacío.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" no está permitido en el nombre de archivo.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" es un nombre reservado y no se permite para los nombres de archivo.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Error al borrar el archivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No hay resultados de búsqueda en otras carpetas para  {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Escriba más de dos caracteres para buscar en otras carpetas",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
-    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
    "{dirs} and {files}" : "{dirs} y {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n oculto","incluyendo %n ocultos","incluyendo %n ocultos"],
    "You do not have permission to upload or create files here" : "No tiene permiso para subir o crear archivos aquí",
@ -444,6 +438,11 @@
    "Edit file locally" : "Editar archivo localmente",
    "Edit online" : "Editar en línea",
    "Create new templates folder" : "Crear nueva carpeta de plantillas",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
    "List of favorites files and folders." : "Lista de archivos y carpetas favoritos.",
    "Personal Files" : "Archivos Personales",
    "Text file" : "Archivo de texto",
--- a/apps/files/l10n/es_EC.js
+++ b/apps/files/l10n/es_EC.js
@ -165,6 +165,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Esta operación está prohibida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verfica las bitácoras o contacta al administrador",
    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente ",
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
    "No favorites yet" : "Aún no hay favoritos",
    "Files and folders you mark as favorite will show up here" : "Los archivos y carpetas que marques como favoritos se mostrarán aquí. ",
    "All files" : "Todos los archivos",
@ -220,8 +222,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Se presentó un error al borrar el archivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados en otras carpetas para  {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ingresa más de dos caracteres para buscar en otras carpetas.",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
-    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
    "{dirs} and {files}" : "{dirs} y {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n oculto","incluyendo %n ocultos","incluyendo %n ocultos"],
    "You do not have permission to upload or create files here" : "No tienes permiso para cargar o crear archivos aquí.",
--- a/apps/files/l10n/es_EC.json
+++ b/apps/files/l10n/es_EC.json
@ -163,6 +163,8 @@
    "This operation is forbidden" : "Esta operación está prohibida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verfica las bitácoras o contacta al administrador",
    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente ",
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
    "No favorites yet" : "Aún no hay favoritos",
    "Files and folders you mark as favorite will show up here" : "Los archivos y carpetas que marques como favoritos se mostrarán aquí. ",
    "All files" : "Todos los archivos",
@ -218,8 +220,6 @@
    "Error deleting file \"{fileName}\"." : "Se presentó un error al borrar el archivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados en otras carpetas para  {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ingresa más de dos caracteres para buscar en otras carpetas.",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
-    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
    "{dirs} and {files}" : "{dirs} y {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n oculto","incluyendo %n ocultos","incluyendo %n ocultos"],
    "You do not have permission to upload or create files here" : "No tienes permiso para cargar o crear archivos aquí.",
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@ -271,11 +271,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verfica las bitácoras o contacta al administrador",
    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente ",
    "Unexpected error: {error}" : "Error inesperado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
    "Filename must not be empty." : "El nombre de archivo no puede estar vacío.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" no está permitido en el nombre de archivo.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" es un nombre reservado y no se permite en el nombre de archivo.",
@ -349,8 +346,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Se presentó un error al borrar el archivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados en otras carpetas para  {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ingrese al menos dos caracteres para buscar en otras carpetas",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
-    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
    "{dirs} and {files}" : "{dirs} y {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n oculto","incluyendo %n ocultos","incluyendo %n ocultos"],
    "You do not have permission to upload or create files here" : "No tiene permiso para crear o cargar archivos aquí",
@ -389,6 +384,11 @@ OC.L10N.register(
    "Edit file locally" : "Editar el archivo localmente",
    "Edit online" : "Editar en línea",
    "Create new templates folder" : "Crear nueva carpeta de plantillas",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
    "List of favorites files and folders." : "Lista de archivos y carpetas favoritos.",
    "Personal Files" : "Archivos personales",
    "Text file" : "Archivo de texto",
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@ -269,11 +269,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta carpeta no está disponible, por favor verfica las bitácoras o contacta al administrador",
    "Storage is temporarily not available" : "El almacenamiento no está disponible temporalmente ",
    "Unexpected error: {error}" : "Error inesperado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
    "Filename must not be empty." : "El nombre de archivo no puede estar vacío.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" no está permitido en el nombre de archivo.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" es un nombre reservado y no se permite en el nombre de archivo.",
@ -347,8 +344,6 @@
    "Error deleting file \"{fileName}\"." : "Se presentó un error al borrar el archivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No se encontraron resultados en otras carpetas para  {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ingrese al menos dos caracteres para buscar en otras carpetas",
-    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas","%n carpetas"],
-    "_%n file_::_%n files_" : ["%n archivo","%n archivos","%n archivos"],
    "{dirs} and {files}" : "{dirs} y {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluyendo %n oculto","incluyendo %n ocultos","incluyendo %n ocultos"],
    "You do not have permission to upload or create files here" : "No tiene permiso para crear o cargar archivos aquí",
@ -387,6 +382,11 @@
    "Edit file locally" : "Editar el archivo localmente",
    "Edit online" : "Editar en línea",
    "Create new templates folder" : "Crear nueva carpeta de plantillas",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} carpeta","{folderCount} carpetas","{folderCount} carpetas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archivo","{fileCount} archivos","{fileCount} archivos"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archivo y {folderCount} carpeta","1 archivo y {folderCount} carpetas","1 archivo y {folderCount} carpetas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archivo y 1 carpeta","{fileCount} archivos y 1 carpeta","{fileCount} archivos y 1 carpeta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} archivos y {folderCount} carpetas",
    "List of favorites files and folders." : "Lista de archivos y carpetas favoritos.",
    "Personal Files" : "Archivos personales",
    "Text file" : "Archivo de texto",
--- a/apps/files/l10n/et_EE.js
+++ b/apps/files/l10n/et_EE.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "See kaust pole saadaval, palun kontrolli logifaile või võta ühendust administraatoriga",
    "Storage is temporarily not available" : "Salvestusruum pole ajutiselt kättesaadav",
    "Unexpected error: {error}" : "Tundmatu viga: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kaust","{folderCount} kausta"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fail","{fileCount} faili"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fail ja {folderCount} kaust","1 fail ja {folderCount} kausta"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fail ja 1 kaust","{fileCount} faili ja 1 kaust"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} faili ja {folderCount} kausta",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n peidetud)"," (%n peidetud)"],
+    "_%n file_::_%n files_" : ["%n fail","%n faili"],
+    "_%n folder_::_%n folders_" : ["%n kaust","%n kausta"],
    "Filename must not be empty." : "Failinimi ei saa olla tühi.",
    "\"{char}\" is not allowed inside a filename." : "„{char}“ pole failinimedes lubatud.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}“ on reserveeritud nimi ja seda failinimedes ei saa kasutada.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Viga „{fileName}“ faili kustutamisel.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Teistest kaustadest ei leitud {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Teistest kaustadest otsimiseks sisesta rohkem kui kaks sümbolit",
-    "_%n folder_::_%n folders_" : ["%n kaust","%n kausta"],
-    "_%n file_::_%n files_" : ["%n fail","%n faili"],
    "{dirs} and {files}" : "{dirs} ja {files}",
    "_including %n hidden_::_including %n hidden_" : ["sealhulgas %n peidetud","sealhulgas %n peidetud"],
    "You do not have permission to upload or create files here" : "Sul pole luba siia faile lisada ja üles laadida",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Muuda faili kohalikus seadmes",
    "Edit online" : "Muuda võrgus",
    "Create new templates folder" : "Loo uus mallide kaust",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kaust","{folderCount} kausta"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fail","{fileCount} faili"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fail ja {folderCount} kaust","1 fail ja {folderCount} kausta"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fail ja 1 kaust","{fileCount} faili ja 1 kaust"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} faili ja {folderCount} kausta",
    "List of favorites files and folders." : "Lemmikfailide ja kaustade loend.",
    "Personal Files" : "Isiklikud Failid",
    "Text file" : "Tekstifail",
--- a/apps/files/l10n/et_EE.json
+++ b/apps/files/l10n/et_EE.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "See kaust pole saadaval, palun kontrolli logifaile või võta ühendust administraatoriga",
    "Storage is temporarily not available" : "Salvestusruum pole ajutiselt kättesaadav",
    "Unexpected error: {error}" : "Tundmatu viga: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kaust","{folderCount} kausta"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fail","{fileCount} faili"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fail ja {folderCount} kaust","1 fail ja {folderCount} kausta"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fail ja 1 kaust","{fileCount} faili ja 1 kaust"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} faili ja {folderCount} kausta",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n peidetud)"," (%n peidetud)"],
+    "_%n file_::_%n files_" : ["%n fail","%n faili"],
+    "_%n folder_::_%n folders_" : ["%n kaust","%n kausta"],
    "Filename must not be empty." : "Failinimi ei saa olla tühi.",
    "\"{char}\" is not allowed inside a filename." : "„{char}“ pole failinimedes lubatud.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}“ on reserveeritud nimi ja seda failinimedes ei saa kasutada.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Viga „{fileName}“ faili kustutamisel.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Teistest kaustadest ei leitud {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Teistest kaustadest otsimiseks sisesta rohkem kui kaks sümbolit",
-    "_%n folder_::_%n folders_" : ["%n kaust","%n kausta"],
-    "_%n file_::_%n files_" : ["%n fail","%n faili"],
    "{dirs} and {files}" : "{dirs} ja {files}",
    "_including %n hidden_::_including %n hidden_" : ["sealhulgas %n peidetud","sealhulgas %n peidetud"],
    "You do not have permission to upload or create files here" : "Sul pole luba siia faile lisada ja üles laadida",
@ -444,6 +438,11 @@
    "Edit file locally" : "Muuda faili kohalikus seadmes",
    "Edit online" : "Muuda võrgus",
    "Create new templates folder" : "Loo uus mallide kaust",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kaust","{folderCount} kausta"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fail","{fileCount} faili"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fail ja {folderCount} kaust","1 fail ja {folderCount} kausta"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fail ja 1 kaust","{fileCount} faili ja 1 kaust"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} faili ja {folderCount} kausta",
    "List of favorites files and folders." : "Lemmikfailide ja kaustade loend.",
    "Personal Files" : "Isiklikud Failid",
    "Text file" : "Tekstifail",
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@ -297,11 +297,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, egiaztatu egunkariak edo jarri administratzailearekin harremanetan",
    "Storage is temporarily not available" : "Biltegia ez dago erabilgarri aldi baterako",
    "Unexpected error: {error}" : "Ustekabeko errorea: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["Karpeta {folderCount}","{folderCount} karpeta"],
-    "_{fileCount} file_::_{fileCount} files_" : ["Fitxategi {fileCount}","{fileCount} fitxategi"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["Fitxategi 1 eta karpeta {folderCount}","Fitxategi 1 eta {folderCount} karpeta"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["Fitxategi {fileCount} eta karpeta 1","{fileCount} fitxategi eta karpeta 1"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxategi eta {folderCount} fitxategi",
+    "_%n file_::_%n files_" : ["Fitxategi %n","%n fitxategi"],
+    "_%n folder_::_%n folders_" : ["Karpeta %n","%n karpeta"],
    "Filename must not be empty." : "Fitxategi-izenak ez du hutsik egon behar.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ez da onartzen fitxategi-izen baten barruan.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" izen erreserbatua da eta ez da onartzen fitxategi-izenetan.",
@ -375,8 +372,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Errorea \"{fileName}\" fitxategia ezabatzerakoan.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ez da '{tag}{filter}{endtag}' bilaketarako emaitzarik aurkitu beste karpetetan",
    "Enter more than two characters to search in other folders" : "Sartu bi karaktere baino gehiago beste karpetetan bilatu ahal izateko",
-    "_%n folder_::_%n folders_" : ["Karpeta %n","%n karpeta"],
-    "_%n file_::_%n files_" : ["Fitxategi %n","%n fitxategi"],
    "{dirs} and {files}" : "{dirs} eta {files}",
    "_including %n hidden_::_including %n hidden_" : ["ezkutuko %n barne","ezkutuko %n barne"],
    "You do not have permission to upload or create files here" : "Ez duzu hemen fitxategiak igotzeko edo sortzeko baimenik",
@ -415,6 +410,11 @@ OC.L10N.register(
    "Edit file locally" : "Editatu fitxategia lokalean",
    "Edit online" : "Editatu sarean",
    "Create new templates folder" : "Sortu txantiloi karpeta berria",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["Karpeta {folderCount}","{folderCount} karpeta"],
+    "_{fileCount} file_::_{fileCount} files_" : ["Fitxategi {fileCount}","{fileCount} fitxategi"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["Fitxategi 1 eta karpeta {folderCount}","Fitxategi 1 eta {folderCount} karpeta"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["Fitxategi {fileCount} eta karpeta 1","{fileCount} fitxategi eta karpeta 1"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxategi eta {folderCount} fitxategi",
    "List of favorites files and folders." : "Fitxategi eta karpeta gogokoen zerrenda.",
    "Personal Files" : "Fitxategi pertsonalak",
    "Text file" : "Testu-fitxategia",
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@ -295,11 +295,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Direktorio hau ez dago erabilgarri, egiaztatu egunkariak edo jarri administratzailearekin harremanetan",
    "Storage is temporarily not available" : "Biltegia ez dago erabilgarri aldi baterako",
    "Unexpected error: {error}" : "Ustekabeko errorea: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["Karpeta {folderCount}","{folderCount} karpeta"],
-    "_{fileCount} file_::_{fileCount} files_" : ["Fitxategi {fileCount}","{fileCount} fitxategi"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["Fitxategi 1 eta karpeta {folderCount}","Fitxategi 1 eta {folderCount} karpeta"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["Fitxategi {fileCount} eta karpeta 1","{fileCount} fitxategi eta karpeta 1"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxategi eta {folderCount} fitxategi",
+    "_%n file_::_%n files_" : ["Fitxategi %n","%n fitxategi"],
+    "_%n folder_::_%n folders_" : ["Karpeta %n","%n karpeta"],
    "Filename must not be empty." : "Fitxategi-izenak ez du hutsik egon behar.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ez da onartzen fitxategi-izen baten barruan.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" izen erreserbatua da eta ez da onartzen fitxategi-izenetan.",
@ -373,8 +370,6 @@
    "Error deleting file \"{fileName}\"." : "Errorea \"{fileName}\" fitxategia ezabatzerakoan.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ez da '{tag}{filter}{endtag}' bilaketarako emaitzarik aurkitu beste karpetetan",
    "Enter more than two characters to search in other folders" : "Sartu bi karaktere baino gehiago beste karpetetan bilatu ahal izateko",
-    "_%n folder_::_%n folders_" : ["Karpeta %n","%n karpeta"],
-    "_%n file_::_%n files_" : ["Fitxategi %n","%n fitxategi"],
    "{dirs} and {files}" : "{dirs} eta {files}",
    "_including %n hidden_::_including %n hidden_" : ["ezkutuko %n barne","ezkutuko %n barne"],
    "You do not have permission to upload or create files here" : "Ez duzu hemen fitxategiak igotzeko edo sortzeko baimenik",
@ -413,6 +408,11 @@
    "Edit file locally" : "Editatu fitxategia lokalean",
    "Edit online" : "Editatu sarean",
    "Create new templates folder" : "Sortu txantiloi karpeta berria",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["Karpeta {folderCount}","{folderCount} karpeta"],
+    "_{fileCount} file_::_{fileCount} files_" : ["Fitxategi {fileCount}","{fileCount} fitxategi"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["Fitxategi 1 eta karpeta {folderCount}","Fitxategi 1 eta {folderCount} karpeta"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["Fitxategi {fileCount} eta karpeta 1","{fileCount} fitxategi eta karpeta 1"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fitxategi eta {folderCount} fitxategi",
    "List of favorites files and folders." : "Fitxategi eta karpeta gogokoen zerrenda.",
    "Personal Files" : "Fitxategi pertsonalak",
    "Text file" : "Testu-fitxategia",
--- a/apps/files/l10n/fa.js
+++ b/apps/files/l10n/fa.js
@ -178,8 +178,8 @@ OC.L10N.register(
    "This operation is forbidden" : "این عملیات غیرمجاز است",
    "This directory is unavailable, please check the logs or contact the administrator" : "پوشه‌ در دسترس نیست، لطفا لاگ‌ها را بررسی کنید یا به مدیر سیستم اطلاع دهید",
    "Storage is temporarily not available" : "ذخیره سازی به طور موقت در دسترس نیست",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} پوشه","{folderCount} پوشه"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} پرونده","{fileCount} پرونده"],
+    "_%n file_::_%n files_" : ["%n فایل","%n فایل"],
+    "_%n folder_::_%n folders_" : ["%n پوشه","%n پوشه"],
    "No favorites yet" : "هنوز مورد دلخواه وجود ندارد",
    "Files and folders you mark as favorite will show up here" : "فایل‌ها و پوشه‌های انتخاب شده به عنوان برگزیده توسط شما، در اینجا نمایش داده می‌شود",
    "All files" : "تمامی فایل‌ها",
@ -239,8 +239,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "خطای حذف پروندهٔ \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "جستجو در پوشه های دیگر برای {tag}{filter}{endtag} یافت نشد",
    "Enter more than two characters to search in other folders" : "برای جستجو در پوشه های دیگر بیش از دو کاراکتر وارد کنید",
-    "_%n folder_::_%n folders_" : ["%n پوشه","%n پوشه"],
-    "_%n file_::_%n files_" : ["%n فایل","%n فایل"],
    "{dirs} and {files}" : "{dirs} و {files}",
    "_including %n hidden_::_including %n hidden_" : ["از جمله %nپنهان","از جمله %nپنهان"],
    "You do not have permission to upload or create files here" : "شما اجازه آپلود یا ایجاد فایل در اینجا را ندارید",
@ -274,6 +272,8 @@ OC.L10N.register(
    "Open the files app settings" : "تنظیمات برنامه فایل ها را باز کنید",
    "Unable to change the favourite state of the file" : "امکان تغییر حالت دلخواه فایل وجود ندارد",
    "Create new templates folder" : "پوشه قالب های جدید ایجاد کنید",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} پوشه","{folderCount} پوشه"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} پرونده","{fileCount} پرونده"],
    "List of favorites files and folders." : "لیست فایل ها و پوشه های مورد علاقه",
    "Text file" : "فایل متنی",
    "New text file.txt" : "پروندهٔ متنی جدید با پسوند txt"
--- a/apps/files/l10n/fa.json
+++ b/apps/files/l10n/fa.json
@ -176,8 +176,8 @@
    "This operation is forbidden" : "این عملیات غیرمجاز است",
    "This directory is unavailable, please check the logs or contact the administrator" : "پوشه‌ در دسترس نیست، لطفا لاگ‌ها را بررسی کنید یا به مدیر سیستم اطلاع دهید",
    "Storage is temporarily not available" : "ذخیره سازی به طور موقت در دسترس نیست",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} پوشه","{folderCount} پوشه"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} پرونده","{fileCount} پرونده"],
+    "_%n file_::_%n files_" : ["%n فایل","%n فایل"],
+    "_%n folder_::_%n folders_" : ["%n پوشه","%n پوشه"],
    "No favorites yet" : "هنوز مورد دلخواه وجود ندارد",
    "Files and folders you mark as favorite will show up here" : "فایل‌ها و پوشه‌های انتخاب شده به عنوان برگزیده توسط شما، در اینجا نمایش داده می‌شود",
    "All files" : "تمامی فایل‌ها",
@ -237,8 +237,6 @@
    "Error deleting file \"{fileName}\"." : "خطای حذف پروندهٔ \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "جستجو در پوشه های دیگر برای {tag}{filter}{endtag} یافت نشد",
    "Enter more than two characters to search in other folders" : "برای جستجو در پوشه های دیگر بیش از دو کاراکتر وارد کنید",
-    "_%n folder_::_%n folders_" : ["%n پوشه","%n پوشه"],
-    "_%n file_::_%n files_" : ["%n فایل","%n فایل"],
    "{dirs} and {files}" : "{dirs} و {files}",
    "_including %n hidden_::_including %n hidden_" : ["از جمله %nپنهان","از جمله %nپنهان"],
    "You do not have permission to upload or create files here" : "شما اجازه آپلود یا ایجاد فایل در اینجا را ندارید",
@ -272,6 +270,8 @@
    "Open the files app settings" : "تنظیمات برنامه فایل ها را باز کنید",
    "Unable to change the favourite state of the file" : "امکان تغییر حالت دلخواه فایل وجود ندارد",
    "Create new templates folder" : "پوشه قالب های جدید ایجاد کنید",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} پوشه","{folderCount} پوشه"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} پرونده","{fileCount} پرونده"],
    "List of favorites files and folders." : "لیست فایل ها و پوشه های مورد علاقه",
    "Text file" : "فایل متنی",
    "New text file.txt" : "پروندهٔ متنی جدید با پسوند txt"
--- a/apps/files/l10n/fi.js
+++ b/apps/files/l10n/fi.js
@ -288,12 +288,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Hakemisto ei ole käytettävissä. Tarkista lokit tai ole yhteydessä ylläpitoon.",
    "Storage is temporarily not available" : "Tallennustila on tilapäisesti pois käytöstä",
    "Unexpected error: {error}" : "Odottamaton virhe: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kansio","{folderCount} kansiota"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} tiedosto","{fileCount} tiedostoa"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tiedosto ja {folderCount} kansio","1 tiedosto ja {folderCount} kansiota"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} tiedosto ja 1 kansio","{fileCount} tiedostoa ja 1 kansio"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} tiedostoa ja {folderCount} kansiota",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n piilotettu)"," (%n piilotettu)"],
+    "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
+    "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
    "Filename must not be empty." : "Tiedostonimi ei voi olla tyhjä.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ei ole sallittu tiedoston nimessä.",
    "\"{extension}\" is not an allowed filetype." : "\"{extension}\" ei ole sallitttu tiedostotyyppi.",
@ -366,8 +362,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Virhe poistaessa tiedostoa \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ei hakutuloksia muissa kansioissa haulla {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Kirjoita enemmän kuin kaksi merkkiä etsiäksesi muista kansioista",
-    "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
-    "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
    "{dirs} and {files}" : "{dirs} ja {files}",
    "_including %n hidden_::_including %n hidden_" : ["Sisältäen %n piilotetun","Sisältäen %n piilotettua"],
    "You do not have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai luomiseen tähän sijaintiin",
@ -406,6 +400,11 @@ OC.L10N.register(
    "Unable to change the favourite state of the file" : "Suosikki-tilan muuttaminen epäonnistui.",
    "Edit file locally" : "Muokkaa tiedostoa paikallisesti",
    "Create new templates folder" : "Luo uusi mallipohjien kansio",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kansio","{folderCount} kansiota"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} tiedosto","{fileCount} tiedostoa"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tiedosto ja {folderCount} kansio","1 tiedosto ja {folderCount} kansiota"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} tiedosto ja 1 kansio","{fileCount} tiedostoa ja 1 kansio"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} tiedostoa ja {folderCount} kansiota",
    "List of favorites files and folders." : "Luettelo suosikkitiedostoista ja -kansioista.",
    "Personal Files" : "Henkilökohtaiset tiedostot",
    "Text file" : "Tekstitiedosto",
--- a/apps/files/l10n/fi.json
+++ b/apps/files/l10n/fi.json
@ -286,12 +286,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Hakemisto ei ole käytettävissä. Tarkista lokit tai ole yhteydessä ylläpitoon.",
    "Storage is temporarily not available" : "Tallennustila on tilapäisesti pois käytöstä",
    "Unexpected error: {error}" : "Odottamaton virhe: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kansio","{folderCount} kansiota"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} tiedosto","{fileCount} tiedostoa"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tiedosto ja {folderCount} kansio","1 tiedosto ja {folderCount} kansiota"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} tiedosto ja 1 kansio","{fileCount} tiedostoa ja 1 kansio"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} tiedostoa ja {folderCount} kansiota",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n piilotettu)"," (%n piilotettu)"],
+    "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
+    "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
    "Filename must not be empty." : "Tiedostonimi ei voi olla tyhjä.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" ei ole sallittu tiedoston nimessä.",
    "\"{extension}\" is not an allowed filetype." : "\"{extension}\" ei ole sallitttu tiedostotyyppi.",
@ -364,8 +360,6 @@
    "Error deleting file \"{fileName}\"." : "Virhe poistaessa tiedostoa \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ei hakutuloksia muissa kansioissa haulla {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Kirjoita enemmän kuin kaksi merkkiä etsiäksesi muista kansioista",
-    "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
-    "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
    "{dirs} and {files}" : "{dirs} ja {files}",
    "_including %n hidden_::_including %n hidden_" : ["Sisältäen %n piilotetun","Sisältäen %n piilotettua"],
    "You do not have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai luomiseen tähän sijaintiin",
@ -404,6 +398,11 @@
    "Unable to change the favourite state of the file" : "Suosikki-tilan muuttaminen epäonnistui.",
    "Edit file locally" : "Muokkaa tiedostoa paikallisesti",
    "Create new templates folder" : "Luo uusi mallipohjien kansio",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} kansio","{folderCount} kansiota"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} tiedosto","{fileCount} tiedostoa"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tiedosto ja {folderCount} kansio","1 tiedosto ja {folderCount} kansiota"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} tiedosto ja 1 kansio","{fileCount} tiedostoa ja 1 kansio"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} tiedostoa ja {folderCount} kansiota",
    "List of favorites files and folders." : "Luettelo suosikkitiedostoista ja -kansioista.",
    "Personal Files" : "Henkilökohtaiset tiedostot",
    "Text file" : "Tekstitiedosto",
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@ -322,11 +322,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Ce répertoire est indisponible, merci de consulter les journaux ou de contacter votre administrateur",
    "Storage is temporarily not available" : "Le support de stockage est temporairement indisponible",
    "Unexpected error: {error}" : "Erreur inattendue: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} dossier","{folderCount} dossiers","{folderCount} dossiers"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fichier","{fileCount} fichiers","{fileCount} fichiers"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fichier et {folderCount} dossier","1 fichier et {folderCount} dossiers","1 fichier et {folderCount} dossiers"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fichier et 1 dossier","{fileCount} fichiers et 1 dossier","{fileCount} fichiers et 1 dossier"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fichiers et {folderCount} dossiers",
+    "_%n file_::_%n files_" : ["%n fichier","%n fichiers","%n fichiers"],
+    "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers","%n dossiers"],
    "Filename must not be empty." : "Le nom du fichier ne doit pas être vide.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" n'est pas autorisé dans un nom de fichier.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" est un nom réservé et il n'est pas autorisé dans les noms de fichier.",
@ -400,8 +397,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Erreur à la suppression du fichier \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Aucun résultat dans d'autres dossiers pour {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Entrez plus de deux caractères pour effectuer une recherche dans d'autres dossiers",
-    "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers","%n dossiers"],
-    "_%n file_::_%n files_" : ["%n fichier","%n fichiers","%n fichiers"],
    "{dirs} and {files}" : "{dirs} et {files}",
    "_including %n hidden_::_including %n hidden_" : ["dont %n masqué","dont %n masqués","dont %n masqués"],
    "You do not have permission to upload or create files here" : "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
@ -441,6 +436,11 @@ OC.L10N.register(
    "Edit file locally" : "Éditer le fichier localement",
    "Edit online" : "Éditer en ligne",
    "Create new templates folder" : "Créer un nouveau dossier de modèles",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} dossier","{folderCount} dossiers","{folderCount} dossiers"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fichier","{fileCount} fichiers","{fileCount} fichiers"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fichier et {folderCount} dossier","1 fichier et {folderCount} dossiers","1 fichier et {folderCount} dossiers"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fichier et 1 dossier","{fileCount} fichiers et 1 dossier","{fileCount} fichiers et 1 dossier"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fichiers et {folderCount} dossiers",
    "List of favorites files and folders." : "Liste des fichiers et dossiers favoris.",
    "Personal Files" : "Fichiers personnels",
    "Text file" : "Fichier texte",
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@ -320,11 +320,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Ce répertoire est indisponible, merci de consulter les journaux ou de contacter votre administrateur",
    "Storage is temporarily not available" : "Le support de stockage est temporairement indisponible",
    "Unexpected error: {error}" : "Erreur inattendue: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} dossier","{folderCount} dossiers","{folderCount} dossiers"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fichier","{fileCount} fichiers","{fileCount} fichiers"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fichier et {folderCount} dossier","1 fichier et {folderCount} dossiers","1 fichier et {folderCount} dossiers"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fichier et 1 dossier","{fileCount} fichiers et 1 dossier","{fileCount} fichiers et 1 dossier"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fichiers et {folderCount} dossiers",
+    "_%n file_::_%n files_" : ["%n fichier","%n fichiers","%n fichiers"],
+    "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers","%n dossiers"],
    "Filename must not be empty." : "Le nom du fichier ne doit pas être vide.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" n'est pas autorisé dans un nom de fichier.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" est un nom réservé et il n'est pas autorisé dans les noms de fichier.",
@ -398,8 +395,6 @@
    "Error deleting file \"{fileName}\"." : "Erreur à la suppression du fichier \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Aucun résultat dans d'autres dossiers pour {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Entrez plus de deux caractères pour effectuer une recherche dans d'autres dossiers",
-    "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers","%n dossiers"],
-    "_%n file_::_%n files_" : ["%n fichier","%n fichiers","%n fichiers"],
    "{dirs} and {files}" : "{dirs} et {files}",
    "_including %n hidden_::_including %n hidden_" : ["dont %n masqué","dont %n masqués","dont %n masqués"],
    "You do not have permission to upload or create files here" : "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
@ -439,6 +434,11 @@
    "Edit file locally" : "Éditer le fichier localement",
    "Edit online" : "Éditer en ligne",
    "Create new templates folder" : "Créer un nouveau dossier de modèles",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} dossier","{folderCount} dossiers","{folderCount} dossiers"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fichier","{fileCount} fichiers","{fileCount} fichiers"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fichier et {folderCount} dossier","1 fichier et {folderCount} dossiers","1 fichier et {folderCount} dossiers"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fichier et 1 dossier","{fileCount} fichiers et 1 dossier","{fileCount} fichiers et 1 dossier"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fichiers et {folderCount} dossiers",
    "List of favorites files and folders." : "Liste des fichiers et dossiers favoris.",
    "Personal Files" : "Fichiers personnels",
    "Text file" : "Fichier texte",
--- a/apps/files/l10n/ga.js
+++ b/apps/files/l10n/ga.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Níl an t-eolaire seo ar fáil, seiceáil na logaí nó déan teagmháil leis an riarthóir le do thoil",
    "Storage is temporarily not available" : "Níl stóráil ar fáil go sealadach",
    "Unexpected error: {error}" : "Earráid gan choinne: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} fillteán","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} comhad","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 chomhad agus {folderCount} fillteán","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} comhad agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán"],
-    "{fileCount} files and {folderCount} folders" : "comhaid {fileCount} agus fillteáin {folderCount}",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n i bhfolach)","(%n i bhfolach)","(%n i bhfolach)","(%n i bhfolach)","(%n i bhfolach)"],
+    "_%n file_::_%n files_" : ["%n comhad","%n comhaid","%n comhaid","%n comhaid","%n comhaid"],
+    "_%n folder_::_%n folders_" : ["%n fillteán","%n fillteáin","%n fillteáin","%n fillteáin","%n fillteáin"],
    "Filename must not be empty." : "Ní ceadmhach ainm an chomhaid a bheith folamh.",
    "\"{char}\" is not allowed inside a filename." : "Ní cheadaítear \"{char}\" taobh istigh d'ainm comhaid.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "Is ainm forchoimeádta é \"{segment}\" agus ní cheadaítear é d'ainmneacha comhaid.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Earráid agus comhad \"{fileName}\" á scriosadh.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Níl aon toradh cuardaigh i bhfillteáin eile le haghaidh {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Cuir isteach níos mó ná dhá charachtar chun cuardach a dhéanamh i bhfillteáin eile",
-    "_%n folder_::_%n folders_" : ["%n fillteán","%n fillteáin","%n fillteáin","%n fillteáin","%n fillteáin"],
-    "_%n file_::_%n files_" : ["%n comhad","%n comhaid","%n comhaid","%n comhaid","%n comhaid"],
    "{dirs} and {files}" : "{dirs} agus {files}",
    "_including %n hidden_::_including %n hidden_" : ["lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach"],
    "You do not have permission to upload or create files here" : "Níl cead agat comhaid a uaslódáil nó a chruthú anseo",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Cuir an comhad in eagar go háitiúil",
    "Edit online" : "Cuir in eagar ar líne",
    "Create new templates folder" : "Cruthaigh fillteán teimpléid nua",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} fillteán","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} comhad","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 chomhad agus {folderCount} fillteán","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} comhad agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán"],
+    "{fileCount} files and {folderCount} folders" : "comhaid {fileCount} agus fillteáin {folderCount}",
    "List of favorites files and folders." : "Liosta de na comhaid is ansa leat agus fillteáin.",
    "Personal Files" : "Comhaid Phearsanta",
    "Text file" : "Comhad téacs",
--- a/apps/files/l10n/ga.json
+++ b/apps/files/l10n/ga.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Níl an t-eolaire seo ar fáil, seiceáil na logaí nó déan teagmháil leis an riarthóir le do thoil",
    "Storage is temporarily not available" : "Níl stóráil ar fáil go sealadach",
    "Unexpected error: {error}" : "Earráid gan choinne: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} fillteán","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} comhad","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 chomhad agus {folderCount} fillteán","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} comhad agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán"],
-    "{fileCount} files and {folderCount} folders" : "comhaid {fileCount} agus fillteáin {folderCount}",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n i bhfolach)","(%n i bhfolach)","(%n i bhfolach)","(%n i bhfolach)","(%n i bhfolach)"],
+    "_%n file_::_%n files_" : ["%n comhad","%n comhaid","%n comhaid","%n comhaid","%n comhaid"],
+    "_%n folder_::_%n folders_" : ["%n fillteán","%n fillteáin","%n fillteáin","%n fillteáin","%n fillteáin"],
    "Filename must not be empty." : "Ní ceadmhach ainm an chomhaid a bheith folamh.",
    "\"{char}\" is not allowed inside a filename." : "Ní cheadaítear \"{char}\" taobh istigh d'ainm comhaid.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "Is ainm forchoimeádta é \"{segment}\" agus ní cheadaítear é d'ainmneacha comhaid.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Earráid agus comhad \"{fileName}\" á scriosadh.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Níl aon toradh cuardaigh i bhfillteáin eile le haghaidh {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Cuir isteach níos mó ná dhá charachtar chun cuardach a dhéanamh i bhfillteáin eile",
-    "_%n folder_::_%n folders_" : ["%n fillteán","%n fillteáin","%n fillteáin","%n fillteáin","%n fillteáin"],
-    "_%n file_::_%n files_" : ["%n comhad","%n comhaid","%n comhaid","%n comhaid","%n comhaid"],
    "{dirs} and {files}" : "{dirs} agus {files}",
    "_including %n hidden_::_including %n hidden_" : ["lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach","lena n-áirítear %n i bhfolach"],
    "You do not have permission to upload or create files here" : "Níl cead agat comhaid a uaslódáil nó a chruthú anseo",
@ -444,6 +438,11 @@
    "Edit file locally" : "Cuir an comhad in eagar go háitiúil",
    "Edit online" : "Cuir in eagar ar líne",
    "Create new templates folder" : "Cruthaigh fillteán teimpléid nua",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} fillteán","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin","{folderCount} fillteáin"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} comhad","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid","{fileCount} comhaid"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 chomhad agus {folderCount} fillteán","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin","1 chomhad agus {folderCount} fillteáin"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} comhad agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán","{fileCount} comhaid agus 1 fillteán"],
+    "{fileCount} files and {folderCount} folders" : "comhaid {fileCount} agus fillteáin {folderCount}",
    "List of favorites files and folders." : "Liosta de na comhaid is ansa leat agus fillteáin.",
    "Personal Files" : "Comhaid Phearsanta",
    "Text file" : "Comhad téacs",
--- a/apps/files/l10n/gl.js
+++ b/apps/files/l10n/gl.js
@ -324,11 +324,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Este directorio non está dispoñíbel, consulte os ficheiros de rexistro ou póñase en contacto coa administración desta instancia.",
    "Storage is temporarily not available" : "O almacenamento non está dispoñíbel temporalmente",
    "Unexpected error: {error}" : "Produciuse un erro non agardado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartafol","{folderCount} cartafoles"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheiro","{fileCount} ficheiros"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheiro e {folderCount} cartafol","1 ficheiro e {folderCount} cartafoles"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheiro e 1 cartafol","{fileCount} ficheiros e 1 cartafol"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} cartafoles",
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
    "Filename must not be empty." : "O nome de ficheiro non debe estar baleiro",
    "\"{char}\" is not allowed inside a filename." : "«{char}» non está permitido nun nome de ficheiro.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "«{segment}» é un nome reservado e non está permitido para os nomes de ficheiro.",
@ -402,8 +399,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Produciuse un erro ao eliminar o ficheiro «{fileName}».",
    "No search results in other folders for {tag}{filter}{endtag}" : "Non foi posíbel atopar resultados de busca noutros cartafoles para {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduza máis de dous caracteres para buscar noutros cartafoles",
-    "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
-    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluíndo %n agachado","incluíndo %n agochados"],
    "You do not have permission to upload or create files here" : "Non ten permiso para enviar ou crear ficheiros aquí",
@ -443,6 +438,11 @@ OC.L10N.register(
    "Edit file locally" : "Editar o ficheiro localmente",
    "Edit online" : "Editar en liña",
    "Create new templates folder" : "Crear un novo cartafol de modelos",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartafol","{folderCount} cartafoles"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheiro","{fileCount} ficheiros"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheiro e {folderCount} cartafol","1 ficheiro e {folderCount} cartafoles"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheiro e 1 cartafol","{fileCount} ficheiros e 1 cartafol"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} cartafoles",
    "List of favorites files and folders." : "Lista de ficheiros e cartafoles favoritos.",
    "Personal Files" : "Ficheiros persoais",
    "Text file" : "Ficheiro de texto",
--- a/apps/files/l10n/gl.json
+++ b/apps/files/l10n/gl.json
@ -322,11 +322,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Este directorio non está dispoñíbel, consulte os ficheiros de rexistro ou póñase en contacto coa administración desta instancia.",
    "Storage is temporarily not available" : "O almacenamento non está dispoñíbel temporalmente",
    "Unexpected error: {error}" : "Produciuse un erro non agardado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartafol","{folderCount} cartafoles"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheiro","{fileCount} ficheiros"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheiro e {folderCount} cartafol","1 ficheiro e {folderCount} cartafoles"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheiro e 1 cartafol","{fileCount} ficheiros e 1 cartafol"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} cartafoles",
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
    "Filename must not be empty." : "O nome de ficheiro non debe estar baleiro",
    "\"{char}\" is not allowed inside a filename." : "«{char}» non está permitido nun nome de ficheiro.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "«{segment}» é un nome reservado e non está permitido para os nomes de ficheiro.",
@ -400,8 +397,6 @@
    "Error deleting file \"{fileName}\"." : "Produciuse un erro ao eliminar o ficheiro «{fileName}».",
    "No search results in other folders for {tag}{filter}{endtag}" : "Non foi posíbel atopar resultados de busca noutros cartafoles para {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduza máis de dous caracteres para buscar noutros cartafoles",
-    "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
-    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluíndo %n agachado","incluíndo %n agochados"],
    "You do not have permission to upload or create files here" : "Non ten permiso para enviar ou crear ficheiros aquí",
@ -441,6 +436,11 @@
    "Edit file locally" : "Editar o ficheiro localmente",
    "Edit online" : "Editar en liña",
    "Create new templates folder" : "Crear un novo cartafol de modelos",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartafol","{folderCount} cartafoles"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ficheiro","{fileCount} ficheiros"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ficheiro e {folderCount} cartafol","1 ficheiro e {folderCount} cartafoles"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ficheiro e 1 cartafol","{fileCount} ficheiros e 1 cartafol"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} cartafoles",
    "List of favorites files and folders." : "Lista de ficheiros e cartafoles favoritos.",
    "Personal Files" : "Ficheiros persoais",
    "Text file" : "Ficheiro de texto",
--- a/apps/files/l10n/hu.js
+++ b/apps/files/l10n/hu.js
@ -310,11 +310,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Ez a könyvtár nem érhető el, nézze meg a naplófájlokat vagy lépjen kapcsolatba az adminisztrátorral",
    "Storage is temporarily not available" : "A tároló átmenetileg nem érhető el",
    "Unexpected error: {error}" : "Váratlan hiba: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} mappa"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fájl","{fileCount} fájl"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fájl és {folderCount} mappa","1 fájl és {folderCount} mappa"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fájl és 1 mappa","{fileCount} fájl és 1 mappa"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fájl és {folderCount} mappa",
+    "_%n file_::_%n files_" : ["%n fájl","%n fájl"],
+    "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
    "Filename must not be empty." : "A fájlnév nem lehet üres.",
    "\"{char}\" is not allowed inside a filename." : "„{char}” nem szerepelhet a fájlnévben.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "A(z) „{segment}” egy fenntartott név és fájlnevek esetén nem engedélyezett.",
@ -388,8 +385,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Hiba történt a(z) „{fileName}” fájl törlése során.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ehhez nincsenek találatok más mappákban: {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Vigyen be legalább két karaktert a más mappákban való kereséshez",
-    "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
-    "_%n file_::_%n files_" : ["%n fájl","%n fájl"],
    "{dirs} and {files}" : "{dirs} és {files}",
    "_including %n hidden_::_including %n hidden_" : ["köztük %n rejtett","köztük %n rejtett"],
    "You do not have permission to upload or create files here" : "Nincs jogosultsága fájlok ide feltöltéséhez vagy létrehozásához",
@ -428,6 +423,11 @@ OC.L10N.register(
    "Edit file locally" : "Fájl helyi szerkesztése",
    "Edit online" : "Online szerkesztés",
    "Create new templates folder" : "Új sablonmappa létrehozása",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} mappa"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fájl","{fileCount} fájl"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fájl és {folderCount} mappa","1 fájl és {folderCount} mappa"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fájl és 1 mappa","{fileCount} fájl és 1 mappa"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fájl és {folderCount} mappa",
    "List of favorites files and folders." : "Kedvenc fájlok és mappák felsorolása.",
    "Personal Files" : "Személyes fájlok",
    "Text file" : "Szövegfájl",
--- a/apps/files/l10n/hu.json
+++ b/apps/files/l10n/hu.json
@ -308,11 +308,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Ez a könyvtár nem érhető el, nézze meg a naplófájlokat vagy lépjen kapcsolatba az adminisztrátorral",
    "Storage is temporarily not available" : "A tároló átmenetileg nem érhető el",
    "Unexpected error: {error}" : "Váratlan hiba: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} mappa"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fájl","{fileCount} fájl"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fájl és {folderCount} mappa","1 fájl és {folderCount} mappa"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fájl és 1 mappa","{fileCount} fájl és 1 mappa"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fájl és {folderCount} mappa",
+    "_%n file_::_%n files_" : ["%n fájl","%n fájl"],
+    "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
    "Filename must not be empty." : "A fájlnév nem lehet üres.",
    "\"{char}\" is not allowed inside a filename." : "„{char}” nem szerepelhet a fájlnévben.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "A(z) „{segment}” egy fenntartott név és fájlnevek esetén nem engedélyezett.",
@ -386,8 +383,6 @@
    "Error deleting file \"{fileName}\"." : "Hiba történt a(z) „{fileName}” fájl törlése során.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ehhez nincsenek találatok más mappákban: {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Vigyen be legalább két karaktert a más mappákban való kereséshez",
-    "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
-    "_%n file_::_%n files_" : ["%n fájl","%n fájl"],
    "{dirs} and {files}" : "{dirs} és {files}",
    "_including %n hidden_::_including %n hidden_" : ["köztük %n rejtett","köztük %n rejtett"],
    "You do not have permission to upload or create files here" : "Nincs jogosultsága fájlok ide feltöltéséhez vagy létrehozásához",
@ -426,6 +421,11 @@
    "Edit file locally" : "Fájl helyi szerkesztése",
    "Edit online" : "Online szerkesztés",
    "Create new templates folder" : "Új sablonmappa létrehozása",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} mappa"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fájl","{fileCount} fájl"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fájl és {folderCount} mappa","1 fájl és {folderCount} mappa"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fájl és 1 mappa","{fileCount} fájl és 1 mappa"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fájl és {folderCount} mappa",
    "List of favorites files and folders." : "Kedvenc fájlok és mappák felsorolása.",
    "Personal Files" : "Személyes fájlok",
    "Text file" : "Szövegfájl",
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@ -143,6 +143,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Operasi ini dilarang",
    "This directory is unavailable, please check the logs or contact the administrator" : "Direktori ini tidak tersedia, silakan periksa log atau hubungi kontak",
    "Storage is temporarily not available" : "Penyimpanan sementara tidak tersedia",
+    "_%n file_::_%n files_" : ["%n berkas"],
+    "_%n folder_::_%n folders_" : ["%n folder"],
    "No favorites yet" : "Belum memiliki favorit",
    "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan di sini.",
    "All files" : "Semua berkas",
@ -199,8 +201,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Terjadi kesalahan saat menghapus berkas \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Hasil pencarian tidak ditemukan di folder lainnya untuk '{tag}{filter}{endtag}'",
    "Enter more than two characters to search in other folders" : "Masukkan lebih dari dua karakter untuk mencari di folder lain",
-    "_%n folder_::_%n folders_" : ["%n folder"],
-    "_%n file_::_%n files_" : ["%n berkas"],
    "{dirs} and {files}" : "{dirs} dan {files}",
    "_including %n hidden_::_including %n hidden_" : ["Termasuk %n tersembunyi"],
    "You do not have permission to upload or create files here" : "Anda tidak memiliki izin untuk mengunggah atau membuat berkas di sini",
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@ -141,6 +141,8 @@
    "This operation is forbidden" : "Operasi ini dilarang",
    "This directory is unavailable, please check the logs or contact the administrator" : "Direktori ini tidak tersedia, silakan periksa log atau hubungi kontak",
    "Storage is temporarily not available" : "Penyimpanan sementara tidak tersedia",
+    "_%n file_::_%n files_" : ["%n berkas"],
+    "_%n folder_::_%n folders_" : ["%n folder"],
    "No favorites yet" : "Belum memiliki favorit",
    "Files and folders you mark as favorite will show up here" : "Berkas dan folder yang Anda tandai sebagai favorit akan ditampilkan di sini.",
    "All files" : "Semua berkas",
@ -197,8 +199,6 @@
    "Error deleting file \"{fileName}\"." : "Terjadi kesalahan saat menghapus berkas \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Hasil pencarian tidak ditemukan di folder lainnya untuk '{tag}{filter}{endtag}'",
    "Enter more than two characters to search in other folders" : "Masukkan lebih dari dua karakter untuk mencari di folder lain",
-    "_%n folder_::_%n folders_" : ["%n folder"],
-    "_%n file_::_%n files_" : ["%n berkas"],
    "{dirs} and {files}" : "{dirs} dan {files}",
    "_including %n hidden_::_including %n hidden_" : ["Termasuk %n tersembunyi"],
    "You do not have permission to upload or create files here" : "Anda tidak memiliki izin untuk mengunggah atau membuat berkas di sini",
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@ -307,11 +307,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Þessi mappa er ekki tiltæk, athugaðu atvikaskrár eða hafðu samband við kerfissjóra",
    "Storage is temporarily not available" : "Gagnageymsla ekki tiltæk í augnablikinu",
    "Unexpected error: {error}" : "Óvænt villa: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} möppur"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} skrá","{fileCount} skrár"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 skrá og {folderCount} mappa","1 skrá og {folderCount} möppur"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} skrá og 1 mappa","{fileCount} skrár og 1 mappa"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} skrár og {folderCount} möppur",
+    "_%n file_::_%n files_" : ["%n skrá","%n skrár"],
+    "_%n folder_::_%n folders_" : ["%n mappa","%n möppur"],
    "Filename must not be empty." : "Skráarheiti má ekki vera tómt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" er er ekki leyfilegt innan í skráarheiti.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" er frátekið heiti og er ekki leyft í skráaheitum.",
@ -385,8 +382,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Villa við að eyða skránni \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Engar leitarniðurstöður í öðrum möppum fyrir {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Settu inn fleiri en tvo stafi til að leita í öðrum möppum",
-    "_%n folder_::_%n folders_" : ["%n mappa","%n möppur"],
-    "_%n file_::_%n files_" : ["%n skrá","%n skrár"],
    "{dirs} and {files}" : "{dirs} og {files}",
    "_including %n hidden_::_including %n hidden_" : ["þar á meðal %n falin","þar á meðal %n faldar"],
    "You do not have permission to upload or create files here" : "Þú hefur ekki heimild til að senda inn eða búa til skrár hér",
@ -425,6 +420,11 @@ OC.L10N.register(
    "Edit file locally" : "Breyta skrá á tölvunni",
    "Edit online" : "Breyta á netinu",
    "Create new templates folder" : "Búa til nýja sniðmátamöppu",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} möppur"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} skrá","{fileCount} skrár"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 skrá og {folderCount} mappa","1 skrá og {folderCount} möppur"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} skrá og 1 mappa","{fileCount} skrár og 1 mappa"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} skrár og {folderCount} möppur",
    "List of favorites files and folders." : "Listi yfir eftirlætisskrár og möppur.",
    "Personal Files" : "Einkaskrár",
    "Text file" : "Textaskrá",
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@ -305,11 +305,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Þessi mappa er ekki tiltæk, athugaðu atvikaskrár eða hafðu samband við kerfissjóra",
    "Storage is temporarily not available" : "Gagnageymsla ekki tiltæk í augnablikinu",
    "Unexpected error: {error}" : "Óvænt villa: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} möppur"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} skrá","{fileCount} skrár"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 skrá og {folderCount} mappa","1 skrá og {folderCount} möppur"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} skrá og 1 mappa","{fileCount} skrár og 1 mappa"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} skrár og {folderCount} möppur",
+    "_%n file_::_%n files_" : ["%n skrá","%n skrár"],
+    "_%n folder_::_%n folders_" : ["%n mappa","%n möppur"],
    "Filename must not be empty." : "Skráarheiti má ekki vera tómt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" er er ekki leyfilegt innan í skráarheiti.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" er frátekið heiti og er ekki leyft í skráaheitum.",
@ -383,8 +380,6 @@
    "Error deleting file \"{fileName}\"." : "Villa við að eyða skránni \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Engar leitarniðurstöður í öðrum möppum fyrir {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Settu inn fleiri en tvo stafi til að leita í öðrum möppum",
-    "_%n folder_::_%n folders_" : ["%n mappa","%n möppur"],
-    "_%n file_::_%n files_" : ["%n skrá","%n skrár"],
    "{dirs} and {files}" : "{dirs} og {files}",
    "_including %n hidden_::_including %n hidden_" : ["þar á meðal %n falin","þar á meðal %n faldar"],
    "You do not have permission to upload or create files here" : "Þú hefur ekki heimild til að senda inn eða búa til skrár hér",
@ -423,6 +418,11 @@
    "Edit file locally" : "Breyta skrá á tölvunni",
    "Edit online" : "Breyta á netinu",
    "Create new templates folder" : "Búa til nýja sniðmátamöppu",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappa","{folderCount} möppur"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} skrá","{fileCount} skrár"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 skrá og {folderCount} mappa","1 skrá og {folderCount} möppur"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} skrá og 1 mappa","{fileCount} skrár og 1 mappa"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} skrár og {folderCount} möppur",
    "List of favorites files and folders." : "Listi yfir eftirlætisskrár og möppur.",
    "Personal Files" : "Einkaskrár",
    "Text file" : "Textaskrá",
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@ -324,11 +324,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Questa cartella non è disponibile, controlla i log o contatta l'amministratore",
    "Storage is temporarily not available" : "L'archiviazione è temporaneamente non disponibile",
    "Unexpected error: {error}" : "Errore imprevisto: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartelle","{folderCount} cartelle"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} file","{fileCount} file"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file e {folderCount} cartella","1 file e {folderCount} cartelle","1 file e {folderCount} cartelle"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file e 1 cartella","{fileCount} file e 1 cartella","{fileCount} file e 1 cartella"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} file e {folderCount} cartelle",
+    "_%n file_::_%n files_" : ["%n file","%n file","%n file"],
+    "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle","%n cartelle"],
    "Filename must not be empty." : "Il nome del file non può essere vuoto.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" non è consentito in un nome di file.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" è un nome riservato e non consentito per i nomi di file.",
@ -402,8 +399,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Errore durante l'eliminazione del file \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nessun risultato di ricerca nelle altre cartelle per {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Digita più di due caratteri per cercare in altre cartelle",
-    "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle","%n cartelle"],
-    "_%n file_::_%n files_" : ["%n file","%n file","%n file"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluso %n nascosto","inclusi %n nascosti","inclusi %n nascosti"],
    "You do not have permission to upload or create files here" : "Non disponi dei permessi per caricare o creare file qui",
@ -443,6 +438,11 @@ OC.L10N.register(
    "Edit file locally" : "Modifica il file localmente",
    "Edit online" : "Modifica online",
    "Create new templates folder" : "Crea una nuova cartella dei modelli",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartelle","{folderCount} cartelle"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} file","{fileCount} file"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file e {folderCount} cartella","1 file e {folderCount} cartelle","1 file e {folderCount} cartelle"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file e 1 cartella","{fileCount} file e 1 cartella","{fileCount} file e 1 cartella"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} file e {folderCount} cartelle",
    "List of favorites files and folders." : "Lista di file e cartelle preferiti.",
    "Personal Files" : "File personali",
    "Text file" : "File di testo",
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@ -322,11 +322,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Questa cartella non è disponibile, controlla i log o contatta l'amministratore",
    "Storage is temporarily not available" : "L'archiviazione è temporaneamente non disponibile",
    "Unexpected error: {error}" : "Errore imprevisto: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartelle","{folderCount} cartelle"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} file","{fileCount} file"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file e {folderCount} cartella","1 file e {folderCount} cartelle","1 file e {folderCount} cartelle"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file e 1 cartella","{fileCount} file e 1 cartella","{fileCount} file e 1 cartella"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} file e {folderCount} cartelle",
+    "_%n file_::_%n files_" : ["%n file","%n file","%n file"],
+    "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle","%n cartelle"],
    "Filename must not be empty." : "Il nome del file non può essere vuoto.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" non è consentito in un nome di file.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" è un nome riservato e non consentito per i nomi di file.",
@ -400,8 +397,6 @@
    "Error deleting file \"{fileName}\"." : "Errore durante l'eliminazione del file \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nessun risultato di ricerca nelle altre cartelle per {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Digita più di due caratteri per cercare in altre cartelle",
-    "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle","%n cartelle"],
-    "_%n file_::_%n files_" : ["%n file","%n file","%n file"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluso %n nascosto","inclusi %n nascosti","inclusi %n nascosti"],
    "You do not have permission to upload or create files here" : "Non disponi dei permessi per caricare o creare file qui",
@ -441,6 +436,11 @@
    "Edit file locally" : "Modifica il file localmente",
    "Edit online" : "Modifica online",
    "Create new templates folder" : "Crea una nuova cartella dei modelli",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartelle","{folderCount} cartelle"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} file","{fileCount} file"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file e {folderCount} cartella","1 file e {folderCount} cartelle","1 file e {folderCount} cartelle"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file e 1 cartella","{fileCount} file e 1 cartella","{fileCount} file e 1 cartella"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} file e {folderCount} cartelle",
    "List of favorites files and folders." : "Lista di file e cartelle preferiti.",
    "Personal Files" : "File personali",
    "Text file" : "File di testo",
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "このディレクトリは利用できません。ログを確認するか管理者に問い合わせてください。",
    "Storage is temporarily not available" : "ストレージは一時的に利用できません",
    "Unexpected error: {error}" : "予期せぬエラー: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} フォルダ"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ファイル"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ファイルと {folderCount} フォルダ"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ファイルと 1 フォルダ"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ファイルと {folderCount} フォルダ",
-    "_(%n hidden)_::_ (%n hidden)_" : [" (%n 非公開)"],
+    "_%n file_::_%n files_" : ["%n 個のファイル"],
+    "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
    "Filename must not be empty." : "ファイル名は空白にできません。",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\"はファイル名には使用できません。",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\"は予約名であり、ファイル名には使用できません。",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "ファイル\"{fileName}\"の削除エラー。",
    "No search results in other folders for {tag}{filter}{endtag}" : "他のフォルダーに {tag}{filter}{endtag} の検索結果はありません",
    "Enter more than two characters to search in other folders" : "他のフォルダーで検索するには、3文字以上を入力してください",
-    "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
-    "_%n file_::_%n files_" : ["%n 個のファイル"],
    "{dirs} and {files}" : "{dirs} と {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n 個の隠しファイルが含まれています"],
    "You do not have permission to upload or create files here" : "ここにファイルをアップロードまたは作成する権限がありません",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "ファイルをローカルで編集",
    "Edit online" : "オンラインで編集",
    "Create new templates folder" : "新しいテンプレートフォルダーを作成",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} フォルダ"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ファイル"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ファイルと {folderCount} フォルダ"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ファイルと 1 フォルダ"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ファイルと {folderCount} フォルダ",
    "List of favorites files and folders." : "お気に入りのファイルやフォルダーの一覧",
    "Personal Files" : "個人ファイル",
    "Text file" : "テキストファイル",
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "このディレクトリは利用できません。ログを確認するか管理者に問い合わせてください。",
    "Storage is temporarily not available" : "ストレージは一時的に利用できません",
    "Unexpected error: {error}" : "予期せぬエラー: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} フォルダ"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ファイル"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ファイルと {folderCount} フォルダ"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ファイルと 1 フォルダ"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ファイルと {folderCount} フォルダ",
-    "_(%n hidden)_::_ (%n hidden)_" : [" (%n 非公開)"],
+    "_%n file_::_%n files_" : ["%n 個のファイル"],
+    "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
    "Filename must not be empty." : "ファイル名は空白にできません。",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\"はファイル名には使用できません。",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\"は予約名であり、ファイル名には使用できません。",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "ファイル\"{fileName}\"の削除エラー。",
    "No search results in other folders for {tag}{filter}{endtag}" : "他のフォルダーに {tag}{filter}{endtag} の検索結果はありません",
    "Enter more than two characters to search in other folders" : "他のフォルダーで検索するには、3文字以上を入力してください",
-    "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
-    "_%n file_::_%n files_" : ["%n 個のファイル"],
    "{dirs} and {files}" : "{dirs} と {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n 個の隠しファイルが含まれています"],
    "You do not have permission to upload or create files here" : "ここにファイルをアップロードまたは作成する権限がありません",
@ -444,6 +438,11 @@
    "Edit file locally" : "ファイルをローカルで編集",
    "Edit online" : "オンラインで編集",
    "Create new templates folder" : "新しいテンプレートフォルダーを作成",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} フォルダ"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} ファイル"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 ファイルと {folderCount} フォルダ"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} ファイルと 1 フォルダ"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ファイルと {folderCount} フォルダ",
    "List of favorites files and folders." : "お気に入りのファイルやフォルダーの一覧",
    "Personal Files" : "個人ファイル",
    "Text file" : "テキストファイル",
--- a/apps/files/l10n/ka.js
+++ b/apps/files/l10n/ka.js
@ -190,11 +190,8 @@ OC.L10N.register(
    "This operation is forbidden" : "This operation is forbidden",
    "This directory is unavailable, please check the logs or contact the administrator" : "This directory is unavailable, please check the logs or contact the administrator",
    "Storage is temporarily not available" : "Storage is temporarily not available",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
+    "_%n file_::_%n files_" : ["%n file","%n files"],
+    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
    "No favorites yet" : "No favorites yet",
    "Files and folders you mark as favorite will show up here" : "Files and folders you mark as favorite will show up here",
    "All files" : "All files",
@ -257,8 +254,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Error deleting file \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Enter more than two characters to search in other folders",
-    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
-    "_%n file_::_%n files_" : ["%n file","%n files"],
    "{dirs} and {files}" : "{dirs} and {files}",
    "_including %n hidden_::_including %n hidden_" : ["including %n hidden","including %n hidden"],
    "You do not have permission to upload or create files here" : "You do not have permission to upload or create files here",
@ -293,6 +288,11 @@ OC.L10N.register(
    "Open the files app settings" : "Open the files app settings",
    "Unable to change the favourite state of the file" : "Unable to change the favourite state of the file",
    "Create new templates folder" : "Create new templates folder",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
    "List of favorites files and folders." : "List of favorites files and folders.",
    "Text file" : "Text file",
    "New text file.txt" : "New text file.txt"
--- a/apps/files/l10n/ka.json
+++ b/apps/files/l10n/ka.json
@ -188,11 +188,8 @@
    "This operation is forbidden" : "This operation is forbidden",
    "This directory is unavailable, please check the logs or contact the administrator" : "This directory is unavailable, please check the logs or contact the administrator",
    "Storage is temporarily not available" : "Storage is temporarily not available",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
+    "_%n file_::_%n files_" : ["%n file","%n files"],
+    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
    "No favorites yet" : "No favorites yet",
    "Files and folders you mark as favorite will show up here" : "Files and folders you mark as favorite will show up here",
    "All files" : "All files",
@ -255,8 +252,6 @@
    "Error deleting file \"{fileName}\"." : "Error deleting file \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "No search results in other folders for {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Enter more than two characters to search in other folders",
-    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
-    "_%n file_::_%n files_" : ["%n file","%n files"],
    "{dirs} and {files}" : "{dirs} and {files}",
    "_including %n hidden_::_including %n hidden_" : ["including %n hidden","including %n hidden"],
    "You do not have permission to upload or create files here" : "You do not have permission to upload or create files here",
@ -291,6 +286,11 @@
    "Open the files app settings" : "Open the files app settings",
    "Unable to change the favourite state of the file" : "Unable to change the favourite state of the file",
    "Create new templates folder" : "Create new templates folder",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} folders"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} file","{fileCount} files"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 file and {folderCount} folder","1 file and {folderCount} folders"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} file and 1 folder","{fileCount} files and 1 folder"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} files and {folderCount} folders",
    "List of favorites files and folders." : "List of favorites files and folders.",
    "Text file" : "Text file",
    "New text file.txt" : "New text file.txt"
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@ -313,11 +313,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "디렉터리를 사용할 수 없습니다. 로그를 확인하거나 관리자에게 연락하십시오",
    "Storage is temporarily not available" : "저장소를 일시적으로 사용할 수 없음",
    "Unexpected error: {error}" : "예상치 못한 오류: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount}개 폴더"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount}개 파일"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1개 파일과 {folderCount}개 폴더"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount}개 파일과 1개 폴더"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount}개 파일과 {folderCount}개 폴더",
+    "_%n file_::_%n files_" : ["파일 %n개"],
+    "_%n folder_::_%n folders_" : ["폴더 %n개"],
    "Filename must not be empty." : "파일 이름을 비울 수 없습니다.",
    "\"{char}\" is not allowed inside a filename." : "파일 이름에 \"{char}\"(을)를 사용할 수 없습니다.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\"(은)는 예약된 이름이므로 파일 이름에 사용할 수 없습니다.",
@ -391,8 +388,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "파일 \"{fileName}\"을(를) 삭제할 수 없습니다.",
    "No search results in other folders for {tag}{filter}{endtag}" : "다른 폴더에 {tag}{filter}{endtag} 검색 결과가 없음",
    "Enter more than two characters to search in other folders" : "다른 폴더에서 검색하기 위해 2글자 이상 입력하세요.",
-    "_%n folder_::_%n folders_" : ["폴더 %n개"],
-    "_%n file_::_%n files_" : ["파일 %n개"],
    "{dirs} and {files}" : "{dirs} 그리고 {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n개의 숨겨진 파일 포함"],
    "You do not have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다.",
@ -432,6 +427,11 @@ OC.L10N.register(
    "Edit file locally" : "로컬에서 파일 편집",
    "Edit online" : "온라인으로 편집",
    "Create new templates folder" : "새로운 템플릿 폴더 만들기",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount}개 폴더"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount}개 파일"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1개 파일과 {folderCount}개 폴더"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount}개 파일과 1개 폴더"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount}개 파일과 {folderCount}개 폴더",
    "List of favorites files and folders." : "즐겨찾는 파일과 폴더의 목록",
    "Personal Files" : "개인 파일",
    "Text file" : "텍스트 파일",
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@ -311,11 +311,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "디렉터리를 사용할 수 없습니다. 로그를 확인하거나 관리자에게 연락하십시오",
    "Storage is temporarily not available" : "저장소를 일시적으로 사용할 수 없음",
    "Unexpected error: {error}" : "예상치 못한 오류: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount}개 폴더"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount}개 파일"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1개 파일과 {folderCount}개 폴더"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount}개 파일과 1개 폴더"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount}개 파일과 {folderCount}개 폴더",
+    "_%n file_::_%n files_" : ["파일 %n개"],
+    "_%n folder_::_%n folders_" : ["폴더 %n개"],
    "Filename must not be empty." : "파일 이름을 비울 수 없습니다.",
    "\"{char}\" is not allowed inside a filename." : "파일 이름에 \"{char}\"(을)를 사용할 수 없습니다.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\"(은)는 예약된 이름이므로 파일 이름에 사용할 수 없습니다.",
@ -389,8 +386,6 @@
    "Error deleting file \"{fileName}\"." : "파일 \"{fileName}\"을(를) 삭제할 수 없습니다.",
    "No search results in other folders for {tag}{filter}{endtag}" : "다른 폴더에 {tag}{filter}{endtag} 검색 결과가 없음",
    "Enter more than two characters to search in other folders" : "다른 폴더에서 검색하기 위해 2글자 이상 입력하세요.",
-    "_%n folder_::_%n folders_" : ["폴더 %n개"],
-    "_%n file_::_%n files_" : ["파일 %n개"],
    "{dirs} and {files}" : "{dirs} 그리고 {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n개의 숨겨진 파일 포함"],
    "You do not have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다.",
@ -430,6 +425,11 @@
    "Edit file locally" : "로컬에서 파일 편집",
    "Edit online" : "온라인으로 편집",
    "Create new templates folder" : "새로운 템플릿 폴더 만들기",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount}개 폴더"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount}개 파일"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1개 파일과 {folderCount}개 폴더"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount}개 파일과 1개 폴더"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount}개 파일과 {folderCount}개 폴더",
    "List of favorites files and folders." : "즐겨찾는 파일과 폴더의 목록",
    "Personal Files" : "개인 파일",
    "Text file" : "텍스트 파일",
--- a/apps/files/l10n/lt_LT.js
+++ b/apps/files/l10n/lt_LT.js
@ -216,10 +216,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Šis katalogas neprieinamas, peržiūrėkite žurnalo įrašus arba susisiekite su administratoriumi",
    "Storage is temporarily not available" : "Saugykla yra laikinai neprieinama",
    "Unexpected error: {error}" : "Netikėta klaida: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} aplankas","{folderCount} aplankai","{folderCount} aplankų","{folderCount} aplankas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} failas","{fileCount} failai","{fileCount} failų","{fileCount} failas"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 failas ir {folderCount} aplankas","1 failas ir {folderCount} aplankai","1 failas ir {folderCount} aplankų","1 failas ir {folderCount} aplankas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} failas ir 1 aplankas","{fileCount} failai ir 1 aplankas","{fileCount} failų ir 1 aplankas","{fileCount} failas ir 1 aplankas"],
+    "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų","%n failas"],
+    "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų","%n aplankas"],
    "Filename must not be empty." : "Failo pavadinimas negali būti tuščias.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}“ yra rezervuotas pavadinimas ir neleidžiamas naudoti failo pavadinimuose.",
    "\"{extension}\" is not an allowed filetype." : "„{extension}“ nėra leidžiamas failo tipas.",
@ -286,8 +284,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Klaida ištrinant failą „{fileName}“.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Kituose aplankuose nėra paieškos rezultatų, skirtų {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Įveskite daugiau nei du simbolius, jei norite ieškoti kituose aplankuose",
-    "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų","%n aplankas"],
-    "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų","%n failas"],
    "{dirs} and {files}" : "{dirs} ir {files}",
    "_including %n hidden_::_including %n hidden_" : ["įskaitant %n paslėptą","įskaitant %n paslėptus","įskaitant %n paslėptų","įskaitant %n paslėptą"],
    "You do not have permission to upload or create files here" : "Neturite teisės įkalti ar kurti failus šioje vietoje",
@ -315,6 +311,10 @@ OC.L10N.register(
    "Storage informations" : "Informacija apie saugyklą",
    "Go to the previous folder" : "Eiti į ankstesnį aplanką",
    "Unable to change the favourite state of the file" : "Nepavyksta pakeisti failo Lankomiausiųjų būsenos",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} aplankas","{folderCount} aplankai","{folderCount} aplankų","{folderCount} aplankas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} failas","{fileCount} failai","{fileCount} failų","{fileCount} failas"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 failas ir {folderCount} aplankas","1 failas ir {folderCount} aplankai","1 failas ir {folderCount} aplankų","1 failas ir {folderCount} aplankas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} failas ir 1 aplankas","{fileCount} failai ir 1 aplankas","{fileCount} failų ir 1 aplankas","{fileCount} failas ir 1 aplankas"],
    "List of favorites files and folders." : "Mėgstamų failų ir aplankų sąrašas.",
    "Personal Files" : "Asmeniniai failai",
    "Text file" : "Tekstinis failas",
--- a/apps/files/l10n/lt_LT.json
+++ b/apps/files/l10n/lt_LT.json
@ -214,10 +214,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Šis katalogas neprieinamas, peržiūrėkite žurnalo įrašus arba susisiekite su administratoriumi",
    "Storage is temporarily not available" : "Saugykla yra laikinai neprieinama",
    "Unexpected error: {error}" : "Netikėta klaida: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} aplankas","{folderCount} aplankai","{folderCount} aplankų","{folderCount} aplankas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} failas","{fileCount} failai","{fileCount} failų","{fileCount} failas"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 failas ir {folderCount} aplankas","1 failas ir {folderCount} aplankai","1 failas ir {folderCount} aplankų","1 failas ir {folderCount} aplankas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} failas ir 1 aplankas","{fileCount} failai ir 1 aplankas","{fileCount} failų ir 1 aplankas","{fileCount} failas ir 1 aplankas"],
+    "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų","%n failas"],
+    "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų","%n aplankas"],
    "Filename must not be empty." : "Failo pavadinimas negali būti tuščias.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}“ yra rezervuotas pavadinimas ir neleidžiamas naudoti failo pavadinimuose.",
    "\"{extension}\" is not an allowed filetype." : "„{extension}“ nėra leidžiamas failo tipas.",
@ -284,8 +282,6 @@
    "Error deleting file \"{fileName}\"." : "Klaida ištrinant failą „{fileName}“.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Kituose aplankuose nėra paieškos rezultatų, skirtų {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Įveskite daugiau nei du simbolius, jei norite ieškoti kituose aplankuose",
-    "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų","%n aplankas"],
-    "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų","%n failas"],
    "{dirs} and {files}" : "{dirs} ir {files}",
    "_including %n hidden_::_including %n hidden_" : ["įskaitant %n paslėptą","įskaitant %n paslėptus","įskaitant %n paslėptų","įskaitant %n paslėptą"],
    "You do not have permission to upload or create files here" : "Neturite teisės įkalti ar kurti failus šioje vietoje",
@ -313,6 +309,10 @@
    "Storage informations" : "Informacija apie saugyklą",
    "Go to the previous folder" : "Eiti į ankstesnį aplanką",
    "Unable to change the favourite state of the file" : "Nepavyksta pakeisti failo Lankomiausiųjų būsenos",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} aplankas","{folderCount} aplankai","{folderCount} aplankų","{folderCount} aplankas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} failas","{fileCount} failai","{fileCount} failų","{fileCount} failas"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 failas ir {folderCount} aplankas","1 failas ir {folderCount} aplankai","1 failas ir {folderCount} aplankų","1 failas ir {folderCount} aplankas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} failas ir 1 aplankas","{fileCount} failai ir 1 aplankas","{fileCount} failų ir 1 aplankas","{fileCount} failas ir 1 aplankas"],
    "List of favorites files and folders." : "Mėgstamų failų ir aplankų sąrašas.",
    "Personal Files" : "Asmeniniai failai",
    "Text file" : "Tekstinis failas",
--- a/apps/files/l10n/mk.js
+++ b/apps/files/l10n/mk.js
@ -224,11 +224,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Операцијата не е дозволена",
    "This directory is unavailable, please check the logs or contact the administrator" : "Овој директориум е недостапен, ве молиме проверете ги логовите или контактирајте со администраторот",
    "Storage is temporarily not available" : "Складиштето моментално не е достапно",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} датотека","{fileCount} датотеки"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 датотека и {folderCount} папки","1 датотека и {folderCount} папки"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} датотека и 1 папка","{fileCount} датотеки и 1 папка"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} датотеки и {folderCount} папки",
+    "_%n file_::_%n files_" : ["%n датотека","%n датотеки"],
+    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
    "No favorites yet" : "Сеуште нема фаворити",
    "Files and folders you mark as favorite will show up here" : "Датотеките и папките кои ќе ги означите како чести, ќе се појават тука",
    "All files" : "Сите датотеки",
@ -292,8 +289,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Грешка при бришење на датотека \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нема резултати од пребарувањето на други места за {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Внесете повеќе од два карактери за да пребарувате во другите папки",
-    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
-    "_%n file_::_%n files_" : ["%n датотека","%n датотеки"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["вклучувајќи %n скриена","вклучувајќи %n скриени"],
    "You do not have permission to upload or create files here" : "Немате дозвола да прикачувате или да креирате датотеки овде",
@ -331,6 +326,11 @@ OC.L10N.register(
    "Unable to change the favourite state of the file" : "Неможе да се промени статусот на омимени на датотеката",
    "Edit file locally" : "Уреди ја датотеката локално",
    "Create new templates folder" : "Креирај нова папка за шаблони",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} датотека","{fileCount} датотеки"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 датотека и {folderCount} папки","1 датотека и {folderCount} папки"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} датотека и 1 папка","{fileCount} датотеки и 1 папка"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} датотеки и {folderCount} папки",
    "List of favorites files and folders." : "Листа на омилени датотеки и папки.",
    "Personal Files" : "Персонални датотеки",
    "Text file" : "Текстуална датотека",
--- a/apps/files/l10n/mk.json
+++ b/apps/files/l10n/mk.json
@ -222,11 +222,8 @@
    "This operation is forbidden" : "Операцијата не е дозволена",
    "This directory is unavailable, please check the logs or contact the administrator" : "Овој директориум е недостапен, ве молиме проверете ги логовите или контактирајте со администраторот",
    "Storage is temporarily not available" : "Складиштето моментално не е достапно",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} датотека","{fileCount} датотеки"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 датотека и {folderCount} папки","1 датотека и {folderCount} папки"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} датотека и 1 папка","{fileCount} датотеки и 1 папка"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} датотеки и {folderCount} папки",
+    "_%n file_::_%n files_" : ["%n датотека","%n датотеки"],
+    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
    "No favorites yet" : "Сеуште нема фаворити",
    "Files and folders you mark as favorite will show up here" : "Датотеките и папките кои ќе ги означите како чести, ќе се појават тука",
    "All files" : "Сите датотеки",
@ -290,8 +287,6 @@
    "Error deleting file \"{fileName}\"." : "Грешка при бришење на датотека \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нема резултати од пребарувањето на други места за {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Внесете повеќе од два карактери за да пребарувате во другите папки",
-    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
-    "_%n file_::_%n files_" : ["%n датотека","%n датотеки"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["вклучувајќи %n скриена","вклучувајќи %n скриени"],
    "You do not have permission to upload or create files here" : "Немате дозвола да прикачувате или да креирате датотеки овде",
@ -329,6 +324,11 @@
    "Unable to change the favourite state of the file" : "Неможе да се промени статусот на омимени на датотеката",
    "Edit file locally" : "Уреди ја датотеката локално",
    "Create new templates folder" : "Креирај нова папка за шаблони",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} датотека","{fileCount} датотеки"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 датотека и {folderCount} папки","1 датотека и {folderCount} папки"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} датотека и 1 папка","{fileCount} датотеки и 1 папка"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} датотеки и {folderCount} папки",
    "List of favorites files and folders." : "Листа на омилени датотеки и папки.",
    "Personal Files" : "Персонални датотеки",
    "Text file" : "Текстуална датотека",
--- a/apps/files/l10n/nb.js
+++ b/apps/files/l10n/nb.js
@ -294,11 +294,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappen er utilgjengelig. Sjekk loggene eller kontakt administrator",
    "Storage is temporarily not available" : "Lagring er midlertidig utilgjengelig",
    "Unexpected error: {error}" : "Uventet feil: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mappe","1 fil og {folderCount} mapper"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mappe","{fileCount} filer og 1 mappe"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
    "Filename must not be empty." : "Filnavn kan ikke være tomt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" er ikke tillatt i et filnavn.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" er et reservert navn og ikke tillatt for filnavn.",
@ -372,8 +369,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Tast inn mer enn to tegn for å lete i andre mapper",
-    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
-    "_%n file_::_%n files_" : ["%n fil","%n filer"],
    "{dirs} and {files}" : "{dirs} og {files}",
    "_including %n hidden_::_including %n hidden_" : ["Inkludert %n skjult","Inkludert %n skjulte"],
    "You do not have permission to upload or create files here" : "Du har ikke tilgang til å laste opp eller opprette filer her",
@ -412,6 +407,11 @@ OC.L10N.register(
    "Edit file locally" : "Rediger fil lokalt",
    "Edit online" : "Rediger på nett",
    "Create new templates folder" : "Opprett ny malermappe",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mappe","1 fil og {folderCount} mapper"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mappe","{fileCount} filer og 1 mappe"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
    "List of favorites files and folders." : "Liste over favorittfiler og -mapper.",
    "Personal Files" : "Personlige filer",
    "Text file" : "Tekstfil",
--- a/apps/files/l10n/nb.json
+++ b/apps/files/l10n/nb.json
@ -292,11 +292,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappen er utilgjengelig. Sjekk loggene eller kontakt administrator",
    "Storage is temporarily not available" : "Lagring er midlertidig utilgjengelig",
    "Unexpected error: {error}" : "Uventet feil: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mappe","1 fil og {folderCount} mapper"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mappe","{fileCount} filer og 1 mappe"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
    "Filename must not be empty." : "Filnavn kan ikke være tomt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" er ikke tillatt i et filnavn.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" er et reservert navn og ikke tillatt for filnavn.",
@ -370,8 +367,6 @@
    "Error deleting file \"{fileName}\"." : "Feil ved sletting av fil \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Ingen søkeresultater i andre mapper etter {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Tast inn mer enn to tegn for å lete i andre mapper",
-    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
-    "_%n file_::_%n files_" : ["%n fil","%n filer"],
    "{dirs} and {files}" : "{dirs} og {files}",
    "_including %n hidden_::_including %n hidden_" : ["Inkludert %n skjult","Inkludert %n skjulte"],
    "You do not have permission to upload or create files here" : "Du har ikke tilgang til å laste opp eller opprette filer her",
@ -410,6 +405,11 @@
    "Edit file locally" : "Rediger fil lokalt",
    "Edit online" : "Rediger på nett",
    "Create new templates folder" : "Opprett ny malermappe",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mappe","{folderCount} mapper"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil og {folderCount} mappe","1 fil og {folderCount} mapper"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil og 1 mappe","{fileCount} filer og 1 mappe"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} filer og {folderCount} mapper",
    "List of favorites files and folders." : "Liste over favorittfiler og -mapper.",
    "Personal Files" : "Personlige filer",
    "Text file" : "Tekstfil",
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@ -324,11 +324,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Deze map is niet beschikbaar. Verifieer de logs of neem contact op met de beheerder",
    "Storage is temporarily not available" : "Opslag is tijdelijk niet beschikbaar",
    "Unexpected error: {error}" : "Onverwachte fout: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} map","{folderCount} mappen"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} bestand","{fileCount} bestanden"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 bestand en {folderCount} map","1 bestand en {folderCount} mappen"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} bestand en 1 map","{fileCount} bestanden en 1 map"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} bestanden en {folderCount} mappen",
+    "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
+    "_%n folder_::_%n folders_" : ["%n map","%n mappen"],
    "Filename must not be empty." : "Bestandsnaam mag niet leeg zijn",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\"is niet toegestaan in een bestandsnaam",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" is een greserveerde naam en niet toegestaan voor bestandsnamen",
@ -402,8 +399,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Fout bij verwijderen bestand \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Geen zoekresultaten voor {tag}{filter}{endtag} in andere mappen",
    "Enter more than two characters to search in other folders" : "Voer meer dan twee tekens in om in andere mappen te zoeken",
-    "_%n folder_::_%n folders_" : ["%n map","%n mappen"],
-    "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
    "{dirs} and {files}" : "{dirs} en {files}",
    "_including %n hidden_::_including %n hidden_" : ["inclusief %n verborgen","inclusief %n verborgen"],
    "You do not have permission to upload or create files here" : "Je hebt geen toestemming om hier te uploaden of bestanden aan te maken",
@ -443,6 +438,11 @@ OC.L10N.register(
    "Edit file locally" : "Bestand lokaal bewerken",
    "Edit online" : "Bewerk online",
    "Create new templates folder" : "Nieuwe sjablonenmap",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} map","{folderCount} mappen"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} bestand","{fileCount} bestanden"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 bestand en {folderCount} map","1 bestand en {folderCount} mappen"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} bestand en 1 map","{fileCount} bestanden en 1 map"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} bestanden en {folderCount} mappen",
    "List of favorites files and folders." : "Lijst van favoriete bestanden en mappen.",
    "Personal Files" : "Persoonlijke bestanden",
    "Text file" : "Tekstbestand",
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@ -322,11 +322,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Deze map is niet beschikbaar. Verifieer de logs of neem contact op met de beheerder",
    "Storage is temporarily not available" : "Opslag is tijdelijk niet beschikbaar",
    "Unexpected error: {error}" : "Onverwachte fout: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} map","{folderCount} mappen"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} bestand","{fileCount} bestanden"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 bestand en {folderCount} map","1 bestand en {folderCount} mappen"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} bestand en 1 map","{fileCount} bestanden en 1 map"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} bestanden en {folderCount} mappen",
+    "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
+    "_%n folder_::_%n folders_" : ["%n map","%n mappen"],
    "Filename must not be empty." : "Bestandsnaam mag niet leeg zijn",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\"is niet toegestaan in een bestandsnaam",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" is een greserveerde naam en niet toegestaan voor bestandsnamen",
@ -400,8 +397,6 @@
    "Error deleting file \"{fileName}\"." : "Fout bij verwijderen bestand \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Geen zoekresultaten voor {tag}{filter}{endtag} in andere mappen",
    "Enter more than two characters to search in other folders" : "Voer meer dan twee tekens in om in andere mappen te zoeken",
-    "_%n folder_::_%n folders_" : ["%n map","%n mappen"],
-    "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
    "{dirs} and {files}" : "{dirs} en {files}",
    "_including %n hidden_::_including %n hidden_" : ["inclusief %n verborgen","inclusief %n verborgen"],
    "You do not have permission to upload or create files here" : "Je hebt geen toestemming om hier te uploaden of bestanden aan te maken",
@ -441,6 +436,11 @@
    "Edit file locally" : "Bestand lokaal bewerken",
    "Edit online" : "Bewerk online",
    "Create new templates folder" : "Nieuwe sjablonenmap",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} map","{folderCount} mappen"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} bestand","{fileCount} bestanden"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 bestand en {folderCount} map","1 bestand en {folderCount} mappen"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} bestand en 1 map","{fileCount} bestanden en 1 map"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} bestanden en {folderCount} mappen",
    "List of favorites files and folders." : "Lijst van favoriete bestanden en mappen.",
    "Personal Files" : "Persoonlijke bestanden",
    "Text file" : "Tekstbestand",
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Ten katalog jest niedostępny, sprawdź logi lub skontaktuj się z administratorem",
    "Storage is temporarily not available" : "Magazyn jest tymczasowo niedostępny",
    "Unexpected error: {error}" : "Nieoczekiwany błąd: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} katalog","{folderCount} katalogi","{folderCount} katalogów","{folderCount} katalogów"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} plik","{fileCount} pliki","{fileCount} plików","{fileCount} plików"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 plik i {folderCount} katalog","1 plik i {folderCount} katalogi","1 plik i {folderCount} katalogów","1 plik i {folderCount} katalogów"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} plik i 1 katalog","{fileCount} pliki i 1 katalog","{fileCount} plików i 1 katalog","{fileCount} plików i 1 katalog"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} plików i {folderCount} katalogów",
-    "_(%n hidden)_::_ (%n hidden)_" : [" (%n ukryty)"," (%n ukryte)"," (%n ukrytych)"," (%n ukrytych)"],
+    "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików","%n plików"],
+    "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów","%n katalogów"],
    "Filename must not be empty." : "Nazwa pliku nie może być pusta.",
    "\"{char}\" is not allowed inside a filename." : "„{char}” nie jest dozwolone w nazwie pliku.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}” jest nazwą zastrzeżoną i nie jest dozwolona w przypadku nazw plików.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Błąd podczas usuwania pliku \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Brak wyników wyszukiwania w innych katalogach dla {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Wprowadź więcej niż dwa znaki, aby przeszukać inne katalogi",
-    "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów","%n katalogów"],
-    "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików","%n plików"],
    "{dirs} and {files}" : "{dirs} i {files}",
    "_including %n hidden_::_including %n hidden_" : ["w tym %n ukryty","w tym %n ukryte","w tym %n ukrytych","w tym %n ukrytych"],
    "You do not have permission to upload or create files here" : "Nie masz uprawnień do wysyłania lub tworzenia plików w tym miejscu",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Edytuj plik lokalnie",
    "Edit online" : "Edycja online",
    "Create new templates folder" : "Utwórz nowy katalog z szablonami",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} katalog","{folderCount} katalogi","{folderCount} katalogów","{folderCount} katalogów"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} plik","{fileCount} pliki","{fileCount} plików","{fileCount} plików"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 plik i {folderCount} katalog","1 plik i {folderCount} katalogi","1 plik i {folderCount} katalogów","1 plik i {folderCount} katalogów"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} plik i 1 katalog","{fileCount} pliki i 1 katalog","{fileCount} plików i 1 katalog","{fileCount} plików i 1 katalog"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} plików i {folderCount} katalogów",
    "List of favorites files and folders." : "Lista ulubionych plików i katalogów.",
    "Personal Files" : "Pliki osobiste",
    "Text file" : "Plik tekstowy",
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Ten katalog jest niedostępny, sprawdź logi lub skontaktuj się z administratorem",
    "Storage is temporarily not available" : "Magazyn jest tymczasowo niedostępny",
    "Unexpected error: {error}" : "Nieoczekiwany błąd: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} katalog","{folderCount} katalogi","{folderCount} katalogów","{folderCount} katalogów"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} plik","{fileCount} pliki","{fileCount} plików","{fileCount} plików"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 plik i {folderCount} katalog","1 plik i {folderCount} katalogi","1 plik i {folderCount} katalogów","1 plik i {folderCount} katalogów"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} plik i 1 katalog","{fileCount} pliki i 1 katalog","{fileCount} plików i 1 katalog","{fileCount} plików i 1 katalog"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} plików i {folderCount} katalogów",
-    "_(%n hidden)_::_ (%n hidden)_" : [" (%n ukryty)"," (%n ukryte)"," (%n ukrytych)"," (%n ukrytych)"],
+    "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików","%n plików"],
+    "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów","%n katalogów"],
    "Filename must not be empty." : "Nazwa pliku nie może być pusta.",
    "\"{char}\" is not allowed inside a filename." : "„{char}” nie jest dozwolone w nazwie pliku.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}” jest nazwą zastrzeżoną i nie jest dozwolona w przypadku nazw plików.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Błąd podczas usuwania pliku \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Brak wyników wyszukiwania w innych katalogach dla {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Wprowadź więcej niż dwa znaki, aby przeszukać inne katalogi",
-    "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów","%n katalogów"],
-    "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików","%n plików"],
    "{dirs} and {files}" : "{dirs} i {files}",
    "_including %n hidden_::_including %n hidden_" : ["w tym %n ukryty","w tym %n ukryte","w tym %n ukrytych","w tym %n ukrytych"],
    "You do not have permission to upload or create files here" : "Nie masz uprawnień do wysyłania lub tworzenia plików w tym miejscu",
@ -444,6 +438,11 @@
    "Edit file locally" : "Edytuj plik lokalnie",
    "Edit online" : "Edycja online",
    "Create new templates folder" : "Utwórz nowy katalog z szablonami",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} katalog","{folderCount} katalogi","{folderCount} katalogów","{folderCount} katalogów"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} plik","{fileCount} pliki","{fileCount} plików","{fileCount} plików"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 plik i {folderCount} katalog","1 plik i {folderCount} katalogi","1 plik i {folderCount} katalogów","1 plik i {folderCount} katalogów"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} plik i 1 katalog","{fileCount} pliki i 1 katalog","{fileCount} plików i 1 katalog","{fileCount} plików i 1 katalog"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} plików i {folderCount} katalogów",
    "List of favorites files and folders." : "Lista ulubionych plików i katalogów.",
    "Personal Files" : "Pliki osobiste",
    "Text file" : "Plik tekstowy",
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Este diretório não está disponível, por favor verifique os logs ou contacte o administrador",
    "Storage is temporarily not available" : "O armazenamento está temporariamente indisponível",
    "Unexpected error: {error}" : "Erro inesperado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} pasta","{folderCount} pastas","{folderCount} pastas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} arquivo","{fileCount} arquivos","{fileCount} arquivos"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 arquivo e {folderCount} pasta","1 arquivo e {folderCount} pastas","1 arquivo e {folderCount} pastas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} arquivo e 1 pasta","{fileCount} arquivos e 1 pasta","{fileCount} arquivos e 1 pasta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} arquivos e {folderCount} pastas",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n oculto)"," (%n ocultos)"," (%n ocultos)"],
+    "_%n file_::_%n files_" : ["%n arquivo","%n arquivos","%n arquivos"],
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
    "Filename must not be empty." : "O nome do arquivo não pode estar vazio.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" não é permitido dentro de um nome de arquivo.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" é um nome reservado e não é permitido para nomes de arquivos.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Ocorreu um erro ao excluir o arquivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Sem resultados de pesquisa em outras pastas para {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Digite mais de dois caracteres para pesquisar em outras pastas",
-    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
-    "_%n file_::_%n files_" : ["%n arquivo","%n arquivos","%n arquivos"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluindo %n oculto","incluindo %n ocultos","incluindo %n ocultos"],
    "You do not have permission to upload or create files here" : "Você não tem permissão para carregar ou criar arquivos aqui",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Editar arquivo localmente",
    "Edit online" : "Editar on-line",
    "Create new templates folder" : "Criar nova pasta de modelos",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} pasta","{folderCount} pastas","{folderCount} pastas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} arquivo","{fileCount} arquivos","{fileCount} arquivos"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 arquivo e {folderCount} pasta","1 arquivo e {folderCount} pastas","1 arquivo e {folderCount} pastas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} arquivo e 1 pasta","{fileCount} arquivos e 1 pasta","{fileCount} arquivos e 1 pasta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} arquivos e {folderCount} pastas",
    "List of favorites files and folders." : "Lista de arquivos e pastas favoritos.",
    "Personal Files" : "Arquivos pessoais",
    "Text file" : "Arquivo texto",
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Este diretório não está disponível, por favor verifique os logs ou contacte o administrador",
    "Storage is temporarily not available" : "O armazenamento está temporariamente indisponível",
    "Unexpected error: {error}" : "Erro inesperado: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} pasta","{folderCount} pastas","{folderCount} pastas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} arquivo","{fileCount} arquivos","{fileCount} arquivos"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 arquivo e {folderCount} pasta","1 arquivo e {folderCount} pastas","1 arquivo e {folderCount} pastas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} arquivo e 1 pasta","{fileCount} arquivos e 1 pasta","{fileCount} arquivos e 1 pasta"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} arquivos e {folderCount} pastas",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n oculto)"," (%n ocultos)"," (%n ocultos)"],
+    "_%n file_::_%n files_" : ["%n arquivo","%n arquivos","%n arquivos"],
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
    "Filename must not be empty." : "O nome do arquivo não pode estar vazio.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" não é permitido dentro de um nome de arquivo.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" é um nome reservado e não é permitido para nomes de arquivos.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Ocorreu um erro ao excluir o arquivo \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Sem resultados de pesquisa em outras pastas para {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Digite mais de dois caracteres para pesquisar em outras pastas",
-    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
-    "_%n file_::_%n files_" : ["%n arquivo","%n arquivos","%n arquivos"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluindo %n oculto","incluindo %n ocultos","incluindo %n ocultos"],
    "You do not have permission to upload or create files here" : "Você não tem permissão para carregar ou criar arquivos aqui",
@ -444,6 +438,11 @@
    "Edit file locally" : "Editar arquivo localmente",
    "Edit online" : "Editar on-line",
    "Create new templates folder" : "Criar nova pasta de modelos",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} pasta","{folderCount} pastas","{folderCount} pastas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} arquivo","{fileCount} arquivos","{fileCount} arquivos"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 arquivo e {folderCount} pasta","1 arquivo e {folderCount} pastas","1 arquivo e {folderCount} pastas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} arquivo e 1 pasta","{fileCount} arquivos e 1 pasta","{fileCount} arquivos e 1 pasta"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} arquivos e {folderCount} pastas",
    "List of favorites files and folders." : "Lista de arquivos e pastas favoritos.",
    "Personal Files" : "Arquivos pessoais",
    "Text file" : "Arquivo texto",
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@ -178,7 +178,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Esta operação é proibida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta diretoria está indisponível, por favor, verifique os registos ou contacte o administrador",
    "Storage is temporarily not available" : "Armazenamento temporariamente indisponível",
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} pastas",
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros","%n ficheiros"],
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
    "No favorites yet" : "Sem favoritos",
    "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui",
    "All files" : "Todos os ficheiros",
@ -235,8 +236,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Erro ao eliminar o ficheiro \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nenhum resultado noutras pastas para {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Digite mais de dois caracteres para pesquisar noutras pastas",
-    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
-    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros","%n ficheiros"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluindo %n ocultos","incluindo %n ocultos","incluindo %n ocultos"],
    "You do not have permission to upload or create files here" : "Não tem permissão para carregar ou criar ficheiros aqui",
@ -258,6 +257,7 @@ OC.L10N.register(
    "Upload file" : "Enviar ficheiro",
    "Not favorited" : "Não favorito",
    "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as etiquetas",
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} pastas",
    "Personal Files" : "Ficheiros pessoais",
    "Text file" : "Ficheiro de Texto",
    "New text file.txt" : "Novo texto ficheiro.txt",
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@ -176,7 +176,8 @@
    "This operation is forbidden" : "Esta operação é proibida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Esta diretoria está indisponível, por favor, verifique os registos ou contacte o administrador",
    "Storage is temporarily not available" : "Armazenamento temporariamente indisponível",
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} pastas",
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros","%n ficheiros"],
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
    "No favorites yet" : "Sem favoritos",
    "Files and folders you mark as favorite will show up here" : "Os ficheiros e pastas que marcou como favoritos serão mostrados aqui",
    "All files" : "Todos os ficheiros",
@ -233,8 +234,6 @@
    "Error deleting file \"{fileName}\"." : "Erro ao eliminar o ficheiro \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nenhum resultado noutras pastas para {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Digite mais de dois caracteres para pesquisar noutras pastas",
-    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas","%n pastas"],
-    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros","%n ficheiros"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluindo %n ocultos","incluindo %n ocultos","incluindo %n ocultos"],
    "You do not have permission to upload or create files here" : "Não tem permissão para carregar ou criar ficheiros aqui",
@ -256,6 +255,7 @@
    "Upload file" : "Enviar ficheiro",
    "Not favorited" : "Não favorito",
    "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as etiquetas",
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ficheiros e {folderCount} pastas",
    "Personal Files" : "Ficheiros pessoais",
    "Text file" : "Ficheiro de Texto",
    "New text file.txt" : "Novo texto ficheiro.txt",
--- a/apps/files/l10n/ro.js
+++ b/apps/files/l10n/ro.js
@ -177,11 +177,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Operațiunea este interzisă",
    "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator",
    "Storage is temporarily not available" : "Spațiu de stocare este indisponibil temporar",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} foldere","{folderCount} foldere"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fișier","{fileCount} fișiere","{fileCount} fișiere"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fișier și {folderCount} folder","1 fișier și {folderCount} foldere","1 fișier și {folderCount} foldere"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fișier și 1 folder","{fileCount} fișiere și 1 folder","{fileCount} fișiere și 1 folder"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fișiere și {folderCount} dosare",
+    "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
+    "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
    "No favorites yet" : "Nu aveți favorite încă",
    "Files and folders you mark as favorite will show up here" : "FIșierele și directoarele pe care le marchezi ca favorite vor apărea aici",
    "All files" : "Toate fișierele",
@ -244,8 +241,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Eroare la ștergerea fișierului \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nu au fost găsite rezultate în alte directoare pentru {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduceți mai mult de două caractere pentru a căuta în alte dosare",
-    "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
-    "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
    "{dirs} and {files}" : "{dirs} și {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluzând %n ascuns","incluzând %nascunse","incluzând %nascuns"],
    "You do not have permission to upload or create files here" : "Nu ai permisiunea de a încărca fișiere aici",
@ -278,6 +273,11 @@ OC.L10N.register(
    "Open the files app settings" : "Deschide setările aplicației Fișiere",
    "Unable to change the favourite state of the file" : "Nu s-a putut schimba starea fișierelor favorite",
    "Create new templates folder" : "Creează un nou dosar pentru șabloane",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} foldere","{folderCount} foldere"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fișier","{fileCount} fișiere","{fileCount} fișiere"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fișier și {folderCount} folder","1 fișier și {folderCount} foldere","1 fișier și {folderCount} foldere"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fișier și 1 folder","{fileCount} fișiere și 1 folder","{fileCount} fișiere și 1 folder"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fișiere și {folderCount} dosare",
    "List of favorites files and folders." : "Lista fișierelor și dosarelor favorite",
    "Text file" : "Fișier text",
    "New text file.txt" : "Fișier nou.txt"
--- a/apps/files/l10n/ro.json
+++ b/apps/files/l10n/ro.json
@ -175,11 +175,8 @@
    "This operation is forbidden" : "Operațiunea este interzisă",
    "This directory is unavailable, please check the logs or contact the administrator" : "Acest director nu este disponibil, te rugăm verifică logurile sau contactează un administrator",
    "Storage is temporarily not available" : "Spațiu de stocare este indisponibil temporar",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} foldere","{folderCount} foldere"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fișier","{fileCount} fișiere","{fileCount} fișiere"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fișier și {folderCount} folder","1 fișier și {folderCount} foldere","1 fișier și {folderCount} foldere"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fișier și 1 folder","{fileCount} fișiere și 1 folder","{fileCount} fișiere și 1 folder"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} fișiere și {folderCount} dosare",
+    "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
+    "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
    "No favorites yet" : "Nu aveți favorite încă",
    "Files and folders you mark as favorite will show up here" : "FIșierele și directoarele pe care le marchezi ca favorite vor apărea aici",
    "All files" : "Toate fișierele",
@ -242,8 +239,6 @@
    "Error deleting file \"{fileName}\"." : "Eroare la ștergerea fișierului \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Nu au fost găsite rezultate în alte directoare pentru {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Introduceți mai mult de două caractere pentru a căuta în alte dosare",
-    "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
-    "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
    "{dirs} and {files}" : "{dirs} și {files}",
    "_including %n hidden_::_including %n hidden_" : ["incluzând %n ascuns","incluzând %nascunse","incluzând %nascuns"],
    "You do not have permission to upload or create files here" : "Nu ai permisiunea de a încărca fișiere aici",
@ -276,6 +271,11 @@
    "Open the files app settings" : "Deschide setările aplicației Fișiere",
    "Unable to change the favourite state of the file" : "Nu s-a putut schimba starea fișierelor favorite",
    "Create new templates folder" : "Creează un nou dosar pentru șabloane",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} folder","{folderCount} foldere","{folderCount} foldere"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fișier","{fileCount} fișiere","{fileCount} fișiere"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fișier și {folderCount} folder","1 fișier și {folderCount} foldere","1 fișier și {folderCount} foldere"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fișier și 1 folder","{fileCount} fișiere și 1 folder","{fileCount} fișiere și 1 folder"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} fișiere și {folderCount} dosare",
    "List of favorites files and folders." : "Lista fișierelor și dosarelor favorite",
    "Text file" : "Fișier text",
    "New text file.txt" : "Fișier nou.txt"
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Каталог недоступен. Проверьте журналы событий или свяжитесь с администратором",
    "Storage is temporarily not available" : "Хранилище временно недоступно",
    "Unexpected error: {error}" : "Неожиданная ошибка: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки","{folderCount} папок","{folderCount} папки"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файла","{fileCount} файлов","{fileCount} файла"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["один файл и {folderCount} папка","один файл и {folderCount} папки","один файл и {folderCount} папок","один файл и {folderCount} папки"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл и одна папка","{fileCount} файла и одна папка","{fileCount} файлов и одна папка","{fileCount} файла и одна папка"],
-    "{fileCount} files and {folderCount} folders" : "файлов: {fileCount}, папок: {folderCount}",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n скрытый)","(%n скрытых)","(%n скрытых)","(%n скрытых)"],
+    "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов","%n файлов"],
+    "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов","%n каталогов"],
    "Filename must not be empty." : "Имя файла не должно быть пустым.",
    "\"{char}\" is not allowed inside a filename." : "не допускается внутри имени файла.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "является зарезервированным именем и не допускается для имен файлов.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Ошибка удаления файла «{fileName}».",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нет результатов поиска в других папках для {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Введите более двух символов для поиска в других каталогах",
-    "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов","%n каталогов"],
-    "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов","%n файлов"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["включая %n скрытый","включая %n скрытых","включая %n скрытых","включая %n скрытых"],
    "You do not have permission to upload or create files here" : "У вас нет разрешения на загрузку или создание файлов здесь",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Редактировать файл локально",
    "Edit online" : "Редактировать онлайн",
    "Create new templates folder" : "Создать новую папку шаблонов",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки","{folderCount} папок","{folderCount} папки"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файла","{fileCount} файлов","{fileCount} файла"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["один файл и {folderCount} папка","один файл и {folderCount} папки","один файл и {folderCount} папок","один файл и {folderCount} папки"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл и одна папка","{fileCount} файла и одна папка","{fileCount} файлов и одна папка","{fileCount} файла и одна папка"],
+    "{fileCount} files and {folderCount} folders" : "файлов: {fileCount}, папок: {folderCount}",
    "List of favorites files and folders." : "Список избранных файлов и каталогов.",
    "Personal Files" : "Личные файлы",
    "Text file" : "Текстовый файл",
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Каталог недоступен. Проверьте журналы событий или свяжитесь с администратором",
    "Storage is temporarily not available" : "Хранилище временно недоступно",
    "Unexpected error: {error}" : "Неожиданная ошибка: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки","{folderCount} папок","{folderCount} папки"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файла","{fileCount} файлов","{fileCount} файла"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["один файл и {folderCount} папка","один файл и {folderCount} папки","один файл и {folderCount} папок","один файл и {folderCount} папки"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл и одна папка","{fileCount} файла и одна папка","{fileCount} файлов и одна папка","{fileCount} файла и одна папка"],
-    "{fileCount} files and {folderCount} folders" : "файлов: {fileCount}, папок: {folderCount}",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n скрытый)","(%n скрытых)","(%n скрытых)","(%n скрытых)"],
+    "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов","%n файлов"],
+    "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов","%n каталогов"],
    "Filename must not be empty." : "Имя файла не должно быть пустым.",
    "\"{char}\" is not allowed inside a filename." : "не допускается внутри имени файла.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "является зарезервированным именем и не допускается для имен файлов.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Ошибка удаления файла «{fileName}».",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нет результатов поиска в других папках для {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Введите более двух символов для поиска в других каталогах",
-    "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов","%n каталогов"],
-    "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов","%n файлов"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["включая %n скрытый","включая %n скрытых","включая %n скрытых","включая %n скрытых"],
    "You do not have permission to upload or create files here" : "У вас нет разрешения на загрузку или создание файлов здесь",
@ -444,6 +438,11 @@
    "Edit file locally" : "Редактировать файл локально",
    "Edit online" : "Редактировать онлайн",
    "Create new templates folder" : "Создать новую папку шаблонов",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} папка","{folderCount} папки","{folderCount} папок","{folderCount} папки"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файла","{fileCount} файлов","{fileCount} файла"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["один файл и {folderCount} папка","один файл и {folderCount} папки","один файл и {folderCount} папок","один файл и {folderCount} папки"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл и одна папка","{fileCount} файла и одна папка","{fileCount} файлов и одна папка","{fileCount} файла и одна папка"],
+    "{fileCount} files and {folderCount} folders" : "файлов: {fileCount}, папок: {folderCount}",
    "List of favorites files and folders." : "Список избранных файлов и каталогов.",
    "Personal Files" : "Личные файлы",
    "Text file" : "Текстовый файл",
--- a/apps/files/l10n/sc.js
+++ b/apps/files/l10n/sc.js
@ -178,11 +178,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Custa operatzione no est permìtida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Custa cartella no est a disponimentu, controlla is informes o cuntata s'amministratzione",
    "Storage is temporarily not available" : "S'archiviatzione immoe no est a disponimentu",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartellas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archìviu","{fileCount} archìvios"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archìviu e {folderCount} cartella","1 archìviu e {folderCount} cartellas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archìviu e 1 cartella","{fileCount} archìvios e 1 cartella"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} archìvios e {folderCount} cartellas",
+    "_%n file_::_%n files_" : ["%n archìviu","%n archìvios"],
+    "_%n folder_::_%n folders_" : ["%n cartella","%n cartellas"],
    "No favorites yet" : "Ancora perunu preferidu",
    "Files and folders you mark as favorite will show up here" : "Is archìvios e is cartellas chi marcas comente preferidos ant a aparèssere inoghe",
    "All files" : "Totu is archìvios",
@ -247,8 +244,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Errore cantzellende s'archìviu \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Perunu resurtadu de chirca in àteras cartellas pro {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Inserta prus de duos caràteres pro chircare in àteras cartellas",
-    "_%n folder_::_%n folders_" : ["%n cartella","%n cartellas"],
-    "_%n file_::_%n files_" : ["%n archìviu","%n archìvios"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["inclùdidu %n cuadu","inclùdidos %n cuados"],
    "You do not have permission to upload or create files here" : "Non tenes permissu pro carrigare o creare archìvios inoghe",
@ -285,6 +280,11 @@ OC.L10N.register(
    "Open the files app settings" : "Aberi sa cunfiguratzione de s'aplicatzione de archìvios",
    "Unable to change the favourite state of the file" : "Non faghet a cambiare s'istadu de preferidu de s'archìviu",
    "Create new templates folder" : "Crea una cartella de modellos noa",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartellas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archìviu","{fileCount} archìvios"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archìviu e {folderCount} cartella","1 archìviu e {folderCount} cartellas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archìviu e 1 cartella","{fileCount} archìvios e 1 cartella"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} archìvios e {folderCount} cartellas",
    "List of favorites files and folders." : "Lista de cartellas e de archìvios preferidos.",
    "Personal Files" : "Archìvios personales",
    "Text file" : "Archìviu de testu",
--- a/apps/files/l10n/sc.json
+++ b/apps/files/l10n/sc.json
@ -176,11 +176,8 @@
    "This operation is forbidden" : "Custa operatzione no est permìtida",
    "This directory is unavailable, please check the logs or contact the administrator" : "Custa cartella no est a disponimentu, controlla is informes o cuntata s'amministratzione",
    "Storage is temporarily not available" : "S'archiviatzione immoe no est a disponimentu",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartellas"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archìviu","{fileCount} archìvios"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archìviu e {folderCount} cartella","1 archìviu e {folderCount} cartellas"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archìviu e 1 cartella","{fileCount} archìvios e 1 cartella"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} archìvios e {folderCount} cartellas",
+    "_%n file_::_%n files_" : ["%n archìviu","%n archìvios"],
+    "_%n folder_::_%n folders_" : ["%n cartella","%n cartellas"],
    "No favorites yet" : "Ancora perunu preferidu",
    "Files and folders you mark as favorite will show up here" : "Is archìvios e is cartellas chi marcas comente preferidos ant a aparèssere inoghe",
    "All files" : "Totu is archìvios",
@ -245,8 +242,6 @@
    "Error deleting file \"{fileName}\"." : "Errore cantzellende s'archìviu \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Perunu resurtadu de chirca in àteras cartellas pro {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Inserta prus de duos caràteres pro chircare in àteras cartellas",
-    "_%n folder_::_%n folders_" : ["%n cartella","%n cartellas"],
-    "_%n file_::_%n files_" : ["%n archìviu","%n archìvios"],
    "{dirs} and {files}" : "{dirs} e {files}",
    "_including %n hidden_::_including %n hidden_" : ["inclùdidu %n cuadu","inclùdidos %n cuados"],
    "You do not have permission to upload or create files here" : "Non tenes permissu pro carrigare o creare archìvios inoghe",
@ -283,6 +278,11 @@
    "Open the files app settings" : "Aberi sa cunfiguratzione de s'aplicatzione de archìvios",
    "Unable to change the favourite state of the file" : "Non faghet a cambiare s'istadu de preferidu de s'archìviu",
    "Create new templates folder" : "Crea una cartella de modellos noa",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} cartella","{folderCount} cartellas"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} archìviu","{fileCount} archìvios"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 archìviu e {folderCount} cartella","1 archìviu e {folderCount} cartellas"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} archìviu e 1 cartella","{fileCount} archìvios e 1 cartella"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} archìvios e {folderCount} cartellas",
    "List of favorites files and folders." : "Lista de cartellas e de archìvios preferidos.",
    "Personal Files" : "Archìvios personales",
    "Text file" : "Archìviu de testu",
--- a/apps/files/l10n/sk.js
+++ b/apps/files/l10n/sk.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Priečinok je nedostupný, skontrolujte prosím logy, alebo kontaktujte správcu",
    "Storage is temporarily not available" : "Úložisko je dočasne nedostupné",
    "Unexpected error: {error}" : "Neočakávaná chyba: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} priečinok","{folderCount} priečinky","{folderCount} priečinkov","{folderCount} priečinkov"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} súbor","{fileCount} súbory","{fileCount} súborov","{fileCount} súborov"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 súbor a {folderCount} priečinok","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} súbor a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} súborov a {folderCount} priečinkov",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n skrytý)","(%n skryté)","(%n skrytých)"," (%n skrytých)"],
+    "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov","%n súborov"],
+    "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov","%n priečinkov"],
    "Filename must not be empty." : "Názov súboru nesmie byť prázdny.",
    "\"{char}\" is not allowed inside a filename." : "Znak \"{char}\" nie je povolený v názve súboru.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" je rezervované slovo a nie je možné ho použiť v názvoch súborov.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Chyba pri mazaní súboru \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Žiadne výsledky vyhľadávania v ostatných priečinkoch pre {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ak chcete hľadať v iných priečinkoch, zadajte viac ako dva znaky",
-    "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov","%n priečinkov"],
-    "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov","%n súborov"],
    "{dirs} and {files}" : "{dirs} a {files}",
    "_including %n hidden_::_including %n hidden_" : ["vrátane %n skytého","vrátane %n skrytých","vrátane %n skrytých","vrátane %n skrytých"],
    "You do not have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvárať súbory",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Editovať súbor lokálne",
    "Edit online" : "Upraviť online",
    "Create new templates folder" : "Vytvoriť nový vzorový priečinok",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} priečinok","{folderCount} priečinky","{folderCount} priečinkov","{folderCount} priečinkov"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} súbor","{fileCount} súbory","{fileCount} súborov","{fileCount} súborov"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 súbor a {folderCount} priečinok","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} súbor a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} súborov a {folderCount} priečinkov",
    "List of favorites files and folders." : "Zoznam obľúbených súborov a priečinkov.",
    "Personal Files" : "Osobné Súbory",
    "Text file" : "Textový súbor",
--- a/apps/files/l10n/sk.json
+++ b/apps/files/l10n/sk.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Priečinok je nedostupný, skontrolujte prosím logy, alebo kontaktujte správcu",
    "Storage is temporarily not available" : "Úložisko je dočasne nedostupné",
    "Unexpected error: {error}" : "Neočakávaná chyba: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} priečinok","{folderCount} priečinky","{folderCount} priečinkov","{folderCount} priečinkov"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} súbor","{fileCount} súbory","{fileCount} súborov","{fileCount} súborov"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 súbor a {folderCount} priečinok","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} súbor a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} súborov a {folderCount} priečinkov",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n skrytý)","(%n skryté)","(%n skrytých)"," (%n skrytých)"],
+    "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov","%n súborov"],
+    "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov","%n priečinkov"],
    "Filename must not be empty." : "Názov súboru nesmie byť prázdny.",
    "\"{char}\" is not allowed inside a filename." : "Znak \"{char}\" nie je povolený v názve súboru.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" je rezervované slovo a nie je možné ho použiť v názvoch súborov.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Chyba pri mazaní súboru \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Žiadne výsledky vyhľadávania v ostatných priečinkoch pre {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ak chcete hľadať v iných priečinkoch, zadajte viac ako dva znaky",
-    "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov","%n priečinkov"],
-    "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov","%n súborov"],
    "{dirs} and {files}" : "{dirs} a {files}",
    "_including %n hidden_::_including %n hidden_" : ["vrátane %n skytého","vrátane %n skrytých","vrátane %n skrytých","vrátane %n skrytých"],
    "You do not have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvárať súbory",
@ -444,6 +438,11 @@
    "Edit file locally" : "Editovať súbor lokálne",
    "Edit online" : "Upraviť online",
    "Create new templates folder" : "Vytvoriť nový vzorový priečinok",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} priečinok","{folderCount} priečinky","{folderCount} priečinkov","{folderCount} priečinkov"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} súbor","{fileCount} súbory","{fileCount} súborov","{fileCount} súborov"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 súbor a {folderCount} priečinok","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky","1 súbor a {folderCount} priečinky"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} súbor a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok","{fileCount} súborov a 1 priečinok"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} súborov a {folderCount} priečinkov",
    "List of favorites files and folders." : "Zoznam obľúbených súborov a priečinkov.",
    "Personal Files" : "Osobné Súbory",
    "Text file" : "Textový súbor",
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@ -240,11 +240,8 @@ OC.L10N.register(
    "This operation is forbidden" : "To dejanje ni dovoljeno!",
    "This directory is unavailable, please check the logs or contact the administrator" : "Mapa ni na voljo. Preverite dnevnik in stopite v stik s skrbnikom sistema.",
    "Storage is temporarily not available" : "Shramba trenutno ni na voljo",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapa","{folderCount} mapi","{folderCount} mape","{folderCount} map"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} datoteka","{fileCount} datoteki","{fileCount} datoteke","{fileCount} datotek"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 datoteka in {folderCount} mapa","1 datoteka in {folderCount} mapi","1 datoteka in {folderCount} mape","1 datoteka in {folderCount} map"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} datoteka in 1 mapa","{fileCount} datoteki in 1 mapa","{fileCount} datoteke in 1 mapa","{fileCount} datotek in 1 mapa"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} datotek in {folderCount} map",
+    "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
+    "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n mape"],
    "Filename must not be empty." : "Ime datoteke ne sme biti prazno.",
    "No favorites yet" : "Ni še dodanih priljubljenih predmetov",
    "Files and folders you mark as favorite will show up here" : "Datoteke ali mape, ki so označene kot priljubljene, bodo zbrane na tem mestu.",
@ -310,8 +307,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Prišli je do napake med brisanjem datoteke »{fileName}«.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Za iskalni niz {tag}{filter}{endtag} ni zadetkov v nobeni mapi",
    "Enter more than two characters to search in other folders" : "Vpišite več kot dva znaka za iskanje po drugih mapah",
-    "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n mape"],
-    "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
    "{dirs} and {files}" : "{dirs} in {files}",
    "_including %n hidden_::_including %n hidden_" : ["vključujoč %n skrito","vključujoč %n skriti","vključujoč %n skrite","vključujoč %n skritih"],
    "You do not have permission to upload or create files here" : "Ni ustreznih dovoljenja za pošiljanje ali ustvarjanje novih datotek",
@ -350,6 +345,11 @@ OC.L10N.register(
    "Edit file locally" : "Uredi datoteko krajevno",
    "Edit online" : "Uredi na spletu",
    "Create new templates folder" : "Ustvari novo začasno mapo",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapa","{folderCount} mapi","{folderCount} mape","{folderCount} map"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} datoteka","{fileCount} datoteki","{fileCount} datoteke","{fileCount} datotek"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 datoteka in {folderCount} mapa","1 datoteka in {folderCount} mapi","1 datoteka in {folderCount} mape","1 datoteka in {folderCount} map"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} datoteka in 1 mapa","{fileCount} datoteki in 1 mapa","{fileCount} datoteke in 1 mapa","{fileCount} datotek in 1 mapa"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} datotek in {folderCount} map",
    "List of favorites files and folders." : "Seznam priljubljenih datotek in map.",
    "Personal Files" : "Osebne datoteke",
    "Text file" : "Besedilna datoteka",
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@ -238,11 +238,8 @@
    "This operation is forbidden" : "To dejanje ni dovoljeno!",
    "This directory is unavailable, please check the logs or contact the administrator" : "Mapa ni na voljo. Preverite dnevnik in stopite v stik s skrbnikom sistema.",
    "Storage is temporarily not available" : "Shramba trenutno ni na voljo",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapa","{folderCount} mapi","{folderCount} mape","{folderCount} map"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} datoteka","{fileCount} datoteki","{fileCount} datoteke","{fileCount} datotek"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 datoteka in {folderCount} mapa","1 datoteka in {folderCount} mapi","1 datoteka in {folderCount} mape","1 datoteka in {folderCount} map"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} datoteka in 1 mapa","{fileCount} datoteki in 1 mapa","{fileCount} datoteke in 1 mapa","{fileCount} datotek in 1 mapa"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} datotek in {folderCount} map",
+    "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
+    "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n mape"],
    "Filename must not be empty." : "Ime datoteke ne sme biti prazno.",
    "No favorites yet" : "Ni še dodanih priljubljenih predmetov",
    "Files and folders you mark as favorite will show up here" : "Datoteke ali mape, ki so označene kot priljubljene, bodo zbrane na tem mestu.",
@ -308,8 +305,6 @@
    "Error deleting file \"{fileName}\"." : "Prišli je do napake med brisanjem datoteke »{fileName}«.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Za iskalni niz {tag}{filter}{endtag} ni zadetkov v nobeni mapi",
    "Enter more than two characters to search in other folders" : "Vpišite več kot dva znaka za iskanje po drugih mapah",
-    "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n mape"],
-    "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
    "{dirs} and {files}" : "{dirs} in {files}",
    "_including %n hidden_::_including %n hidden_" : ["vključujoč %n skrito","vključujoč %n skriti","vključujoč %n skrite","vključujoč %n skritih"],
    "You do not have permission to upload or create files here" : "Ni ustreznih dovoljenja za pošiljanje ali ustvarjanje novih datotek",
@ -348,6 +343,11 @@
    "Edit file locally" : "Uredi datoteko krajevno",
    "Edit online" : "Uredi na spletu",
    "Create new templates folder" : "Ustvari novo začasno mapo",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapa","{folderCount} mapi","{folderCount} mape","{folderCount} map"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} datoteka","{fileCount} datoteki","{fileCount} datoteke","{fileCount} datotek"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 datoteka in {folderCount} mapa","1 datoteka in {folderCount} mapi","1 datoteka in {folderCount} mape","1 datoteka in {folderCount} map"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} datoteka in 1 mapa","{fileCount} datoteki in 1 mapa","{fileCount} datoteke in 1 mapa","{fileCount} datotek in 1 mapa"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} datotek in {folderCount} map",
    "List of favorites files and folders." : "Seznam priljubljenih datotek in map.",
    "Personal Files" : "Osebne datoteke",
    "Text file" : "Besedilna datoteka",
--- a/apps/files/l10n/sr.js
+++ b/apps/files/l10n/sr.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Овај директоријум није доступан, проверите дневник или контактирајте администратора",
    "Storage is temporarily not available" : "Складиште привремено није  доступно",
    "Unexpected error: {error}" : "Неочекивана грешка: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} фолдер","{folderCount} фолдера","{folderCount} фолдера"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} фајл","{fileCount} фајла","{fileCount} фајлова"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 фајл и {folderCount} фолдер","1 фајл и {folderCount} фолдера","1 фајл и {folderCount} фолдера"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} фајл и 1 фолдер","{fileCount} фајла и 1 фолдер","{fileCount} фајлова и 1 фолдер"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} фајлова и {folderCount} фолдера",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n сакривен)","(%n сакривена)","(%n сакривених)"],
+    "_%n file_::_%n files_" : ["%n фајл","%n фајла","%n фајлова"],
+    "_%n folder_::_%n folders_" : ["%n фасцикла","%n фасцикле","%n фасцикли"],
    "Filename must not be empty." : "Назив фајла не може бити празан.",
    "\"{char}\" is not allowed inside a filename." : "„{char}“ није дозвољен карактер у имену фајла.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}” је резервисано име и не сме се користити као име фајла.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Грешка при брисању фајла „{fileName}“.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нема резултата претраге у осталим фасциклама за {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Унесите више од два карактера да претражујете у другим фасциклама",
-    "_%n folder_::_%n folders_" : ["%n фасцикла","%n фасцикле","%n фасцикли"],
-    "_%n file_::_%n files_" : ["%n фајл","%n фајла","%n фајлова"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["укључујући и %n скривени","укључујући и %n скривена","укључујући и %n скривених"],
    "You do not have permission to upload or create files here" : "Немате дозволу да овде отпремите или креирате фајлове",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Уреди фајл локално",
    "Edit online" : "Уреди на мрежи",
    "Create new templates folder" : "Креирај нови фолдер шаблона",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} фолдер","{folderCount} фолдера","{folderCount} фолдера"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} фајл","{fileCount} фајла","{fileCount} фајлова"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 фајл и {folderCount} фолдер","1 фајл и {folderCount} фолдера","1 фајл и {folderCount} фолдера"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} фајл и 1 фолдер","{fileCount} фајла и 1 фолдер","{fileCount} фајлова и 1 фолдер"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} фајлова и {folderCount} фолдера",
    "List of favorites files and folders." : "Листа омиљених фајлова и директоријума.",
    "Personal Files" : "Лични фајлови",
    "Text file" : "Tекстуални фајл",
--- a/apps/files/l10n/sr.json
+++ b/apps/files/l10n/sr.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Овај директоријум није доступан, проверите дневник или контактирајте администратора",
    "Storage is temporarily not available" : "Складиште привремено није  доступно",
    "Unexpected error: {error}" : "Неочекивана грешка: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} фолдер","{folderCount} фолдера","{folderCount} фолдера"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} фајл","{fileCount} фајла","{fileCount} фајлова"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 фајл и {folderCount} фолдер","1 фајл и {folderCount} фолдера","1 фајл и {folderCount} фолдера"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} фајл и 1 фолдер","{fileCount} фајла и 1 фолдер","{fileCount} фајлова и 1 фолдер"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} фајлова и {folderCount} фолдера",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n сакривен)","(%n сакривена)","(%n сакривених)"],
+    "_%n file_::_%n files_" : ["%n фајл","%n фајла","%n фајлова"],
+    "_%n folder_::_%n folders_" : ["%n фасцикла","%n фасцикле","%n фасцикли"],
    "Filename must not be empty." : "Назив фајла не може бити празан.",
    "\"{char}\" is not allowed inside a filename." : "„{char}“ није дозвољен карактер у имену фајла.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "„{segment}” је резервисано име и не сме се користити као име фајла.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Грешка при брисању фајла „{fileName}“.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нема резултата претраге у осталим фасциклама за {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Унесите више од два карактера да претражујете у другим фасциклама",
-    "_%n folder_::_%n folders_" : ["%n фасцикла","%n фасцикле","%n фасцикли"],
-    "_%n file_::_%n files_" : ["%n фајл","%n фајла","%n фајлова"],
    "{dirs} and {files}" : "{dirs} и {files}",
    "_including %n hidden_::_including %n hidden_" : ["укључујући и %n скривени","укључујући и %n скривена","укључујући и %n скривених"],
    "You do not have permission to upload or create files here" : "Немате дозволу да овде отпремите или креирате фајлове",
@ -444,6 +438,11 @@
    "Edit file locally" : "Уреди фајл локално",
    "Edit online" : "Уреди на мрежи",
    "Create new templates folder" : "Креирај нови фолдер шаблона",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} фолдер","{folderCount} фолдера","{folderCount} фолдера"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} фајл","{fileCount} фајла","{fileCount} фајлова"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 фајл и {folderCount} фолдер","1 фајл и {folderCount} фолдера","1 фајл и {folderCount} фолдера"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} фајл и 1 фолдер","{fileCount} фајла и 1 фолдер","{fileCount} фајлова и 1 фолдер"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} фајлова и {folderCount} фолдера",
    "List of favorites files and folders." : "Листа омиљених фајлова и директоријума.",
    "Personal Files" : "Лични фајлови",
    "Text file" : "Tекстуални фајл",
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Denna katalog är inte tillgänglig, kontrollera loggarna eller kontakta administratören",
    "Storage is temporarily not available" : "Lagring är tillfälligt inte tillgänglig",
    "Unexpected error: {error}" : "Oväntat fel: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapp","{folderCount} mappar"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil och {folderCount} mapp","1 fil och {folderCount} mappar"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil och 1 mapp","{fileCount} filer och 1 mapp"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} filer och {folderCount} mappar",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n gömd)"," (%n gömd)"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
    "Filename must not be empty." : "Filnamn får inte vara tomt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" är inte tillåtet i ett filnamn.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" är ett reserverat namn och inte tillåtet som filnamn.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Fel när \"{fileName}\" skulle raderas.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Inga sökresultat i andra mappar för {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ange mer än två tecken för att söka i andra mappar",
-    "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
-    "_%n file_::_%n files_" : ["%n fil","%n filer"],
    "{dirs} and {files}" : "{dirs} och {files}",
    "_including %n hidden_::_including %n hidden_" : ["inkluderar %n dold","inkluderar %n dolda"],
    "You do not have permission to upload or create files here" : "Du har inte behörighet att ladda upp eller skapa filer här",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Redigera filen lokalt",
    "Edit online" : "Redigera online",
    "Create new templates folder" : "Skapa ny mallmapp",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapp","{folderCount} mappar"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil och {folderCount} mapp","1 fil och {folderCount} mappar"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil och 1 mapp","{fileCount} filer och 1 mapp"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} filer och {folderCount} mappar",
    "List of favorites files and folders." : "Lista över favoritfiler och mappar.",
    "Personal Files" : "Personliga filer",
    "Text file" : "Textfil",
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Denna katalog är inte tillgänglig, kontrollera loggarna eller kontakta administratören",
    "Storage is temporarily not available" : "Lagring är tillfälligt inte tillgänglig",
    "Unexpected error: {error}" : "Oväntat fel: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapp","{folderCount} mappar"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil och {folderCount} mapp","1 fil och {folderCount} mappar"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil och 1 mapp","{fileCount} filer och 1 mapp"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} filer och {folderCount} mappar",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n gömd)"," (%n gömd)"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
    "Filename must not be empty." : "Filnamn får inte vara tomt.",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" är inte tillåtet i ett filnamn.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" är ett reserverat namn och inte tillåtet som filnamn.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Fel när \"{fileName}\" skulle raderas.",
    "No search results in other folders for {tag}{filter}{endtag}" : "Inga sökresultat i andra mappar för {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Ange mer än två tecken för att söka i andra mappar",
-    "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
-    "_%n file_::_%n files_" : ["%n fil","%n filer"],
    "{dirs} and {files}" : "{dirs} och {files}",
    "_including %n hidden_::_including %n hidden_" : ["inkluderar %n dold","inkluderar %n dolda"],
    "You do not have permission to upload or create files here" : "Du har inte behörighet att ladda upp eller skapa filer här",
@ -444,6 +438,11 @@
    "Edit file locally" : "Redigera filen lokalt",
    "Edit online" : "Redigera online",
    "Create new templates folder" : "Skapa ny mallmapp",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} mapp","{folderCount} mappar"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} fil","{fileCount} filer"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 fil och {folderCount} mapp","1 fil och {folderCount} mappar"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} fil och 1 mapp","{fileCount} filer och 1 mapp"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} filer och {folderCount} mappar",
    "List of favorites files and folders." : "Lista över favoritfiler och mappar.",
    "Personal Files" : "Personliga filer",
    "Text file" : "Textfil",
--- a/apps/files/l10n/th.js
+++ b/apps/files/l10n/th.js
@ -147,6 +147,8 @@ OC.L10N.register(
    "This operation is forbidden" : "การดำเนินการนี้ถูกห้าม",
    "This directory is unavailable, please check the logs or contact the administrator" : "ไม่สามารถใช้งานไดเรกทอรีนี้ โปรดตรวจสอบบันทึกหรือติดต่อผู้ดูแลระบบ",
    "Storage is temporarily not available" : "พื้นที่จัดเก็บข้อมูลไม่สามารถใช้งานได้ชั่วคราว",
+    "_%n file_::_%n files_" : ["%n ไฟล์"],
+    "_%n folder_::_%n folders_" : ["%n โฟลเดอร์"],
    "No favorites yet" : "ยังไม่มีรายการโปรด",
    "Files and folders you mark as favorite will show up here" : "ไฟล์และโฟลเดอร์ที่คุณระบุเป็นรายการโปรดจะแสดงที่นี่",
    "All files" : "ไฟล์ทั้งหมด",
@ -205,8 +207,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "เกิดข้อผิดพลาดขณะลบไฟล์ \"{fileName}\"",
    "No search results in other folders for {tag}{filter}{endtag}" : "ไม่มีผลลัพธ์การค้นหาในโฟลเดอร์อื่นสำหรับ {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "ใส่มากกว่า 2 ตัวอักษร เพื่อค้นหาในโฟลเดอร์อื่น",
-    "_%n folder_::_%n folders_" : ["%n โฟลเดอร์"],
-    "_%n file_::_%n files_" : ["%n ไฟล์"],
    "{dirs} and {files}" : "{dirs} และ {files}",
    "_including %n hidden_::_including %n hidden_" : ["รวมถึง %n ไฟล์ที่ซ่อนอยู่"],
    "You do not have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัปโหลดหรือสร้างไฟล์ที่นี่",
--- a/apps/files/l10n/th.json
+++ b/apps/files/l10n/th.json
@ -145,6 +145,8 @@
    "This operation is forbidden" : "การดำเนินการนี้ถูกห้าม",
    "This directory is unavailable, please check the logs or contact the administrator" : "ไม่สามารถใช้งานไดเรกทอรีนี้ โปรดตรวจสอบบันทึกหรือติดต่อผู้ดูแลระบบ",
    "Storage is temporarily not available" : "พื้นที่จัดเก็บข้อมูลไม่สามารถใช้งานได้ชั่วคราว",
+    "_%n file_::_%n files_" : ["%n ไฟล์"],
+    "_%n folder_::_%n folders_" : ["%n โฟลเดอร์"],
    "No favorites yet" : "ยังไม่มีรายการโปรด",
    "Files and folders you mark as favorite will show up here" : "ไฟล์และโฟลเดอร์ที่คุณระบุเป็นรายการโปรดจะแสดงที่นี่",
    "All files" : "ไฟล์ทั้งหมด",
@ -203,8 +205,6 @@
    "Error deleting file \"{fileName}\"." : "เกิดข้อผิดพลาดขณะลบไฟล์ \"{fileName}\"",
    "No search results in other folders for {tag}{filter}{endtag}" : "ไม่มีผลลัพธ์การค้นหาในโฟลเดอร์อื่นสำหรับ {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "ใส่มากกว่า 2 ตัวอักษร เพื่อค้นหาในโฟลเดอร์อื่น",
-    "_%n folder_::_%n folders_" : ["%n โฟลเดอร์"],
-    "_%n file_::_%n files_" : ["%n ไฟล์"],
    "{dirs} and {files}" : "{dirs} และ {files}",
    "_including %n hidden_::_including %n hidden_" : ["รวมถึง %n ไฟล์ที่ซ่อนอยู่"],
    "You do not have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัปโหลดหรือสร้างไฟล์ที่นี่",
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Bu klasör yazılabilir değil. Lütfen günlük kayıtlarına bakın ya da BT yöneticiniz ile görüşün",
    "Storage is temporarily not available" : "Depolama geçici olarak kullanılamıyor",
    "Unexpected error: {error}" : "Beklenmeyen bir sorun çıktı: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} klasör","{folderCount} klasör"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} dosya","{fileCount} dosya"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 dosya ve {folderCount} klasör","1 dosya ve {folderCount} klasör"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} dosya ve 1 klasör","{fileCount} dosya ve 1 klasör"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} dosya ve {folderCount} klasör",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n gizli)"," (%n gizli)"],
+    "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
+    "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
    "Filename must not be empty." : "Dosya adı boş olamaz.",
    "\"{char}\" is not allowed inside a filename." : "Dosya adlarında \"{char}\" kullanılamaz.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ayrılmış bir ad olduğundan dosya adlarında kullanılamaz.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "\"{fileName}\" dosyası silinirken sorun çıktı.",
    "No search results in other folders for {tag}{filter}{endtag}" : "{tag}{filter}{endtag} için diğer klasörlerde herhangi bir arama sonucu yok",
    "Enter more than two characters to search in other folders" : "Diğer klasörlerde aramak için iki karakterden fazla yazın",
-    "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
-    "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
    "{dirs} and {files}" : "{dirs} ve {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n gizli ile birlikte","%n gizli ile birlikte"],
    "You do not have permission to upload or create files here" : "Buraya dosya yükleme ya da ekleme izniniz yok",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Dosyayı yerel olarak düzenle",
    "Edit online" : "Çevrim içi düzenle",
    "Create new templates folder" : "Yeni kalıp klasörü oluştur",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} klasör","{folderCount} klasör"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} dosya","{fileCount} dosya"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 dosya ve {folderCount} klasör","1 dosya ve {folderCount} klasör"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} dosya ve 1 klasör","{fileCount} dosya ve 1 klasör"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} dosya ve {folderCount} klasör",
    "List of favorites files and folders." : "Sık kullanılan dosya ve klasör listesi.",
    "Personal Files" : "Kişisel dosyalar",
    "Text file" : "Metin dosyası",
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Bu klasör yazılabilir değil. Lütfen günlük kayıtlarına bakın ya da BT yöneticiniz ile görüşün",
    "Storage is temporarily not available" : "Depolama geçici olarak kullanılamıyor",
    "Unexpected error: {error}" : "Beklenmeyen bir sorun çıktı: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} klasör","{folderCount} klasör"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} dosya","{fileCount} dosya"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 dosya ve {folderCount} klasör","1 dosya ve {folderCount} klasör"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} dosya ve 1 klasör","{fileCount} dosya ve 1 klasör"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} dosya ve {folderCount} klasör",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n gizli)"," (%n gizli)"],
+    "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
+    "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
    "Filename must not be empty." : "Dosya adı boş olamaz.",
    "\"{char}\" is not allowed inside a filename." : "Dosya adlarında \"{char}\" kullanılamaz.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" ayrılmış bir ad olduğundan dosya adlarında kullanılamaz.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "\"{fileName}\" dosyası silinirken sorun çıktı.",
    "No search results in other folders for {tag}{filter}{endtag}" : "{tag}{filter}{endtag} için diğer klasörlerde herhangi bir arama sonucu yok",
    "Enter more than two characters to search in other folders" : "Diğer klasörlerde aramak için iki karakterden fazla yazın",
-    "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
-    "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
    "{dirs} and {files}" : "{dirs} ve {files}",
    "_including %n hidden_::_including %n hidden_" : ["%n gizli ile birlikte","%n gizli ile birlikte"],
    "You do not have permission to upload or create files here" : "Buraya dosya yükleme ya da ekleme izniniz yok",
@ -444,6 +438,11 @@
    "Edit file locally" : "Dosyayı yerel olarak düzenle",
    "Edit online" : "Çevrim içi düzenle",
    "Create new templates folder" : "Yeni kalıp klasörü oluştur",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} klasör","{folderCount} klasör"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} dosya","{fileCount} dosya"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 dosya ve {folderCount} klasör","1 dosya ve {folderCount} klasör"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} dosya ve 1 klasör","{fileCount} dosya ve 1 klasör"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} dosya ve {folderCount} klasör",
    "List of favorites files and folders." : "Sık kullanılan dosya ve klasör listesi.",
    "Personal Files" : "Kişisel dosyalar",
    "Text file" : "Metin dosyası",
--- a/apps/files/l10n/ug.js
+++ b/apps/files/l10n/ug.js
@ -262,7 +262,6 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "بۇ مۇندەرىجىنى ئىشلەتكىلى بولمايدۇ ، خاتىرىلەرنى تەكشۈرۈپ بېقىڭ ياكى باشقۇرغۇچى بىلەن ئالاقىلىشىڭ",
    "Storage is temporarily not available" : "ساقلاش ۋاقتىنى ۋاقىتلىق ئىشلەتكىلى بولمايدۇ",
    "Unexpected error: {error}" : "ئويلىمىغان خاتالىق: {error}",
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ھۆججەتلىرى ۋە {folderCount} ھۆججەت قىسقۇچلىرى",
    "Filename must not be empty." : "ھۆججەت ئىسمى بوش بولماسلىقى كېرەك.",
    "\"{char}\" is not allowed inside a filename." : "ھۆججەت نامىدا \"{char}\" رۇخسەت قىلىنمايدۇ.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" زاپاس ئىسىم بولۇپ ، ھۆججەت نامىغا رۇخسەت قىلىنمايدۇ.",
@ -370,6 +369,7 @@ OC.L10N.register(
    "Edit file locally" : "ھۆججەتنى يەرلىكتە تەھرىرلەڭ",
    "Edit online" : "توردا تەھرىرلەڭ",
    "Create new templates folder" : "يېڭى قېلىپ ھۆججەت قىسقۇچى قۇر",
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ھۆججەتلىرى ۋە {folderCount} ھۆججەت قىسقۇچلىرى",
    "List of favorites files and folders." : "ياقتۇرىدىغان ھۆججەت ۋە ھۆججەت قىسقۇچلارنىڭ تىزىملىكى.",
    "Personal Files" : "شەخسىي ھۆججەتلەر",
    "Text file" : "تېكىست ھۆججەت",
--- a/apps/files/l10n/ug.json
+++ b/apps/files/l10n/ug.json
@ -260,7 +260,6 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "بۇ مۇندەرىجىنى ئىشلەتكىلى بولمايدۇ ، خاتىرىلەرنى تەكشۈرۈپ بېقىڭ ياكى باشقۇرغۇچى بىلەن ئالاقىلىشىڭ",
    "Storage is temporarily not available" : "ساقلاش ۋاقتىنى ۋاقىتلىق ئىشلەتكىلى بولمايدۇ",
    "Unexpected error: {error}" : "ئويلىمىغان خاتالىق: {error}",
-    "{fileCount} files and {folderCount} folders" : "{fileCount} ھۆججەتلىرى ۋە {folderCount} ھۆججەت قىسقۇچلىرى",
    "Filename must not be empty." : "ھۆججەت ئىسمى بوش بولماسلىقى كېرەك.",
    "\"{char}\" is not allowed inside a filename." : "ھۆججەت نامىدا \"{char}\" رۇخسەت قىلىنمايدۇ.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" زاپاس ئىسىم بولۇپ ، ھۆججەت نامىغا رۇخسەت قىلىنمايدۇ.",
@ -368,6 +367,7 @@
    "Edit file locally" : "ھۆججەتنى يەرلىكتە تەھرىرلەڭ",
    "Edit online" : "توردا تەھرىرلەڭ",
    "Create new templates folder" : "يېڭى قېلىپ ھۆججەت قىسقۇچى قۇر",
+    "{fileCount} files and {folderCount} folders" : "{fileCount} ھۆججەتلىرى ۋە {folderCount} ھۆججەت قىسقۇچلىرى",
    "List of favorites files and folders." : "ياقتۇرىدىغان ھۆججەت ۋە ھۆججەت قىسقۇچلارنىڭ تىزىملىكى.",
    "Personal Files" : "شەخسىي ھۆججەتلەر",
    "Text file" : "تېكىست ھۆججەت",
--- a/apps/files/l10n/uk.js
+++ b/apps/files/l10n/uk.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "Каталог недоступний, будь ласка, перевірте файл журналу або зверніться до адміністратора  ",
    "Storage is temporarily not available" : "Сховище тимчасово недоступне",
    "Unexpected error: {error}" : "Неочікувана помилка: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} каталог","{folderCount} каталоги","{folderCount} каталогів","{folderCount} каталогів"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файли","{fileCount} файлів","{fileCount} файлів"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 файл та {folderCount} каталог","1 файл та {folderCount} каталоги","1 файл та {folderCount} каталогів","1 файл та {folderCount} каталогів"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл та 1 каталог","{fileCount} файли та 1 каталог","{fileCount} файлів та 1 каталог","{fileCount} файлів та 1 каталог"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} файлів та {folderCount} каталогів",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n приховано)"," (%n прихованих)"," (%n прихованих)"," (%n прихованих)"],
+    "_%n file_::_%n files_" : ["%n файл","%n файли","%n файлів","%n файлів"],
+    "_%n folder_::_%n folders_" : ["%n каталог ","%n каталоги ","%n каталогів ","%n каталогів"],
    "Filename must not be empty." : "Імена файлів не мають бути порожні.",
    "\"{char}\" is not allowed inside a filename." : "Символ \"{char}\" не дозволено у імені файлу.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" є зарезервованим ім'ям і не дозволяється у іменах файлів.",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Помилка вилучення файлу \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нічого не знайдено в інших каталогах за запитом {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Для пошуку в інших каталогах потрібно зазначити більше двох символів",
-    "_%n folder_::_%n folders_" : ["%n каталог ","%n каталоги ","%n каталогів ","%n каталогів"],
-    "_%n file_::_%n files_" : ["%n файл","%n файли","%n файлів","%n файлів"],
    "{dirs} and {files}" : "{dirs} та {files}",
    "_including %n hidden_::_including %n hidden_" : ["включаючи %n прихований","включаючи %n прихованих","включаючи %n прихованих","включно %n прихованих"],
    "You do not have permission to upload or create files here" : "У вас відсутні повноваження для завантаження або створення файлів тут",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "Редагувати файл на пристрої",
    "Edit online" : "Відкрити онлайн",
    "Create new templates folder" : "Створіть новий каталог для шаблонів",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} каталог","{folderCount} каталоги","{folderCount} каталогів","{folderCount} каталогів"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файли","{fileCount} файлів","{fileCount} файлів"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 файл та {folderCount} каталог","1 файл та {folderCount} каталоги","1 файл та {folderCount} каталогів","1 файл та {folderCount} каталогів"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл та 1 каталог","{fileCount} файли та 1 каталог","{fileCount} файлів та 1 каталог","{fileCount} файлів та 1 каталог"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} файлів та {folderCount} каталогів",
    "List of favorites files and folders." : "Список файлів та каталогів із зірочкою.",
    "Personal Files" : "Мої документи",
    "Text file" : "Текстовий файл",
--- a/apps/files/l10n/uk.json
+++ b/apps/files/l10n/uk.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "Каталог недоступний, будь ласка, перевірте файл журналу або зверніться до адміністратора  ",
    "Storage is temporarily not available" : "Сховище тимчасово недоступне",
    "Unexpected error: {error}" : "Неочікувана помилка: {error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} каталог","{folderCount} каталоги","{folderCount} каталогів","{folderCount} каталогів"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файли","{fileCount} файлів","{fileCount} файлів"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 файл та {folderCount} каталог","1 файл та {folderCount} каталоги","1 файл та {folderCount} каталогів","1 файл та {folderCount} каталогів"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл та 1 каталог","{fileCount} файли та 1 каталог","{fileCount} файлів та 1 каталог","{fileCount} файлів та 1 каталог"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} файлів та {folderCount} каталогів",
-    "_(%n hidden)_::_ (%n hidden)_" : ["(%n приховано)"," (%n прихованих)"," (%n прихованих)"," (%n прихованих)"],
+    "_%n file_::_%n files_" : ["%n файл","%n файли","%n файлів","%n файлів"],
+    "_%n folder_::_%n folders_" : ["%n каталог ","%n каталоги ","%n каталогів ","%n каталогів"],
    "Filename must not be empty." : "Імена файлів не мають бути порожні.",
    "\"{char}\" is not allowed inside a filename." : "Символ \"{char}\" не дозволено у імені файлу.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" є зарезервованим ім'ям і не дозволяється у іменах файлів.",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "Помилка вилучення файлу \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Нічого не знайдено в інших каталогах за запитом {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Для пошуку в інших каталогах потрібно зазначити більше двох символів",
-    "_%n folder_::_%n folders_" : ["%n каталог ","%n каталоги ","%n каталогів ","%n каталогів"],
-    "_%n file_::_%n files_" : ["%n файл","%n файли","%n файлів","%n файлів"],
    "{dirs} and {files}" : "{dirs} та {files}",
    "_including %n hidden_::_including %n hidden_" : ["включаючи %n прихований","включаючи %n прихованих","включаючи %n прихованих","включно %n прихованих"],
    "You do not have permission to upload or create files here" : "У вас відсутні повноваження для завантаження або створення файлів тут",
@ -444,6 +438,11 @@
    "Edit file locally" : "Редагувати файл на пристрої",
    "Edit online" : "Відкрити онлайн",
    "Create new templates folder" : "Створіть новий каталог для шаблонів",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} каталог","{folderCount} каталоги","{folderCount} каталогів","{folderCount} каталогів"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} файл","{fileCount} файли","{fileCount} файлів","{fileCount} файлів"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 файл та {folderCount} каталог","1 файл та {folderCount} каталоги","1 файл та {folderCount} каталогів","1 файл та {folderCount} каталогів"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} файл та 1 каталог","{fileCount} файли та 1 каталог","{fileCount} файлів та 1 каталог","{fileCount} файлів та 1 каталог"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} файлів та {folderCount} каталогів",
    "List of favorites files and folders." : "Список файлів та каталогів із зірочкою.",
    "Personal Files" : "Мої документи",
    "Text file" : "Текстовий файл",
--- a/apps/files/l10n/vi.js
+++ b/apps/files/l10n/vi.js
@ -257,11 +257,8 @@ OC.L10N.register(
    "This operation is forbidden" : "Thao tác bị cấm",
    "This directory is unavailable, please check the logs or contact the administrator" : "Thư mục này không sẵn có, hãy kiểm tra log hoặc liên hệ người quản lý",
    "Storage is temporarily not available" : "Kho lưu trữ tạm thời không khả dụng",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["thư mục {folderCount}"],
-    "_{fileCount} file_::_{fileCount} files_" : ["tệp {fileCount}"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tệp và thư mục {folderCount}"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["tệp {fileCount} và 1 thư mục"],
-    "{fileCount} files and {folderCount} folders" : "Tệp {fileCount} và thư mục {folderCount}",
+    "_%n file_::_%n files_" : ["%n tập tin"],
+    "_%n folder_::_%n folders_" : ["%n thư mục"],
    "Filename must not be empty." : "Tên tập tin không thể trống",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" không được phép bên trong tên tệp.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" là tên dành riêng và không được phép cho tên tệp.",
@ -333,8 +330,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "Lỗi khi xóa tập tin \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Không có kết quả tìm kiếm trong các thư mục khác cho {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Nhập nhiều hơn hai ký tự để tìm kiếm trong các thư mục khác",
-    "_%n folder_::_%n folders_" : ["%n thư mục"],
-    "_%n file_::_%n files_" : ["%n tập tin"],
    "{dirs} and {files}" : "{dirs} và {files}",
    "_including %n hidden_::_including %n hidden_" : ["Bao gồm %n ẩn"],
    "You do not have permission to upload or create files here" : "Bạn không đủ quyền để Tải lên hoặc Tạo tập tin ở đây",
@ -372,6 +367,11 @@ OC.L10N.register(
    "Edit file locally" : "Chỉnh sửa tập tin ngoại tuyến",
    "Edit online" : "Chỉnh sửa trực tuyến",
    "Create new templates folder" : "Tạo thư mục mẫu mới",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["thư mục {folderCount}"],
+    "_{fileCount} file_::_{fileCount} files_" : ["tệp {fileCount}"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tệp và thư mục {folderCount}"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["tệp {fileCount} và 1 thư mục"],
+    "{fileCount} files and {folderCount} folders" : "Tệp {fileCount} và thư mục {folderCount}",
    "List of favorites files and folders." : "Danh sách các tập tin và thư mục yêu thích.",
    "Personal Files" : "Tệp tin cá nhân",
    "Text file" : "Tập tin văn bản",
--- a/apps/files/l10n/vi.json
+++ b/apps/files/l10n/vi.json
@ -255,11 +255,8 @@
    "This operation is forbidden" : "Thao tác bị cấm",
    "This directory is unavailable, please check the logs or contact the administrator" : "Thư mục này không sẵn có, hãy kiểm tra log hoặc liên hệ người quản lý",
    "Storage is temporarily not available" : "Kho lưu trữ tạm thời không khả dụng",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["thư mục {folderCount}"],
-    "_{fileCount} file_::_{fileCount} files_" : ["tệp {fileCount}"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tệp và thư mục {folderCount}"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["tệp {fileCount} và 1 thư mục"],
-    "{fileCount} files and {folderCount} folders" : "Tệp {fileCount} và thư mục {folderCount}",
+    "_%n file_::_%n files_" : ["%n tập tin"],
+    "_%n folder_::_%n folders_" : ["%n thư mục"],
    "Filename must not be empty." : "Tên tập tin không thể trống",
    "\"{char}\" is not allowed inside a filename." : "\"{char}\" không được phép bên trong tên tệp.",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "\"{segment}\" là tên dành riêng và không được phép cho tên tệp.",
@ -331,8 +328,6 @@
    "Error deleting file \"{fileName}\"." : "Lỗi khi xóa tập tin \"{fileName}\".",
    "No search results in other folders for {tag}{filter}{endtag}" : "Không có kết quả tìm kiếm trong các thư mục khác cho {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "Nhập nhiều hơn hai ký tự để tìm kiếm trong các thư mục khác",
-    "_%n folder_::_%n folders_" : ["%n thư mục"],
-    "_%n file_::_%n files_" : ["%n tập tin"],
    "{dirs} and {files}" : "{dirs} và {files}",
    "_including %n hidden_::_including %n hidden_" : ["Bao gồm %n ẩn"],
    "You do not have permission to upload or create files here" : "Bạn không đủ quyền để Tải lên hoặc Tạo tập tin ở đây",
@ -370,6 +365,11 @@
    "Edit file locally" : "Chỉnh sửa tập tin ngoại tuyến",
    "Edit online" : "Chỉnh sửa trực tuyến",
    "Create new templates folder" : "Tạo thư mục mẫu mới",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["thư mục {folderCount}"],
+    "_{fileCount} file_::_{fileCount} files_" : ["tệp {fileCount}"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 tệp và thư mục {folderCount}"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["tệp {fileCount} và 1 thư mục"],
+    "{fileCount} files and {folderCount} folders" : "Tệp {fileCount} và thư mục {folderCount}",
    "List of favorites files and folders." : "Danh sách các tập tin và thư mục yêu thích.",
    "Personal Files" : "Tệp tin cá nhân",
    "Text file" : "Tập tin văn bản",
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "此目录不可用，请检查日志或联系管理员",
    "Storage is temporarily not available" : "存储空间暂时不可用",
    "Unexpected error: {error}" : "意外错误：{error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 个文件夹"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 个文件"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 个文件夹及 {folderCount} 个文件夹"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 个文件及 1 个文件夹"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} 个文件及 {folderCount} 个文件夹",
-    "_(%n hidden)_::_ (%n hidden)_" : ["（%n 隐藏）"],
+    "_%n file_::_%n files_" : ["%n 个文件"],
+    "_%n folder_::_%n folders_" : ["%n 个文件夹"],
    "Filename must not be empty." : "文件名不能为空。",
    "\"{char}\" is not allowed inside a filename." : "文件名中不允许出现 “{char}”",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "“{segment}” 是一个保留名称，不允许用在文件名中。",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "删除文件“{fileName}”时出错。",
    "No search results in other folders for {tag}{filter}{endtag}" : "在其它的文件夹里没有关于 {tag}{filter}{endtag} 的搜索结果",
    "Enter more than two characters to search in other folders" : "输入至少三个字符，以搜索其他文件夹",
-    "_%n folder_::_%n folders_" : ["%n 个文件夹"],
-    "_%n file_::_%n files_" : ["%n 个文件"],
    "{dirs} and {files}" : "{dirs} 和 {files}",
    "_including %n hidden_::_including %n hidden_" : ["包括 %n 个隐藏文件"],
    "You do not have permission to upload or create files here" : "您没有在此上传或创建文件的权限",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "本地编辑",
    "Edit online" : "在线编辑",
    "Create new templates folder" : "新建模板文件夹",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 个文件夹"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 个文件"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 个文件夹及 {folderCount} 个文件夹"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 个文件及 1 个文件夹"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} 个文件及 {folderCount} 个文件夹",
    "List of favorites files and folders." : "收藏文件和文件夹列表",
    "Personal Files" : "个人文件",
    "Text file" : "文本文件",
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "此目录不可用，请检查日志或联系管理员",
    "Storage is temporarily not available" : "存储空间暂时不可用",
    "Unexpected error: {error}" : "意外错误：{error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 个文件夹"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 个文件"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 个文件夹及 {folderCount} 个文件夹"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 个文件及 1 个文件夹"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} 个文件及 {folderCount} 个文件夹",
-    "_(%n hidden)_::_ (%n hidden)_" : ["（%n 隐藏）"],
+    "_%n file_::_%n files_" : ["%n 个文件"],
+    "_%n folder_::_%n folders_" : ["%n 个文件夹"],
    "Filename must not be empty." : "文件名不能为空。",
    "\"{char}\" is not allowed inside a filename." : "文件名中不允许出现 “{char}”",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "“{segment}” 是一个保留名称，不允许用在文件名中。",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "删除文件“{fileName}”时出错。",
    "No search results in other folders for {tag}{filter}{endtag}" : "在其它的文件夹里没有关于 {tag}{filter}{endtag} 的搜索结果",
    "Enter more than two characters to search in other folders" : "输入至少三个字符，以搜索其他文件夹",
-    "_%n folder_::_%n folders_" : ["%n 个文件夹"],
-    "_%n file_::_%n files_" : ["%n 个文件"],
    "{dirs} and {files}" : "{dirs} 和 {files}",
    "_including %n hidden_::_including %n hidden_" : ["包括 %n 个隐藏文件"],
    "You do not have permission to upload or create files here" : "您没有在此上传或创建文件的权限",
@ -444,6 +438,11 @@
    "Edit file locally" : "本地编辑",
    "Edit online" : "在线编辑",
    "Create new templates folder" : "新建模板文件夹",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 个文件夹"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 个文件"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 个文件夹及 {folderCount} 个文件夹"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 个文件及 1 个文件夹"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} 个文件及 {folderCount} 个文件夹",
    "List of favorites files and folders." : "收藏文件和文件夹列表",
    "Personal Files" : "个人文件",
    "Text file" : "文本文件",
--- a/apps/files/l10n/zh_HK.js
+++ b/apps/files/l10n/zh_HK.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法存取，請檢查伺服器記錄檔或聯絡管理員",
    "Storage is temporarily not available" : "儲存空間暫時無法使用",
    "Unexpected error: {error}" : "意外錯誤：{error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
-    "_(%n hidden)_::_ (%n hidden)_" : ["（%n 隱藏）"],
+    "_%n file_::_%n files_" : ["%n 個檔案"],
+    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
    "Filename must not be empty." : "檔案名稱不能為空。",
    "\"{char}\" is not allowed inside a filename." : "檔案名稱中不允許出現「{char}」",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "「{segment}」是保留名稱，不允許用在檔案名稱。",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "刪除 \"{fileName}\" 出錯",
    "No search results in other folders for {tag}{filter}{endtag}" : "在其它資料夾中沒有找到 {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "輸入兩個字元以上以便在其它資料夾搜尋",
-    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
-    "_%n file_::_%n files_" : ["%n 個檔案"],
    "{dirs} and {files}" : "{dirs} 和 {files}",
    "_including %n hidden_::_including %n hidden_" : ["包括 %n 個隱藏檔"],
    "You do not have permission to upload or create files here" : "您無權限上傳或建立檔案",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "在近端編輯檔案",
    "Edit online" : "在線編輯",
    "Create new templates folder" : "創建新範本資料夾",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
    "List of favorites files and folders." : "最愛檔案與資料夾的清單。",
    "Personal Files" : "個人檔案",
    "Text file" : "文字檔",
--- a/apps/files/l10n/zh_HK.json
+++ b/apps/files/l10n/zh_HK.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法存取，請檢查伺服器記錄檔或聯絡管理員",
    "Storage is temporarily not available" : "儲存空間暫時無法使用",
    "Unexpected error: {error}" : "意外錯誤：{error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
-    "_(%n hidden)_::_ (%n hidden)_" : ["（%n 隱藏）"],
+    "_%n file_::_%n files_" : ["%n 個檔案"],
+    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
    "Filename must not be empty." : "檔案名稱不能為空。",
    "\"{char}\" is not allowed inside a filename." : "檔案名稱中不允許出現「{char}」",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "「{segment}」是保留名稱，不允許用在檔案名稱。",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "刪除 \"{fileName}\" 出錯",
    "No search results in other folders for {tag}{filter}{endtag}" : "在其它資料夾中沒有找到 {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "輸入兩個字元以上以便在其它資料夾搜尋",
-    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
-    "_%n file_::_%n files_" : ["%n 個檔案"],
    "{dirs} and {files}" : "{dirs} 和 {files}",
    "_including %n hidden_::_including %n hidden_" : ["包括 %n 個隱藏檔"],
    "You do not have permission to upload or create files here" : "您無權限上傳或建立檔案",
@ -444,6 +438,11 @@
    "Edit file locally" : "在近端編輯檔案",
    "Edit online" : "在線編輯",
    "Create new templates folder" : "創建新範本資料夾",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
    "List of favorites files and folders." : "最愛檔案與資料夾的清單。",
    "Personal Files" : "個人檔案",
    "Text file" : "文字檔",
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@ -326,12 +326,8 @@ OC.L10N.register(
    "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法取用，請檢查伺服器紀錄檔或聯絡管理員",
    "Storage is temporarily not available" : "儲存空間暫時無法使用",
    "Unexpected error: {error}" : "意外錯誤：{error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
-    "_(%n hidden)_::_ (%n hidden)_" : ["（%n 個隱藏）"],
+    "_%n file_::_%n files_" : ["%n 個檔案"],
+    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
    "Filename must not be empty." : "檔案名稱不能為空。",
    "\"{char}\" is not allowed inside a filename." : "檔案名稱中不允許出現「{char}」",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "「{segment}」是保留名稱，不允許用在檔案名稱。",
@ -405,8 +401,6 @@ OC.L10N.register(
    "Error deleting file \"{fileName}\"." : "刪除「{fileName}」時發生錯誤。",
    "No search results in other folders for {tag}{filter}{endtag}" : "在其他資料夾中沒有找到 {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "請輸入兩個字元以上，以便在其他資料夾搜尋",
-    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
-    "_%n file_::_%n files_" : ["%n 個檔案"],
    "{dirs} and {files}" : "{dirs} 和 {files}",
    "_including %n hidden_::_including %n hidden_" : ["包含 %n 個隱藏檔"],
    "You do not have permission to upload or create files here" : "您無權在此上傳或建立檔案",
@ -446,6 +440,11 @@ OC.L10N.register(
    "Edit file locally" : "本機編輯檔案",
    "Edit online" : "線上編輯",
    "Create new templates folder" : "建立新的範本資料夾",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
    "List of favorites files and folders." : "喜愛檔案與資料夾的清單。",
    "Personal Files" : "個人檔案",
    "Text file" : "文字檔案",
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@ -324,12 +324,8 @@
    "This directory is unavailable, please check the logs or contact the administrator" : "這個目錄無法取用，請檢查伺服器紀錄檔或聯絡管理員",
    "Storage is temporarily not available" : "儲存空間暫時無法使用",
    "Unexpected error: {error}" : "意外錯誤：{error}",
-    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
-    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
-    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
-    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
-    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
-    "_(%n hidden)_::_ (%n hidden)_" : ["（%n 個隱藏）"],
+    "_%n file_::_%n files_" : ["%n 個檔案"],
+    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
    "Filename must not be empty." : "檔案名稱不能為空。",
    "\"{char}\" is not allowed inside a filename." : "檔案名稱中不允許出現「{char}」",
    "\"{segment}\" is a reserved name and not allowed for filenames." : "「{segment}」是保留名稱，不允許用在檔案名稱。",
@ -403,8 +399,6 @@
    "Error deleting file \"{fileName}\"." : "刪除「{fileName}」時發生錯誤。",
    "No search results in other folders for {tag}{filter}{endtag}" : "在其他資料夾中沒有找到 {tag}{filter}{endtag}",
    "Enter more than two characters to search in other folders" : "請輸入兩個字元以上，以便在其他資料夾搜尋",
-    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
-    "_%n file_::_%n files_" : ["%n 個檔案"],
    "{dirs} and {files}" : "{dirs} 和 {files}",
    "_including %n hidden_::_including %n hidden_" : ["包含 %n 個隱藏檔"],
    "You do not have permission to upload or create files here" : "您無權在此上傳或建立檔案",
@ -444,6 +438,11 @@
    "Edit file locally" : "本機編輯檔案",
    "Edit online" : "線上編輯",
    "Create new templates folder" : "建立新的範本資料夾",
+    "_{folderCount} folder_::_{folderCount} folders_" : ["{folderCount} 個資料夾"],
+    "_{fileCount} file_::_{fileCount} files_" : ["{fileCount} 個檔案"],
+    "_1 file and {folderCount} folder_::_1 file and {folderCount} folders_" : ["1 個檔案與 {folderCount} 個資料夾"],
+    "_{fileCount} file and 1 folder_::_{fileCount} files and 1 folder_" : ["{fileCount} 個檔案與 1 個資料夾"],
+    "{fileCount} files and {folderCount} folders" : "{fileCount} 個檔案與 {folderCount} 個資料夾",
    "List of favorites files and folders." : "喜愛檔案與資料夾的清單。",
    "Personal Files" : "個人檔案",
    "Text file" : "文字檔案",
--- a/apps/files_sharing/l10n/sv.js
+++ b/apps/files_sharing/l10n/sv.js
@ -254,7 +254,7 @@ OC.L10N.register(
    "Search for internal recipients" : "Sök efter interna mottagare",
    "Note from" : "Anteckning från",
    "Note:" : "Notering:",
-    "File drop" : "Göm fillista",
+    "File drop" : "Filinkast",
    "Upload files to {foldername}." : "Ladda upp filer till {foldername}.",
    "By uploading files, you agree to the terms of service." : "Genom att ladda upp filer godkänner du användarvillkoren.",
    "View terms of service" : "Visa användarvillkoren",
--- a/apps/files_sharing/l10n/sv.json
+++ b/apps/files_sharing/l10n/sv.json
@ -252,7 +252,7 @@
    "Search for internal recipients" : "Sök efter interna mottagare",
    "Note from" : "Anteckning från",
    "Note:" : "Notering:",
-    "File drop" : "Göm fillista",
+    "File drop" : "Filinkast",
    "Upload files to {foldername}." : "Ladda upp filer till {foldername}.",
    "By uploading files, you agree to the terms of service." : "Genom att ladda upp filer godkänner du användarvillkoren.",
    "View terms of service" : "Visa användarvillkoren",
--- a/Show more
+++ b/Show more