diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 4f03a6a2b..91360c0f1 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -117,12 +117,14 @@ limitations under the License.
     <string name="export_title">تصدير إلى…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d‏ ملفات</string>
-    <string name="files_many">%1$d‏ ملفًا</string>
-    <string name="files_one">1 ملف</string>
-    <string name="files_other">%1$d‏ من الملفات</string>
-    <string name="files_two">2 ملفان</string>
-    <string name="files_zero">0 ملفات</string>
+    <plurals name="files">
+        <item quantity="zero">0 ملفات</item>
+        <item quantity="one">1 ملف</item>
+        <item quantity="two">2 ملفان</item>
+        <item quantity="few">%1$d‏ ملفات</item>
+        <item quantity="many">%1$d‏ ملفًا</item>
+        <item quantity="other">%1$d‏ من الملفات</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">إضافة</string>
     <string name="generic_delete_selected_confirm_title">حذف ما تم تحديده؟</string>
diff --git a/src/main/res/values-b+en+001/strings.xml b/src/main/res/values-b+en+001/strings.xml
index eeed293d2..603da785a 100644
--- a/src/main/res/values-b+en+001/strings.xml
+++ b/src/main/res/values-b+en+001/strings.xml
@@ -97,12 +97,10 @@
     <string name="export_progress_message">Exporting to %1$s…</string>
     <string name="export_success">Exported %1$s to %2$s</string>
     <string name="export_title">Export to…</string>
-    <string name="files_few">%1$d files</string>
-    <string name="files_many">%1$d files</string>
-    <string name="files_one">1 file</string>
-    <string name="files_other">%1$d files</string>
-    <string name="files_two">2 files</string>
-    <string name="files_zero">0 files</string>
+    <plurals name="files">
+        <item quantity="one">1 file</item>
+        <item quantity="other">%1$d files</item>
+    </plurals>
     <string name="generic_add">Add</string>
     <string name="generic_delete_selected_confirm_title">Delete selected?</string>
     <string name="generic_description">Description</string>
diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml
index 7a9f3c0c1..c7b5e6904 100644
--- a/src/main/res/values-b+es+419/strings.xml
+++ b/src/main/res/values-b+es+419/strings.xml
@@ -97,12 +97,10 @@
     <string name="export_progress_message">Exportando a %1$s…</string>
     <string name="export_success">Se exportaron %1$s a %2$s</string>
     <string name="export_title">Exportar a…</string>
-    <string name="files_few">%1$d archivos</string>
-    <string name="files_many">%1$d archivos</string>
-    <string name="files_one">1 archivo</string>
-    <string name="files_other">%1$d archivos</string>
-    <string name="files_two">2 archivos</string>
-    <string name="files_zero">0 archivos</string>
+    <plurals name="files">
+        <item quantity="one">1 archivo</item>>
+        <item quantity="other">%1$d archivos</item>
+    </plurals>
     <string name="generic_add">Agregar</string>
     <string name="generic_delete_selected_confirm_title">¿Eliminar elementos seleccionados?</string>
     <string name="generic_description">Descripción</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 3d44e0e32..98fe1f393 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Експортиране във…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d файла</string>
-    <string name="files_many">%1$d файла</string>
-    <string name="files_one">1 файл</string>
-    <string name="files_other">%1$d файла</string>
-    <string name="files_two">2 файла</string>
-    <string name="files_zero">0 файла</string>
+    <plurals name="files">
+        <item quantity="one">1 файл</item>
+        <item quantity="other">%1$d файла</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Прибавяне</string>
     <string name="generic_delete_selected_confirm_title">Да се изтрият ли избраните?</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index c08bf5813..1a2b15296 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Exportació a…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d fitxers</string>
