am 70b80e0c: Merge "Fixed the Music app crash issue when the repeat button is disabled."

* commit '70b80e0c42d3f9fd890afccbcb8fe32abc74a615':
  Fixed the Music app crash issue when the repeat button is disabled.
diff --git a/res/values-af/strings2.xml b/res/values-af/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-af/strings2.xml
+++ b/res/values-af/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a2dac6c..9f38b41 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -59,9 +59,9 @@
     <string name="playlists_menu" msgid="5382792649771928849">"የጨዋታዝርዝሮች"</string>
     <string name="playlists_title" msgid="5094238486322957927">"የጨዋታዝርዝሮች"</string>
     <string name="videos_title" msgid="2066741954354129115">"ቪዲዮዎች"</string>
-    <string name="all_title" msgid="6880186414437237653">"ሁሉም ማህደረመረጃ"</string>
+    <string name="all_title" msgid="6880186414437237653">"ሁሉም  ማህደረ መረጃ"</string>
     <string name="browse_menu" msgid="5248122473075843289">"አርቲስቶች"</string>
-    <string name="search_title" msgid="1016971653383739344">" ፈልግ"</string>
+    <string name="search_title" msgid="1016971653383739344">"ፍለጋ"</string>
     <string name="no_tracks_title" msgid="8805805388271238471">"ምንም ዘፈኖች የሉም"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"ምንም ቪዲዮዎች የሉም"</string>
     <string name="no_playlists_title" msgid="4456351945617594418">"ምንም ጨዋታዝርዝሮች የሉም"</string>
diff --git a/res/values-am/strings2.xml b/res/values-am/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-am/strings2.xml
+++ b/res/values-am/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ar/strings2.xml b/res/values-ar/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-ar/strings2.xml
+++ b/res/values-ar/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-be/strings2.xml b/res/values-be/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-be/strings2.xml
+++ b/res/values-be/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-bg/strings2.xml b/res/values-bg/strings2.xml
index c0dd200..50f910a 100644
--- a/res/values-bg/strings2.xml
+++ b/res/values-bg/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"„<xliff:g id="ALBUM">%2$s</xliff:g>“"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"„<xliff:g id="ALBUM">%2$s</xliff:g>“\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 5d325f5..538e4d1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -30,9 +30,9 @@
     <item quantity="one" msgid="3798955510439465932">"1 àlbum"</item>
     <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> àlbums"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Party shuffle"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Party shuffle desactivat"</string>
+    <string name="goto_start" msgid="8979658707407220934">"Música"</string>
+    <string name="party_shuffle" msgid="8213359225506006168">"Sessió aleatòria"</string>
+    <string name="party_shuffle_off" msgid="1828744483354711679">"Desactiva la sessió aleatòria"</string>
     <string name="delete_item" msgid="3363330144534750601">"Suprimeix"</string>
     <string name="shuffle_all" msgid="1388193611787878773">"Reprodueix aleatòriament"</string>
     <string name="play_all" msgid="6309622568869321842">"Reprodueix-ho tot"</string>
@@ -50,17 +50,17 @@
     <string name="scanning" msgid="3529383847223198502">"S\'està cercant a la targeta SD..."</string>
     <string name="scanning_nosdcard" msgid="8105284774487360148">"S\'està explorant l\'emmagatzematge USB…"</string>
     <string name="nowplaying_title" msgid="8342523844307751761">"Reproducció en curs"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Party shuffle"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Intèrprets"</string>
+    <string name="partyshuffle_title" msgid="6582413231529992125">"Sessió aleatòria"</string>
+    <string name="artists_title" msgid="8490372367259160067">"Artistes"</string>
     <string name="albums_menu" msgid="5807982055590211900">"Àlbums"</string>
     <string name="albums_title" msgid="8773880394961378035">"Àlbums"</string>
     <string name="tracks_menu" msgid="6942246568246092330">"Cançons"</string>
     <string name="tracks_title" msgid="3229389424532295124">"Cançons"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Llistes de reproducció"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Llistes de reproducció"</string>
+    <string name="playlists_menu" msgid="5382792649771928849">"Llistes"</string>
+    <string name="playlists_title" msgid="5094238486322957927">"Llistes"</string>
     <string name="videos_title" msgid="2066741954354129115">"Vídeos"</string>
     <string name="all_title" msgid="6880186414437237653">"Tots els fitxers multimèdia"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Intèrprets"</string>
+    <string name="browse_menu" msgid="5248122473075843289">"Artistes"</string>
     <string name="search_title" msgid="1016971653383739344">"Cerca"</string>
     <string name="no_tracks_title" msgid="8805805388271238471">"Cap cançó"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"Cap vídeo"</string>
@@ -88,8 +88,8 @@
     <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"S\'ha detectat un error a l\'emmagatzematge USB."</string>
     <string name="unknown_artist_name" msgid="5567811106415855219">"Intèrpret desconegut"</string>
     <string name="unknown_album_name" msgid="8525145988941244727">"Àlbum desconegut"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Ordre aleatori activat"</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Ordre aleatori desactivat."</string>
+    <string name="shuffle_on_notif" msgid="5453708337808483943">"Reproducció aleatòria activada"</string>
+    <string name="shuffle_off_notif" msgid="4251189610017886263">"Reproducció aleatòria desactivada."</string>
     <string name="repeat_off_notif" msgid="1149406899083479716">"La repetició està desactivada."</string>
     <string name="repeat_current_notif" msgid="1227153936360904196">"S\'està repetint la cançó actual."</string>
     <string name="repeat_all_notif" msgid="6443293055987316642">"S\'estan repetint totes les cançons."</string>
@@ -139,16 +139,16 @@
     <string name="remove_from_playlist" msgid="2548577514849026354">"Elimina de la llista de reproducció"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"S\'està connectant a <xliff:g id="HOST">%s</xliff:g>…"</string>
     <string name="mediasearch" msgid="959222971261132292">"Cerca <xliff:g id="TERM">%s</xliff:g> mitjançant:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Intèrprets..."</string>
+    <string name="working_artists" msgid="8678357432732156580">"Artistes..."</string>
     <string name="working_albums" msgid="8713273699401457426">"Àlbums..."</string>
     <string name="working_songs" msgid="2201491972050410684">"Cançons..."</string>
     <string name="working_playlists" msgid="4424950806134653351">"Llistes de reproducció..."</string>
     <string name="loading" msgid="1991660396037155453">"S\'està carregant..."</string>
     <string name="sort_by_track" msgid="7662999005554152565">"Pistes"</string>
     <string name="sort_by_album" msgid="2912837715658975248">"Àlbums"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Intèrprets"</string>
+    <string name="sort_by_artist" msgid="4607024967813199992">"Artistes"</string>
     <string name="music_picker_title" msgid="4143865470317360605">"Tria una pista de música"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Intèrprets, àlbums i pistes"</string>
+    <string name="search_settings_description" msgid="6520975349259883368">"Artistes, àlbums i cançons"</string>
     <string name="search_hint" msgid="3766854898072633001">"Cerca a la música"</string>
     <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="widget_initial_text" msgid="3166878738860903586">"Toca per triar música."</string>
