Automatic translation import

Change-Id: Id68c0a1676b7a739d75cbfbab4ca607e37c0bdaa

29 files changed, 164 insertions, 180 deletions

diff --git a/res/values-as-rIN/plurals.xml b/res/values-as-rIN/plurals.xml
index b8fdd88..ceabe5d 100644
--- a/res/values-as-rIN/plurals.xml
+++ b/res/values-as-rIN/plurals.xml
@@ -38,10 +38,6 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> ৰকম</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-be-rBY/plurals.xml b/res/values-be-rBY/plurals.xml
index 410c996..ff50b0f 100644
--- a/res/values-be-rBY/plurals.xml
+++ b/res/values-be-rBY/plurals.xml
@@ -19,68 +19,68 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> выканавец</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> выканаўца</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> выканаўца</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> выканаўцы</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> выканаўцаў</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> альбом</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> альбома</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> альбомы</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> альбомаў</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> трэк</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> трэка</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> трэкі</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> трэкаў</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> жанр</item>
-    <item quantity="few"><xliff:g id="count">%d</xliff:g> жанру</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> жанры</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> жанраў</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g> гадзіна</item>
-    <item quantity="few"><xliff:g id="hours">%d</xliff:g> гадзіны</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g> гадзінаў</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>г</item>
+    <item quantity="few"><xliff:g id="hours">%d</xliff:g>г</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>г</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> хвіліна</item>
-    <item quantity="few"><xliff:g id="minutes">%d</xliff:g> хвіліны</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> хвілінаў</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>х</item>
+    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>х</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>х</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў плэйліст.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка дададзена ў плэйліст.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзена ў плэйліст.</item>
+    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі дададзены ў плэйліст.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзены ў плэйліст.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк выдалены з плэйліста.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка выдалены з плэйліста.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэка выдалены з плэйліста.</item>
+    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі выдалены з плэйліста.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў выдалены з плэйліста.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў чаргу.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка дададзены ў чаргу.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзена ў чаргу.</item>
+    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі дададзены ў чаргу.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзены ў чаргу.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трэк дададзены ў абранае.</item>
-    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трэка дададзены ў абранае.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзена ў абранае.</item>
+    <item quantity="few"><xliff:g id="number" example="3">%d</xliff:g> трэкі дададзены ў абранае.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> трэкаў дададзены ў абранае.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
     <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> трэк выдалены.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete">%d</xliff:g> трэка выдалены.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> трэкаў выдалены.</item>
+    <item quantity="few"><xliff:g id="songs_to_delete" example="3">%d</xliff:g> трэкі выдалены.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete" example="27">%d</xliff:g> трэкаў выдалены.</item>
   </plurals>
 </resources>
diff --git a/res/values-bg/plurals.xml b/res/values-bg/plurals.xml
index 0c886bf..a41ddd0 100644
--- a/res/values-bg/plurals.xml
+++ b/res/values-bg/plurals.xml
@@ -19,13 +19,13 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d </xliff:g> изпълнител</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> изпълнител</item>
     <item quantity="other"><xliff:g id="count">%d </xliff:g> изпълнители</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d </xliff:g> албум</item>
-    <item quantity="other"><xliff:g id="count">%d </xliff:g> албуми</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> албум</item>
+    <item quantity="other"><xliff:g id="count">%d </xliff:g> албума</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
@@ -34,13 +34,13 @@
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d </xliff:g> жанр</item>
-    <item quantity="other"><xliff:g id="count">%d </xliff:g> жанрове</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> жанр</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> жанра</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g> ч.</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g> ч.</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g> ч</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g> ч</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
@@ -55,11 +55,11 @@
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d </xliff:g> песен е премахната от списъка за изпълнение.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d </xliff:g> песени са премахнати от списъка за изпълнение.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d </xliff:g> песни са премахнати от списъка за изпълнение.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> песен е добавена към опашката.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d </xliff:g> песен е добавена към опашката.</item>
     <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> песни са добавени към опашката.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
