CMFileManager: Make use of plurals correctly

* Make selection strings use of plurals allowing to translate these into
  languages where the logic of plurals is different than in English.

* Rename some plurals as these are not used only in properties dialog
  any more.

* Remove quantity="zero" cases from plurals as these are never used in
  English.

* Remove now unused strings from translations and rename plurals.

Change-Id: I8c07f1ba85b208d37626106e0e2f691468c1cbc4

33 files changed, 64 insertions, 307 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index d8dfa73a..beeb2139 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -274,13 +274,13 @@
   <!-- Fso Properties Dialog * Others Label -->
   <string name="fso_properties_dialog_others">Ander:</string>
   <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 vouergidse</item>
     <item quantity="one">1 vouergids</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> vouergidse</item>
   </plurals>
   <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 lêers</item>
     <item quantity="one">1 lêer</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> lêers</item>
@@ -571,20 +571,6 @@
   <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>
 
-  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
-     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
-     Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> vouergids geselekteer.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> vouergidse geselekteer.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> lêer geselekteer.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> lêers geselekteer.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> vouergids en
-    <xliff:g id="files">%2$s</xliff:g> lêer geselekteer.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> vouergids en
-    <xliff:g id="file2">%2$s</xliff:g> lêers geselekteer.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> vouergidse
-    en <xliff:g id="files">%2$s</xliff:g> lêers geselekteer.</string>
-
   <!-- Category descriptions -->
   <string name="category_system">STELSEL</string>
   <string name="category_app">PROGRAM</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0f848279..f43a8a03 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -145,13 +145,13 @@
   <string name="fso_properties_dialog_owner">Vlastník:</string>
   <string name="fso_properties_dialog_group">Skupina:</string>
   <string name="fso_properties_dialog_others">Ostatní:</string>
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 složek</item>
     <item quantity="one">1 složka</item>
     <item quantity="few"><xliff:g id="folders">%1$d</xliff:g> složky</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> složek</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 souborů</item>
     <item quantity="one">1 soubor</item>
     <item quantity="few"><xliff:g id="files">%1$d</xliff:g> soubory</item>
@@ -309,14 +309,6 @@
   <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>
 
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> složka vybrána.</string>
-  <string name="selection_other_folders">Vybraných složek: <xliff:g id="folders">%1$s</xliff:g></string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> soubor vybrán.</string>
-  <string name="selection_other_files">Vybraných souborů: <xliff:g id="files">%1$s</xliff:g></string>
-  <string name="selection_other_folders_one_file">Vybraných složek: <xliff:g id="folders">%1$s</xliff:g> a <xliff:g id="files">%2$s</xliff:g> soubor vybrán.</string>
-  <string name="selection_one_folder_other_files">Vybrána složka <xliff:g id="folder2">%1$s</xliff:g> a vybraných souborů: <xliff:g id="file2">%2$s</xliff:g></string>
-  <string name="selection_other_folders_other_files">Vybraných složek: <xliff:g id="folder2">%1$s</xliff:g> a vybraných souborů: <xliff:g id="files">%2$s</xliff:g></string>
-
   <string name="category_system">SYSTÉM</string>
   <string name="category_app">APLIKACE</string>
   <string name="category_binary">BINÁRNÍ SOUBOR</string>
diff --git a/res/values-da/plurals.xml b/res/values-da/plurals.xml
index 07149067..a904c1bb 100644
--- a/res/values-da/plurals.xml
+++ b/res/values-da/plurals.xml
@@ -16,12 +16,12 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 mapper</item>
     <item quantity="one">1 mappe</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> mapper</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 filer</item>
     <item quantity="one">1 fil</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> filer</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4790e99f..c53a58c4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -271,13 +271,6 @@
   <string name="filetime_format_mode_ddMMyyyy_HHmmss">dd/mm/åååå tt:mm:ss</string>
   <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/åååå tt:mm:ss</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">åååå-mm-dd tt:mm:ss</string>
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> mappe valgt.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> mapper valgt.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fil valgt.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> filer valgt.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> mapper og <xliff:g id="files">%2$s</xliff:g> fil valgt.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> mappe og <xliff:g id="file2">%2$s</xliff:g> filer valgt.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> mapper og <xliff:g id="files">%2$s</xliff:g> filer valgt.</string>
   <string name="category_system">SYSTEM</string>
   <string name="category_app">APP</string>
   <string name="category_binary">BINÆR</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 77cb5129..8877a412 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -172,14 +172,14 @@
     <string name="fso_properties_dialog_others">Andere:</string>
 
     <!-- Fso properties - Folders -->
-    <plurals name="fso_properties_dialog_folders">
+    <plurals name="n_folders">
         <item quantity="zero">Kein Ordner</item>
         <item quantity="one">1 Ordner</item>
         <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> Ordner</item>
     </plurals>
 
     <!-- Fso properties - Files -->
-    <plurals name="fso_properties_dialog_files">
+    <plurals name="n_files">
         <item quantity="zero">Keine Dateien</item>
         <item quantity="one">1 Datei</item>
         <item quantity="other"><xliff:g id="files">%1$d</xliff:g> Dateien</item>
@@ -354,15 +354,6 @@
     <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
     <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>
 