diff --git a/res/values-ca/strings2.xml b/res/values-ca/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-ca/strings2.xml
+++ b/res/values-ca/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b759ad4..d0a9e6e 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -97,7 +97,7 @@
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Použít jako vyzváněcí tón"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"Skladba <xliff:g id="NAME">%s</xliff:g> byla nastavena jako vyzváněcí tón."</string>
     <string name="play_selection" msgid="2854921021814550018">"Přehrát"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Přidat do seznamu stop"</string>
+    <string name="add_to_playlist" msgid="7110273488645072783">"Přidat do seznamu skladeb"</string>
     <string name="queue" msgid="2937629819482787704">"Aktuální seznam stop"</string>
     <string name="new_playlist" msgid="7588112979692632867">"Nové"</string>
     <string name="new_playlist_name_template" msgid="905710296728900597">"Nový seznam stop <xliff:g id="NUMBER">%d</xliff:g>"</string>
diff --git a/res/values-cs/strings2.xml b/res/values-cs/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-cs/strings2.xml
+++ b/res/values-cs/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-da-keyshidden/strings.xml b/res/values-da-keyshidden/strings.xml
index 5c3bba0..38df345 100644
--- a/res/values-da-keyshidden/strings.xml
+++ b/res/values-da-keyshidden/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Åbn tastaturet for at give din nye afspilningsliste et navn, eller vælg Gem for at give den navnet \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Åbn tastaturet for at give afspilningslisten \"<xliff:g id="PLAYLIST">%s</xliff:g>\" et nyt navn."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Åbn tastaturet for at give afspilningslisten \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" et navn, eller vælg Gem for at give den navnet \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
+    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Åbn tastaturet for at give din nye playliste et navn, eller vælg Gem for at give den navnet \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Åbn tastaturet for at give playlisten \"<xliff:g id="PLAYLIST">%s</xliff:g>\" et nyt navn."</string>
+    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Åbn tastaturet for at give playlisten \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" et navn, eller vælg Gem for at give den navnet \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c0019f5..b8033fd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -56,20 +56,20 @@
     <string name="albums_title" msgid="8773880394961378035">"Albummer"</string>
     <string name="tracks_menu" msgid="6942246568246092330">"Sange"</string>
     <string name="tracks_title" msgid="3229389424532295124">"Sange"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Spillelister"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Spillelister"</string>
+    <string name="playlists_menu" msgid="5382792649771928849">"Playlister"</string>
+    <string name="playlists_title" msgid="5094238486322957927">"Playlister"</string>
     <string name="videos_title" msgid="2066741954354129115">"Videoer"</string>
     <string name="all_title" msgid="6880186414437237653">"Alle medier"</string>
     <string name="browse_menu" msgid="5248122473075843289">"Kunstnere"</string>
     <string name="search_title" msgid="1016971653383739344">"Søg"</string>
     <string name="no_tracks_title" msgid="8805805388271238471">"Der er ingen sange"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"Der er ingen videoer"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Der er ingen afspilningslister"</string>
+    <string name="no_playlists_title" msgid="4456351945617594418">"Der er ingen playlister"</string>
     <string name="delete_playlist_menu" msgid="8998637685583495247">"Slet"</string>
     <string name="edit_playlist_menu" msgid="571618502105370684">"Rediger"</string>
     <string name="rename_playlist_menu" msgid="3133463747389494668">"Omdøb"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Afspilningsliste slettet."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Afspilningslisten er omdøbt."</string>
+    <string name="playlist_deleted_message" msgid="9008053828193961455">"Playliste slettet."</string>
+    <string name="playlist_renamed_message" msgid="7187580192703005990">"Playlisten er omdøbt."</string>
     <string name="recentlyadded" msgid="110978416756366953">"Tilføjet for nylig"</string>
     <string name="recentlyadded_title" msgid="3153322287249901914">"Tilføjet for nylig"</string>
     <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
@@ -97,15 +97,15 @@
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Brug som ringetone"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" er indstillet som ringetone for telefonen."</string>
     <string name="play_selection" msgid="2854921021814550018">"Afspil"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Føj til afspilningsliste"</string>
-    <string name="queue" msgid="2937629819482787704">"Aktuel afspilningsliste"</string>
+    <string name="add_to_playlist" msgid="7110273488645072783">"Føj til playliste"</string>
+    <string name="queue" msgid="2937629819482787704">"Aktuel playliste"</string>
     <string name="new_playlist" msgid="7588112979692632867">"Ny"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Ny afspilningsliste <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="new_playlist_name_template" msgid="905710296728900597">"Ny playliste <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"Der blev føjet 1 sang til afspilningslisten."</item>
-    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> sange føjet til afspilningsliste."</item>
+    <item quantity="one" msgid="422388042993582235">"Der blev føjet 1 sang til playlisten."</item>
+    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> sange føjet til playliste."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Den valgte afspilningsliste er tom."</string>
+    <string name="emptyplaylist" msgid="6711555673997896344">"Den valgte playliste er tom."</string>
     <string name="create_playlist_create_text" msgid="8149755205483279143">"Gem"</string>
     <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Overskriv"</string>
     <string name="service_start_error_title" msgid="8649916852210198813">"Afspilningsproblem"</string>
@@ -127,8 +127,8 @@
   </string-array>
     <string name="weekpicker_set" msgid="7636608790418067496">"Udfør"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"Angiv tid"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Gem som afspilningsliste"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Ryd afspilningsliste"</string>
+    <string name="save_as_playlist" msgid="5180413608901885255">"Gem som playliste"</string>
+    <string name="clear_playlist" msgid="4565515100924905315">"Ryd playliste"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Musik"</string>
     <string name="musicshortcutlabel" msgid="2602980193508150226">"Musikafspilningsliste"</string>
     <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musik"</string>
@@ -136,13 +136,13 @@
     <string name="mediapickerlabel" msgid="4549836003229914299">"Musik"</string>
     <string name="playback_failed" msgid="3811851150820251398">"Afspilleren understøtter ikke denne slags lydfiler."</string>
     <string name="cancel" msgid="886559484711947520">"Annuller"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Fjern fra afspilningsliste"</string>
+    <string name="remove_from_playlist" msgid="2548577514849026354">"Fjern fra playliste"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"Opretter forbindelse til <xliff:g id="HOST">%s</xliff:g>..."</string>
     <string name="mediasearch" msgid="959222971261132292">"Søg efter <xliff:g id="TERM">%s</xliff:g> ved hjælp af:"</string>
     <string name="working_artists" msgid="8678357432732156580">"Kunstnere ..."</string>
     <string name="working_albums" msgid="8713273699401457426">"Albummer ..."</string>
     <string name="working_songs" msgid="2201491972050410684">"Sange ..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Afspilningslister ..."</string>