diff --git a/res/values-de/plurals.xml b/res/values-de/plurals.xml
index 43ad243..abe4ec8 100644
--- a/res/values-de/plurals.xml
+++ b/res/values-de/plurals.xml
@@ -44,8 +44,8 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> Min.</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> Min.</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> m</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-eo/plurals.xml b/res/values-eo/plurals.xml
index 6bb5535..9827780 100644
--- a/res/values-eo/plurals.xml
+++ b/res/values-eo/plurals.xml
@@ -18,20 +18,8 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> artisto</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> artistoj</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> albumo</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> albumoj</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> kanto</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> kantoj</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
   <!-- Used to show a shortened version of hours-->
   <!-- Used to show a shortened version of minutes -->
diff --git a/res/values-es-rUS/plurals.xml b/res/values-es-rUS/plurals.xml
index 0399111..b623606 100644
--- a/res/values-es-rUS/plurals.xml
+++ b/res/values-es-rUS/plurals.xml
@@ -19,23 +19,23 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g>artista</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>artistas</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> artista</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> artistas</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g>álbum</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>álbumes</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> álbum</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> álbumes</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g>canción</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>canciones</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> canción</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> canciones</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g>género</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g>géneros</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> género</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> géneros</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
@@ -44,13 +44,13 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min</item>
     <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción añadida a la lista de reproducción.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> canciones añadidas a la lista de reproducción.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> canciones añadidas a la lista de reproducción.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
@@ -65,11 +65,11 @@
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción añadida a favoritos.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> canciones añadidas a favoritos.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> canciones añadidas a favoritos.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g>la canción fue eliminada.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g>las canciones fueron eliminadas.</item>
+    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> canción fue eliminada.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> canciones fueron eliminadas.</item>
   </plurals>
 </resources>
diff --git a/res/values-es/plurals.xml b/res/values-es/plurals.xml
index 39bc749..b623606 100644
--- a/res/values-es/plurals.xml
+++ b/res/values-es/plurals.xml
@@ -45,7 +45,7 @@
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
     <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>mins</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-gl-rES/plurals.xml b/res/values-gl-rES/plurals.xml
index b5968a2..6136aaf 100644
--- a/res/values-gl-rES/plurals.xml
+++ b/res/values-gl-rES/plurals.xml
@@ -30,12 +30,12 @@
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> canción</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> cancións</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> canciones</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> xénero</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> xéneros</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> genero</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> generos</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
@@ -49,27 +49,27 @@
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción engadida á lista.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> cancións engadidas á lista.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción añadida á lista de reproducción.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> cancións añadida á lista de reproducción.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción retirada da lista.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> cancións retiradas da lista.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción eliminada dá lista de reproducción.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> cancións eliminadas dá lista de reproducción.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción engadida á cola.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> cancións engadidas á cola.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción añadida á cola de reproducción.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> cancións añadidas á cola de reproducción.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción engadida a favoritos.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> cancións engadidas a favoritos.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> canción añadida a favoritos.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> cancións añadidas a favoritos.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> canción eliminada.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> cancións eliminadas.</item>
+    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> canción foi eliminada.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> cancións foron eliminadas.</item>
   </plurals>
 </resources>
diff --git a/res/values-gu-rIN/plurals.xml b/res/values-gu-rIN/plurals.xml
index 2179a4a..ef257e4 100644
--- a/res/values-gu-rIN/plurals.xml
+++ b/res/values-gu-rIN/plurals.xml
@@ -38,6 +38,10 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> ઝાનરો</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
+  <plurals name="Nhours">
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g> કલાક</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g> કલાક</item>
+  </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
     <item quantity="one"><xliff:g id="hours">%d</xliff:g>મિનીટ</item>
diff --git a/res/values-hr/plurals.xml b/res/values-hr/plurals.xml
index 039fc65..70b74b0 100644
--- a/res/values-hr/plurals.xml
+++ b/res/values-hr/plurals.xml
@@ -43,21 +43,21 @@
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g> h</item>
-    <item quantity="few"><xliff:g id="hours">%d </xliff:g> h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g> h</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="few"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> m</item>
-    <item quantity="few"><xliff:g id="minutes">%d </xliff:g> m</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> m</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="few"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> pjesma dodana na popis za reproduciranje.</item>
     <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> pjesme dodane na popis za reproduciranje.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d </xliff:g> pjesme dodao na popis za reproduciranje.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> pjesama dodano na popis za reproduciranje.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
@@ -80,7 +80,7 @@
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
     <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> pjesma je izbrisana.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete">%d</xliff:g> pjesme su izbrisane.</item>