-    <!-- Selections -->
-    <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> Ordner ausgewählt</string>
-    <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> Ordner ausgewählt</string>
-    <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> Datei ausgewählt.</string>
-    <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> Dateien ausgewählt</string>
-    <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> Ordner und <xliff:g id="files">%2$s</xliff:g> Datei ausgewählt</string>
-    <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> Ordner und <xliff:g id="file2">%2$s</xliff:g> Dateien ausgewählt</string>
-    <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> Ordner und <xliff:g id="files">%2$s</xliff:g> Dateien ausgewählt</string>
-
     <!-- Category descriptions -->
     <string name="category_system">SYSTEM</string>
     <string name="category_app">APP</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 4f278571..09df7b6c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -132,12 +132,12 @@
     <string name="fso_properties_dialog_owner">Ιδιοκτήτης:</string>
     <string name="fso_properties_dialog_group">Γκρουπ:</string>
     <string name="fso_properties_dialog_others">Άλλοι:</string>
-    <plurals name="fso_properties_dialog_folders">
+    <plurals name="n_folders">
         <item quantity="zero">0 φάκελοι</item>
         <item quantity="one">1 φάκελος</item>
         <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> φάκελοι</item>
     </plurals>
-    <plurals name="fso_properties_dialog_files">
+    <plurals name="n_files">
         <item quantity="zero">0 αρχεία</item>
         <item quantity="one">1 αρχείο</item>
         <item quantity="other"><xliff:g id="files">%1$d</xliff:g> αρχεία</item>
@@ -273,13 +273,6 @@
     <string name="filetime_format_mode_ddMMyyyy_HHmmss">ηη/μμ/εεεε ωω:λλ:δδ</string>
     <string name="filetime_format_mode_MMddyyyy_HHmmss">μμ/ηη/εεεε ωω:λλ:δδ</string>
     <string name="filetime_format_mode_yyyyMMdd_HHmmss">εεεε-μμ-ηη ωω:λλ:δδ</string>
-    <string name="selection_one_folder">Επιλέχθηκε <xliff:g id="folders">%1$s</xliff:g> φάκελος.</string>
-    <string name="selection_other_folders">Επιλέχθηκαν <xliff:g id="folders">%1$s</xliff:g> φάκελοι.</string>
-    <string name="selection_one_file">Επιλέχθηκε <xliff:g id="files">%1$s</xliff:g> αρχείο.</string>
-    <string name="selection_other_files">Επιλέχθηκαν <xliff:g id="files">%1$s</xliff:g> αρχεία.</string>
-    <string name="selection_other_folders_one_file">Επιλέχθηκαν <xliff:g id="folders">%1$s</xliff:g> φάκελοι και <xliff:g id="files">%2$s</xliff:g> αρχείο.</string>
-    <string name="selection_one_folder_other_files">Επιλέχθηκαν <xliff:g id="folder2">%1$s</xliff:g> φάκελος και <xliff:g id="file2">%2$s</xliff:g> αρχεία.</string>
-    <string name="selection_other_folders_other_files">Επιλέχθηκαν <xliff:g id="folder2">%1$s</xliff:g> φάκελοι και <xliff:g id="files">%2$s</xliff:g> αρχεία.</string>
     <string name="category_system">ΣΥΣΤΗΜΑ</string>
     <string name="category_app">ΕΦΑΡΜΟΓΗ</string>
     <string name="category_binary">BINARY</string>
diff --git a/res/values-es/plurals.xml b/res/values-es/plurals.xml
index 91c7a81b..8c6e7cad 100644
--- a/res/values-es/plurals.xml
+++ b/res/values-es/plurals.xml
@@ -15,12 +15,12 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <plurals name="fso_properties_dialog_folders">
+    <plurals name="n_folders">
         <item quantity="zero">0 carpetas</item>
         <item quantity="one">1 carpeta</item>
         <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> carpetas</item>
     </plurals>
-    <plurals name="fso_properties_dialog_files">
+    <plurals name="n_files">
         <item quantity="zero">0 archivos</item>
         <item quantity="one">1 archivo</item>
         <item quantity="other"><xliff:g id="files">%1$d</xliff:g> archivos</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 80d9a9ad..db243b8d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -270,13 +270,6 @@
     <string name="filetime_format_mode_ddMMyyyy_HHmmss">dd/mm/aaaa hh:mm:ss</string>
     <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/aaaa hh:mm:ss</string>
     <string name="filetime_format_mode_yyyyMMdd_HHmmss">aaaa-mm-dd hh:mm:ss</string>
-    <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> carpeta seleccionada.</string>
-    <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> carpetas seleccionadas.</string>
-    <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> archivo seleccionado.</string>
-    <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> archivos seleccionados.</string>
-    <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> carpetas y <xliff:g id="files">%2$s</xliff:g> archivo seleccionado.</string>
-    <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> carpeta y <xliff:g id="file2">%2$s</xliff:g> archivos seleccionados.</string>
-    <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> carpetas y <xliff:g id="files">%2$s</xliff:g> archivos seleccionados.</string>
     <string name="category_system">SISTEMA</string>
     <string name="category_app">APLICACIÓN</string>
     <string name="category_binary">BINARIO</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5bfb5731..3cd013b3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -128,12 +128,12 @@
   <string name="fso_properties_dialog_owner">Omistaja:</string>
   <string name="fso_properties_dialog_group">Ryhmä:</string>
   <string name="fso_properties_dialog_others">Muut:</string>
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 kansiota</item>
     <item quantity="one">1 kansio</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> kansiota</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 tiedostoa</item>
     <item quantity="one">1 tiedosto</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> tiedostoa</item>