+    <string name="working_playlists" msgid="4424950806134653351">"Playlister ..."</string>
     <string name="loading" msgid="1991660396037155453">"Indlæser…"</string>
     <string name="sort_by_track" msgid="7662999005554152565">"Numre"</string>
     <string name="sort_by_album" msgid="2912837715658975248">"Albummer"</string>
diff --git a/res/values-da/strings2.xml b/res/values-da/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-da/strings2.xml
+++ b/res/values-da/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c919f6c..5442ec8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -70,8 +70,8 @@
     <string name="rename_playlist_menu" msgid="3133463747389494668">"Umbenennen"</string>
     <string name="playlist_deleted_message" msgid="9008053828193961455">"Playlist gelöscht"</string>
     <string name="playlist_renamed_message" msgid="7187580192703005990">"Playlist umbenannt"</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Kürzlich hinzugefügt"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Kürzlich hinzugefügt"</string>
+    <string name="recentlyadded" msgid="110978416756366953">"Vor Kurzem hinzugefügt"</string>
+    <string name="recentlyadded_title" msgid="3153322287249901914">"Vor Kurzem hinzugefügt"</string>
     <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
     <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
     <string name="sdcard_missing_title" msgid="9008284946643270850">"Keine SD-Karte"</string>
@@ -148,7 +148,7 @@
     <string name="sort_by_album" msgid="2912837715658975248">"Alben"</string>
     <string name="sort_by_artist" msgid="4607024967813199992">"Interpreten"</string>
     <string name="music_picker_title" msgid="4143865470317360605">"Musiktrack auswählen"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Interpreten, Alben und Tracks"</string>
+    <string name="search_settings_description" msgid="6520975349259883368">"Interpreten, Alben und Songs"</string>
     <string name="search_hint" msgid="3766854898072633001">"In Musik suchen"</string>
     <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="widget_initial_text" msgid="3166878738860903586">"Zur Musikauswahl berühren"</string>
diff --git a/res/values-de/strings2.xml b/res/values-de/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-de/strings2.xml
+++ b/res/values-de/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-el/strings2.xml b/res/values-el/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-el/strings2.xml
+++ b/res/values-el/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-en-rGB/strings2.xml b/res/values-en-rGB/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-en-rGB/strings2.xml
+++ b/res/values-en-rGB/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es-keysexposed/strings.xml b/res/values-es-keysexposed/strings.xml
index 03893aa..d09d707 100644
--- a/res/values-es-keysexposed/strings.xml
+++ b/res/values-es-keysexposed/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Nombre de la lista de reproducción"</string>
+    <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Nombre de la playlist"</string>
     <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Cambiar \"<xliff:g id="PLAYLIST">%s</xliff:g>\" por"</string>
     <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Cambiar \"<xliff:g id="PLAYLIST">%s</xliff:g>\" por"</string>
 </resources>
diff --git a/res/values-es-keyshidden/strings.xml b/res/values-es-keyshidden/strings.xml
index f772c8b..388f50e 100644
--- a/res/values-es-keyshidden/strings.xml
+++ b/res/values-es-keyshidden/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Abre el teclado para asignar un nombre a la nueva lista de reproducción o selecciona \"Guardar\" para llamarla \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Abre el teclado para asignar un nombre nuevo a la lista de reproducción \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Abre el teclado para asignar un nombre nuevo a la lista de reproducción \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" o selecciona \"Guardar\" para llamarla \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
+    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Abre el teclado para asignar un nombre a la nueva playlist o selecciona \"Guardar\" para llamarla \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Abre el teclado para asignar un nombre nuevo a la playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Abre el teclado para asignar un nombre nuevo a la playlist \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" o selecciona \"Guardar\" para llamarla \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 75b8f79..685db64 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -125,7 +125,7 @@
     <item msgid="2727959579637914171">"11 semanas"</item>
     <item msgid="8708754966127584739">"12 semanas"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Finalizado"</string>
+    <string name="weekpicker_set" msgid="7636608790418067496">"Finalizar"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"Establecer hora"</string>
     <string name="save_as_playlist" msgid="5180413608901885255">"Guardar como lista de reproducción"</string>
     <string name="clear_playlist" msgid="4565515100924905315">"Eliminar lista de reproducción"</string>
diff --git a/res/values-es-rUS/strings2.xml b/res/values-es-rUS/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-es-rUS/strings2.xml
+++ b/res/values-es-rUS/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1c4ca01..bbeb7a2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -30,7 +30,7 @@
     <item quantity="one" msgid="3798955510439465932">"1 álbum"</item>
     <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> álbumes"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
+    <string name="goto_start" msgid="8979658707407220934">"Música"</string>
     <string name="party_shuffle" msgid="8213359225506006168">"Sesión aleatoria"</string>
     <string name="party_shuffle_off" msgid="1828744483354711679">"Desactivar sesión aleatoria"</string>
     <string name="delete_item" msgid="3363330144534750601">"Eliminar"</string>
@@ -64,14 +64,14 @@
     <string name="search_title" msgid="1016971653383739344">"Buscar"</string>
     <string name="no_tracks_title" msgid="8805805388271238471">"Ninguna canción"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"Ningún vídeo"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Ninguna lista de reproducción"</string>
+    <string name="no_playlists_title" msgid="4456351945617594418">"No hay playlists"</string>
     <string name="delete_playlist_menu" msgid="8998637685583495247">"Eliminar"</string>
     <string name="edit_playlist_menu" msgid="571618502105370684">"Editar"</string>
     <string name="rename_playlist_menu" msgid="3133463747389494668">"Cambiar nombre"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Se ha eliminado la lista de reproducción."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Se ha cambiado el nombre de la lista."</string>
+    <string name="playlist_deleted_message" msgid="9008053828193961455">"Se ha eliminado la playlist."</string>
+    <string name="playlist_renamed_message" msgid="7187580192703005990">"Se ha cambiado el nombre de la playlist."</string>
     <string name="recentlyadded" msgid="110978416756366953">"Añadidas recientemente"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Añadido recientemente"</string>
+    <string name="recentlyadded_title" msgid="3153322287249901914">"Añadidas recientemente"</string>
     <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
     <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
     <string name="sdcard_missing_title" msgid="9008284946643270850">"Falta la tarjeta SD"</string>
@@ -97,15 +97,15 @@
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Usar como tono"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"Se ha establecido \"<xliff:g id="NAME">%s</xliff:g>\" como tono del teléfono."</string>
     <string name="play_selection" msgid="2854921021814550018">"Reproducir"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Añadir a lista"</string>
-    <string name="queue" msgid="2937629819482787704">"Lista de reproducción actual"</string>
+    <string name="add_to_playlist" msgid="7110273488645072783">"Añadir a playlist"</string>
+    <string name="queue" msgid="2937629819482787704">"Playlist actual"</string>
     <string name="new_playlist" msgid="7588112979692632867">"Nuevo"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Lista <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="new_playlist_name_template" msgid="905710296728900597">"Nueva playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"Se ha añadido una canción a la lista de reproducción."</item>