+    <item quantity="few"><xliff:g id="songs_to_delete" example="2">%d</xliff:g> pjesme su izbrisane.</item>
     <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> pjesama je izbrisano.</item>
   </plurals>
 </resources>
diff --git a/res/values-in/plurals.xml b/res/values-in/plurals.xml
index b36de92..94e3c53 100644
--- a/res/values-in/plurals.xml
+++ b/res/values-in/plurals.xml
@@ -31,7 +31,7 @@
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> aliran</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> genre</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
diff --git a/res/values-iw/plurals.xml b/res/values-iw/plurals.xml
index 1c6b4b9..bad0c2e 100644
--- a/res/values-iw/plurals.xml
+++ b/res/values-iw/plurals.xml
@@ -19,7 +19,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one">אמן אחד</item>
+    <item quantity="one">אמן <xliff:g id="count">%d</xliff:g></item>
     <item quantity="two"><xliff:g id="count">%d</xliff:g> אמנים</item>
     <item quantity="many"><xliff:g id="count">%d</xliff:g> אמנים</item>
     <item quantity="other"><xliff:g id="count">%d</xliff:g> אמנים</item>
diff --git a/res/values-ml-rIN/plurals.xml b/res/values-ml-rIN/plurals.xml
index ece042d..a267785 100644
--- a/res/values-ml-rIN/plurals.xml
+++ b/res/values-ml-rIN/plurals.xml
@@ -19,57 +19,57 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
   <plurals name="Nartists">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> ആര്‍ട്ടിസ്റ്റ്</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> ആർട്ടിസ്റ്റുകൾ</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> കലാകാരന്</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> കലാകാരന്മാർ</item>
   </plurals>
   <!-- Used to indicate the number of albums for an artist -->
   <plurals name="Nalbums">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> ആൽബം</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> ആൽബങ്ങൾ</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> ആൽബങ്ങളും</item>
   </plurals>
   <!-- Used to indicate the number of songs for an album -->
   <plurals name="Nsongs">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> ഗാനം</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> ഗാനങ്ങള്‍</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> പാട്ട്</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> പാട്ടുകൾ</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> വിഭാഗം</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> തരങ്ങൾ</item>
+    <item quantity="one"><xliff:g id="count">%d</xliff:g>സംഗീത തരം</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g>സംഗീത തരങ്ങൾ</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>മണിക്കൂര്‍</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>മണികൂറുകള്‍</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g></item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g></item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>മിനിറ്റ്</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>മിനിറ്റുകള്‍</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g></item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g></item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിലേക്ക് ചേർത്തു.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ പ്ലേലിസ്റ്റിലേക്ക് ചേർത്തു.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> പാട്ടുകൾ പ്ലേലിസ്റ്റിലേക്ക് ചേർത്തു.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കി.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കി.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കം.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം പ്ലേലിസ്റ്റിൽ നിന്നും നീക്കം.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം ക്യൂവിലേക്ക് ചേർത്തു.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ ക്യൂവിലേക്ക് ചേർത്തു.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം ക്യൂ ചേർത്തു.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> പാട്ടുകൾ ക്യൂ ചേർത്തു.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
-    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ഗാനം ഇഷ്ടങ്ങളിലേയ്ക്ക് ചേർത്തു.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> ഗാനങ്ങൾ പ്രിയപ്പെട്ടവയിലേക്ക് ചേർത്തു.</item>
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> പാട്ട് പ്രിയപ്പെട്ടവലേക്ക് ചേർത്തു.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> പാട്ടുകൾ പ്രിയപ്പെട്ടവലേക്ക് ചേർത്തു.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
-    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> ഗാനം ഇല്ലാതാക്കി.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> ഗാനങ്ങൾ ഇല്ലാതാക്കി.</item>
+    <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> പാട്ട് ഡിലീറ്റ് ചെയ്തു.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> പാട്ടുകൾ ഇല്ലാതാക്കി.</item>
   </plurals>
 </resources>
