resolved conflicts for merge of 7790a210 to master
diff --git a/res/layout-finger/audio_player_common.xml b/res/layout-finger/audio_player_common.xml
index 95320d9..6e14f75 100644
--- a/res/layout-finger/audio_player_common.xml
+++ b/res/layout-finger/audio_player_common.xml
@@ -25,8 +25,8 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="#ff5a5a5a"
-        android:paddingTop="1px"
-        android:paddingBottom="4px"
+        android:paddingTop="1dip"
+        android:paddingBottom="4dip"
         android:orientation="horizontal">
 
         <TextView android:id="@+id/currenttime"
@@ -40,7 +40,7 @@
             android:layout_gravity="bottom"
             android:layout_weight="1"
             android:layout_width="0dip"
-            android:paddingLeft="5px"
+            android:paddingLeft="5dip"
             android:layout_height="wrap_content" />
 
         <LinearLayout
@@ -48,8 +48,8 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_gravity="bottom"
-            android:layout_marginTop="1px"
-            android:layout_marginBottom="2px"
+            android:layout_marginTop="1dip"
+            android:layout_marginBottom="2dip"
             android:gravity="center">
 
             <com.android.music.RepeatingImageButton android:id="@+id/prev" style="@android:style/MediaButton.Previous" />
@@ -69,7 +69,7 @@
             android:shadowDy="0"
             android:shadowRadius="3"
             android:gravity="right"
-            android:paddingRight="5px"
+            android:paddingRight="5dip"
             android:layout_gravity="bottom"
             android:layout_weight="1"
             android:layout_width="0dip"
@@ -81,9 +81,9 @@
         android:background="#ff5a5a5a"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="fill_parent"
-        android:layout_height="36px"
-        android:paddingLeft="5px"
-        android:paddingRight="5px"
-        android:paddingBottom="4px" />
+        android:layout_height="36dip"
+        android:paddingLeft="5dip"
+        android:paddingRight="5dip"
+        android:paddingBottom="4dip" />
 
 </merge>
diff --git a/res/layout-finger/confirm_delete.xml b/res/layout-finger/confirm_delete.xml
index be8d7ec..1fdf3fc 100644
--- a/res/layout-finger/confirm_delete.xml
+++ b/res/layout-finger/confirm_delete.xml
@@ -31,17 +31,17 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="6px"
+        android:padding="6dip"
         android:background="#ffffff" >
 
         <Button android:id="@+id/delete"
-            android:layout_width="120px" android:layout_height="wrap_content" 
+            android:layout_width="120dip" android:layout_height="wrap_content" 
             android:text="@string/delete_confirm_button_text"
             android:layout_gravity="center_horizontal"
             android:layout_alignParentLeft="true" />
 
         <Button android:id="@+id/cancel"
-            android:layout_width="120px" android:layout_height="wrap_content" 
+            android:layout_width="120dip" android:layout_height="wrap_content" 
             android:text="@string/cancel"
             android:layout_alignParentRight="true" />
 
diff --git a/res/layout-finger/weekpicker.xml b/res/layout-finger/weekpicker.xml
index 00ced6f..053a1e2 100644
--- a/res/layout-finger/weekpicker.xml
+++ b/res/layout-finger/weekpicker.xml
@@ -39,25 +39,25 @@
         android:focusable="true"
         android:focusableInTouchMode="true"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="6px"
-        android:layout_marginBottom="6px"
+        android:layout_marginTop="6dip"
+        android:layout_marginBottom="6dip"
         />
     
     <!-- Set button -->
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="6px"
+        android:padding="6dip"
         android:background="#ffffff" >
 
         <Button android:id="@+id/set"
-            android:layout_width="120px"
+            android:layout_width="120dip"
             android:layout_height="wrap_content"
             android:text="@string/weekpicker_set"
             android:layout_alignParentLeft="true" />
 
         <Button android:id="@+id/cancel"
-            android:layout_width="120px"
+            android:layout_width="120dip"
             android:layout_height="wrap_content" 
             android:text="@string/cancel"
             android:layout_alignParentRight="true" />
diff --git a/res/layout-keysexposed/create_playlist.xml b/res/layout-keysexposed/create_playlist.xml
index 1bf2252..9a91a46 100644
--- a/res/layout-keysexposed/create_playlist.xml
+++ b/res/layout-keysexposed/create_playlist.xml
@@ -40,16 +40,16 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="6px"
+        android:padding="6dip"
         android:background="#ffffff" >
 
         <Button android:id="@+id/create"
-            android:layout_width="120px" android:layout_height="wrap_content" 
+            android:layout_width="120dip" android:layout_height="wrap_content" 
             android:text="@string/create_playlist_create_text"
             android:layout_alignParentLeft="true" />
 
         <Button android:id="@+id/cancel"
-            android:layout_width="120px" android:layout_height="wrap_content" 
+            android:layout_width="120dip" android:layout_height="wrap_content" 
             android:text="@string/cancel"
             android:layout_alignParentRight="true" />
 
diff --git a/res/layout-keyshidden/create_playlist.xml b/res/layout-keyshidden/create_playlist.xml
index bb5c6ac..675228b 100644
--- a/res/layout-keyshidden/create_playlist.xml
+++ b/res/layout-keyshidden/create_playlist.xml
@@ -51,16 +51,16 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:padding="6px"
+        android:padding="6dip"
         android:background="#ffffff" >
 
         <Button android:id="@+id/create"
-            android:layout_width="120px" android:layout_height="wrap_content" 
+            android:layout_width="120dip" android:layout_height="wrap_content" 
             android:text="@string/create_playlist_create_text"
             android:layout_alignParentLeft="true" />
 
         <Button android:id="@+id/cancel"
-            android:layout_width="120px" android:layout_height="wrap_content" 
+            android:layout_width="120dip" android:layout_height="wrap_content" 
             android:text="@string/cancel"
             android:layout_alignParentRight="true" />
 
diff --git a/res/layout/scanning.xml b/res/layout/scanning.xml
index ff3caa6..c4aa9ad 100644
--- a/res/layout/scanning.xml
+++ b/res/layout/scanning.xml
@@ -18,7 +18,7 @@
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:padding="12px">
+    android:padding="12dip">
 
     <ProgressBar android:id="@+id/spinner"
         style="?android:attr/progressBarStyleLarge"
diff --git a/res/values-cs-finger/strings2.xml b/res/values-cs-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-cs-finger/strings2.xml
+++ b/res/values-cs-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-cs-keysexposed/strings.xml
index f184494..ffba993 100644
--- a/res/values-cs-keysexposed/strings.xml
+++ b/res/values-cs-keysexposed/strings.xml
@@ -15,7 +15,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">"Název seznamu stop"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Přejmenovat seznam stop <xliff:g id="PLAYLIST">%s</xliff:g> na"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Přejmenovat seznam stop <xliff:g id="PLAYLIST">%s</xliff:g> na"</string>
+    <string name="create_playlist_create_text_prompt">"Název seznamu stop"</string>
+    <string name="rename_playlist_same_prompt">"Přejmenovat seznam stop <xliff:g id="PLAYLIST">%s</xliff:g> na"</string>
+    <string name="rename_playlist_diff_prompt">"Přejmenovat seznam stop <xliff:g id="PLAYLIST">%s</xliff:g> na"</string>
 </resources>
diff --git a/res/values-cs-keyshidden/strings.xml b/res/values-cs-keyshidden/strings.xml
index b1e81c6..96fd750 100644
--- a/res/values-cs-keyshidden/strings.xml
+++ b/res/values-cs-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Otevřete klávesnici a zadejte název nového seznamu stop. Pokud zvolíte tlačítko Uložit, seznamu stop bude přidělen název %s."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Otevřete klávesnici a zadejte nový název seznamu stop <xliff:g id="PLAYLIST">%s</xliff:g>."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Otevřete klávesnici a zadejte nový název seznamu stop <xliff:g id="PLAYLIST">%s</xliff:g>, nebo zvolte tlačítko Uložit a seznamu stop bude přidělen název %s."</string>
+    <string name="create_playlist_create_text_prompt">"Otevřete klávesnici a zadejte název nového seznamu stop. Pokud zvolíte tlačítko Uložit, seznamu stop bude přidělen název %s."</string>
+    <string name="rename_playlist_same_prompt">"Otevřete klávesnici a zadejte nový název seznamu stop <xliff:g id="PLAYLIST">%s</xliff:g>."</string>
+    <string name="rename_playlist_diff_prompt">"Otevřete klávesnici a zadejte nový název seznamu stop <xliff:g id="PLAYLIST">%s</xliff:g>, nebo zvolte tlačítko Uložit a seznamu stop bude přidělen název %s."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7e33447..b43e378 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 skladba"</string>
+    <string name="onesong">"1 skladba"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"Počet skladeb: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    <item quantity="other">"Počet skladeb: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> z celkem <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> skladeb"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> z celkem <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> skladeb"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"Počet alb: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"Počet alb: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Knihovna"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Přehrávání"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Náhodně – všechny"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Vypnout náhodné přehrávání všeho"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Smazat"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Náhodně – aktuální seznam"</string>
-    <string name="play_all" msgid="6309622568869321842">"Přehrát vše"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Všechny skladby interpreta <xliff:g id="ARTIST">%s</xliff:g> budou trvale smazány z karty SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Celé album <xliff:g id="ALBUM">%s</xliff:g> bude trvale smazáno z karty SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"Skladba <xliff:g id="SONG">%s</xliff:g> bude trvale smazána z karty SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Knihovna"</string>
+    <string name="goto_playback">"Přehrávání"</string>
+    <string name="party_shuffle">"Náhodně – všechny"</string>
+    <string name="party_shuffle_off">"Vypnout náhodné přehrávání všeho"</string>
+    <string name="delete_item">"Smazat"</string>
+    <string name="shuffle_all">"Náhodně – aktuální seznam"</string>
+    <string name="play_all">"Přehrát vše"</string>
+    <string name="delete_artist_desc">"Všechny skladby interpreta <xliff:g id="ARTIST">%s</xliff:g> budou trvale smazány z karty SD."</string>
+    <string name="delete_album_desc">"Celé album <xliff:g id="ALBUM">%s</xliff:g> bude trvale smazáno z karty SD."</string>
+    <string name="delete_song_desc">"Skladba <xliff:g id="SONG">%s</xliff:g> bude trvale smazána z karty SD."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"Byla smazána 1 skladba."</item>
-    <item quantity="other" msgid="5156740163031225200">"Smazané skladby: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
+    <item quantity="one">"Byla smazána 1 skladba."</item>
+    <item quantity="other">"Smazané skladby: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Vyhledávání na kartě SD..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Nyní se přehrává"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Náhodně – všechny"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Interpreti"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Alba"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Alba"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Skladby"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Skladby"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Seznamy stop"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Seznamy stop"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Videa"</string>
-    <string name="all_title" msgid="6880186414437237653">"Všechna média"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Interpreti"</string>
-    <string name="search_title" msgid="1016971653383739344">"Hledat"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Žádné skladby"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Žádná videa"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Žádné seznamy stop"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Smazat"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Upravit"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Přejmenovat"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Seznam stop byl smazán."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Seznam stop byl přejmenován."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Nedávno přidané"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Nedávno přidané"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasty"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasty"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Žádná karta SD není dostupná"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"V telefonu není vložena karta SD."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Karta SD není dostupná"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Karta SD je zaneprázdněna."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Chyba karty SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Na kartě SD došlo k chybě."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Neznámý interpret"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Neznámé album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Náhodné přehrávání je zapnuto."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Náhodné přehrávání je vypnuto."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Opakování je vypnuto."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Opakování aktuální skladby."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Opakování všech skladeb."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Použít jako vyzváněcí tón telefonu"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Použít jako vyzváněcí tón"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"Skladba %s 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="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>
+    <string name="scanning">"Vyhledávání na kartě SD..."</string>
+    <string name="nowplaying_title">"Nyní se přehrává"</string>
+    <string name="partyshuffle_title">"Náhodně – všechny"</string>
+    <string name="artists_title">"Interpreti"</string>
+    <string name="albums_menu">"Alba"</string>
+    <string name="albums_title">"Alba"</string>
+    <string name="tracks_menu">"Skladby"</string>
+    <string name="tracks_title">"Skladby"</string>
+    <string name="playlists_menu">"Seznamy stop"</string>
+    <string name="playlists_title">"Seznamy stop"</string>
+    <string name="videos_title">"Videa"</string>
+    <string name="all_title">"Všechna média"</string>
+    <string name="browse_menu">"Interpreti"</string>
+    <string name="search_title">"Hledat"</string>
+    <string name="no_tracks_title">"Žádné skladby"</string>
+    <string name="no_videos_title">"Žádná videa"</string>
+    <string name="no_playlists_title">"Žádné seznamy stop"</string>
+    <string name="delete_playlist_menu">"Smazat"</string>
+    <string name="edit_playlist_menu">"Upravit"</string>
+    <string name="rename_playlist_menu">"Přejmenovat"</string>
+    <string name="playlist_deleted_message">"Seznam stop byl smazán."</string>
+    <string name="playlist_renamed_message">"Seznam stop byl přejmenován."</string>
+    <string name="recentlyadded">"Nedávno přidané"</string>
+    <string name="recentlyadded_title">"Nedávno přidané"</string>
+    <string name="podcasts_listitem">"Podcasty"</string>
+    <string name="podcasts_title">"Podcasty"</string>
+    <string name="sdcard_missing_title">"Žádná karta SD není dostupná"</string>
+    <string name="sdcard_missing_message">"V telefonu není vložena karta SD."</string>
+    <string name="sdcard_busy_title">"Karta SD není dostupná"</string>
+    <string name="sdcard_busy_message">"Karta SD je zaneprázdněna."</string>
+    <string name="sdcard_error_title">"Chyba karty SD"</string>
+    <string name="sdcard_error_message">"Na kartě SD došlo k chybě."</string>
+    <string name="unknown_artist_name">"Neznámý interpret"</string>
+    <string name="unknown_album_name">"Neznámé album"</string>
+    <string name="shuffle_on_notif">"Náhodné přehrávání je zapnuto."</string>
+    <string name="shuffle_off_notif">"Náhodné přehrávání je vypnuto."</string>
+    <string name="repeat_off_notif">"Opakování je vypnuto."</string>
+    <string name="repeat_current_notif">"Opakování aktuální skladby."</string>
+    <string name="repeat_all_notif">"Opakování všech skladeb."</string>
+    <string name="ringtone_menu">"Použít jako vyzváněcí tón telefonu"</string>
+    <string name="ringtone_menu_short">"Použít jako vyzváněcí tón"</string>
+    <string name="ringtone_set">"Skladba %s byla nastavena jako vyzváněcí tón."</string>
+    <string name="play_selection">"Přehrát"</string>
+    <string name="add_to_playlist">"Přidat do seznamu stop"</string>
+    <string name="queue">"Aktuální seznam stop"</string>
+    <string name="new_playlist">"Nové"</string>
+    <string name="new_playlist_name_template">"Nový seznam stop <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 skladba byla přidána do seznamu stop."</item>
-    <item quantity="other" msgid="7675242021325355213">"Skladby přidány do seznamu stop: %d."</item>
+    <item quantity="one">"1 skladba byla přidána do seznamu stop."</item>
+    <item quantity="other">"Skladby přidány do seznamu stop: %d."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Vybraný seznam stop je prázdný."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Uložit"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Přepsat"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problém s přehráváním"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Skladbu nelze přehrát."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Vybraný seznam stop je prázdný."</string>
+    <string name="create_playlist_create_text">"Uložit"</string>
+    <string name="create_playlist_overwrite_text">"Přepsat"</string>
+    <string name="service_start_error_title">"Problém s přehráváním"</string>
+    <string name="service_start_error_msg">"Skladbu nelze přehrát."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 týden"</item>
-    <item msgid="7487749116155425822">"2 týdny"</item>
-    <item msgid="1565338360539555185">"3 týdny"</item>
-    <item msgid="2142986059836933072">"4 týdny"</item>
-    <item msgid="4332403875260507291">"5 týdnů"</item>
-    <item msgid="3847281907869868565">"6 týdnů"</item>
-    <item msgid="2942654998558867799">"7 týdnů"</item>
-    <item msgid="2115529325850052227">"8 týdnů"</item>
-    <item msgid="1396675336665198092">"9 týdnů"</item>
-    <item msgid="3178819129208998649">"10 týdnů"</item>
-    <item msgid="2727959579637914171">"11 týdnů"</item>
-    <item msgid="8708754966127584739">"12 týdnů"</item>
+    <item>"1 týden"</item>
+    <item>"2 týdny"</item>
+    <item>"3 týdny"</item>
+    <item>"4 týdny"</item>
+    <item>"5 týdnů"</item>
+    <item>"6 týdnů"</item>
+    <item>"7 týdnů"</item>
+    <item>"8 týdnů"</item>
+    <item>"9 týdnů"</item>
+    <item>"10 týdnů"</item>
+    <item>"11 týdnů"</item>
+    <item>"12 týdnů"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Hotovo"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Nastavit čas"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Uložit jako seznam stop"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Vymazat seznam stop"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Hudba"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Seznam skladeb"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Hudba"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videa"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Hudba"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Přehrávač nepodporuje tento typ zvukových souborů."</string>
-    <string name="cancel" msgid="886559484711947520">"Zrušit"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Odstranit ze seznamu stop"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Připojování k proudu <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Vyhledat skladbu %s pomocí:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Interpreti…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Alba…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Skladby…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Seznamy stop…"</string>
-    <string name="loading" msgid="3267924133697717662">"Načítání"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Stopy"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Alba"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Interpreti"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Vyberte hudební stopu"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Stopa <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"Přehrání požadovaného datového proudu se nezdařilo."</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Interpreti, alba a stopy"</string>
+    <string name="weekpicker_set">"Hotovo"</string>
+    <string name="weekpicker_title">"Nastavit čas"</string>
+    <string name="save_as_playlist">"Uložit jako seznam stop"</string>
+    <string name="clear_playlist">"Vymazat seznam stop"</string>
+    <string name="musicbrowserlabel">"Hudba"</string>
+    <string name="musicshortcutlabel">"Seznam skladeb"</string>
+    <string name="mediaplaybacklabel">"Hudba"</string>
+    <string name="videobrowserlabel">"Videa"</string>
+    <string name="mediapickerlabel">"Hudba"</string>
+    <string name="playback_failed">"Přehrávač nepodporuje tento typ zvukových souborů."</string>
+    <string name="cancel">"Zrušit"</string>
+    <string name="remove_from_playlist">"Odstranit ze seznamu stop"</string>
+    <string name="streamloadingtext">"Připojování k proudu <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Vyhledat skladbu %s pomocí:"</string>
+    <string name="working_artists">"Interpreti…"</string>
+    <string name="working_albums">"Alba…"</string>
+    <string name="working_songs">"Skladby…"</string>
+    <string name="working_playlists">"Seznamy stop…"</string>
+    <string name="loading">"Načítání"</string>
+    <string name="sort_by_track">"Stopy"</string>
+    <string name="sort_by_album">"Alba"</string>
+    <string name="sort_by_artist">"Interpreti"</string>
+    <string name="music_picker_title">"Vyberte hudební stopu"</string>
+    <string name="gadget_track">"Stopa <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"Přehrání požadovaného datového proudu se nezdařilo."</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-da-finger/strings2.xml b/res/values-da-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-da-finger/strings2.xml
+++ b/res/values-da-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-da-keysexposed/strings.xml
index 52019a6..f21aa99 100644
--- a/res/values-da-keysexposed/strings.xml
+++ b/res/values-da-keysexposed/strings.xml
@@ -15,7 +15,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">"Afspilningslistens navn"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Omdøb \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Omdøb \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
+    <string name="create_playlist_create_text_prompt">"Afspilningslistens navn"</string>
+    <string name="rename_playlist_same_prompt">"Omdøb \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
+    <string name="rename_playlist_diff_prompt">"Omdøb \"<xliff:g id="PLAYLIST">%s</xliff:g>\" til"</string>
 </resources>
diff --git a/res/values-da-keyshidden/strings.xml b/res/values-da-keyshidden/strings.xml
index 4e1a59a..957e03f 100644
--- a/res/values-da-keyshidden/strings.xml
+++ b/res/values-da-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Åbn tastaturet for at give din nye afspilningsliste et navn, eller vælg Gem for at give den navnet \"%s\"."</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="6930730254920388535">"Åbn tastaturet for at give afspilningslisten \"<xliff:g id="PLAYLIST">%s</xliff:g>\" et navn, eller vælg Gem for at give den navnet \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Åbn tastaturet for at give din nye afspilningsliste et navn, eller vælg Gem for at give den navnet \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Åbn tastaturet for at give afspilningslisten \"<xliff:g id="PLAYLIST">%s</xliff:g>\" et nyt navn."</string>
+    <string name="rename_playlist_diff_prompt">"Åbn tastaturet for at give afspilningslisten \"<xliff:g id="PLAYLIST">%s</xliff:g>\" et navn, eller vælg Gem for at give den navnet \"%s\"."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 292be5e..66de33d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 sang"</string>
+    <string name="onesong">"1 sang"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> sange"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> sange"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> af <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> sange"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> af <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> sange"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albummer"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> albummer"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Bibliotek"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Afspilning"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Festmix"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Festmix er slået fra"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Slet"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Bland alle"</string>
-    <string name="play_all" msgid="6309622568869321842">"Spil alle"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Alle sange af <xliff:g id="ARTIST">%s</xliff:g> slettes permanent fra SD-kortet."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Hele albummet \"<xliff:g id="ALBUM">%s</xliff:g>\" slettes permanent fra SD-kortet."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" slettes permanent fra SD-kortet."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Bibliotek"</string>
+    <string name="goto_playback">"Afspilning"</string>
+    <string name="party_shuffle">"Festmix"</string>
+    <string name="party_shuffle_off">"Festmix er slået fra"</string>
+    <string name="delete_item">"Slet"</string>
+    <string name="shuffle_all">"Bland alle"</string>
+    <string name="play_all">"Spil alle"</string>
+    <string name="delete_artist_desc">"Alle sange af <xliff:g id="ARTIST">%s</xliff:g> slettes permanent fra SD-kortet."</string>
+    <string name="delete_album_desc">"Hele albummet \"<xliff:g id="ALBUM">%s</xliff:g>\" slettes permanent fra SD-kortet."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" slettes permanent fra SD-kortet."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"Der blev slettet 1 sang."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> sange blev slettet."</item>
+    <item quantity="one">"Der blev slettet 1 sang."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> sange blev slettet."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Scanner SD-kort ..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Spiller nu"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Festmix"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Kunstnere"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Albummer"</string>
-    <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">"Afspiln.liste"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Afspiln.liste"</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="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="recentlyadded" msgid="110978416756366953">"Tilføjet for nyligt"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Tilføjet for nyligt"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Der er intet SD-kort"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Der er ikke indsat et SD-kort i din telefon."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD-kortet er ikke tilgængeligt"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Beklager! Dit SD-kort er optaget."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD-kortfejl"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Der opstod en fejl på dit SD-kort."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Ukendt kunstner"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Ukendt album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Bland er slået til."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Bland er slået fra."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Gentagelse er slået fra."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Den aktuelle sang gentages."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Gentager alle sange."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Brug som telefonringetone"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Brug som ringetone"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" 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="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="scanning">"Scanner SD-kort ..."</string>
+    <string name="nowplaying_title">"Spiller nu"</string>
+    <string name="partyshuffle_title">"Festmix"</string>
+    <string name="artists_title">"Kunstnere"</string>
+    <string name="albums_menu">"Albummer"</string>
+    <string name="albums_title">"Albummer"</string>
+    <string name="tracks_menu">"Sange"</string>
+    <string name="tracks_title">"Sange"</string>
+    <string name="playlists_menu">"Afspilningslister"</string>
+    <string name="playlists_title">"Afspilningslister"</string>
+    <string name="videos_title">"Videoer"</string>
+    <string name="all_title">"Alle medier"</string>
+    <string name="browse_menu">"Kunstnere"</string>
+    <string name="search_title">"Søg"</string>
+    <string name="no_tracks_title">"Der er ingen sange"</string>
+    <string name="no_videos_title">"Der er ingen videoer"</string>
+    <string name="no_playlists_title">"Der er ingen afspilningslister"</string>
+    <string name="delete_playlist_menu">"Slet"</string>
+    <string name="edit_playlist_menu">"Rediger"</string>
+    <string name="rename_playlist_menu">"Omdøb"</string>
+    <string name="playlist_deleted_message">"Afspilningsliste slettet."</string>
+    <string name="playlist_renamed_message">"Afspilningslisten er omdøbt."</string>
+    <string name="recentlyadded">"Tilføjet for nyligt"</string>
+    <string name="recentlyadded_title">"Tilføjet for nyligt"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Der er intet SD-kort"</string>
+    <string name="sdcard_missing_message">"Der er ikke indsat et SD-kort i din telefon."</string>
+    <string name="sdcard_busy_title">"SD-kortet er ikke tilgængeligt"</string>
+    <string name="sdcard_busy_message">"Beklager! Dit SD-kort er optaget."</string>
+    <string name="sdcard_error_title">"SD-kortfejl"</string>
+    <string name="sdcard_error_message">"Der opstod en fejl på dit SD-kort."</string>
+    <string name="unknown_artist_name">"Ukendt kunstner"</string>
+    <string name="unknown_album_name">"Ukendt album"</string>
+    <string name="shuffle_on_notif">"Bland er slået til."</string>
+    <string name="shuffle_off_notif">"Bland er slået fra."</string>
+    <string name="repeat_off_notif">"Gentagelse er slået fra."</string>
+    <string name="repeat_current_notif">"Den aktuelle sang gentages."</string>
+    <string name="repeat_all_notif">"Gentager alle sange."</string>
+    <string name="ringtone_menu">"Brug som telefonringetone"</string>
+    <string name="ringtone_menu_short">"Brug som ringetone"</string>
+    <string name="ringtone_set">"\"%s\" er indstillet som ringetone for telefonen."</string>
+    <string name="play_selection">"Afspil"</string>
+    <string name="add_to_playlist">"Føj til afspilningsliste"</string>
+    <string name="queue">"Aktuel afspilningsliste"</string>
+    <string name="new_playlist">"Ny"</string>
+    <string name="new_playlist_name_template">"Ny afspilningsliste <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="7675242021325355213">"%d sange føjet til afspilningsliste."</item>
+    <item quantity="one">"Der blev føjet 1 sang til afspilningslisten."</item>
+    <item quantity="other">"%d sange føjet til afspilningsliste."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Den valgte afspilningsliste 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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Beklager! Sangen kunne ikke spilles."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Den valgte afspilningsliste er tom."</string>
+    <string name="create_playlist_create_text">"Gem"</string>
+    <string name="create_playlist_overwrite_text">"Overskriv"</string>
+    <string name="service_start_error_title">"Afspilningsproblem"</string>
+    <string name="service_start_error_msg">"Beklager! Sangen kunne ikke spilles."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 uge"</item>
-    <item msgid="7487749116155425822">"2 uger"</item>
-    <item msgid="1565338360539555185">"3 uger"</item>
-    <item msgid="2142986059836933072">"4 uger"</item>
-    <item msgid="4332403875260507291">"5 uger"</item>
-    <item msgid="3847281907869868565">"6 uger"</item>
-    <item msgid="2942654998558867799">"7 uger"</item>
-    <item msgid="2115529325850052227">"8 uger"</item>
-    <item msgid="1396675336665198092">"9 uger"</item>
-    <item msgid="3178819129208998649">"10 uger"</item>
-    <item msgid="2727959579637914171">"11 uger"</item>
-    <item msgid="8708754966127584739">"12 uger"</item>
+    <item>"1 uge"</item>
+    <item>"2 uger"</item>
+    <item>"3 uger"</item>
+    <item>"4 uger"</item>
+    <item>"5 uger"</item>
+    <item>"6 uger"</item>
+    <item>"7 uger"</item>
+    <item>"8 uger"</item>
+    <item>"9 uger"</item>
+    <item>"10 uger"</item>
+    <item>"11 uger"</item>
+    <item>"12 uger"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Færdig"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Indstil tid"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Gem som afspilningsliste"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Ryd afspilningsliste"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Musik"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Musikafspilningsliste"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musik"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videoer"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Musik"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Beklager! 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="streamloadingtext" msgid="3367150884806639224">"Forbinder til <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Søg efter %s 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="loading" msgid="3267924133697717662">"Indlæser"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Numre"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Albummer"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Kunstnere"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Vælg musiknummer"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Nummer <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Færdig"</string>
+    <string name="weekpicker_title">"Indstil tid"</string>
+    <string name="save_as_playlist">"Gem som afspilningsliste"</string>
+    <string name="clear_playlist">"Ryd afspilningsliste"</string>
+    <string name="musicbrowserlabel">"Musik"</string>
+    <string name="musicshortcutlabel">"Musikafspilningsliste"</string>
+    <string name="mediaplaybacklabel">"Musik"</string>
+    <string name="videobrowserlabel">"Videoer"</string>
+    <string name="mediapickerlabel">"Musik"</string>
+    <string name="playback_failed">"Beklager! Afspilleren understøtter ikke denne slags lydfiler."</string>
+    <string name="cancel">"Annuller"</string>
+    <string name="remove_from_playlist">"Fjern fra afspilningsliste"</string>
+    <string name="streamloadingtext">"Forbinder til <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Søg efter %s ved hjælp af:"</string>
+    <string name="working_artists">"Kunstnere ..."</string>
+    <string name="working_albums">"Albummer ..."</string>
+    <string name="working_songs">"Sange ..."</string>
+    <string name="working_playlists">"Afspilningslister ..."</string>
+    <string name="loading">"Indlæser"</string>
+    <string name="sort_by_track">"Numre"</string>
+    <string name="sort_by_album">"Albummer"</string>
+    <string name="sort_by_artist">"Kunstnere"</string>
+    <string name="music_picker_title">"Vælg musiknummer"</string>
+    <string name="gadget_track">"Nummer <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-de-finger/strings2.xml b/res/values-de-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-de-finger/strings2.xml
+++ b/res/values-de-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-de-keysexposed/strings.xml
index dad3463..6ec704b 100644
--- a/res/values-de-keysexposed/strings.xml
+++ b/res/values-de-keysexposed/strings.xml
@@ -15,7 +15,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">"Name der Playlist"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" umbenennen in"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" umbenennen in"</string>
+    <string name="create_playlist_create_text_prompt">"Name der Playlist"</string>
+    <string name="rename_playlist_same_prompt">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" umbenennen in"</string>
+    <string name="rename_playlist_diff_prompt">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" umbenennen in"</string>
 </resources>
diff --git a/res/values-de-keyshidden/strings.xml b/res/values-de-keyshidden/strings.xml
index 0afe514..fbc866f 100644
--- a/res/values-de-keyshidden/strings.xml
+++ b/res/values-de-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Ziehen Sie die Tastatur heraus, um für die neue Playlist einen Namen festzulegen, oder wählen Sie \"Speichern\", um sie mit dem Namen \"%s\" zu speichern."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Ziehen Sie die Tastatur heraus, um \"<xliff:g id="PLAYLIST">%s</xliff:g>\" umzubenennen."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Ziehen Sie die Tastatur heraus, um die Playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" umzubenennen, oder wählen Sie \"Speichern\", um sie mit dem Namen \"%s\" zu speichern."</string>
+    <string name="create_playlist_create_text_prompt">"Ziehen Sie die Tastatur heraus, um für die neue Playlist einen Namen festzulegen, oder wählen Sie \"Speichern\", um sie mit dem Namen \"%s\" zu speichern."</string>
+    <string name="rename_playlist_same_prompt">"Ziehen Sie die Tastatur heraus, um \"<xliff:g id="PLAYLIST">%s</xliff:g>\" umzubenennen."</string>
+    <string name="rename_playlist_diff_prompt">"Ziehen Sie die Tastatur heraus, um die Playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" umzubenennen, oder wählen Sie \"Speichern\", um sie mit dem Namen \"%s\" zu speichern."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 400e070..52d009d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 Titel"</string>
+    <string name="onesong">"1 Titel"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> Titel"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> Titel"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> von \n<xliff:g id="TOTAL_COUNT">%1$d</xliff:g> Liedern"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> von \n<xliff:g id="TOTAL_COUNT">%1$d</xliff:g> Liedern"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 Album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> Alben"</item>
+    <item quantity="one">"1 Album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> Alben"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Bibliothek"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Wiedergeben"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Party-Shuffle"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Party-Shuffle deaktivieren"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Löschen"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Alle zufällig wiedergeben"</string>
-    <string name="play_all" msgid="6309622568869321842">"Alle wiedergeben"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Alle Titel von <xliff:g id="ARTIST">%s</xliff:g> werden endgültig von der SD-Karte gelöscht."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Das gesamte Album \"<xliff:g id="ALBUM">%s</xliff:g>\" wird endgültig von der SD-Karte gelöscht."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" wird endgültig von der SD-Karte gelöscht."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Bibliothek"</string>
+    <string name="goto_playback">"Wiedergeben"</string>
+    <string name="party_shuffle">"Party-Shuffle"</string>
+    <string name="party_shuffle_off">"Party-Shuffle deaktivieren"</string>
+    <string name="delete_item">"Löschen"</string>
+    <string name="shuffle_all">"Alle zufällig wiedergeben"</string>
+    <string name="play_all">"Alle wiedergeben"</string>
+    <string name="delete_artist_desc">"Alle Titel von <xliff:g id="ARTIST">%s</xliff:g> werden endgültig von der SD-Karte gelöscht."</string>
+    <string name="delete_album_desc">"Das gesamte Album \"<xliff:g id="ALBUM">%s</xliff:g>\" wird endgültig von der SD-Karte gelöscht."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" wird endgültig von der SD-Karte gelöscht."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 Titel wurde gelöscht."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> Titel wurden gelöscht."</item>
+    <item quantity="one">"1 Titel wurde gelöscht."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> Titel wurden gelöscht."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"SD-Karte wird gelesenen..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Aktuelle Wiedergabe"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Party-Shuffle"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Interpreten"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Alben"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Alben"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Titel"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Titel"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Playlists"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Playlists"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Videos"</string>
-    <string name="all_title" msgid="6880186414437237653">"Alle Medien"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Interpreten"</string>
-    <string name="search_title" msgid="1016971653383739344">"Suchen"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Keine Titel"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Keine Videos"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Keine Playlists"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Löschen"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Bearbeiten"</string>
-    <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="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>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Es befindet sich keine SD-Karte im Telefon."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD-Karte nicht verfügbar"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Die SD-Karte ist ausgelastet."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD-Kartenfehler"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Bei der SD-Karte ist ein Fehler aufgetreten."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Unbekannter Interpret"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Unbekanntes Album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Zufallswiedergabe ist aktiviert."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Zufallswiedergabe ist deaktiviert."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Wiederholung ist deaktiviert."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Aktueller Titel wird wiederholt."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Alle Titel werden wiederholt."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Als Telefonklingelton verwenden"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Als Klingelton verwenden"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" als Telefonklingelton eingestellt"</string>
-    <string name="play_selection" msgid="2854921021814550018">"Wiedergeben"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Zur Playlist hinzufügen"</string>
-    <string name="queue" msgid="2937629819482787704">"Aktuelle Playlist"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Neu"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Neue Playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"SD-Karte wird gelesenen..."</string>
+    <string name="nowplaying_title">"Aktuelle Wiedergabe"</string>
+    <string name="partyshuffle_title">"Party-Shuffle"</string>
+    <string name="artists_title">"Interpreten"</string>
+    <string name="albums_menu">"Alben"</string>
+    <string name="albums_title">"Alben"</string>
+    <string name="tracks_menu">"Titel"</string>
+    <string name="tracks_title">"Titel"</string>
+    <string name="playlists_menu">"Playlists"</string>
+    <string name="playlists_title">"Playlists"</string>
+    <string name="videos_title">"Videos"</string>
+    <string name="all_title">"Alle Medien"</string>
+    <string name="browse_menu">"Interpreten"</string>
+    <string name="search_title">"Suchen"</string>
+    <string name="no_tracks_title">"Keine Titel"</string>
+    <string name="no_videos_title">"Keine Videos"</string>
+    <string name="no_playlists_title">"Keine Playlists"</string>
+    <string name="delete_playlist_menu">"Löschen"</string>
+    <string name="edit_playlist_menu">"Bearbeiten"</string>
+    <string name="rename_playlist_menu">"Umbenennen"</string>
+    <string name="playlist_deleted_message">"Playlist gelöscht"</string>
+    <string name="playlist_renamed_message">"Playlist umbenannt"</string>
+    <string name="recentlyadded">"Kürzlich hinzugefügt"</string>
+    <string name="recentlyadded_title">"Kürzlich hinzugefügt"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Keine SD-Karte"</string>
+    <string name="sdcard_missing_message">"Es befindet sich keine SD-Karte im Telefon."</string>
+    <string name="sdcard_busy_title">"SD-Karte nicht verfügbar"</string>
+    <string name="sdcard_busy_message">"Die SD-Karte ist ausgelastet."</string>
+    <string name="sdcard_error_title">"SD-Kartenfehler"</string>
+    <string name="sdcard_error_message">"Bei der SD-Karte ist ein Fehler aufgetreten."</string>
+    <string name="unknown_artist_name">"Unbekannter Interpret"</string>
+    <string name="unknown_album_name">"Unbekanntes Album"</string>
+    <string name="shuffle_on_notif">"Zufallswiedergabe ist aktiviert."</string>
+    <string name="shuffle_off_notif">"Zufallswiedergabe ist deaktiviert."</string>
+    <string name="repeat_off_notif">"Wiederholung ist deaktiviert."</string>
+    <string name="repeat_current_notif">"Aktueller Titel wird wiederholt."</string>
+    <string name="repeat_all_notif">"Alle Titel werden wiederholt."</string>
+    <string name="ringtone_menu">"Als Telefonklingelton verwenden"</string>
+    <string name="ringtone_menu_short">"Als Klingelton verwenden"</string>
+    <string name="ringtone_set">"\"%s\" als Telefonklingelton eingestellt"</string>
+    <string name="play_selection">"Wiedergeben"</string>
+    <string name="add_to_playlist">"Zur Playlist hinzufügen"</string>
+    <string name="queue">"Aktuelle Playlist"</string>
+    <string name="new_playlist">"Neu"</string>
+    <string name="new_playlist_name_template">"Neue Playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 Titel zur Playlist hinzugefügt"</item>
-    <item quantity="other" msgid="7675242021325355213">"%d Titel zur Playlist hinzugefügt."</item>
+    <item quantity="one">"1 Titel zur Playlist hinzugefügt"</item>
+    <item quantity="other">"%d Titel zur Playlist hinzugefügt."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Playlist ist leer"</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Speichern"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Überschreiben"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problem bei der Wiedergabe"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Der Titel kann nicht wiedergegeben werden."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Playlist ist leer"</string>
+    <string name="create_playlist_create_text">"Speichern"</string>
+    <string name="create_playlist_overwrite_text">"Überschreiben"</string>
+    <string name="service_start_error_title">"Problem bei der Wiedergabe"</string>
+    <string name="service_start_error_msg">"Der Titel kann nicht wiedergegeben werden."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 Woche"</item>
-    <item msgid="7487749116155425822">"2 Wochen"</item>
-    <item msgid="1565338360539555185">"3 Wochen"</item>
-    <item msgid="2142986059836933072">"4 Wochen"</item>
-    <item msgid="4332403875260507291">"5 Wochen"</item>
-    <item msgid="3847281907869868565">"6 Wochen"</item>
-    <item msgid="2942654998558867799">"7 Wochen"</item>
-    <item msgid="2115529325850052227">"8 Wochen"</item>
-    <item msgid="1396675336665198092">"9 Wochen"</item>
-    <item msgid="3178819129208998649">"10 Wochen"</item>
-    <item msgid="2727959579637914171">"11 Wochen"</item>
-    <item msgid="8708754966127584739">"12 Wochen"</item>
+    <item>"1 Woche"</item>
+    <item>"2 Wochen"</item>
+    <item>"3 Wochen"</item>
+    <item>"4 Wochen"</item>
+    <item>"5 Wochen"</item>
+    <item>"6 Wochen"</item>
+    <item>"7 Wochen"</item>
+    <item>"8 Wochen"</item>
+    <item>"9 Wochen"</item>
+    <item>"10 Wochen"</item>
+    <item>"11 Wochen"</item>
+    <item>"12 Wochen"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Fertig"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Uhrzeit einstellen"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Als Playlist speichern"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Playlist löschen"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Musik"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Musikplaylist"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musik"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videos"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Musik"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Die Wiedergabe dieses Audiodateityps wird nicht unterstützt."</string>
-    <string name="cancel" msgid="886559484711947520">"Abbrechen"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Von Playlist entfernen"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Verbindung mit <xliff:g id="HOST">%s</xliff:g> wird hergestellt"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Nach %s suchen mithilfe von:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Interpreten..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"Alben…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Lieder…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Playlists…"</string>
-    <string name="loading" msgid="3267924133697717662">"Wird geladen"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Tracks"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Alben"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Interpreten"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Musiktrack auswählen"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Track <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"Der angeforderte Stream konnte nicht wiedergegeben werden."</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Interpreten, Alben und Tracks"</string>
+    <string name="weekpicker_set">"Fertig"</string>
+    <string name="weekpicker_title">"Uhrzeit einstellen"</string>
+    <string name="save_as_playlist">"Als Playlist speichern"</string>
+    <string name="clear_playlist">"Playlist löschen"</string>
+    <string name="musicbrowserlabel">"Musik"</string>
+    <string name="musicshortcutlabel">"Musikplaylist"</string>
+    <string name="mediaplaybacklabel">"Musik"</string>
+    <string name="videobrowserlabel">"Videos"</string>
+    <string name="mediapickerlabel">"Musik"</string>
+    <string name="playback_failed">"Die Wiedergabe dieses Audiodateityps wird nicht unterstützt."</string>
+    <string name="cancel">"Abbrechen"</string>
+    <string name="remove_from_playlist">"Von Playlist entfernen"</string>
+    <string name="streamloadingtext">"Verbindung mit <xliff:g id="HOST">%s</xliff:g> wird hergestellt"</string>
+    <string name="mediasearch">"Nach %s suchen mithilfe von:"</string>
+    <string name="working_artists">"Interpreten..."</string>
+    <string name="working_albums">"Alben…"</string>
+    <string name="working_songs">"Lieder…"</string>
+    <string name="working_playlists">"Playlists…"</string>
+    <string name="loading">"Wird geladen"</string>
+    <string name="sort_by_track">"Tracks"</string>
+    <string name="sort_by_album">"Alben"</string>
+    <string name="sort_by_artist">"Interpreten"</string>
+    <string name="music_picker_title">"Musiktrack auswählen"</string>
+    <string name="gadget_track">"Track <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"Der angeforderte Stream konnte nicht wiedergegeben werden."</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-el-finger/strings2.xml b/res/values-el-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-el-finger/strings2.xml
+++ b/res/values-el-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-el-keysexposed/strings.xml
index ee6d4fe..7b6d38e 100644
--- a/res/values-el-keysexposed/strings.xml
+++ b/res/values-el-keysexposed/strings.xml
@@ -15,7 +15,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="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>
+    <string name="create_playlist_create_text_prompt">"Όνομα λίστας αναπαραγωγής"</string>
+    <string name="rename_playlist_same_prompt">"Μετονομασία της λίστας αναπαραγωγής \"<xliff:g id="PLAYLIST">%s</xliff:g>\" σε"</string>
+    <string name="rename_playlist_diff_prompt">"Μετονομασία της λίστας αναπαραγωγής \"<xliff:g id="PLAYLIST">%s</xliff:g>\" σε"</string>
 </resources>
diff --git a/res/values-el-keyshidden/strings.xml b/res/values-el-keyshidden/strings.xml
index 9097685..8ce2680 100644
--- a/res/values-el-keyshidden/strings.xml
+++ b/res/values-el-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Ανοίξτε το πληκτρολόγιο για να δώσετε στην νέα λίστα αναπαραγωγής ένα όνομα ή επιλέξτε Αποθήκευση για να την ονομάσετε \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Ανοίξτε το πληκτρολόγιο για να δώσετε στη λίστα αναπαραγωγής \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ένα νέο όνομα."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Ανοίξτε το πληκτρολόγιο για να δώσετε στη λίστα αναπαραγωγής <xliff:g id="PLAYLIST">%s</xliff:g>ένα νέο όνομα ή επιλέξτε Αποθήκευση για να την ονομάσετε \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Ανοίξτε το πληκτρολόγιο για να δώσετε στην νέα λίστα αναπαραγωγής ένα όνομα ή επιλέξτε Αποθήκευση για να την ονομάσετε \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Ανοίξτε το πληκτρολόγιο για να δώσετε στη λίστα αναπαραγωγής \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ένα νέο όνομα."</string>
+    <string name="rename_playlist_diff_prompt">"Ανοίξτε το πληκτρολόγιο για να δώσετε στη λίστα αναπαραγωγής <xliff:g id="PLAYLIST">%s</xliff:g>ένα νέο όνομα ή επιλέξτε Αποθήκευση για να την ονομάσετε \"%s\"."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 2d9fd56..e74edc9 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 τραγούδι"</string>
+    <string name="onesong">"1 τραγούδι"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> τραγούδια"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> τραγούδια"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> από <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> τραγούδια"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> από <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> τραγούδια"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 άλμπουμ"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> άλμπουμ"</item>
+    <item quantity="one">"1 άλμπουμ"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> άλμπουμ"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Βιβλιοθήκη"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Αναπαραγωγή"</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>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Όλα τα τραγούδια από <xliff:g id="ARTIST">%s</xliff:g> θα διαγραφούν οριστικά από την κάρτα SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Ολόκληρο το άλμπουμ \"<xliff:g id="ALBUM">%s</xliff:g>\" θα διαγραφεί οριστικά από την κάρτα SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"Το <xliff:g id="SONG">%s</xliff:g> θα διαγραφεί οριστικά από την κάρτα SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Βιβλιοθήκη"</string>
+    <string name="goto_playback">"Αναπαραγωγή"</string>
+    <string name="party_shuffle">"Πάρτι - τυχαία αναπαραγωγή"</string>
+    <string name="party_shuffle_off">"Απενεργοποίηση λειτουργίας \"πάρτι - τυχαία αναπαραγωγή\""</string>
+    <string name="delete_item">"Διαγραφή"</string>
+    <string name="shuffle_all">"Τυχαία αναπαραγωγή όλων"</string>
+    <string name="play_all">"Αναπαραγωγή όλων"</string>
+    <string name="delete_artist_desc">"Όλα τα τραγούδια από <xliff:g id="ARTIST">%s</xliff:g> θα διαγραφούν οριστικά από την κάρτα SD."</string>
+    <string name="delete_album_desc">"Ολόκληρο το άλμπουμ \"<xliff:g id="ALBUM">%s</xliff:g>\" θα διαγραφεί οριστικά από την κάρτα SD."</string>
+    <string name="delete_song_desc">"Το <xliff:g id="SONG">%s</xliff:g> θα διαγραφεί οριστικά από την κάρτα SD."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"Διαγράφηκε 1 τραγούδι."</item>
-    <item quantity="other" msgid="5156740163031225200">"Διαγράφηκαν <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> τραγούδια."</item>
+    <item quantity="one">"Διαγράφηκε 1 τραγούδι."</item>
+    <item quantity="other">"Διαγράφηκαν <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> τραγούδια."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Σάρωση κάρτας SD..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Αναπαραγωγή σε εξέλιξη"</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="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="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="recentlyadded" msgid="110978416756366953">"Αρχεία που προστέθηκαν πρόσφατα"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Αρχεία που προστέθηκαν πρόσφατα"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Δεν υπάρχει κάρτα SD"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Δεν υπάρχει κάρτα SD στο τηλέφωνό σας."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Η κάρτα SD δεν είναι διαθέσιμη"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Λυπούμαστε, η κάρτα SD είναι απασχολημένη."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Σφάλμα κάρτας SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Προέκυψε σφάλμα στην κάρτα SD."</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>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Η επανάληψη απενεργοποιήθηκε."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Επανάληψη τρέχοντος τραγουδιού."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Επανάληψη όλων των τραγουδιών."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Χρήση ως ήχος κλήσης τηλεφώνου"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Χρήση ως ήχος κλήσης"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"Ορισμός του \"%s\" ως ήχος κλήσης τηλεφώνου."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Αναπαραγωγή"</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="scanning">"Σάρωση κάρτας SD..."</string>
+    <string name="nowplaying_title">"Αναπαραγωγή σε εξέλιξη"</string>
+    <string name="partyshuffle_title">"Πάρτι - τυχαία αναπαραγωγή"</string>
+    <string name="artists_title">"Καλλιτέχνες"</string>
+    <string name="albums_menu">"Άλμπουμ"</string>
+    <string name="albums_title">"Άλμπουμ"</string>
+    <string name="tracks_menu">"Τραγούδια"</string>
+    <string name="tracks_title">"Τραγούδια"</string>
+    <string name="playlists_menu">"Λίστες αναπαραγωγής"</string>
+    <string name="playlists_title">"Λίστες αναπαραγωγής"</string>
+    <string name="videos_title">"Βίντεο"</string>
+    <string name="all_title">"Όλα τα μέσα"</string>
+    <string name="browse_menu">"Καλλιτέχνες"</string>
+    <string name="search_title">"Αναζήτηση"</string>
+    <string name="no_tracks_title">"Δεν υπάρχουν τραγούδια"</string>
+    <string name="no_videos_title">"Δεν υπάρχουν βίντεο"</string>
+    <string name="no_playlists_title">"Δεν υπάρχουν λίστες αναπαραγωγής"</string>
+    <string name="delete_playlist_menu">"Διαγραφή"</string>
+    <string name="edit_playlist_menu">"Επεξεργασία"</string>
+    <string name="rename_playlist_menu">"Μετονομασία"</string>
+    <string name="playlist_deleted_message">"Η λίστα αναπαραγωγής διαγράφηκε."</string>
+    <string name="playlist_renamed_message">"Μετονομασία λίστας αναπαραγωγής."</string>
+    <string name="recentlyadded">"Αρχεία που προστέθηκαν πρόσφατα"</string>
+    <string name="recentlyadded_title">"Αρχεία που προστέθηκαν πρόσφατα"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Δεν υπάρχει κάρτα SD"</string>
+    <string name="sdcard_missing_message">"Δεν υπάρχει κάρτα SD στο τηλέφωνό σας."</string>
+    <string name="sdcard_busy_title">"Η κάρτα SD δεν είναι διαθέσιμη"</string>
+    <string name="sdcard_busy_message">"Λυπούμαστε, η κάρτα SD είναι απασχολημένη."</string>
+    <string name="sdcard_error_title">"Σφάλμα κάρτας SD"</string>
+    <string name="sdcard_error_message">"Προέκυψε σφάλμα στην κάρτα SD."</string>
+    <string name="unknown_artist_name">"Άγνωστος καλλιτέχνης"</string>
+    <string name="unknown_album_name">"Άγνωστο άλμπουμ"</string>
+    <string name="shuffle_on_notif">"Η τυχαία αναπαραγωγή ενεργοποιήθηκε."</string>
+    <string name="shuffle_off_notif">"Η τυχαία αναπαραγωγή απενεργοποιήθηκε."</string>
+    <string name="repeat_off_notif">"Η επανάληψη απενεργοποιήθηκε."</string>
+    <string name="repeat_current_notif">"Επανάληψη τρέχοντος τραγουδιού."</string>
+    <string name="repeat_all_notif">"Επανάληψη όλων των τραγουδιών."</string>
+    <string name="ringtone_menu">"Χρήση ως ήχος κλήσης τηλεφώνου"</string>
+    <string name="ringtone_menu_short">"Χρήση ως ήχος κλήσης"</string>
+    <string name="ringtone_set">"Ορισμός του \"%s\" ως ήχος κλήσης τηλεφώνου."</string>
+    <string name="play_selection">"Αναπαραγωγή"</string>
+    <string name="add_to_playlist">"Προσθήκη στη λίστα αναπαραγωγής"</string>
+    <string name="queue">"Τρέχουσα λίστα αναπαραγωγής"</string>
+    <string name="new_playlist">"Νέο"</string>
+    <string name="new_playlist_name_template">"Νέα λίστα αναπαραγωγής <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 τραγούδι προστέθηκε στη λίστα αναπαραγωγής."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d τραγούδια προστέθηκαν στη λίστα αναπαραγωγής."</item>
+    <item quantity="one">"1 τραγούδι προστέθηκε στη λίστα αναπαραγωγής."</item>
+    <item quantity="other">"%d τραγούδια προστέθηκαν στη λίστα αναπαραγωγής."</item>
   </plurals>
-    <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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Λυπούμαστε, δεν είναι δυνατή η αναπαραγωγή του τραγουδιού."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Η λίστα αναπαραγωγής που επιλέξατε είναι κενή."</string>
+    <string name="create_playlist_create_text">"Αποθήκευση"</string>
+    <string name="create_playlist_overwrite_text">"Αντικατάσταση"</string>
+    <string name="service_start_error_title">"Πρόβλημα αναπαραγωγής"</string>
+    <string name="service_start_error_msg">"Λυπούμαστε, δεν είναι δυνατή η αναπαραγωγή του τραγουδιού."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 εβδομάδα"</item>
-    <item msgid="7487749116155425822">"2 εβδομάδες"</item>
-    <item msgid="1565338360539555185">"3 εβδομάδες"</item>
-    <item msgid="2142986059836933072">"4 εβδομάδες"</item>
-    <item msgid="4332403875260507291">"5 εβδομάδες"</item>
-    <item msgid="3847281907869868565">"6 εβδομάδες"</item>
-    <item msgid="2942654998558867799">"7 εβδομάδες"</item>
-    <item msgid="2115529325850052227">"8 εβδομάδες"</item>
-    <item msgid="1396675336665198092">"9 εβδομάδες"</item>
-    <item msgid="3178819129208998649">"10 εβδομάδες"</item>
-    <item msgid="2727959579637914171">"11 εβδομάδες"</item>
-    <item msgid="8708754966127584739">"12 εβδομάδες"</item>
+    <item>"1 εβδομάδα"</item>
+    <item>"2 εβδομάδες"</item>
+    <item>"3 εβδομάδες"</item>
+    <item>"4 εβδομάδες"</item>
+    <item>"5 εβδομάδες"</item>
+    <item>"6 εβδομάδες"</item>
+    <item>"7 εβδομάδες"</item>
+    <item>"8 εβδομάδες"</item>
+    <item>"9 εβδομάδες"</item>
+    <item>"10 εβδομάδες"</item>
+    <item>"11 εβδομάδες"</item>
+    <item>"12 εβδομάδες"</item>
   </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="musicbrowserlabel" msgid="3162022214114562892">"Μουσική"</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="4477832192645009774">"Λυπούμαστε, το πρόγραμμα αναπαραγωγής δεν υποστηρίζει αυτόν τον τύπο αρχείου ήχου."</string>
-    <string name="cancel" msgid="886559484711947520">"Ακύρωση"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Κατάργηση από τη λίστα αναπαραγωγής"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Σύνδεση στο <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Αναζήτηση του %s με χρήση:"</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="3267924133697717662">"Φόρτωση"</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="music_picker_title" msgid="1561623486324013570">"Επιλέξτε μουσικό κομμάτι"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Κομμάτι <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Ολοκληρώθηκε"</string>
+    <string name="weekpicker_title">"Ρύθμιση ώρας"</string>
+    <string name="save_as_playlist">"Αποθήκευση ως λίστα αναπαραγωγής"</string>
+    <string name="clear_playlist">"Εκκαθάριση λίστας αναπαραγωγής"</string>
+    <string name="musicbrowserlabel">"Μουσική"</string>
+    <string name="musicshortcutlabel">"Λίστα αναπαραγωγής μουσικής"</string>
+    <string name="mediaplaybacklabel">"Μουσική"</string>
+    <string name="videobrowserlabel">"Βίντεο"</string>
+    <string name="mediapickerlabel">"Μουσική"</string>
+    <string name="playback_failed">"Λυπούμαστε, το πρόγραμμα αναπαραγωγής δεν υποστηρίζει αυτόν τον τύπο αρχείου ήχου."</string>
+    <string name="cancel">"Ακύρωση"</string>
+    <string name="remove_from_playlist">"Κατάργηση από τη λίστα αναπαραγωγής"</string>
+    <string name="streamloadingtext">"Σύνδεση στο <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Αναζήτηση του %s με χρήση:"</string>
+    <string name="working_artists">"Καλλιτέχνες..."</string>
+    <string name="working_albums">"Άλμπουμ..."</string>
+    <string name="working_songs">"Τραγούδια..."</string>
+    <string name="working_playlists">"Λίστες αναπαραγωγής..."</string>
+    <string name="loading">"Φόρτωση"</string>
+    <string name="sort_by_track">"Κομμάτια"</string>
+    <string name="sort_by_album">"Άλμπουμ"</string>
+    <string name="sort_by_artist">"Καλλιτέχνες"</string>
+    <string name="music_picker_title">"Επιλέξτε μουσικό κομμάτι"</string>
+    <string name="gadget_track">"Κομμάτι <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-es-finger/strings2.xml b/res/values-es-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-es-finger/strings2.xml
+++ b/res/values-es-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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 07b470c..f41a5c0 100644
--- a/res/values-es-keysexposed/strings.xml
+++ b/res/values-es-keysexposed/strings.xml
@@ -15,7 +15,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 lista de reproducción"</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>
+    <string name="create_playlist_create_text_prompt">"Nombre de lista de reproducción"</string>
+    <string name="rename_playlist_same_prompt">"Cambiar \"<xliff:g id="PLAYLIST">%s</xliff:g>\" por"</string>
+    <string name="rename_playlist_diff_prompt">"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 3536546..fd8243d 100644
--- a/res/values-es-keyshidden/strings.xml
+++ b/res/values-es-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Abre el teclado para asignar un nombre a la nueva lista de reproducción o selecciona \"Guardar\" para llamarla \"%s\"."</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="6930730254920388535">"Abre el teclado para asignar un nombre nuevo a la lista de reproducción <xliff:g id="PLAYLIST">%s</xliff:g> o selecciona \"Guardar\" para llamarla \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Abre el teclado para asignar un nombre a la nueva lista de reproducción o selecciona \"Guardar\" para llamarla \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"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">"Abre el teclado para asignar un nombre nuevo a la lista de reproducción <xliff:g id="PLAYLIST">%s</xliff:g> o selecciona \"Guardar\" para llamarla \"%s\"."</string>
 </resources>
diff --git a/res/values-es-rUS-finger/strings2.xml b/res/values-es-rUS-finger/strings2.xml
index d4521df..120ac61 100644
--- a/res/values-es-rUS-finger/strings2.xml
+++ b/res/values-es-rUS-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"Segmento <xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"Segmento <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-rUS-keysexposed/strings.xml b/res/values-es-rUS-keysexposed/strings.xml
index 1c01eec..279e05a 100644
--- a/res/values-es-rUS-keysexposed/strings.xml
+++ b/res/values-es-rUS-keysexposed/strings.xml
@@ -15,7 +15,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 lista de reproducción"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Cambiar nombre \"<xliff:g id="PLAYLIST">%s</xliff:g>\" por"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Cambiar nombre \"<xliff:g id="PLAYLIST">%s</xliff:g>\" por"</string>
+    <string name="create_playlist_create_text_prompt">"Nombre de lista de reproducción"</string>
+    <string name="rename_playlist_same_prompt">"Cambiar nombre \"<xliff:g id="PLAYLIST">%s</xliff:g>\" por"</string>
+    <string name="rename_playlist_diff_prompt">"Cambiar nombre \"<xliff:g id="PLAYLIST">%s</xliff:g>\" por"</string>
 </resources>
diff --git a/res/values-es-rUS-keyshidden/strings.xml b/res/values-es-rUS-keyshidden/strings.xml
index b037adc..0b3c3a1 100644
--- a/res/values-es-rUS-keyshidden/strings.xml
+++ b/res/values-es-rUS-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Abre el teclado para asignar un nombre a tu lista de reproducción nueva o selecciona Guardar para nombrarla \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Abrir 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="6930730254920388535">"Abre el teclado para asignar un nombre nuevo a la lista de reproducción \"<xliff:g id="PLAYLIST">%s</xliff:g>\" o selecciona Guardar para nombrarla \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Abre el teclado para asignar un nombre a tu lista de reproducción nueva o selecciona Guardar para nombrarla \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Abrir 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">"Abre el teclado para asignar un nombre nuevo a la lista de reproducción \"<xliff:g id="PLAYLIST">%s</xliff:g>\" o selecciona Guardar para nombrarla \"%s\"."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 88bc87a..3f78fb1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 canción"</string>
+    <string name="onesong">"1 canción"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> canciones"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> canciones"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> canciones"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> canciones"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 álbum"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> álbumes"</item>
+    <item quantity="one">"1 álbum"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> álbumes"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Reproducir"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Party shuffle"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Party shuffle desactivado"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Eliminar"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Arrastrar todo"</string>
-    <string name="play_all" msgid="6309622568869321842">"Reproducir todo"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> se eliminarán definitivamente de la tarjeta SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"El álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" se eliminará definitivamente de la tarjeta SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" se eliminará definitivamente de la tarjeta SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"Aceptar"</string>
+    <string name="goto_start">"Biblioteca"</string>
+    <string name="goto_playback">"Reproducir"</string>
+    <string name="party_shuffle">"Party shuffle"</string>
+    <string name="party_shuffle_off">"Party shuffle desactivado"</string>
+    <string name="delete_item">"Eliminar"</string>
+    <string name="shuffle_all">"Arrastrar todo"</string>
+    <string name="play_all">"Reproducir todo"</string>
+    <string name="delete_artist_desc">"Todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> se eliminarán definitivamente de la tarjeta SD."</string>
+    <string name="delete_album_desc">"El álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" se eliminará definitivamente de la tarjeta SD."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" se eliminará definitivamente de la tarjeta SD."</string>
+    <string name="delete_confirm_button_text">"Aceptar"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"Se eliminó 1 canción."</item>
-    <item quantity="other" msgid="5156740163031225200">"Se eliminaron <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> canciones."</item>
+    <item quantity="one">"Se eliminó 1 canción."</item>
+    <item quantity="other">"Se eliminaron <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> canciones."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Escaneando tarjeta SD..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Reproduciendo ahora"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Party shuffle"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artistas"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Álbumes"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Álbumes"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Canciones"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Canciones"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Listas de repr."</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Listas de reproducción"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Videos"</string>
-    <string name="all_title" msgid="6880186414437237653">"Todos los medios"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artistas"</string>
-    <string name="search_title" msgid="1016971653383739344">"Buscar"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"No hay canciones"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"No hay videos"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"No hay listas de reproducción"</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">"Lista de reproducción eliminada."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Se cambió el nombre de la lista de reproducción."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Últimos agregados"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Últimos agregados"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"No hay tarjeta SD"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Tu teléfono no tiene una tarjeta SD."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Tarjeta SD no disponible"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Lo sentimos, pero tu tarjeta SD está ocupada."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Error de tarjeta SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Se encontró un error en tu tarjeta SD."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Artista desconocido"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Álbum desconocido"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"El shuffle está activado."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"El shuffle está desactivado."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Repetir está desactivado."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Repitiendo canción actual."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Repitiendo todas las canciones."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Usar como tono de timbre del teléfono"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Usar como tono de timbre"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" definidos como tono de timbre del teléfono."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Reproducir"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Agregar a lista de reproducción"</string>
-    <string name="queue" msgid="2937629819482787704">"Lista de reproducción actual"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Nuevos"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Lista de reproducción nueva <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Escaneando tarjeta SD..."</string>
+    <string name="nowplaying_title">"Reproduciendo ahora"</string>
+    <string name="partyshuffle_title">"Party shuffle"</string>
+    <string name="artists_title">"Artistas"</string>
+    <string name="albums_menu">"Álbumes"</string>
+    <string name="albums_title">"Álbumes"</string>
+    <string name="tracks_menu">"Canciones"</string>
+    <string name="tracks_title">"Canciones"</string>
+    <string name="playlists_menu">"Listas de reproducción"</string>
+    <string name="playlists_title">"Listas de reproducción"</string>
+    <string name="videos_title">"Videos"</string>
+    <string name="all_title">"Todos los medios"</string>
+    <string name="browse_menu">"Artistas"</string>
+    <string name="search_title">"Buscar"</string>
+    <string name="no_tracks_title">"No hay canciones"</string>
+    <string name="no_videos_title">"No hay videos"</string>
+    <string name="no_playlists_title">"No hay listas de reproducción"</string>
+    <string name="delete_playlist_menu">"Eliminar"</string>
+    <string name="edit_playlist_menu">"Editar"</string>
+    <string name="rename_playlist_menu">"Cambiar nombre"</string>
+    <string name="playlist_deleted_message">"Lista de reproducción eliminada."</string>
+    <string name="playlist_renamed_message">"Se cambió el nombre de la lista de reproducción."</string>
+    <string name="recentlyadded">"Últimos agregados"</string>
+    <string name="recentlyadded_title">"Últimos agregados"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"No hay tarjeta SD"</string>
+    <string name="sdcard_missing_message">"Tu teléfono no tiene una tarjeta SD."</string>
+    <string name="sdcard_busy_title">"Tarjeta SD no disponible"</string>
+    <string name="sdcard_busy_message">"Lo sentimos, pero tu tarjeta SD está ocupada."</string>
+    <string name="sdcard_error_title">"Error de tarjeta SD"</string>
+    <string name="sdcard_error_message">"Se encontró un error en tu tarjeta SD."</string>
+    <string name="unknown_artist_name">"Artista desconocido"</string>
+    <string name="unknown_album_name">"Álbum desconocido"</string>
+    <string name="shuffle_on_notif">"El shuffle está activado."</string>
+    <string name="shuffle_off_notif">"El shuffle está desactivado."</string>
+    <string name="repeat_off_notif">"Repetir está desactivado."</string>
+    <string name="repeat_current_notif">"Repitiendo canción actual."</string>
+    <string name="repeat_all_notif">"Repitiendo todas las canciones."</string>
+    <string name="ringtone_menu">"Usar como tono de timbre del teléfono"</string>
+    <string name="ringtone_menu_short">"Usar como tono de timbre"</string>
+    <string name="ringtone_set">"\"%s\" definidos como tono de timbre del teléfono."</string>
+    <string name="play_selection">"Reproducir"</string>
+    <string name="add_to_playlist">"Agregar a lista de reproducción"</string>
+    <string name="queue">"Lista de reproducción actual"</string>
+    <string name="new_playlist">"Nuevos"</string>
+    <string name="new_playlist_name_template">"Lista de reproducción nueva <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"Se agregó una canción a la lista de reproducción."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d canciones agregadas a la lista de reproducción."</item>
+    <item quantity="one">"Se agregó una canción a la lista de reproducción."</item>
+    <item quantity="other">"%d canciones agregadas a la lista de reproducción."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"La lista de reproducción seleccionada está vacía."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Guardar"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Sobreescribir"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problema de reproducción"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Lo sentimos, pero la canción no se pudo reproducir."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"Aceptar"</string>
+    <string name="emptyplaylist">"La lista de reproducción seleccionada está vacía."</string>
+    <string name="create_playlist_create_text">"Guardar"</string>
+    <string name="create_playlist_overwrite_text">"Sobreescribir"</string>
+    <string name="service_start_error_title">"Problema de reproducción"</string>
+    <string name="service_start_error_msg">"Lo sentimos, pero la canción no se pudo reproducir."</string>
+    <string name="service_start_error_button">"Aceptar"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 semana"</item>
-    <item msgid="7487749116155425822">"2 semanas"</item>
-    <item msgid="1565338360539555185">"3 semanas"</item>
-    <item msgid="2142986059836933072">"4 semanas"</item>
-    <item msgid="4332403875260507291">"5 semanas"</item>
-    <item msgid="3847281907869868565">"6 semanas"</item>
-    <item msgid="2942654998558867799">"7 semanas"</item>
-    <item msgid="2115529325850052227">"8 semanas"</item>
-    <item msgid="1396675336665198092">"9 semanas"</item>
-    <item msgid="3178819129208998649">"10 semanas"</item>
-    <item msgid="2727959579637914171">"11 semanas"</item>
-    <item msgid="8708754966127584739">"12 semanas"</item>
+    <item>"1 semana"</item>
+    <item>"2 semanas"</item>
+    <item>"3 semanas"</item>
+    <item>"4 semanas"</item>
+    <item>"5 semanas"</item>
+    <item>"6 semanas"</item>
+    <item>"7 semanas"</item>
+    <item>"8 semanas"</item>
+    <item>"9 semanas"</item>
+    <item>"10 semanas"</item>
+    <item>"11 semanas"</item>
+    <item>"12 semanas"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Finalizado"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Fijar hora"</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="musicbrowserlabel" msgid="3162022214114562892">"Música"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Lista de reproducción de música"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Música"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videos"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Música"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Lo sentimos, pero 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">"Suprimir de la lista de reproducción"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Conectándose a <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Buscar %s usando:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artistas..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"Álbumes..."</string>
-    <string name="working_songs" msgid="2201491972050410684">"Canciones..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Listas de reproducción..."</string>
-    <string name="loading" msgid="3267924133697717662">"Cargando"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Pista"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Álbumes"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artistas"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Seleccionar pista de música"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Pista <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Finalizado"</string>
+    <string name="weekpicker_title">"Fijar hora"</string>
+    <string name="save_as_playlist">"Guardar como lista de reproducción"</string>
+    <string name="clear_playlist">"Borrar lista de reproducción"</string>
+    <string name="musicbrowserlabel">"Música"</string>
+    <string name="musicshortcutlabel">"Lista de reproducción de música"</string>
+    <string name="mediaplaybacklabel">"Música"</string>
+    <string name="videobrowserlabel">"Videos"</string>
+    <string name="mediapickerlabel">"Música"</string>
+    <string name="playback_failed">"Lo sentimos, pero el reproductor no admite este tipo de archivo de audio."</string>
+    <string name="cancel">"Cancelar"</string>
+    <string name="remove_from_playlist">"Suprimir de la lista de reproducción"</string>
+    <string name="streamloadingtext">"Conectándose a <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Buscar %s usando:"</string>
+    <string name="working_artists">"Artistas..."</string>
+    <string name="working_albums">"Álbumes..."</string>
+    <string name="working_songs">"Canciones..."</string>
+    <string name="working_playlists">"Listas de reproducción..."</string>
+    <string name="loading">"Cargando"</string>
+    <string name="sort_by_track">"Pista"</string>
+    <string name="sort_by_album">"Álbumes"</string>
+    <string name="sort_by_artist">"Artistas"</string>
+    <string name="music_picker_title">"Seleccionar pista de música"</string>
+    <string name="gadget_track">"Pista <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 020f12f..3e8511f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 canción"</string>
+    <string name="onesong">"1 canción"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> canciones"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> canciones"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> canciones"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> canciones"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 álbum"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> álbumes"</item>
+    <item quantity="one">"1 álbum"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> álbumes"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Reproducción"</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">"Suprimir"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Reproducción aleatoria"</string>
-    <string name="play_all" msgid="6309622568869321842">"Reproducir todo"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> se eliminarán de forma permanente de la tarjeta SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"El álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" completo se eliminará de forma permanente de la tarjeta SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" se eliminará de forma permanente de la tarjeta SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"Aceptar"</string>
+    <string name="goto_start">"Biblioteca"</string>
+    <string name="goto_playback">"Reproducción"</string>
+    <string name="party_shuffle">"Sesión aleatoria"</string>
+    <string name="party_shuffle_off">"Desactivar sesión aleatoria"</string>
+    <string name="delete_item">"Suprimir"</string>
+    <string name="shuffle_all">"Reproducción aleatoria"</string>
+    <string name="play_all">"Reproducir todo"</string>
+    <string name="delete_artist_desc">"Todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> se eliminarán de forma permanente de la tarjeta SD."</string>
+    <string name="delete_album_desc">"El álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" completo se eliminará de forma permanente de la tarjeta SD."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" se eliminará de forma permanente de la tarjeta SD."</string>
+    <string name="delete_confirm_button_text">"Aceptar"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"Se ha eliminado una canción."</item>
-    <item quantity="other" msgid="5156740163031225200">"Se han eliminado <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> canciones."</item>
+    <item quantity="one">"Se ha eliminado una canción."</item>
+    <item quantity="other">"Se han eliminado <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> canciones."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Examinando tarjeta SD…"</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Reproduciendo"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Sesión aleatoria"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artistas"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Álbumes"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Álbumes"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Canciones"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Canciones"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Listas reprod."</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Listas reprod."</string>
-    <string name="videos_title" msgid="2066741954354129115">"Vídeos"</string>
-    <string name="all_title" msgid="6880186414437237653">"Todos los medios"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artistas"</string>
-    <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="delete_playlist_menu" msgid="8998637685583495247">"Suprimir"</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 de reproducción."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Añadidas recientemente"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Añadidos 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>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Falta la tarjeta SD en el teléfono"</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Tarjeta SD no disponible"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"La tarjeta SD está ocupada."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Error de tarjeta SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Se ha producido un error al acceder a la tarjeta SD."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Artista desconocido"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Álbum desconocido"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"La reproducción aleatoria está activada."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"La reproducción aleatoria está desactivada."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"La repetición está desactivada."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Repitiendo canción actual..."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Repitiendo todas las canciones..."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Utilizar como tono del teléfono"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Utilizar como tono"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"Se ha establecido \"%s\" 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 de reproducción"</string>
-    <string name="queue" msgid="2937629819482787704">"Lista de reproducción actual"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Nuevo"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nueva lista de reproducción <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Examinando tarjeta SD…"</string>
+    <string name="nowplaying_title">"Reproduciendo"</string>
+    <string name="partyshuffle_title">"Sesión aleatoria"</string>
+    <string name="artists_title">"Artistas"</string>
+    <string name="albums_menu">"Álbumes"</string>
+    <string name="albums_title">"Álbumes"</string>
+    <string name="tracks_menu">"Canciones"</string>
+    <string name="tracks_title">"Canciones"</string>
+    <string name="playlists_menu">"Listas reprod."</string>
+    <string name="playlists_title">"Listas reprod."</string>
+    <string name="videos_title">"Vídeos"</string>
+    <string name="all_title">"Todos los medios"</string>
+    <string name="browse_menu">"Artistas"</string>
+    <string name="search_title">"Buscar"</string>
+    <string name="no_tracks_title">"Ninguna canción"</string>
+    <string name="no_videos_title">"Ningún vídeo"</string>
+    <string name="no_playlists_title">"Ninguna lista de reproducción"</string>
+    <string name="delete_playlist_menu">"Suprimir"</string>
+    <string name="edit_playlist_menu">"Editar"</string>
+    <string name="rename_playlist_menu">"Cambiar nombre"</string>
+    <string name="playlist_deleted_message">"Se ha eliminado la lista de reproducción."</string>
+    <string name="playlist_renamed_message">"Se ha cambiado el nombre de la lista de reproducción."</string>
+    <string name="recentlyadded">"Añadidas recientemente"</string>
+    <string name="recentlyadded_title">"Añadidos recientemente"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Falta la tarjeta SD"</string>
+    <string name="sdcard_missing_message">"Falta la tarjeta SD en el teléfono"</string>
+    <string name="sdcard_busy_title">"Tarjeta SD no disponible"</string>
+    <string name="sdcard_busy_message">"La tarjeta SD está ocupada."</string>
+    <string name="sdcard_error_title">"Error de tarjeta SD"</string>
+    <string name="sdcard_error_message">"Se ha producido un error al acceder a la tarjeta SD."</string>
+    <string name="unknown_artist_name">"Artista desconocido"</string>
+    <string name="unknown_album_name">"Álbum desconocido"</string>
+    <string name="shuffle_on_notif">"La reproducción aleatoria está activada."</string>
+    <string name="shuffle_off_notif">"La reproducción aleatoria está desactivada."</string>
+    <string name="repeat_off_notif">"La repetición está desactivada."</string>
+    <string name="repeat_current_notif">"Repitiendo canción actual..."</string>
+    <string name="repeat_all_notif">"Repitiendo todas las canciones..."</string>
+    <string name="ringtone_menu">"Utilizar como tono del teléfono"</string>
+    <string name="ringtone_menu_short">"Utilizar como tono"</string>
+    <string name="ringtone_set">"Se ha establecido \"%s\" como tono del teléfono."</string>
+    <string name="play_selection">"Reproducir"</string>
+    <string name="add_to_playlist">"Añadir a lista de reproducción"</string>
+    <string name="queue">"Lista de reproducción actual"</string>
+    <string name="new_playlist">"Nuevo"</string>
+    <string name="new_playlist_name_template">"Nueva lista de reproducción <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="7675242021325355213">"Se han añadido %d canciones a la lista de reproducción."</item>
+    <item quantity="one">"Se ha añadido una canción a la lista de reproducción."</item>
+    <item quantity="other">"Se han añadido %d canciones a la lista de reproducción."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"La lista de reproducción 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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"No se ha podido reproducir la canción."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"Aceptar"</string>
+    <string name="emptyplaylist">"La lista de reproducción seleccionada está vacía."</string>
+    <string name="create_playlist_create_text">"Guardar"</string>
+    <string name="create_playlist_overwrite_text">"Sobrescribir"</string>
+    <string name="service_start_error_title">"Problema de reproducción"</string>
+    <string name="service_start_error_msg">"No se ha podido reproducir la canción."</string>
+    <string name="service_start_error_button">"Aceptar"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 semana"</item>
-    <item msgid="7487749116155425822">"2 semanas"</item>
-    <item msgid="1565338360539555185">"3 semanas"</item>
-    <item msgid="2142986059836933072">"4 semanas"</item>
-    <item msgid="4332403875260507291">"5 semanas"</item>
-    <item msgid="3847281907869868565">"6 semanas"</item>
-    <item msgid="2942654998558867799">"7 semanas"</item>
-    <item msgid="2115529325850052227">"8 semanas"</item>
-    <item msgid="1396675336665198092">"9 semanas"</item>
-    <item msgid="3178819129208998649">"10 semanas"</item>
-    <item msgid="2727959579637914171">"11 semanas"</item>
-    <item msgid="8708754966127584739">"12 semanas"</item>
+    <item>"1 semana"</item>
+    <item>"2 semanas"</item>
+    <item>"3 semanas"</item>
+    <item>"4 semanas"</item>
+    <item>"5 semanas"</item>
+    <item>"6 semanas"</item>
+    <item>"7 semanas"</item>
+    <item>"8 semanas"</item>
+    <item>"9 semanas"</item>
+    <item>"10 semanas"</item>
+    <item>"11 semanas"</item>
+    <item>"12 semanas"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Hecho"</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">"Borrar lista de reproducción"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Música"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Lista de reproducción 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="4477832192645009774">"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">"Eliminar de lista de reproducción"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Conectando con <xliff:g id="HOST">%s</xliff:g>..."</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Buscar %s con:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artistas…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Álbumes…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Canciones…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Listas de reproducción…"</string>
-    <string name="loading" msgid="3267924133697717662">"Cargando"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Pistas"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Álbumes"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artistas"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Seleccionar pista musical"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Pista <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"No se ha podido reproducir el flujo solicitado."</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artistas, álbumes y pistas"</string>
+    <string name="weekpicker_set">"Hecho"</string>
+    <string name="weekpicker_title">"Establecer hora"</string>
+    <string name="save_as_playlist">"Guardar como lista de reproducción"</string>
+    <string name="clear_playlist">"Borrar lista de reproducción"</string>
+    <string name="musicbrowserlabel">"Música"</string>
+    <string name="musicshortcutlabel">"Lista de reproducción de música"</string>
+    <string name="mediaplaybacklabel">"Música"</string>
+    <string name="videobrowserlabel">"Vídeos"</string>
+    <string name="mediapickerlabel">"Música"</string>
+    <string name="playback_failed">"El reproductor no admite este tipo de archivo de audio."</string>
+    <string name="cancel">"Cancelar"</string>
+    <string name="remove_from_playlist">"Eliminar de lista de reproducción"</string>
+    <string name="streamloadingtext">"Conectando con <xliff:g id="HOST">%s</xliff:g>..."</string>
+    <string name="mediasearch">"Buscar %s con:"</string>
+    <string name="working_artists">"Artistas…"</string>
+    <string name="working_albums">"Álbumes…"</string>
+    <string name="working_songs">"Canciones…"</string>
+    <string name="working_playlists">"Listas de reproducción…"</string>
+    <string name="loading">"Cargando"</string>
+    <string name="sort_by_track">"Pistas"</string>
+    <string name="sort_by_album">"Álbumes"</string>
+    <string name="sort_by_artist">"Artistas"</string>
+    <string name="music_picker_title">"Seleccionar pista musical"</string>
+    <string name="gadget_track">"Pista <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"No se ha podido reproducir el flujo solicitado."</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-finger/strings2.xml b/res/values-fr-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-fr-finger/strings2.xml
+++ b/res/values-fr-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-fr-keysexposed/strings.xml
index 04206f7..9fa5d9d 100644
--- a/res/values-fr-keysexposed/strings.xml
+++ b/res/values-fr-keysexposed/strings.xml
@@ -15,7 +15,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">"Nom de la playlist"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Renommer \"<xliff:g id="PLAYLIST">%s</xliff:g>\" en"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Renommer \"<xliff:g id="PLAYLIST">%s</xliff:g>\" en"</string>
+    <string name="create_playlist_create_text_prompt">"Nom de la playlist"</string>
+    <string name="rename_playlist_same_prompt">"Renommer \"<xliff:g id="PLAYLIST">%s</xliff:g>\" en"</string>
+    <string name="rename_playlist_diff_prompt">"Renommer \"<xliff:g id="PLAYLIST">%s</xliff:g>\" en"</string>
 </resources>
diff --git a/res/values-fr-keyshidden/strings.xml b/res/values-fr-keyshidden/strings.xml
index e05edd6..2ee347c 100644
--- a/res/values-fr-keyshidden/strings.xml
+++ b/res/values-fr-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Ouvrez le clavier afin de saisir un nom pour votre nouvelle playlist ou sélectionnez Enregistrer pour la nommer \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Ouvrez le clavier pour renommer la playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Ouvrez le clavier pour saisir un nouveau nom pour la playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ou sélectionnez Enregistrer pour la nommer \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Ouvrez le clavier afin de saisir un nom pour votre nouvelle playlist ou sélectionnez Enregistrer pour la nommer \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Ouvrez le clavier pour renommer la playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_diff_prompt">"Ouvrez le clavier pour saisir un nouveau nom pour la playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ou sélectionnez Enregistrer pour la nommer \"%s\"."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 418d932..d988d51 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 chanson"</string>
+    <string name="onesong">"1 chanson"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> chansons"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> chansons"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> chansons sur <xliff:g id="TOTAL_COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> chansons sur <xliff:g id="TOTAL_COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albums"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> albums"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Bibliothèque"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Lecture"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Lecture aléatoire"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"La lecture aléatoire est désactivée."</string>
-    <string name="delete_item" msgid="3363330144534750601">"Supprimer"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Lecture aléatoire de toutes les chansons"</string>
-    <string name="play_all" msgid="6309622568869321842">"Tout lire"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Toutes les chansons de <xliff:g id="ARTIST">%s</xliff:g> seront définitivement supprimées de la carte SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"L\'intégralité de l\'album \"<xliff:g id="ALBUM">%s</xliff:g>\" sera définitivement supprimée de la carte SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"La chanson \"<xliff:g id="SONG">%s</xliff:g>\" sera définitivement supprimée de la carte SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Bibliothèque"</string>
+    <string name="goto_playback">"Lecture"</string>
+    <string name="party_shuffle">"Lecture aléatoire"</string>
+    <string name="party_shuffle_off">"La lecture aléatoire est désactivée."</string>
+    <string name="delete_item">"Supprimer"</string>
+    <string name="shuffle_all">"Lecture aléatoire de toutes les chansons"</string>
+    <string name="play_all">"Tout lire"</string>
+    <string name="delete_artist_desc">"Toutes les chansons de <xliff:g id="ARTIST">%s</xliff:g> seront définitivement supprimées de la carte SD."</string>
+    <string name="delete_album_desc">"L\'intégralité de l\'album \"<xliff:g id="ALBUM">%s</xliff:g>\" sera définitivement supprimée de la carte SD."</string>
+    <string name="delete_song_desc">"La chanson \"<xliff:g id="SONG">%s</xliff:g>\" sera définitivement supprimée de la carte SD."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 chanson a été supprimée."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> chansons ont été supprimées."</item>
+    <item quantity="one">"1 chanson a été supprimée."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> chansons ont été supprimées."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Lecture de la carte SD..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"En écoute"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Lecture aléatoire"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artistes"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Albums"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Albums"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Chansons"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Chansons"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Playlists"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Playlists"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Vidéos"</string>
-    <string name="all_title" msgid="6880186414437237653">"Tous le multimédia"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artistes"</string>
-    <string name="search_title" msgid="1016971653383739344">"Rechercher"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Aucune chanson"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Aucune vidéo trouvée"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Aucune playlist trouvée"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Supprimer"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Modifier"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Renommer"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"La playlist a été supprimée."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"La playlist a été renommée."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Ajoutés récemment"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Playlist récente"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Aucune carte SD trouvée"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Aucune carte SD n\'est insérée dans votre téléphone."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Carte SD non disponible"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Désolé, votre carte SD n\'est pas disponible."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Erreur de carte SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Une erreur s\'est produite sur votre carte SD."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Artiste inconnu"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Album inconnu"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"La lecture aléatoire est activée."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"La lecture aléatoire est désactivée."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"La lecture en boucle est désactivée."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Lecture en boucle de la chanson en écoute."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Lecture en boucle de toutes les chansons"</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Utiliser comme sonnerie"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Définir comme sonnerie"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" a été défini comme sonnerie."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Lire"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Ajouter à la playlist"</string>
-    <string name="queue" msgid="2937629819482787704">"Playlist actuelle"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Nouveau"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nouvelle playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Lecture de la carte SD..."</string>
+    <string name="nowplaying_title">"En écoute"</string>
+    <string name="partyshuffle_title">"Lecture aléatoire"</string>
+    <string name="artists_title">"Artistes"</string>
+    <string name="albums_menu">"Albums"</string>
+    <string name="albums_title">"Albums"</string>
+    <string name="tracks_menu">"Chansons"</string>
+    <string name="tracks_title">"Chansons"</string>
+    <string name="playlists_menu">"Playlists"</string>
+    <string name="playlists_title">"Playlists"</string>
+    <string name="videos_title">"Vidéos"</string>
+    <string name="all_title">"Tous le multimédia"</string>
+    <string name="browse_menu">"Artistes"</string>
+    <string name="search_title">"Rechercher"</string>
+    <string name="no_tracks_title">"Aucune chanson"</string>
+    <string name="no_videos_title">"Aucune vidéo trouvée"</string>
+    <string name="no_playlists_title">"Aucune playlist trouvée"</string>
+    <string name="delete_playlist_menu">"Supprimer"</string>
+    <string name="edit_playlist_menu">"Modifier"</string>
+    <string name="rename_playlist_menu">"Renommer"</string>
+    <string name="playlist_deleted_message">"La playlist a été supprimée."</string>
+    <string name="playlist_renamed_message">"La playlist a été renommée."</string>
+    <string name="recentlyadded">"Ajoutés récemment"</string>
+    <string name="recentlyadded_title">"Playlist récente"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Aucune carte SD trouvée"</string>
+    <string name="sdcard_missing_message">"Aucune carte SD n\'est insérée dans votre téléphone."</string>
+    <string name="sdcard_busy_title">"Carte SD non disponible"</string>
+    <string name="sdcard_busy_message">"Désolé, votre carte SD n\'est pas disponible."</string>
+    <string name="sdcard_error_title">"Erreur de carte SD"</string>
+    <string name="sdcard_error_message">"Une erreur s\'est produite sur votre carte SD."</string>
+    <string name="unknown_artist_name">"Artiste inconnu"</string>
+    <string name="unknown_album_name">"Album inconnu"</string>
+    <string name="shuffle_on_notif">"La lecture aléatoire est activée."</string>
+    <string name="shuffle_off_notif">"La lecture aléatoire est désactivée."</string>
+    <string name="repeat_off_notif">"La lecture en boucle est désactivée."</string>
+    <string name="repeat_current_notif">"Lecture en boucle de la chanson en écoute."</string>
+    <string name="repeat_all_notif">"Lecture en boucle de toutes les chansons"</string>
+    <string name="ringtone_menu">"Utiliser comme sonnerie"</string>
+    <string name="ringtone_menu_short">"Définir comme sonnerie"</string>
+    <string name="ringtone_set">"\"%s\" a été défini comme sonnerie."</string>
+    <string name="play_selection">"Lire"</string>
+    <string name="add_to_playlist">"Ajouter à la playlist"</string>
+    <string name="queue">"Playlist actuelle"</string>
+    <string name="new_playlist">"Nouveau"</string>
+    <string name="new_playlist_name_template">"Nouvelle playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 chanson a été ajoutée à la playlist."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d chansons ont été ajoutées à la playlist."</item>
+    <item quantity="one">"1 chanson a été ajoutée à la playlist."</item>
+    <item quantity="other">"%d chansons ont été ajoutées à la playlist."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"La playlist sélectionnée est vide."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Enregistrer"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Remplacer"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Erreur de lecture"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Désolé, la chanson n\'a pas pu être lue."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"La playlist sélectionnée est vide."</string>
+    <string name="create_playlist_create_text">"Enregistrer"</string>
+    <string name="create_playlist_overwrite_text">"Remplacer"</string>
+    <string name="service_start_error_title">"Erreur de lecture"</string>
+    <string name="service_start_error_msg">"Désolé, la chanson n\'a pas pu être lue."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 sem."</item>
-    <item msgid="7487749116155425822">"2 sem."</item>
-    <item msgid="1565338360539555185">"3 sem."</item>
-    <item msgid="2142986059836933072">"4 sem."</item>
-    <item msgid="4332403875260507291">"5 sem."</item>
-    <item msgid="3847281907869868565">"6 sem."</item>
-    <item msgid="2942654998558867799">"7 sem."</item>
-    <item msgid="2115529325850052227">"8 sem."</item>
-    <item msgid="1396675336665198092">"9 sem."</item>
-    <item msgid="3178819129208998649">"10 sem."</item>
-    <item msgid="2727959579637914171">"11 sem."</item>
-    <item msgid="8708754966127584739">"12 sem."</item>
+    <item>"1 sem."</item>
+    <item>"2 sem."</item>
+    <item>"3 sem."</item>
+    <item>"4 sem."</item>
+    <item>"5 sem."</item>
+    <item>"6 sem."</item>
+    <item>"7 sem."</item>
+    <item>"8 sem."</item>
+    <item>"9 sem."</item>
+    <item>"10 sem."</item>
+    <item>"11 sem."</item>
+    <item>"12 sem."</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"OK"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Définir la durée"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Enregistrer comme playlist"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Effacer la playlist"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Musique"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Playlist musicale"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musique"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Vidéos"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Musique"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Désolé, le lecteur ne prend pas en charge ce type de fichier audio."</string>
-    <string name="cancel" msgid="886559484711947520">"Annuler"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Supprimer de la playlist"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Connexion à <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Rechercher %s à l\'aide de :"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artistes…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Albums…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Chansons…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Playlists…"</string>
-    <string name="loading" msgid="3267924133697717662">"Chargement"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Pistes"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Albums"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artistes"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Sélectionner une piste"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Piste <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"Échec de la lecture du flux demandé"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artistes, albums et morceaux"</string>
+    <string name="weekpicker_set">"OK"</string>
+    <string name="weekpicker_title">"Définir la durée"</string>
+    <string name="save_as_playlist">"Enregistrer comme playlist"</string>
+    <string name="clear_playlist">"Effacer la playlist"</string>
+    <string name="musicbrowserlabel">"Musique"</string>
+    <string name="musicshortcutlabel">"Playlist musicale"</string>
+    <string name="mediaplaybacklabel">"Musique"</string>
+    <string name="videobrowserlabel">"Vidéos"</string>
+    <string name="mediapickerlabel">"Musique"</string>
+    <string name="playback_failed">"Désolé, le lecteur ne prend pas en charge ce type de fichier audio."</string>
+    <string name="cancel">"Annuler"</string>
+    <string name="remove_from_playlist">"Supprimer de la playlist"</string>
+    <string name="streamloadingtext">"Connexion à <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Rechercher %s à l\'aide de :"</string>
+    <string name="working_artists">"Artistes…"</string>
+    <string name="working_albums">"Albums…"</string>
+    <string name="working_songs">"Chansons…"</string>
+    <string name="working_playlists">"Playlists…"</string>
+    <string name="loading">"Chargement"</string>
+    <string name="sort_by_track">"Pistes"</string>
+    <string name="sort_by_album">"Albums"</string>
+    <string name="sort_by_artist">"Artistes"</string>
+    <string name="music_picker_title">"Sélectionner une piste"</string>
+    <string name="gadget_track">"Piste <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"Échec de la lecture du flux demandé"</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-it-finger/strings2.xml b/res/values-it-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-it-finger/strings2.xml
+++ b/res/values-it-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-it-keysexposed/strings.xml
index 280a254..ba7ae09 100644
--- a/res/values-it-keysexposed/strings.xml
+++ b/res/values-it-keysexposed/strings.xml
@@ -15,7 +15,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">"Nome playlist"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Cambia \"<xliff:g id="PLAYLIST">%s</xliff:g>\" con"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Cambia \"<xliff:g id="PLAYLIST">%s</xliff:g>\" con"</string>
+    <string name="create_playlist_create_text_prompt">"Nome playlist"</string>
+    <string name="rename_playlist_same_prompt">"Cambia \"<xliff:g id="PLAYLIST">%s</xliff:g>\" con"</string>
+    <string name="rename_playlist_diff_prompt">"Cambia \"<xliff:g id="PLAYLIST">%s</xliff:g>\" con"</string>
 </resources>
diff --git a/res/values-it-keyshidden/strings.xml b/res/values-it-keyshidden/strings.xml
index fd3ee8f..637d1ad 100644
--- a/res/values-it-keyshidden/strings.xml
+++ b/res/values-it-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Apri la tastiera per assegnare un nome alla nuova playlist o seleziona Salva per denominarla \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Apri la tastiera per assegnare un nuovo nome alla playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Apri la tastiera per assegnare un nuovo nome alla playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" o seleziona Salva per denominarla \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Apri la tastiera per assegnare un nome alla nuova playlist o seleziona Salva per denominarla \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Apri la tastiera per assegnare un nuovo nome alla playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_diff_prompt">"Apri la tastiera per assegnare un nuovo nome alla playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" o seleziona Salva per denominarla \"%s\"."</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 74ed5c8..3ab0f31 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 brano"</string>
+    <string name="onesong">"1 brano"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> brani"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> brani"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> brani su <xliff:g id="TOTAL_COUNT">%1$d</xliff:g>"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> brani su <xliff:g id="TOTAL_COUNT">%1$d</xliff:g>"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> album"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> album"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Raccolta"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Riproduci"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Party shuffle"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Party shuffle non attiva"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Elimina"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Ripr. casuale"</string>
-    <string name="play_all" msgid="6309622568869321842">"Riprod. tutti"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Tutti i brani di <xliff:g id="ARTIST">%s</xliff:g> verranno eliminati definitivamente dalla scheda SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"L\'intero album \"<xliff:g id="ALBUM">%s</xliff:g>\" verrà eliminato definitivamente dalla scheda SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"Il brano \"<xliff:g id="SONG">%s</xliff:g>\" verrà eliminato definitivamente dalla scheda SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Raccolta"</string>
+    <string name="goto_playback">"Riproduci"</string>
+    <string name="party_shuffle">"Party shuffle"</string>
+    <string name="party_shuffle_off">"Party shuffle non attiva"</string>
+    <string name="delete_item">"Elimina"</string>
+    <string name="shuffle_all">"Ripr. casuale"</string>
+    <string name="play_all">"Riprod. tutti"</string>
+    <string name="delete_artist_desc">"Tutti i brani di <xliff:g id="ARTIST">%s</xliff:g> verranno eliminati definitivamente dalla scheda SD."</string>
+    <string name="delete_album_desc">"L\'intero album \"<xliff:g id="ALBUM">%s</xliff:g>\" verrà eliminato definitivamente dalla scheda SD."</string>
+    <string name="delete_song_desc">"Il brano \"<xliff:g id="SONG">%s</xliff:g>\" verrà eliminato definitivamente dalla scheda SD."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 brano eliminato."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> brani eliminati."</item>
+    <item quantity="one">"1 brano eliminato."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> brani eliminati."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Analisi scheda SD..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"In esecuzione"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Party shuffle"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artisti"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Album"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Album"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Brani"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Brani"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Playlist"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Playlist"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Video"</string>
-    <string name="all_title" msgid="6880186414437237653">"Tutti i media"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artisti"</string>
-    <string name="search_title" msgid="1016971653383739344">"Cerca"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Nessun brano"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Nessun video"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Nessuna playlist"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Elimina"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Modifica"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Rinomina"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Playlist eliminata."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Playlist rinominata."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Aggiunta di recente"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Aggiunta di recente"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcast"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcast"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Nessuna scheda SD"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Il telefono non contiene una scheda SD."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Scheda SD non disponibile"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Spiacenti. La scheda SD è già in uso."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Errore della scheda SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Si è verificato un errore nella scheda SD."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Artista sconosciuto"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Album sconosciuto"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Riproduzione casuale attiva."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Riproduzione casuale non attiva."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Ripetizione non attiva."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Ripetizione brano corrente."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Ripetizione di tutti i brani."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Usa come suoneria"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Usa come suoneria"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" impostato come suoneria."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Riprod."</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Aggiungi a playlist"</string>
-    <string name="queue" msgid="2937629819482787704">"Playlist corrente"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Nuova"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nuova playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Analisi scheda SD..."</string>
+    <string name="nowplaying_title">"In esecuzione"</string>
+    <string name="partyshuffle_title">"Party shuffle"</string>
+    <string name="artists_title">"Artisti"</string>
+    <string name="albums_menu">"Album"</string>
+    <string name="albums_title">"Album"</string>
+    <string name="tracks_menu">"Brani"</string>
+    <string name="tracks_title">"Brani"</string>
+    <string name="playlists_menu">"Playlist"</string>
+    <string name="playlists_title">"Playlist"</string>
+    <string name="videos_title">"Video"</string>
+    <string name="all_title">"Tutti i media"</string>
+    <string name="browse_menu">"Artisti"</string>
+    <string name="search_title">"Cerca"</string>
+    <string name="no_tracks_title">"Nessun brano"</string>
+    <string name="no_videos_title">"Nessun video"</string>
+    <string name="no_playlists_title">"Nessuna playlist"</string>
+    <string name="delete_playlist_menu">"Elimina"</string>
+    <string name="edit_playlist_menu">"Modifica"</string>
+    <string name="rename_playlist_menu">"Rinomina"</string>
+    <string name="playlist_deleted_message">"Playlist eliminata."</string>
+    <string name="playlist_renamed_message">"Playlist rinominata."</string>
+    <string name="recentlyadded">"Aggiunta di recente"</string>
+    <string name="recentlyadded_title">"Aggiunta di recente"</string>
+    <string name="podcasts_listitem">"Podcast"</string>
+    <string name="podcasts_title">"Podcast"</string>
+    <string name="sdcard_missing_title">"Nessuna scheda SD"</string>
+    <string name="sdcard_missing_message">"Il telefono non contiene una scheda SD."</string>
+    <string name="sdcard_busy_title">"Scheda SD non disponibile"</string>
+    <string name="sdcard_busy_message">"Spiacenti. La scheda SD è già in uso."</string>
+    <string name="sdcard_error_title">"Errore della scheda SD"</string>
+    <string name="sdcard_error_message">"Si è verificato un errore nella scheda SD."</string>
+    <string name="unknown_artist_name">"Artista sconosciuto"</string>
+    <string name="unknown_album_name">"Album sconosciuto"</string>
+    <string name="shuffle_on_notif">"Riproduzione casuale attiva."</string>
+    <string name="shuffle_off_notif">"Riproduzione casuale non attiva."</string>
+    <string name="repeat_off_notif">"Ripetizione non attiva."</string>
+    <string name="repeat_current_notif">"Ripetizione brano corrente."</string>
+    <string name="repeat_all_notif">"Ripetizione di tutti i brani."</string>
+    <string name="ringtone_menu">"Usa come suoneria"</string>
+    <string name="ringtone_menu_short">"Usa come suoneria"</string>
+    <string name="ringtone_set">"\"%s\" impostato come suoneria."</string>
+    <string name="play_selection">"Riprod."</string>
+    <string name="add_to_playlist">"Aggiungi a playlist"</string>
+    <string name="queue">"Playlist corrente"</string>
+    <string name="new_playlist">"Nuova"</string>
+    <string name="new_playlist_name_template">"Nuova playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 brano aggiunto alla playlist."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d brani aggiunti alla playlist."</item>
+    <item quantity="one">"1 brano aggiunto alla playlist."</item>
+    <item quantity="other">"%d brani aggiunti alla playlist."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"La playlist selezionata è vuota."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Salva"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Sostituisci"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problema di riproduzione"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Spiacenti. Impossibile riprodurre il brano."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"La playlist selezionata è vuota."</string>
+    <string name="create_playlist_create_text">"Salva"</string>
+    <string name="create_playlist_overwrite_text">"Sostituisci"</string>
+    <string name="service_start_error_title">"Problema di riproduzione"</string>
+    <string name="service_start_error_msg">"Spiacenti. Impossibile riprodurre il brano."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 settimana"</item>
-    <item msgid="7487749116155425822">"2 settimane"</item>
-    <item msgid="1565338360539555185">"3 settimane"</item>
-    <item msgid="2142986059836933072">"4 settimane"</item>
-    <item msgid="4332403875260507291">"5 settimane"</item>
-    <item msgid="3847281907869868565">"6 settimane"</item>
-    <item msgid="2942654998558867799">"7 settimane"</item>
-    <item msgid="2115529325850052227">"8 settimane"</item>
-    <item msgid="1396675336665198092">"9 settimane"</item>
-    <item msgid="3178819129208998649">"10 settimane"</item>
-    <item msgid="2727959579637914171">"11 settimane"</item>
-    <item msgid="8708754966127584739">"12 settimane"</item>
+    <item>"1 settimana"</item>
+    <item>"2 settimane"</item>
+    <item>"3 settimane"</item>
+    <item>"4 settimane"</item>
+    <item>"5 settimane"</item>
+    <item>"6 settimane"</item>
+    <item>"7 settimane"</item>
+    <item>"8 settimane"</item>
+    <item>"9 settimane"</item>
+    <item>"10 settimane"</item>
+    <item>"11 settimane"</item>
+    <item>"12 settimane"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Fine"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Imposta periodo"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Salva come playlist"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Cancella playlist"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Musica"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Playlist musicale"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musica"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Video"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Musica"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Spiacenti. Il player non supporta questo tipo di file audio."</string>
-    <string name="cancel" msgid="886559484711947520">"Annulla"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Rimuovi da playlist"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Connessione a <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Cerca %s con:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artisti…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Album…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Brani…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Playlist…"</string>
-    <string name="loading" msgid="3267924133697717662">"Caricamento"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Tracce"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Album"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artisti"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Seleziona traccia musicale"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Traccia <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"Impossibile riprodurre lo stream richiesto."</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artisti, album e tracce"</string>
+    <string name="weekpicker_set">"Fine"</string>
+    <string name="weekpicker_title">"Imposta periodo"</string>
+    <string name="save_as_playlist">"Salva come playlist"</string>
+    <string name="clear_playlist">"Cancella playlist"</string>
+    <string name="musicbrowserlabel">"Musica"</string>
+    <string name="musicshortcutlabel">"Playlist musicale"</string>
+    <string name="mediaplaybacklabel">"Musica"</string>
+    <string name="videobrowserlabel">"Video"</string>
+    <string name="mediapickerlabel">"Musica"</string>
+    <string name="playback_failed">"Spiacenti. Il player non supporta questo tipo di file audio."</string>
+    <string name="cancel">"Annulla"</string>
+    <string name="remove_from_playlist">"Rimuovi da playlist"</string>
+    <string name="streamloadingtext">"Connessione a <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Cerca %s con:"</string>
+    <string name="working_artists">"Artisti…"</string>
+    <string name="working_albums">"Album…"</string>
+    <string name="working_songs">"Brani…"</string>
+    <string name="working_playlists">"Playlist…"</string>
+    <string name="loading">"Caricamento"</string>
+    <string name="sort_by_track">"Tracce"</string>
+    <string name="sort_by_album">"Album"</string>
+    <string name="sort_by_artist">"Artisti"</string>
+    <string name="music_picker_title">"Seleziona traccia musicale"</string>
+    <string name="gadget_track">"Traccia <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"Impossibile riprodurre lo stream richiesto."</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-ja-finger/strings2.xml b/res/values-ja-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-ja-finger/strings2.xml
+++ b/res/values-ja-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-ja-keysexposed/strings.xml
index bd99e98..46d1dfd 100644
--- a/res/values-ja-keysexposed/strings.xml
+++ b/res/values-ja-keysexposed/strings.xml
@@ -15,7 +15,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="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>
+    <string name="create_playlist_create_text_prompt">"プレイリスト名"</string>
+    <string name="rename_playlist_same_prompt">"「<xliff:g id="PLAYLIST">%s</xliff:g>」の新しい名前"</string>
+    <string name="rename_playlist_diff_prompt">"「<xliff:g id="PLAYLIST">%s</xliff:g>」の新しい名前"</string>
 </resources>
diff --git a/res/values-ja-keyshidden/strings.xml b/res/values-ja-keyshidden/strings.xml
index 33f3687..849e675 100644
--- a/res/values-ja-keyshidden/strings.xml
+++ b/res/values-ja-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"キーボードを表示して新しいプレイリストに名前を付けるか、[保存]を選択して「%s」という名前で保存します。"</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"キーボードを表示して「<xliff:g id="PLAYLIST">%s</xliff:g>」に新しい名前を付けます。"</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"キーボードを表示して「<xliff:g id="PLAYLIST">%s</xliff:g>」に新しい名前を付けるか、[保存]を選択して「%s」という名前で保存します。"</string>
+    <string name="create_playlist_create_text_prompt">"キーボードを表示して新しいプレイリストに名前を付けるか、[保存]を選択して「%s」という名前で保存します。"</string>
+    <string name="rename_playlist_same_prompt">"キーボードを表示して「<xliff:g id="PLAYLIST">%s</xliff:g>」に新しい名前を付けます。"</string>
+    <string name="rename_playlist_diff_prompt">"キーボードを表示して「<xliff:g id="PLAYLIST">%s</xliff:g>」に新しい名前を付けるか、[保存]を選択して「%s」という名前で保存します。"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index b5b1150..3bb0153 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -15,127 +15,129 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"曲(1)"</string>
+    <string name="onesong">"曲(1)"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"曲(<xliff:g id="COUNT">%d</xliff:g>)"</item>
+    <item quantity="other">"曲(<xliff:g id="COUNT">%d</xliff:g>)"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="TOTAL_COUNT">%1$d</xliff:g>曲中<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g>曲"</item>
+    <item quantity="other">"<xliff:g id="TOTAL_COUNT">%1$d</xliff:g>曲中<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g>曲"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"アルバム(1)"</item>
-    <item quantity="other" msgid="3047615499770811984">"アルバム(<xliff:g id="COUNT">%d</xliff:g>)"</item>
+    <item quantity="one">"アルバム(1)"</item>
+    <item quantity="other">"アルバム(<xliff:g id="COUNT">%d</xliff:g>)"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"ライブラリ"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"再生"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"パーティシャッフル"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"パーティシャッフルOFF"</string>
-    <string name="delete_item" msgid="3363330144534750601">"削除"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"すべてシャッフル"</string>
-    <string name="play_all" msgid="6309622568869321842">"すべて再生"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"<xliff:g id="ARTIST">%s</xliff:g>の全曲をSDカードから完全に削除します。"</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"アルバム「<xliff:g id="ALBUM">%s</xliff:g>」全体をSDカードから完全に削除します。"</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"「<xliff:g id="SONG">%s</xliff:g>」をSDカードから完全に削除します。"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"ライブラリ"</string>
+    <string name="goto_playback">"再生"</string>
+    <string name="party_shuffle">"パーティシャッフル"</string>
+    <string name="party_shuffle_off">"パーティシャッフルOFF"</string>
+    <string name="delete_item">"削除"</string>
+    <string name="shuffle_all">"すべてシャッフル"</string>
+    <string name="play_all">"すべて再生"</string>
+    <string name="delete_artist_desc">"<xliff:g id="ARTIST">%s</xliff:g>の全曲をSDカードから完全に削除します。"</string>
+    <string name="delete_album_desc">"アルバム「<xliff:g id="ALBUM">%s</xliff:g>」全体をSDカードから完全に削除します。"</string>
+    <string name="delete_song_desc">"「<xliff:g id="SONG">%s</xliff:g>」をSDカードから完全に削除します。"</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1曲削除しました。"</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g>曲削除しました。"</item>
+    <item quantity="one">"1曲削除しました。"</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g>曲削除しました。"</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"SDカードをスキャン中..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"再生中"</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="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="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="recentlyadded" msgid="110978416756366953">"最近追加したアイテム"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"最近追加したアイテム"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"ポッドキャスト"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"ポッドキャスト"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"SDカードがありません"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"SDカードが携帯電話に挿入されていません。"</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SDカードを使用できません"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"このSDカードは別の端末で使用中です。"</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SDカードエラー"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"SDカードでエラーが発生しました。"</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"不明なアーティスト"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"不明なアルバム"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"シャッフルをONにしました。"</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"シャッフルをOFFにしました。"</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"繰り返しをOFFにしました。"</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"現在の曲を繰り返し再生します。"</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"全曲繰り返しで再生します。"</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"着信音に設定"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"着信音に設定"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"「%s」を着信音として設定しました。"</string>
-    <string name="play_selection" msgid="2854921021814550018">"再生"</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="scanning">"SDカードをスキャン中..."</string>
+    <string name="nowplaying_title">"再生中"</string>
+    <string name="partyshuffle_title">"パーティシャッフル"</string>
+    <string name="artists_title">"アーティスト"</string>
+    <string name="albums_menu">"アルバム"</string>
+    <string name="albums_title">"アルバム"</string>
+    <string name="tracks_menu">"曲"</string>
+    <string name="tracks_title">"曲"</string>
+    <string name="playlists_menu">"プレイリスト"</string>
+    <string name="playlists_title">"プレイリスト"</string>
+    <string name="videos_title">"動画"</string>
+    <string name="all_title">"すべてのメディア"</string>
+    <string name="browse_menu">"アーティスト"</string>
+    <string name="search_title">"検索"</string>
+    <string name="no_tracks_title">"曲がありません"</string>
+    <string name="no_videos_title">"動画がありません"</string>
+    <string name="no_playlists_title">"プレイリストがありません"</string>
+    <string name="delete_playlist_menu">"削除"</string>
+    <string name="edit_playlist_menu">"編集"</string>
+    <string name="rename_playlist_menu">"名前を変更"</string>
+    <string name="playlist_deleted_message">"プレイリストを削除しました。"</string>
+    <string name="playlist_renamed_message">"プレイリストの名前を変更しました。"</string>
+    <string name="recentlyadded">"最近追加したアイテム"</string>
+    <string name="recentlyadded_title">"最近追加したアイテム"</string>
+    <string name="podcasts_listitem">"ポッドキャスト"</string>
+    <string name="podcasts_title">"ポッドキャスト"</string>
+    <string name="sdcard_missing_title">"SDカードがありません"</string>
+    <string name="sdcard_missing_message">"SDカードが携帯電話に挿入されていません。"</string>
+    <string name="sdcard_busy_title">"SDカードを使用できません"</string>
+    <string name="sdcard_busy_message">"このSDカードは別の端末で使用中です。"</string>
+    <string name="sdcard_error_title">"SDカードエラー"</string>
+    <string name="sdcard_error_message">"SDカードでエラーが発生しました。"</string>
+    <string name="unknown_artist_name">"不明なアーティスト"</string>
+    <string name="unknown_album_name">"不明なアルバム"</string>
+    <string name="shuffle_on_notif">"シャッフルをONにしました。"</string>
+    <string name="shuffle_off_notif">"シャッフルをOFFにしました。"</string>
+    <string name="repeat_off_notif">"繰り返しをOFFにしました。"</string>
+    <string name="repeat_current_notif">"現在の曲を繰り返し再生します。"</string>
+    <string name="repeat_all_notif">"全曲繰り返しで再生します。"</string>
+    <string name="ringtone_menu">"着信音に設定"</string>
+    <string name="ringtone_menu_short">"着信音に設定"</string>
+    <string name="ringtone_set">"「%s」を着信音として設定しました。"</string>
+    <string name="play_selection">"再生"</string>
+    <string name="add_to_playlist">"プレイリストに追加"</string>
+    <string name="queue">"現在のプレイリスト"</string>
+    <string name="new_playlist">"新規"</string>
+    <string name="new_playlist_name_template">"新規プレイリスト<xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"プレイリストに1曲追加しました。"</item>
-    <item quantity="other" msgid="7675242021325355213">"プレイリストに%d曲追加しました。"</item>
+    <item quantity="one">"プレイリストに1曲追加しました。"</item>
+    <item quantity="other">"プレイリストに%d曲追加しました。"</item>
   </plurals>
-    <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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"再生できません。"</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"選択したプレイリストは空です。"</string>
+    <string name="create_playlist_create_text">"保存"</string>
+    <string name="create_playlist_overwrite_text">"上書き保存"</string>
+    <string name="service_start_error_title">"再生エラー"</string>
+    <string name="service_start_error_msg">"再生できません。"</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1週間"</item>
-    <item msgid="7487749116155425822">"2週間"</item>
-    <item msgid="1565338360539555185">"3週間"</item>
-    <item msgid="2142986059836933072">"4週間"</item>
-    <item msgid="4332403875260507291">"5週間"</item>
-    <item msgid="3847281907869868565">"6週間"</item>
-    <item msgid="2942654998558867799">"7週間"</item>
-    <item msgid="2115529325850052227">"8週間"</item>
-    <item msgid="1396675336665198092">"9週間"</item>
-    <item msgid="3178819129208998649">"10週間"</item>
-    <item msgid="2727959579637914171">"11週間"</item>
-    <item msgid="8708754966127584739">"12週間"</item>
+    <item>"1週間"</item>
+    <item>"2週間"</item>
+    <item>"3週間"</item>
+    <item>"4週間"</item>
+    <item>"5週間"</item>
+    <item>"6週間"</item>
+    <item>"7週間"</item>
+    <item>"8週間"</item>
+    <item>"9週間"</item>
+    <item>"10週間"</item>
+    <item>"11週間"</item>
+    <item>"12週間"</item>
   </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="musicbrowserlabel" msgid="3162022214114562892">"音楽"</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="4477832192645009774">"プレーヤーが対応していない音声ファイル形式です。"</string>
-    <string name="cancel" msgid="886559484711947520">"キャンセル"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"プレイリストから削除"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"<xliff:g id="HOST">%s</xliff:g>に接続中"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"%sの検索:"</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="3267924133697717662">"読み込み中"</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="music_picker_title" msgid="1561623486324013570">"音楽トラックを選択"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"トラック<xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"要求されたストリームを再生できませんでした。"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"アーティスト、アルバム、トラック"</string>
+    <string name="weekpicker_set">"完了"</string>
+    <string name="weekpicker_title">"期間の設定"</string>
+    <string name="save_as_playlist">"プレイリストとして保存"</string>
+    <string name="clear_playlist">"プレイリストを消去"</string>
+    <string name="musicbrowserlabel">"音楽"</string>
+    <string name="musicshortcutlabel">"ミュージックプレイリスト"</string>
+    <string name="mediaplaybacklabel">"音楽"</string>
+    <string name="videobrowserlabel">"動画"</string>
+    <string name="mediapickerlabel">"音楽"</string>
+    <string name="playback_failed">"プレーヤーが対応していない音声ファイル形式です。"</string>
+    <string name="cancel">"キャンセル"</string>
+    <string name="remove_from_playlist">"プレイリストから削除"</string>
+    <string name="streamloadingtext">"<xliff:g id="HOST">%s</xliff:g>に接続中"</string>
+    <string name="mediasearch">"%sの検索:"</string>
+    <string name="working_artists">"アーティスト..."</string>
+    <string name="working_albums">"アルバム..."</string>
+    <string name="working_songs">"曲..."</string>
+    <string name="working_playlists">"再生リスト..."</string>
+    <string name="loading">"読み込み中"</string>
+    <string name="sort_by_track">"トラック"</string>
+    <string name="sort_by_album">"アルバム"</string>
+    <string name="sort_by_artist">"アーティスト"</string>
+    <string name="music_picker_title">"音楽トラックを選択"</string>
+    <string name="gadget_track">"トラック<xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
+    <skip />
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-ko-finger/strings2.xml b/res/values-ko-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-ko-finger/strings2.xml
+++ b/res/values-ko-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-ko-keysexposed/strings.xml
index 41863e3..60dc323 100644
--- a/res/values-ko-keysexposed/strings.xml
+++ b/res/values-ko-keysexposed/strings.xml
@@ -15,7 +15,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="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>
+    <string name="create_playlist_create_text_prompt">"재생 목록 이름"</string>
+    <string name="rename_playlist_same_prompt">"\'<xliff:g id="PLAYLIST">%s</xliff:g>\'을(를) 다음으로 변경"</string>
+    <string name="rename_playlist_diff_prompt">"\'<xliff:g id="PLAYLIST">%s</xliff:g>\'을(를) 다음으로 변경"</string>
 </resources>
diff --git a/res/values-ko-keyshidden/strings.xml b/res/values-ko-keyshidden/strings.xml
index 4549564..3f071b8 100644
--- a/res/values-ko-keyshidden/strings.xml
+++ b/res/values-ko-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"키보드를 사용하여 새 재생 목록에 이름을 지정하거나 \'저장\'을 선택하여 \'%s\'(이)라고 지정합니다."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"키보드를 사용하여 재생 목록 \'<xliff:g id="PLAYLIST">%s</xliff:g>\'에 새 이름을 지정합니다."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"키보드를 사용하여 재생 목록 \'<xliff:g id="PLAYLIST">%s</xliff:g>\'에 새 이름을 지정하거나 \'저장\'을 선택하여 \'%s\'(이)라고 지정합니다."</string>
+    <string name="create_playlist_create_text_prompt">"키보드를 사용하여 새 재생 목록에 이름을 지정하거나 \'저장\'을 선택하여 \'%s\'(이)라고 지정합니다."</string>
+    <string name="rename_playlist_same_prompt">"키보드를 사용하여 재생 목록 \'<xliff:g id="PLAYLIST">%s</xliff:g>\'에 새 이름을 지정합니다."</string>
+    <string name="rename_playlist_diff_prompt">"키보드를 사용하여 재생 목록 \'<xliff:g id="PLAYLIST">%s</xliff:g>\'에 새 이름을 지정하거나 \'저장\'을 선택하여 \'%s\'(이)라고 지정합니다."</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8f1bc86..71c1dc7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"노래 1곡"</string>
+    <string name="onesong">"노래 1곡"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"노래 <xliff:g id="COUNT">%d</xliff:g>곡"</item>
+    <item quantity="other">"노래 <xliff:g id="COUNT">%d</xliff:g>곡"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"노래 <xliff:g id="TOTAL_COUNT">%1$d</xliff:g>곡 중 <xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g>곡"</item>
+    <item quantity="other">"노래 <xliff:g id="TOTAL_COUNT">%1$d</xliff:g>곡 중 <xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g>곡"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"앨범 1개"</item>
-    <item quantity="other" msgid="3047615499770811984">"앨범 <xliff:g id="COUNT">%d</xliff:g>개"</item>
+    <item quantity="one">"앨범 1개"</item>
+    <item quantity="other">"앨범 <xliff:g id="COUNT">%d</xliff:g>개"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"라이브러리"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"재생"</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>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"<xliff:g id="ARTIST">%s</xliff:g>의 모든 노래가 SD 카드에서 완전히 삭제됩니다."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"전체 앨범 \'<xliff:g id="ALBUM">%s</xliff:g>\'이(가) SD 카드에서 완전히 삭제됩니다."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\'<xliff:g id="SONG">%s</xliff:g>\'이(가) SD 카드에서 완전히 삭제됩니다."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"확인"</string>
+    <string name="goto_start">"라이브러리"</string>
+    <string name="goto_playback">"재생"</string>
+    <string name="party_shuffle">"파티 셔플"</string>
+    <string name="party_shuffle_off">"파티 셔플 사용 안함"</string>
+    <string name="delete_item">"삭제"</string>
+    <string name="shuffle_all">"모두 셔플"</string>
+    <string name="play_all">"모두 재생"</string>
+    <string name="delete_artist_desc">"<xliff:g id="ARTIST">%s</xliff:g>의 모든 노래가 SD 카드에서 완전히 삭제됩니다."</string>
+    <string name="delete_album_desc">"전체 앨범 \'<xliff:g id="ALBUM">%s</xliff:g>\'이(가) SD 카드에서 완전히 삭제됩니다."</string>
+    <string name="delete_song_desc">"\'<xliff:g id="SONG">%s</xliff:g>\'이(가) SD 카드에서 완전히 삭제됩니다."</string>
+    <string name="delete_confirm_button_text">"확인"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"노래 1곡이 삭제되었습니다."</item>
-    <item quantity="other" msgid="5156740163031225200">"노래 <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>곡이 삭제되었습니다."</item>
+    <item quantity="one">"노래 1곡이 삭제되었습니다."</item>
+    <item quantity="other">"노래 <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>곡이 삭제되었습니다."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"SD 카드 스캔 중..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"지금 재생 중"</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="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="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="recentlyadded" msgid="110978416756366953">"최근 추가 목록"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"최근 추가 목록"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcast"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcast"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"SD 카드 없음"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"휴대전화에 SD 카드가 삽입되어 있지 않습니다."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD 카드를 사용할 수 없음"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"SD 카드가 사용 중입니다."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD 카드 오류"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"SD 카드에 오류가 발생했습니다."</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>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"반복을 사용하지 않습니다."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"현재 노래를 반복합니다."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"모든 노래를 반복합니다."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"휴대전화 벨소리로 사용"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"벨소리로 사용"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\'%s\'이(가) 휴대전화 벨소리로 설정되었습니다."</string>
-    <string name="play_selection" msgid="2854921021814550018">"재생"</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="scanning">"SD 카드 스캔 중..."</string>
+    <string name="nowplaying_title">"지금 재생 중"</string>
+    <string name="partyshuffle_title">"파티 셔플"</string>
+    <string name="artists_title">"아티스트"</string>
+    <string name="albums_menu">"앨범"</string>
+    <string name="albums_title">"앨범"</string>
+    <string name="tracks_menu">"노래"</string>
+    <string name="tracks_title">"노래"</string>
+    <string name="playlists_menu">"재생 목록"</string>
+    <string name="playlists_title">"재생 목록"</string>
+    <string name="videos_title">"동영상"</string>
+    <string name="all_title">"전체 미디어"</string>
+    <string name="browse_menu">"아티스트"</string>
+    <string name="search_title">"검색"</string>
+    <string name="no_tracks_title">"노래 없음"</string>
+    <string name="no_videos_title">"동영상 없음"</string>
+    <string name="no_playlists_title">"재생 목록 없음"</string>
+    <string name="delete_playlist_menu">"삭제"</string>
+    <string name="edit_playlist_menu">"수정"</string>
+    <string name="rename_playlist_menu">"이름 바꾸기"</string>
+    <string name="playlist_deleted_message">"재생 목록이 삭제되었습니다."</string>
+    <string name="playlist_renamed_message">"재생 목록 이름이 변경되었습니다."</string>
+    <string name="recentlyadded">"최근 추가 목록"</string>
+    <string name="recentlyadded_title">"최근 추가 목록"</string>
+    <string name="podcasts_listitem">"Podcast"</string>
+    <string name="podcasts_title">"Podcast"</string>
+    <string name="sdcard_missing_title">"SD 카드 없음"</string>
+    <string name="sdcard_missing_message">"휴대전화에 SD 카드가 삽입되어 있지 않습니다."</string>
+    <string name="sdcard_busy_title">"SD 카드를 사용할 수 없음"</string>
+    <string name="sdcard_busy_message">"SD 카드가 사용 중입니다."</string>
+    <string name="sdcard_error_title">"SD 카드 오류"</string>
+    <string name="sdcard_error_message">"SD 카드에 오류가 발생했습니다."</string>
+    <string name="unknown_artist_name">"알 수 없는 아티스트"</string>
+    <string name="unknown_album_name">"알 수 없는 앨범"</string>
+    <string name="shuffle_on_notif">"셔플을 사용합니다."</string>
+    <string name="shuffle_off_notif">"셔플을 사용하지 않습니다."</string>
+    <string name="repeat_off_notif">"반복을 사용하지 않습니다."</string>
+    <string name="repeat_current_notif">"현재 노래를 반복합니다."</string>
+    <string name="repeat_all_notif">"모든 노래를 반복합니다."</string>
+    <string name="ringtone_menu">"휴대전화 벨소리로 사용"</string>
+    <string name="ringtone_menu_short">"벨소리로 사용"</string>
+    <string name="ringtone_set">"\'%s\'이(가) 휴대전화 벨소리로 설정되었습니다."</string>
+    <string name="play_selection">"재생"</string>
+    <string name="add_to_playlist">"재생 목록에 추가"</string>
+    <string name="queue">"현재 재생 목록"</string>
+    <string name="new_playlist">"새로 만들기"</string>
+    <string name="new_playlist_name_template">"새 재생 목록 <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"재생 목록에 노래 1곡이 추가되었습니다."</item>
-    <item quantity="other" msgid="7675242021325355213">"노래 %d곡이 재생 목록에 추가되었습니다."</item>
+    <item quantity="one">"재생 목록에 노래 1곡이 추가되었습니다."</item>
+    <item quantity="other">"노래 %d곡이 재생 목록에 추가되었습니다."</item>
   </plurals>
-    <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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"노래를 재생할 수 없습니다."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"확인"</string>
+    <string name="emptyplaylist">"선택한 재생 목록이 비어 있습니다."</string>
+    <string name="create_playlist_create_text">"저장"</string>
+    <string name="create_playlist_overwrite_text">"덮어쓰기"</string>
+    <string name="service_start_error_title">"재생 문제"</string>
+    <string name="service_start_error_msg">"노래를 재생할 수 없습니다."</string>
+    <string name="service_start_error_button">"확인"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1주"</item>
-    <item msgid="7487749116155425822">"2주"</item>
-    <item msgid="1565338360539555185">"3주"</item>
-    <item msgid="2142986059836933072">"4주"</item>
-    <item msgid="4332403875260507291">"5주"</item>
-    <item msgid="3847281907869868565">"6주"</item>
-    <item msgid="2942654998558867799">"7주"</item>
-    <item msgid="2115529325850052227">"8주"</item>
-    <item msgid="1396675336665198092">"9주"</item>
-    <item msgid="3178819129208998649">"10주"</item>
-    <item msgid="2727959579637914171">"11주"</item>
-    <item msgid="8708754966127584739">"12주"</item>
+    <item>"1주"</item>
+    <item>"2주"</item>
+    <item>"3주"</item>
+    <item>"4주"</item>
+    <item>"5주"</item>
+    <item>"6주"</item>
+    <item>"7주"</item>
+    <item>"8주"</item>
+    <item>"9주"</item>
+    <item>"10주"</item>
+    <item>"11주"</item>
+    <item>"12주"</item>
   </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="musicbrowserlabel" msgid="3162022214114562892">"음악"</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="4477832192645009774">"플레이어에서 지원하지 않는 오디오 파일 형식입니다."</string>
-    <string name="cancel" msgid="886559484711947520">"취소"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"재생 목록에서 삭제"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"<xliff:g id="HOST">%s</xliff:g>에 연결 중"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"다음을 사용하여 %s 검색:"</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="3267924133697717662">"로드 중"</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="music_picker_title" msgid="1561623486324013570">"음악 트랙 선택"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"트랙 <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"완료"</string>
+    <string name="weekpicker_title">"시간 설정"</string>
+    <string name="save_as_playlist">"재생 목록으로 저장"</string>
+    <string name="clear_playlist">"재생 목록 지우기"</string>
+    <string name="musicbrowserlabel">"음악"</string>
+    <string name="musicshortcutlabel">"음악 재생 목록"</string>
+    <string name="mediaplaybacklabel">"음악"</string>
+    <string name="videobrowserlabel">"동영상"</string>
+    <string name="mediapickerlabel">"음악"</string>
+    <string name="playback_failed">"플레이어에서 지원하지 않는 오디오 파일 형식입니다."</string>
+    <string name="cancel">"취소"</string>
+    <string name="remove_from_playlist">"재생 목록에서 삭제"</string>
+    <string name="streamloadingtext">"<xliff:g id="HOST">%s</xliff:g>에 연결 중"</string>
+    <string name="mediasearch">"다음을 사용하여 %s 검색:"</string>
+    <string name="working_artists">"아티스트..."</string>
+    <string name="working_albums">"앨범..."</string>
+    <string name="working_songs">"노래..."</string>
+    <string name="working_playlists">"재생 목록..."</string>
+    <string name="loading">"로드 중"</string>
+    <string name="sort_by_track">"트랙"</string>
+    <string name="sort_by_album">"앨범"</string>
+    <string name="sort_by_artist">"아티스트"</string>
+    <string name="music_picker_title">"음악 트랙 선택"</string>
+    <string name="gadget_track">"트랙 <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 8664bac..907977f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -15,127 +15,129 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 sang"</string>
+    <string name="onesong">"1 sang"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> sanger"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> sanger"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> av <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> sanger"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> av <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> sanger"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> album"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> album"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Bibliotek"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Avspilling"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Tilfeldig"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Tilfeldig av"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Slett"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Stokk alle"</string>
-    <string name="play_all" msgid="6309622568869321842">"Spill alle"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Alle sanger av <xliff:g id="ARTIST">%s</xliff:g> vil vil bli slettet permanent fra minnekortet."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Hele albumet «<xliff:g id="ALBUM">%s</xliff:g>» vil bli slettet permanent fra minnekortet."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"«<xliff:g id="SONG">%s</xliff:g>» vil bli slettet permanent fra minnekortet."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Bibliotek"</string>
+    <string name="goto_playback">"Avspilling"</string>
+    <string name="party_shuffle">"Tilfeldig"</string>
+    <string name="party_shuffle_off">"Tilfeldig av"</string>
+    <string name="delete_item">"Slett"</string>
+    <string name="shuffle_all">"Stokk alle"</string>
+    <string name="play_all">"Spill alle"</string>
+    <string name="delete_artist_desc">"Alle sanger av <xliff:g id="ARTIST">%s</xliff:g> vil vil bli slettet permanent fra minnekortet."</string>
+    <string name="delete_album_desc">"Hele albumet \"<xliff:g id="ALBUM">%s</xliff:g>\" vil bli slettet permanent fra minnekortet."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" vil bli slettet permanent fra minnekortet."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 sang ble slettet."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> sang ble slettet."</item>
+    <item quantity="one">"1 sang ble slettet."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> sang ble slettet."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Søker i minnekort…"</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Spilles nå"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Tilfeldig"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artister"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Album"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Album"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Sanger"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Sanger"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Spillelister"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Spillelister"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Videoer"</string>
-    <string name="all_title" msgid="6880186414437237653">"Alle medier"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artister"</string>
-    <string name="search_title" msgid="1016971653383739344">"Søk"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Ingen sanger"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Ingen videoer"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Ingen spillelister"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Slett"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Rediger"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Gi nytt navn"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Spillelisten ble slettet."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Spillelisten fikk nytt navn."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Nylig lagt til"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Nylig lagt til"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Mangler minnekort"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Telefonen har ikke noe minnekort i seg."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Minnekort utilgjengelig"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Minnekortet er opptatt."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Feil i minnekort"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"En feil oppsto i minnekortet."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Ukjent artist"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Ukjent album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Tilfeldig avspilling er på."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Tilfeldig avspilling er av."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Ingen gjentagelse."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Gjentar denne sangen."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Gjentar alle sanger."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Bruk som telefonringetone"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Bruk som ringetone"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"«%s» valgt som telefonringetone."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Spill"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Legg til spillelisten"</string>
-    <string name="queue" msgid="2937629819482787704">"Gjeldende spilleliste"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Ny"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Ny spilleliste <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Søker i minnekort…"</string>
+    <string name="nowplaying_title">"Spilles nå"</string>
+    <string name="partyshuffle_title">"Tilfeldig"</string>
+    <string name="artists_title">"Artister"</string>
+    <string name="albums_menu">"Album"</string>
+    <string name="albums_title">"Album"</string>
+    <string name="tracks_menu">"Sanger"</string>
+    <string name="tracks_title">"Sanger"</string>
+    <string name="playlists_menu">"Spillelister"</string>
+    <string name="playlists_title">"Spillelister"</string>
+    <string name="videos_title">"Videoer"</string>
+    <string name="all_title">"Alle medier"</string>
+    <string name="browse_menu">"Artister"</string>
+    <string name="search_title">"Søk"</string>
+    <string name="no_tracks_title">"Ingen sanger"</string>
+    <string name="no_videos_title">"Ingen videoer"</string>
+    <string name="no_playlists_title">"Ingen spillelister"</string>
+    <string name="delete_playlist_menu">"Slett"</string>
+    <string name="edit_playlist_menu">"Rediger"</string>
+    <string name="rename_playlist_menu">"Gi nytt navn"</string>
+    <string name="playlist_deleted_message">"Spillelisten ble slettet."</string>
+    <string name="playlist_renamed_message">"Spillelisten fikk nytt navn."</string>
+    <string name="recentlyadded">"Nylig lagt til"</string>
+    <string name="recentlyadded_title">"Nylig lagt til"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Mangler minnekort"</string>
+    <string name="sdcard_missing_message">"Telefonen har ikke noe minnekort i seg."</string>
+    <string name="sdcard_busy_title">"Minnekort utilgjengelig"</string>
+    <string name="sdcard_busy_message">"Minnekortet er opptatt."</string>
+    <string name="sdcard_error_title">"Feil i minnekort"</string>
+    <string name="sdcard_error_message">"En feil oppsto i minnekortet."</string>
+    <string name="unknown_artist_name">"Ukjent artist"</string>
+    <string name="unknown_album_name">"Ukjent album"</string>
+    <string name="shuffle_on_notif">"Tilfeldig avspilling er på."</string>
+    <string name="shuffle_off_notif">"Tilfeldig avspilling er av."</string>
+    <string name="repeat_off_notif">"Ingen gjentagelse."</string>
+    <string name="repeat_current_notif">"Gjentar denne sangen."</string>
+    <string name="repeat_all_notif">"Gjentar alle sanger."</string>
+    <string name="ringtone_menu">"Bruk som telefonringetone"</string>
+    <string name="ringtone_menu_short">"Bruk som ringetone"</string>
+    <string name="ringtone_set">"\"%s\" valgt som telefonringetone."</string>
+    <string name="play_selection">"Spill"</string>
+    <string name="add_to_playlist">"Legg til spillelisten"</string>
+    <string name="queue">"Gjeldende spilleliste"</string>
+    <string name="new_playlist">"Ny"</string>
+    <string name="new_playlist_name_template">"Ny spilleliste <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 sang ble lagt til spillelisten."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d sanger ble lagt til spillelisten."</item>
+    <item quantity="one">"1 sang ble lagt til spillelisten."</item>
+    <item quantity="other">"%d sanger ble lagt til spillelisten."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Den valgte spillelisten er tom."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Lagre"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Erstatt"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Avspillingsproblem"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Beklager, kunne ikke spille av sangen."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Den valgte spillelisten er tom."</string>
+    <string name="create_playlist_create_text">"Lagre"</string>
+    <string name="create_playlist_overwrite_text">"Erstatt"</string>
+    <string name="service_start_error_title">"Avspillingsproblem"</string>
+    <string name="service_start_error_msg">"Beklager, kunne ikke spille av sangen."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 uke"</item>
-    <item msgid="7487749116155425822">"2 uker"</item>
-    <item msgid="1565338360539555185">"3 uker"</item>
-    <item msgid="2142986059836933072">"4 uker"</item>
-    <item msgid="4332403875260507291">"5 uker"</item>
-    <item msgid="3847281907869868565">"6 uker"</item>
-    <item msgid="2942654998558867799">"7 uker"</item>
-    <item msgid="2115529325850052227">"8 uker"</item>
-    <item msgid="1396675336665198092">"9 uker"</item>
-    <item msgid="3178819129208998649">"10 uker"</item>
-    <item msgid="2727959579637914171">"11 uker"</item>
-    <item msgid="8708754966127584739">"12 uker"</item>
+    <item>"1 uke"</item>
+    <item>"2 uker"</item>
+    <item>"3 uker"</item>
+    <item>"4 uker"</item>
+    <item>"5 uker"</item>
+    <item>"6 uker"</item>
+    <item>"7 uker"</item>
+    <item>"8 uker"</item>
+    <item>"9 uker"</item>
+    <item>"10 uker"</item>
+    <item>"11 uker"</item>
+    <item>"12 uker"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Ferdig"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Velg tid"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Lagre som spilleliste"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Tøm spilleliste"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Musikk"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Musikk-spilleliste"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musikk"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videoer"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Musikk"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Beklager, spilleren støtter ikke denne typen lydfiler."</string>
-    <string name="cancel" msgid="886559484711947520">"Avbryt"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Fjern fra spilleliste"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Kobler til <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Søk etter %s ved hjelp av:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artister…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Album…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Sanger…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Spillelister…"</string>
-    <string name="loading" msgid="3267924133697717662">"Laster"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Spor"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Album"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artister"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Velg musikkspor"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Spor <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"Kunne ikke spille av strømmen."</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artister, album og spor"</string>
+    <string name="weekpicker_set">"Ferdig"</string>
+    <string name="weekpicker_title">"Velg tid"</string>
+    <string name="save_as_playlist">"Lagre som spilleliste"</string>
+    <string name="clear_playlist">"Tøm spilleliste"</string>
+    <string name="musicbrowserlabel">"Musikk"</string>
+    <string name="musicshortcutlabel">"Musikk-spilleliste"</string>
+    <string name="mediaplaybacklabel">"Musikk"</string>
+    <string name="videobrowserlabel">"Videoer"</string>
+    <string name="mediapickerlabel">"Musikk"</string>
+    <string name="playback_failed">"Beklager, spilleren støtter ikke denne typen lydfiler."</string>
+    <string name="cancel">"Avbryt"</string>
+    <string name="remove_from_playlist">"Fjern fra spilleliste"</string>
+    <string name="streamloadingtext">"Kobler til <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Søk etter %s ved hjelp av:"</string>
+    <string name="working_artists">"Artister…"</string>
+    <string name="working_albums">"Album…"</string>
+    <string name="working_songs">"Sanger…"</string>
+    <string name="working_playlists">"Spillelister…"</string>
+    <string name="loading">"Laster"</string>
+    <string name="sort_by_track">"Spor"</string>
+    <string name="sort_by_album">"Album"</string>
+    <string name="sort_by_artist">"Artister"</string>
+    <string name="music_picker_title">"Velg musikkspor"</string>
+    <string name="gadget_track">"Spor <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
+    <skip />
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-nl-finger/strings2.xml b/res/values-nl-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-nl-finger/strings2.xml
+++ b/res/values-nl-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-nl-keysexposed/strings.xml
index 4c89559..a06ee49 100644
--- a/res/values-nl-keysexposed/strings.xml
+++ b/res/values-nl-keysexposed/strings.xml
@@ -15,7 +15,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">"Naam afspeellijst"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Naam van \'<xliff:g id="PLAYLIST">%s</xliff:g>\' wijzigen in"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Naam van \'<xliff:g id="PLAYLIST">%s</xliff:g>\' wijzigen in"</string>
+    <string name="create_playlist_create_text_prompt">"Naam afspeellijst"</string>
+    <string name="rename_playlist_same_prompt">"Naam van \'<xliff:g id="PLAYLIST">%s</xliff:g>\' wijzigen in"</string>
+    <string name="rename_playlist_diff_prompt">"Naam van \'<xliff:g id="PLAYLIST">%s</xliff:g>\' wijzigen in"</string>
 </resources>
diff --git a/res/values-nl-keyshidden/strings.xml b/res/values-nl-keyshidden/strings.xml
index e37301c..26c6e7b 100644
--- a/res/values-nl-keyshidden/strings.xml
+++ b/res/values-nl-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Open het toetsenbord om uw nieuwe afspeellijst een naam te geven of selecteer \'Opslaan\' om deze de naam \'%s\' te geven."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Open het toetsenbord om afspeellijst \'<xliff:g id="PLAYLIST">%s</xliff:g>\' een nieuwe naam te geven."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Open het toetsenbord om afspeellijst \'<xliff:g id="PLAYLIST">%s</xliff:g>\' een nieuwe naam te geven of selecteer \'Opslaan\' om deze de naam \'%s\' te geven."</string>
+    <string name="create_playlist_create_text_prompt">"Open het toetsenbord om uw nieuwe afspeellijst een naam te geven of selecteer \'Opslaan\' om deze de naam \'%s\' te geven."</string>
+    <string name="rename_playlist_same_prompt">"Open het toetsenbord om afspeellijst \'<xliff:g id="PLAYLIST">%s</xliff:g>\' een nieuwe naam te geven."</string>
+    <string name="rename_playlist_diff_prompt">"Open het toetsenbord om afspeellijst \'<xliff:g id="PLAYLIST">%s</xliff:g>\' een nieuwe naam te geven of selecteer \'Opslaan\' om deze de naam \'%s\' te geven."</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 90b7ca4..e2e747e 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 nummer"</string>
+    <string name="onesong">"1 nummer"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> nummers"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> nummers"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> van <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> nummers"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> van <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> nummers"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albums"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> albums"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Bibliotheek"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Afspelen"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Party shuffle"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Party shuffle uit"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Verwijderen"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Alles in willekeurige volgorde afspelen"</string>
-    <string name="play_all" msgid="6309622568869321842">"Alles afspelen"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Alle nummers van <xliff:g id="ARTIST">%s</xliff:g> worden definitief van de SD-kaart verwijderd."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Het hele album \'<xliff:g id="ALBUM">%s</xliff:g>\' wordt definitief van de SD-kaart verwijderd."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"<xliff:g id="SONG">%s</xliff:g>\' wordt definitief van de SD-kaart verwijderd."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Bibliotheek"</string>
+    <string name="goto_playback">"Afspelen"</string>
+    <string name="party_shuffle">"Party shuffle"</string>
+    <string name="party_shuffle_off">"Party shuffle uit"</string>
+    <string name="delete_item">"Verwijderen"</string>
+    <string name="shuffle_all">"Alles in willekeurige volgorde afspelen"</string>
+    <string name="play_all">"Alles afspelen"</string>
+    <string name="delete_artist_desc">"Alle nummers van <xliff:g id="ARTIST">%s</xliff:g> worden definitief van de SD-kaart verwijderd."</string>
+    <string name="delete_album_desc">"Het hele album \'<xliff:g id="ALBUM">%s</xliff:g>\' wordt definitief van de SD-kaart verwijderd."</string>
+    <string name="delete_song_desc">"<xliff:g id="SONG">%s</xliff:g>\' wordt definitief van de SD-kaart verwijderd."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 nummer is verwijderd."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> nummers zijn verwijderd."</item>
+    <item quantity="one">"1 nummer is verwijderd."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> nummers zijn verwijderd."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"SD-kaart scannen..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Wordt nu afgespeeld"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Party shuffle"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artiesten"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Albums"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Albums"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Nummers"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Nummers"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Afspeellijsten"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Afspeellijsten"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Video\'s"</string>
-    <string name="all_title" msgid="6880186414437237653">"Alle media"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artiesten"</string>
-    <string name="search_title" msgid="1016971653383739344">"Zoeken"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Geen nummers"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Geen video\'s"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Geen afspeellijsten"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Verwijderen"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Bewerken"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Naam wijzigen"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Afspeellijst verwijderd."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Naam van afspeellijst gewijzigd."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Onlangs toegevoegd"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Onlangs toegevoegd"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Geen SD-kaart"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Er is geen SD-kaart in de telefoon geplaatst."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD-kaart niet beschikbaar"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"De SD-kaart is in gebruik."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Fout met SD-kaart"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Er is een fout opgetreden met de SD-kaart."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Onbekende artiest"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Onbekend album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Shuffle is ingeschakeld."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Shuffle is uitgeschakeld."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Herhalen is uitgeschakeld."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Huidig nummer wordt herhaald."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Alle nummers worden herhaald."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Gebruiken als beltoon van telefoon"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Gebruiken als beltoon"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"%s\' ingesteld als beltoon van telefoon."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Afspelen"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Toevoegen aan afspeellijst"</string>
-    <string name="queue" msgid="2937629819482787704">"Huidige afspeellijst"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Nieuw"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nieuwe afspeellijst <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"SD-kaart scannen..."</string>
+    <string name="nowplaying_title">"Wordt nu afgespeeld"</string>
+    <string name="partyshuffle_title">"Party shuffle"</string>
+    <string name="artists_title">"Artiesten"</string>
+    <string name="albums_menu">"Albums"</string>
+    <string name="albums_title">"Albums"</string>
+    <string name="tracks_menu">"Nummers"</string>
+    <string name="tracks_title">"Nummers"</string>
+    <string name="playlists_menu">"Afspeellijsten"</string>
+    <string name="playlists_title">"Afspeellijsten"</string>
+    <string name="videos_title">"Video\'s"</string>
+    <string name="all_title">"Alle media"</string>
+    <string name="browse_menu">"Artiesten"</string>
+    <string name="search_title">"Zoeken"</string>
+    <string name="no_tracks_title">"Geen nummers"</string>
+    <string name="no_videos_title">"Geen video\'s"</string>
+    <string name="no_playlists_title">"Geen afspeellijsten"</string>
+    <string name="delete_playlist_menu">"Verwijderen"</string>
+    <string name="edit_playlist_menu">"Bewerken"</string>
+    <string name="rename_playlist_menu">"Naam wijzigen"</string>
+    <string name="playlist_deleted_message">"Afspeellijst verwijderd."</string>
+    <string name="playlist_renamed_message">"Naam van afspeellijst gewijzigd."</string>
+    <string name="recentlyadded">"Onlangs toegevoegd"</string>
+    <string name="recentlyadded_title">"Onlangs toegevoegd"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Geen SD-kaart"</string>
+    <string name="sdcard_missing_message">"Er is geen SD-kaart in de telefoon geplaatst."</string>
+    <string name="sdcard_busy_title">"SD-kaart niet beschikbaar"</string>
+    <string name="sdcard_busy_message">"De SD-kaart is in gebruik."</string>
+    <string name="sdcard_error_title">"Fout met SD-kaart"</string>
+    <string name="sdcard_error_message">"Er is een fout opgetreden met de SD-kaart."</string>
+    <string name="unknown_artist_name">"Onbekende artiest"</string>
+    <string name="unknown_album_name">"Onbekend album"</string>
+    <string name="shuffle_on_notif">"Shuffle is ingeschakeld."</string>
+    <string name="shuffle_off_notif">"Shuffle is uitgeschakeld."</string>
+    <string name="repeat_off_notif">"Herhalen is uitgeschakeld."</string>
+    <string name="repeat_current_notif">"Huidig nummer wordt herhaald."</string>
+    <string name="repeat_all_notif">"Alle nummers worden herhaald."</string>
+    <string name="ringtone_menu">"Gebruiken als beltoon van telefoon"</string>
+    <string name="ringtone_menu_short">"Gebruiken als beltoon"</string>
+    <string name="ringtone_set">"%s\' ingesteld als beltoon van telefoon."</string>
+    <string name="play_selection">"Afspelen"</string>
+    <string name="add_to_playlist">"Toevoegen aan afspeellijst"</string>
+    <string name="queue">"Huidige afspeellijst"</string>
+    <string name="new_playlist">"Nieuw"</string>
+    <string name="new_playlist_name_template">"Nieuwe afspeellijst <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 nummer toegevoegd aan afspeellijst."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d nummers toegevoegd aan afspeellijst."</item>
+    <item quantity="one">"1 nummer toegevoegd aan afspeellijst."</item>
+    <item quantity="other">"%d nummers toegevoegd aan afspeellijst."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Geselecteerde afspeellijst is leeg."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Opslaan"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Overschrijven"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Probleem met afspelen"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Het nummer kan niet worden afgespeeld."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Geselecteerde afspeellijst is leeg."</string>
+    <string name="create_playlist_create_text">"Opslaan"</string>
+    <string name="create_playlist_overwrite_text">"Overschrijven"</string>
+    <string name="service_start_error_title">"Probleem met afspelen"</string>
+    <string name="service_start_error_msg">"Het nummer kan niet worden afgespeeld."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 week"</item>
-    <item msgid="7487749116155425822">"2 weken"</item>
-    <item msgid="1565338360539555185">"3 weken"</item>
-    <item msgid="2142986059836933072">"4 weken"</item>
-    <item msgid="4332403875260507291">"5 weken"</item>
-    <item msgid="3847281907869868565">"6 weken"</item>
-    <item msgid="2942654998558867799">"7 weken"</item>
-    <item msgid="2115529325850052227">"8 weken"</item>
-    <item msgid="1396675336665198092">"9 weken"</item>
-    <item msgid="3178819129208998649">"10 weken"</item>
-    <item msgid="2727959579637914171">"11 weken"</item>
-    <item msgid="8708754966127584739">"12 weken"</item>
+    <item>"1 week"</item>
+    <item>"2 weken"</item>
+    <item>"3 weken"</item>
+    <item>"4 weken"</item>
+    <item>"5 weken"</item>
+    <item>"6 weken"</item>
+    <item>"7 weken"</item>
+    <item>"8 weken"</item>
+    <item>"9 weken"</item>
+    <item>"10 weken"</item>
+    <item>"11 weken"</item>
+    <item>"12 weken"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Gereed"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Tijd instellen"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Opslaan als afspeellijst"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Afspeellijst wissen"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Muziek"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Afspeellijst voor muziek"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Muziek"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Video\'s"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Muziek"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"De speler ondersteunt dit type audiobestand niet."</string>
-    <string name="cancel" msgid="886559484711947520">"Annuleren"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Verwijderen uit afspeellijst"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Verbinding maken met <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Zoeken naar %s via:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artiesten…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Albums…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Nummers…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Afspeellijsten…"</string>
-    <string name="loading" msgid="3267924133697717662">"Laden"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Tracks"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Albums"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artiesten"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Muziektrack selecteren"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Track <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"Het afspelen van de aangevraagde stream is mislukt."</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artiesten, albums en nummers"</string>
+    <string name="weekpicker_set">"Gereed"</string>
+    <string name="weekpicker_title">"Tijd instellen"</string>
+    <string name="save_as_playlist">"Opslaan als afspeellijst"</string>
+    <string name="clear_playlist">"Afspeellijst wissen"</string>
+    <string name="musicbrowserlabel">"Muziek"</string>
+    <string name="musicshortcutlabel">"Afspeellijst voor muziek"</string>
+    <string name="mediaplaybacklabel">"Muziek"</string>
+    <string name="videobrowserlabel">"Video\'s"</string>
+    <string name="mediapickerlabel">"Muziek"</string>
+    <string name="playback_failed">"De speler ondersteunt dit type audiobestand niet."</string>
+    <string name="cancel">"Annuleren"</string>
+    <string name="remove_from_playlist">"Verwijderen uit afspeellijst"</string>
+    <string name="streamloadingtext">"Verbinding maken met <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Zoeken naar %s via:"</string>
+    <string name="working_artists">"Artiesten…"</string>
+    <string name="working_albums">"Albums…"</string>
+    <string name="working_songs">"Nummers…"</string>
+    <string name="working_playlists">"Afspeellijsten…"</string>
+    <string name="loading">"Laden"</string>
+    <string name="sort_by_track">"Tracks"</string>
+    <string name="sort_by_album">"Albums"</string>
+    <string name="sort_by_artist">"Artiesten"</string>
+    <string name="music_picker_title">"Muziektrack selecteren"</string>
+    <string name="gadget_track">"Track <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"Het afspelen van de aangevraagde stream is mislukt."</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-pl-finger/strings2.xml b/res/values-pl-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-pl-finger/strings2.xml
+++ b/res/values-pl-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-pl-keysexposed/strings.xml
index b1a144d..d4294bb 100644
--- a/res/values-pl-keysexposed/strings.xml
+++ b/res/values-pl-keysexposed/strings.xml
@@ -15,7 +15,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">"Nazwa playlisty"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Zmień nazwę „<xliff:g id="PLAYLIST">%s</xliff:g>” na"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Zmień nazwę „<xliff:g id="PLAYLIST">%s</xliff:g>” na"</string>
+    <string name="create_playlist_create_text_prompt">"Nazwa playlisty"</string>
+    <string name="rename_playlist_same_prompt">"Zmień nazwę „<xliff:g id="PLAYLIST">%s</xliff:g>” na"</string>
+    <string name="rename_playlist_diff_prompt">"Zmień nazwę „<xliff:g id="PLAYLIST">%s</xliff:g>” na"</string>
 </resources>
diff --git a/res/values-pl-keyshidden/strings.xml b/res/values-pl-keyshidden/strings.xml
index 592f652..8dcbae0 100644
--- a/res/values-pl-keyshidden/strings.xml
+++ b/res/values-pl-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Otwórz klawiaturę, aby nazwać nową playlistę lub wybierz polecenie Zapisz, aby nazwać ją „%s”."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Otwórz klawiaturę, aby nadać nową nazwę playliście „<xliff:g id="PLAYLIST">%s</xliff:g>”."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Otwórz klawiaturę, aby nadać playliście „<xliff:g id="PLAYLIST">%s</xliff:g>” nową nazwę lub wybierz polecenie Zapisz, aby nazwać ją „%s”."</string>
+    <string name="create_playlist_create_text_prompt">"Otwórz klawiaturę, aby nazwać nową playlistę lub wybierz polecenie Zapisz, aby nazwać ją „%s”."</string>
+    <string name="rename_playlist_same_prompt">"Otwórz klawiaturę, aby nadać nową nazwę playliście „<xliff:g id="PLAYLIST">%s</xliff:g>”."</string>
+    <string name="rename_playlist_diff_prompt">"Otwórz klawiaturę, aby nadać playliście „<xliff:g id="PLAYLIST">%s</xliff:g>” nową nazwę lub wybierz polecenie Zapisz, aby nazwać ją „%s”."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2cf44bc..01b2879 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 utwór"</string>
+    <string name="onesong">"1 utwór"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> utworów"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> utworów"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> z <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> utworów"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> z <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> utworów"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albumów"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> albumów"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Biblioteka"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Odtwórz"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Losowo – tryb imprezy"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Wyłącz tryb imprezy"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Usuń"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Wszystkie losowo"</string>
-    <string name="play_all" msgid="6309622568869321842">"Odtwórz wszystko"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Wszystkie utwory wykonawcy <xliff:g id="ARTIST">%s</xliff:g> zostaną na stałe usunięte z karty SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Cały album „<xliff:g id="ALBUM">%s</xliff:g>” zostanie na stałe usunięty z karty SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"Utwór „<xliff:g id="SONG">%s</xliff:g>” zostanie na stałe usunięty z karty SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Biblioteka"</string>
+    <string name="goto_playback">"Odtwórz"</string>
+    <string name="party_shuffle">"Losowo – tryb imprezy"</string>
+    <string name="party_shuffle_off">"Wyłącz tryb imprezy"</string>
+    <string name="delete_item">"Usuń"</string>
+    <string name="shuffle_all">"Wszystkie losowo"</string>
+    <string name="play_all">"Odtwórz wszystko"</string>
+    <string name="delete_artist_desc">"Wszystkie utwory wykonawcy <xliff:g id="ARTIST">%s</xliff:g> zostaną na stałe usunięte z karty SD."</string>
+    <string name="delete_album_desc">"Cały album „<xliff:g id="ALBUM">%s</xliff:g>” zostanie na stałe usunięty z karty SD."</string>
+    <string name="delete_song_desc">"Utwór „<xliff:g id="SONG">%s</xliff:g>” zostanie na stałe usunięty z karty SD."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 utwór został usunięty."</item>
-    <item quantity="other" msgid="5156740163031225200">"Liczba usuniętych utworów: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
+    <item quantity="one">"1 utwór został usunięty."</item>
+    <item quantity="other">"Liczba usuniętych utworów: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Skanowanie karty SD..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Teraz odtwarzane"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Losowo w trybie imprezy"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Wykonawcy"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Albumy"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Albumy"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Utwory"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Utwory"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Playlisty"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Playlisty"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Filmy wideo"</string>
-    <string name="all_title" msgid="6880186414437237653">"Wszystkie multimedia"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Wykonawcy"</string>
-    <string name="search_title" msgid="1016971653383739344">"Szukaj"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Brak utworów"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Brak filmów wideo"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Brak playlist"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Usuń"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Edytuj"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Zmień nazwę"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Playlista została usunięta."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Zmieniono nazwę playlisty."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Ostatnio dodane"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Ostatnio dodane"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasty"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasty"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Brak karty SD"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Brak karty SD w telefonie."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Karta SD jest niedostępna"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Niestety, karta SD jest zajęta."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Błąd karty SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Napotkano błąd na karcie SD."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Nieznany wykonawca"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Nieznany album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Odtwarzanie losowe włączone"</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Odtwarzanie losowe wyłączone"</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Powtarzanie jest wyłączone."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Powtarzanie obecnego utworu."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Powtarzanie wszystkich utworów."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Ustaw jako dzwonek telefonu"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Ustaw jako dzwonek"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"„%s” ustawiono jako dzwonek telefonu."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Odtwórz"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Dodaj do playlisty"</string>
-    <string name="queue" msgid="2937629819482787704">"Bieżąca playlista"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Nowy"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nowa playlista <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Skanowanie karty SD..."</string>
+    <string name="nowplaying_title">"Teraz odtwarzane"</string>
+    <string name="partyshuffle_title">"Losowo w trybie imprezy"</string>
+    <string name="artists_title">"Wykonawcy"</string>
+    <string name="albums_menu">"Albumy"</string>
+    <string name="albums_title">"Albumy"</string>
+    <string name="tracks_menu">"Utwory"</string>
+    <string name="tracks_title">"Utwory"</string>
+    <string name="playlists_menu">"Playlisty"</string>
+    <string name="playlists_title">"Playlisty"</string>
+    <string name="videos_title">"Filmy wideo"</string>
+    <string name="all_title">"Wszystkie multimedia"</string>
+    <string name="browse_menu">"Wykonawcy"</string>
+    <string name="search_title">"Szukaj"</string>
+    <string name="no_tracks_title">"Brak utworów"</string>
+    <string name="no_videos_title">"Brak filmów wideo"</string>
+    <string name="no_playlists_title">"Brak playlist"</string>
+    <string name="delete_playlist_menu">"Usuń"</string>
+    <string name="edit_playlist_menu">"Edytuj"</string>
+    <string name="rename_playlist_menu">"Zmień nazwę"</string>
+    <string name="playlist_deleted_message">"Playlista została usunięta."</string>
+    <string name="playlist_renamed_message">"Zmieniono nazwę playlisty."</string>
+    <string name="recentlyadded">"Ostatnio dodane"</string>
+    <string name="recentlyadded_title">"Ostatnio dodane"</string>
+    <string name="podcasts_listitem">"Podcasty"</string>
+    <string name="podcasts_title">"Podcasty"</string>
+    <string name="sdcard_missing_title">"Brak karty SD"</string>
+    <string name="sdcard_missing_message">"Brak karty SD w telefonie."</string>
+    <string name="sdcard_busy_title">"Karta SD jest niedostępna"</string>
+    <string name="sdcard_busy_message">"Niestety, karta SD jest zajęta."</string>
+    <string name="sdcard_error_title">"Błąd karty SD"</string>
+    <string name="sdcard_error_message">"Napotkano błąd na karcie SD."</string>
+    <string name="unknown_artist_name">"Nieznany wykonawca"</string>
+    <string name="unknown_album_name">"Nieznany album"</string>
+    <string name="shuffle_on_notif">"Odtwarzanie losowe włączone"</string>
+    <string name="shuffle_off_notif">"Odtwarzanie losowe wyłączone"</string>
+    <string name="repeat_off_notif">"Powtarzanie jest wyłączone."</string>
+    <string name="repeat_current_notif">"Powtarzanie obecnego utworu."</string>
+    <string name="repeat_all_notif">"Powtarzanie wszystkich utworów."</string>
+    <string name="ringtone_menu">"Ustaw jako dzwonek telefonu"</string>
+    <string name="ringtone_menu_short">"Ustaw jako dzwonek"</string>
+    <string name="ringtone_set">"„%s” ustawiono jako dzwonek telefonu."</string>
+    <string name="play_selection">"Odtwórz"</string>
+    <string name="add_to_playlist">"Dodaj do playlisty"</string>
+    <string name="queue">"Bieżąca playlista"</string>
+    <string name="new_playlist">"Nowy"</string>
+    <string name="new_playlist_name_template">"Nowa playlista <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"Dodano 1 utwór do playlisty."</item>
-    <item quantity="other" msgid="7675242021325355213">"Utworów dodanych do playlisty: %d."</item>
+    <item quantity="one">"Dodano 1 utwór do playlisty."</item>
+    <item quantity="other">"Utworów dodanych do playlisty: %d."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Wybrana playlista jest pusta."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Zapisz"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Zastąp"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problem z odtwarzaniem"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Niestety, nie można odtworzyć utworu."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Wybrana playlista jest pusta."</string>
+    <string name="create_playlist_create_text">"Zapisz"</string>
+    <string name="create_playlist_overwrite_text">"Zastąp"</string>
+    <string name="service_start_error_title">"Problem z odtwarzaniem"</string>
+    <string name="service_start_error_msg">"Niestety, nie można odtworzyć utworu."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"tydzień"</item>
-    <item msgid="7487749116155425822">"2 tygodnie"</item>
-    <item msgid="1565338360539555185">"3 tygodnie"</item>
-    <item msgid="2142986059836933072">"4 tygodnie"</item>
-    <item msgid="4332403875260507291">"5 tygodni"</item>
-    <item msgid="3847281907869868565">"6 tygodni"</item>
-    <item msgid="2942654998558867799">"7 tygodni"</item>
-    <item msgid="2115529325850052227">"8 tygodni"</item>
-    <item msgid="1396675336665198092">"9 tygodni"</item>
-    <item msgid="3178819129208998649">"10 tygodni"</item>
-    <item msgid="2727959579637914171">"11 tygodni"</item>
-    <item msgid="8708754966127584739">"12 tygodni"</item>
+    <item>"tydzień"</item>
+    <item>"2 tygodnie"</item>
+    <item>"3 tygodnie"</item>
+    <item>"4 tygodnie"</item>
+    <item>"5 tygodni"</item>
+    <item>"6 tygodni"</item>
+    <item>"7 tygodni"</item>
+    <item>"8 tygodni"</item>
+    <item>"9 tygodni"</item>
+    <item>"10 tygodni"</item>
+    <item>"11 tygodni"</item>
+    <item>"12 tygodni"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Gotowe"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Ustaw czas"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Zapisz jako playlistę"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Wyczyść playlistę"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Muzyka"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Playlista muzyczna"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Muzyka"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Filmy wideo"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Muzyka"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Niestety, odtwarzacz nie obsługuje plików audio tego typu."</string>
-    <string name="cancel" msgid="886559484711947520">"Anuluj"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Usuń z playlisty"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Łączenie z: <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Wyszukaj %s z wykorzystaniem:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Wykonawcy…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Albumy…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Utwory…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Playlisty…"</string>
-    <string name="loading" msgid="3267924133697717662">"Ładowanie"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Utwory"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Albumy"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Wykonawcy"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Wybierz utwór muzyczny"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Utwór <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"Nie można odtworzyć żądanego strumienia."</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Wykonawcy, albumy i utwory"</string>
+    <string name="weekpicker_set">"Gotowe"</string>
+    <string name="weekpicker_title">"Ustaw czas"</string>
+    <string name="save_as_playlist">"Zapisz jako playlistę"</string>
+    <string name="clear_playlist">"Wyczyść playlistę"</string>
+    <string name="musicbrowserlabel">"Muzyka"</string>
+    <string name="musicshortcutlabel">"Playlista muzyczna"</string>
+    <string name="mediaplaybacklabel">"Muzyka"</string>
+    <string name="videobrowserlabel">"Filmy wideo"</string>
+    <string name="mediapickerlabel">"Muzyka"</string>
+    <string name="playback_failed">"Niestety, odtwarzacz nie obsługuje plików audio tego typu."</string>
+    <string name="cancel">"Anuluj"</string>
+    <string name="remove_from_playlist">"Usuń z playlisty"</string>
+    <string name="streamloadingtext">"Łączenie z: <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Wyszukaj %s z wykorzystaniem:"</string>
+    <string name="working_artists">"Wykonawcy…"</string>
+    <string name="working_albums">"Albumy…"</string>
+    <string name="working_songs">"Utwory…"</string>
+    <string name="working_playlists">"Playlisty…"</string>
+    <string name="loading">"Ładowanie"</string>
+    <string name="sort_by_track">"Utwory"</string>
+    <string name="sort_by_album">"Albumy"</string>
+    <string name="sort_by_artist">"Wykonawcy"</string>
+    <string name="music_picker_title">"Wybierz utwór muzyczny"</string>
+    <string name="gadget_track">"Utwór <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"Nie można odtworzyć żądanego strumienia."</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-finger/strings2.xml b/res/values-pt-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-pt-finger/strings2.xml
+++ b/res/values-pt-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-pt-keysexposed/strings.xml
index 5393af1..1d31273 100644
--- a/res/values-pt-keysexposed/strings.xml
+++ b/res/values-pt-keysexposed/strings.xml
@@ -15,7 +15,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">"Nome da lista de reprodução"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Renomear \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Renomear \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
+    <string name="create_playlist_create_text_prompt">"Nome da lista de reprodução"</string>
+    <string name="rename_playlist_same_prompt">"Renomear \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
+    <string name="rename_playlist_diff_prompt">"Renomear \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
 </resources>
diff --git a/res/values-pt-keyshidden/strings.xml b/res/values-pt-keyshidden/strings.xml
index d5718d1..98d976f 100644
--- a/res/values-pt-keyshidden/strings.xml
+++ b/res/values-pt-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Abra o teclado para dar um nome à sua nova Lista de reprodução ou selecione Salvar para nomeá-la \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Abra o teclado para dar um nome à nova lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Abra o teclado para dar um novo nome à lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ou selecione Salvar para nomeá-la \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Abra o teclado para dar um nome à sua nova Lista de reprodução ou selecione Salvar para nomeá-la \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Abra o teclado para dar um nome à nova lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_diff_prompt">"Abra o teclado para dar um novo nome à lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ou selecione Salvar para nomeá-la \"%s\"."</string>
 </resources>
diff --git a/res/values-pt-rPT-finger/strings2.xml b/res/values-pt-rPT-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-pt-rPT-finger/strings2.xml
+++ b/res/values-pt-rPT-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-pt-rPT-keysexposed/strings.xml
index eb487ac..f85aa8e 100644
--- a/res/values-pt-rPT-keysexposed/strings.xml
+++ b/res/values-pt-rPT-keysexposed/strings.xml
@@ -15,7 +15,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">"Nome da lista de reprodução"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Mudar o nome de \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Mudar o nome de \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
+    <string name="create_playlist_create_text_prompt">"Nome da lista de reprodução"</string>
+    <string name="rename_playlist_same_prompt">"Mudar o nome de \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
+    <string name="rename_playlist_diff_prompt">"Mudar o nome de \"<xliff:g id="PLAYLIST">%s</xliff:g>\" para"</string>
 </resources>
diff --git a/res/values-pt-rPT-keyshidden/strings.xml b/res/values-pt-rPT-keyshidden/strings.xml
index 1caebdc..6616e52 100644
--- a/res/values-pt-rPT-keyshidden/strings.xml
+++ b/res/values-pt-rPT-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Abra o teclado para dar um nome à nova lista de reprodução ou seleccione Guardar para a guardar com o nome \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Abra o teclado para dar um novo nome à lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Abra o teclado para dar um novo nome à lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ou seleccione Guardar para a guardar com o nome \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Abra o teclado para dar um nome à nova lista de reprodução ou seleccione Guardar para a guardar com o nome \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Abra o teclado para dar um novo nome à lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_diff_prompt">"Abra o teclado para dar um novo nome à lista de reprodução \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ou seleccione Guardar para a guardar com o nome \"%s\"."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 9ec1667..9380085 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 música"</string>
+    <string name="onesong">"1 música"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> músicas"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> músicas"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> músicas"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> músicas"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 álbum"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> álbuns"</item>
+    <item quantity="one">"1 álbum"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> álbuns"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Reprodução"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Lista aleatória"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Lista aleatória desactivada"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Eliminar"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Reproduzir todas aleatoriamente"</string>
-    <string name="play_all" msgid="6309622568869321842">"Reproduzir todas"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Todas as músicas de <xliff:g id="ARTIST">%s</xliff:g> serão eliminadas definitivamente do cartão SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"O álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" inteiro será eliminado definitivamente do cartão SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" será eliminada definitivamente do cartão SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Biblioteca"</string>
+    <string name="goto_playback">"Reprodução"</string>
+    <string name="party_shuffle">"Lista·aleatória"</string>
+    <string name="party_shuffle_off">"Lista·aleatória·desactivada"</string>
+    <string name="delete_item">"Eliminar"</string>
+    <string name="shuffle_all">"Reproduzir todas aleatoriamente"</string>
+    <string name="play_all">"Reproduzir todas"</string>
+    <string name="delete_artist_desc">"Todas as músicas de <xliff:g id="ARTIST">%s</xliff:g> serão eliminadas definitivamente do cartão SD."</string>
+    <string name="delete_album_desc">"O álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" inteiro será eliminado definitivamente do cartão SD."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" será eliminada definitivamente do cartão SD."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"Foi eliminada 1 música."</item>
-    <item quantity="other" msgid="5156740163031225200">"Foram eliminadas <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> músicas."</item>
+    <item quantity="one">"Foi eliminada 1 música."</item>
+    <item quantity="other">"Foram eliminadas <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> músicas."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"A analisar o cartão SD..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Em reprodução"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Lista aleatória"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artistas"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Álbuns"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Álbuns"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Músicas"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Músicas"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Listas de reprodução"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Listas de reprodução"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Vídeos"</string>
-    <string name="all_title" msgid="6880186414437237653">"Todo o conteúdo multimédia"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artistas"</string>
-    <string name="search_title" msgid="1016971653383739344">"Pesquisar"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Sem músicas"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Sem vídeos"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Sem listas de reprodução"</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">"Mudar o nome"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Lista de reprodução eliminada."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Nome da lista de reprodução alterado."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Adicionadas recentemente"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Adicionadas recentemente"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Sem cartão SD"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"O telefone não tem um cartão SD inserido."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Cartão SD indisponível"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Lamentamos, mas o cartão SD está ocupado."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Erro do cartão SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Ocorreu um erro com o cartão SD."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Artista desconhecido"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Álbum desconhecido"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"A reprodução aleatória está activada"</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"A reprodução aleatória está desactivada."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"A repetição está desactivada."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Repetir a música actual."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"A repetir todas as músicas."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Utilizar como toque do telefone"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Utilizar como toque"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" definida como toque do telefone."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Reproduzir"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Adicionar à lista de reprodução"</string>
-    <string name="queue" msgid="2937629819482787704">"Lista de reprodução actual"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Novo"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nova lista de reprodução <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"A analisar o cartão SD..."</string>
+    <string name="nowplaying_title">"Em reprodução"</string>
+    <string name="partyshuffle_title">"Lista aleatória"</string>
+    <string name="artists_title">"Artistas"</string>
+    <string name="albums_menu">"Álbuns"</string>
+    <string name="albums_title">"Álbuns"</string>
+    <string name="tracks_menu">"Músicas"</string>
+    <string name="tracks_title">"Músicas"</string>
+    <string name="playlists_menu">"Listas de reprodução"</string>
+    <string name="playlists_title">"Listas de reprodução"</string>
+    <string name="videos_title">"Vídeos"</string>
+    <string name="all_title">"Todo o conteúdo multimédia"</string>
+    <string name="browse_menu">"Artistas"</string>
+    <string name="search_title">"Pesquisar"</string>
+    <string name="no_tracks_title">"Sem músicas"</string>
+    <string name="no_videos_title">"Sem vídeos"</string>
+    <string name="no_playlists_title">"Sem listas de reprodução"</string>
+    <string name="delete_playlist_menu">"Eliminar"</string>
+    <string name="edit_playlist_menu">"Editar"</string>
+    <string name="rename_playlist_menu">"Mudar o nome"</string>
+    <string name="playlist_deleted_message">"Lista de reprodução eliminada."</string>
+    <string name="playlist_renamed_message">"Nome da lista de reprodução alterado."</string>
+    <string name="recentlyadded">"Adicionadas recentemente"</string>
+    <string name="recentlyadded_title">"Adicionadas recentemente"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Sem cartão SD"</string>
+    <string name="sdcard_missing_message">"O telefone não tem um cartão SD inserido."</string>
+    <string name="sdcard_busy_title">"Cartão SD indisponível"</string>
+    <string name="sdcard_busy_message">"Lamentamos, mas o cartão SD está ocupado."</string>
+    <string name="sdcard_error_title">"Erro do cartão SD"</string>
+    <string name="sdcard_error_message">"Ocorreu um erro com o cartão SD."</string>
+    <string name="unknown_artist_name">"Artista desconhecido"</string>
+    <string name="unknown_album_name">"Álbum desconhecido"</string>
+    <string name="shuffle_on_notif">"A reprodução aleatória está activada"</string>
+    <string name="shuffle_off_notif">"A reprodução aleatória está desactivada."</string>
+    <string name="repeat_off_notif">"A repetição está desactivada."</string>
+    <string name="repeat_current_notif">"Repetir a música actual."</string>
+    <string name="repeat_all_notif">"A repetir todas as músicas."</string>
+    <string name="ringtone_menu">"Utilizar como toque do telefone"</string>
+    <string name="ringtone_menu_short">"Utilizar como toque"</string>
+    <string name="ringtone_set">"\"%s\" definida como toque do telefone."</string>
+    <string name="play_selection">"Reproduzir"</string>
+    <string name="add_to_playlist">"Adicionar à lista de reprodução"</string>
+    <string name="queue">"Lista de reprodução actual"</string>
+    <string name="new_playlist">"Novo"</string>
+    <string name="new_playlist_name_template">"Nova lista de reprodução <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"Uma música adicionada à lista de reprodução."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d músicas adicionadas à lista de reprodução."</item>
+    <item quantity="one">"Uma música adicionada à lista de reprodução."</item>
+    <item quantity="other">"%d músicas adicionadas à lista de reprodução."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"A lista de reprodução seleccionada está vazia."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Guardar"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Substituir"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problemas de reprodução"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Lamentamos, mas não foi possível reproduzir a música."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"A lista de reprodução seleccionada está vazia."</string>
+    <string name="create_playlist_create_text">"Guardar"</string>
+    <string name="create_playlist_overwrite_text">"Substituir"</string>
+    <string name="service_start_error_title">"Problemas de reprodução"</string>
+    <string name="service_start_error_msg">"Lamentamos, mas não foi possível reproduzir a música."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 semana"</item>
-    <item msgid="7487749116155425822">"2 semanas"</item>
-    <item msgid="1565338360539555185">"3 semanas"</item>
-    <item msgid="2142986059836933072">"4 semanas"</item>
-    <item msgid="4332403875260507291">"5 semanas"</item>
-    <item msgid="3847281907869868565">"6 semanas"</item>
-    <item msgid="2942654998558867799">"7 semanas"</item>
-    <item msgid="2115529325850052227">"8 semanas"</item>
-    <item msgid="1396675336665198092">"9 semanas"</item>
-    <item msgid="3178819129208998649">"10 semanas"</item>
-    <item msgid="2727959579637914171">"11 semanas"</item>
-    <item msgid="8708754966127584739">"12 semanas"</item>
+    <item>"1 semana"</item>
+    <item>"2 semanas"</item>
+    <item>"3 semanas"</item>
+    <item>"4 semanas"</item>
+    <item>"5 semanas"</item>
+    <item>"6 semanas"</item>
+    <item>"7 semanas"</item>
+    <item>"8 semanas"</item>
+    <item>"9 semanas"</item>
+    <item>"10 semanas"</item>
+    <item>"11 semanas"</item>
+    <item>"12 semanas"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Concluído"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Definir a hora"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Guardar como lista de reprodução"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Limpar a lista de reprodução"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Música"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Lista de reprodução de músicas"</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="4477832192645009774">"Lamentamos, mas o leitor não suporta este tipo de ficheiros de áudio."</string>
-    <string name="cancel" msgid="886559484711947520">"Cancelar"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Remover da lista de reprodução"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"A ligar a <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Procurar %s utilizando:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artistas..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"Álbuns..."</string>
-    <string name="working_songs" msgid="2201491972050410684">"Músicas..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Listas de reprodução..."</string>
-    <string name="loading" msgid="3267924133697717662">"A carregar"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Faixas"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Álbuns"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artistas"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Seleccionar faixa de música"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Faixa <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Concluído"</string>
+    <string name="weekpicker_title">"Definir a hora"</string>
+    <string name="save_as_playlist">"Guardar como lista de reprodução"</string>
+    <string name="clear_playlist">"Limpar a lista de reprodução"</string>
+    <string name="musicbrowserlabel">"Música"</string>
+    <string name="musicshortcutlabel">"Lista de reprodução de músicas"</string>
+    <string name="mediaplaybacklabel">"Música"</string>
+    <string name="videobrowserlabel">"Vídeos"</string>
+    <string name="mediapickerlabel">"Música"</string>
+    <string name="playback_failed">"Lamentamos, mas o leitor não suporta este tipo de ficheiros de áudio."</string>
+    <string name="cancel">"Cancelar"</string>
+    <string name="remove_from_playlist">"Remover da lista de reprodução"</string>
+    <string name="streamloadingtext">"A ligar a <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Procurar %s utilizando:"</string>
+    <string name="working_artists">"Artistas..."</string>
+    <string name="working_albums">"Álbuns..."</string>
+    <string name="working_songs">"Músicas..."</string>
+    <string name="working_playlists">"Listas de reprodução..."</string>
+    <string name="loading">"A carregar"</string>
+    <string name="sort_by_track">"Faixas"</string>
+    <string name="sort_by_album">"Álbuns"</string>
+    <string name="sort_by_artist">"Artistas"</string>
+    <string name="music_picker_title">"Seleccionar faixa de música"</string>
+    <string name="gadget_track">"Faixa <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index dcd5e3c..bc61ab4 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 música"</string>
+    <string name="onesong">"1 música"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> músicas"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> músicas"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> músicas"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> de <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> músicas"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 álbum"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> álbuns"</item>
+    <item quantity="one">"1 álbum"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> álbuns"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Reprodução"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Coleção aleatória"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Coleção aleatória desativada"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Excluir"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Reproduzir aleatoriamente"</string>
-    <string name="play_all" msgid="6309622568869321842">"Reproduzir tudo"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Todas as músicas do <xliff:g id="ARTIST">%s</xliff:g> serão permanentemente excluídas do cartão SD."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Todo o álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" será permanentemente excluído do cartão SD."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" será permanentemente excluída do cartão SD."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Biblioteca"</string>
+    <string name="goto_playback">"Reprodução"</string>
+    <string name="party_shuffle">"Coleção aleatória"</string>
+    <string name="party_shuffle_off">"Coleção aleatória desativada"</string>
+    <string name="delete_item">"Excluir"</string>
+    <string name="shuffle_all">"Reproduzir aleatoriamente"</string>
+    <string name="play_all">"Reproduzir tudo"</string>
+    <string name="delete_artist_desc">"Todas as músicas do <xliff:g id="ARTIST">%s</xliff:g> serão permanentemente excluídas do cartão SD."</string>
+    <string name="delete_album_desc">"Todo o álbum \"<xliff:g id="ALBUM">%s</xliff:g>\" será permanentemente excluído do cartão SD."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" será permanentemente excluída do cartão SD."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 música foi excluída."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> músicas foram excluídas."</item>
+    <item quantity="one">"1 música foi excluída."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> músicas foram excluídas."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Verificando o cartão SD…"</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Em reprodução"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Coleção aleatória"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artistas"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Álbuns"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Álbuns"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Músicas"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Músicas"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Listas de reprodução"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Listas de reprodução"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Vídeos"</string>
-    <string name="all_title" msgid="6880186414437237653">"Todas as mídias"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artistas"</string>
-    <string name="search_title" msgid="1016971653383739344">"Pesquisar"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Sem músicas"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Sem vídeos"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Sem listas de reprodução"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Excluir"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Editar"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Renomear"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Lista de reprodução excluída."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Lista de reprodução renomeada."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Adicionado recentemente"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Adicionado recentemente"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcasts"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Sem cartão SD"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"O seu telefone não tem um cartão SD inserido."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Cartão SD não disponível"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Desculpe, o seu cartão SD está ocupado."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Erro do cartão SD"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Foi encontrado um erro no seu cartão SD."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Artista desconhecido"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Álbum desconhecido"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"A reprodução aleatória está ativada."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"A reprodução aleatória está desativada."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"A repetição está desativada."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Repetindo a música atual."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Repetindo todas as músicas."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Usar como toque do telefone"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Usar como toque"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" definido como toque do telefone."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Reproduzir"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Adicionar à lista de reprodução"</string>
-    <string name="queue" msgid="2937629819482787704">"Lista de reprodução atual"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Novo"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nova lista de reprodução <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Verificando o cartão SD…"</string>
+    <string name="nowplaying_title">"Em reprodução"</string>
+    <string name="partyshuffle_title">"Coleção aleatória"</string>
+    <string name="artists_title">"Artistas"</string>
+    <string name="albums_menu">"Álbuns"</string>
+    <string name="albums_title">"Álbuns"</string>
+    <string name="tracks_menu">"Músicas"</string>
+    <string name="tracks_title">"Músicas"</string>
+    <string name="playlists_menu">"Listas de reprodução"</string>
+    <string name="playlists_title">"Listas de reprodução"</string>
+    <string name="videos_title">"Vídeos"</string>
+    <string name="all_title">"Todas as mídias"</string>
+    <string name="browse_menu">"Artistas"</string>
+    <string name="search_title">"Pesquisar"</string>
+    <string name="no_tracks_title">"Sem músicas"</string>
+    <string name="no_videos_title">"Sem vídeos"</string>
+    <string name="no_playlists_title">"Sem listas de reprodução"</string>
+    <string name="delete_playlist_menu">"Excluir"</string>
+    <string name="edit_playlist_menu">"Editar"</string>
+    <string name="rename_playlist_menu">"Renomear"</string>
+    <string name="playlist_deleted_message">"Lista de reprodução excluída."</string>
+    <string name="playlist_renamed_message">"Lista de reprodução renomeada."</string>
+    <string name="recentlyadded">"Adicionado recentemente"</string>
+    <string name="recentlyadded_title">"Adicionado recentemente"</string>
+    <string name="podcasts_listitem">"Podcasts"</string>
+    <string name="podcasts_title">"Podcasts"</string>
+    <string name="sdcard_missing_title">"Sem cartão SD"</string>
+    <string name="sdcard_missing_message">"O seu telefone não tem um cartão SD inserido."</string>
+    <string name="sdcard_busy_title">"Cartão SD não disponível"</string>
+    <string name="sdcard_busy_message">"Desculpe, o seu cartão SD está ocupado."</string>
+    <string name="sdcard_error_title">"Erro do cartão SD"</string>
+    <string name="sdcard_error_message">"Foi encontrado um erro no seu cartão SD."</string>
+    <string name="unknown_artist_name">"Artista desconhecido"</string>
+    <string name="unknown_album_name">"Álbum desconhecido"</string>
+    <string name="shuffle_on_notif">"A reprodução aleatória está ativada."</string>
+    <string name="shuffle_off_notif">"A reprodução aleatória está desativada."</string>
+    <string name="repeat_off_notif">"A repetição está desativada."</string>
+    <string name="repeat_current_notif">"Repetindo a música atual."</string>
+    <string name="repeat_all_notif">"Repetindo todas as músicas."</string>
+    <string name="ringtone_menu">"Usar como toque do telefone"</string>
+    <string name="ringtone_menu_short">"Usar como toque"</string>
+    <string name="ringtone_set">"\"%s\" definido como toque do telefone."</string>
+    <string name="play_selection">"Reproduzir"</string>
+    <string name="add_to_playlist">"Adicionar à lista de reprodução"</string>
+    <string name="queue">"Lista de reprodução atual"</string>
+    <string name="new_playlist">"Novo"</string>
+    <string name="new_playlist_name_template">"Nova lista de reprodução <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 música adicionada à lista de reprodução."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d músicas adicionadas à lista de reprodução."</item>
+    <item quantity="one">"1 música adicionada à lista de reprodução."</item>
+    <item quantity="other">"%d músicas adicionadas à lista de reprodução."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"A lista de reprodução selecionada está vazia."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Salvar"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Substituir"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problema na reprodução"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Desculpe, não foi possível reproduzir a música."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"A lista de reprodução selecionada está vazia."</string>
+    <string name="create_playlist_create_text">"Salvar"</string>
+    <string name="create_playlist_overwrite_text">"Substituir"</string>
+    <string name="service_start_error_title">"Problema na reprodução"</string>
+    <string name="service_start_error_msg">"Desculpe, não foi possível reproduzir a música."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 semana"</item>
-    <item msgid="7487749116155425822">"2 semanas"</item>
-    <item msgid="1565338360539555185">"3 semanas"</item>
-    <item msgid="2142986059836933072">"4 semanas"</item>
-    <item msgid="4332403875260507291">"5 semanas"</item>
-    <item msgid="3847281907869868565">"6 semanas"</item>
-    <item msgid="2942654998558867799">"7 semanas"</item>
-    <item msgid="2115529325850052227">"8 semanas"</item>
-    <item msgid="1396675336665198092">"9 semanas"</item>
-    <item msgid="3178819129208998649">"10 semanas"</item>
-    <item msgid="2727959579637914171">"11 semanas"</item>
-    <item msgid="8708754966127584739">"12 semanas"</item>
+    <item>"1 semana"</item>
+    <item>"2 semanas"</item>
+    <item>"3 semanas"</item>
+    <item>"4 semanas"</item>
+    <item>"5 semanas"</item>
+    <item>"6 semanas"</item>
+    <item>"7 semanas"</item>
+    <item>"8 semanas"</item>
+    <item>"9 semanas"</item>
+    <item>"10 semanas"</item>
+    <item>"11 semanas"</item>
+    <item>"12 semanas"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Concluído"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Definir o período"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Salvar como lista de reprodução"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Limpar lista de reprodução"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Música"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Lista de reprodução de músicas"</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="4477832192645009774">"Desculpe, o player não suporta este tipo de arquivo de áudio."</string>
-    <string name="cancel" msgid="886559484711947520">"Cancelar"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Remover da lista de reprodução"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Conectando-se a <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Pesquisar %s usando:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artistas…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Álbuns..."</string>
-    <string name="working_songs" msgid="2201491972050410684">"Músicas…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Listas de reprodução..."</string>
-    <string name="loading" msgid="3267924133697717662">"Carregando"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Faixas"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Álbuns"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artistas"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Selecione a faixa de música"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Faixa <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Concluído"</string>
+    <string name="weekpicker_title">"Definir o período"</string>
+    <string name="save_as_playlist">"Salvar como lista de reprodução"</string>
+    <string name="clear_playlist">"Limpar lista de reprodução"</string>
+    <string name="musicbrowserlabel">"Música"</string>
+    <string name="musicshortcutlabel">"Lista de reprodução de músicas"</string>
+    <string name="mediaplaybacklabel">"Música"</string>
+    <string name="videobrowserlabel">"Vídeos"</string>
+    <string name="mediapickerlabel">"Música"</string>
+    <string name="playback_failed">"Desculpe, o player não suporta este tipo de arquivo de áudio."</string>
+    <string name="cancel">"Cancelar"</string>
+    <string name="remove_from_playlist">"Remover da lista de reprodução"</string>
+    <string name="streamloadingtext">"Conectando-se a <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Pesquisar %s usando:"</string>
+    <string name="working_artists">"Artistas…"</string>
+    <string name="working_albums">"Álbuns..."</string>
+    <string name="working_songs">"Músicas…"</string>
+    <string name="working_playlists">"Listas de reprodução..."</string>
+    <string name="loading">"Carregando"</string>
+    <string name="sort_by_track">"Faixas"</string>
+    <string name="sort_by_album">"Álbuns"</string>
+    <string name="sort_by_artist">"Artistas"</string>
+    <string name="music_picker_title">"Selecione a faixa de música"</string>
+    <string name="gadget_track">"Faixa <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-ru-finger/strings2.xml b/res/values-ru-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-ru-finger/strings2.xml
+++ b/res/values-ru-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-ru-keysexposed/strings.xml
index 356cbb9..97e8979 100644
--- a/res/values-ru-keysexposed/strings.xml
+++ b/res/values-ru-keysexposed/strings.xml
@@ -15,7 +15,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="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>
+    <string name="create_playlist_create_text_prompt">"Название плейлиста"</string>
+    <string name="rename_playlist_same_prompt">"Новое название \"<xliff:g id="PLAYLIST">%s</xliff:g>\" в"</string>
+    <string name="rename_playlist_diff_prompt">"Новое название \"<xliff:g id="PLAYLIST">%s</xliff:g>\" в"</string>
 </resources>
diff --git a/res/values-ru-keyshidden/strings.xml b/res/values-ru-keyshidden/strings.xml
index c3f6050..ee9a619 100644
--- a/res/values-ru-keyshidden/strings.xml
+++ b/res/values-ru-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Откройте клавиатуру, чтобы ввести название для нового плейлиста или нажмите \"Сохранить\", чтобы сохранить плейлист под названием \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Откройте клавиатуру, чтобы ввести новое название для плейлиста \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Откройте клавиатуру, чтобы ввести другое название для плейлиста <xliff:g id="PLAYLIST">%s</xliff:g> или нажмите \"Сохранить\", чтобы сохранить плейлист под названием \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Откройте клавиатуру, чтобы ввести название для нового плейлиста или нажмите \"Сохранить\", чтобы сохранить плейлист под названием \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Откройте клавиатуру, чтобы ввести новое название для плейлиста \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_diff_prompt">"Откройте клавиатуру, чтобы ввести другое название для плейлиста <xliff:g id="PLAYLIST">%s</xliff:g> или нажмите \"Сохранить\", чтобы сохранить плейлист под названием \"%s\"."</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a0fb80b..93344a5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 композиция"</string>
+    <string name="onesong">"1 композиция"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"Композиций: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    <item quantity="other">"Композиций: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> из <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> песен"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> из <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> песен"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 альбом"</item>
-    <item quantity="other" msgid="3047615499770811984">"Альбомов: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    <item quantity="one">"1 альбом"</item>
+    <item quantity="other">"Альбомов: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Библиотека"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Воспроизведение"</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>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Все композиции артиста <xliff:g id="ARTIST">%s</xliff:g> будут навсегда удалены с SD-карты."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Весь альбом \"<xliff:g id="ALBUM">%s</xliff:g>\" будет навсегда удален с SD-карты."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"Композиция \"<xliff:g id="SONG">%s</xliff:g>\" будет навсегда удалена с SD-карты."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"ОК"</string>
+    <string name="goto_start">"Библиотека"</string>
+    <string name="goto_playback">"Воспроизведение"</string>
+    <string name="party_shuffle">"Перемешать любимые"</string>
+    <string name="party_shuffle_off">"Режим случайного воспроизведения любимых композиций отключен"</string>
+    <string name="delete_item">"Удалить"</string>
+    <string name="shuffle_all">"Перемешать все"</string>
+    <string name="play_all">"Воспроизвести все"</string>
+    <string name="delete_artist_desc">"Все композиции артиста <xliff:g id="ARTIST">%s</xliff:g> будут навсегда удалены с SD-карты."</string>
+    <string name="delete_album_desc">"Весь альбом \"<xliff:g id="ALBUM">%s</xliff:g>\" будет навсегда удален с SD-карты."</string>
+    <string name="delete_song_desc">"Композиция \"<xliff:g id="SONG">%s</xliff:g>\" будет навсегда удалена с SD-карты."</string>
+    <string name="delete_confirm_button_text">"ОК"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 композиция удалена"</item>
-    <item quantity="other" msgid="5156740163031225200">"Удалено композиций: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
+    <item quantity="one">"1 композиция удалена"</item>
+    <item quantity="other">"Удалено композиций: <xliff:g id="SONGS_TO_DELETE">%d</xliff:g>."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Сканирование SD-карты…"</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Сейчас воспроизводится"</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="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="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="recentlyadded" msgid="110978416756366953">"Недавно добавленные"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Недавно добавленные"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Подкасты"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Подкасты"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"SD-карта отсутствует."</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"В телефоне отсутствует SD-карта."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD-карта недоступна"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"SD-карта занята."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Ошибка SD-карты"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Ошибка SD-карты."</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>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Режим повторного воспроизведения отключен."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Повторение текущей композиции."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Повтор всех композиций."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Сделать мелодией звонка"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Сделать мелодией звонка"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"Композиция \"%s\" установлена в качестве мелодии звонка."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Воспроизвести"</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="scanning">"Сканирование SD-карты…"</string>
+    <string name="nowplaying_title">"Сейчас воспроизводится"</string>
+    <string name="partyshuffle_title">"Перемешать любимые"</string>
+    <string name="artists_title">"Исполнители"</string>
+    <string name="albums_menu">"Альбомы"</string>
+    <string name="albums_title">"Альбомы"</string>
+    <string name="tracks_menu">"Композиции"</string>
+    <string name="tracks_title">"Композиции"</string>
+    <string name="playlists_menu">"Плейлисты"</string>
+    <string name="playlists_title">"Плейлисты"</string>
+    <string name="videos_title">"Видео"</string>
+    <string name="all_title">"Все типы"</string>
+    <string name="browse_menu">"Исполнители"</string>
+    <string name="search_title">"Поиск"</string>
+    <string name="no_tracks_title">"Нет композиций"</string>
+    <string name="no_videos_title">"Видео отсутствует"</string>
+    <string name="no_playlists_title">"Нет плейлистов."</string>
+    <string name="delete_playlist_menu">"Удалить"</string>
+    <string name="edit_playlist_menu">"Изменить"</string>
+    <string name="rename_playlist_menu">"Переименовать"</string>
+    <string name="playlist_deleted_message">"Плейлист удален."</string>
+    <string name="playlist_renamed_message">"Плейлист переименован."</string>
+    <string name="recentlyadded">"Недавно добавленные"</string>
+    <string name="recentlyadded_title">"Недавно добавленные"</string>
+    <string name="podcasts_listitem">"Подкасты"</string>
+    <string name="podcasts_title">"Подкасты"</string>
+    <string name="sdcard_missing_title">"SD-карта отсутствует."</string>
+    <string name="sdcard_missing_message">"В телефоне отсутствует SD-карта."</string>
+    <string name="sdcard_busy_title">"SD-карта недоступна"</string>
+    <string name="sdcard_busy_message">"SD-карта занята."</string>
+    <string name="sdcard_error_title">"Ошибка SD-карты"</string>
+    <string name="sdcard_error_message">"Ошибка SD-карты."</string>
+    <string name="unknown_artist_name">"Неизвестный исполнитель"</string>
+    <string name="unknown_album_name">"Неизвестный альбом"</string>
+    <string name="shuffle_on_notif">"Режим случайного воспроизведения включен."</string>
+    <string name="shuffle_off_notif">"Режим случайного воспроизведения отключен."</string>
+    <string name="repeat_off_notif">"Режим повторного воспроизведения отключен."</string>
+    <string name="repeat_current_notif">"Повторение текущей композиции."</string>
+    <string name="repeat_all_notif">"Повтор всех композиций."</string>
+    <string name="ringtone_menu">"Использовать как мелодию звонка телефона"</string>
+    <string name="ringtone_menu_short">"Использовать как мелодию звонка"</string>
+    <string name="ringtone_set">"Композиция \"%s\" установлена в качестве мелодии звонка."</string>
+    <string name="play_selection">"Воспроизвести"</string>
+    <string name="add_to_playlist">"Добавить в плейлист"</string>
+    <string name="queue">"Текущий плейлист"</string>
+    <string name="new_playlist">"Создать"</string>
+    <string name="new_playlist_name_template">"Новый плейлист <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 композиция добавлена в плейлист."</item>
-    <item quantity="other" msgid="7675242021325355213">"Добавлено композиций в плейлист: %d."</item>
+    <item quantity="one">"1 композиция добавлена в плейлист."</item>
+    <item quantity="other">"Добавлено композиций в плейлист: %d."</item>
   </plurals>
-    <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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Воспроизвести композицию невозможно."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"ОК"</string>
+    <string name="emptyplaylist">"Выбранный плейлист пуст."</string>
+    <string name="create_playlist_create_text">"Сохранить"</string>
+    <string name="create_playlist_overwrite_text">"Перезаписать"</string>
+    <string name="service_start_error_title">"Сбой при воспроизведении"</string>
+    <string name="service_start_error_msg">"Воспроизвести композицию невозможно."</string>
+    <string name="service_start_error_button">"ОК"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 неделя"</item>
-    <item msgid="7487749116155425822">"2 недели"</item>
-    <item msgid="1565338360539555185">"3 недели"</item>
-    <item msgid="2142986059836933072">"4 недели"</item>
-    <item msgid="4332403875260507291">"5 недель"</item>
-    <item msgid="3847281907869868565">"6 недель"</item>
-    <item msgid="2942654998558867799">"7 недель"</item>
-    <item msgid="2115529325850052227">"8 недель"</item>
-    <item msgid="1396675336665198092">"9 недель"</item>
-    <item msgid="3178819129208998649">"10 нед."</item>
-    <item msgid="2727959579637914171">"11 нед."</item>
-    <item msgid="8708754966127584739">"12 нед."</item>
+    <item>"1 неделя"</item>
+    <item>"2 недели"</item>
+    <item>"3 недели"</item>
+    <item>"4 недели"</item>
+    <item>"5 недель"</item>
+    <item>"6 недель"</item>
+    <item>"7 недель"</item>
+    <item>"8 недель"</item>
+    <item>"9 недель"</item>
+    <item>"10 недель"</item>
+    <item>"11 недель"</item>
+    <item>"12 недель"</item>
   </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="musicbrowserlabel" msgid="3162022214114562892">"Музыка"</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="4477832192645009774">"Этот тип аудиофайла не поддерживается проигрывателем."</string>
-    <string name="cancel" msgid="886559484711947520">"Отмена"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Удалить из плейлиста"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Подключение к <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Поиск %s с помощью:"</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="3267924133697717662">"Идет загрузка"</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="music_picker_title" msgid="1561623486324013570">"Выбрать музыкальную дорожку"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Трек <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Готово"</string>
+    <string name="weekpicker_title">"Установить время"</string>
+    <string name="save_as_playlist">"Сохранить как плейлист"</string>
+    <string name="clear_playlist">"Очистить плейлист"</string>
+    <string name="musicbrowserlabel">"Музыка"</string>
+    <string name="musicshortcutlabel">"Музыкальный плейлист"</string>
+    <string name="mediaplaybacklabel">"Музыка"</string>
+    <string name="videobrowserlabel">"Видео"</string>
+    <string name="mediapickerlabel">"Музыка"</string>
+    <string name="playback_failed">"Этот тип аудиофайла не поддерживается проигрывателем."</string>
+    <string name="cancel">"Отмена"</string>
+    <string name="remove_from_playlist">"Удалить из плейлиста"</string>
+    <string name="streamloadingtext">"Подключение к <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Поиск %s с помощью:"</string>
+    <string name="working_artists">"Исполнители..."</string>
+    <string name="working_albums">"Альбомы…"</string>
+    <string name="working_songs">"Композиции..."</string>
+    <string name="working_playlists">"Плейлисты..."</string>
+    <string name="loading">"Идет загрузка"</string>
+    <string name="sort_by_track">"Дорожки"</string>
+    <string name="sort_by_album">"Альбомы"</string>
+    <string name="sort_by_artist">"Артисты"</string>
+    <string name="music_picker_title">"Выбрать музыкальную дорожку"</string>
+    <string name="gadget_track">"Трек <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-sv-finger/strings2.xml b/res/values-sv-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-sv-finger/strings2.xml
+++ b/res/values-sv-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-sv-keysexposed/strings.xml
index bd14133..b1da478 100644
--- a/res/values-sv-keysexposed/strings.xml
+++ b/res/values-sv-keysexposed/strings.xml
@@ -15,7 +15,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">"Spellistans namn"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Ändra namnet \"<xliff:g id="PLAYLIST">%s</xliff:g>\" till"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Ändra namnet \"<xliff:g id="PLAYLIST">%s</xliff:g>\" till"</string>
+    <string name="create_playlist_create_text_prompt">"Spellistans namn"</string>
+    <string name="rename_playlist_same_prompt">"Ändra namnet \"<xliff:g id="PLAYLIST">%s</xliff:g>\" till"</string>
+    <string name="rename_playlist_diff_prompt">"Ändra namnet \"<xliff:g id="PLAYLIST">%s</xliff:g>\" till"</string>
 </resources>
diff --git a/res/values-sv-keyshidden/strings.xml b/res/values-sv-keyshidden/strings.xml
index 2319802..a670044 100644
--- a/res/values-sv-keyshidden/strings.xml
+++ b/res/values-sv-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Öppna tangentbordet om du vill ange ett namn på spellistan. Om du väljer Spara får den namnet \"%s\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Öppna tangentbordet om du vill ange ett namn på spellistan <xliff:g id="PLAYLIST">%s</xliff:g>."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"Öppna tangentbordet om du vill ange ett nytt namn på spellistan <xliff:g id="PLAYLIST">%s</xliff:g>. Om du väljer Spara får den namnet \"%s\"."</string>
+    <string name="create_playlist_create_text_prompt">"Öppna tangentbordet om du vill ange ett namn på spellistan. Om du väljer Spara får den namnet \"%s\"."</string>
+    <string name="rename_playlist_same_prompt">"Öppna tangentbordet om du vill ange ett namn på spellistan <xliff:g id="PLAYLIST">%s</xliff:g>."</string>
+    <string name="rename_playlist_diff_prompt">"Öppna tangentbordet om du vill ange ett nytt namn på spellistan <xliff:g id="PLAYLIST">%s</xliff:g>. Om du väljer Spara får den namnet \"%s\"."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fdf2a97..edeb2c4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 låt"</string>
+    <string name="onesong">"1 låt"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> låtar"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> låtar"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> av <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> låtar"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> av <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> låtar"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> album"</item>
+    <item quantity="one">"1 album"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> album"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Bibliotek"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Uppspelning"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Blanda alla spår"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Blandar inte hela listan"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Ta bort"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Blanda hela listan"</string>
-    <string name="play_all" msgid="6309622568869321842">"Spela alla"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"Alla låtar av <xliff:g id="ARTIST">%s</xliff:g> tas bort från SD-kortet permanent."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"Hela albumet <xliff:g id="ALBUM">%s</xliff:g> tas bort från SD-kortet permanent."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" tas bort från SD-kortet permanent."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
+    <string name="goto_start">"Bibliotek"</string>
+    <string name="goto_playback">"Uppspelning"</string>
+    <string name="party_shuffle">"Blanda alla spår"</string>
+    <string name="party_shuffle_off">"Blandar inte hela listan"</string>
+    <string name="delete_item">"Ta bort"</string>
+    <string name="shuffle_all">"Blanda hela listan"</string>
+    <string name="play_all">"Spela alla"</string>
+    <string name="delete_artist_desc">"Alla låtar av <xliff:g id="ARTIST">%s</xliff:g> tas bort från SD-kortet permanent."</string>
+    <string name="delete_album_desc">"Hela albumet <xliff:g id="ALBUM">%s</xliff:g> tas bort från SD-kortet permanent."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" tas bort från SD-kortet permanent."</string>
+    <string name="delete_confirm_button_text">"OK"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 låt togs bort."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> låtar togs bort."</item>
+    <item quantity="one">"1 låt togs bort."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> låtar togs bort."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Skannar SD-kort…"</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Nu spelas"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Blanda alla spår"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artister"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Album"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Album"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Låtar"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Låtar"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Spellistor"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Spellistor"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Videor"</string>
-    <string name="all_title" msgid="6880186414437237653">"Alla media"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artister"</string>
-    <string name="search_title" msgid="1016971653383739344">"Sök"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Inga låtar"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Inga videor"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Ingen spellista"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Ta bort"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Redigera"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Byt namn"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Spellista har tagits bort."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Nytt namn på spellista."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Nyligen tillagda"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Nyligen tillagda"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podsändningar"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podsändningar"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Inget SD-kort"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Det finns inget SD-kort i telefonen."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD-kort ej tillgängligt"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Ditt SD-kort är tyvärr upptaget."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD-kortfel"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Ett fel upptäcktes på ditt SD-kort."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Okänd artist"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Okänt album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Blandar spår."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Blandar inte spår."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Upprepning är aktiverat."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Upprepa aktuell låt."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Upprepa alla låtar."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Använd som ringsignal"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Använd som ringsignal"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" vald som ringsignal."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Spela"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Lägg till i spellista"</string>
-    <string name="queue" msgid="2937629819482787704">"Aktuell spellista"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Ny"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Ny spellista <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"Skannar SD-kort…"</string>
+    <string name="nowplaying_title">"Nu spelas"</string>
+    <string name="partyshuffle_title">"Blanda alla spår"</string>
+    <string name="artists_title">"Artister"</string>
+    <string name="albums_menu">"Album"</string>
+    <string name="albums_title">"Album"</string>
+    <string name="tracks_menu">"Låtar"</string>
+    <string name="tracks_title">"Låtar"</string>
+    <string name="playlists_menu">"Spellistor"</string>
+    <string name="playlists_title">"Spellistor"</string>
+    <string name="videos_title">"Videor"</string>
+    <string name="all_title">"Alla media"</string>
+    <string name="browse_menu">"Artister"</string>
+    <string name="search_title">"Sök"</string>
+    <string name="no_tracks_title">"Inga låtar"</string>
+    <string name="no_videos_title">"Inga videor"</string>
+    <string name="no_playlists_title">"Ingen spellista"</string>
+    <string name="delete_playlist_menu">"Ta bort"</string>
+    <string name="edit_playlist_menu">"Redigera"</string>
+    <string name="rename_playlist_menu">"Byt namn"</string>
+    <string name="playlist_deleted_message">"Spellista har tagits bort."</string>
+    <string name="playlist_renamed_message">"Nytt namn på spellista."</string>
+    <string name="recentlyadded">"Nyligen tillagda"</string>
+    <string name="recentlyadded_title">"Nyligen tillagda"</string>
+    <string name="podcasts_listitem">"Podsändningar"</string>
+    <string name="podcasts_title">"Podsändningar"</string>
+    <string name="sdcard_missing_title">"Inget SD-kort"</string>
+    <string name="sdcard_missing_message">"Det finns inget SD-kort i telefonen."</string>
+    <string name="sdcard_busy_title">"SD-kort ej tillgängligt"</string>
+    <string name="sdcard_busy_message">"Ditt SD-kort är tyvärr upptaget."</string>
+    <string name="sdcard_error_title">"SD-kortfel"</string>
+    <string name="sdcard_error_message">"Ett fel upptäcktes på ditt SD-kort."</string>
+    <string name="unknown_artist_name">"Okänd artist"</string>
+    <string name="unknown_album_name">"Okänt album"</string>
+    <string name="shuffle_on_notif">"Blandar spår."</string>
+    <string name="shuffle_off_notif">"Blandar inte spår."</string>
+    <string name="repeat_off_notif">"Upprepning är aktiverat."</string>
+    <string name="repeat_current_notif">"Upprepa aktuell låt."</string>
+    <string name="repeat_all_notif">"Upprepa alla låtar."</string>
+    <string name="ringtone_menu">"Använd som ringsignal"</string>
+    <string name="ringtone_menu_short">"Använd som ringsignal"</string>
+    <string name="ringtone_set">"\"%s\" vald som ringsignal."</string>
+    <string name="play_selection">"Spela"</string>
+    <string name="add_to_playlist">"Lägg till i spellista"</string>
+    <string name="queue">"Aktuell spellista"</string>
+    <string name="new_playlist">"Ny"</string>
+    <string name="new_playlist_name_template">"Ny spellista <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 låt har lagts till i spellistan."</item>
-    <item quantity="other" msgid="7675242021325355213">"%d låtar har lagts till i spellistan."</item>
+    <item quantity="one">"1 låt har lagts till i spellistan."</item>
+    <item quantity="other">"%d låtar har lagts till i spellistan."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Den valda spellistan är tom."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Spara"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Skriv över"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Problem med uppspelningen"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Det gick tyvärr inte att spela låten."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
+    <string name="emptyplaylist">"Den valda spellistan är tom."</string>
+    <string name="create_playlist_create_text">"Spara"</string>
+    <string name="create_playlist_overwrite_text">"Skriv över"</string>
+    <string name="service_start_error_title">"Problem med uppspelningen"</string>
+    <string name="service_start_error_msg">"Det gick tyvärr inte att spela låten."</string>
+    <string name="service_start_error_button">"OK"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 vecka"</item>
-    <item msgid="7487749116155425822">"2 veckor"</item>
-    <item msgid="1565338360539555185">"3 veckor"</item>
-    <item msgid="2142986059836933072">"4 veckor"</item>
-    <item msgid="4332403875260507291">"5 veckor"</item>
-    <item msgid="3847281907869868565">"6 veckor"</item>
-    <item msgid="2942654998558867799">"7 veckor"</item>
-    <item msgid="2115529325850052227">"8 veckor"</item>
-    <item msgid="1396675336665198092">"9 veckor"</item>
-    <item msgid="3178819129208998649">"10 veckor"</item>
-    <item msgid="2727959579637914171">"11 veckor"</item>
-    <item msgid="8708754966127584739">"12 veckor"</item>
+    <item>"1 vecka"</item>
+    <item>"2 veckor"</item>
+    <item>"3 veckor"</item>
+    <item>"4 veckor"</item>
+    <item>"5 veckor"</item>
+    <item>"6 veckor"</item>
+    <item>"7 veckor"</item>
+    <item>"8 veckor"</item>
+    <item>"9 veckor"</item>
+    <item>"10 veckor"</item>
+    <item>"11 veckor"</item>
+    <item>"12 veckor"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Färdig"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Ange tid"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Spara som spellista"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Rensa spellista"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Musik"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Musikspellista"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Musik"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videor"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Musik"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Spelaren stöder tyvärr inte den här typen av ljudfiler."</string>
-    <string name="cancel" msgid="886559484711947520">"Avbryt"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Ta bort från spellista"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Ansluter till <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Sök efter %s med:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artister…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Album…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Låtar…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Spellistor…"</string>
-    <string name="loading" msgid="3267924133697717662">"Läser in"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Spår"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Album"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artister"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Välj musikspår"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Spår <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Färdig"</string>
+    <string name="weekpicker_title">"Ange tid"</string>
+    <string name="save_as_playlist">"Spara som spellista"</string>
+    <string name="clear_playlist">"Rensa spellista"</string>
+    <string name="musicbrowserlabel">"Musik"</string>
+    <string name="musicshortcutlabel">"Musikspellista"</string>
+    <string name="mediaplaybacklabel">"Musik"</string>
+    <string name="videobrowserlabel">"Videor"</string>
+    <string name="mediapickerlabel">"Musik"</string>
+    <string name="playback_failed">"Spelaren stöder tyvärr inte den här typen av ljudfiler."</string>
+    <string name="cancel">"Avbryt"</string>
+    <string name="remove_from_playlist">"Ta bort från spellista"</string>
+    <string name="streamloadingtext">"Ansluter till <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Sök efter %s med:"</string>
+    <string name="working_artists">"Artister…"</string>
+    <string name="working_albums">"Album…"</string>
+    <string name="working_songs">"Låtar…"</string>
+    <string name="working_playlists">"Spellistor…"</string>
+    <string name="loading">"Läser in"</string>
+    <string name="sort_by_track">"Spår"</string>
+    <string name="sort_by_album">"Album"</string>
+    <string name="sort_by_artist">"Artister"</string>
+    <string name="music_picker_title">"Välj musikspår"</string>
+    <string name="gadget_track">"Spår <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-tr-finger/strings2.xml b/res/values-tr-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-tr-finger/strings2.xml
+++ b/res/values-tr-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-tr-keysexposed/strings.xml
index 5d3065f..7b52d00 100644
--- a/res/values-tr-keysexposed/strings.xml
+++ b/res/values-tr-keysexposed/strings.xml
@@ -15,7 +15,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">"Şarkı listesi adı"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" listesini şu şekilde yeniden adlandır:"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" listesini şu şekilde yeniden adlandır:"</string>
+    <string name="create_playlist_create_text_prompt">"Şarkı listesi adı"</string>
+    <string name="rename_playlist_same_prompt">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" listesini şu şekilde yeniden adlandır:"</string>
+    <string name="rename_playlist_diff_prompt">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" listesini şu şekilde yeniden adlandır:"</string>
 </resources>
diff --git a/res/values-tr-keyshidden/strings.xml b/res/values-tr-keyshidden/strings.xml
index ebdc2a1..958b1f4 100644
--- a/res/values-tr-keyshidden/strings.xml
+++ b/res/values-tr-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"Yeni şarkı listenize bir ad vermek için tuş takımını açın veya \"%s\" olarak adlandırmak üzere Kaydet\'i seçin."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" şarkı listesine yeni bir ad vermek için tuş takımını açın."</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" şarkı listesine yeni bir ad vermek için tuş takımını açın veya \"%s\" olarak adlandırmak üzere Kaydet\'i seçin."</string>
+    <string name="create_playlist_create_text_prompt">"Yeni şarkı listenize bir ad vermek için tuş takımını açın veya \"%s\" olarak adlandırmak üzere Kaydet\'i seçin."</string>
+    <string name="rename_playlist_same_prompt">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" şarkı listesine yeni bir ad vermek için tuş takımını açın."</string>
+    <string name="rename_playlist_diff_prompt">"\"<xliff:g id="PLAYLIST">%s</xliff:g>\" şarkı listesine yeni bir ad vermek için tuş takımını açın veya \"%s\" olarak adlandırmak üzere Kaydet\'i seçin."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 107df4b..d96fa1e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 şarkı"</string>
+    <string name="onesong">"1 şarkı"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> şarkı"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> şarkı"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> / <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> şarkı"</item>
+    <item quantity="other">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> / <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> şarkı"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 albüm"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albüm"</item>
+    <item quantity="one">"1 albüm"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> albüm"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Kitaplık"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"Yürüt"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Karışık albüm oluştur"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Karışık albüm oluşturma kapalı"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Sil"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Tümünü karıştır"</string>
-    <string name="play_all" msgid="6309622568869321842">"Tümünü yürüt"</string>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"<xliff:g id="ARTIST">%s</xliff:g> sanatçısına ait tüm şarkılar SD karttan kalıcı olarak silinecek."</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"\"<xliff:g id="ALBUM">%s</xliff:g>\" albümünün tamamı SD kattan silinecek."</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"\"<xliff:g id="SONG">%s</xliff:g>\" SD karttan kalıcı olarak silinecek."</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"Tamam"</string>
+    <string name="goto_start">"Kitaplık"</string>
+    <string name="goto_playback">"Yürüt"</string>
+    <string name="party_shuffle">"Karışık albüm oluşturma"</string>
+    <string name="party_shuffle_off">"Karışık albüm oluşturma kapalı"</string>
+    <string name="delete_item">"Sil"</string>
+    <string name="shuffle_all">"Tümünü karıştır"</string>
+    <string name="play_all">"Tümünü yürüt"</string>
+    <string name="delete_artist_desc">"<xliff:g id="ARTIST">%s</xliff:g> sanatçısına ait tüm şarkılar SD karttan kalıcı olarak silinecek."</string>
+    <string name="delete_album_desc">"\"<xliff:g id="ALBUM">%s</xliff:g>\" albümünün tamamı SD kattan silinecek."</string>
+    <string name="delete_song_desc">"\"<xliff:g id="SONG">%s</xliff:g>\" SD karttan kalıcı olarak silinecek."</string>
+    <string name="delete_confirm_button_text">"Tamam"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 şarkı silindi."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> şarkı silindi."</item>
+    <item quantity="one">"1 şarkı silindi."</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> şarkı silindi."</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"SD kart taranıyor..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Şimdi yürütülüyor"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Karışık albüm oluşturma"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Sanatçılar"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Albümler"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Albümler"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Şarkılar"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Şarkılar"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Şarkı listeleri"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Şarkı listeleri"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Videolar"</string>
-    <string name="all_title" msgid="6880186414437237653">"Tüm medya"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Sanatçılar"</string>
-    <string name="search_title" msgid="1016971653383739344">"Ara"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Şarkı yok"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Video yok"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Şarkı listesi yok"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Sil"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Düzenle"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Yeniden adlandır"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Şarkı listesi silindi."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Şarkı listesi yeniden adlandırıldı."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"En son eklenen"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"En son eklenen"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcast\'ler"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcast\'ler"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"SD kart yok"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"Telefonunuza takılı bir SD kart yok."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD kart kullanılamıyor"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"Maalesef, SD kartınız meşgul."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD kart hatası"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"SD kartınızda bir hatayla karşılaşıldı."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Bilinmeyen sanatçı"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Bilinmeyen albüm"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Karıştırma açık."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Karıştırma kapalı."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Tekrarlama kapalı."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Geçerli şarkı tekrarlanıyor."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Tüm şarkılar tekrarlanıyor."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Telefon zil sesi olarak kullan"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Zil sesi olarak kullan"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"\"%s\" telefon zil sesi olarak ayarlanmış."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Yürüt"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Şarkı listesine ekle"</string>
-    <string name="queue" msgid="2937629819482787704">"Geçerli şarkı listesi"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Yeni"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Yeni şarkı listesi <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="scanning">"SD kart taranıyor..."</string>
+    <string name="nowplaying_title">"Şimdi yürütülüyor"</string>
+    <string name="partyshuffle_title">"Karışık albüm oluşturma"</string>
+    <string name="artists_title">"Sanatçılar"</string>
+    <string name="albums_menu">"Albümler"</string>
+    <string name="albums_title">"Albümler"</string>
+    <string name="tracks_menu">"Şarkılar"</string>
+    <string name="tracks_title">"Şarkılar"</string>
+    <string name="playlists_menu">"Şarkı listeleri"</string>
+    <string name="playlists_title">"Şarkı listeleri"</string>
+    <string name="videos_title">"Videolar"</string>
+    <string name="all_title">"Tüm medya"</string>
+    <string name="browse_menu">"Sanatçılar"</string>
+    <string name="search_title">"Ara"</string>
+    <string name="no_tracks_title">"Şarkı yok"</string>
+    <string name="no_videos_title">"Video yok"</string>
+    <string name="no_playlists_title">"Şarkı listesi yok"</string>
+    <string name="delete_playlist_menu">"Sil"</string>
+    <string name="edit_playlist_menu">"Düzenle"</string>
+    <string name="rename_playlist_menu">"Yeniden adlandır"</string>
+    <string name="playlist_deleted_message">"Şarkı listesi silindi."</string>
+    <string name="playlist_renamed_message">"Şarkı listesi yeniden adlandırıldı."</string>
+    <string name="recentlyadded">"En son eklenen"</string>
+    <string name="recentlyadded_title">"En son eklenen"</string>
+    <string name="podcasts_listitem">"Podcast\'ler"</string>
+    <string name="podcasts_title">"Podcast\'ler"</string>
+    <string name="sdcard_missing_title">"SD kart yok"</string>
+    <string name="sdcard_missing_message">"Telefonunuza takılı bir SD kart yok."</string>
+    <string name="sdcard_busy_title">"SD kart kullanılamıyor"</string>
+    <string name="sdcard_busy_message">"Maalesef, SD kartınız meşgul."</string>
+    <string name="sdcard_error_title">"SD kart hatası"</string>
+    <string name="sdcard_error_message">"SD kartınızda bir hatayla karşılaşıldı."</string>
+    <string name="unknown_artist_name">"Bilinmeyen sanatçı"</string>
+    <string name="unknown_album_name">"Bilinmeyen albüm"</string>
+    <string name="shuffle_on_notif">"Karıştırma açık."</string>
+    <string name="shuffle_off_notif">"Karıştırma kapalı."</string>
+    <string name="repeat_off_notif">"Tekrarlama kapalı."</string>
+    <string name="repeat_current_notif">"Geçerli şarkı tekrarlanıyor."</string>
+    <string name="repeat_all_notif">"Tüm şarkılar tekrarlanıyor."</string>
+    <string name="ringtone_menu">"Telefon zil sesi olarak kullan"</string>
+    <string name="ringtone_menu_short">"Zil sesi olarak kullan"</string>
+    <string name="ringtone_set">"\"%s\" telefon zil sesi olarak ayarlanmış."</string>
+    <string name="play_selection">"Yürüt"</string>
+    <string name="add_to_playlist">"Şarkı listesine ekle"</string>
+    <string name="queue">"Geçerli şarkı listesi"</string>
+    <string name="new_playlist">"Yeni"</string>
+    <string name="new_playlist_name_template">"Yeni şarkı listesi <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"Şarkı listesine 1 şarkı eklendi."</item>
-    <item quantity="other" msgid="7675242021325355213">"Şarkı listesine %d şarkı eklendi."</item>
+    <item quantity="one">"Şarkı listesine 1 şarkı eklendi."</item>
+    <item quantity="other">"Şarkı listesine %d şarkı eklendi."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Seçilen şarkı listesi boş."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Kaydet"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Üzerine yaz"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Yürütme sorunu"</string>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"Maalesef, şarkı yürütülemedi."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"Tamam"</string>
+    <string name="emptyplaylist">"Seçilen şarkı listesi boş."</string>
+    <string name="create_playlist_create_text">"Kaydet"</string>
+    <string name="create_playlist_overwrite_text">"Üzerine yaz"</string>
+    <string name="service_start_error_title">"Yürütme sorunu"</string>
+    <string name="service_start_error_msg">"Maalesef, şarkı yürütülemedi."</string>
+    <string name="service_start_error_button">"Tamam"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 hafta"</item>
-    <item msgid="7487749116155425822">"2 hafta"</item>
-    <item msgid="1565338360539555185">"3 hafta"</item>
-    <item msgid="2142986059836933072">"4 hafta"</item>
-    <item msgid="4332403875260507291">"5 hafta"</item>
-    <item msgid="3847281907869868565">"6 hafta"</item>
-    <item msgid="2942654998558867799">"7 hafta"</item>
-    <item msgid="2115529325850052227">"8 hafta"</item>
-    <item msgid="1396675336665198092">"9 hafta"</item>
-    <item msgid="3178819129208998649">"10 hafta"</item>
-    <item msgid="2727959579637914171">"11 hafta"</item>
-    <item msgid="8708754966127584739">"12 hafta"</item>
+    <item>"1 hafta"</item>
+    <item>"2 hafta"</item>
+    <item>"3 hafta"</item>
+    <item>"4 hafta"</item>
+    <item>"5 hafta"</item>
+    <item>"6 hafta"</item>
+    <item>"7 hafta"</item>
+    <item>"8 hafta"</item>
+    <item>"9 hafta"</item>
+    <item>"10 hafta"</item>
+    <item>"11 hafta"</item>
+    <item>"12 hafta"</item>
   </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Bitti"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Saati ayarla"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Şarkı listesi olarak kaydet"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Şarkı listesini temizle"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Müzik"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Müzik şarkı listesi"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Müzik"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videolar"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Müzik"</string>
-    <string name="playback_failed" msgid="4477832192645009774">"Maalesef, bu oynatıcı bu tür ses dosyalarını desteklemiyor."</string>
-    <string name="cancel" msgid="886559484711947520">"İptal"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Şarkı listesinden kaldır"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"Şuraya bağlanılıyor: <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"Şunu kullanarak %s için arama yap:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Sanatçılar..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"Albümler..."</string>
-    <string name="working_songs" msgid="2201491972050410684">"Şarkılar..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Şarkı listeleri..."</string>
-    <string name="loading" msgid="3267924133697717662">"Yükleniyor"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Parçalar"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Albümler"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Sanatçılar"</string>
-    <string name="music_picker_title" msgid="1561623486324013570">"Müzik parçasını seç"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"Parça <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"Bitti"</string>
+    <string name="weekpicker_title">"Saati ayarla"</string>
+    <string name="save_as_playlist">"Şarkı listesi olarak kaydet"</string>
+    <string name="clear_playlist">"Şarkı listesini temizle"</string>
+    <string name="musicbrowserlabel">"Müzik"</string>
+    <string name="musicshortcutlabel">"Müzik şarkı listesi"</string>
+    <string name="mediaplaybacklabel">"Müzik"</string>
+    <string name="videobrowserlabel">"Videolar"</string>
+    <string name="mediapickerlabel">"Müzik"</string>
+    <string name="playback_failed">"Maalesef, bu oynatıcı bu tür ses dosyalarını desteklemiyor."</string>
+    <string name="cancel">"İptal"</string>
+    <string name="remove_from_playlist">"Şarkı listesinden kaldır"</string>
+    <string name="streamloadingtext">"Şuraya bağlanılıyor: <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"Şunu kullanarak %s için arama yap:"</string>
+    <string name="working_artists">"Sanatçılar..."</string>
+    <string name="working_albums">"Albümler..."</string>
+    <string name="working_songs">"Şarkılar..."</string>
+    <string name="working_playlists">"Şarkı listeleri..."</string>
+    <string name="loading">"Yükleniyor"</string>
+    <string name="sort_by_track">"Parçalar"</string>
+    <string name="sort_by_album">"Albümler"</string>
+    <string name="sort_by_artist">"Sanatçılar"</string>
+    <string name="music_picker_title">"Müzik parçasını seç"</string>
+    <string name="gadget_track">"Parça <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-zh-rCN-finger/strings2.xml b/res/values-zh-rCN-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-zh-rCN-finger/strings2.xml
+++ b/res/values-zh-rCN-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-zh-rCN-keysexposed/strings.xml
index 3b71036..048c393 100644
--- a/res/values-zh-rCN-keysexposed/strings.xml
+++ b/res/values-zh-rCN-keysexposed/strings.xml
@@ -15,7 +15,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="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>
+    <string name="create_playlist_create_text_prompt">"播放列表名称"</string>
+    <string name="rename_playlist_same_prompt">"将“<xliff:g id="PLAYLIST">%s</xliff:g>”重命名为"</string>
+    <string name="rename_playlist_diff_prompt">"将“<xliff:g id="PLAYLIST">%s</xliff:g>”重命名为"</string>
 </resources>
diff --git a/res/values-zh-rCN-keyshidden/strings.xml b/res/values-zh-rCN-keyshidden/strings.xml
index cd4c80a..47face8 100644
--- a/res/values-zh-rCN-keyshidden/strings.xml
+++ b/res/values-zh-rCN-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"打开键盘为新的播放列表创建名称,或选择“保存”将其命名为“%s”。"</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"打开键盘为“<xliff:g id="PLAYLIST">%s</xliff:g>”播放列表创建一个新名称。"</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"打开键盘为“<xliff:g id="PLAYLIST">%s</xliff:g>”播放列表创建一个新名称,或选择“保存”将其命名为“%s”。"</string>
+    <string name="create_playlist_create_text_prompt">"打开键盘为新的播放列表创建名称,或选择“保存”将其命名为“%s”。"</string>
+    <string name="rename_playlist_same_prompt">"打开键盘为“<xliff:g id="PLAYLIST">%s</xliff:g>”播放列表创建一个新名称。"</string>
+    <string name="rename_playlist_diff_prompt">"打开键盘为“<xliff:g id="PLAYLIST">%s</xliff:g>”播放列表创建一个新名称,或选择“保存”将其命名为“%s”。"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 509377a..76fd5bd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,127 +15,127 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 首歌曲"</string>
+    <string name="onesong">"1 首歌曲"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> 首歌曲"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 首歌曲"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"共 <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> 首歌曲,其中 <xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> 首"</item>
+    <item quantity="other">"共 <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> 首歌曲,其中 <xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> 首"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 张专辑"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> 张专辑"</item>
+    <item quantity="one">"1 张专辑"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 张专辑"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"音乐库"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"播放"</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>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"将会从 SD 卡上永久删除<xliff:g id="ARTIST">%s</xliff:g>的所有歌曲。"</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"将会从 SD 卡上永久删除整张“<xliff:g id="ALBUM">%s</xliff:g>”专辑。"</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"将会从 SD 卡上永久删除“<xliff:g id="SONG">%s</xliff:g>”。"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"确定"</string>
+    <string name="goto_start">"音乐库"</string>
+    <string name="goto_playback">"播放"</string>
+    <string name="party_shuffle">"派对随机播放"</string>
+    <string name="party_shuffle_off">"派对随机播放已关闭"</string>
+    <string name="delete_item">"删除"</string>
+    <string name="shuffle_all">"全部随机播放"</string>
+    <string name="play_all">"全部播放"</string>
+    <string name="delete_artist_desc">"将会从 SD 卡上永久删除<xliff:g id="ARTIST">%s</xliff:g>的所有歌曲。"</string>
+    <string name="delete_album_desc">"将会从 SD 卡上永久删除整张“<xliff:g id="ALBUM">%s</xliff:g>”专辑。"</string>
+    <string name="delete_song_desc">"将会从 SD 卡上永久删除“<xliff:g id="SONG">%s</xliff:g>”。"</string>
+    <string name="delete_confirm_button_text">"确定"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 首歌曲已删除。"</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> 首歌曲已删除。"</item>
+    <item quantity="one">"1 首歌曲已删除。"</item>
+    <item quantity="other">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> 首歌曲已删除。"</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"正在扫描 SD 卡..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"当前正在播放"</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="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="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="recentlyadded" msgid="110978416756366953">"最近添加的文件"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"最近添加的文件"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"播客"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"播客"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"无 SD 卡"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"手机中未插入 SD 卡。"</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD 卡不可用"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"抱歉,SD 卡正忙。"</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD 卡错误"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"SD 卡上出现错误。"</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>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"重复播放已关闭。"</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"重复当前歌曲。"</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"重复播放所有歌曲。"</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"用作手机铃声"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"用作铃声"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"已将“%s”设置为手机铃声。"</string>
-    <string name="play_selection" msgid="2854921021814550018">"播放"</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="scanning">"正在扫描 SD 卡..."</string>
+    <string name="nowplaying_title">"当前正在播放"</string>
+    <string name="partyshuffle_title">"派对随机播放"</string>
+    <string name="artists_title">"艺术家"</string>
+    <string name="albums_menu">"专辑"</string>
+    <string name="albums_title">"专辑"</string>
+    <string name="tracks_menu">"歌曲"</string>
+    <string name="tracks_title">"歌曲"</string>
+    <string name="playlists_menu">"播放列表"</string>
+    <string name="playlists_title">"播放列表"</string>
+    <string name="videos_title">"视频"</string>
+    <string name="all_title">"所有媒体"</string>
+    <string name="browse_menu">"艺术家"</string>
+    <string name="search_title">"搜索"</string>
+    <string name="no_tracks_title">"无歌曲"</string>
+    <string name="no_videos_title">"无视频"</string>
+    <string name="no_playlists_title">"无播放列表"</string>
+    <string name="delete_playlist_menu">"删除"</string>
+    <string name="edit_playlist_menu">"编辑"</string>
+    <string name="rename_playlist_menu">"重命名"</string>
+    <string name="playlist_deleted_message">"播放列表已删除。"</string>
+    <string name="playlist_renamed_message">"播放列表已重命名。"</string>
+    <string name="recentlyadded">"最近添加的文件"</string>
+    <string name="recentlyadded_title">"最近添加的文件"</string>
+    <string name="podcasts_listitem">"播客"</string>
+    <string name="podcasts_title">"播客"</string>
+    <string name="sdcard_missing_title">"无 SD 卡"</string>
+    <string name="sdcard_missing_message">"手机中未插入 SD 卡。"</string>
+    <string name="sdcard_busy_title">"SD 卡不可用"</string>
+    <string name="sdcard_busy_message">"抱歉,SD 卡正忙。"</string>
+    <string name="sdcard_error_title">"SD 卡错误"</string>
+    <string name="sdcard_error_message">"SD 卡上出现错误。"</string>
+    <string name="unknown_artist_name">"未知艺术家"</string>
+    <string name="unknown_album_name">"未知专辑"</string>
+    <string name="shuffle_on_notif">"随机播放已打开。"</string>
+    <string name="shuffle_off_notif">"随机播放已关闭。"</string>
+    <string name="repeat_off_notif">"重复已关闭。"</string>
+    <string name="repeat_current_notif">"重复当前歌曲。"</string>
+    <string name="repeat_all_notif">"重复所有歌曲。"</string>
+    <string name="ringtone_menu">"用作手机铃声"</string>
+    <string name="ringtone_menu_short">"用作铃声"</string>
+    <string name="ringtone_set">"已将“%s”设置为手机铃声。"</string>
+    <string name="play_selection">"播放"</string>
+    <string name="add_to_playlist">"添加到播放列表"</string>
+    <string name="queue">"当前播放列表"</string>
+    <string name="new_playlist">"新建"</string>
+    <string name="new_playlist_name_template">"新建播放列表 <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"已将 1 首歌曲添加到播放列表。"</item>
-    <item quantity="other" msgid="7675242021325355213">"%d 首歌曲已添加到播放列表。"</item>
+    <item quantity="one">"已将 1 首歌曲添加到播放列表。"</item>
+    <item quantity="other">"%d 首歌曲已添加到播放列表。"</item>
   </plurals>
-    <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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"抱歉,无法播放此歌曲。"</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"确定"</string>
+    <string name="emptyplaylist">"选定的播放列表为空。"</string>
+    <string name="create_playlist_create_text">"保存"</string>
+    <string name="create_playlist_overwrite_text">"覆盖"</string>
+    <string name="service_start_error_title">"播放问题"</string>
+    <string name="service_start_error_msg">"抱歉,无法播放此歌曲。"</string>
+    <string name="service_start_error_button">"确定"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 周"</item>
-    <item msgid="7487749116155425822">"2 周"</item>
-    <item msgid="1565338360539555185">"3 周"</item>
-    <item msgid="2142986059836933072">"4 周"</item>
-    <item msgid="4332403875260507291">"5 周"</item>
-    <item msgid="3847281907869868565">"6 周"</item>
-    <item msgid="2942654998558867799">"7 周"</item>
-    <item msgid="2115529325850052227">"8 周"</item>
-    <item msgid="1396675336665198092">"9 周"</item>
-    <item msgid="3178819129208998649">"10 周"</item>
-    <item msgid="2727959579637914171">"11 周"</item>
-    <item msgid="8708754966127584739">"12 周"</item>
+    <item>"1 周"</item>
+    <item>"2 周"</item>
+    <item>"3 周"</item>
+    <item>"4 周"</item>
+    <item>"5 周"</item>
+    <item>"6 周"</item>
+    <item>"7 周"</item>
+    <item>"8 周"</item>
+    <item>"9 周"</item>
+    <item>"10 周"</item>
+    <item>"11 周"</item>
+    <item>"12 周"</item>
   </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="musicbrowserlabel" msgid="3162022214114562892">"音乐"</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="4477832192645009774">"抱歉,播放器不支持此类型的音频文件。"</string>
-    <string name="cancel" msgid="886559484711947520">"取消"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"从播放列表中删除"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"正在连接 <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"搜索%s所用的工具:"</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="3267924133697717662">"正在载入"</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="music_picker_title" msgid="1561623486324013570">"选择曲目"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"曲目 <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="weekpicker_set">"完成"</string>
+    <string name="weekpicker_title">"设置时间"</string>
+    <string name="save_as_playlist">"另存为播放列表"</string>
+    <string name="clear_playlist">"清除播放列表"</string>
+    <string name="musicbrowserlabel">"音乐"</string>
+    <string name="musicshortcutlabel">"音乐播放列表"</string>
+    <string name="mediaplaybacklabel">"音乐"</string>
+    <string name="videobrowserlabel">"视频"</string>
+    <string name="mediapickerlabel">"音乐"</string>
+    <string name="playback_failed">"抱歉,播放器不支持此类型的音频文件。"</string>
+    <string name="cancel">"取消"</string>
+    <string name="remove_from_playlist">"从播放列表中删除"</string>
+    <string name="streamloadingtext">"正在连接 <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"搜索%s所用的工具:"</string>
+    <string name="working_artists">"艺术家..."</string>
+    <string name="working_albums">"专辑..."</string>
+    <string name="working_songs">"歌曲..."</string>
+    <string name="working_playlists">"播放列表..."</string>
+    <string name="loading">"正在载入"</string>
+    <string name="sort_by_track">"曲目"</string>
+    <string name="sort_by_album">"专辑"</string>
+    <string name="sort_by_artist">"艺术家"</string>
+    <string name="music_picker_title">"选择曲目"</string>
+    <string name="gadget_track">"曲目 <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
     <!-- no translation found for fail_to_start_stream (3605390187703912835) -->
     <skip />
     <!-- no translation found for search_settings_description (6520975349259883368) -->
diff --git a/res/values-zh-rTW-finger/strings2.xml b/res/values-zh-rTW-finger/strings2.xml
index 4e6109b..838dac5 100644
--- a/res/values-zh-rTW-finger/strings2.xml
+++ b/res/values-zh-rTW-finger/strings2.xml
@@ -15,5 +15,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="2128095771677061443">"<xliff:g id="ALBUM">%2$s</xliff:g>"\n"<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
+    <string name="notification_artist_album">"<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-keysexposed/strings.xml b/res/values-zh-rTW-keysexposed/strings.xml
index 8edfb23..2034d1a 100644
--- a/res/values-zh-rTW-keysexposed/strings.xml
+++ b/res/values-zh-rTW-keysexposed/strings.xml
@@ -15,7 +15,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="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>
+    <string name="create_playlist_create_text_prompt">"播放清單名稱"</string>
+    <string name="rename_playlist_same_prompt">"將「<xliff:g id="PLAYLIST">%s</xliff:g>」重新命名為"</string>
+    <string name="rename_playlist_diff_prompt">"將「<xliff:g id="PLAYLIST">%s</xliff:g>」重新命名為"</string>
 </resources>
diff --git a/res/values-zh-rTW-keyshidden/strings.xml b/res/values-zh-rTW-keyshidden/strings.xml
index dc0e0cc..09f596e 100644
--- a/res/values-zh-rTW-keyshidden/strings.xml
+++ b/res/values-zh-rTW-keyshidden/strings.xml
@@ -15,7 +15,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="6653146846093237201">"開啟鍵盤為新 [播放清單] 命名,或選取 [儲存] 將之命名為「%s」。"</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"開啟鍵盤以重新命名「<xliff:g id="PLAYLIST">%s</xliff:g>」播放清單。"</string>
-    <string name="rename_playlist_diff_prompt" msgid="6930730254920388535">"開啟鍵盤以重新命名「<xliff:g id="PLAYLIST">%s</xliff:g>」播放清單,或選取 [儲存] 將之命名為「%s」。"</string>
+    <string name="create_playlist_create_text_prompt">"開啟鍵盤為新 [播放清單] 命名,或選取 [儲存] 將之命名為「%s」。"</string>
+    <string name="rename_playlist_same_prompt">"開啟鍵盤以重新命名「<xliff:g id="PLAYLIST">%s</xliff:g>」播放清單。"</string>
+    <string name="rename_playlist_diff_prompt">"開啟鍵盤以重新命名「<xliff:g id="PLAYLIST">%s</xliff:g>」播放清單,或選取 [儲存] 將之命名為「%s」。"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 3e0e4b3..47ff27f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -15,127 +15,128 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="onesong" msgid="8336826100414159413">"1 首樂曲"</string>
+    <string name="onesong">"1 首樂曲"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> 首樂曲"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 首樂曲"</item>
   </plurals>
   <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"專輯的 <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> 首樂曲中,有 <xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> 首該演出者的樂曲"</item>
+    <item quantity="other">"專輯的 <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> 首樂曲中,有 <xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> 首該演出者的樂曲"</item>
   </plurals>
   <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 張專輯"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> 專輯"</item>
+    <item quantity="one">"1 張專輯"</item>
+    <item quantity="other">"<xliff:g id="COUNT">%d</xliff:g> 專輯"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"媒體庫"</string>
-    <string name="goto_playback" msgid="4885216161312176550">"播放內容"</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>
-    <string name="delete_artist_desc" msgid="1843750591006508005">"<xliff:g id="ARTIST">%s</xliff:g>的所有歌曲會從 SD 卡永久刪除。"</string>
-    <string name="delete_album_desc" msgid="535515999268177079">"「<xliff:g id="ALBUM">%s</xliff:g>」的所有內容會從 SD 卡永久刪除。"</string>
-    <string name="delete_song_desc" msgid="1856800468541831408">"「<xliff:g id="SONG">%s</xliff:g>」會從 SD 卡永久刪除。"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"確定"</string>
+    <string name="goto_start">"媒體庫"</string>
+    <string name="goto_playback">"播放內容"</string>
+    <string name="party_shuffle">"派對隨機播放"</string>
+    <string name="party_shuffle_off">"關閉派對隨機播放"</string>
+    <string name="delete_item">"刪除"</string>
+    <string name="shuffle_all">"全部隨機播放"</string>
+    <string name="play_all">"全部播放"</string>
+    <string name="delete_artist_desc">"<xliff:g id="ARTIST">%s</xliff:g>的所有歌曲會從 SD 卡永久刪除。"</string>
+    <string name="delete_album_desc">"「<xliff:g id="ALBUM">%s</xliff:g>」的所有內容會從 SD 卡永久刪除。"</string>
+    <string name="delete_song_desc">"「<xliff:g id="SONG">%s</xliff:g>」會從 SD 卡永久刪除。"</string>
+    <string name="delete_confirm_button_text">"確定"</string>
   <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"已刪除 1 首樂曲。"</item>
-    <item quantity="other" msgid="5156740163031225200">"已刪除 <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> 首樂曲。"</item>
+    <item quantity="one">"已刪除 1 首樂曲。"</item>
+    <item quantity="other">"已刪除 <xliff:g id="SONGS_TO_DELETE">%d</xliff:g> 首樂曲。"</item>
   </plurals>
-    <string name="scanning" msgid="3529383847223198502">"掃描 SD 卡中..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"目前播放"</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="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="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="recentlyadded" msgid="110978416756366953">"最近新增的樂曲"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"最近新增的樂曲"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcast"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcast"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"沒有 SD 卡"</string>
-    <string name="sdcard_missing_message" msgid="1169260755336159747">"您的手機未插入 SD 卡。"</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"無法使用 SD 卡"</string>
-    <string name="sdcard_busy_message" msgid="8071868348072728830">"很抱歉,SD 卡忙碌中。"</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD 卡錯誤"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"SD 卡發生錯誤。"</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>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"已關閉重複播放。"</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"重複播放目前樂曲。"</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"重複播放所有樂曲。"</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"設成來電鈴聲"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"設成鈴聲"</string>
-    <string name="ringtone_set" msgid="4352073372504803255">"已將「%s」設為來電鈴聲。"</string>
-    <string name="play_selection" msgid="2854921021814550018">"播放"</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="scanning">"掃描 SD 卡中..."</string>
+    <string name="nowplaying_title">"目前播放"</string>
+    <string name="partyshuffle_title">"派對隨機播放"</string>
+    <string name="artists_title">"演出者"</string>
+    <string name="albums_menu">"專輯"</string>
+    <string name="albums_title">"專輯"</string>
+    <string name="tracks_menu">"樂曲"</string>
+    <string name="tracks_title">"樂曲"</string>
+    <string name="playlists_menu">"播放清單"</string>
+    <string name="playlists_title">"播放清單"</string>
+    <string name="videos_title">"影片"</string>
+    <string name="all_title">"所有媒體"</string>
+    <string name="browse_menu">"演出者"</string>
+    <string name="search_title">"搜尋"</string>
+    <string name="no_tracks_title">"沒有樂曲"</string>
+    <string name="no_videos_title">"沒有影片"</string>
+    <string name="no_playlists_title">"沒有播放清單"</string>
+    <string name="delete_playlist_menu">"刪除"</string>
+    <string name="edit_playlist_menu">"編輯"</string>
+    <string name="rename_playlist_menu">"重新命名"</string>
+    <string name="playlist_deleted_message">"播放清單已刪除。"</string>
+    <string name="playlist_renamed_message">"已重新命名播放清單。"</string>
+    <string name="recentlyadded">"最近新增的樂曲"</string>
+    <string name="recentlyadded_title">"最近新增的樂曲"</string>
+    <string name="podcasts_listitem">"Podcast"</string>
+    <string name="podcasts_title">"Podcast"</string>
+    <string name="sdcard_missing_title">"沒有 SD 卡"</string>
+    <string name="sdcard_missing_message">"您的手機未插入 SD 卡。"</string>
+    <string name="sdcard_busy_title">"無法使用 SD 卡"</string>
+    <string name="sdcard_busy_message">"很抱歉,SD 卡忙碌中。"</string>
+    <string name="sdcard_error_title">"SD 卡錯誤"</string>
+    <string name="sdcard_error_message">"SD 卡發生錯誤。"</string>
+    <string name="unknown_artist_name">"未知的演出者"</string>
+    <string name="unknown_album_name">"未知的專輯"</string>
+    <string name="shuffle_on_notif">"已開啟隨機播放。"</string>
+    <string name="shuffle_off_notif">"已關閉隨機播放。"</string>
+    <string name="repeat_off_notif">"已關閉重複播放。"</string>
+    <string name="repeat_current_notif">"重複播放目前樂曲。"</string>
+    <string name="repeat_all_notif">"重複播放所有樂曲。"</string>
+    <string name="ringtone_menu">"設成來電鈴聲"</string>
+    <string name="ringtone_menu_short">"設成鈴聲"</string>
+    <string name="ringtone_set">"已將「%s」設為來電鈴聲。"</string>
+    <string name="play_selection">"播放"</string>
+    <string name="add_to_playlist">"新增至播放清單"</string>
+    <string name="queue">"目前播放清單"</string>
+    <string name="new_playlist">"新增"</string>
+    <string name="new_playlist_name_template">"新播放清單 <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"已將 1 首樂曲加入播放清單。"</item>
-    <item quantity="other" msgid="7675242021325355213">"%d 首樂曲已新增至播放清單。"</item>
+    <item quantity="one">"已將 1 首樂曲加入播放清單。"</item>
+    <item quantity="other">"%d 首樂曲已新增至播放清單。"</item>
   </plurals>
-    <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>
-    <string name="service_start_error_msg" msgid="3880338547260838681">"很抱歉,此樂曲無法播放。"</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"確定"</string>
+    <string name="emptyplaylist">"您選取的播放清單是空的。"</string>
+    <string name="create_playlist_create_text">"儲存"</string>
+    <string name="create_playlist_overwrite_text">"覆寫"</string>
+    <string name="service_start_error_title">"播放內容問題"</string>
+    <string name="service_start_error_msg">"很抱歉,此樂曲無法播放。"</string>
+    <string name="service_start_error_button">"確定"</string>
   <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 週"</item>
-    <item msgid="7487749116155425822">"2 週"</item>
-    <item msgid="1565338360539555185">"3 週"</item>
-    <item msgid="2142986059836933072">"4 週"</item>
-    <item msgid="4332403875260507291">"5 週"</item>
-    <item msgid="3847281907869868565">"6 週"</item>
-    <item msgid="2942654998558867799">"7 週"</item>
-    <item msgid="2115529325850052227">"8 週"</item>
-    <item msgid="1396675336665198092">"9 週"</item>
-    <item msgid="3178819129208998649">"10 週"</item>
-    <item msgid="2727959579637914171">"11 週"</item>
-    <item msgid="8708754966127584739">"12 週"</item>
+    <item>"1 週"</item>
+    <item>"2 週"</item>
+    <item>"3 週"</item>
+    <item>"4 週"</item>
+    <item>"5 週"</item>
+    <item>"6 週"</item>
+    <item>"7 週"</item>
+    <item>"8 週"</item>
+    <item>"9 週"</item>
+    <item>"10 週"</item>
+    <item>"11 週"</item>
+    <item>"12 週"</item>
   </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="musicbrowserlabel" msgid="3162022214114562892">"音樂"</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="4477832192645009774">"很抱歉,播放器不支援此音訊檔格式。"</string>
-    <string name="cancel" msgid="886559484711947520">"取消"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"從播放清單移除"</string>
-    <string name="streamloadingtext" msgid="3367150884806639224">"連線到 <xliff:g id="HOST">%s</xliff:g>"</string>
-    <string name="mediasearch" msgid="9170843953524689876">"搜尋 %s,使用:"</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="3267924133697717662">"載入中"</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="music_picker_title" msgid="1561623486324013570">"選取音樂曲目"</string>
-    <string name="gadget_track" msgid="3186569295893300114">"音軌 <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
-    <string name="fail_to_start_stream" msgid="3605390187703912835">"無法播放您要求的串流媒體。"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"歌手/創作人、專輯及歌曲。"</string>
+    <string name="weekpicker_set">"完成"</string>
+    <string name="weekpicker_title">"設定時間"</string>
+    <string name="save_as_playlist">"另存為播放清單"</string>
+    <string name="clear_playlist">"清除播放清單"</string>
+    <string name="musicbrowserlabel">"音樂"</string>
+    <string name="musicshortcutlabel">"音樂播放清單"</string>
+    <string name="mediaplaybacklabel">"音樂"</string>
+    <string name="videobrowserlabel">"影片"</string>
+    <string name="mediapickerlabel">"音樂"</string>
+    <string name="playback_failed">"很抱歉,播放器不支援此音訊檔格式。"</string>
+    <string name="cancel">"取消"</string>
+    <string name="remove_from_playlist">"從播放清單移除"</string>
+    <string name="streamloadingtext">"連線到 <xliff:g id="HOST">%s</xliff:g>"</string>
+    <string name="mediasearch">"搜尋 %s,使用:"</string>
+    <string name="working_artists">"演出者..."</string>
+    <string name="working_albums">"專輯..."</string>
+    <string name="working_songs">"樂曲..."</string>
+    <string name="working_playlists">"播放清單..."</string>
+    <string name="loading">"載入中"</string>
+    <string name="sort_by_track">"曲目"</string>
+    <string name="sort_by_album">"專輯"</string>
+    <string name="sort_by_artist">"演出者"</string>
+    <string name="music_picker_title">"選取音樂曲目"</string>
+    <string name="gadget_track">"音軌 <xliff:g id="TRACK_NUMBER">%d</xliff:g>"</string>
+    <string name="fail_to_start_stream">"無法播放您要求的串流媒體。"</string>
+    <!-- no translation found for search_settings_description (6520975349259883368) -->
+    <skip />
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 9a7806a..07a5839 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,6 +16,5 @@
 
 <resources>
     <color name="appwidget_text">#ff000000</color>
-    <color name="appwidget_shadow">#ffffffff</color>
 </resources>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index bcb0d64..c1c15b3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,8 +15,10 @@
 -->
 
 <resources>
-    <!-- Size of widget album art cutout -->
-    <dimen name="appwidget_cutout">198dip</dimen>
+    <!-- height of a normal list item in edit playlist mode -->
+    <dimen name="normal_height">64dip</dimen>
+    <!-- height of an expanded list item in edit playlist mode -->
+    <dimen name="expanded_height">128dip</dimen>
 
     <dimen name="appwidget_width">311dip</dimen>
     <dimen name="appwidget_height">80dip</dimen>
diff --git a/src/com/android/music/AlbumBrowserActivity.java b/src/com/android/music/AlbumBrowserActivity.java
index 0d6c150..2a55d08 100644
--- a/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
@@ -253,13 +253,13 @@
         switch (item.getItemId()) {
             case PLAY_SELECTION: {
                 // play the selected album
-                int [] list = MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
+                long [] list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
                 MusicUtils.playAll(this, list, 0);
                 return true;
             }
 
             case QUEUE: {
-                int [] list = MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
+                long [] list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
                 MusicUtils.addToCurrentPlaylist(this, list);
                 return true;
             }
@@ -272,18 +272,18 @@
             }
 
             case PLAYLIST_SELECTED: {
-                int [] list = MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
-                int playlist = item.getIntent().getIntExtra("playlist", 0);
+                long [] list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
+                long playlist = item.getIntent().getLongExtra("playlist", 0);
                 MusicUtils.addToPlaylist(this, list, playlist);
                 return true;
             }
             case DELETE_ITEM: {
-                int [] list = MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
+                long [] list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
                 String f = getString(R.string.delete_album_desc); 
                 String desc = String.format(f, mCurrentAlbumName);
                 Bundle b = new Bundle();
                 b.putString("description", desc);
-                b.putIntArray("items", list);
+                b.putLongArray("items", list);
                 Intent intent = new Intent();
                 intent.setClass(this, DeleteItems.class);
                 intent.putExtras(b);
@@ -332,8 +332,8 @@
                 if (resultCode == RESULT_OK) {
                     Uri uri = intent.getData();
                     if (uri != null) {
-                        int [] list = MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
-                        MusicUtils.addToPlaylist(this, list, Integer.parseInt(uri.getLastPathSegment()));
+                        long [] list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
+                        MusicUtils.addToPlaylist(this, list, Long.parseLong(uri.getLastPathSegment()));
                     }
                 }
                 break;
@@ -573,16 +573,15 @@
             // We don't actually need the path to the thumbnail file,
             // we just use it to see if there is album art or not
             String art = cursor.getString(mAlbumArtIndex);
+            long aid = cursor.getLong(0);
             if (unknown || art == null || art.length() == 0) {
                 iv.setImageDrawable(null);
             } else {
-                int artIndex = cursor.getInt(0);
-                Drawable d = MusicUtils.getCachedArtwork(context, artIndex, mDefaultAlbumIcon);
+                Drawable d = MusicUtils.getCachedArtwork(context, aid, mDefaultAlbumIcon);
                 iv.setImageDrawable(d);
             }
             
-            int currentalbumid = MusicUtils.getCurrentAlbumId();
-            int aid = cursor.getInt(0);
+            long currentalbumid = MusicUtils.getCurrentAlbumId();
             iv = vh.play_indicator;
             if (currentalbumid == aid) {
                 iv.setImageDrawable(mNowPlayingOverlay);
diff --git a/src/com/android/music/ArtistAlbumBrowserActivity.java b/src/com/android/music/ArtistAlbumBrowserActivity.java
index 35bf54e..8165979 100644
--- a/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
@@ -348,20 +348,20 @@
         switch (item.getItemId()) {
             case PLAY_SELECTION: {
                 // play everything by the selected artist
-                int [] list =
+                long [] list =
                     mCurrentArtistId != null ?
-                    MusicUtils.getSongListForArtist(this, Integer.parseInt(mCurrentArtistId))
-                    : MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
+                    MusicUtils.getSongListForArtist(this, Long.parseLong(mCurrentArtistId))
+                    : MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
                         
                 MusicUtils.playAll(this, list, 0);
                 return true;
             }
 
             case QUEUE: {
-                int [] list =
+                long [] list =
                     mCurrentArtistId != null ?
-                    MusicUtils.getSongListForArtist(this, Integer.parseInt(mCurrentArtistId))
-                    : MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
+                    MusicUtils.getSongListForArtist(this, Long.parseLong(mCurrentArtistId))
+                    : MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
                 MusicUtils.addToCurrentPlaylist(this, list);
                 return true;
             }
@@ -374,30 +374,30 @@
             }
 
             case PLAYLIST_SELECTED: {
-                int [] list =
+                long [] list =
                     mCurrentArtistId != null ?
-                    MusicUtils.getSongListForArtist(this, Integer.parseInt(mCurrentArtistId))
-                    : MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
-                int playlist = item.getIntent().getIntExtra("playlist", 0);
+                    MusicUtils.getSongListForArtist(this, Long.parseLong(mCurrentArtistId))
+                    : MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
+                long playlist = item.getIntent().getLongExtra("playlist", 0);
                 MusicUtils.addToPlaylist(this, list, playlist);
                 return true;
             }
             
             case DELETE_ITEM: {
-                int [] list;
+                long [] list;
                 String desc;
                 if (mCurrentArtistId != null) {
-                    list = MusicUtils.getSongListForArtist(this, Integer.parseInt(mCurrentArtistId));
+                    list = MusicUtils.getSongListForArtist(this, Long.parseLong(mCurrentArtistId));
                     String f = getString(R.string.delete_artist_desc);
                     desc = String.format(f, mCurrentArtistName);
                 } else {
-                    list = MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
+                    list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
                     String f = getString(R.string.delete_album_desc); 
                     desc = String.format(f, mCurrentAlbumName);
                 }
                 Bundle b = new Bundle();
                 b.putString("description", desc);
-                b.putIntArray("items", list);
+                b.putLongArray("items", list);
                 Intent intent = new Intent();
                 intent.setClass(this, DeleteItems.class);
                 intent.putExtras(b);
@@ -453,13 +453,13 @@
                 if (resultCode == RESULT_OK) {
                     Uri uri = intent.getData();
                     if (uri != null) {
-                        int [] list = null;
+                        long [] list = null;
                         if (mCurrentArtistId != null) {
-                            list = MusicUtils.getSongListForArtist(this, Integer.parseInt(mCurrentArtistId));
+                            list = MusicUtils.getSongListForArtist(this, Long.parseLong(mCurrentArtistId));
                         } else if (mCurrentAlbumId != null) {
-                            list = MusicUtils.getSongListForAlbum(this, Integer.parseInt(mCurrentAlbumId));
+                            list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
                         }
-                        MusicUtils.addToPlaylist(this, list, Integer.parseInt(uri.getLastPathSegment()));
+                        MusicUtils.addToPlaylist(this, list, Long.parseLong(uri.getLastPathSegment()));
                     }
                 }
                 break;
@@ -644,8 +644,8 @@
             
             vh.line2.setText(songs_albums);
             
-            int currentartistid = MusicUtils.getCurrentArtistId();
-            int artistid = cursor.getInt(mGroupArtistIdIdx);
+            long currentartistid = MusicUtils.getCurrentArtistId();
+            long artistid = cursor.getLong(mGroupArtistIdIdx);
             if (currentartistid == artistid && !isexpanded) {
                 vh.play_indicator.setImageDrawable(mNowPlayingOverlay);
             } else {
@@ -701,13 +701,13 @@
                 iv.setBackgroundDrawable(mDefaultAlbumIcon);
                 iv.setImageDrawable(null);
             } else {
-                int artIndex = cursor.getInt(0);
+                long artIndex = cursor.getLong(0);
                 Drawable d = MusicUtils.getCachedArtwork(context, artIndex, mDefaultAlbumIcon);
                 iv.setImageDrawable(d);
             }
 
-            int currentalbumid = MusicUtils.getCurrentAlbumId();
-            int aid = cursor.getInt(0);
+            long currentalbumid = MusicUtils.getCurrentAlbumId();
+            long aid = cursor.getLong(0);
             iv = vh.play_indicator;
             if (currentalbumid == aid) {
                 iv.setImageDrawable(mNowPlayingOverlay);
@@ -720,7 +720,7 @@
         @Override
         protected Cursor getChildrenCursor(Cursor groupCursor) {
             
-            int id = groupCursor.getInt(groupCursor.getColumnIndexOrThrow(MediaStore.Audio.Artists._ID));
+            long id = groupCursor.getLong(groupCursor.getColumnIndexOrThrow(MediaStore.Audio.Artists._ID));
             
             String[] cols = new String[] {
                     MediaStore.Audio.Albums._ID,
diff --git a/src/com/android/music/DeleteItems.java b/src/com/android/music/DeleteItems.java
index 15e681f..6cb2527 100644
--- a/src/com/android/music/DeleteItems.java
+++ b/src/com/android/music/DeleteItems.java
@@ -40,7 +40,7 @@
 {
     private TextView mPrompt;
     private Button mButton;
-    private int [] mItemList;
+    private long [] mItemList;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -64,7 +64,7 @@
 
         Bundle b = getIntent().getExtras();
         String desc = b.getString("description");
-        mItemList = b.getIntArray("items");
+        mItemList = b.getLongArray("items");
         
         mPrompt.setText(desc);
     }
diff --git a/src/com/android/music/IMediaPlaybackService.aidl b/src/com/android/music/IMediaPlaybackService.aidl
index 1d27057..be48247 100644
--- a/src/com/android/music/IMediaPlaybackService.aidl
+++ b/src/com/android/music/IMediaPlaybackService.aidl
@@ -23,7 +23,7 @@
 {
     void openFile(String path, boolean oneShot);
     void openFileAsync(String path);
-    void open(in int [] list, int position);
+    void open(in long [] list, int position);
     int getQueuePosition();
     boolean isPlaying();
     void stop();
@@ -36,19 +36,19 @@
     long seek(long pos);
     String getTrackName();
     String getAlbumName();
-    int getAlbumId();
+    long getAlbumId();
     String getArtistName();
-    int getArtistId();
-    void enqueue(in int [] list, int action);
-    int [] getQueue();
+    long getArtistId();
+    void enqueue(in long [] list, int action);
+    long [] getQueue();
     void moveQueueItem(int from, int to);
     void setQueuePosition(int index);
     String getPath();
-    int getAudioId();
+    long getAudioId();
     void setShuffleMode(int shufflemode);
     int getShuffleMode();
     int removeTracks(int first, int last);
-    int removeTrack(int id);
+    int removeTrack(long id);
     void setRepeatMode(int repeatmode);
     int getRepeatMode();
     int getMediaMountedCount();
diff --git a/src/com/android/music/MediaPlaybackActivity.java b/src/com/android/music/MediaPlaybackActivity.java
index 8f47a40..1273a35 100644
--- a/src/com/android/music/MediaPlaybackActivity.java
+++ b/src/com/android/music/MediaPlaybackActivity.java
@@ -22,6 +22,7 @@
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -29,6 +30,7 @@
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.media.AudioManager;
 import android.media.MediaFile;
@@ -269,15 +271,38 @@
         String artist;
         String album;
         String song;
+        long audioid;
         
         try {
             artist = mService.getArtistName();
             album = mService.getAlbumName();
             song = mService.getTrackName();
+            audioid = mService.getAudioId();
         } catch (RemoteException ex) {
             return true;
         }
-        
+
+        if (MediaFile.UNKNOWN_STRING.equals(album) &&
+                MediaFile.UNKNOWN_STRING.equals(artist) &&
+                song != null &&
+                song.startsWith("recording")) {
+            // not music
+            return false;
+        }
+        Cursor c = MusicUtils.query(this,
+                ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, audioid),
+                new String[] {MediaStore.Audio.Media.IS_MUSIC}, null, null, null);
+        boolean ismusic = true;
+        if (c != null) {
+            if (c.moveToFirst()) {
+                ismusic = c.getInt(0) != 0;
+            }
+            c.close();
+        }
+        if (!ismusic) {
+            return false;
+        }
+
         boolean knownartist =
             (artist != null) && !MediaFile.UNKNOWN_STRING.equals(artist);
 
@@ -566,21 +591,21 @@
                 }
 
                 case PLAYLIST_SELECTED: {
-                    int [] list = new int[1];
+                    long [] list = new long[1];
                     list[0] = MusicUtils.getCurrentAudioId();
-                    int playlist = item.getIntent().getIntExtra("playlist", 0);
+                    long playlist = item.getIntent().getLongExtra("playlist", 0);
                     MusicUtils.addToPlaylist(this, list, playlist);
                     return true;
                 }
                 
                 case DELETE_ITEM: {
                     if (mService != null) {
-                        int [] list = new int[1];
+                        long [] list = new long[1];
                         list[0] = MusicUtils.getCurrentAudioId();
                         Bundle b = new Bundle();
                         b.putString("description", getString(R.string.delete_song_desc,
                                 mService.getTrackName()));
-                        b.putIntArray("items", list);
+                        b.putLongArray("items", list);
                         intent = new Intent();
                         intent.setClass(this, DeleteItems.class);
                         intent.putExtras(b);
@@ -603,7 +628,7 @@
             case NEW_PLAYLIST:
                 Uri uri = intent.getData();
                 if (uri != null) {
-                    int [] list = new int[1];
+                    long [] list = new long[1];
                     list[0] = MusicUtils.getCurrentAudioId();
                     int playlist = Integer.parseInt(uri.getLastPathSegment());
                     MusicUtils.addToPlaylist(this, list, playlist);
@@ -1209,6 +1234,15 @@
         }
     };
 
+    private static class AlbumSongIdWrapper {
+        public long albumid;
+        public long songid;
+        AlbumSongIdWrapper(long aid, long sid) {
+            albumid = aid;
+            songid = sid;
+        }
+    }
+    
     private void updateTrackInfo() {
         if (mService == null) {
             return;
@@ -1220,13 +1254,16 @@
                 return;
             }
             
-            if (mService.getAudioId() < 0 && path.toLowerCase().startsWith("http://")) {
+            long songid = mService.getAudioId(); 
+            if (songid < 0 && path.toLowerCase().startsWith("http://")) {
+                // Once we can get album art and meta data from MediaPlayer, we
+                // can show that info again when streaming.
                 ((View) mArtistName.getParent()).setVisibility(View.INVISIBLE);
                 ((View) mAlbumName.getParent()).setVisibility(View.INVISIBLE);
                 mAlbum.setVisibility(View.GONE);
                 mTrackName.setText(path);
                 mAlbumArtHandler.removeMessages(GET_ALBUM_ART);
-                mAlbumArtHandler.obtainMessage(GET_ALBUM_ART, -1, 0).sendToTarget();
+                mAlbumArtHandler.obtainMessage(GET_ALBUM_ART, new AlbumSongIdWrapper(-1, -1)).sendToTarget();
             } else {
                 ((View) mArtistName.getParent()).setVisibility(View.VISIBLE);
                 ((View) mAlbumName.getParent()).setVisibility(View.VISIBLE);
@@ -1236,7 +1273,7 @@
                 }
                 mArtistName.setText(artistName);
                 String albumName = mService.getAlbumName();
-                int albumid = mService.getAlbumId();
+                long albumid = mService.getAlbumId();
                 if (MediaFile.UNKNOWN_STRING.equals(albumName)) {
                     albumName = getString(R.string.unknown_album_name);
                     albumid = -1;
@@ -1244,7 +1281,7 @@
                 mAlbumName.setText(albumName);
                 mTrackName.setText(mService.getTrackName());
                 mAlbumArtHandler.removeMessages(GET_ALBUM_ART);
-                mAlbumArtHandler.obtainMessage(GET_ALBUM_ART, albumid, 0).sendToTarget();
+                mAlbumArtHandler.obtainMessage(GET_ALBUM_ART, new AlbumSongIdWrapper(albumid, songid)).sendToTarget();
                 mAlbum.setVisibility(View.VISIBLE);
             }
             mDuration = mService.duration();
@@ -1255,22 +1292,24 @@
     }
     
     public class AlbumArtHandler extends Handler {
-        private int mAlbumId = -1;
+        private long mAlbumId = -1;
         
         public AlbumArtHandler(Looper looper) {
             super(looper);
         }
+        @Override
         public void handleMessage(Message msg)
         {
-            int albumid = msg.arg1;
+            long albumid = ((AlbumSongIdWrapper) msg.obj).albumid;
+            long songid = ((AlbumSongIdWrapper) msg.obj).songid;
             if (msg.what == GET_ALBUM_ART && (mAlbumId != albumid || albumid < 0)) {
                 // while decoding the new image, show the default album art
                 Message numsg = mHandler.obtainMessage(ALBUM_ART_DECODED, null);
                 mHandler.removeMessages(ALBUM_ART_DECODED);
                 mHandler.sendMessageDelayed(numsg, 300);
-                Bitmap bm = MusicUtils.getArtwork(MediaPlaybackActivity.this, albumid);
+                Bitmap bm = MusicUtils.getArtwork(MediaPlaybackActivity.this, songid, albumid);
                 if (bm == null) {
-                    bm = MusicUtils.getArtwork(MediaPlaybackActivity.this, -1);
+                    bm = MusicUtils.getArtwork(MediaPlaybackActivity.this, songid, -1);
                     albumid = -1;
                 }
                 if (bm != null) {
diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 23ca124..83bc800 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -108,9 +108,9 @@
     private int mShuffleMode = SHUFFLE_NONE;
     private int mRepeatMode = REPEAT_NONE;
     private int mMediaMountedCount = 0;
-    private int [] mAutoShuffleList = null;
+    private long [] mAutoShuffleList = null;
     private boolean mOneShot;
-    private int [] mPlayList = null;
+    private long [] mPlayList = null;
     private int mPlayListLen = 0;
     private Vector<Integer> mHistory = new Vector<Integer>(MAX_HISTORY_SIZE);
     private Cursor mCursor;
@@ -359,12 +359,12 @@
             // on the phone)
             int len = mPlayListLen;
             for (int i = 0; i < len; i++) {
-                int n = mPlayList[i];
+                long n = mPlayList[i];
                 if (n == 0) {
                     q.append("0;");
                 } else {
                     while (n != 0) {
-                        int digit = n & 0xf;
+                        int digit = (int)(n & 0xf);
                         n >>= 4;
                         q.append(hexdigits[digit]);
                     }
@@ -654,7 +654,7 @@
     private void notifyChange(String what) {
         
         Intent i = new Intent(what);
-        i.putExtra("id", Integer.valueOf(getAudioId()));
+        i.putExtra("id", Long.valueOf(getAudioId()));
         i.putExtra("artist", getArtistName());
         i.putExtra("album",getAlbumName());
         i.putExtra("track", getTrackName());
@@ -675,7 +675,7 @@
             // reallocate at 2x requested size so we don't
             // need to grow and copy the array for every
             // insert
-            int [] newlist = new int[size * 2];
+            long [] newlist = new long[size * 2];
             int len = mPlayList != null ? mPlayList.length : mPlayListLen;
             for (int i = 0; i < len; i++) {
                 newlist[i] = mPlayList[i];
@@ -687,7 +687,7 @@
     }
     
     // insert the list of songs at the specified position in the playlist
-    private void addToPlayList(int [] list, int position) {
+    private void addToPlayList(long [] list, int position) {
         int addlen = list.length;
         if (position < 0) { // overwrite
             mPlayListLen = 0;
@@ -720,7 +720,7 @@
      * @param list The list of tracks to append.
      * @param action NOW, NEXT or LAST
      */
-    public void enqueue(int [] list, int action) {
+    public void enqueue(long [] list, int action) {
         synchronized(this) {
             if (action == NEXT && mPlayPos + 1 < mPlayListLen) {
                 addToPlayList(list, mPlayPos + 1);
@@ -753,12 +753,12 @@
      * specified position is 0.
      * @param list The new list of tracks.
      */
-    public void open(int [] list, int position) {
+    public void open(long [] list, int position) {
         synchronized (this) {
             if (mShuffleMode == SHUFFLE_AUTO) {
                 mShuffleMode = SHUFFLE_NORMAL;
             }
-            int oldId = getAudioId();
+            long oldId = getAudioId();
             int listlength = list.length;
             boolean newlist = true;
             if (mPlayListLen == listlength) {
@@ -805,7 +805,7 @@
                 index2 = mPlayListLen - 1;
             }
             if (index1 < index2) {
-                int tmp = mPlayList[index1];
+                long tmp = mPlayList[index1];
                 for (int i = index1; i < index2; i++) {
                     mPlayList[i] = mPlayList[i+1];
                 }
@@ -816,7 +816,7 @@
                         mPlayPos--;
                 }
             } else if (index2 < index1) {
-                int tmp = mPlayList[index1];
+                long tmp = mPlayList[index1];
                 for (int i = index1; i > index2; i--) {
                     mPlayList[i] = mPlayList[i-1];
                 }
@@ -835,10 +835,10 @@
      * Returns the current play list
      * @return An array of integers containing the IDs of the tracks in the play list
      */
-    public int [] getQueue() {
+    public long [] getQueue() {
         synchronized (this) {
             int len = mPlayListLen;
-            int [] list = new int[len];
+            long [] list = new long[len];
             for (int i = 0; i < len; i++) {
                 list[i] = mPlayList[i];
             }
@@ -941,7 +941,7 @@
                             mCursor.moveToNext();
                             ensurePlayListCapacity(1);
                             mPlayListLen = 1;
-                            mPlayList[0] = mCursor.getInt(IDCOLIDX);
+                            mPlayList[0] = mCursor.getLong(IDCOLIDX);
                             mPlayPos = 0;
                         }
                     }
@@ -1283,7 +1283,7 @@
         for (int i = 0; i < to_add; i++) {
             // pick something at random from the list
             int idx = mRand.nextInt(mAutoShuffleList.length);
-            Integer which = mAutoShuffleList[idx];
+            long which = mAutoShuffleList[idx];
             ensurePlayListCapacity(mPlayListLen + 1);
             mPlayList[mPlayListLen++] = which;
             notify = true;
@@ -1320,10 +1320,10 @@
                 return false;
             }
             int len = c.getCount();
-            int[] list = new int[len];
+            long [] list = new long[len];
             for (int i = 0; i < len; i++) {
                 c.moveToNext();
-                list[i] = c.getInt(0);
+                list[i] = c.getLong(0);
             }
             mAutoShuffleList = list;
             return true;
@@ -1397,7 +1397,7 @@
      * @param id The id to be removed
      * @return how many instances of the track were removed
      */
-    public int removeTrack(int id) {
+    public int removeTrack(long id) {
         int numremoved = 0;
         synchronized (this) {
             for (int i = 0; i < mPlayListLen; i++) {
@@ -1466,7 +1466,7 @@
      * Returns the rowid of the currently playing file, or -1 if
      * no file is currently playing.
      */
-    public int getAudioId() {
+    public long getAudioId() {
         synchronized (this) {
             if (mPlayPos >= 0 && mPlayer.isInitialized()) {
                 return mPlayList[mPlayPos];
@@ -1508,12 +1508,12 @@
         }
     }
     
-    public int getArtistId() {
+    public long getArtistId() {
         synchronized (this) {
             if (mCursor == null) {
                 return -1;
             }
-            return mCursor.getInt(mCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.ARTIST_ID));
+            return mCursor.getLong(mCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.ARTIST_ID));
         }
     }
 
@@ -1526,12 +1526,12 @@
         }
     }
 
-    public int getAlbumId() {
+    public long getAlbumId() {
         synchronized (this) {
             if (mCursor == null) {
                 return -1;
             }
-            return mCursor.getInt(mCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.ALBUM_ID));
+            return mCursor.getLong(mCursor.getColumnIndexOrThrow(MediaStore.Audio.Media.ALBUM_ID));
         }
     }
 
@@ -1764,7 +1764,7 @@
         {
             mService.get().open(path, oneShot);
         }
-        public void open(int [] list, int position) {
+        public void open(long [] list, int position) {
             mService.get().open(list, position);
         }
         public int getQueuePosition() {
@@ -1797,19 +1797,19 @@
         public String getAlbumName() {
             return mService.get().getAlbumName();
         }
-        public int getAlbumId() {
+        public long getAlbumId() {
             return mService.get().getAlbumId();
         }
         public String getArtistName() {
             return mService.get().getArtistName();
         }
-        public int getArtistId() {
+        public long getArtistId() {
             return mService.get().getArtistId();
         }
-        public void enqueue(int [] list , int action) {
+        public void enqueue(long [] list , int action) {
             mService.get().enqueue(list, action);
         }
-        public int [] getQueue() {
+        public long [] getQueue() {
             return mService.get().getQueue();
         }
         public void moveQueueItem(int from, int to) {
@@ -1818,7 +1818,7 @@
         public String getPath() {
             return mService.get().getPath();
         }
-        public int getAudioId() {
+        public long getAudioId() {
             return mService.get().getAudioId();
         }
         public long position() {
@@ -1839,7 +1839,7 @@
         public int removeTracks(int first, int last) {
             return mService.get().removeTracks(first, last);
         }
-        public int removeTrack(int id) {
+        public int removeTrack(long id) {
             return mService.get().removeTrack(id);
         }
         public void setRepeatMode(int repeatmode) {
diff --git a/src/com/android/music/MusicUtils.java b/src/com/android/music/MusicUtils.java
index ea20794..79a468c 100644
--- a/src/com/android/music/MusicUtils.java
+++ b/src/com/android/music/MusicUtils.java
@@ -16,21 +16,7 @@
 
 package com.android.music;
 
-import java.io.File;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Formatter;
-import java.util.HashMap;
-import java.util.Locale;
-
 import android.app.Activity;
-import android.app.ExpandableListActivity;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.ContentUris;
@@ -49,12 +35,10 @@
 import android.graphics.PixelFormat;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.media.MediaFile;
-import android.media.MediaScanner;
 import android.net.Uri;
-import android.os.RemoteException;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.util.Log;
@@ -64,6 +48,16 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Formatter;
+import java.util.HashMap;
+import java.util.Locale;
+
 public class MusicUtils {
 
     private static final String TAG = "MusicUtils";
@@ -195,7 +189,7 @@
         }
     }
     
-    public static int getCurrentAlbumId() {
+    public static long getCurrentAlbumId() {
         if (sService != null) {
             try {
                 return sService.getAlbumId();
@@ -205,7 +199,7 @@
         return -1;
     }
 
-    public static int getCurrentArtistId() {
+    public static long getCurrentArtistId() {
         if (MusicUtils.sService != null) {
             try {
                 return sService.getArtistId();
@@ -215,7 +209,7 @@
         return -1;
     }
 
-    public static int getCurrentAudioId() {
+    public static long getCurrentAudioId() {
         if (MusicUtils.sService != null) {
             try {
                 return sService.getAudioId();
@@ -250,14 +244,14 @@
         return false;
     }
 
-    private final static int [] sEmptyList = new int[0];
+    private final static long [] sEmptyList = new long[0];
     
-    public static int [] getSongListForCursor(Cursor cursor) {
+    public static long [] getSongListForCursor(Cursor cursor) {
         if (cursor == null) {
             return sEmptyList;
         }
         int len = cursor.getCount();
-        int [] list = new int[len];
+        long [] list = new long[len];
         cursor.moveToFirst();
         int colidx = -1;
         try {
@@ -266,13 +260,13 @@
             colidx = cursor.getColumnIndexOrThrow(MediaStore.Audio.Media._ID);
         }
         for (int i = 0; i < len; i++) {
-            list[i] = cursor.getInt(colidx);
+            list[i] = cursor.getLong(colidx);
             cursor.moveToNext();
         }
         return list;
     }
 
-    public static int [] getSongListForArtist(Context context, int id) {
+    public static long [] getSongListForArtist(Context context, long id) {
         final String[] ccols = new String[] { MediaStore.Audio.Media._ID };
         String where = MediaStore.Audio.Media.ARTIST_ID + "=" + id + " AND " + 
         MediaStore.Audio.Media.IS_MUSIC + "=1";
@@ -281,14 +275,14 @@
                 MediaStore.Audio.Media.ALBUM_KEY + ","  + MediaStore.Audio.Media.TRACK);
         
         if (cursor != null) {
-            int [] list = getSongListForCursor(cursor);
+            long [] list = getSongListForCursor(cursor);
             cursor.close();
             return list;
         }
         return sEmptyList;
     }
 
-    public static int [] getSongListForAlbum(Context context, int id) {
+    public static long [] getSongListForAlbum(Context context, long id) {
         final String[] ccols = new String[] { MediaStore.Audio.Media._ID };
         String where = MediaStore.Audio.Media.ALBUM_ID + "=" + id + " AND " + 
                 MediaStore.Audio.Media.IS_MUSIC + "=1";
@@ -296,20 +290,20 @@
                 ccols, where, null, MediaStore.Audio.Media.TRACK);
 
         if (cursor != null) {
-            int [] list = getSongListForCursor(cursor);
+            long [] list = getSongListForCursor(cursor);
             cursor.close();
             return list;
         }
         return sEmptyList;
     }
 
-    public static int [] getSongListForPlaylist(Context context, long plid) {
+    public static long [] getSongListForPlaylist(Context context, long plid) {
         final String[] ccols = new String[] { MediaStore.Audio.Playlists.Members.AUDIO_ID };
         Cursor cursor = query(context, MediaStore.Audio.Playlists.Members.getContentUri("external", plid),
                 ccols, null, null, MediaStore.Audio.Playlists.Members.DEFAULT_SORT_ORDER);
         
         if (cursor != null) {
-            int [] list = getSongListForCursor(cursor);
+            long [] list = getSongListForCursor(cursor);
             cursor.close();
             return list;
         }
@@ -317,13 +311,13 @@
     }
     
     public static void playPlaylist(Context context, long plid) {
-        int [] list = getSongListForPlaylist(context, plid);
+        long [] list = getSongListForPlaylist(context, plid);
         if (list != null) {
             playAll(context, list, -1, false);
         }
     }
 
-    public static int [] getAllSongs(Context context) {
+    public static long [] getAllSongs(Context context) {
         Cursor c = query(context, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
                 new String[] {MediaStore.Audio.Media._ID}, MediaStore.Audio.Media.IS_MUSIC + "=1",
                 null, null);
@@ -332,10 +326,10 @@
                 return null;
             }
             int len = c.getCount();
-            int[] list = new int[len];
+            long [] list = new long[len];
             for (int i = 0; i < len; i++) {
                 c.moveToNext();
-                list[i] = c.getInt(0);
+                list[i] = c.getLong(0);
             }
 
             return list;
@@ -377,7 +371,7 @@
                 cur.moveToFirst();
                 while (! cur.isAfterLast()) {
                     Intent intent = new Intent();
-                    intent.putExtra("playlist", cur.getInt(0));
+                    intent.putExtra("playlist", cur.getLong(0));
 //                    if (cur.getInt(0) == mLastPlaylistSelected) {
 //                        sub.add(0, MusicBaseActivity.PLAYLIST_SELECTED, cur.getString(1)).setIntent(intent);
 //                    } else {
@@ -399,7 +393,7 @@
         return;
     }
     
-    public static void deleteTracks(Context context, int [] list) {
+    public static void deleteTracks(Context context, long [] list) {
         
         String [] cols = new String [] { MediaStore.Audio.Media._ID, 
                 MediaStore.Audio.Media.DATA, MediaStore.Audio.Media.ALBUM_ID };
@@ -423,10 +417,10 @@
                 c.moveToFirst();
                 while (! c.isAfterLast()) {
                     // remove from current playlist
-                    int id = c.getInt(0);
+                    long id = c.getLong(0);
                     sService.removeTrack(id);
                     // remove from album art cache
-                    int artIndex = c.getInt(2);
+                    long artIndex = c.getLong(2);
                     synchronized(sArtCache) {
                         sArtCache.remove(artIndex);
                     }
@@ -466,7 +460,7 @@
         context.getContentResolver().notifyChange(Uri.parse("content://media"), null);
     }
     
-    public static void addToCurrentPlaylist(Context context, int [] list) {
+    public static void addToCurrentPlaylist(Context context, long [] list) {
         if (sService == null) {
             return;
         }
@@ -479,7 +473,7 @@
         }
     }
     
-    public static void addToPlaylist(Context context, int [] ids, long playlistid) {
+    public static void addToPlaylist(Context context, long [] ids, long playlistid) {
         if (ids == null) {
             // this shouldn't happen (the menuitems shouldn't be visible
             // unless the selected item represents something playable
@@ -513,18 +507,25 @@
     }
 
     public static Cursor query(Context context, Uri uri, String[] projection,
-            String selection, String[] selectionArgs, String sortOrder) {
+            String selection, String[] selectionArgs, String sortOrder, int limit) {
         try {
             ContentResolver resolver = context.getContentResolver();
             if (resolver == null) {
                 return null;
             }
+            if (limit > 0) {
+                uri = uri.buildUpon().appendQueryParameter("limit", "" + limit).build();
+            }
             return resolver.query(uri, projection, selection, selectionArgs, sortOrder);
          } catch (UnsupportedOperationException ex) {
             return null;
         }
         
     }
+    public static Cursor query(Context context, Uri uri, String[] projection,
+            String selection, String[] selectionArgs, String sortOrder) {
+        return query(context, uri, projection, selection, selectionArgs, sortOrder, 0);
+    }
     
     public static boolean isMediaScannerScanning(Context context) {
         boolean result = false;
@@ -661,17 +662,17 @@
         playAll(context, cursor, position, false);
     }
     
-    public static void playAll(Context context, int [] list, int position) {
+    public static void playAll(Context context, long [] list, int position) {
         playAll(context, list, position, false);
     }
     
     private static void playAll(Context context, Cursor cursor, int position, boolean force_shuffle) {
     
-        int [] list = getSongListForCursor(cursor);
+        long [] list = getSongListForCursor(cursor);
         playAll(context, list, position, force_shuffle);
     }
     
-    private static void playAll(Context context, int [] list, int position, boolean force_shuffle) {
+    private static void playAll(Context context, long [] list, int position, boolean force_shuffle) {
         if (list.length == 0 || sService == null) {
             Log.d("MusicUtils", "attempt to play empty song list");
             // Don't try to play empty playlists. Nothing good will come of it.
@@ -683,13 +684,13 @@
             if (force_shuffle) {
                 sService.setShuffleMode(MediaPlaybackService.SHUFFLE_NORMAL);
             }
-            int curid = sService.getAudioId();
+            long curid = sService.getAudioId();
             int curpos = sService.getQueuePosition();
             if (position != -1 && curpos == position && curid == list[position]) {
                 // The selected file is the file that's currently playing;
                 // figure out if we need to restart with a new playlist,
                 // or just launch the playback activity.
-                int [] playlist = sService.getQueue();
+                long [] playlist = sService.getQueue();
                 if (Arrays.equals(list, playlist)) {
                     // we don't need to set a new list, but we should resume playback if needed
                     sService.play();
@@ -740,12 +741,11 @@
     }
     
     private static int sArtId = -2;
-    private static byte [] mCachedArt;
     private static Bitmap mCachedBit = null;
     private static final BitmapFactory.Options sBitmapOptionsCache = new BitmapFactory.Options();
     private static final BitmapFactory.Options sBitmapOptions = new BitmapFactory.Options();
     private static final Uri sArtworkUri = Uri.parse("content://media/external/audio/albumart");
-    private static final HashMap<Integer, Drawable> sArtCache = new HashMap<Integer, Drawable>();
+    private static final HashMap<Long, Drawable> sArtCache = new HashMap<Long, Drawable>();
     private static int sArtCacheId = -1;
     
     static {
@@ -777,7 +777,7 @@
         }
     }
     
-    public static Drawable getCachedArtwork(Context context, int artIndex, BitmapDrawable defaultArtwork) {
+    public static Drawable getCachedArtwork(Context context, long artIndex, BitmapDrawable defaultArtwork) {
         Drawable d = null;
         synchronized(sArtCache) {
             d = sArtCache.get(artIndex);
@@ -807,7 +807,7 @@
     // Get album art for specified album. This method will not try to
     // fall back to getting artwork directly from the file, nor will
     // it attempt to repair the database.
-    private static Bitmap getArtworkQuick(Context context, int album_id, int w, int h) {
+    private static Bitmap getArtworkQuick(Context context, long album_id, int w, int h) {
         // NOTE: There is in fact a 1 pixel border on the right side in the ImageView
         // used to display this drawable. Take it into account now, so we don't have to
         // scale later.
@@ -865,27 +865,18 @@
     /** Get album art for specified album. You should not pass in the album id
      * for the "unknown" album here (use -1 instead)
      */
-    public static Bitmap getArtwork(Context context, int album_id) {
-        return getArtwork(context, album_id, true);
-    }
-    
-    /** Get album art for specified album. You should not pass in the album id
-     * for the "unknown" album here (use -1 instead)
-     */
-    public static Bitmap getArtwork(Context context, int album_id, boolean allowDefault) {
+    public static Bitmap getArtwork(Context context, long song_id, long album_id) {
 
         if (album_id < 0) {
             // This is something that is not in the database, so get the album art directly
             // from the file.
-            Bitmap bm = getArtworkFromFile(context, null, -1);
-            if (bm != null) {
-                return bm;
+            if (song_id >= 0) {
+                Bitmap bm = getArtworkFromFile(context, song_id, -1);
+                if (bm != null) {
+                    return bm;
+                }
             }
-            if (allowDefault) {
-                return getDefaultArtwork(context);
-            } else {
-                return null;
-            }
+            return getDefaultArtwork(context);
         }
 
         ContentResolver res = context.getContentResolver();
@@ -898,61 +889,16 @@
             } catch (FileNotFoundException ex) {
                 // The album art thumbnail does not actually exist. Maybe the user deleted it, or
                 // maybe it never existed to begin with.
-                Bitmap bm = getArtworkFromFile(context, null, album_id);
+                Bitmap bm = getArtworkFromFile(context, song_id, album_id);
                 if (bm != null) {
                     if (bm.getConfig() == null) {
                         bm = bm.copy(Bitmap.Config.RGB_565, false);
                         if (bm == null) {
-                            if (allowDefault) {
-                                return getDefaultArtwork(context);
-                            } else {
-                                return null;
-                            }
+                            return getDefaultArtwork(context);
                         }
                     }
-                    // Put the newly found artwork in the database.
-                    // Note that this shouldn't be done for the "unknown" album,
-                    // but if this method is called correctly, that won't happen.
-                    
-                    // first write it somewhere
-                    String file = Environment.getExternalStorageDirectory()
-                        + "/albumthumbs/" + String.valueOf(System.currentTimeMillis());
-                    if (ensureFileExists(file)) {
-                        try {
-                            OutputStream outstream = new FileOutputStream(file);
-                            boolean success = bm.compress(Bitmap.CompressFormat.JPEG, 75, outstream);
-                            outstream.close();
-                            if (success) {
-                                ContentValues values = new ContentValues();
-                                values.put("album_id", album_id);
-                                values.put("_data", file);
-                                Uri newuri = res.insert(sArtworkUri, values);
-                                if (newuri == null) {
-                                    // Failed to insert in to the database. The most likely
-                                    // cause of this is that the item already existed in the
-                                    // database, and the most likely cause of that is that
-                                    // the album was scanned before, but the user deleted the
-                                    // album art from the sd card.
-                                    // We can ignore that case here, since the media provider
-                                    // will regenerate the album art for those entries when
-                                    // it detects this.
-                                    success = false;
-                                }
-                            }
-                            if (!success) {
-                                File f = new File(file);
-                                f.delete();
-                            }
-                        } catch (FileNotFoundException e) {
-                            Log.e(TAG, "error creating file", e);
-                        } catch (IOException e) {
-                            Log.e(TAG, "error creating file", e);
-                        }
-                    }
-                } else if (allowDefault) {
-                    bm = getDefaultArtwork(context);
                 } else {
-                    bm = null;
+                    bm = getDefaultArtwork(context);
                 }
                 return bm;
             } finally {
@@ -967,168 +913,39 @@
         
         return null;
     }
-
-    // copied from MediaProvider
-    private static boolean ensureFileExists(String path) {
-        File file = new File(path);
-        if (file.exists()) {
-            return true;
-        } else {
-            // we will not attempt to create the first directory in the path
-            // (for example, do not create /sdcard if the SD card is not mounted)
-            int secondSlash = path.indexOf('/', 1);
-            if (secondSlash < 1) return false;
-            String directoryPath = path.substring(0, secondSlash);
-            File directory = new File(directoryPath);
-            if (!directory.exists())
-                return false;
-            file.getParentFile().mkdirs();
-            try {
-                return file.createNewFile();
-            } catch(IOException ioe) {
-                Log.d(TAG, "File creation failed for " + path);
-            }
-            return false;
-        }
-    }
     
     // get album art for specified file
     private static final String sExternalMediaUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI.toString();
-    private static Bitmap getArtworkFromFile(Context context, Uri uri, int albumid) {
+    private static Bitmap getArtworkFromFile(Context context, long songid, long albumid) {
         Bitmap bm = null;
         byte [] art = null;
         String path = null;
 
-        if (sArtId == albumid) {
-            //Log.i("@@@@@@ ", "reusing cached data", new Exception());
-            if (mCachedBit != null) {
-                return mCachedBit;
-            }
-            art = mCachedArt;
-        } else {
-            // try reading embedded artwork
-            if (uri == null) {
-                try {
-                    int curalbum = sService.getAlbumId();
-                    if (curalbum == albumid || albumid < 0) {
-                        path = sService.getPath();
-                        if (path != null) {
-                            uri = Uri.parse(path);
-                        }
-                    }
-                } catch (RemoteException ex) {
-                    return null;
-                } catch (NullPointerException ex) {
-                    return null;
-                }
-            }
-            if (uri == null) {
-                if (albumid >= 0) {
-                    Cursor c = query(context,MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                            new String[] { MediaStore.Audio.Media._ID, MediaStore.Audio.Media.ALBUM },
-                            MediaStore.Audio.Media.ALBUM_ID + "=?", new String [] {String.valueOf(albumid)},
-                            null);
-                    if (c != null) {
-                        if (c.moveToFirst()) {
-                            int trackid = c.getInt(0);
-                            uri = ContentUris.withAppendedId(
-                                    MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, trackid);
-                            if (MediaFile.UNKNOWN_STRING.equals(c.getString(1))) {
-                                albumid = -1;
-                            }
-                        }
-                        c.close();
-                    }
-                }
-            }
-            if (uri != null) {
-                MediaScanner scanner = new MediaScanner(context);
-                ParcelFileDescriptor pfd = null;
-                try {
-                    pfd = context.getContentResolver().openFileDescriptor(uri, "r");
-                    if (pfd != null) {
-                        FileDescriptor fd = pfd.getFileDescriptor();
-                        art = scanner.extractAlbumArt(fd);
-                    }
-                } catch (IOException ex) {
-                } catch (SecurityException ex) {
-                } finally {
-                    try {
-                        if (pfd != null) {
-                            pfd.close();
-                        }
-                    } catch (IOException ex) {
-                    }
-                }
-            }
+        if (albumid < 0 && songid < 0) {
+            throw new IllegalArgumentException("Must specify an album or a song id");
         }
-        // if no embedded art exists, look for AlbumArt.jpg in same directory as the media file
-        if (art == null && path != null) {
-            if (path.startsWith(sExternalMediaUri)) {
-                // get the real path
-                Cursor c = query(context,Uri.parse(path),
-                        new String[] { MediaStore.Audio.Media.DATA},
-                        null, null, null);
-                if (c != null) {
-                    c.moveToFirst();
-                    if (!c.isAfterLast()) {
-                        path = c.getString(0);
-                    }
-                    c.close();
+
+        try {
+            if (albumid < 0) {
+                Uri uri = Uri.parse("content://media/external/audio/media/" + songid + "/albumart");
+                ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "r");
+                if (pfd != null) {
+                    FileDescriptor fd = pfd.getFileDescriptor();
+                    bm = BitmapFactory.decodeFileDescriptor(fd);
+                }
+            } else {
+                Uri uri = ContentUris.withAppendedId(sArtworkUri, albumid);
+                ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "r");
+                if (pfd != null) {
+                    FileDescriptor fd = pfd.getFileDescriptor();
+                    bm = BitmapFactory.decodeFileDescriptor(fd);
                 }
             }
-            int lastSlash = path.lastIndexOf('/');
-            if (lastSlash > 0) {
-                String artPath = path.substring(0, lastSlash + 1) + "AlbumArt.jpg";
-                File file = new File(artPath);
-                if (file.exists()) {
-                    art = new byte[(int)file.length()];
-                    FileInputStream stream = null;
-                    try {
-                        stream = new FileInputStream(file);
-                        stream.read(art);
-                    } catch (IOException ex) {
-                        art = null;
-                    } finally {
-                        try {
-                            if (stream != null) {
-                                stream.close();
-                            }
-                        } catch (IOException ex) {
-                        }
-                    }
-                } else {
-                    // TODO: try getting album art from the web
-                }
-            }
+        } catch (FileNotFoundException ex) {
+            //
         }
-        
-        if (art != null) {
-            try {
-                // get the size of the bitmap
-                BitmapFactory.Options opts = new BitmapFactory.Options();
-                opts.inJustDecodeBounds = true;
-                opts.inSampleSize = 1;
-                BitmapFactory.decodeByteArray(art, 0, art.length, opts);
-                
-                // request a reasonably sized output image
-                // TODO: don't hardcode the size
-                while (opts.outHeight > 320 || opts.outWidth > 320) {
-                    opts.outHeight /= 2;
-                    opts.outWidth /= 2;
-                    opts.inSampleSize *= 2;
-                }
-                
-                // get the image for real now
-                opts.inJustDecodeBounds = false;
-                bm = BitmapFactory.decodeByteArray(art, 0, art.length, opts);
-                if (albumid != -1) {
-                    sArtId = albumid;
-                }
-                mCachedArt = art;
-                mCachedBit = bm;
-            } catch (Exception e) {
-            }
+        if (bm != null) {
+            mCachedBit = bm;
         }
         return bm;
     }
diff --git a/src/com/android/music/PlaylistBrowserActivity.java b/src/com/android/music/PlaylistBrowserActivity.java
index da934b2..d85f07d 100644
--- a/src/com/android/music/PlaylistBrowserActivity.java
+++ b/src/com/android/music/PlaylistBrowserActivity.java
@@ -100,7 +100,7 @@
                     } else if (id == PODCASTS_PLAYLIST) {
                         playPodcasts();
                     } else if (id == ALL_SONGS_PLAYLIST) {
-                        int [] list = MusicUtils.getAllSongs(PlaylistBrowserActivity.this);
+                        long [] list = MusicUtils.getAllSongs(PlaylistBrowserActivity.this);
                         if (list != null) {
                             MusicUtils.playAll(PlaylistBrowserActivity.this, list, 0);
                         }
@@ -384,10 +384,10 @@
         }
         try {
             int len = cursor.getCount();
-            int [] list = new int[len];
+            long [] list = new long[len];
             for (int i = 0; i < len; i++) {
                 cursor.moveToNext();
-                list[i] = cursor.getInt(0);
+                list[i] = cursor.getLong(0);
             }
             MusicUtils.playAll(this, list, 0);
         } catch (SQLiteException ex) {
@@ -409,10 +409,10 @@
         }
         try {
             int len = cursor.getCount();
-            int [] list = new int[len];
+            long [] list = new long[len];
             for (int i = 0; i < len; i++) {
                 cursor.moveToNext();
-                list[i] = cursor.getInt(0);
+                list[i] = cursor.getLong(0);
             }
             MusicUtils.playAll(this, list, 0);
         } catch (SQLiteException ex) {
diff --git a/src/com/android/music/QueryBrowserActivity.java b/src/com/android/music/QueryBrowserActivity.java
index a67790a..99fae16 100644
--- a/src/com/android/music/QueryBrowserActivity.java
+++ b/src/com/android/music/QueryBrowserActivity.java
@@ -100,7 +100,7 @@
             if (path.startsWith("content://media/external/audio/media/")) {
                 // This is a specific file
                 String id = uri.getLastPathSegment();
-                int [] list = new int[] { Integer.valueOf(id) };
+                long [] list = new long[] { Long.valueOf(id) };
                 MusicUtils.playAll(this, list, 0);
                 finish();
                 return;
@@ -254,7 +254,7 @@
             intent.putExtra("album", Long.valueOf(id).toString());
             startActivity(intent);
         } else if (position >= 0 && id >= 0){
-            int [] list = new int[] { (int) id };
+            long [] list = new long[] { id };
             MusicUtils.playAll(this, list, 0);
         } else {
             Log.e("QueryBrowser", "invalid position/id: " + position + "/" + id);
diff --git a/src/com/android/music/RepeatingImageButton.java b/src/com/android/music/RepeatingImageButton.java
index 08c951c..b4e7733 100644
--- a/src/com/android/music/RepeatingImageButton.java
+++ b/src/com/android/music/RepeatingImageButton.java
@@ -82,6 +82,19 @@
     }
 
     @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_DPAD_CENTER:
+            case KeyEvent.KEYCODE_ENTER:
+                // need to call super to make long press work, but return
+                // true so that the application doesn't get the down event.
+                super.onKeyDown(keyCode, event);
+                return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
         switch (keyCode) {
         case KeyEvent.KEYCODE_DPAD_CENTER:
diff --git a/src/com/android/music/TouchInterceptor.java b/src/com/android/music/TouchInterceptor.java
index 4276b7b..8476011 100644
--- a/src/com/android/music/TouchInterceptor.java
+++ b/src/com/android/music/TouchInterceptor.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
@@ -32,7 +33,6 @@
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.widget.AdapterView;
 import android.widget.ImageView;
-import android.widget.ListAdapter;
 import android.widget.ListView;
 
 public class TouchInterceptor extends ListView {
@@ -57,12 +57,17 @@
     private Rect mTempRect = new Rect();
     private Bitmap mDragBitmap;
     private final int mTouchSlop;
+    private int mItemHeightNormal;
+    private int mItemHeightExpanded;
 
     public TouchInterceptor(Context context, AttributeSet attrs) {
         super(context, attrs);
         SharedPreferences pref = context.getSharedPreferences("Music", 3);
         mRemoveMode = pref.getInt("deletemode", -1);
         mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
+        Resources res = getResources();
+        mItemHeightNormal = res.getDimensionPixelSize(R.dimen.normal_height);
+        mItemHeightExpanded = res.getDimensionPixelSize(R.dimen.expanded_height);
     }
     
     @Override
@@ -107,7 +112,8 @@
                     View dragger = item.findViewById(R.id.icon);
                     Rect r = mTempRect;
                     dragger.getDrawingRect(r);
-                    if (x < r.right) {
+                    // The dragger icon itself is quite small, so pretend the touch area is bigger
+                    if (x < r.right * 2) {
                         item.setDrawingCacheEnabled(true);
                         // Create a copy of the drawing cache so that it does not get recycled
                         // by the framework when the list tries to clean up memory
@@ -189,7 +195,7 @@
                 }
             }
             ViewGroup.LayoutParams params = v.getLayoutParams();
-            params.height = 64;
+            params.height = mItemHeightNormal;
             v.setLayoutParams(params);
             v.setVisibility(View.VISIBLE);
         }
@@ -220,7 +226,7 @@
             if (vv == null) {
                 break;
             }
-            int height = 64;
+            int height = mItemHeightNormal;
             int visibility = View.VISIBLE;
             if (vv.equals(first)) {
                 // processing the item that is being dragged
@@ -233,7 +239,7 @@
                 }
             } else if (i == childnum) {
                 if (mDragPos < getCount() - 1) {
-                    height = 128;
+                    height = mItemHeightExpanded;
                 }
             }
             ViewGroup.LayoutParams params = vv.getLayoutParams();
diff --git a/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 1f1adf6..e4e1543 100644
--- a/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
@@ -144,7 +144,8 @@
                 MediaStore.Audio.Media.ARTIST_ID,
                 MediaStore.Audio.Media.DURATION,
                 MediaStore.Audio.Playlists.Members.PLAY_ORDER,
-                MediaStore.Audio.Playlists.Members.AUDIO_ID
+                MediaStore.Audio.Playlists.Members.AUDIO_ID,
+                MediaStore.Audio.Media.IS_MUSIC
         };
 
         setContentView(R.layout.media_picker_activity);
@@ -189,7 +190,7 @@
                     !(mPlaylist.equals("podcasts") || mPlaylist.equals("recentlyadded")));
             setListAdapter(mAdapter);
             setTitle(R.string.working_songs);
-            getTrackCursor(mAdapter.getQueryHandler(), null);
+            getTrackCursor(mAdapter.getQueryHandler(), null, true);
         } else {
             mTrackCursor = mAdapter.getCursor();
             // If mTrackCursor is null, this can be because it doesn't have
@@ -202,7 +203,7 @@
                 init(mTrackCursor);
             } else {
                 setTitle(R.string.working_songs);
-                getTrackCursor(mAdapter.getQueryHandler(), null);
+                getTrackCursor(mAdapter.getQueryHandler(), null, true);
             }
         }
     }
@@ -291,7 +292,7 @@
     private Handler mReScanHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            getTrackCursor(mAdapter.getQueryHandler(), null);
+            getTrackCursor(mAdapter.getQueryHandler(), null, true);
             // if the query results in a null cursor, onQueryComplete() will
             // call init(), which will post a delayed message to this handler
             // in order to try again.
@@ -462,7 +463,7 @@
                 if (from < to) {
                     // move the item to somewhere later in the list
                     mTrackCursor.moveToPosition(to);
-                    int toidx = mTrackCursor.getInt(colidx);
+                    long toidx = mTrackCursor.getLong(colidx);
                     mTrackCursor.moveToPosition(from);
                     values.put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, toidx);
                     wherearg[0] = mTrackCursor.getString(0);
@@ -476,7 +477,7 @@
                 } else if (from > to) {
                     // move the item to somewhere earlier in the list
                     mTrackCursor.moveToPosition(to);
-                    int toidx = mTrackCursor.getInt(colidx);
+                    long toidx = mTrackCursor.getLong(colidx);
                     mTrackCursor.moveToPosition(from);
                     values.put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, toidx);
                     wherearg[0] = mTrackCursor.getString(0);
@@ -558,6 +559,33 @@
         }
     };
 
+    // Cursor should be positioned on the entry to be checked
+    // Returns false if the entry matches the naming pattern used for recordings,
+    // or if it is marked as not music in the database.
+    private boolean isMusic(Cursor c) {
+        int titleidx = c.getColumnIndex(MediaStore.Audio.Media.TITLE);
+        int albumidx = c.getColumnIndex(MediaStore.Audio.Media.ALBUM);
+        int artistidx = c.getColumnIndex(MediaStore.Audio.Media.ARTIST);
+
+        String title = c.getString(titleidx);
+        String album = c.getString(albumidx);
+        String artist = c.getString(artistidx);
+        if (MediaFile.UNKNOWN_STRING.equals(album) &&
+                MediaFile.UNKNOWN_STRING.equals(artist) &&
+                title != null &&
+                title.startsWith("recording")) {
+            // not music
+            return false;
+        }
+
+        int ismusic_idx = c.getColumnIndex(MediaStore.Audio.Media.IS_MUSIC);
+        boolean ismusic = true;
+        if (ismusic_idx >= 0) {
+            ismusic = mTrackCursor.getInt(ismusic_idx) != 0;
+        }
+        return ismusic;
+    }
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfoIn) {
         menu.add(0, PLAY_SELECTION, 0, R.string.play_selection);
@@ -568,17 +596,20 @@
         }
         menu.add(0, USE_AS_RINGTONE, 0, R.string.ringtone_menu);
         menu.add(0, DELETE_ITEM, 0, R.string.delete_item);
-        menu.add(0, SEARCH, 0, R.string.search_title);
         AdapterContextMenuInfo mi = (AdapterContextMenuInfo) menuInfoIn;
         mSelectedPosition =  mi.position;
         mTrackCursor.moveToPosition(mSelectedPosition);
         try {
             int id_idx = mTrackCursor.getColumnIndexOrThrow(
                     MediaStore.Audio.Playlists.Members.AUDIO_ID);
-            mSelectedId = mTrackCursor.getInt(id_idx);
+            mSelectedId = mTrackCursor.getLong(id_idx);
         } catch (IllegalArgumentException ex) {
             mSelectedId = mi.id;
         }
+        // only add the 'search' menu if the selected item is music
+        if (isMusic(mTrackCursor)) {
+            menu.add(0, SEARCH, 0, R.string.search_title);
+        }
         mCurrentAlbumName = mTrackCursor.getString(mTrackCursor.getColumnIndexOrThrow(
                 MediaStore.Audio.Media.ALBUM));
         mCurrentArtistNameForAlbum = mTrackCursor.getString(mTrackCursor.getColumnIndexOrThrow(
@@ -599,7 +630,7 @@
             }
 
             case QUEUE: {
-                int [] list = new int[] { (int) mSelectedId };
+                long [] list = new long[] { mSelectedId };
                 MusicUtils.addToCurrentPlaylist(this, list);
                 return true;
             }
@@ -612,8 +643,8 @@
             }
 
             case PLAYLIST_SELECTED: {
-                int [] list = new int[] { (int) mSelectedId };
-                int playlist = item.getIntent().getIntExtra("playlist", 0);
+                long [] list = new long[] { mSelectedId };
+                long playlist = item.getIntent().getLongExtra("playlist", 0);
                 MusicUtils.addToPlaylist(this, list, playlist);
                 return true;
             }
@@ -624,13 +655,13 @@
                 return true;
 
             case DELETE_ITEM: {
-                int [] list = new int[1];
+                long [] list = new long[1];
                 list[0] = (int) mSelectedId;
                 Bundle b = new Bundle();
                 String f = getString(R.string.delete_song_desc); 
                 String desc = String.format(f, mCurrentTrackName);
                 b.putString("description", desc);
-                b.putIntArray("items", list);
+                b.putLongArray("items", list);
                 Intent intent = new Intent();
                 intent.setClass(this, DeleteItems.class);
                 intent.putExtras(b);
@@ -869,7 +900,7 @@
                 if (resultCode == RESULT_CANCELED) {
                     finish();
                 } else {
-                    getTrackCursor(mAdapter.getQueryHandler(), null);
+                    getTrackCursor(mAdapter.getQueryHandler(), null, true);
                 }
                 break;
                 
@@ -877,7 +908,7 @@
                 if (resultCode == RESULT_OK) {
                     Uri uri = intent.getData();
                     if (uri != null) {
-                        int [] list = new int[] { (int) mSelectedId };
+                        long [] list = new long[] { mSelectedId };
                         MusicUtils.addToPlaylist(this, list, Integer.valueOf(uri.getLastPathSegment()));
                     }
                 }
@@ -887,7 +918,7 @@
                 if (resultCode == RESULT_OK) {
                     Uri uri = intent.getData();
                     if (uri != null) {
-                        int [] list = MusicUtils.getSongListForCursor(mTrackCursor);
+                        long [] list = MusicUtils.getSongListForCursor(mTrackCursor);
                         int plid = Integer.parseInt(uri.getLastPathSegment());
                         MusicUtils.addToPlaylist(this, list, plid);
                     }
@@ -896,12 +927,18 @@
         }
     }
     
-    private Cursor getTrackCursor(AsyncQueryHandler async, String filter) {
+    private Cursor getTrackCursor(TrackListAdapter.TrackQueryHandler queryhandler, String filter,
+            boolean async) {
+
+        if (queryhandler == null) {
+            throw new IllegalArgumentException();
+        }
+
         Cursor ret = null;
         mSortOrder = MediaStore.Audio.Media.TITLE_KEY;
         StringBuilder where = new StringBuilder();
         where.append(MediaStore.Audio.Media.TITLE + " != ''");
-        
+
         // Add in the filtering constraints
         String [] keywords = null;
         if (filter != null) {
@@ -921,17 +958,9 @@
         
         if (mGenre != null) {
             mSortOrder = MediaStore.Audio.Genres.Members.DEFAULT_SORT_ORDER;
-            if (async != null) {
-                async.startQuery(0, null,
-                        MediaStore.Audio.Genres.Members.getContentUri("external",
-                        Integer.valueOf(mGenre)),
-                        mCursorCols, where.toString(), keywords, mSortOrder);
-                ret = null;
-            } else {
-                ret = MusicUtils.query(this,
-                        MediaStore.Audio.Genres.Members.getContentUri("external", Integer.valueOf(mGenre)),
-                        mCursorCols, where.toString(), keywords, mSortOrder);
-            }
+            ret = queryhandler.doQuery(MediaStore.Audio.Genres.Members.getContentUri("external",
+                    Integer.valueOf(mGenre)),
+                    mCursorCols, where.toString(), keywords, mSortOrder, async);
         } else if (mPlaylist != null) {
             if (mPlaylist.equals("nowplaying")) {
                 if (MusicUtils.sService != null) {
@@ -944,43 +973,22 @@
                 }
             } else if (mPlaylist.equals("podcasts")) {
                 where.append(" AND " + MediaStore.Audio.Media.IS_PODCAST + "=1");
-                if (async != null) {
-                    async.startQuery(0, null,
-                            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, mCursorCols,
-                            where.toString(), keywords, MediaStore.Audio.Media.DEFAULT_SORT_ORDER);
-                    ret = null;
-                 } else {
-                    ret = MusicUtils.query(this,
-                            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, mCursorCols,
-                            where.toString(), keywords, MediaStore.Audio.Media.DEFAULT_SORT_ORDER);
-                }
+                ret = queryhandler.doQuery(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                        mCursorCols, where.toString(), keywords,
+                        MediaStore.Audio.Media.DEFAULT_SORT_ORDER, async);
             } else if (mPlaylist.equals("recentlyadded")) {
                 // do a query for all songs added in the last X weeks
                 int X = MusicUtils.getIntPref(this, "numweeks", 2) * (3600 * 24 * 7);
                 where.append(" AND " + MediaStore.MediaColumns.DATE_ADDED + ">");
                 where.append(System.currentTimeMillis() / 1000 - X);
-                if (async != null) {
-                    async.startQuery(0, null,
-                            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, mCursorCols,
-                            where.toString(), keywords, MediaStore.Audio.Media.DEFAULT_SORT_ORDER);
-                    ret = null;
-                 } else {
-                    ret = MusicUtils.query(this,
-                            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, mCursorCols,
-                            where.toString(), keywords, MediaStore.Audio.Media.DEFAULT_SORT_ORDER);
-                }
+                ret = queryhandler.doQuery(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                        mCursorCols, where.toString(), keywords,
+                        MediaStore.Audio.Media.DEFAULT_SORT_ORDER, async);
             } else {
                 mSortOrder = MediaStore.Audio.Playlists.Members.DEFAULT_SORT_ORDER;
-                if (async != null) {
-                    async.startQuery(0, null,
-                            MediaStore.Audio.Playlists.Members.getContentUri("external", Long.valueOf(mPlaylist)),
-                            mPlaylistMemberCols, where.toString(), keywords, mSortOrder);
-                    ret = null;
-                } else {
-                    ret = MusicUtils.query(this,
-                            MediaStore.Audio.Playlists.Members.getContentUri("external", Long.valueOf(mPlaylist)),
-                            mPlaylistMemberCols, where.toString(), keywords, mSortOrder);
-                }
+                ret = queryhandler.doQuery(MediaStore.Audio.Playlists.Members.getContentUri("external",
+                        Long.valueOf(mPlaylist)), mPlaylistMemberCols,
+                        where.toString(), keywords, mSortOrder, async);
             }
         } else {
             if (mAlbumId != null) {
@@ -991,20 +999,13 @@
                 where.append(" AND " + MediaStore.Audio.Media.ARTIST_ID + "=" + mArtistId);
             }
             where.append(" AND " + MediaStore.Audio.Media.IS_MUSIC + "=1");
-            if (async != null) {
-                async.startQuery(0, null,
-                        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                        mCursorCols, where.toString() , keywords, mSortOrder);
-                ret = null;
-            } else {
-                ret = MusicUtils.query(this, MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                        mCursorCols, where.toString() , keywords, mSortOrder);
-            }
+            ret = queryhandler.doQuery(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                    mCursorCols, where.toString() , keywords, mSortOrder, async);
         }
         
         // This special case is for the "nowplaying" cursor, which cannot be handled
         // asynchronously using AsyncQueryHandler, so we do some extra initialization here.
-        if (ret != null && async != null) {
+        if (ret != null && async) {
             init(ret);
             setTitle();
         }
@@ -1024,7 +1025,7 @@
             try {
                 mNowPlaying = mService.getQueue();
             } catch (RemoteException ex) {
-                mNowPlaying = new int[0];
+                mNowPlaying = new long[0];
             }
             mSize = mNowPlaying.length;
             if (mSize == 0) {
@@ -1051,11 +1052,11 @@
             }
             
             int size = mCurrentPlaylistCursor.getCount();
-            mCursorIdxs = new int[size];
+            mCursorIdxs = new long[size];
             mCurrentPlaylistCursor.moveToFirst();
             int colidx = mCurrentPlaylistCursor.getColumnIndexOrThrow(MediaStore.Audio.Media._ID);
             for (int i = 0; i < size; i++) {
-                mCursorIdxs[i] = mCurrentPlaylistCursor.getInt(colidx);
+                mCursorIdxs[i] = mCurrentPlaylistCursor.getLong(colidx);
                 mCurrentPlaylistCursor.moveToNext();
             }
             mCurrentPlaylistCursor.moveToFirst();
@@ -1068,7 +1069,7 @@
             try {
                 int removed = 0;
                 for (int i = mNowPlaying.length - 1; i >= 0; i--) {
-                    int trackid = mNowPlaying[i];
+                    long trackid = mNowPlaying[i];
                     int crsridx = Arrays.binarySearch(mCursorIdxs, trackid);
                     if (crsridx < 0) {
                         //Log.i("@@@@@", "item no longer exists in db: " + trackid);
@@ -1084,7 +1085,7 @@
                     }
                 }
             } catch (RemoteException ex) {
-                mNowPlaying = new int[0];
+                mNowPlaying = new long[0];
             }
         }
 
@@ -1108,7 +1109,7 @@
             // in queue-order, so we need to figure out where in the cursor we
             // should be.
            
-            int newid = mNowPlaying[newPosition];
+            long newid = mNowPlaying[newPosition];
             int crsridx = Arrays.binarySearch(mCursorIdxs, newid);
             mCurrentPlaylistCursor.moveToPosition(crsridx);
             mCurPos = newPosition;
@@ -1235,8 +1236,8 @@
         private String [] mCols;
         private Cursor mCurrentPlaylistCursor;     // updated in onMove
         private int mSize;          // size of the queue
-        private int[] mNowPlaying;
-        private int[] mCursorIdxs;
+        private long[] mNowPlaying;
+        private long[] mCursorIdxs;
         private int mCurPos;
         private IMediaPlaybackService mService;
     }
@@ -1257,7 +1258,7 @@
         private AlphabetIndexer mIndexer;
         
         private TrackBrowserActivity mActivity = null;
-        private AsyncQueryHandler mQueryHandler;
+        private TrackQueryHandler mQueryHandler;
         private String mConstraint = null;
         private boolean mConstraintIsValid = false;
         
@@ -1270,15 +1271,50 @@
             char [] buffer2;
         }
 
-        class QueryHandler extends AsyncQueryHandler {
-            QueryHandler(ContentResolver res) {
+        class TrackQueryHandler extends AsyncQueryHandler {
+
+            class QueryArgs {
+                public Uri uri;
+                public String [] projection;
+                public String selection;
+                public String [] selectionArgs;
+                public String orderBy;
+            }
+
+            TrackQueryHandler(ContentResolver res) {
                 super(res);
             }
             
+            public Cursor doQuery(Uri uri, String[] projection,
+                    String selection, String[] selectionArgs,
+                    String orderBy, boolean async) {
+                if (async) {
+                    // Get 100 results first, which is enough to allow the user to start scrolling,
+                    // while still being very fast.
+                    Uri limituri = uri.buildUpon().appendQueryParameter("limit", "100").build();
+                    QueryArgs args = new QueryArgs();
+                    args.uri = uri;
+                    args.projection = projection;
+                    args.selection = selection;
+                    args.selectionArgs = selectionArgs;
+                    args.orderBy = orderBy;
+
+                    startQuery(0, args, limituri, projection, selection, selectionArgs, orderBy);
+                    return null;
+                }
+                return MusicUtils.query(mActivity,
+                        uri, projection, selection, selectionArgs, orderBy);
+            }
+
             @Override
             protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
                 //Log.i("@@@", "query complete: " + cursor.getCount() + "   " + mActivity);
                 mActivity.init(cursor);
+                if (token == 0 && cookie != null && cursor != null && cursor.getCount() >= 100) {
+                    QueryArgs args = (QueryArgs) cookie;
+                    startQuery(1, null, args.uri, args.projection, args.selection,
+                            args.selectionArgs, args.orderBy);
+                }
             }
         }
         
@@ -1293,14 +1329,14 @@
             mUnknownArtist = context.getString(R.string.unknown_artist_name);
             mUnknownAlbum = context.getString(R.string.unknown_album_name);
             
-            mQueryHandler = new QueryHandler(context.getContentResolver());
+            mQueryHandler = new TrackQueryHandler(context.getContentResolver());
         }
         
         public void setActivity(TrackBrowserActivity newactivity) {
             mActivity = newactivity;
         }
         
-        public AsyncQueryHandler getQueryHandler() {
+        public TrackQueryHandler getQueryHandler() {
             return mQueryHandler;
         }
         
@@ -1381,7 +1417,7 @@
             vh.line2.setText(vh.buffer2, 0, len);
 
             ImageView iv = vh.play_indicator;
-            int id = -1;
+            long id = -1;
             if (MusicUtils.sService != null) {
                 // TODO: IPC call on each bind??
                 try {
@@ -1406,7 +1442,7 @@
             // playlist mode (except when you're viewing the "current playlist",
             // which is not really a playlist)
             if ( (mIsNowPlaying && cursor.getPosition() == id) ||
-                 (!mIsNowPlaying && !mDisableNowPlayingIndicator && cursor.getInt(mAudioIdIdx) == id)) {
+                 (!mIsNowPlaying && !mDisableNowPlayingIndicator && cursor.getLong(mAudioIdIdx) == id)) {
                 iv.setImageResource(R.drawable.indicator_ic_mp_playing_list);
                 iv.setVisibility(View.VISIBLE);
             } else {
@@ -1431,7 +1467,7 @@
                     (s != null && s.equals(mConstraint)))) {
                 return getCursor();
             }
-            Cursor c = mActivity.getTrackCursor(null, s);
+            Cursor c = mActivity.getTrackCursor(mQueryHandler, s, false);
             mConstraint = s;
             mConstraintIsValid = true;
             return c;