@@ -254,13 +254,6 @@
   <string name="mime_folder">Kansio</string>
   <string name="mime_symlink">Symlinkki</string>
   <string name="mime_unknown">Tuntematon</string>
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> kansio valittu.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> kansiota valittu.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> tiedosto valittu.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> tiedostoa valittu.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> kansiota ja <xliff:g id="files">%2$s</xliff:g> tiedosto valittu.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> kansio ja <xliff:g id="file2">%2$s</xliff:g> tiedostoa valittu.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> kansiota ja <xliff:g id="files">%2$s</xliff:g> tiedostoa valittu.</string>
   <string name="category_system">JÄRJESTELMÄ</string>
   <string name="category_app">SOVELLUS</string>
   <string name="category_binary">BINÄÄRI</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 33d2c36f..6ec21b52 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -133,12 +133,12 @@
   <string name="fso_properties_dialog_owner">Propriétaire\u00A0:</string>
   <string name="fso_properties_dialog_group">Groupe\u00A0:</string>
   <string name="fso_properties_dialog_others">Autres\u00A0:</string>
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 dossier</item>
     <item quantity="one">1 dossier</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> dossiers</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 fichier</item>
     <item quantity="one">1 fichier</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> fichiers</item>
@@ -285,13 +285,6 @@
   <string name="filetime_format_mode_ddMMyyyy_HHmmss">jj/mm/aaaa hh:mm:ss</string>
   <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/jj/aaaa hh:mm:ss</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">aaaa-mm-jj hh:mm:ss</string>
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> dossier sélectionné</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> dossiers sélectionnés</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fichier sélectionné</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> fichiers sélectionnés</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> dossier et <xliff:g id="files">%2$s</xliff:g> fichier sélectionnés</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> dossier et <xliff:g id="file2">%2$s</xliff:g> fichiers sélectionnés</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> dossiers et <xliff:g id="files">%2$s</xliff:g> fichiers sélectionnés</string>
   <string name="category_system">SYSTEM</string>
   <string name="category_app">APP</string>
   <string name="category_binary">BINARY</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 510b36f8..8ab75d7d 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -129,10 +129,10 @@
     <string name="fso_properties_dialog_owner">Tulajdonos:</string>
     <string name="fso_properties_dialog_group">Csoport:</string>
     <string name="fso_properties_dialog_others">Mások:</string>
-    <plurals name="fso_properties_dialog_folders">
+    <plurals name="n_folders">
       <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> könyvtár</item>
     </plurals>
-    <plurals name="fso_properties_dialog_files">
+    <plurals name="n_files">
       <item quantity="other"><xliff:g id="files">%1$d</xliff:g> fájl</item>
     </plurals>
     <string name="fso_properties_dialog_include_in_media_scan">Médiakeresés kihagyása:</string>
@@ -265,13 +265,6 @@
     <string name="filetime_format_mode_ddMMyyyy_HHmmss">nn/hh/éééé óó:pp:mm</string>
     <string name="filetime_format_mode_MMddyyyy_HHmmss">hh/nn/éééé óó:pp:mm</string>
     <string name="filetime_format_mode_yyyyMMdd_HHmmss">éééé/hh/nn óó:pp:mm</string>
-    <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> könyvtár kiválasztva.</string>
-    <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> könyvtár kiválasztva.</string>
-    <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fájl kiválasztva.</string>
-    <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> fájl kiválasztva.</string>
-    <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> könyvtár és <xliff:g id="files">%2$s</xliff:g> fájl kiválasztva.</string>
-    <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> könyvtár és <xliff:g id="file2">%2$s</xliff:g> fájl kiválasztva.</string>
-    <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> könyvtár és <xliff:g id="files">%2$s</xliff:g> fájl kiválasztva.</string>
     <string name="category_system">RENDSZER</string>
     <string name="category_app">ALKALMAZÁS</string>
     <string name="category_binary">BINÁRIS</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 7b62842e..72d485de 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -128,12 +128,12 @@
   <string name="fso_properties_dialog_owner">Proprietario:</string>
   <string name="fso_properties_dialog_group">Gruppo:</string>
   <string name="fso_properties_dialog_others">Altri:</string>
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 cartelle</item>
     <item quantity="one">1 cartella</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> cartelle</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 file</item>
     <item quantity="one">1 file</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> file</item>