diff --git a/res/values-mr-rIN/plurals.xml b/res/values-mr-rIN/plurals.xml
index 43a5b74..12257b7 100644
--- a/res/values-mr-rIN/plurals.xml
+++ b/res/values-mr-rIN/plurals.xml
@@ -39,8 +39,8 @@
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>ता</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>ता</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
diff --git a/res/values-nb/plurals.xml b/res/values-nb/plurals.xml
index b32a23f..dd4e5bd 100644
--- a/res/values-nb/plurals.xml
+++ b/res/values-nb/plurals.xml
@@ -35,7 +35,7 @@
   <!-- Used to indicate the number of genres -->
   <plurals name="Ngenres">
     <item quantity="one"><xliff:g id="count">%d</xliff:g> sjanger</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> sjangere</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> sjangre</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
diff --git a/res/values-or-rIN/plurals.xml b/res/values-or-rIN/plurals.xml
index ce228c1..2cbf7c8 100644
--- a/res/values-or-rIN/plurals.xml
+++ b/res/values-or-rIN/plurals.xml
@@ -38,7 +38,15 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> ଜେନେରେ</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
+  <plurals name="Nhours">
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>ଘଣ୍ଟା</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>h</item>
+  </plurals>
   <!-- Used to show a shortened version of minutes -->
+  <plurals name="Nminutes">
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>ମିନିଟ୍</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
+  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> ଗୀତ ଚାଳନତାଲିକାରେ ଯୋଗ କରାଯାଇଛି।</item>
diff --git a/res/values-pt-rBR/plurals.xml b/res/values-pt-rBR/plurals.xml
index 4cba155..58d335d 100644
--- a/res/values-pt-rBR/plurals.xml
+++ b/res/values-pt-rBR/plurals.xml
@@ -44,8 +44,8 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>min</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>min</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-pt-rPT/plurals.xml b/res/values-pt-rPT/plurals.xml
index 9b13964..2ab9fc7 100644
--- a/res/values-pt-rPT/plurals.xml
+++ b/res/values-pt-rPT/plurals.xml
@@ -44,8 +44,8 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="one"><xliff:g id="minutes">%d</xliff:g> min</item>
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> mins</item>
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
diff --git a/res/values-ro/plurals.xml b/res/values-ro/plurals.xml
index 2b72134..ee6fa62 100644
--- a/res/values-ro/plurals.xml
+++ b/res/values-ro/plurals.xml
@@ -36,6 +36,11 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> melodii</item>
   </plurals>
   <!-- Used to indicate the number of genres -->
+  <plurals name="Ngenres">
+    <item quantity="one"><xliff:g id="count">%d</xliff:g> gen</item>
+    <item quantity="few"><xliff:g id="count">%d</xliff:g> genuri</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> genuri</item>
+  </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
     <item quantity="one"><xliff:g id="hours">%d</xliff:g>o</item>
@@ -49,6 +54,11 @@
     <item quantity="other"><xliff:g id="minutes">%d</xliff:g>m</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
+  <plurals name="NNNtrackstoplaylist">
+    <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> cântec adăugat la lista de redare.</item>
+    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> (de) cântece adăugate la lista de redare.</item>
+    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> (de) cântece adăugate la lista de redare.</item>
+  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> melodie ștearsă din lista de redare.</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ba53bde..76ff6aa 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -132,6 +132,8 @@
   <string name="settings_show_lyrics_summary">Pentru melodii care au un fișier srt</string>
   <string name="settings_shake_to_play">Scuturați pentru a reda</string>
   <string name="settings_shake_to_play_summary">Se agită dispozitivul pentru a reda melodia următoare</string>
+  <string name="settings_lockscreen_album_art">Coperta albumului pe ecranul de blocare</string>
+  <string name="settings_lockscreen_album_art_summary">Înlocuiți fundalul ecranului de blocare cu coperta albumului</string>
   <!-- App widget -->
   <string name="app_widget_small">Muzică: 4 \u00d7 1</string>
   <string name="app_widget_large">Muzică: 4 \u00d7 2</string>
@@ -153,6 +155,7 @@
   <string name="empty_last_added">Melodiile adăugate de dvs în ultima lună vor fi afișate aici.</string>
   <string name="empty_generic_main">Nicio melodie nu a fost găsită</string>
   <string name="empty_generic_secondary">Pentru a copia muzică de pe computer în dispozitivul dvs, folosiți un cablu USB.</string>
+  <string name="empty_queue_main">Nicio melodie în coada de redare</string>
   <string name="empty_queue_secondary">Pentru a adăuga melodii în coada de redare, atingeți meniul de opțiuni pe un cântec, album sau artist și selectați \"Adăugați la coadă\".</string>
   <string name="error_playing_track">Melodia %1$s nu poate fi redată</string>
   <!-- Section Headers -->