-    <item quantity="other" msgid="7662771987109627255">"Se han añadido <xliff:g id="NUMBER">%d</xliff:g> canciones a la lista de reproducción."</item>
+    <item quantity="one" msgid="422388042993582235">"Se ha añadido una canción a la playlist."</item>
+    <item quantity="other" msgid="7662771987109627255">"Se han añadido <xliff:g id="NUMBER">%d</xliff:g> canciones a la playlist."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"La lista de reproducción seleccionada está vacía."</string>
+    <string name="emptyplaylist" msgid="6711555673997896344">"La playlist seleccionada está vacía."</string>
     <string name="create_playlist_create_text" msgid="8149755205483279143">"Guardar"</string>
     <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Sobrescribir"</string>
     <string name="service_start_error_title" msgid="8649916852210198813">"Problema de reproducción"</string>
@@ -127,16 +127,16 @@
   </string-array>
     <string name="weekpicker_set" msgid="7636608790418067496">"Listo"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"Establecer período"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Guardar como lista de reproducción"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Borrar lista de reproducción"</string>
+    <string name="save_as_playlist" msgid="5180413608901885255">"Guardar como playlist"</string>
+    <string name="clear_playlist" msgid="4565515100924905315">"Borrar playlist"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Música"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Lista de reproducción de música"</string>
+    <string name="musicshortcutlabel" msgid="2602980193508150226">"Playlist de música"</string>
     <string name="mediaplaybacklabel" msgid="6733604841530940397">"Música"</string>
     <string name="videobrowserlabel" msgid="8522326678447494657">"Vídeos"</string>
     <string name="mediapickerlabel" msgid="4549836003229914299">"Música"</string>
     <string name="playback_failed" msgid="3811851150820251398">"El reproductor no admite este tipo de archivo de audio."</string>
     <string name="cancel" msgid="886559484711947520">"Cancelar"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Quitar de la lista de reproducción"</string>
+    <string name="remove_from_playlist" msgid="2548577514849026354">"Quitar de la playlist"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"Estableciendo conexión con <xliff:g id="HOST">%s</xliff:g>..."</string>
     <string name="mediasearch" msgid="959222971261132292">"Buscar <xliff:g id="TERM">%s</xliff:g> con:"</string>
     <string name="working_artists" msgid="8678357432732156580">"Artistas…"</string>
diff --git a/res/values-es/strings2.xml b/res/values-es/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-es/strings2.xml
+++ b/res/values-es/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-et/strings2.xml b/res/values-et/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-et/strings2.xml
+++ b/res/values-et/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fa/strings2.xml b/res/values-fa/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-fa/strings2.xml
+++ b/res/values-fa/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fi/strings2.xml b/res/values-fi/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-fi/strings2.xml
+++ b/res/values-fi/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e6f9269..5ebb303 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -97,7 +97,7 @@
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Définir comme sonnerie"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" a été défini comme sonnerie."</string>
     <string name="play_selection" msgid="2854921021814550018">"Écouter"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Ajouter à la playlist"</string>
+    <string name="add_to_playlist" msgid="7110273488645072783">"Ajouter à une playlist"</string>
     <string name="queue" msgid="2937629819482787704">"Playlist actuelle"</string>
     <string name="new_playlist" msgid="7588112979692632867">"Nouvelle"</string>
     <string name="new_playlist_name_template" msgid="905710296728900597">"Nouvelle playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
@@ -148,7 +148,7 @@
     <string name="sort_by_album" msgid="2912837715658975248">"Albums"</string>
     <string name="sort_by_artist" msgid="4607024967813199992">"Artistes"</string>
     <string name="music_picker_title" msgid="4143865470317360605">"Sélectionner un titre"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artistes, albums et morceaux"</string>
+    <string name="search_settings_description" msgid="6520975349259883368">"Artistes, albums et titres"</string>
     <string name="search_hint" msgid="3766854898072633001">"Rechercher de la musique"</string>
     <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="widget_initial_text" msgid="3166878738860903586">"Appuyez pour sélectionner des titres"</string>
diff --git a/res/values-fr/strings2.xml b/res/values-fr/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-fr/strings2.xml
+++ b/res/values-fr/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hi/strings2.xml b/res/values-hi/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-hi/strings2.xml
+++ b/res/values-hi/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index aaa7a60..d087804 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -69,7 +69,7 @@
     <string name="edit_playlist_menu" msgid="571618502105370684">"Uređivanje"</string>
     <string name="rename_playlist_menu" msgid="3133463747389494668">"Preimenuj"</string>
     <string name="playlist_deleted_message" msgid="9008053828193961455">"Popis za reprodukciju je izbrisan."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Popis za reprodukciju preimenovan je."</string>
+    <string name="playlist_renamed_message" msgid="7187580192703005990">"Popis pjesama preimenovan je."</string>
     <string name="recentlyadded" msgid="110978416756366953">"Nedavno dodano"</string>
     <string name="recentlyadded_title" msgid="3153322287249901914">"Nedavno dodano"</string>
     <string name="podcasts_listitem" msgid="8657809279717670634">"Podcastovi"</string>
@@ -97,15 +97,15 @@
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Koristi kao zvuk zvona"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" postavi kao zvuk zvona telefona."</string>
     <string name="play_selection" msgid="2854921021814550018">"Reproduciraj"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Dodaj na popis za reprodukciju"</string>
+    <string name="add_to_playlist" msgid="7110273488645072783">"Dodaj na popis pjesama"</string>
     <string name="queue" msgid="2937629819482787704">"Aktualni popis za reprodukciju"</string>
     <string name="new_playlist" msgid="7588112979692632867">"Novo"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Novi popis za reprodukciju <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="new_playlist_name_template" msgid="905710296728900597">"Novi popis pjesama <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one" msgid="422388042993582235">"Na popis za reprodukciju dodana je 1 pjesma."</item>
     <item quantity="other" msgid="7662771987109627255">"Broj pjesama dodanih na popis za reprodukciju: <xliff:g id="NUMBER">%d</xliff:g>."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Odabrani popis za reprodukciju je prazan."</string>
+    <string name="emptyplaylist" msgid="6711555673997896344">"Odabrani popis pjesama je prazan."</string>
     <string name="create_playlist_create_text" msgid="8149755205483279143">"Spremi"</string>
     <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Presnimi"</string>
     <string name="service_start_error_title" msgid="8649916852210198813">"Problem s reprodukcijom"</string>
@@ -127,7 +127,7 @@
   </string-array>
     <string name="weekpicker_set" msgid="7636608790418067496">"Gotovo"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"Postavljanje vremena"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Spremi kao popis za reprodukciju"</string>
+    <string name="save_as_playlist" msgid="5180413608901885255">"Spremi kao popis pjesama"</string>
     <string name="clear_playlist" msgid="4565515100924905315">"Očisti popis za reprodukciju"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Glazba"</string>
     <string name="musicshortcutlabel" msgid="2602980193508150226">"Popis za reprodukciju glazbe"</string>