@@ -281,13 +281,6 @@
   <string name="mime_unknown">Sconosciuto</string>
   <string name="filetime_format_mode_system">Definito da sistema</string>
   <string name="filetime_format_mode_locale">Definito da localizzazione</string>
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> cartella selezionata.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> cartelle selezionate.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> file selezionato.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> file selezionati.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> cartelle e <xliff:g id="files">%2$s</xliff:g> file selezionati.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> cartella e <xliff:g id="file2">%2$s</xliff:g> file selezionati.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> cartelle e <xliff:g id="files">%2$s</xliff:g> file selezionati.</string>
   <string name="category_system">SISTEMA</string>
   <string name="category_app">APP</string>
   <string name="category_binary">BINARIO</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 118f8a75..44e92504 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -258,13 +258,13 @@
   <!-- Fso Properties Dialog * Others Label -->
   <string name="fso_properties_dialog_others">אחרים:</string>
   <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">אין תיקיות</item>
     <item quantity="one">תיקייה אחת</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> תיקיות</item>
   </plurals>
   <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">אין קבצים</item>
     <item quantity="one">קובץ אחד</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> קבצים</item>
@@ -523,17 +523,6 @@
   <!-- Mime/Types * Unknown -->
   <string name="mime_unknown">לא ידוע</string>
 
-  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
-     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
-     Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder">תיקייה אחת נבחרה.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> תיקיות נבחרו.</string>
-  <string name="selection_one_file">קובץ אחד נבחר.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> קבצים נבחרו.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> תיקיות וקובץ אחד נבחרו.</string>
-  <string name="selection_one_folder_other_files">תיקייה אחת ו-<xliff:g id="file2">%2$s</xliff:g> קבצים נבחרו.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> תיקיות ו-<xliff:g id="files">%2$s</xliff:g> קבצים נבחרו.</string>
-
   <!-- Category descriptions -->
   <string name="category_system">מערכת</string>
   <string name="category_app">יישום</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b08fbac5..9cb575b7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -262,13 +262,13 @@
   <!-- Fso Properties Dialog * Others Label -->
   <string name="fso_properties_dialog_others">その他:</string>
   <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 フォルダ</item>
     <item quantity="one">1 フォルダ</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> フォルダ</item>
   </plurals>
   <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 ファイル</item>
     <item quantity="one">1 ファイル</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> ファイル</item>
@@ -520,20 +520,6 @@
   <!-- Mime/Types * Unknown -->
   <string name="mime_unknown">不明</string>
 
-  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
-     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
-     Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> つのフォルダを選択中</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> つのフォルダを選択中</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> つのファイルを選択中</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> つのファイルを選択中</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> つのフォルダと
-    <xliff:g id="files">%2$s</xliff:g> つのファイルを選択中</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> つのフォルダと
-    <xliff:g id="file2">%2$s</xliff:g> つのファイルを選択中</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> つのフォルダと
-    and <xliff:g id="files">%2$s</xliff:g> つのファイルを選択中</string>
-
   <!-- Category descriptions -->
   <string name="category_system">システム</string>
   <string name="category_app">アプリ</string>
diff --git a/res/values-nb/plurals.xml b/res/values-nb/plurals.xml
index 1d4d74a7..4859343e 100644
--- a/res/values-nb/plurals.xml
+++ b/res/values-nb/plurals.xml
@@ -14,12 +14,12 @@
      limitations under the License.
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <plurals name="fso_properties_dialog_folders">
+    <plurals name="n_folders">
         <item quantity="zero">0 mapper</item>
         <item quantity="one">1 mappe</item>
         <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> mapper</item>
     </plurals>
-    <plurals name="fso_properties_dialog_files">
+    <plurals name="n_files">
         <item quantity="zero">0 filer</item>
         <item quantity="one">1 fil</item>
         <item quantity="other"><xliff:g id="files">%1$d</xliff:g> filer</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 32134bcd..630c6a8c 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -261,13 +261,6 @@
     <string name="filetime_format_mode_ddMMyyyy_HHmmss">dd/mm/åååå tt:mm:ss</string>
     <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/åååå tt:mm:ss</string>
     <string name="filetime_format_mode_yyyyMMdd_HHmmss">åååå-mm-dd tt:mm:ss</string>
-    <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> mappe valgt.</string>
-    <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> mapper valgt.</string>
-    <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fil valgt.</string>
-    <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> filer valgt.</string>
-    <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> mapper og <xliff:g id="files">%2$s</xliff:g> fil valgt.</string>
-    <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> mappe og <xliff:g id="file2">%2$s</xliff:g> filer valgt.</string>
-    <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> mapper og <xliff:g id="files">%2$s</xliff:g> filer valgt.</string>
     <string name="category_system">SYSTEM</string>
     <string name="category_app">APP</string>
     <string name="category_binary">BINÆR</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 64794183..da38b7cd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -132,12 +132,12 @@
     <string name="fso_properties_dialog_owner">Eigenaar:</string>
     <string name="fso_properties_dialog_group">Groep:</string>
     <string name="fso_properties_dialog_others">Andere:</string>
-    <plurals name="fso_properties_dialog_folders">
+    <plurals name="n_folders">
         <item quantity="zero">0 mappen</item>
         <item quantity="one">1 map</item>
         <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> mappen</item>
     </plurals>
-    <plurals name="fso_properties_dialog_files">
+    <plurals name="n_files">
         <item quantity="zero">0 bestanden</item>
         <item quantity="one">1 bestand</item>
         <item quantity="other"><xliff:g id="files">%1$d</xliff:g> bestanden</item>
