CMFileManager: Simplify selection string creation

Change-Id: I583ca10561882a6768b8af91914bf4ca3224caa7

7 files changed, 9 insertions, 30 deletions

diff --git a/res/values-cs/plurals.xml b/res/values-cs/plurals.xml
index f525910e..1656644a 100644
--- a/res/values-cs/plurals.xml
+++ b/res/values-cs/plurals.xml
@@ -31,10 +31,4 @@
         <item quantity="few">Nalezeny <xliff:g id="count">%d</xliff:g> položky</item>
         <item quantity="other">Nalezeno <xliff:g id="count">%d</xliff:g> položek</item>
     </plurals>
-
-    <plurals name="selection_folders_or_files">
-        <item quantity="one">1 vybrán.</item>
-        <item quantity="few"><xliff:g id="items">%1$s</xliff:g> vybrány.</item>
-        <item quantity="other"><xliff:g id="items">%1$s</xliff:g> vybraných.</item>
-    </plurals>
 </resources>
diff --git a/res/values-el/plurals.xml b/res/values-el/plurals.xml
index 301c2966..2a154205 100644
--- a/res/values-el/plurals.xml
+++ b/res/values-el/plurals.xml
@@ -22,14 +22,8 @@
     <item quantity="one">1 αρχείο</item>
     <item quantity="other"><xliff:g id="files">%1$d</xliff:g> αρχεία</item>
   </plurals>
-  <!-- Search * Search found items -->
   <plurals name="search_found_items">
     <item quantity="one">Βρέθηκε 1 αντικείμενο</item>
     <item quantity="other">Βρέθηκαν <xliff:g id="count">%d</xliff:g> αντικείμενα</item>
   </plurals>
-  <!-- Selection -->
-  <plurals name="selection_folders_or_files">
-    <item quantity="one">Επιλέχθηκε <xliff:g id="items">%1$s</xliff:g>.</item>
-    <item quantity="other">Επιλέχθηκαν <xliff:g id="items">%1$s</xliff:g>.</item>
-  </plurals>
 </resources>
diff --git a/res/values-es/plurals.xml b/res/values-es/plurals.xml
index 9122a5ba..c7f8f75e 100644
--- a/res/values-es/plurals.xml
+++ b/res/values-es/plurals.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <plurals name="n_folders">
         <item quantity="one">1 carpeta</item>
@@ -27,7 +26,4 @@
         <item quantity="one">1 elemento encontrado</item>
         <item quantity="other"><xliff:g id="count">%d</xliff:g> elementos encontrados</item>
     </plurals>
-    <plurals name="selection_folders_or_files">
-        <item quantity="other"><xliff:g id="items">%1$s</xliff:g> seleccionados.</item>
-    </plurals>
 </resources>
diff --git a/res/values-hu/plurals.xml b/res/values-hu/plurals.xml
index 8322113c..dcad5567 100644
--- a/res/values-hu/plurals.xml
+++ b/res/values-hu/plurals.xml
@@ -23,7 +23,4 @@
   <plurals name="search_found_items">
     <item quantity="other"><xliff:g id="count">%d</xliff:g> találat</item>
   </plurals>
-  <plurals name="selection_folders_or_files">
-    <item quantity="other"><xliff:g id="items">%1$s</xliff:g> kiválasztva.</item>
-  </plurals>
 </resources>
diff --git a/res/values-nl/plurals.xml b/res/values-nl/plurals.xml
index 3888f517..69338676 100644
--- a/res/values-nl/plurals.xml
+++ b/res/values-nl/plurals.xml
@@ -28,8 +28,4 @@
     <item quantity="one">1 item gevonden</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> items gevonden</item>
   </plurals>
-
-  <plurals name="selection_folders_or_files">
-    <item quantity="other"><xliff:g id="items">%1$s</xliff:g> geselecteerd.</item>
-  </plurals>
 </resources>
diff --git a/res/values-pt-rBR/plurals.xml b/res/values-pt-rBR/plurals.xml
index 07627317..888ef994 100644
--- a/res/values-pt-rBR/plurals.xml
+++ b/res/values-pt-rBR/plurals.xml
@@ -26,7 +26,4 @@
         <item quantity="one">1 item encontrado</item>
         <item quantity="other"><xliff:g id="count" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> itens encontrados</item>
     </plurals>
-    <plurals name="selection_folders_or_files">
-        <item quantity="other"><xliff:g id="items">%1$s</xliff:g> selecionados.</item>
-    </plurals>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values/plurals.xml b/res/values/plurals.xml
index 78d0db44..fab83dad 100644
--- a/res/values/plurals.xml
+++ b/res/values/plurals.xml
@@ -27,8 +27,13 @@
     <item quantity="one">1 item found</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> items found</item>
   </plurals>
-  <!-- Selection -->
-  <plurals name="selection_folders_or_files">
-    <item quantity="other"><xliff:g id="items">%1$s</xliff:g> selected.</item>
+  <!-- Statusbar text if there are selected folders or files -->
+  <plurals name="selection_folders">
+    <item quantity="one">1 folder selected.</item>
+    <item quantity="other"><xliff:g id="folders">%1$d</xliff:g> folders selected.</item>
+  </plurals>
+  <plurals name="selection_files">
+    <item quantity="one">1 file selected.</item>
+    <item quantity="other"><xliff:g id="files">%1$d</xliff:g> files selected.</item>
   </plurals>
 </resources>