diff --git a/res/values-ru/plurals.xml b/res/values-ru/plurals.xml
index 3a56955..6d271c8 100644
--- a/res/values-ru/plurals.xml
+++ b/res/values-ru/plurals.xml
@@ -56,8 +56,8 @@
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в плейлист.</item>
-    <item quantity="few"><xliff:g id="number" example="1">%d</xliff:g> трека добавлены в плейлист.</item>
-    <item quantity="other"><xliff:g id="number" example="1">%d</xliff:g> треков добавлены в плейлист.</item>
+    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в плейлист.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в плейлист.</item>
   </plurals>
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
@@ -68,19 +68,19 @@
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в очередь.</item>
-    <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> трека добавлены в очередь.</item>
-    <item quantity="other"><xliff:g id="number" example="5">%d</xliff:g> треков добавлены в очередь.</item>
+    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в очередь.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в очередь.</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> трек добавлен в избранное.</item>
-    <item quantity="few"><xliff:g id="number" example="2">%d</xliff:g> трека добавлены в избранное.</item>
-    <item quantity="other"><xliff:g id="number" example="5">%d</xliff:g> треков добавлены в избранное.</item>
+    <item quantity="few"><xliff:g id="number" example="27">%d</xliff:g> трека добавлены в избранное.</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> треков добавлены в избранное.</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
     <item quantity="one"><xliff:g id="songs_to_delete" example="1">%d</xliff:g> трек удален.</item>
-    <item quantity="few"><xliff:g id="songs_to_delete" example="2">%d</xliff:g> трека удалены.</item>
-    <item quantity="other"><xliff:g id="songs_to_delete" example="5">%d</xliff:g> треков удалены.</item>
+    <item quantity="few"><xliff:g id="songs_to_delete">%d</xliff:g> трека удалены.</item>
+    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> треков удалены.</item>
   </plurals>
 </resources>
diff --git a/res/values-sv/plurals.xml b/res/values-sv/plurals.xml
index 2bf8b64..fc0a686 100644
--- a/res/values-sv/plurals.xml
+++ b/res/values-sv/plurals.xml
@@ -55,7 +55,7 @@
   <!-- Toasts after removing song(s) from playlists -->
   <plurals name="NNNtracksfromplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> låt borttagen från spellistan.</item>
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> låtar borttagna från spellistan.</item>
+    <item quantity="other"><xliff:g id="number" example="27"> %d </xliff:g> låtar borttagna från spellistan.</item>
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
diff --git a/res/values-te-rIN/plurals.xml b/res/values-te-rIN/plurals.xml
index ee5f6d1..9a78c90 100644
--- a/res/values-te-rIN/plurals.xml
+++ b/res/values-te-rIN/plurals.xml
@@ -38,7 +38,15 @@
     <item quantity="other"><xliff:g id="count">%d</xliff:g> శైలులు</item>
   </plurals>
   <!-- Used to show a shortened version of hours-->
+  <plurals name="Nhours">
+    <item quantity="one"><xliff:g id="hours">%d</xliff:g>h</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>గ</item>
+  </plurals>
   <!-- Used to show a shortened version of minutes -->
+  <plurals name="Nminutes">
+    <item quantity="one"><xliff:g id="minutes">%d</xliff:g>m</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>ని</item>
+  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one"><xliff:g id="number" example="1">%d</xliff:g> పాట  ప్లేజాబితాకు జోడించబడింది.</item>
diff --git a/res/values-th/plurals.xml b/res/values-th/plurals.xml
index 0ba5f3a..f2eabe5 100644
--- a/res/values-th/plurals.xml
+++ b/res/values-th/plurals.xml
@@ -35,11 +35,11 @@
   </plurals>
   <!-- Used to show a shortened version of hours-->
   <plurals name="Nhours">