@@ -273,13 +273,6 @@
     <string name="filetime_format_mode_ddMMyyyy_HHmmss">dd/mm/yyyy hh:mm:ss</string>
     <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
     <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>
-    <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> map geselecteerd.</string>
-    <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> mappen geselecteerd.</string>
-    <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> bestand geselecteerd.</string>
-    <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> bestanden geselecteerd.</string>
-    <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> mappen en <xliff:g id="files">%2$s</xliff:g> bestand geselecteerd.</string>
-    <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> map en <xliff:g id="file2">%2$s</xliff:g> bestand geselecteerd.</string>
-    <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> mappen en <xliff:g id="files">%2$s</xliff:g> bestanden geselecteerd.</string>
     <string name="category_system">SYSTEEM</string>
     <string name="category_app">APP</string>
     <string name="category_binary">BINAIR</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f1f1836a..217c8d96 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -140,12 +140,12 @@
   <string name="fso_properties_dialog_owner">Właściciel:</string>
   <string name="fso_properties_dialog_group">Grupa:</string>
   <string name="fso_properties_dialog_others">Inni:</string>
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 folderów</item>
     <item quantity="one">1 folder</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> folderów</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 plików</item>
     <item quantity="one">1 plik</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> plików</item>
@@ -304,14 +304,6 @@
   <string name="mime_symlink">Dowiązanie</string>
   <string name="mime_unknown">Nieznane</string>
 
-  <string name="selection_one_folder">Wybrano <xliff:g id="folders">%1$s</xliff:g> folder.</string>
-  <string name="selection_other_folders">Wybrano <xliff:g id="folders">%1$s</xliff:g> folderów.</string>
-  <string name="selection_one_file">Wybrano <xliff:g id="files">%1$s</xliff:g> plik.</string>
-  <string name="selection_other_files">Wybrano <xliff:g id="files">%1$s</xliff:g> plików.</string>
-  <string name="selection_other_folders_one_file">Wybrano <xliff:g id="folders">%1$s</xliff:g> folderów i <xliff:g id="files">%2$s</xliff:g> plik.</string>
-  <string name="selection_one_folder_other_files">Wybrano <xliff:g id="folder2">%1$s</xliff:g> folder i <xliff:g id="file2">%2$s</xliff:g> plików.</string>
-  <string name="selection_other_folders_other_files">Wybrano <xliff:g id="folder2">%1$s</xliff:g> folderów i <xliff:g id="files">%2$s</xliff:g> plików</string>
-
   <string name="category_system">SYSTEM</string>
   <string name="category_app">APLIKACJE</string>
   <string name="category_binary">PLIKI BINARNE</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e6ba35b7..5b233110 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -119,12 +119,12 @@
     <string name="fso_properties_dialog_owner">Proprietário:</string>
     <string name="fso_properties_dialog_group">Grupo:</string>
     <string name="fso_properties_dialog_others">Outros:</string>
-    <plurals name="fso_properties_dialog_folders">
+    <plurals name="n_folders">
         <item quantity="zero">0 pastas</item>
         <item quantity="one">1 pasta</item>
         <item quantity="other"><xliff:g id="folders" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$d</xliff:g> pastas</item>
     </plurals>
-    <plurals name="fso_properties_dialog_files">
+    <plurals name="n_files">
         <item quantity="zero">0 arquivos</item>
         <item quantity="one">1 arquivos</item>
         <item quantity="other"><xliff:g id="files" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$d</xliff:g> arquivos</item>
@@ -237,14 +237,6 @@
     <string name="mime_folder">Pasta</string>
     <string name="mime_symlink">Link simbólico</string>
     <string name="mime_unknown">Desconhecido</string>
-    <string name="selection_one_folder"><xliff:g id="folders" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> pasta selecionada</string>
-    <string name="selection_other_folders"><xliff:g id="folders" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> pastas selecionadas</string>
-    <string name="selection_one_file"><xliff:g id="files" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> arquivo selecionado</string>
-    <string name="selection_other_files"><xliff:g id="files" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> arquivos selecionados</string>
-    <string name="selection_one_folder_one_file"><xliff:g id="folders" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> pasta e <xliff:g id="files" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%2$s</xliff:g> arquivo selecionados</string>
-    <string name="selection_other_folders_one_file"><xliff:g id="folders" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> pastas e <xliff:g id="files" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%2$s</xliff:g> arquivo selecionados</string>
-    <string name="selection_one_folder_other_files"><xliff:g id="folder2" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> pasta e <xliff:g id="file2" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%2$s</xliff:g> arquivos selecionados</string>
-    <string name="selection_other_folders_other_files"><xliff:g id="folder2" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%1$s</xliff:g> pastas e <xliff:g id="files" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%2$s</xliff:g> arquivos selecionados</string>
     <string name="category_system">SISTEMA</string>
     <string name="category_app">APLICATIVO</string>
     <string name="category_binary">BINÁRIO</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 65b80a72..736d7d47 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -283,13 +283,13 @@
   <string name="fso_delete_nomedia_non_empty_body">Esta pasta contém um ficheiro .nomedia com dados.\n\nDeseja removê-lo?</string>
   
   <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 pastas</item>
     <item quantity="one">1 pasta</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> pastas</item>
   </plurals>
   <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 ficheiros</item>
     <item quantity="one">1 ficheiro</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> ficheiros</item>