@@ -136,7 +136,7 @@
     <string name="mediapickerlabel" msgid="4549836003229914299">"Glazba"</string>
     <string name="playback_failed" msgid="3811851150820251398">"Player ne podržava ovu vrstu audiodatoteka."</string>
     <string name="cancel" msgid="886559484711947520">"Odustani"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Ukloni s popisa za reprodukciju"</string>
+    <string name="remove_from_playlist" msgid="2548577514849026354">"Ukloni s popisa pjesama"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"Povezivanje s hostom <xliff:g id="HOST">%s</xliff:g>…"</string>
     <string name="mediasearch" msgid="959222971261132292">"Traži pojam \"<xliff:g id="TERM">%s</xliff:g>\" koristeći:"</string>
     <string name="working_artists" msgid="8678357432732156580">"Izvođači..."</string>
diff --git a/res/values-hr/strings2.xml b/res/values-hr/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-hr/strings2.xml
+++ b/res/values-hr/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-hu/strings2.xml b/res/values-hu/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-hu/strings2.xml
+++ b/res/values-hu/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-in/strings2.xml b/res/values-in/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-in/strings2.xml
+++ b/res/values-in/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-it/strings2.xml b/res/values-it/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-it/strings2.xml
+++ b/res/values-it/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-iw/strings2.xml b/res/values-iw/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-iw/strings2.xml
+++ b/res/values-iw/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ja/strings2.xml b/res/values-ja/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-ja/strings2.xml
+++ b/res/values-ja/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ko/strings2.xml b/res/values-ko/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-ko/strings2.xml
+++ b/res/values-ko/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lt/strings2.xml b/res/values-lt/strings2.xml
index c0dd200..50f910a 100644
--- a/res/values-lt/strings2.xml
+++ b/res/values-lt/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"„<xliff:g id="ALBUM">%2$s</xliff:g>“"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"„<xliff:g id="ALBUM">%2$s</xliff:g>“\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-lv/strings2.xml b/res/values-lv/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-lv/strings2.xml
+++ b/res/values-lv/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ms/strings2.xml b/res/values-ms/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-ms/strings2.xml
+++ b/res/values-ms/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nb/strings2.xml b/res/values-nb/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-nb/strings2.xml
+++ b/res/values-nb/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-nl/strings2.xml b/res/values-nl/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-nl/strings2.xml
+++ b/res/values-nl/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pl/strings2.xml b/res/values-pl/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-pl/strings2.xml
+++ b/res/values-pl/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings2.xml b/res/values-pt-rPT/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-pt-rPT/strings2.xml
+++ b/res/values-pt-rPT/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-pt/strings2.xml b/res/values-pt/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-pt/strings2.xml
+++ b/res/values-pt/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 002ac53..e5dea34 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -33,15 +33,15 @@
     <string name="goto_start" msgid="8979658707407220934">"Bibliotecă"</string>
     <string name="party_shuffle" msgid="8213359225506006168">"Colecţie aleatorie"</string>
     <string name="party_shuffle_off" msgid="1828744483354711679">"Colecţie aleatorie dezactivată"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Ştergeţi"</string>
+    <string name="delete_item" msgid="3363330144534750601">"Ștergeţi"</string>
     <string name="shuffle_all" msgid="1388193611787878773">"Redaţi toată lista în mod aleatoriu"</string>
     <string name="play_all" msgid="6309622568869321842">"Redaţi toate"</string>
-    <string name="delete_artist_desc" msgid="8665759524898379194">"Ştergeţi definitiv toate cântecele de <xliff:g id="ARTIST">%s</xliff:g> de pe cardul SD?"</string>
-    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Ştergeţi definitiv toate cântecele de <xliff:g id="ARTIST">%s</xliff:g> de pe stocarea USB?"</string>
-    <string name="delete_album_desc" msgid="8172412873562794429">"Ştergeţi definitiv întregul album „<xliff:g id="ALBUM">%s</xliff:g>” de pe cardul SD?"</string>
-    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Ştergeţi definitiv întregul album „<xliff:g id="ALBUM">%s</xliff:g>” de pe stocarea USB?"</string>
-    <string name="delete_song_desc" msgid="1842681623848282205">"Ştergeţi definitiv „<xliff:g id="SONG">%s</xliff:g>” de pe cardul SD?"</string>
-    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Ştergeţi definitiv „<xliff:g id="SONG">%s</xliff:g>” de pe stocarea USB?"</string>
+    <string name="delete_artist_desc" msgid="8665759524898379194">"Ștergeţi definitiv toate cântecele de <xliff:g id="ARTIST">%s</xliff:g> de pe cardul SD?"</string>
+    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Ștergeţi definitiv toate cântecele de <xliff:g id="ARTIST">%s</xliff:g> de pe stocarea USB?"</string>
+    <string name="delete_album_desc" msgid="8172412873562794429">"Ștergeţi definitiv întregul album „<xliff:g id="ALBUM">%s</xliff:g>” de pe cardul SD?"</string>
+    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Ștergeţi definitiv întregul album „<xliff:g id="ALBUM">%s</xliff:g>” de pe stocarea USB?"</string>
+    <string name="delete_song_desc" msgid="1842681623848282205">"Ștergeţi definitiv „<xliff:g id="SONG">%s</xliff:g>” de pe cardul SD?"</string>
+    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Ștergeţi definitiv „<xliff:g id="SONG">%s</xliff:g>” de pe stocarea USB?"</string>
     <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
   <plurals name="NNNtracksdeleted">
     <item quantity="one" msgid="8560276109508404217">"1 cântec a fost şters."</item>
@@ -65,7 +65,7 @@
     <string name="no_tracks_title" msgid="8805805388271238471">"Niciun cântec"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"Niciun videoclip"</string>
     <string name="no_playlists_title" msgid="4456351945617594418">"Nicio listă de redare"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Ştergeţi"</string>
+    <string name="delete_playlist_menu" msgid="8998637685583495247">"Ștergeţi"</string>
     <string name="edit_playlist_menu" msgid="571618502105370684">"Modificaţi"</string>
     <string name="rename_playlist_menu" msgid="3133463747389494668">"Redenumiţi"</string>
     <string name="playlist_deleted_message" msgid="9008053828193961455">"Listă de redare ştearsă."</string>
@@ -128,7 +128,7 @@
     <string name="weekpicker_set" msgid="7636608790418067496">"Terminat"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"Setaţi ora"</string>
     <string name="save_as_playlist" msgid="5180413608901885255">"Salvaţi ca listă de redare"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Ştergeţi lista de redare"</string>
+    <string name="clear_playlist" msgid="4565515100924905315">"Ștergeţi lista de redare"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Muzică"</string>
     <string name="musicshortcutlabel" msgid="2602980193508150226">"Listă de redare muzică"</string>
     <string name="mediaplaybacklabel" msgid="6733604841530940397">"Muzică"</string>