-    <item quantity="other"><xliff:g id="hours"> %d</xliff:g>ชม.</item>
+    <item quantity="other"><xliff:g id="hours">%d</xliff:g>ชม.</item>
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="other"><xliff:g id="minutes"> %d</xliff:g>นาที</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>นาที</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
@@ -51,11 +51,11 @@
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="other">มี <xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มอยู่ในคิว</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มเข้าในคิว</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มไปยังรายการโปรด</item>
+    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> เพลงถูกเพิ่มในรายการโปรด</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
diff --git a/res/values-vi/plurals.xml b/res/values-vi/plurals.xml
index e463be3..9827780 100644
--- a/res/values-vi/plurals.xml
+++ b/res/values-vi/plurals.xml
@@ -18,47 +18,14 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Used to indicate the number of artists -->
-  <plurals name="Nartists">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> nghệ sĩ</item>
-  </plurals>
   <!-- Used to indicate the number of albums for an artist -->
-  <plurals name="Nalbums">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> album</item>
-  </plurals>
   <!-- Used to indicate the number of songs for an album -->
-  <plurals name="Nsongs">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> bài hát</item>
-  </plurals>
   <!-- Used to indicate the number of genres -->
-  <plurals name="Ngenres">
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> thể loại</item>
-  </plurals>
   <!-- Used to show a shortened version of hours-->
-  <plurals name="Nhours">
-    <item quantity="other"><xliff:g id="hours">%d</xliff:g>giờ</item>
-  </plurals>
   <!-- Used to show a shortened version of minutes -->
-  <plurals name="Nminutes">
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>phút</item>
-  </plurals>
   <!-- Toasts after adding song(s) to playlists -->
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát đã được thêm vào danh sách phát.</item>
-  </plurals>
   <!-- Toasts after removing song(s) from playlists -->
-  <plurals name="NNNtracksfromplaylist">
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát đã được xoá khỏi danh sách phát.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to queue -->
-  <plurals name="NNNtrackstoqueue">
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát được thêm vào danh sách chờ.</item>
-  </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
-  <plurals name="NNNtrackstofavorites">
-    <item quantity="other"><xliff:g id="number" example="27">%d</xliff:g> bài hát đã được thêm vào yêu thích.</item>
-  </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
-  <plurals name="NNNtracksdeleted">
-    <item quantity="other"><xliff:g id="songs_to_delete">%d</xliff:g> bài hát đã bị xoá.</item>
-  </plurals>
 </resources>
diff --git a/res/values-zh-rCN/plurals.xml b/res/values-zh-rCN/plurals.xml
index 91d23e7..5dea06e 100644
--- a/res/values-zh-rCN/plurals.xml
+++ b/res/values-zh-rCN/plurals.xml
@@ -59,6 +59,6 @@
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
-    <item quantity="other">已删除 <xliff:g id="songs_to_delete">%d</xliff:g>首歌曲。</item>
+    <item quantity="other">已删除 <xliff:g id="songs_to_delete">%d</xliff:g> 首歌曲。</item>
   </plurals>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ff68177..3b6e47e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -78,7 +78,7 @@
   <string name="clear">清空</string>
   <string name="new_playlist_name_template">播放列表 <xliff:g id="number">%d</xliff:g></string>
   <string name="create_playlist_prompt">播放列表名称</string>
-  <string name="delete_dialog_title">删除 <xliff:g id="item" example="album">%s</xliff:g> ？</string>
+  <string name="delete_dialog_title">删除 <xliff:g id="item" example="album">%s</xliff:g>？</string>
   <string name="clear_top_tracks_title">清空热门曲目？</string>
   <string name="clear_recent_title">清空最近播放？</string>
   <string name="clear_last_added">清空最后添加？</string>
@@ -114,7 +114,7 @@
   <string name="accessibility_queue">打开队列</string>
   <string name="accessibility_browse">浏览音乐</string>
   <!-- Toast messages -->
-  <string name="set_as_ringtone">设置 \"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\" 为铃声</string>
+  <string name="set_as_ringtone">设置“<xliff:g id="name" example="Alarm Bell">%s</xliff:g>”为铃声</string>
   <string name="playlist_renamed">播放列表已被重命名</string>
   <!-- Settings -->
   <string name="settings_ui_category">界面</string>
@@ -137,7 +137,7 @@
   <!-- App widget -->
   <string name="app_widget_small">音乐：4 \u00d7 1</string>
   <string name="app_widget_large">音乐：4 \u00d7 1</string>
-  <string name="app_widget_large_alt">音乐： 4 \u00d7 2 (交替)</string>
+  <string name="app_widget_large_alt">音乐：4 \u00d7 2 (交替)</string>
   <string name="app_widget_recent">最近听过的音乐</string>
   <!-- Empty list / error messages -->
   <string name="no_effects_for_you">无法打开均衡器。</string>