@@ -573,20 +573,6 @@
   <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/aaaa hh:mm:ss</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">aaaa-mm-dd hh:mm:ss</string>
 
-  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
-     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
-     Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> pasta seleccionada.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> pastas seleccionada.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> ficheiro seleccionado.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> ficheiros seleccionado.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> pastas e
-    <xliff:g id="files">%2$s</xliff:g> ficheiro seleccionados.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> pasta e
-    <xliff:g id="file2">%2$s</xliff:g> ficheiros seleccionados.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> pastas
-    e <xliff:g id="files">%2$s</xliff:g> ficheiros seleccionados.</string>
-
   <!-- Category descriptions -->
   <string name="category_system">SISTEMA</string>
   <string name="category_app">APLICAÇÃO</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 92a97943..eaa28071 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -113,12 +113,12 @@
   <string name="fso_properties_dialog_owner">Proprietar:</string>
   <string name="fso_properties_dialog_group">Grup:</string>
   <string name="fso_properties_dialog_others">Altele:</string>
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 dosare</item>
     <item quantity="one">1 dosar</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> dosare</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 fişiere</item>
     <item quantity="one">1 fişiere</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> fişiere</item>
@@ -224,13 +224,6 @@
   <string name="mime_folder">Dosar</string>
   <string name="mime_symlink">Legătură simbolică</string>
   <string name="mime_unknown">Necunoscut</string>
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> dosare selectate.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> dosare selectate.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> fişiere selectate.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> fişiere selectate.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> dosare şi<xliff:g id="files">%2$s</xliff:g> fişiere selectate.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> dosare şi<xliff:g id="file2">%2$s</xliff:g> fişiere selectate.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> dosare şi<xliff:g id="files">%2$s</xliff:g> fişiere selectate.</string>
   <string name="category_system">SISTEM</string>
   <string name="category_app">APLICAŢIE</string>
   <string name="category_binary">BINAR</string>
diff --git a/res/values-ru/plurals.xml b/res/values-ru/plurals.xml
index 0eb46b74..10daa869 100644
--- a/res/values-ru/plurals.xml
+++ b/res/values-ru/plurals.xml
@@ -15,13 +15,13 @@
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 папок</item>
     <item quantity="one">1 папка</item>
     <item quantity="other">папок: <xliff:g id="folders">%1$d</xliff:g></item>
   </plurals>
   <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 файлов</item>
     <item quantity="one">1 файл</item>
     <item quantity="other">файлов: <xliff:g id="files">%1$d</xliff:g></item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3aa4f19a..0e1a154d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -307,15 +307,6 @@
   <string name="filetime_format_mode_MMddyyyy_HHmmss">мм/дд/гггг чч:мм:сс</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">гггг-мм-дд чч:мм:сс</string>
 
-  <string name="selection_one_folder">Выбрана <xliff:g id="folders">%1$s</xliff:g> папка</string>
-  <string name="selection_other_folders">Выбрано папок: <xliff:g id="folders">%1$s</xliff:g></string>
-  <string name="selection_one_file">Выбран <xliff:g id="files">%1$s</xliff:g> файл</string>
-  <string name="selection_other_files">Выбрано файлов: <xliff:g id="files">%1$s</xliff:g></string>
-  <string name="selection_one_folder_one_file">Выбрана <xliff:g id="folders">%1$s</xliff:g> папка и <xliff:g id="files">%2$s</xliff:g> файл</string>
-  <string name="selection_other_folders_one_file">Выбрано папок: <xliff:g id="folders">%1$s</xliff:g> и <xliff:g id="files">%2$s</xliff:g> файл</string>
-  <string name="selection_one_folder_other_files">Выбрана <xliff:g id="folder2">%1$s</xliff:g> папка и файлов: <xliff:g id="file2">%2$s</xliff:g></string>
-  <string name="selection_other_folders_other_files">Выбрано папок: <xliff:g id="folder2">%1$s</xliff:g> и файлов: <xliff:g id="files">%2$s</xliff:g></string>
-
   <string name="category_system">СИСТЕМА</string>
   <string name="category_app">ПРИЛОЖЕНИЕ</string>
   <string name="category_binary">ДВОИЧНЫЙ</string>
diff --git a/res/values-sk/plurals.xml b/res/values-sk/plurals.xml
index 93cb5af5..3c62ac09 100644
--- a/res/values-sk/plurals.xml
+++ b/res/values-sk/plurals.xml
@@ -15,14 +15,14 @@
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 priečinkov</item>
     <item quantity="one">1 priečinok</item>
     <item quantity="few"><xliff:g id="folders">%1$d</xliff:g> priečinky</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> priečinkov</item>
   </plurals>
   <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 súborov</item>
     <item quantity="one">1 súbor</item>
     <item quantity="few"><xliff:g id="files">%1$d</xliff:g> súbory</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index afad43d3..8bda7a5f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -539,17 +539,6 @@
   <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>
 