-    <string name="files_many">%1$d fitxers</string>
-    <string name="files_one">1 fitxer</string>
-    <string name="files_other">%1$d fitxers</string>
-    <string name="files_two">2 fitxers</string>
-    <string name="files_zero">0 fitxers</string>
+    <plurals name="files">
+        <item quantity="one">1 fitxer</item>
+        <item quantity="other">%1$d fitxers</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Afegeix</string>
     <string name="generic_delete_selected_confirm_title">Voleu esborrar els elements seleccionats?</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index a7536ac9d..654f384d9 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -168,12 +168,11 @@ Pokud zařízení GPS hlásí nepřesná data (např. Polohu, rychlost, nadmořs
     <string name="export_title">Export do…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d soubory</string>
-    <string name="files_many">%1$d souborů</string>
-    <string name="files_one">1 soubor</string>
-    <string name="files_other">%1$d souborů</string>
-    <string name="files_two">2 soubory</string>
-    <string name="files_zero">0 souborů</string>
+    <plurals name="files">
+        <item quantity="one">1 soubor</item>
+        <item quantity="few">%1$d soubory</item>
+        <item quantity="other">%1$d souborů</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Přidat</string>
     <string name="generic_delete_selected_confirm_title">Smazat vybrané?</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 824d923a3..cbd5223f4 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -172,12 +172,10 @@ Hvis GPS-enheden rapporterer unøjagtige data (f.eks. Placering, hastighed, høj
     <string name="export_title">Eksportér til…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d filer</string>
-    <string name="files_many">%1$d filer</string>
-    <string name="files_one">1 fil</string>
-    <string name="files_other">%1$d filer</string>
-    <string name="files_two">2 filer</string>
-    <string name="files_zero">0 filer</string>
+    <plurals name="files">
+        <item quantity="one">1 fil</item>
+        <item quantity="other">%1$d filer</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Tilføj</string>
     <string name="generic_delete_selected_confirm_title">Skal de valgte slettes?</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6394bcfc1..02e313db1 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -176,13 +176,11 @@ g) das tun, was Deiner Meinung nach OpenTracks hilft.</string>
     <string name="export_success">%1$s in %2$s exportiert</string>
     <string name="export_title">Exportieren in…</string>
     <!-- External Storage -->
-    <!-- Files -->
-    <string name="files_few">%1$d Dateien</string>
-    <string name="files_many">%1$d Dateien</string>
-    <string name="files_one">1 Datei</string>
-    <string name="files_other">%1$d Dateien</string>
-    <string name="files_two">2 Dateien</string>
-    <string name="files_zero">0 Dateien</string>
+    <!-- Files -->=
+    <plurals name="files">
+        <item quantity="one">1 Datei</item>
+        <item quantity="other">%1$d Dateien</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Hinzufügen</string>
     <string name="generic_delete_selected_confirm_title">Ausgewählte Elemente löschen?</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 4e01da15a..8d5e30738 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Εξαγωγή σε…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d αρχεία</string>
-    <string name="files_many">%1$d αρχεία</string>
-    <string name="files_one">1 αρχείο</string>
-    <string name="files_other">%1$d αρχεία</string>
-    <string name="files_two">2 αρχεία</string>
-    <string name="files_zero">0 αρχεία</string>
+    <plurals name="files">
+        <item quantity="one">1 αρχείο</item>
+        <item quantity="other">%1$d αρχεία</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Προσθήκη</string>
     <string name="generic_delete_selected_confirm_title">Διαγραφή επιλεγμένων;</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index e3ddedf42..4994b6c84 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -168,12 +168,10 @@ Si el dispositivo GPS reporta datos inexactos (por ejemplo, ubicación, velocida
     <string name="export_title">Exportar a…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d archivos</string>
-    <string name="files_many">%1$d archivos</string>
-    <string name="files_one">1 archivo</string>
-    <string name="files_other">%1$d archivos</string>
-    <string name="files_two">2 archivos</string>
-    <string name="files_zero">0 archivos</string>
+    <plurals name="files">
+        <item quantity="one">1 archivo</item>
+        <item quantity="other">%1$d archivos</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Añadir</string>
     <string name="generic_delete_selected_confirm_title">¿Eliminar elementos seleccionados?</string>
diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index cc474248a..8d7129448 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -168,12 +168,10 @@ Kui GPS-seade teatab ebatäpsetest andmetest (nt asukoht, kiirus, kõrgus), ei s
     <string name="export_title">Eksportimine …</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d faili</string>
-    <string name="files_many">%1$d faili</string>
-    <string name="files_one">1 fail</string>
-    <string name="files_other">%1$d faili</string>
-    <string name="files_two">2 faili</string>
-    <string name="files_zero">0 faili</string>
+    <plurals name="files">
+        <item quantity="one">1 fail</item>
+        <item quantity="other">%1$d faili</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Lisa</string>
     <string name="generic_delete_selected_confirm_title">Kas kustutada valitud?</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 645ff24c8..02286e34c 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -169,12 +169,10 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O
     <string name="export_title">Esportatu hona…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d fitxategi</string>
-    <string name="files_many">%1$d fitxategi</string>
-    <string name="files_one">1 fitxategi</string>
-    <string name="files_other">%1$d fitxategi</string>
-    <string name="files_two">2 fitxategi</string>
-    <string name="files_zero">0 fitxategi</string>
+    <plurals name="files">
+        <item quantity="one">1 fitxategi</item>
+        <item quantity="other">%1$d fitxategi</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Gehitu</string>
     <string name="generic_delete_selected_confirm_title">Hautatutakoak ezabatu nahi dituzu?</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index c5070e5c5..fb3831897 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">صادر کردن به…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d فایل</string>
-    <string name="files_many">%1$d فایل</string>
-    <string name="files_one">۱ فایل</string>
-    <string name="files_other">%1$d فایل</string>
-    <string name="files_two">۲ فایل</string>
-    <string name="files_zero">۰ فایل</string>
+    <plurals name="files">
+        <item quantity="one">%1$d فایل</item>
+        <item quantity="other">%1$d فایل</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">افزودن</string>
     <string name="generic_delete_selected_confirm_title">موارد انتخابی حذف شود؟</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index e2fc2ae21..1d13b72cb 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -173,12 +173,10 @@ limitations under the License.
     <string name="export_title">Vie kohteeseen…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d tiedostoa</string>
-    <string name="files_many">%1$d tiedostoa</string>
-    <string name="files_one">1 tiedosto</string>
-    <string name="files_other">%1$d tiedostoa</string>
-    <string name="files_two">2 tiedostoa</string>
-    <string name="files_zero">0 tiedostoa</string>
+    <plurals name="files">
+        <item quantity="one">1 tiedosto</item>
+        <item quantity="other">%1$d tiedostoa</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Lisää</string>
     <string name="generic_delete_selected_confirm_title">Poistetaanko valitut?</string>
diff --git a/src/main/res/values-fr-rCA/strings.xml b/src/main/res/values-fr-rCA/strings.xml
index 5aa022d25..def2741bf 100644
--- a/src/main/res/values-fr-rCA/strings.xml
+++ b/src/main/res/values-fr-rCA/strings.xml
@@ -97,12 +97,10 @@
     <string name="export_progress_message">Exportation vers le répertoire %1$s en cours…</string>
     <string name="export_success">%1$s parcours bien exporté(s) vers le répertoire %2$s</string>
     <string name="export_title">Exporter vers…</string>
-    <string name="files_few">%1$d fichiers</string>
-    <string name="files_many">%1$d fichiers</string>
-    <string name="files_one">1 fichier</string>
-    <string name="files_other">%1$d fichiers</string>
-    <string name="files_two">2 fichiers</string>
-    <string name="files_zero">0 fichier</string>
+    <plurals name="files">
+        <item quantity="one">%1$d fichier</item>
+        <item quantity="other">%1$d fichiers</item>
+    </plurals>
     <string name="generic_add">Ajouter</string>
     <string name="generic_delete_selected_confirm_title">Supprimer les éléments sélectionnés?</string>
     <string name="generic_description">Description</string>
diff --git a/src/main/res/values-fr-rCH/strings.xml b/src/main/res/values-fr-rCH/strings.xml
index 916a2f3d5..80f5d1bee 100644
--- a/src/main/res/values-fr-rCH/strings.xml
+++ b/src/main/res/values-fr-rCH/strings.xml
@@ -97,12 +97,10 @@
     <string name="export_progress_message">Exportation vers le répertoire %1$s en cours…</string>
     <string name="export_success">%1$s parcours exporté(s) vers le répertoire %2$s.</string>
     <string name="export_title">Exporter vers…</string>
-    <string name="files_few">%1$d fichiers</string>
-    <string name="files_many">%1$d fichiers</string>
-    <string name="files_one">1 fichier</string>
-    <string name="files_other">%1$d fichiers</string>
-    <string name="files_two">2 fichiers</string>
-    <string name="files_zero">Aucun fichier</string>
+    <plurals name="files">
+        <item quantity="one">%1$d fichier</item>
+        <item quantity="other">%1$d fichiers</item>
+    </plurals>
     <string name="generic_add">Ajouter</string>
     <string name="generic_delete_selected_confirm_title">Supprimer les éléments sélectionnés ?</string>
     <string name="generic_description">Description</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e2cd3fff0..8eb44c87b 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -168,12 +168,10 @@ Si le dispositif GPS signale des données inexactes (par exemple, la localisatio
     <string name="export_title">Exporter vers…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d fichiers</string>
-    <string name="files_many">%1$d fichiers</string>
-    <string name="files_one">1 fichier</string>
-    <string name="files_other">%1$d fichiers</string>
-    <string name="files_two">2 fichiers</string>
-    <string name="files_zero">Aucun fichier</string>
+    <plurals name="files">
+        <item quantity="one">%1$d fichier</item>
+        <item quantity="other">%1$d fichiers</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Ajouter</string>
     <string name="generic_delete_selected_confirm_title">Supprimer les éléments sélectionnés ?</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 314068969..9dfb84891 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -178,12 +178,10 @@ Se te detés ou estás en interiores, non se gardarán datos do sensor (mais ser
     <string name="export_title">Exportar a…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d ficheiros</string>
-    <string name="files_many">%1$d ficheiros</string>
-    <string name="files_one">1 ficheiro</string>
-    <string name="files_other">%1$d ficheiros</string>
-    <string name="files_two">2 ficheiros</string>
-    <string name="files_zero">0 ficheiros</string>
+    <plurals name="files">
+        <item quantity="one">1 ficheiro</item>
+        <item quantity="other">%1$d ficheiros</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Engadir</string>
     <string name="generic_delete_selected_confirm_title">Eliminar a selección?</string>
diff --git a/src/main/res/values-hi/strings.xml b/src/main/res/values-hi/strings.xml
index 6bcbdb34c..760455daf 100644
--- a/src/main/res/values-hi/strings.xml
+++ b/src/main/res/values-hi/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">यहां निर्यात करें…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d फ़ाइलें</string>
-    <string name="files_many">%1$d फ़ाइलें</string>
-    <string name="files_one">1 फ़ाइल</string>
-    <string name="files_other">%1$d फ़ाइलें</string>
-    <string name="files_two">2 फ़ाइलें</string>
-    <string name="files_zero">0 फ़ाइलें</string>
+    <plurals name="files">
+        <item quantity="one">%1$d फ़ाइलें</item>
+        <item quantity="other">%1$d फ़ाइलें</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">जोड़ें</string>
     <string name="generic_delete_selected_confirm_title">चयनित हटाएं?</string>
diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml
index 033bf8001..1d1774689 100644
--- a/src/main/res/values-hr/strings.xml
+++ b/src/main/res/values-hr/strings.xml
@@ -117,12 +117,11 @@ limitations under the License.
     <string name="export_title">Izvoz u…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d datoteke</string>
-    <string name="files_many">%1$d datoteka</string>
-    <string name="files_one">1 datoteka</string>
-    <string name="files_other">%1$d datoteka</string>
-    <string name="files_two">2 datoteke</string>
-    <string name="files_zero">0 datoteka</string>
+    <plurals name="files">
+        <item quantity="one">%1$d datoteka</item>
+        <item quantity="few">%1$d datoteke</item>
+        <item quantity="other">%1$d datoteka</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Dodaj</string>
     <string name="generic_delete_selected_confirm_title">Želite li izbrisati odabrano?</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 090b001a4..bdd74bcaa 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Exportálás ide:…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d fájl</string>
-    <string name="files_many">%1$d fájl</string>
-    <string name="files_one">1 fájl</string>
-    <string name="files_other">%1$d fájl</string>
-    <string name="files_two">2 fájl</string>
-    <string name="files_zero">0 fájl</string>
+    <plurals name="files">
+        <item quantity="one">1 fájl</item>
+        <item quantity="other">%1$d fájl</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Hozzáadás</string>
     <string name="generic_delete_selected_confirm_title">Törli a kiválasztott(ak)at?</string>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 521cdd7f0..0be4c7a55 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -97,12 +97,9 @@
     <string name="export_progress_message">Mengekspor ke %1$s…</string>
     <string name="export_success">%1$s dari %2$s terekspor.</string>
     <string name="export_title">Ekspor ke…</string>
-    <string name="files_few">%1$d file</string>
-    <string name="files_many">%1$d file</string>
-    <string name="files_one">1 file</string>
-    <string name="files_other">%1$d file</string>
-    <string name="files_two">2 file</string>
-    <string name="files_zero">0 file</string>
+    <plurals name="files">
+        <item quantity="other">%1$d file</item>
+    </plurals>
     <string name="generic_add">Tambahkan</string>
     <string name="generic_delete_selected_confirm_title">Hapus yang dipilih?</string>
     <string name="generic_description">Deskripsi</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index e505e52b6..178053773 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -160,12 +160,10 @@ Infatti, un\'applicazione deve supportare <i>ACTION_VIEW</i> con MIME <i>applica
     <string name="export_title">Esporta in…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d file</string>
-    <string name="files_many">%1$d file</string>
-    <string name="files_one">1 file</string>
-    <string name="files_other">%1$d file</string>
-    <string name="files_two">2 file</string>
-    <string name="files_zero">0 file</string>
+    <plurals name="files">
+        <item quantity="one">1 file</item>
+        <item quantity="other">%1$d file</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Aggiungi</string>
     <string name="generic_delete_selected_confirm_title">Eliminare selezione?</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 9e216e932..62968162f 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -97,12 +97,12 @@
     <string name="export_progress_message">מייצא אל %1$s…</string>
     <string name="export_success">יוצאו %1$s אל %2$s</string>
     <string name="export_title">ייצא אל…</string>
-    <string name="files_few">%1$d קבצים</string>
-    <string name="files_many">%1$d קבצים</string>
-    <string name="files_one">קובץ אחד</string>
-    <string name="files_other">%1$d קבצים</string>
-    <string name="files_two">שני קבצים</string>
-    <string name="files_zero">אפס קבצים</string>
+    <plurals name="files">
+        <item quantity="one">קובץ אחד</item>
+        <item quantity="two">שני קבצים</item>
+        <item quantity="many">%1$d קבצים</item>
+        <item quantity="other">%1$d קבצים</item>
+    </plurals>
     <string name="generic_add">הוסף</string>
     <string name="generic_delete_selected_confirm_title">למחוק את הפריטים שנבחרו?</string>
     <string name="generic_description">תיאור</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index c13404348..ea12c2b43 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -117,12 +117,9 @@ limitations under the License.
     <string name="export_title">エクスポート先…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d個のファイル</string>
-    <string name="files_many">%1$d個のファイル</string>
-    <string name="files_one">1個のファイル</string>
-    <string name="files_other">%1$d個のファイル</string>
-    <string name="files_two">2個のファイル</string>
-    <string name="files_zero">0個のファイル</string>
+    <plurals name="files">
+        <item quantity="other">%1$d個のファイル</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">追加</string>
     <string name="generic_delete_selected_confirm_title">選択したアイテムを削除しますか？</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 440f48629..528798de6 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -117,12 +117,9 @@ limitations under the License.
     <string name="export_title">내보내기…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">파일 %1$d개</string>
-    <string name="files_many">파일 %1$d개</string>
-    <string name="files_one">파일 1개</string>
-    <string name="files_other">파일 %1$d개</string>
-    <string name="files_two">파일 2개</string>
-    <string name="files_zero">파일 0개</string>
+    <plurals name="files">
+        <item quantity="other">파일 %1$d개</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">추가하기</string>
     <string name="generic_delete_selected_confirm_title">선택한 항목을 삭제하시겠습니까?</string>
diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml
index ad162a756..e9c638231 100644
--- a/src/main/res/values-lt/strings.xml
+++ b/src/main/res/values-lt/strings.xml
@@ -117,12 +117,11 @@ limitations under the License.
     <string name="export_title">Eksportuoti į…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d failai</string>
-    <string name="files_many">%1$d failai</string>
-    <string name="files_one">1 failas</string>
-    <string name="files_other">%1$d failų</string>
-    <string name="files_two">2 failai</string>
-    <string name="files_zero">0 failų</string>
+    <plurals name="files">
+        <item quantity="one">%1$d failas</item>
+        <item quantity="few">%1$d failai</item>
+        <item quantity="other">%1$d failų</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Papildyti</string>
     <string name="generic_delete_selected_confirm_title">Ištrinti pasirinktus?</string>
diff --git a/src/main/res/values-lv/strings.xml b/src/main/res/values-lv/strings.xml
index 9c95eb2c0..d34d186c4 100644
--- a/src/main/res/values-lv/strings.xml
+++ b/src/main/res/values-lv/strings.xml
@@ -117,12 +117,11 @@ limitations under the License.
     <string name="export_title">Eksportēšana uz…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d faili</string>
-    <string name="files_many">%1$d faili</string>
-    <string name="files_one">1 fails</string>
-    <string name="files_other">%1$d faili</string>
-    <string name="files_two">2 faili</string>
-    <string name="files_zero">0 failu</string>
+    <plurals name="files">
+        <item quantity="zero">%1$d failu</item>
+        <item quantity="one">%1$d fails</item>
+        <item quantity="other">%1$d faili</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Pievienot</string>
     <string name="generic_delete_selected_confirm_title">Vai dzēst atlasītos vienumus?</string>
diff --git a/src/main/res/values-mo/strings.xml b/src/main/res/values-mo/strings.xml
index 8dca3587b..2cbcb9e0c 100644
--- a/src/main/res/values-mo/strings.xml
+++ b/src/main/res/values-mo/strings.xml
@@ -97,12 +97,14 @@
     <string name="export_progress_message">Se exportă în %1$s…</string>
     <string name="export_success">S-a(u) exportat %1$s în %2$s</string>
     <string name="export_title">Exportați în…</string>
-    <string name="files_few">%1$d fișiere</string>
-    <string name="files_many">%1$d (de) fișiere</string>
-    <string name="files_one">1 fișier</string>
-    <string name="files_other">%1$d (de) fișiere</string>
-    <string name="files_two">2 fișiere</string>
-    <string name="files_zero">0 fișiere</string>
+    <plurals name="files">
+        <item quantity="zero">0 fișiere</item>
+        <item quantity="one">1 fișier</item>
+        <item quantity="two">2 fișiere</item>
+        <item quantity="few">%1$d fișiere</item>
+        <item quantity="many">%1$d (de) fișiere</item>
+        <item quantity="other">%1$d (de) fișiere</item>
+    </plurals>
     <string name="generic_add">Adăugați</string>
     <string name="generic_delete_selected_confirm_title">Ștergeți cele selectate?</string>
     <string name="generic_description">Descriere</string>
diff --git a/src/main/res/values-ms/strings.xml b/src/main/res/values-ms/strings.xml
index d797bc16d..91133e2f2 100644
--- a/src/main/res/values-ms/strings.xml
+++ b/src/main/res/values-ms/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Eksport ke…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d fail</string>
-    <string name="files_many">%1$d fail</string>
-    <string name="files_one">1 fail</string>
-    <string name="files_other">%1$d fail</string>
-    <string name="files_two">2 fail</string>
-    <string name="files_zero">0 fail</string>
+    <plurals name="files">
+        <item quantity="other">%1$d fail</item>
+    </plurals>
+
     <!-- Generic -->
     <string name="generic_add">Tambah</string>
     <string name="generic_delete_selected_confirm_title">Padamkan yang dipilih?</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 01a3b2a1c..be902043f 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Eksporter til…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d filer</string>
-    <string name="files_many">%1$d filer</string>
-    <string name="files_one">1 fil</string>
-    <string name="files_other">%1$d filer</string>
-    <string name="files_two">2 filer</string>
-    <string name="files_zero">0 filer</string>
+    <plurals name="files">
+        <item quantity="one">1 fil</item>
+        <item quantity="other">%1$d filer</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Legg til</string>
     <string name="generic_delete_selected_confirm_title">Vil du slette de valgte elementene?</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 2c8c1bff4..62c47e566 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -168,12 +168,10 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid
     <string name="export_title">Exporteren naar…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d bestanden</string>
-    <string name="files_many">%1$d bestanden</string>
-    <string name="files_one">1 bestand</string>
-    <string name="files_other">%1$d bestanden</string>
-    <string name="files_two">2 bestanden</string>
-    <string name="files_zero">0 bestanden</string>
+    <plurals name="files">
+        <item quantity="one">1 bestand</item>
+        <item quantity="other">%1$d bestanden</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Toevoegen</string>
     <string name="generic_delete_selected_confirm_title">Geselecteerde items verwijderen?</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 260378a49..c73387043 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -125,12 +125,12 @@ limitations under the License.
     <string name="export_progress_summary_errors_msg">Błędy</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d pliki</string>
-    <string name="files_many">%1$d plików</string>
-    <string name="files_one">1 plik</string>
-    <string name="files_other">%1$d pliku</string>
-    <string name="files_two">2 pliki</string>
-    <string name="files_zero">0 plików</string>
+    <plurals name="files">
+        <item quantity="one">1 plik</item>
+        <item quantity="few">%1$d pliki</item>
+        <item quantity="many">%1$d plików</item>
+        <item quantity="other">%1$d pliku</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Dodaj</string>
     <string name="generic_delete_selected_confirm_title">Usunąć wybrane?</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 015b03af7..90552e1ae 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -97,12 +97,10 @@
     <string name="export_progress_message">Exportando para %1$s…</string>
     <string name="export_success">Exportação: %1$s para %2$s</string>
     <string name="export_title">Exportar para…</string>
-    <string name="files_few">%1$d arquivos</string>
-    <string name="files_many">%1$d arquivos</string>
-    <string name="files_one">1 arquivo</string>
-    <string name="files_other">%1$d arquivos</string>
-    <string name="files_two">2 arquivos</string>
-    <string name="files_zero">0 arquivos</string>
+    <plurals name="files">
+        <item quantity="one">%1$d arquivo</item>
+        <item quantity="other">%1$d arquivos</item>
+    </plurals>
     <string name="generic_add">Adicionar</string>
     <string name="generic_delete_selected_confirm_title">Excluir selecionados?</string>
     <string name="generic_description">Descrição</string>
diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml
index f4e629397..36c004cef 100644
--- a/src/main/res/values-pt-rPT/strings.xml
+++ b/src/main/res/values-pt-rPT/strings.xml
@@ -97,12 +97,10 @@
     <string name="export_progress_message">A exportar para %1$s …</string>
     <string name="export_success">%1$s exportados para %2$s</string>
     <string name="export_title">Exportar para…</string>
-    <string name="files_few">%1$d ficheiros</string>
-    <string name="files_many">%1$d ficheiros</string>
-    <string name="files_one">1 ficheiro</string>
-    <string name="files_other">%1$d ficheiros</string>
-    <string name="files_two">2 ficheiros</string>
-    <string name="files_zero">0 ficheiros</string>
+    <plurals name="files">
+        <item quantity="one">%1$d ficheiro</item>
+        <item quantity="other">%1$d ficheiros</item>
+    </plurals>
     <string name="generic_add">Adicionar</string>
     <string name="generic_delete_selected_confirm_title">Eliminar seleção?</string>
     <string name="generic_description">Descrição</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 204825e93..0bd03b5fb 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Exportar para…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d arquivos</string>
-    <string name="files_many">%1$d arquivos</string>
-    <string name="files_one">1 arquivo</string>
-    <string name="files_other">%1$d arquivos</string>
-    <string name="files_two">2 arquivos</string>
-    <string name="files_zero">0 arquivos</string>
+    <plurals name="files">
+        <item quantity="one">%1$d arquivo</item>
+        <item quantity="other">%1$d arquivos</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Adicionar</string>
     <string name="generic_delete_selected_confirm_title">Excluir selecionados?</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index f5ec172f7..da76b6c57 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -117,12 +117,11 @@ limitations under the License.
     <string name="export_title">Exportați în…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d fișiere</string>
-    <string name="files_many">%1$d (de) fișiere</string>
-    <string name="files_one">1 fișier</string>
-    <string name="files_other">%1$d (de) fișiere</string>
-    <string name="files_two">2 fișiere</string>
-    <string name="files_zero">0 fișiere</string>
+    <plurals name="files">
+        <item quantity="one">1 fișier</item>
+        <item quantity="few">%1$d fișiere</item>
+        <item quantity="other">%1$d (de) fișiere</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Adăugați</string>
     <string name="generic_delete_selected_confirm_title">Ștergeți cele selectate?</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 1bc53747a..561de7c03 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -117,12 +117,12 @@ limitations under the License.
     <string name="export_title">Экспорт в…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d файла</string>
-    <string name="files_many">%1$d файлов</string>
-    <string name="files_one">1 файл</string>
-    <string name="files_other">%1$d файла</string>
-    <string name="files_two">2 файла</string>
-    <string name="files_zero">0 файлов</string>
+    <plurals name="files">
+        <item quantity="one">%1$d файл</item>
+        <item quantity="few">%1$d файла</item>
+        <item quantity="many">%1$d файлов</item>
+        <item quantity="other">%1$d файла</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Добавить</string>
     <string name="generic_delete_selected_confirm_title">Удалить выбранное?</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 67e9b6cab..dde08a66e 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -117,12 +117,11 @@ limitations under the License.
     <string name="export_title">Exportovať do…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d súbory</string>
-    <string name="files_many">%1$d súborov</string>
-    <string name="files_one">1 súbor</string>
-    <string name="files_other">%1$d súborov</string>
-    <string name="files_two">2 súbory</string>
-    <string name="files_zero">0 súborov</string>
+    <plurals name="files">
+        <item quantity="one">1 súbor</item>
+        <item quantity="few">%1$d súbory</item>
+        <item quantity="other">%1$d súborov</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Pridať</string>
     <string name="generic_delete_selected_confirm_title">Odstrániť vybraté položky?</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index 2c7718c85..f6b3377a4 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -117,12 +117,12 @@ limitations under the License.
     <string name="export_title">Izvozi v …</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">št. datotek: %1$d</string>
-    <string name="files_many">št. datotek: %1$d</string>
-    <string name="files_one">1 datoteka</string>
-    <string name="files_other">%1$d datotek</string>
-    <string name="files_two">2 datoteki</string>
-    <string name="files_zero">0 datotek</string>
+    <plurals name="files">
+        <item quantity="one">%1$d datoteka</item>
+        <item quantity="two">%1$d datoteki</item>
+        <item quantity="few">št. datotek: %1$d</item>
+        <item quantity="other">%1$d datotek</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Dodaj</string>
     <string name="generic_delete_selected_confirm_title">Izbriši izbrano?</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 5d1f55c61..8e0609e98 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -117,12 +117,11 @@ limitations under the License.
     <string name="export_title">Извоз у…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d датотеке</string>
-    <string name="files_many">%1$d датотека</string>
-    <string name="files_one">1 датотека</string>
-    <string name="files_other">%1$d датотека</string>
-    <string name="files_two">2 датотеке</string>
-    <string name="files_zero">0 датотека</string>
+    <plurals name="files">
+        <item quantity="one">%1$d датотека</item>
+        <item quantity="few">%1$d датотеке</item>
+        <item quantity="other">%1$d датотека</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Додај</string>
     <string name="generic_delete_selected_confirm_title">Желите да избришете изабрано?</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 15b2c0efb..e6b6c3b1e 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Exportera till …</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d filer</string>
-    <string name="files_many">%1$d filer</string>
-    <string name="files_one">1 fil</string>
-    <string name="files_other">%1$d filer</string>
-    <string name="files_two">2 filer</string>
-    <string name="files_zero">0 filer</string>
+    <plurals name="files">
+        <item quantity="one">1 fil</item>
+        <item quantity="other">%1$d filer</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Lägg till</string>
     <string name="generic_delete_selected_confirm_title">Ta bort markerade?</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 851d7929b..5b95023e5 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -117,12 +117,9 @@ limitations under the License.
     <string name="export_title">ส่งออกลงใน…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d ไฟล์</string>
-    <string name="files_many">%1$d ไฟล์</string>
-    <string name="files_one">1 ไฟล์</string>
-    <string name="files_other">%1$d ไฟล์</string>
-    <string name="files_two">2 ไฟล์</string>
-    <string name="files_zero">0 ไฟล์</string>
+    <plurals name="files">
+        <item quantity="other">%1$d ไฟล</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">เพิ่ม</string>
     <string name="generic_delete_selected_confirm_title">ลบรายการที่เลือกใช่ไหม</string>
diff --git a/src/main/res/values-tl/strings.xml b/src/main/res/values-tl/strings.xml
index 3f86cfddc..48d62ffe3 100644
--- a/src/main/res/values-tl/strings.xml
+++ b/src/main/res/values-tl/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">I-export sa…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d (na) file</string>
-    <string name="files_many">%1$d (na) file</string>
-    <string name="files_one">1 file</string>
-    <string name="files_other">%1$d (na) file</string>
-    <string name="files_two">2 file</string>
-    <string name="files_zero">0 file</string>
+    <plurals name="files">
+        <item quantity="one">%1$d file</item>
+        <item quantity="other">%1$d (na) file</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Idagdag</string>
     <string name="generic_delete_selected_confirm_title">Tanggalin ang pinili?</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 1e203e03e..1bacc2db9 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -117,12 +117,10 @@ limitations under the License.
     <string name="export_title">Şuraya aktar…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d dosya</string>
-    <string name="files_many">%1$d dosya</string>
-    <string name="files_one">1 dosya</string>
-    <string name="files_other">%1$d dosya</string>
-    <string name="files_two">2 dosya</string>
-    <string name="files_zero">0 dosya</string>
+    <plurals name="files">
+        <item quantity="one">1 dosya</item>
+        <item quantity="other">%1$d dosya</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Ekle</string>
     <string name="generic_delete_selected_confirm_title">Seçilenler silinsin mi?</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 220fb1c6a..f1bbdc949 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -117,12 +117,12 @@ limitations under the License.
     <string name="export_title">Експорт у…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d файли</string>
-    <string name="files_many">%1$d файлів</string>
-    <string name="files_one">1 файл</string>
-    <string name="files_other">%1$d файлу</string>
-    <string name="files_two">2 файли</string>
-    <string name="files_zero">0 файлів</string>
+    <plurals name="files">
+        <item quantity="one">%1$d файл</item>
+        <item quantity="few">%1$d файли</item>
+        <item quantity="many">%1$d файлів</item>
+        <item quantity="other">%1$d файлу</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Додати</string>
     <string name="generic_delete_selected_confirm_title">Видалити вибрані?</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 8323e4f01..d780c1e94 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -117,12 +117,9 @@ limitations under the License.
     <string name="export_title">Xuất sang…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d tệp</string>
-    <string name="files_many">%1$d tệp</string>
-    <string name="files_one">1 tệp</string>
-    <string name="files_other">%1$d tệp</string>
-    <string name="files_two">2 tệp</string>
-    <string name="files_zero">0 tệp</string>
+    <plurals name="files">
+        <item quantity="other">%1$d tệp</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Thêm</string>
     <string name="generic_delete_selected_confirm_title">Xóa phần được chọn?</string>
diff --git a/src/main/res/values-zh-rHK/strings.xml b/src/main/res/values-zh-rHK/strings.xml
index 6662f2ad4..1dc41fd53 100644
--- a/src/main/res/values-zh-rHK/strings.xml
+++ b/src/main/res/values-zh-rHK/strings.xml
@@ -97,12 +97,9 @@
     <string name="export_progress_message">正在匯出至 %1$s…</string>
     <string name="export_success">已將 %1$s 匯出至 %2$s</string>
     <string name="export_title">匯出至…</string>
-    <string name="files_few">%1$d 個檔案</string>
-    <string name="files_many">%1$d 個檔案</string>
-    <string name="files_one">1 個檔案</string>
-    <string name="files_other">%1$d 個檔案</string>
-    <string name="files_two">2 個檔案</string>
-    <string name="files_zero">0 個檔案</string>
+    <plurals name="files">
+        <item quantity="other">%1$d 個檔案</item>
+    </plurals>
     <string name="generic_add">新增</string>
     <string name="generic_delete_selected_confirm_title">確定要刪除所選項目？</string>
     <string name="generic_description">內容描述</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 6662f2ad4..1dc41fd53 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -97,12 +97,9 @@
     <string name="export_progress_message">正在匯出至 %1$s…</string>
     <string name="export_success">已將 %1$s 匯出至 %2$s</string>
     <string name="export_title">匯出至…</string>
-    <string name="files_few">%1$d 個檔案</string>
-    <string name="files_many">%1$d 個檔案</string>
-    <string name="files_one">1 個檔案</string>
-    <string name="files_other">%1$d 個檔案</string>
-    <string name="files_two">2 個檔案</string>
-    <string name="files_zero">0 個檔案</string>
+    <plurals name="files">
+        <item quantity="other">%1$d 個檔案</item>
+    </plurals>
     <string name="generic_add">新增</string>
     <string name="generic_delete_selected_confirm_title">確定要刪除所選項目？</string>
     <string name="generic_description">內容描述</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 6391c2a65..69c3bdbf5 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -117,12 +117,9 @@ limitations under the License.
     <string name="export_title">导出到…</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d个文件</string>
-    <string name="files_many">%1$d个文件</string>
-    <string name="files_one">1个文件</string>
-    <string name="files_other">%1$d个文件</string>
-    <string name="files_two">2个文件</string>
-    <string name="files_zero">0个文件</string>
+    <plurals name="files">
+        <item quantity="other">%1$d个文件</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">添加</string>
     <string name="generic_delete_selected_confirm_title">删除所选项？</string>
diff --git a/src/main/res/values/plurals.xml b/src/main/res/values/plurals.xml
index bdb0c41d5..19655b4fa 100644
--- a/src/main/res/values/plurals.xml
+++ b/src/main/res/values/plurals.xml
@@ -14,23 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
-    <plurals name="files">
-        <item quantity="zero">@string/files_zero</item>
-        <item quantity="one">@string/files_one</item>
-        <item quantity="two">@string/files_two</item>
-        <item quantity="few">@string/files_few</item>
-        <item quantity="many">@string/files_many</item>
-        <item quantity="other">@string/files_other</item>
-    </plurals>
-    <plurals name="tracks">
-        <item quantity="zero">@string/tracks_zero</item>
-        <item quantity="one">@string/tracks_one</item>
-        <item quantity="two">@string/tracks_two</item>
-        <item quantity="few">@string/tracks_few</item>
-        <item quantity="many">@string/tracks_many</item>
-        <item quantity="other">@string/tracks_other</item>
-    </plurals>
-    <plurals name="voiceHours">
+
+<plurals name="voiceHours">
         <item quantity="zero">@string/voice_hours_zero</item>
         <item quantity="one">@string/voice_hours_one</item>
         <item quantity="two">@string/voice_hours_two</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index b3645c837..db13536a7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -217,12 +217,10 @@ limitations under the License.
     <string name="export_progress_summary_errors_msg">Errors</string>
     <!-- External Storage -->
     <!-- Files -->
-    <string name="files_few">%1$d files</string>
-    <string name="files_many">%1$d files</string>
-    <string name="files_one">1 file</string>
-    <string name="files_other">%1$d files</string>
-    <string name="files_two">2 files</string>
-    <string name="files_zero">0 files</string>
+    <plurals name="files">
+        <item quantity="one">1 file</item>
+        <item quantity="other">%1$d files</item>
+    </plurals>
     <!-- Generic -->
     <string name="generic_add">Add</string>
     <string name="generic_delete_selected_confirm_title">Delete selected?</string>