diff --git a/res/values-ro/strings2.xml b/res/values-ro/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-ro/strings2.xml
+++ b/res/values-ro/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-ru/strings2.xml b/res/values-ru/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-ru/strings2.xml
+++ b/res/values-ru/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sk/strings2.xml b/res/values-sk/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-sk/strings2.xml
+++ b/res/values-sk/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sl/strings2.xml b/res/values-sl/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-sl/strings2.xml
+++ b/res/values-sl/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sr/strings2.xml b/res/values-sr/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-sr/strings2.xml
+++ b/res/values-sr/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sv/strings2.xml b/res/values-sv/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-sv/strings2.xml
+++ b/res/values-sv/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index cc06aed..31f56e0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -144,7 +144,7 @@
     <string name="working_songs" msgid="2201491972050410684">"Nyimbo.."</string>
     <string name="working_playlists" msgid="4424950806134653351">"Orodha za kucheza…"</string>
     <string name="loading" msgid="1991660396037155453">"Inapakia…"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Traki"</string>
+    <string name="sort_by_track" msgid="7662999005554152565">"Nyimbo"</string>
     <string name="sort_by_album" msgid="2912837715658975248">"Albamu"</string>
     <string name="sort_by_artist" msgid="4607024967813199992">"Wasanii"</string>
     <string name="music_picker_title" msgid="4143865470317360605">"Chagua wimbo"</string>
diff --git a/res/values-sw/strings2.xml b/res/values-sw/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-sw/strings2.xml
+++ b/res/values-sw/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-th-keysexposed/strings.xml b/res/values-th-keysexposed/strings.xml
index 9cd7c10..612692e 100644
--- a/res/values-th-keysexposed/strings.xml
+++ b/res/values-th-keysexposed/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"ชื่อรายการเพลง"</string>
+    <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"ชื่อเพลย์ลิสต์"</string>
     <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"เปลี่ยนชื่อ \"<xliff:g id="PLAYLIST">%s</xliff:g>\" เป็น"</string>
     <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"เปลี่ยนชื่อ \"<xliff:g id="PLAYLIST">%s</xliff:g>\" เป็น"</string>
 </resources>
diff --git a/res/values-th-keyshidden/strings.xml b/res/values-th-keyshidden/strings.xml
index 2f4bfd2..750cba0 100644
--- a/res/values-th-keyshidden/strings.xml
+++ b/res/values-th-keyshidden/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"เปิดแป้นพิมพ์เพื่อตั้งชื่อให้รายการเพลงใหม่หรือเลือก บันทึก เพื่อตั้งชื่อว่า  \"<xliff:g id="PLAYLIST">%s</xliff:g>\""</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"เปิดแป้นพิมพ์เพื่อตั้งชื่อใหม่ให้รายการเพลง \"<xliff:g id="PLAYLIST">%s</xliff:g>\""</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"เปิดแป้นพิมพ์เพื่อตั้งชื่อใหม่แก่รายการเพลง \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" หรือเลือก บันทึก เพื่อตั้งชื่อว่า \"<xliff:g id="NAME">%2$s</xliff:g>\""</string>
+    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"เปิดแป้นพิมพ์เพื่อตั้งชื่อให้เพลย์ลิสต์ใหม่หรือเลือก บันทึก เพื่อตั้งชื่อว่า  \"<xliff:g id="PLAYLIST">%s</xliff:g>\""</string>
+    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"เปิดแป้นพิมพ์เพื่อตั้งชื่อใหม่ให้เพลย์ลิสต์ \"<xliff:g id="PLAYLIST">%s</xliff:g>\""</string>
+    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"เปิดแป้นพิมพ์เพื่อตั้งชื่อใหม่แก่เพลย์ลิสต์ \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" หรือเลือก บันทึก เพื่อตั้งชื่อว่า \"<xliff:g id="NAME">%2$s</xliff:g>\""</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index feb9233..8a71109 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -31,8 +31,8 @@
     <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> อัลบั้ม"</item>
   </plurals>
     <string name="goto_start" msgid="8979658707407220934">"ไลบรารี"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"รายการเพลงสุ่ม"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"ปิดรายการเพลงสุ่ม"</string>
+    <string name="party_shuffle" msgid="8213359225506006168">"เพลย์ลิสต์สุ่ม"</string>
+    <string name="party_shuffle_off" msgid="1828744483354711679">"ปิดเพลย์ลิสต์สุ่ม"</string>
     <string name="delete_item" msgid="3363330144534750601">"ลบ"</string>
     <string name="shuffle_all" msgid="1388193611787878773">"สุ่มเพลงทั้งหมด"</string>
     <string name="play_all" msgid="6309622568869321842">"เล่นทั้งหมด"</string>
@@ -50,26 +50,26 @@
     <string name="scanning" msgid="3529383847223198502">"กำลังสแกนการ์ด SD…"</string>
     <string name="scanning_nosdcard" msgid="8105284774487360148">"กำลังสแกนที่เก็บข้อมูล USB…"</string>
     <string name="nowplaying_title" msgid="8342523844307751761">"กำลังเล่น"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"รายการเพลงสุ่ม"</string>
+    <string name="partyshuffle_title" msgid="6582413231529992125">"เพลย์ลิสต์สุ่ม"</string>
     <string name="artists_title" msgid="8490372367259160067">"ศิลปิน"</string>
     <string name="albums_menu" msgid="5807982055590211900">"อัลบั้ม"</string>
     <string name="albums_title" msgid="8773880394961378035">"อัลบั้ม"</string>
     <string name="tracks_menu" msgid="6942246568246092330">"เพลง"</string>
     <string name="tracks_title" msgid="3229389424532295124">"เพลง"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"รายการเพลง"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"รายการเพลง"</string>
+    <string name="playlists_menu" msgid="5382792649771928849">"เพลย์ลิสต์"</string>
+    <string name="playlists_title" msgid="5094238486322957927">"เพลย์ลิสต์"</string>
     <string name="videos_title" msgid="2066741954354129115">"วิดีโอ"</string>
     <string name="all_title" msgid="6880186414437237653">"สื่อทั้งหมด"</string>
     <string name="browse_menu" msgid="5248122473075843289">"ศิลปิน"</string>
     <string name="search_title" msgid="1016971653383739344">"ค้นหา"</string>
     <string name="no_tracks_title" msgid="8805805388271238471">"ไม่มีเพลง"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"ไม่มีวิดีโอ"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"ไม่มีรายการเพลง"</string>
+    <string name="no_playlists_title" msgid="4456351945617594418">"ไม่มีเพลย์ลิสต์"</string>
     <string name="delete_playlist_menu" msgid="8998637685583495247">"ลบ"</string>
     <string name="edit_playlist_menu" msgid="571618502105370684">"แก้ไข"</string>
     <string name="rename_playlist_menu" msgid="3133463747389494668">"เปลี่ยนชื่อ"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"รายการเพลงถูกลบ"</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"เปลี่ยนชื่อรายการเพลง"</string>