-  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
-     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
-     Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> vybraný priečinok.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> vybrané(-ých) priečinky(-ov).</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> vybraný súbor.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> vybrané(-ých) súbory(-ov).</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> vybrané(-ých) priečinky(-ov) a <xliff:g id="files">%2$s</xliff:g> súbory(-ov).</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> vybraný priečinok a <xliff:g id="file2">%2$s</xliff:g> súbory(-ov).</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> vybrané(-ých) priečinky(-ov) a <xliff:g id="files">%2$s</xliff:g> súbor.</string>
-
   <!-- Category descriptions -->
   <string name="category_system">SYSTÉM</string>
   <string name="category_app">APLIKÁCIA</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 8e657327..a3b44e38 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -282,13 +282,13 @@
   <!-- Fso Properties Dialog * Others Label -->
   <string name="fso_properties_dialog_others">Остали:</string>
   <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 фолдера</item>
     <item quantity="one">1 фолдер</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> фолдера</item>
   </plurals>
   <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 фајлова</item>
     <item quantity="one">1 фајл</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> фајлова</item>
@@ -564,20 +564,6 @@
   <!-- Mime/Types * Unknown -->
   <string name="mime_unknown">Непознато</string>
 
-  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
-     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
-     Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> фолдер изабран.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> фолдера изабрано.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> фајл изабран.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> фајлова изабрано.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> фолдера и
-    <xliff:g id="files">%2$s</xliff:g> фајл изабрано.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> фолдер и
-    <xliff:g id="file2">%2$s</xliff:g> фајлова изабрано.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> фолдера
-    и <xliff:g id="files">%2$s</xliff:g> фајлова изабрано.</string>
-
   <!-- Category descriptions -->
   <string name="category_system">СИСТЕМ</string>
   <string name="category_app">ПРОГРАМ</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 0ff57ac1..850efc4d 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -296,14 +296,6 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="mime_symlink">Посилання</string>
     <string name="mime_unknown">Невідомо</string>
 
-    <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> папка виділена</string>
-    <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> папки(-ок) виділено</string>
-    <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> файл виділений</string>
-    <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> файлів(-и) виділено</string>
-    <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> папки(-ок,-а) і <xliff:g id="files">%2$s</xliff:g> файл виділений</string>
-    <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> папка і <xliff:g id="file2">%2$s</xliff:g> файлів(-и) виділено</string>
-    <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> папки(-ок,-а) і <xliff:g id="files">%2$s</xliff:g> файлів(-и) виділено</string>
-
     <string name="category_system">СИСТЕМА</string>
     <string name="category_app">ДОДАТОК</string>
     <string name="category_binary">ДВІЙКОВИЙ</string>
diff --git a/res/values-zh-rCN/plurals.xml b/res/values-zh-rCN/plurals.xml
index e5aa1c2a..f02240ec 100644
--- a/res/values-zh-rCN/plurals.xml
+++ b/res/values-zh-rCN/plurals.xml
@@ -14,12 +14,12 @@
      limitations under the License.
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <plurals name="fso_properties_dialog_folders">
+  <plurals name="n_folders">
     <item quantity="zero">0 个文件夹</item>
     <item quantity="one">1 个文件夹</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> 个文件夹</item>
   </plurals>
-  <plurals name="fso_properties_dialog_files">
+  <plurals name="n_files">
     <item quantity="zero">0 个文件</item>
     <item quantity="one">1 个文件</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> 个文件</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ca42d4aa..f7ab6e3e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -323,16 +323,6 @@
   <string name="filetime_format_mode_MMddyyyy_HHmmss">月/日/年 时:分:秒</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">年-月-日 时:分:秒</string>
 
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> 个文件夹被选.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> 个文件夹被选.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> 个文件被选.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> 个文件被选.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> 个文件夹与
-    <xliff:g id="files">%2$s</xliff:g> 个文件被选.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> 个文件夹与
-    <xliff:g id="file2">%2$s</xliff:g> 个文件被选.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> 个文件夹与 <xliff:g id="files">%2$s</xliff:g> 个文件被选.</string>
-
   <string name="category_system">系统</string>
   <string name="category_app">程序</string>
   <string name="category_binary">二进制</string>
diff --git a/res/values/plurals.xml b/res/values/plurals.xml
index 8028b268..27f67bf7 100644
--- a/res/values/plurals.xml
+++ b/res/values/plurals.xml
@@ -14,21 +14,16 @@
      limitations under the License.
  -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Fso Properties Dialog * Folders -->
-  <plurals name="fso_properties_dialog_folders">
-    <item quantity="zero">0 folders</item>
+  <plurals name="n_folders">
     <item quantity="one">1 folder</item>
     <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> folders</item>
   </plurals>
-  <!-- Fso Properties Dialog * Files -->
-  <plurals name="fso_properties_dialog_files">
-    <item quantity="zero">0 files</item>
-    <item quantity="one">1 files</item>
+  <plurals name="n_files">
+    <item quantity="one">1 file</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> files</item>
   </plurals>
   <!-- Search * Search found items -->
   <plurals name="search_found_items">
