Browse Source

lint: use plurals and simplify file list footer calculation

AndyScherzinger 7 years ago
parent
commit
408f6f93cb
39 changed files with 34 additions and 336 deletions
  1. 25 34
      src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
  2. 0 6
      src/main/res/values-ar/strings.xml
  3. 0 8
      src/main/res/values-ast/strings.xml
  4. 0 8
      src/main/res/values-bg-rBG/strings.xml
  5. 0 8
      src/main/res/values-ca/strings.xml
  6. 0 8
      src/main/res/values-cs-rCZ/strings.xml
  7. 0 8
      src/main/res/values-da/strings.xml
  8. 0 8
      src/main/res/values-de-rDE/strings.xml
  9. 0 8
      src/main/res/values-de/strings.xml
  10. 0 8
      src/main/res/values-el/strings.xml
  11. 0 8
      src/main/res/values-en-rGB/strings.xml
  12. 0 8
      src/main/res/values-es-rAR/strings.xml
  13. 0 8
      src/main/res/values-es-rMX/strings.xml
  14. 0 8
      src/main/res/values-es/strings.xml
  15. 0 8
      src/main/res/values-fi-rFI/strings.xml
  16. 0 8
      src/main/res/values-fr/strings.xml
  17. 0 8
      src/main/res/values-he/strings.xml
  18. 0 8
      src/main/res/values-hu-rHU/strings.xml
  19. 0 8
      src/main/res/values-id/strings.xml
  20. 0 8
      src/main/res/values-is/strings.xml
  21. 0 8
      src/main/res/values-it/strings.xml
  22. 0 8
      src/main/res/values-ja-rJP/strings.xml
  23. 0 8
      src/main/res/values-ko/strings.xml
  24. 0 8
      src/main/res/values-lv/strings.xml
  25. 0 8
      src/main/res/values-nb-rNO/strings.xml
  26. 0 8
      src/main/res/values-nl/strings.xml
  27. 0 8
      src/main/res/values-pl/strings.xml
  28. 0 8
      src/main/res/values-pt-rBR/strings.xml
  29. 0 8
      src/main/res/values-ro/strings.xml
  30. 0 8
      src/main/res/values-ru/strings.xml
  31. 0 8
      src/main/res/values-sk-rSK/strings.xml
  32. 0 8
      src/main/res/values-sl/strings.xml
  33. 0 8
      src/main/res/values-sq/strings.xml
  34. 1 8
      src/main/res/values-sr/strings.xml
  35. 0 8
      src/main/res/values-sv/strings.xml
  36. 0 8
      src/main/res/values-tr/strings.xml
  37. 0 8
      src/main/res/values-zh-rCN/strings.xml
  38. 0 8
      src/main/res/values-zh-rTW/strings.xml
  39. 8 8
      src/main/res/values/strings.xml