+    <string name="playlist_deleted_message" msgid="9008053828193961455">"เพลย์ลิสต์ถูกลบ"</string>
+    <string name="playlist_renamed_message" msgid="7187580192703005990">"เปลี่ยนชื่อเพลย์ลิสต์"</string>
     <string name="recentlyadded" msgid="110978416756366953">"เพิ่งเพิ่มเข้ามา"</string>
     <string name="recentlyadded_title" msgid="3153322287249901914">"เพิ่งเพิ่มเข้ามา"</string>
     <string name="podcasts_listitem" msgid="8657809279717670634">"พอดแคสต์"</string>
@@ -97,15 +97,15 @@
     <string name="ringtone_menu_short" msgid="3367622038867238133">"ใช้เป็นเสียงเรียกเข้า"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" ถูกตั้งค่าเป็นเสียงเรียกเข้าของโทรศัพท์"</string>
     <string name="play_selection" msgid="2854921021814550018">"เล่น"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"เพิ่มในรายการเพลง"</string>
-    <string name="queue" msgid="2937629819482787704">"รายการเพลงปัจจุบัน"</string>
+    <string name="add_to_playlist" msgid="7110273488645072783">"เพิ่มในเพลย์ลิสต์"</string>
+    <string name="queue" msgid="2937629819482787704">"เพลย์ลิสต์ปัจจุบัน"</string>
     <string name="new_playlist" msgid="7588112979692632867">"ใหม่"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"รายการเพลงใหม่ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="new_playlist_name_template" msgid="905710296728900597">"เพลย์ลิสต์ใหม่ <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"เพิ่มในรายการเพลง 1 เพลง"</item>
-    <item quantity="other" msgid="7662771987109627255">"เพิ่ม <xliff:g id="NUMBER">%d</xliff:g> เพลงลงในรายการเพลง"</item>
+    <item quantity="one" msgid="422388042993582235">"เพิ่มในเพลย์ลิสต์ 1 เพลง"</item>
+    <item quantity="other" msgid="7662771987109627255">"เพิ่ม <xliff:g id="NUMBER">%d</xliff:g> เพลงลงในเพลย์ลิสต์"</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"รายการเพลงที่เลือกไว้ว่างเปล่า"</string>
+    <string name="emptyplaylist" msgid="6711555673997896344">"เพลย์ลิสต์ที่เลือกไว้ว่างเปล่า"</string>
     <string name="create_playlist_create_text" msgid="8149755205483279143">"บันทึก"</string>
     <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"เขียนทับ"</string>
     <string name="service_start_error_title" msgid="8649916852210198813">"ปัญหาการเล่น"</string>
@@ -127,22 +127,22 @@
   </string-array>
     <string name="weekpicker_set" msgid="7636608790418067496">"เสร็จสิ้น"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"ตั้งเวลา"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"บันทึกเป็นรายการเพลง"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"ล้างรายการเพลง"</string>
+    <string name="save_as_playlist" msgid="5180413608901885255">"บันทึกเป็นเพลย์ลิสต์"</string>
+    <string name="clear_playlist" msgid="4565515100924905315">"ล้างเพลย์ลิสต์"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"เพลง"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"รายการเพลง"</string>
+    <string name="musicshortcutlabel" msgid="2602980193508150226">"เพลย์ลิสต์"</string>
     <string name="mediaplaybacklabel" msgid="6733604841530940397">"เพลง"</string>
     <string name="videobrowserlabel" msgid="8522326678447494657">"วิดีโอ"</string>
     <string name="mediapickerlabel" msgid="4549836003229914299">"เพลง"</string>
     <string name="playback_failed" msgid="3811851150820251398">"โปรแกรมเล่นไม่สนับสนุนไฟล์เสียงประเภทนี้"</string>
     <string name="cancel" msgid="886559484711947520">"ยกเลิก"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"นำออกจากรายการเพลง"</string>
+    <string name="remove_from_playlist" msgid="2548577514849026354">"นำออกจากเพลย์ลิสต์"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"กำลังเชื่อมต่อกับ <xliff:g id="HOST">%s</xliff:g>..."</string>
     <string name="mediasearch" msgid="959222971261132292">"ค้นหาเกี่ยวกับ <xliff:g id="TERM">%s</xliff:g> โดยใช้:"</string>
     <string name="working_artists" msgid="8678357432732156580">"ศิลปิน..."</string>
     <string name="working_albums" msgid="8713273699401457426">"อัลบั้ม..."</string>
     <string name="working_songs" msgid="2201491972050410684">"เพลง..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"รายการเพลง..."</string>
+    <string name="working_playlists" msgid="4424950806134653351">"เพลย์ลิสต์..."</string>
     <string name="loading" msgid="1991660396037155453">"กำลังโหลด..."</string>
     <string name="sort_by_track" msgid="7662999005554152565">"แทร็ก"</string>
     <string name="sort_by_album" msgid="2912837715658975248">"อัลบั้ม"</string>
diff --git a/res/values-th/strings2.xml b/res/values-th/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-th/strings2.xml
+++ b/res/values-th/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tl/strings2.xml b/res/values-tl/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-tl/strings2.xml
+++ b/res/values-tl/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-tr/strings2.xml b/res/values-tr/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-tr/strings2.xml
+++ b/res/values-tr/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-uk/strings2.xml b/res/values-uk/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-uk/strings2.xml
+++ b/res/values-uk/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-vi/strings2.xml b/res/values-vi/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-vi/strings2.xml
+++ b/res/values-vi/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5b2ae69..05b286c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -51,7 +51,7 @@
     <string name="scanning_nosdcard" msgid="8105284774487360148">"正在扫描 USB 存储设备..."</string>
     <string name="nowplaying_title" msgid="8342523844307751761">"正在播放"</string>
     <string name="partyshuffle_title" msgid="6582413231529992125">"派对随机播放"</string>
-    <string name="artists_title" msgid="8490372367259160067">"艺术家"</string>
+    <string name="artists_title" msgid="8490372367259160067">"音乐人"</string>
     <string name="albums_menu" msgid="5807982055590211900">"专辑"</string>
     <string name="albums_title" msgid="8773880394961378035">"专辑"</string>
     <string name="tracks_menu" msgid="6942246568246092330">"歌曲"</string>
@@ -60,7 +60,7 @@
     <string name="playlists_title" msgid="5094238486322957927">"播放列表"</string>
     <string name="videos_title" msgid="2066741954354129115">"视频"</string>
     <string name="all_title" msgid="6880186414437237653">"所有媒体"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"艺术家"</string>
+    <string name="browse_menu" msgid="5248122473075843289">"音乐人"</string>
     <string name="search_title" msgid="1016971653383739344">"搜索"</string>
     <string name="no_tracks_title" msgid="8805805388271238471">"无歌曲"</string>
     <string name="no_videos_title" msgid="6218814130364793104">"无视频"</string>
@@ -86,7 +86,7 @@
     <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB 存储设备错误"</string>
     <string name="sdcard_error_message" msgid="4574563894036627855">"SD 卡出现错误。"</string>
     <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"USB 存储设备出现错误。"</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"未知艺术家"</string>