@@ -148,7 +148,7 @@
   <string name="empty_recent_main">没有最近的歌曲</string>
   <string name="empty_recent">这里会显示您最近听过的歌曲。</string>
   <string name="empty_playlist_main">播放列表中没有歌曲</string>
-  <string name="empty_playlist_secondary">要向此播放列表中添加歌曲，请点击选项菜单上的歌曲、 唱片集或艺术家，并选择“添加到播放列表”。</string>
+  <string name="empty_playlist_secondary">要向此播放列表添加歌曲，请点击歌曲、唱片集或艺术家上的选项菜单，选择“添加到播放列表”。</string>
   <string name="empty_top_tracks_main">没有热门的曲目</string>
   <string name="empty_top_tracks_secondary">您最常听的歌曲将添加到此列表中。</string>
   <string name="empty_last_added_main">最近没有添加歌曲</string>
@@ -156,7 +156,7 @@
   <string name="empty_generic_main">没有找到音乐</string>
   <string name="empty_generic_secondary">请使用 USB 数据线把音乐从您的计算机复制到您的设备中。</string>
   <string name="empty_queue_main">播放队列中没有音乐</string>
-  <string name="empty_queue_secondary">要向您的播放队列中添加歌曲，请点击歌曲、 唱片集或艺术家在选项菜单并选择“添加到队列”。</string>
+  <string name="empty_queue_secondary">要向您的播放队列添加歌曲，请点击歌曲、唱片集或艺术家上的选项菜单，选择“添加到队列”。</string>
   <string name="error_playing_track">无法播放音轨 %1$s</string>
   <!-- Section Headers -->
   <string name="header_unknown_year">未知年份</string>
diff --git a/res/values-zh-rTW/plurals.xml b/res/values-zh-rTW/plurals.xml
index f9b9864..123d6e9 100644
--- a/res/values-zh-rTW/plurals.xml
+++ b/res/values-zh-rTW/plurals.xml
@@ -39,7 +39,7 @@
   </plurals>
   <!-- Used to show a shortened version of minutes -->
   <plurals name="Nminutes">
-    <item quantity="other"><xliff:g id="minutes">%d</xliff:g>分鐘</item>
+    <item quantity="other"><xliff:g id="minutes">%d</xliff:g> 分鐘</item>
   </plurals>
   <!-- Toasts after adding song(s) to playlists -->
   <plurals name="NNNtrackstoplaylist">
@@ -51,11 +51,11 @@
   </plurals>
   <!-- Toasts after adding song(s) to queue -->
   <plurals name="NNNtrackstoqueue">
-    <item quantity="other">已新增 <xliff:g id="number" example="27">%d</xliff:g> 首曲目至佇列。</item>
+    <item quantity="other">已新增 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲至佇列。</item>
   </plurals>
   <!-- Toasts after adding song(s) to the favorites list -->
   <plurals name="NNNtrackstofavorites">
-    <item quantity="other">已加入 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲至最愛。</item>
+    <item quantity="other">已新增 <xliff:g id="number" example="27">%d</xliff:g> 首樂曲至最愛。</item>
   </plurals>
   <!-- Toast confirming that song(s) was/were deleted. -->
   <plurals name="NNNtracksdeleted">
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 5bd32a1..f3e5981 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -78,16 +78,16 @@
   <string name="clear">清除</string>
   <string name="new_playlist_name_template">播放清單<xliff:g id="number">%d</xliff:g></string>
   <string name="create_playlist_prompt">播放清單名稱</string>
-  <string name="delete_dialog_title">是否刪除 <xliff:g id="item" example="album">%s</xliff:g>？</string>
-  <string name="clear_top_tracks_title">是否清除熱門曲目？</string>
-  <string name="clear_recent_title">是否清除最近播放？</string>
-  <string name="clear_last_added">是否清除最近新增？</string>
+  <string name="delete_dialog_title">刪除 「<xliff:g id="item" example="album">%s</xliff:g>」？</string>
+  <string name="clear_top_tracks_title">清除熱門曲目?</string>
+  <string name="clear_recent_title">清除最近播放？</string>
+  <string name="clear_last_added">清除最近新增？</string>
   <string name="cannot_be_undone">這將無法復原</string>
   <string name="delete_warning">這將永久刪除已快取的影像</string>