+ 25 - 34
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -1189,40 +1189,31 @@ public class OCFileListFragment extends ExtendedListFragment implements OCFileLi
         String output = "";
 
         if (getActivity() != null) {
-            if (filesCount <= 0) {
-                if (foldersCount <= 0) {
-                    output = "";
-
-                } else if (foldersCount == 1) {
-                    output = getResources().getString(R.string.file_list__footer__folder);
-
-                } else { // foldersCount > 1
-                    output = getResources().getString(R.string.file_list__footer__folders, foldersCount);
-                }
-
-            } else if (filesCount == 1) {
-                if (foldersCount <= 0) {
-                    output = getResources().getString(R.string.file_list__footer__file);
-
-                } else if (foldersCount == 1) {
-                    output = getResources().getString(R.string.file_list__footer__file_and_folder);
-
-                } else { // foldersCount > 1
-                    output = getResources().getString(R.string.file_list__footer__file_and_folders, foldersCount);
-                }
-            } else {    // filesCount > 1
-                if (foldersCount <= 0) {
-                    output = getResources().getString(R.string.file_list__footer__files, filesCount);
-
-                } else if (foldersCount == 1) {
-                    output = getResources().getString(R.string.file_list__footer__files_and_folder, filesCount);
-
-                } else { // foldersCount > 1
-                    output = getResources().getString(
-                            R.string.file_list__footer__files_and_folders, filesCount, foldersCount
-                    );
-
-                }
+            if (filesCount + foldersCount <= 0) {
+                output = "";
+            } else if (foldersCount <= 0) {
+                output = getResources().getQuantityString(
+                        R.plurals.file_list__footer__file,
+                        filesCount,
+                        filesCount
+                );
+            } else if (filesCount <= 0) {
+                output = getResources().getQuantityString(
+                        R.plurals.file_list__footer__folder,
+                        foldersCount,
+                        foldersCount
+                );
+            } else {
+                output = getResources().getQuantityString(
+                        R.plurals.file_list__footer__file,
+                        filesCount,
+                        filesCount)
+                        + ", "
+                        + getResources().getQuantityString(
+                        R.plurals.file_list__footer__folder,
+                        foldersCount,
+                        foldersCount
+                );
             }
         }
 

+ 0 - 6
src/main/res/values-ar/strings.xml

@@ -292,12 +292,6 @@
 	<string name="auth_host_address">عنوان الخادم</string>
     <string name="username">إسم المستخدم</string>
 
-    <string name="file_list__footer__folder">مجلد واحد</string>
-    <string name="file_list__footer__folders">%1$d مجلدات</string>
-    <string name="file_list__footer__file">1 ملف</string>
-    <string name="file_list__footer__file_and_folder">1 ملف, 1 مجلد</string>
-    <string name="file_list__footer__file_and_folders">1 ملف, %1$d مجلدات</string>
-    <string name="file_list__footer__files">%1$d ملفات</string>
     <string name="file_list__footer__files_and_folder">%1$d ملفات و مجلد واحد</string>
     <string name="file_list__footer__files_and_folders">%1$d ملفات و %2$d مجلدات</string>
     <string name="set_picture_as">إستخدم الصورة كـ</string>

+ 0 - 8
src/main/res/values-ast/strings.xml

@@ -367,14 +367,6 @@
 
     <string name="username">Nome d\'usuariu</string>
 
-    <string name="file_list__footer__folder">1 carpeta</string>
-    <string name="file_list__footer__folders">%1$d carpetes </string>
-    <string name="file_list__footer__file">1 ficheru</string>
-    <string name="file_list__footer__file_and_folder">1 ficheru, 1 carpeta</string>
-    <string name="file_list__footer__file_and_folders">1 ficheru, %1$d carpetes</string>
-    <string name="file_list__footer__files">%1$d ficheros</string>
-    <string name="file_list__footer__files_and_folder">%1$d ficheros, 1 carpeta</string>
-    <string name="file_list__footer__files_and_folders">%1$d ficheros, %2$d carpetes</string>
     <string name="prefs_instant_behaviour_dialogTitle">El ficheru orixinal sedrá&#8230;</string>
     <string name="prefs_instant_behaviour_title">El ficheru orixinal sedrá&#8230;</string>
     <string name="upload_copy_files">Copiar ficheru</string>

+ 0 - 8
src/main/res/values-bg-rBG/strings.xml

@@ -305,14 +305,6 @@
 
     <string name="username">Потребител</string>
 
-    <string name="file_list__footer__folder">1 папка</string>
-    <string name="file_list__footer__folders">%1$d папки</string>
-    <string name="file_list__footer__file">1 файл</string>
-    <string name="file_list__footer__file_and_folder">1 файл, 1 папка</string>
-    <string name="file_list__footer__file_and_folders">1 файл, %1$d папки</string>
-    <string name="file_list__footer__files">%1$d файла</string>
-    <string name="file_list__footer__files_and_folder">%1$d файла, 1 папка</string>
-    <string name="file_list__footer__files_and_folders">%1$d файла, %2$d папки</string>
     <string name="prefs_instant_behaviour_dialogTitle">Оригиналните файлове ще бъдат &#8230;</string>
     <string name="prefs_instant_behaviour_title">Оригиналните файлове ще бъдат &#8230;</string>
     <string name="upload_copy_files">Копирай файла</string>

+ 0 - 8
src/main/res/values-ca/strings.xml

@@ -388,14 +388,6 @@
 
     <string name="username">Nom d\'usuari</string>
 
-    <string name="file_list__footer__folder">1 carpeta</string>
-    <string name="file_list__footer__folders">%1$d carpetes</string>
-    <string name="file_list__footer__file">1 fitxer</string>
-    <string name="file_list__footer__file_and_folder">1 fitxer, 1 carpeta</string>
-    <string name="file_list__footer__file_and_folders">1 fitxer, %1$d carpetes</string>
-    <string name="file_list__footer__files">%1$d fitxers</string>
-    <string name="file_list__footer__files_and_folder">%1$d fitxers, 1 carpeta</string>
-    <string name="file_list__footer__files_and_folders">%1$d fitxers, %2$d carpetes</string>
     <string name="prefs_instant_behaviour_dialogTitle">El fitxer original serà&#8230;</string>
     <string name="prefs_instant_behaviour_title">El fitxer original serà&#8230;</string>
     <string name="upload_copy_files">Copiar fitxer</string>

+ 0 - 8
src/main/res/values-cs-rCZ/strings.xml

@@ -456,14 +456,6 @@
 
     <string name="username">Uživatelské jméno</string>
 
-    <string name="file_list__footer__folder">1 adresář</string>
-    <string name="file_list__footer__folders">%1$d adresáře(ů)</string>
-    <string name="file_list__footer__file">1 soubor</string>
-    <string name="file_list__footer__file_and_folder">1 soubor, 1 adresář</string>
-    <string name="file_list__footer__file_and_folders">1 soubor, %1$d adresáře(ů)</string>
-    <string name="file_list__footer__files">%1$d soubory(ů)</string>
-    <string name="file_list__footer__files_and_folder">%1$d soubory(ů), 1 adresář</string>
-    <string name="file_list__footer__files_and_folders">%1$d soubory(ů), %2$d adresáře(ů)</string>
     <string name="set_picture_as">Použít obrázek jako</string>
     <string name="set_as">Nastavit jako</string>
 

+ 0 - 8
src/main/res/values-da/strings.xml

@@ -335,14 +335,6 @@
 
     <string name="username">Brugernavn</string>
 
-    <string name="file_list__footer__folder">1 mappe</string>
-    <string name="file_list__footer__folders">%1$d mapper</string>
-    <string name="file_list__footer__file">1 fil</string>
-    <string name="file_list__footer__file_and_folder">1 fil, 1 mappe</string>
-    <string name="file_list__footer__file_and_folders">1 fil, %1$d mapper</string>
-    <string name="file_list__footer__files">%1$d filer</string>
-    <string name="file_list__footer__files_and_folder">%1$d filer, 1 mape</string>
-    <string name="file_list__footer__files_and_folders">%1$d filer, %2$d mapper</string>
     <string name="upload_copy_files">Kopiér fil</string>
     <string name="upload_move_files">Flyt fil</string>
     <string name="select_all">Vælg alle</string>

+ 0 - 8
src/main/res/values-de-rDE/strings.xml

@@ -458,14 +458,6 @@
 
     <string name="username">Benutzername</string>
 
-    <string name="file_list__footer__folder">1 Ordner</string>
-    <string name="file_list__footer__folders">%1$d Ordner</string>
-    <string name="file_list__footer__file">1 Datei</string>
-    <string name="file_list__footer__file_and_folder">1 Datei, 1 Ordner</string>
-    <string name="file_list__footer__file_and_folders">1 Datei, %1$d Ordner</string>
-    <string name="file_list__footer__files">%1$d Dateien</string>
-    <string name="file_list__footer__files_and_folder">%1$d Dateien, 1 Ordner</string>
-    <string name="file_list__footer__files_and_folders">%1$d Dateien, %2$d Ordner</string>
     <string name="set_picture_as">Nutze Bild als</string>
     <string name="set_as">Setze als</string>
 

+ 0 - 8
src/main/res/values-de/strings.xml

@@ -458,14 +458,6 @@
 
     <string name="username">Benutzername</string>
 
-    <string name="file_list__footer__folder">1 Ordner</string>
-    <string name="file_list__footer__folders">%1$d Ordner</string>
-    <string name="file_list__footer__file">1 Datei</string>
-    <string name="file_list__footer__file_and_folder">1 Datei, 1 Ordner</string>
-    <string name="file_list__footer__file_and_folders">1 Datei, %1$d Ordner</string>
-    <string name="file_list__footer__files">%1$d Dateien</string>
-    <string name="file_list__footer__files_and_folder">%1$d Dateien, 1 Ordner</string>
-    <string name="file_list__footer__files_and_folders">%1$d Dateien, %2$d Ordner</string>
     <string name="set_picture_as">Bild verwenden als</string>
     <string name="set_as">Setze als</string>
 

+ 0 - 8
src/main/res/values-el/strings.xml

@@ -426,14 +426,6 @@
 
     <string name="username">Όνομα χρήστη</string>
 
-    <string name="file_list__footer__folder">1 φάκελος</string>
-    <string name="file_list__footer__folders">%1$d φάκελοι</string>
-    <string name="file_list__footer__file">1 αρχείο</string>
-    <string name="file_list__footer__file_and_folder">1 αρχείο, 1 φάκελος</string>
-    <string name="file_list__footer__file_and_folders">1 αρχείο, %1$d φάκελοι</string>
-    <string name="file_list__footer__files">%1$d αρχεία</string>
-    <string name="file_list__footer__files_and_folder">%1$d αρχεία, 1 φάκελος</string>
-    <string name="file_list__footer__files_and_folders">%1$d αρχεία, %2$d φάκελοι</string>
     <string name="set_picture_as">Χρησιμοποίησε την εικόνα ως</string>
     <string name="set_as">Ορισμός ως</string>
 

+ 0 - 8
src/main/res/values-en-rGB/strings.xml

@@ -457,14 +457,6 @@
 
     <string name="username">Username</string>
 
-    <string name="file_list__footer__folder">1 folder</string>
-    <string name="file_list__footer__folders">%1$d folders</string>
-    <string name="file_list__footer__file">1 file</string>
-    <string name="file_list__footer__file_and_folder">1 file, 1 folder</string>
-    <string name="file_list__footer__file_and_folders">1 file, %1$d folders</string>
-    <string name="file_list__footer__files">%1$d files</string>
-    <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
-    <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
     <string name="set_picture_as">Use picture as</string>
     <string name="set_as">Set As</string>
 

+ 0 - 8
src/main/res/values-es-rAR/strings.xml

@@ -421,14 +421,6 @@
 
     <string name="username">Nombre de usuario</string>
 
-    <string name="file_list__footer__folder">1 carpeta</string>
-    <string name="file_list__footer__folders">%1$d carpetas</string>
-    <string name="file_list__footer__file">1 archivo</string>
-    <string name="file_list__footer__file_and_folder">1 archivo, 1 carpeta</string>
-    <string name="file_list__footer__file_and_folders">1 archivo, %1$d carpeta</string>
-    <string name="file_list__footer__files">%1$d archivos</string>
-    <string name="file_list__footer__files_and_folder">%1$d archivos, 1 carpeta</string>
-    <string name="file_list__footer__files_and_folders">%1$d archivos, %2$d carpetas</string>
     <string name="set_picture_as">Usar imagen como</string>
     <string name="set_as">Establecer Como</string>
 

+ 0 - 8
src/main/res/values-es-rMX/strings.xml

@@ -457,14 +457,6 @@
 
     <string name="username">Usuario</string>
 
-    <string name="file_list__footer__folder">1 carpeta</string>
-    <string name="file_list__footer__folders">%1$d carpetas</string>
-    <string name="file_list__footer__file">1 archivo</string>
-    <string name="file_list__footer__file_and_folder">1 archivo, 1 carpeta</string>
-    <string name="file_list__footer__file_and_folders">1 archivo, %1$d carpeta</string>
-    <string name="file_list__footer__files">%1$d archivos</string>
-    <string name="file_list__footer__files_and_folder">%1$d archivos, 1 carpeta</string>
-    <string name="file_list__footer__files_and_folders">%1$d archivos, %2$d carpetas</string>
     <string name="set_picture_as">Usar imagen como</string>
     <string name="set_as">Establecer Como</string>
 

+ 0 - 8
src/main/res/values-es/strings.xml

@@ -435,14 +435,6 @@
 
     <string name="username">Nombre de usuario</string>
 
-    <string name="file_list__footer__folder">1 carpeta</string>
-    <string name="file_list__footer__folders">%1$d carpetas</string>
-    <string name="file_list__footer__file">1 archivo</string>
-    <string name="file_list__footer__file_and_folder">1 archivo, 1 carpeta</string>
-    <string name="file_list__footer__file_and_folders">1 archivo, %1$d carpetas</string>
-    <string name="file_list__footer__files">%1$d archivos</string>
-    <string name="file_list__footer__files_and_folder">%1$d archivos, 1 carpeta</string>
-    <string name="file_list__footer__files_and_folders">%1$d archivos, %2$d carpetas</string>
     <string name="set_picture_as">Usar imagen como</string>
     <string name="set_as">Establecer como</string>
 

+ 0 - 8
src/main/res/values-fi-rFI/strings.xml

@@ -372,14 +372,6 @@
 
     <string name="username">Käyttäjätunnus</string>
 
-    <string name="file_list__footer__folder">1 kansio</string>
-    <string name="file_list__footer__folders">%1$d kansiota</string>
-    <string name="file_list__footer__file">1 tiedosto</string>
-    <string name="file_list__footer__file_and_folder">1 tiedosto, 1 kansio</string>
-    <string name="file_list__footer__file_and_folders">1 tiedosto, %1$d kansiota</string>
-    <string name="file_list__footer__files">%1$d tiedostoa</string>
-    <string name="file_list__footer__files_and_folder">%1$d tiedostoa, 1 kansio</string>
-    <string name="file_list__footer__files_and_folders">%1$d tiedostoa, %2$d kansiota</string>
     <string name="prefs_instant_behaviour_dialogTitle">Alkuperäinen tiedosto&#8230;</string>
     <string name="prefs_instant_behaviour_title">Alkuperäinen tiedosto&#8230;</string>
     <string name="upload_copy_files">Kopioi tiedosto</string>

+ 0 - 8
src/main/res/values-fr/strings.xml

@@ -459,14 +459,6 @@ Attention la suppression est irréversible.</string>
 
     <string name="username">Nom d\'utilisateur</string>
 
-    <string name="file_list__footer__folder">1 dossier</string>
-    <string name="file_list__footer__folders">%1$d dossiers</string>
-    <string name="file_list__footer__file">1 fichier</string>
-    <string name="file_list__footer__file_and_folder">1 fichier, 1 dossier</string>
-    <string name="file_list__footer__file_and_folders">1 fichier, %1$d dossiers</string>
-    <string name="file_list__footer__files">%1$d fichiers</string>
-    <string name="file_list__footer__files_and_folder">%1$d fichiers, 1 dossier</string>
-    <string name="file_list__footer__files_and_folders">%1$d fichiers, %2$d dossiers</string>
     <string name="set_picture_as">Utiliser l\'image comme</string>
     <string name="set_as">Utiliser comme</string>
 

+ 0 - 8
src/main/res/values-he/strings.xml

@@ -283,14 +283,6 @@
 
     <string name="username">שם משתמש</string>
 
-    <string name="file_list__footer__folder">1 תיקייה</string>
-    <string name="file_list__footer__folders">%1$d תיקיות</string>
-    <string name="file_list__footer__file">1 קובץ</string>
-    <string name="file_list__footer__file_and_folder">1 קובץ, 1 תיקייה</string>
-    <string name="file_list__footer__file_and_folders">1 קובץ, %1$d תיקיות</string>
-    <string name="file_list__footer__files">%1$d קבצים</string>
-    <string name="file_list__footer__files_and_folder">%1$d קבצים, 1 תיקייה</string>
-    <string name="file_list__footer__files_and_folders">%1$d קבצים, %2$d תיקיות</string>
     <string name="prefs_instant_behaviour_dialogTitle">&#8230;קובץ מקורי יהיה</string>
     <string name="prefs_instant_behaviour_title">&#8230;קובץ מקורי יהיה</string>
     <string name="upload_copy_files">העתקת קובץ</string>

+ 0 - 8
src/main/res/values-hu-rHU/strings.xml

@@ -458,14 +458,6 @@
 
     <string name="username">Felhasználónév</string>
 
-    <string name="file_list__footer__folder">1 mappa</string>
-    <string name="file_list__footer__folders">%1$d mappa</string>
-    <string name="file_list__footer__file">1 fájl</string>
-    <string name="file_list__footer__file_and_folder">1 fájl, 1 mappa</string>
-    <string name="file_list__footer__file_and_folders">1 fájl, %1$d mappa</string>
-    <string name="file_list__footer__files">%1$d fájl</string>
-    <string name="file_list__footer__files_and_folder">%1$d fájl, 1 mappa</string>
-    <string name="file_list__footer__files_and_folders">%1$d fájl, %2$d mappa</string>
     <string name="set_picture_as">Kép használata mint</string>
     <string name="set_as">Beállítás mint</string>
 

+ 0 - 8
src/main/res/values-id/strings.xml

@@ -422,14 +422,6 @@
 
     <string name="username">Nama pengguna</string>
 
-    <string name="file_list__footer__folder">1 folder</string>
-    <string name="file_list__footer__folders">%1$d folder</string>
-    <string name="file_list__footer__file">1 berkas</string>
-    <string name="file_list__footer__file_and_folder">1 berkas, 1 folder</string>
-    <string name="file_list__footer__file_and_folders">1 berkas, %1$d folder</string>
-    <string name="file_list__footer__files">%1$d berkas</string>
-    <string name="file_list__footer__files_and_folder">%1$d berkas, 1 folder</string>
-    <string name="file_list__footer__files_and_folders">%1$d berkas, %2$d folder</string>
     <string name="set_picture_as">Gunakan gambar sebagai</string>
     <string name="set_as">Gunakan sebagai</string>
 

+ 0 - 8
src/main/res/values-is/strings.xml

@@ -426,14 +426,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
 
     <string name="username">Notandanafn</string>
 
-    <string name="file_list__footer__folder">1 mappa</string>
-    <string name="file_list__footer__folders">%1$d möppur</string>
-    <string name="file_list__footer__file">1 skrá</string>
-    <string name="file_list__footer__file_and_folder">1 skrá, 1 mappa</string>
-    <string name="file_list__footer__file_and_folders">1 skrá, %1$d möppur</string>
-    <string name="file_list__footer__files">%1$d skrár</string>
-    <string name="file_list__footer__files_and_folder">%1$d skrár, 1 mappa</string>
-    <string name="file_list__footer__files_and_folders">%1$d skrár, %2$d möppur</string>
     <string name="set_picture_as">Nota mynd sem</string>
     <string name="set_as">Setja sem</string>
 

+ 0 - 8
src/main/res/values-it/strings.xml

@@ -457,14 +457,6 @@
 
     <string name="username">Nome utente</string>
 
-    <string name="file_list__footer__folder">1 cartella</string>
-    <string name="file_list__footer__folders">%1$d cartelle</string>
-    <string name="file_list__footer__file">1 file</string>
-    <string name="file_list__footer__file_and_folder">1 file, 1 cartella</string>
-    <string name="file_list__footer__file_and_folders">1 file, %1$d cartelle</string>
-    <string name="file_list__footer__files">%1$d file</string>
-    <string name="file_list__footer__files_and_folder">%1$d file, 1 cartella</string>
-    <string name="file_list__footer__files_and_folders">%1$d file, %2$d cartelle</string>
     <string name="set_picture_as">Usa immagine come</string>
     <string name="set_as">Imposta come</string>
 

+ 0 - 8
src/main/res/values-ja-rJP/strings.xml

@@ -340,14 +340,6 @@
 
     <string name="username">ユーザー名</string>
 
-    <string name="file_list__footer__folder">1 フォルダー</string>
-    <string name="file_list__footer__folders">%1$d フォルダー</string>
-    <string name="file_list__footer__file">1 ファイル</string>
-    <string name="file_list__footer__file_and_folder">1 ファイル、1 フォルダー</string>
-    <string name="file_list__footer__file_and_folders">1 ファイル、%1$d フォルダー</string>
-    <string name="file_list__footer__files">%1$d ファイル</string>
-    <string name="file_list__footer__files_and_folder">%1$d ファイル、1 フォルダー</string>
-    <string name="file_list__footer__files_and_folders">%1$d ファイル、%2$d フォルダー</string>
     <string name="prefs_instant_behaviour_dialogTitle">オリジナルファイルは、&#8230; になります。</string>
     <string name="prefs_instant_behaviour_title">オリジナルファイルは、&#8230; になります。</string>
     <string name="upload_copy_files">ファイルをコピー</string>

+ 0 - 8
src/main/res/values-ko/strings.xml

@@ -358,14 +358,6 @@
 
     <string name="username">사용자 이름</string>
 
-    <string name="file_list__footer__folder">폴더 1개</string>
-    <string name="file_list__footer__folders">폴더 %1$d개</string>
-    <string name="file_list__footer__file">파일 1개</string>
-    <string name="file_list__footer__file_and_folder">파일 1개, 폴더 1개</string>
-    <string name="file_list__footer__file_and_folders">파일 1개, 폴더 %1$d개</string>
-    <string name="file_list__footer__files">파일 %1$d개</string>
-    <string name="file_list__footer__files_and_folder">파일 %1$d개, 폴더 1개</string>
-    <string name="file_list__footer__files_and_folders">파일 %1$d개, 폴더 %2$d개</string>
     <string name="prefs_instant_behaviour_dialogTitle">원래 파일은&#8230;</string>
     <string name="prefs_instant_behaviour_title">원래 파일은&#8230;</string>
     <string name="upload_copy_files">파일 복사</string>

+ 0 - 8
src/main/res/values-lv/strings.xml

@@ -275,14 +275,6 @@
 
     <string name="username">Lietotājvārds</string>
 
-    <string name="file_list__footer__folder">1 mape</string>
-    <string name="file_list__footer__folders">%1$d mapes</string>
-    <string name="file_list__footer__file">1 datne</string>
-    <string name="file_list__footer__file_and_folder">1 fails, 1 mape</string>
-    <string name="file_list__footer__file_and_folders">1 fails, %1$d mapes</string>
-    <string name="file_list__footer__files">%1$d faili</string>
-    <string name="file_list__footer__files_and_folder">%1$d faili, 1 mapē</string>
-    <string name="file_list__footer__files_and_folders">%1$d faili, %2$d mapes</string>
     <string name="prefs_instant_behaviour_dialogTitle">Oriģinālais fails tiks&#8230;</string>
     <string name="prefs_instant_behaviour_title">Oriģinālais fails tiks&#8230;</string>
     <string name="upload_copy_files">Kopēt failu</string>

+ 0 - 8
src/main/res/values-nb-rNO/strings.xml

@@ -456,14 +456,6 @@
 
     <string name="username">Brukernavn</string>
 
-    <string name="file_list__footer__folder">1 mappe</string>
-    <string name="file_list__footer__folders">%1$d mapper</string>
-    <string name="file_list__footer__file">1 fil</string>
-    <string name="file_list__footer__file_and_folder">1 fil, 1 mappe</string>
-    <string name="file_list__footer__file_and_folders">1 fil, %1$d mapper</string>
-    <string name="file_list__footer__files">%1$d filer</string>
-    <string name="file_list__footer__files_and_folder">%1$d filer, 1 mappe</string>
-    <string name="file_list__footer__files_and_folders">%1$d filer, %2$d mapper</string>
     <string name="set_picture_as">Bruk bilde som</string>
     <string name="set_as">Bruk som</string>
 

+ 0 - 8
src/main/res/values-nl/strings.xml

@@ -459,14 +459,6 @@ Kies er eentje van een provider.</string>
 
     <string name="username">Gebruikersnaam</string>
 
-    <string name="file_list__footer__folder">1 map</string>
-    <string name="file_list__footer__folders">%1$d mappen</string>
-    <string name="file_list__footer__file">1 bestand</string>
-    <string name="file_list__footer__file_and_folder">1 bestand, 1 map</string>
-    <string name="file_list__footer__file_and_folders">1 bestand, %1$d mappen</string>
-    <string name="file_list__footer__files">%1$d bestanden</string>
-    <string name="file_list__footer__files_and_folder">%1$d bestanden, 1 map</string>
-    <string name="file_list__footer__files_and_folders">%1$d bestanden, %2$d mappen</string>
     <string name="set_picture_as">Gebruik afbeelding als</string>
     <string name="set_as">Stel in als</string>
 

+ 0 - 8
src/main/res/values-pl/strings.xml

@@ -457,14 +457,6 @@
 
     <string name="username">Użytkownik</string>
 
-    <string name="file_list__footer__folder">1 folder</string>
-    <string name="file_list__footer__folders">%1$d folderów</string>
-    <string name="file_list__footer__file">1 plik</string>
-    <string name="file_list__footer__file_and_folder">1 plik , 1 folder</string>
-    <string name="file_list__footer__file_and_folders">1 plik, %1$d folderów</string>
-    <string name="file_list__footer__files">%1$d plików</string>
-    <string name="file_list__footer__files_and_folder">%1$d plików, 1 folder</string>
-    <string name="file_list__footer__files_and_folders">%1$d plików, %2$d folderów</string>
     <string name="set_picture_as">Użyj obrazu jako</string>
     <string name="set_as">Ustaw jako</string>
 

+ 0 - 8
src/main/res/values-pt-rBR/strings.xml

@@ -457,14 +457,6 @@
 
     <string name="username">Nome do usuário</string>
 
-    <string name="file_list__footer__folder">1 pasta</string>
-    <string name="file_list__footer__folders">%1$d pastas</string>
-    <string name="file_list__footer__file">1 arquivo</string>
-    <string name="file_list__footer__file_and_folder">1 arquivo, 1 pasta</string>
-    <string name="file_list__footer__file_and_folders">1 arquivo, %1$d pastas</string>
-    <string name="file_list__footer__files">%1$d arquivos</string>
-    <string name="file_list__footer__files_and_folder">%1$d arquivos, 1 pasta</string>
-    <string name="file_list__footer__files_and_folders">%1$d arquivos, %2$d pastas</string>
     <string name="set_picture_as">Usar imagem como</string>
     <string name="set_as">Definir Como</string>
 

+ 0 - 8
src/main/res/values-ro/strings.xml

@@ -289,14 +289,6 @@
 
     <string name="username">Utilizator</string>
 
-    <string name="file_list__footer__folder">1 folder</string>
-    <string name="file_list__footer__folders">%1$d foldere</string>
-    <string name="file_list__footer__file">1 fișier</string>
-    <string name="file_list__footer__file_and_folder">1 fișier, 1 folder</string>
-    <string name="file_list__footer__file_and_folders">1 fișier, %1$d foldere</string>
-    <string name="file_list__footer__files">%1$d fișiere</string>
-    <string name="file_list__footer__files_and_folder">%1$d fișiere, 1 folder</string>
-    <string name="file_list__footer__files_and_folders">%1$d fișiere, %2$d foldere</string>
     <string name="prefs_instant_behaviour_dialogTitle">Fișierul original va fi&#8230;</string>
     <string name="prefs_instant_behaviour_title">Fișierul original va fi&#8230;</string>
     <string name="upload_copy_files">Copiază fișierul</string>

+ 0 - 8
src/main/res/values-ru/strings.xml

@@ -426,14 +426,6 @@
 
     <string name="username">Имя пользователя</string>
 
-    <string name="file_list__footer__folder">1 каталог</string>
-    <string name="file_list__footer__folders">%1$d каталогов</string>
-    <string name="file_list__footer__file">1 файл</string>
-    <string name="file_list__footer__file_and_folder">1 файл, 1 каталог</string>
-    <string name="file_list__footer__file_and_folders">1 файл, %1$d каталогов</string>
-    <string name="file_list__footer__files">%1$d файлов</string>
-    <string name="file_list__footer__files_and_folder">%1$d файлов, 1 каталог</string>
-    <string name="file_list__footer__files_and_folders">%1$d файлов, %2$d каталогов</string>
     <string name="set_picture_as">Использовать изображение</string>
     <string name="set_as">Установить как</string>
 

+ 0 - 8
src/main/res/values-sk-rSK/strings.xml

@@ -315,14 +315,6 @@
 
     <string name="username">Používateľské meno</string>
 
-    <string name="file_list__footer__folder">1 priečinok</string>
-    <string name="file_list__footer__folders">%1$d prieč.</string>
-    <string name="file_list__footer__file">1 súbor</string>
-    <string name="file_list__footer__file_and_folder">1 súbor, 1 priečinok</string>
-    <string name="file_list__footer__file_and_folders">1 súbor, %1$d prieč.</string>
-    <string name="file_list__footer__files">%1$d súb.</string>
-    <string name="file_list__footer__files_and_folder">%1$d súb., 1 priečinok</string>
-    <string name="file_list__footer__files_and_folders">%1$d súb., %2$d prieč.</string>
     <string name="prefs_instant_behaviour_dialogTitle">Pôvodný súbor bude&#8230;</string>
     <string name="prefs_instant_behaviour_title">Pôvodný súbor bude&#8230;</string>
     <string name="upload_copy_files">Kopírovať súbor</string>

+ 0 - 8
src/main/res/values-sl/strings.xml

@@ -423,14 +423,6 @@
 
     <string name="username">Uporabniško ime</string>
 
-    <string name="file_list__footer__folder">1 mapa</string>
-    <string name="file_list__footer__folders">%1$d map</string>
-    <string name="file_list__footer__file">1 datoteka</string>
-    <string name="file_list__footer__file_and_folder">1 datoteka, 1 mapa</string>
-    <string name="file_list__footer__file_and_folders">1 datoteka, %1$d map</string>
-    <string name="file_list__footer__files">%1$d datotek</string>
-    <string name="file_list__footer__files_and_folder">%1$d datotek, 1 mapa</string>
-    <string name="file_list__footer__files_and_folders">%1$d datotek, %2$d map</string>
     <string name="set_picture_as">Uporabi sliko kot</string>
     <string name="set_as">Nastavi kot</string>
 

+ 0 - 8
src/main/res/values-sq/strings.xml

@@ -453,14 +453,6 @@
 
     <string name="username">Emër përdoruesi</string>
 
-    <string name="file_list__footer__folder">1 dosje</string>
-    <string name="file_list__footer__folders">%1$d dosje</string>
-    <string name="file_list__footer__file">1 skedar</string>
-    <string name="file_list__footer__file_and_folder">1 skedar, 1 dosje</string>
-    <string name="file_list__footer__file_and_folders">1 skedar, %1$d dosje</string>
-    <string name="file_list__footer__files">%1$d skedar</string>
-    <string name="file_list__footer__files_and_folder">%1$d skedare, 1 dosje</string>
-    <string name="file_list__footer__files_and_folders">%1$d skedare, %2$d dosje</string>
     <string name="set_picture_as">Vendos fotografinë</string>
     <string name="set_as">Vendos Si</string>
 

+ 1 - 8
src/main/res/values-sr/strings.xml

@@ -457,14 +457,7 @@
 
     <string name="username">Корисничко име</string>
 
-    <string name="file_list__footer__folder">1 фасцикла</string>
-    <string name="file_list__footer__folders">%1$d фасцикли</string>
-    <string name="file_list__footer__file">1 фајл</string>
-    <string name="file_list__footer__file_and_folder">1 фајл, 1 фасцикла</string>
-    <string name="file_list__footer__file_and_folders">1 фајл, %1$d фасцикли</string>
-    <string name="file_list__footer__files">%1$d фајлова</string>
-    <string name="file_list__footer__files_and_folder">%1$d фајла, 1 фасцикла</string>
-    <string name="file_list__footer__files_and_folders">%1$d фајла, %2$d фасцикли</string>
+
     <string name="set_picture_as">Постави слику као</string>
     <string name="set_as">Постави као</string>
 

+ 0 - 8
src/main/res/values-sv/strings.xml

@@ -426,14 +426,6 @@
 
     <string name="username">Användarnamn</string>
 
-    <string name="file_list__footer__folder">1 mapp</string>
-    <string name="file_list__footer__folders">%1$d mappar</string>
-    <string name="file_list__footer__file">1 fil</string>
-    <string name="file_list__footer__file_and_folder">1 fil, 1 mapp</string>
-    <string name="file_list__footer__file_and_folders">1 fil, %1$d mappar</string>
-    <string name="file_list__footer__files">%1$d filer</string>
-    <string name="file_list__footer__files_and_folder">%1$d filer, 1 mapp</string>
-    <string name="file_list__footer__files_and_folders">%1$d filer, %2$d mappar</string>
     <string name="set_picture_as">Använd bild som</string>
     <string name="set_as">Sätt som</string>
 

+ 0 - 8
src/main/res/values-tr/strings.xml

@@ -458,14 +458,6 @@
 
     <string name="username">Kullanıcı adı</string>
 
-    <string name="file_list__footer__folder">1 klasör</string>
-    <string name="file_list__footer__folders">%1$d klasör</string>
-    <string name="file_list__footer__file">1 dosya</string>
-    <string name="file_list__footer__file_and_folder">1 dosya, 1 klasör</string>
-    <string name="file_list__footer__file_and_folders">1 dosya, %1$d klasör</string>
-    <string name="file_list__footer__files">%1$d dosya</string>
-    <string name="file_list__footer__files_and_folder">%1$d dosya, 1 klasör</string>
-    <string name="file_list__footer__files_and_folders">%1$d dosya, %2$d klasör</string>
     <string name="set_picture_as">Görseli farklı kullan</string>
     <string name="set_as">Farklı Ayarla</string>
 

+ 0 - 8
src/main/res/values-zh-rCN/strings.xml

@@ -430,14 +430,6 @@
 
     <string name="username">用户名</string>
 
-    <string name="file_list__footer__folder">1 个文件夹</string>
-    <string name="file_list__footer__folders">%1$d 个文件夹</string>
-    <string name="file_list__footer__file">1 个文件</string>
-    <string name="file_list__footer__file_and_folder">1 个文件,1 个文件夹</string>
-    <string name="file_list__footer__file_and_folders">1 个文件,%1$d 个文件夹</string>
-    <string name="file_list__footer__files">%1$d 个文件</string>
-    <string name="file_list__footer__files_and_folder">%1$d 个文件,1 个文件夹</string>
-    <string name="file_list__footer__files_and_folders">%1$d 个文件,%2$d 个文件夹</string>
     <string name="set_picture_as">将图片用作</string>
     <string name="set_as">设置</string>
 

+ 0 - 8
src/main/res/values-zh-rTW/strings.xml

@@ -407,14 +407,6 @@
 
     <string name="username">使用者名稱</string>
 
-    <string name="file_list__footer__folder">1 個資料夾</string>
-    <string name="file_list__footer__folders">%1$d 個資料夾</string>
-    <string name="file_list__footer__file">1 個檔案</string>
-    <string name="file_list__footer__file_and_folder">1 個檔案, 1 個資料夾</string>
-    <string name="file_list__footer__file_and_folders">1 個檔案, %1$d 個資料夾</string>
-    <string name="file_list__footer__files">%1$d 個檔案</string>
-    <string name="file_list__footer__files_and_folder">%1$d 個檔案, 1 個資料夾</string>
-    <string name="file_list__footer__files_and_folders">%1$d 個檔案, %2$d 個資料夾</string>
     <string name="set_picture_as">使用圖片作為</string>
     <string name="set_as">設置為</string>
 

+ 8 - 8
src/main/res/values/strings.xml

@@ -466,14 +466,14 @@
 
     <string name="username">Username</string>
 
-    <string name="file_list__footer__folder">1 folder</string>
-    <string name="file_list__footer__folders">%1$d folders</string>
-    <string name="file_list__footer__file">1 file</string>
-    <string name="file_list__footer__file_and_folder">1 file, 1 folder</string>
-    <string name="file_list__footer__file_and_folders">1 file, %1$d folders</string>
-    <string name="file_list__footer__files">%1$d files</string>
-    <string name="file_list__footer__files_and_folder">%1$d files, 1 folder</string>
-    <string name="file_list__footer__files_and_folders">%1$d files, %2$d folders</string>
+    <plurals name="file_list__footer__folder">
+        <item quantity="one">%1$d folder</item>
+        <item quantity="other">%1$d folders</item>
+    </plurals>
+    <plurals name="file_list__footer__file">
+        <item quantity="one">%1$d file</item>
+        <item quantity="other">%1$d files</item>
+    </plurals>
     <string name="set_picture_as">Use picture as</string>
     <string name="set_as">Set As</string>