+    <string name="unknown_artist_name" msgid="5567811106415855219">"未知音乐人"</string>
     <string name="unknown_album_name" msgid="8525145988941244727">"未知专辑"</string>
     <string name="shuffle_on_notif" msgid="5453708337808483943">"随机播放已打开。"</string>
     <string name="shuffle_off_notif" msgid="4251189610017886263">"随机播放已关闭。"</string>
@@ -139,16 +139,16 @@
     <string name="remove_from_playlist" msgid="2548577514849026354">"从播放列表中删除"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"正在连接<xliff:g id="HOST">%s</xliff:g>..."</string>
     <string name="mediasearch" msgid="959222971261132292">"使用以下工具搜索“<xliff:g id="TERM">%s</xliff:g>”:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"艺术家..."</string>
+    <string name="working_artists" msgid="8678357432732156580">"音乐人..."</string>
     <string name="working_albums" msgid="8713273699401457426">"专辑..."</string>
     <string name="working_songs" msgid="2201491972050410684">"歌曲..."</string>
     <string name="working_playlists" msgid="4424950806134653351">"播放列表..."</string>
     <string name="loading" msgid="1991660396037155453">"正在加载..."</string>
     <string name="sort_by_track" msgid="7662999005554152565">"曲目"</string>
     <string name="sort_by_album" msgid="2912837715658975248">"专辑"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"艺术家"</string>
+    <string name="sort_by_artist" msgid="4607024967813199992">"音乐人"</string>
     <string name="music_picker_title" msgid="4143865470317360605">"选择音乐曲目"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"艺术家、专辑和曲目"</string>
+    <string name="search_settings_description" msgid="6520975349259883368">"音乐人、专辑和曲目"</string>
     <string name="search_hint" msgid="3766854898072633001">"搜索音乐"</string>
     <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="widget_initial_text" msgid="3166878738860903586">"触摸可选择音乐。"</string>
diff --git a/res/values-zh-rCN/strings2.xml b/res/values-zh-rCN/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-zh-rCN/strings2.xml
+++ b/res/values-zh-rCN/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2fa2106..8179242 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -148,7 +148,7 @@
     <string name="sort_by_album" msgid="2912837715658975248">"專輯"</string>
     <string name="sort_by_artist" msgid="4607024967813199992">"演出者"</string>
     <string name="music_picker_title" msgid="4143865470317360605">"選擇音樂曲目"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"演出者、專輯及曲目。"</string>
+    <string name="search_settings_description" msgid="6520975349259883368">"演出者、專輯及曲目"</string>
     <string name="search_hint" msgid="3766854898072633001">"搜尋音樂"</string>
     <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
     <string name="widget_initial_text" msgid="3166878738860903586">"輕觸即可選擇音樂。"</string>
diff --git a/res/values-zh-rTW/strings2.xml b/res/values-zh-rTW/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-zh-rTW/strings2.xml
+++ b/res/values-zh-rTW/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/res/values-zu/strings2.xml b/res/values-zu/strings2.xml
index dd0ea04..4393d0e 100644
--- a/res/values-zu/strings2.xml
+++ b/res/values-zu/strings2.xml
@@ -19,5 +19,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 410fe4f..25d60c7 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -319,17 +319,21 @@
         ComponentName rec = new ComponentName(getPackageName(),
                 MediaButtonIntentReceiver.class.getName());
         mAudioManager.registerMediaButtonEventReceiver(rec);
-        // TODO update to new constructor
-//        mRemoteControlClient = new RemoteControlClient(rec);
-//        mAudioManager.registerRemoteControlClient(mRemoteControlClient);
-//
-//        int flags = RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS
-//                | RemoteControlClient.FLAG_KEY_MEDIA_NEXT
-//                | RemoteControlClient.FLAG_KEY_MEDIA_PLAY
-//                | RemoteControlClient.FLAG_KEY_MEDIA_PAUSE
-//                | RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE
-//                | RemoteControlClient.FLAG_KEY_MEDIA_STOP;
-//        mRemoteControlClient.setTransportControlFlags(flags);
+
+        Intent i = new Intent(Intent.ACTION_MEDIA_BUTTON);
+        i.setComponent(rec);
+        PendingIntent pi = PendingIntent.getBroadcast(this /*context*/,
+                0 /*requestCode, ignored*/, i /*intent*/, 0 /*flags*/);
+        mRemoteControlClient = new RemoteControlClient(pi);
+        mAudioManager.registerRemoteControlClient(mRemoteControlClient);
+
+        int flags = RemoteControlClient.FLAG_KEY_MEDIA_PREVIOUS
+                | RemoteControlClient.FLAG_KEY_MEDIA_NEXT
+                | RemoteControlClient.FLAG_KEY_MEDIA_PLAY
+                | RemoteControlClient.FLAG_KEY_MEDIA_PAUSE
+                | RemoteControlClient.FLAG_KEY_MEDIA_PLAY_PAUSE
+                | RemoteControlClient.FLAG_KEY_MEDIA_STOP;
+        mRemoteControlClient.setTransportControlFlags(flags);
         
         mPreferences = getSharedPreferences("Music", MODE_WORLD_READABLE | MODE_WORLD_WRITEABLE);
         mCardId = MusicUtils.getCardId(this);
@@ -377,7 +381,7 @@
         mPlayer = null;
 
         mAudioManager.abandonAudioFocus(mAudioFocusListener);
-        //mAudioManager.unregisterRemoteControlClient(mRemoteControlClient);
+        mAudioManager.unregisterRemoteControlClient(mRemoteControlClient);
         
         // make sure there aren't any other messages coming
         mDelayedStopHandler.removeCallbacksAndMessages(null);
@@ -797,19 +801,19 @@
         sendStickyBroadcast(i);
 
         if (what.equals(PLAYSTATE_CHANGED)) {
-//            mRemoteControlClient.setPlaybackState(isPlaying() ?
-//                    RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
+            mRemoteControlClient.setPlaybackState(isPlaying() ?
+                    RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
         } else if (what.equals(META_CHANGED)) {
-//            RemoteControlClient.MetadataEditor ed = mRemoteControlClient.editMetadata(true);
-//            ed.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, getTrackName());
-//            ed.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, getAlbumName());
-//            ed.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, getArtistName());
-//            ed.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration());
-//            Bitmap b = MusicUtils.getArtwork(this, getAudioId(), getAlbumId(), false);
-//            if (b != null) {
-//                ed.putBitmap(MetadataEditor.BITMAP_KEY_ARTWORK, b);
-//            }
-//            ed.apply();
+            RemoteControlClient.MetadataEditor ed = mRemoteControlClient.editMetadata(true);
+            ed.putString(MediaMetadataRetriever.METADATA_KEY_TITLE, getTrackName());
+            ed.putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, getAlbumName());
+            ed.putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, getArtistName());
+            ed.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration());
+            Bitmap b = MusicUtils.getArtwork(this, getAudioId(), getAlbumId(), false);
+            if (b != null) {
+                ed.putBitmap(MetadataEditor.BITMAP_KEY_ARTWORK, b);
+            }
+            ed.apply();
         }
 
         if (what.equals(QUEUE_CHANGED)) {