-  <string name="new_photo">從相簿選擇照片</string>
+  <string name="new_photo">從相簿選擇相片</string>
   <string name="google_search">Google 搜尋</string>
-  <string name="use_default">使用預設照片</string>
-  <string name="old_photo">使用舊的照片</string>
+  <string name="use_default">使用預設相片</string>
+  <string name="old_photo">使用舊的相片</string>
   <!-- Context menu items -->
   <string name="context_menu_play_selection">播放</string>
   <string name="context_menu_play_next">播放下一首</string>
@@ -100,7 +100,7 @@
   <string name="context_menu_remove_from_recent">從最近移除</string>
   <string name="context_menu_use_as_ringtone">設定為鈴聲</string>
   <string name="context_menu_remove_from_playlist">從播放清單移除</string>
-  <string name="context_menu_change_image">更改圖片</string>
+  <string name="context_menu_change_image">變更圖片</string>
   <!-- Content descriptions -->
   <string name="accessibility_play">播放</string>
   <string name="accessibility_pause">暫停</string>
@@ -114,7 +114,7 @@
   <string name="accessibility_queue">開啟佇列</string>
   <string name="accessibility_browse">瀏覽音樂</string>
   <!-- Toast messages -->
-  <string name="set_as_ringtone">將\"<xliff:g id="name" example="Alarm Bell">%s</xliff:g>\"設為鈴聲</string>
+  <string name="set_as_ringtone">將「<xliff:g id="name" example="Alarm Bell">%s</xliff:g>」設為鈴聲</string>
   <string name="playlist_renamed">已重新命名播放清單</string>
   <!-- Settings -->
   <string name="settings_ui_category">介面</string>
@@ -132,8 +132,8 @@
   <string name="settings_show_lyrics_summary">有 srt 檔的樂曲</string>
   <string name="settings_shake_to_play">搖動播放</string>
   <string name="settings_shake_to_play_summary">搖動您的裝置即可播放下一首樂曲</string>
-  <string name="settings_lockscreen_album_art">鎖定螢幕專輯封面</string>
-  <string name="settings_lockscreen_album_art_summary">在鎖定螢幕背景顯示專輯封面</string>
+  <string name="settings_lockscreen_album_art">鎖定畫面專輯封面</string>
+  <string name="settings_lockscreen_album_art_summary">在鎖定畫面背景顯示專輯封面</string>
   <!-- App widget -->
   <string name="app_widget_small">音樂：4 \u00d7 1</string>
   <string name="app_widget_large">音樂：4 \u00d7 2</string>
@@ -148,7 +148,7 @@
   <string name="empty_recent_main">沒有最近播放的樂曲</string>
   <string name="empty_recent">最近聽過的樂曲將會顯示在這裡。</string>
   <string name="empty_playlist_main">播放清單中沒有樂曲</string>
-  <string name="empty_playlist_secondary">要新增樂曲至此播放清單，請於樂曲、專輯或演出者輕觸功能選單，並選擇「新增至播放清單」。</string>
+  <string name="empty_playlist_secondary">要新增樂曲至此播放清單，請於樂曲、專輯或演出者輕觸功能選單，並選擇 [新增至播放清單] 。</string>
   <string name="empty_top_tracks_main">沒有熱門曲目</string>
   <string name="empty_top_tracks_secondary">您最常聽的樂曲將新增至此清單。</string>
   <string name="empty_last_added_main">沒有最近新增的樂曲</string>
@@ -156,7 +156,7 @@
   <string name="empty_generic_main">找不到音樂</string>
   <string name="empty_generic_secondary">請透過 USB 傳輸線從您的電腦複製音樂至您的裝置。</string>
   <string name="empty_queue_main">播放佇列中沒有樂曲</string>
-  <string name="empty_queue_secondary">要新增樂曲至播放佇列，請輕觸樂曲、專輯或演出者，並在功能選單中選擇「新增至佇列」。</string>
+  <string name="empty_queue_secondary">要新增樂曲至播放佇列，請輕觸樂曲、專輯或演出者，並在功能選單中選擇 [新增至佇列] 。</string>
   <string name="error_playing_track">無法播放曲目 %1$s</string>
   <!-- Section Headers -->
   <string name="header_unknown_year">未知年份</string>