-    <item quantity="zero">No items found</item>
     <item quantity="one">1 item found</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> items found</item>
   </plurals>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 17790fb8..5c647229 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -592,21 +592,11 @@
   <string name="filetime_format_mode_MMddyyyy_HHmmss">mm/dd/yyyy hh:mm:ss</string>
   <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string>
 
-  <!-- Selection. All possibilities. [1 folder; >1 folders; 1 file; >1 files;
-     >1 folders and 1 file; 1 folder and >1 files; >1 folders and >1 files]
-     Avoid using plural item because is more complex to achieved all strings -->
-  <string name="selection_one_folder"><xliff:g id="folders">%1$s</xliff:g> folder selected.</string>
-  <string name="selection_other_folders"><xliff:g id="folders">%1$s</xliff:g> folders selected.</string>
-  <string name="selection_one_file"><xliff:g id="files">%1$s</xliff:g> file selected.</string>
-  <string name="selection_other_files"><xliff:g id="files">%1$s</xliff:g> files selected.</string>
-  <string name="selection_one_folder_one_file"><xliff:g id="folders">%1$s</xliff:g> folder and
-    <xliff:g id="files">%2$s</xliff:g> file selected.</string>
-  <string name="selection_other_folders_one_file"><xliff:g id="folders">%1$s</xliff:g> folders and
-    <xliff:g id="files">%2$s</xliff:g> file selected.</string>
-  <string name="selection_one_folder_other_files"><xliff:g id="folder2">%1$s</xliff:g> folder and
-    <xliff:g id="file2">%2$s</xliff:g> files selected.</string>
-  <string name="selection_other_folders_other_files"><xliff:g id="folder2">%1$s</xliff:g> folders
-    and <xliff:g id="files">%2$s</xliff:g> files selected.</string>
+  <!-- Selection. -->
+  <!-- For example "2 files selected." or "2 folders selected." -->
+  <string name="selection_folders_or_files"><xliff:g id="items">%1$s</xliff:g> selected.</string>
+  <!-- For example "2 folders and 1 file selected." -->
+  <string name="selection_folders_and_files"><xliff:g id="folders">%1$s</xliff:g> and <xliff:g id="files">%2$s</xliff:g> selected.</string>
 
   <!-- Category descriptions -->
   <string name="category_system">SYSTEM</string>
diff --git a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
index 8408e5fe..975d335d 100644
--- a/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
+++ b/src/com/cyanogenmod/filemanager/ui/dialogs/FsoPropertiesDialog.java
@@ -1132,11 +1132,11 @@ public class FsoPropertiesDialog
 
             // Compute folders and files string
             String folders = res.getQuantityString(
-                                        R.plurals.fso_properties_dialog_folders,
+                                        R.plurals.n_folders,
                                         this.mFolderUsage.getNumberOfFolders(),
                                         Integer.valueOf(this.mFolderUsage.getNumberOfFolders()));
             String files = res.getQuantityString(
-                                        R.plurals.fso_properties_dialog_files,
+                                        R.plurals.n_files,
                                         this.mFolderUsage.getNumberOfFiles(),
                                         Integer.valueOf(this.mFolderUsage.getNumberOfFiles()));
             final String contains = res.getString(
diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java
index 19cb33c7..630b6b04 100644
--- a/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java
+++ b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java
@@ -124,38 +124,18 @@ public class SelectionView extends LinearLayout {
         }
 
         // Get the string
-        if (folders == 1 && files == 0) {
-            return getContext().getString(R.string.selection_one_folder, Integer.valueOf(folders));
+        String nFoldersString = getContext().getResources().getQuantityString(R.plurals.n_folders, folders, folders);
+        String nFilesString = getContext().getResources().getQuantityString(R.plurals.n_files, files, files);
+ 
+        if (files == 0) {
+            return getContext().getString(R.string.selection_folders_or_files, nFoldersString);
         }
-        if (folders > 1 && files == 0) {
-            return getContext().getString(
-                    R.string.selection_other_folders, Integer.valueOf(folders));
-        }
-        if (folders == 0 && files == 1) {
-            return getContext().getString(R.string.selection_one_file, Integer.valueOf(files));
-        }
-        if (folders == 0 && files > 1) {
-            return getContext().getString(
-                    R.string.selection_other_files, Integer.valueOf(files));
-        }
-        if (folders == 1 && files == 1) {
-            return getContext().getString(
-                    R.string.selection_one_folder_one_file,
-                    Integer.valueOf(folders), Integer.valueOf(files));
-        }
-        if (folders > 1 && files == 1) {
-            return getContext().getString(
-                    R.string.selection_other_folders_one_file,
-                    Integer.valueOf(folders), Integer.valueOf(files));
-        }
-        if (folders == 1 && files > 1) {
-            return getContext().getString(
-                    R.string.selection_one_folder_other_files,
-                    Integer.valueOf(folders), Integer.valueOf(files));
+
+        if (folders == 0) {
+            return getContext().getString(R.string.selection_folders_or_files, nFilesString);
         }
-        return getContext().getString(
-                R.string.selection_other_folders_other_files,
-                Integer.valueOf(folders), Integer.valueOf(files));
+
+        return getContext().getString(R.string.selection_folders_and_files, nFoldersString, nFilesString);
     }
 
     /**