Apollo: update translations

Change-Id: If37cf5b3e6cbefa9dedf77b8c8c93a0bfb1772a6

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index c4b458d..e70449c 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 Andrew Neal
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,8 +13,8 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
- -->
-<resources>
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- Main TitlePageIndicator titles -->
     <string-array name="page_titles" translatable="false">

diff --git a/res/values/plurals.xml b/res/values/plurals.xml
index ade024e..1e7c7d2 100644 (file)
--- a/res/values/plurals.xml
+++ b/res/values/plurals.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 Andrew Neal
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,86 +13,59 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      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">
-
     <!-- Used to indicate the number of artists -->
     <plurals name="Nartists">
-
-        <!-- Only one artist -->
-        <item quantity="one">1 artist</item>
-        <!-- More than one artist -->
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> artist</item>
         <item quantity="other"><xliff:g id="count">%d</xliff:g> artists</item>
     </plurals>
 
     <!-- Used to indicate the number of albums for an artist -->
     <plurals name="Nalbums">
-
-        <!-- Only one album -->
-        <item quantity="one">1 album</item>
-        <!-- More than one album -->
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> album</item>
         <item quantity="other"><xliff:g id="count">%d</xliff:g> albums</item>
     </plurals>
 
     <!-- Used to indicate the number of songs for an album -->
     <plurals name="Nsongs">
-
-        <!-- Only one song -->
-        <item quantity="one">1 song</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> song</item>
         <item quantity="other"><xliff:g id="count">%d</xliff:g> songs</item>
     </plurals>
 
     <!-- Used to indicate the number of genres -->
     <plurals name="Ngenres">
-
-        <!-- Only one genre -->
-        <item quantity="one">1 genre</item>
-        <!-- More than one genre -->
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> genre</item>
         <item quantity="other"><xliff:g id="count">%d</xliff:g> genres</item>
     </plurals>
 
     <!-- Toasts after adding song(s) to playlists -->
     <plurals name="NNNtrackstoplaylist">
-
-        <!-- message shown when one song was added -->
-        <item quantity="one">1 song added to playlist.</item>
-        <!-- message shown when zero or more than one song was added -->
+        <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> song added to playlist.</item>
         <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to playlist.</item>
     </plurals>
 
     <!-- Toasts after removing song(s) from playlists -->
     <plurals name="NNNtracksfromplaylist">
-
-        <!-- message shown when one song was removed -->
-        <item quantity="one">1 song removed from playlist.</item>
-        <!-- message shown when zero or more than one song was removed -->
+        <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> song removed from playlist.</item>
         <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs removed from playlist.</item>
     </plurals>
 
     <!-- Toasts after adding song(s) to queue -->
     <plurals name="NNNtrackstoqueue">
-
-        <!-- message shown when one song was added -->
-        <item quantity="one">1 song added to the queue.</item>
-        <!-- message shown when zero or more than one song was added -->
+        <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> song added to the queue.</item>
         <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to the queue.</item>
     </plurals>
 
     <!-- Toasts after adding song(s) to the favorites list -->
     <plurals name="NNNtrackstofavorites">
-
-        <!-- message shown when one song was added -->
-        <item quantity="one">1 song added to Favorites.</item>
-        <!-- message shown when zero or more than one song was added -->
+        <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> song added to Favorites.</item>
         <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> songs added to Favorites.</item>
     </plurals>
 
     <!-- Toast confirming that song(s) was/were deleted. -->
     <plurals name="NNNtracksdeleted">
-
-        <!-- delete confirmation message for 1 song -->
-        <item quantity="one">1 song was deleted.</item>
-        <!-- delete confirmation message for 0 or more than 1 songs -->
+        <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> song was deleted.</item>
         <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> songs were deleted.</item>
     </plurals>
 

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9c99f1c..c9a166f 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 Andrew Neal
+<!--
+     Copyright (C) 2012-2013 Andrew Neal
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -12,7 +13,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      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">
 
     <string name="app_name">Apollo</string>