diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index c930048..9f38b41 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -135,7 +135,7 @@
     <string name="videobrowserlabel" msgid="8522326678447494657">"ቪዲዮዎች"</string>
     <string name="mediapickerlabel" msgid="4549836003229914299">"ሙዚቃ"</string>
     <string name="playback_failed" msgid="3811851150820251398">"ይቅርታ፣ ማጫወቻው የዚህ አይነት የኦዲዮ ፋይል አይደግፍም።"</string>
-    <string name="cancel" msgid="886559484711947520">"ሰርዝ"</string>
+    <string name="cancel" msgid="886559484711947520">"ይቅር"</string>
     <string name="remove_from_playlist" msgid="2548577514849026354">"ከጨዋታዝርዝር አስወግድ"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"ወደ<xliff:g id="HOST">%s</xliff:g> በማገናኘት ላይ"</string>
     <string name="mediasearch" msgid="959222971261132292">" ለ<xliff:g id="TERM">%s</xliff:g> በመጠቀም ፈልግ"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 5e6acca..b8033fd 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -30,7 +30,7 @@
     <item quantity="one" msgid="3798955510439465932">"1 album"</item>
     <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albummer"</item>
   </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Samling"</string>
+    <string name="goto_start" msgid="8979658707407220934">"Bibliotek"</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>
diff --git a/res/values-el-keysexposed/strings.xml b/res/values-el-keysexposed/strings.xml
index 0c0b8a3..cf1b921 100644
--- a/res/values-el-keysexposed/strings.xml
+++ b/res/values-el-keysexposed/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Όνομα playlist"</string>
+    <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Όνομα λίστας αναπαραγωγής"</string>
     <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Μετονομασία της λίστας αναπαραγωγής \"<xliff:g id="PLAYLIST">%s</xliff:g>\" σε"</string>
     <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Μετονομασία της λίστας αναπαραγωγής \"<xliff:g id="PLAYLIST">%s</xliff:g>\" σε"</string>
 </resources>
diff --git a/res/values-el-keyshidden/strings.xml b/res/values-el-keyshidden/strings.xml
index f80d654..f6ae4d3 100644
--- a/res/values-el-keyshidden/strings.xml
+++ b/res/values-el-keyshidden/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Ανοίξτε το πληκτρολόγιο για να δώσετε στο νέο playlist ένα όνομα ή επιλέξτε Αποθήκευση για να το ονομάσετε \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Ανοίξτε το πληκτρολόγιο για να δώσετε στο playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ένα νέο όνομα."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Ανοίξτε το πληκτρολόγιο για να δώσετε στο playlist \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" ένα νέο όνομα ή επιλέξτε Αποθήκευση για να το ονομάσετε \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
+    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Ανοίξτε το πληκτρολόγιο για να δώσετε στην νέα λίστα αναπαραγωγής ένα όνομα ή επιλέξτε Αποθήκευση για να την ονομάσετε \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
+    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Ανοίξτε το πληκτρολόγιο για να δώσετε στη λίστα αναπαραγωγής \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ένα νέο όνομα."</string>
+    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Ανοίξτε το πληκτρολόγιο για να δώσετε στη λίστα αναπαραγωγής \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" ένα νέο όνομα ή επιλέξτε Αποθήκευση για να την ονομάσετε \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index b4f4b6e..cfaf561 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -68,8 +68,8 @@
     <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">"Το playlist διαγράφηκε."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Μετονομασία playlist."</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>
@@ -97,15 +97,15 @@
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Χρήση ως ήχος κλήσης"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"Ορισμός του \"<xliff:g id="NAME">%s</xliff:g>\" ως ήχο κλήσης του τηλεφώνου."</string>
     <string name="play_selection" msgid="2854921021814550018">"Αναπαραγωγή"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Προσθ. σε playlist"</string>
-    <string name="queue" msgid="2937629819482787704">"Τρέχον playlist"</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">"Νέο playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="new_playlist_name_template" msgid="905710296728900597">"Νέα λίστα αναπαραγωγής <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 τραγούδι προστέθηκε στο playlist."</item>
-    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> τραγούδια προστέθηκαν στο playlist."</item>
+    <item quantity="one" msgid="422388042993582235">"1 τραγούδι προστέθηκε στη λίστα αναπαραγωγής."</item>
+    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> τραγούδια προστέθηκαν στη λίστα αναπαραγωγής."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Το playlist που επιλέξατε είναι κενό."</string>
+    <string name="emptyplaylist" msgid="6711555673997896344">"Η λίστα αναπαραγωγής που επιλέξατε είναι κενή."</string>
     <string name="create_playlist_create_text" msgid="8149755205483279143">"Αποθ/ση"</string>
     <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Αντικατάσταση"</string>
     <string name="service_start_error_title" msgid="8649916852210198813">"Πρόβλημα αναπαραγωγής"</string>
@@ -127,16 +127,16 @@
   </string-array>
     <string name="weekpicker_set" msgid="7636608790418067496">"Τέλος"</string>
     <string name="weekpicker_title" msgid="699535378922101701">"Ρύθμιση ώρας"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Αποθ. playlist."</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Εκκαθ. playlist"</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">"Το playlist της μουσικής"</string>
+    <string name="musicshortcutlabel" msgid="2602980193508150226">"Λίστα αναπαραγωγής μουσικής"</string>
     <string name="mediaplaybacklabel" msgid="6733604841530940397">"Μουσική"</string>
     <string name="videobrowserlabel" msgid="8522326678447494657">"Βίντεο"</string>
     <string name="mediapickerlabel" msgid="4549836003229914299">"Μουσική"</string>
     <string name="playback_failed" msgid="3811851150820251398">"Λυπούμαστε, το πρόγραμμα αναπαραγωγής δεν υποστηρίζει αυτόν τον τύπο αρχείου ήχου."</string>
     <string name="cancel" msgid="886559484711947520">"Ακύρωση"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Κατάργηση από το playlist"</string>
+    <string name="remove_from_playlist" msgid="2548577514849026354">"Κατάργηση από τη λίστα αναπαραγωγής"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"Σύνδεση σε <xliff:g id="HOST">%s</xliff:g>..."</string>
     <string name="mediasearch" msgid="959222971261132292">"Αναζήτηση του όρου \"<xliff:g id="TERM">%s</xliff:g>\" με χρήση:"</string>
     <string name="working_artists" msgid="8678357432732156580">"Καλλιτέχνες..."</string>
diff --git a/res/values-en-rIN-keysexposed/strings.xml b/res/values-en-rIN-keysexposed/strings.xml
deleted file mode 100644
index 914b59f..0000000
--- a/res/values-en-rIN-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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">"Playlist name"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Rename \"<xliff:g id="PLAYLIST">%s</xliff:g>\" to"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Rename \"<xliff:g id="PLAYLIST">%s</xliff:g>\" to"</string>
-</resources>
diff --git a/res/values-en-rIN-keyshidden/strings.xml b/res/values-en-rIN-keyshidden/strings.xml
deleted file mode 100644
index 46a835a..0000000
--- a/res/values-en-rIN-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Open the keyboard to give your new Playlist a name or select Save to name it \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Open the keyboard to give playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\" a new name."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Open the keyboard to give playlist \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" a new name or select Save to name it \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
-</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
deleted file mode 100644
index 51360a2..0000000
--- a/res/values-en-rIN/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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 song"</string>
-  <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> songs"</item>
-  </plurals>
-  <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> of <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> songs"</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>
-  </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Library"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Party shuffle"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Party shuffle off"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Delete"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Shuffle all"</string>
-    <string name="play_all" msgid="6309622568869321842">"Play all"</string>
-    <string name="delete_artist_desc" msgid="8665759524898379194">"Permanently delete all songs by <xliff:g id="ARTIST">%s</xliff:g> from the SD card?"</string>
-    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Permanently delete all songs by <xliff:g id="ARTIST">%s</xliff:g> from USB storage?"</string>
-    <string name="delete_album_desc" msgid="8172412873562794429">"Permanently delete the entire album \"<xliff:g id="ALBUM">%s</xliff:g>\" from the SD card?"</string>
-    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Permanently delete the entire album \"<xliff:g id="ALBUM">%s</xliff:g>\" from USB storage?"</string>
-    <string name="delete_song_desc" msgid="1842681623848282205">"Permanently delete \"<xliff:g id="SONG">%s</xliff:g>\" from the SD card?"</string>
-    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Permanently delete \"<xliff:g id="SONG">%s</xliff:g>\" from USB storage?"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 song was deleted."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> songs were deleted."</item>
-  </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Scanning SD card…"</string>
-    <string name="scanning_nosdcard" msgid="8105284774487360148">"Scanning USB storage…"</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Now playing"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Party shuffle"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artists"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Albums"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Albums"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Songs"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Songs"</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">"All media"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artists"</string>
-    <string name="search_title" msgid="1016971653383739344">"Search"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"No songs"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"No videos"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"No playlists"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Delete"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Edit"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Rename"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Playlist deleted."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Playlist renamed."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Recently added"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Recently added"</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 SD card"</string>
-    <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"No USB storage"</string>
-    <string name="sdcard_missing_message" msgid="2100061456003981823">"Your phone doesn\'t have an SD card inserted."</string>
-    <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Your phone doesn\'t have USB storage."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD card unavailable"</string>
-    <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"USB storage unavailable"</string>
-    <string name="sdcard_busy_message" msgid="579981082201215537">"Your SD card is busy."</string>
-    <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"Your USB storage is busy."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD card error"</string>
-    <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB storage error"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"An error was encountered on your SD card."</string>
-    <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"An error was encountered on your USB storage."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Unknown artist"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Unknown album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Shuffle is on."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Shuffle is off."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Repeat is off."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Repeating current song."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Repeating all songs."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Use as phone ringtone"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Use as ringtone"</string>
-    <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" set as phone ringtone."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Play"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Add to playlist"</string>
-    <string name="queue" msgid="2937629819482787704">"Current playlist"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"New"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"New playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 song added to playlist."</item>
-    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> songs added to playlist."</item>
-  </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Selected playlist is empty."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Save"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Overwrite"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Playback problem"</string>
-    <string name="service_start_error_msg" msgid="7061754255330276478">"The song couldn\'t be played."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
-  <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 week"</item>
-    <item msgid="7487749116155425822">"2 weeks"</item>
-    <item msgid="1565338360539555185">"3 weeks"</item>
-    <item msgid="2142986059836933072">"4 weeks"</item>
-    <item msgid="4332403875260507291">"5 weeks"</item>
-    <item msgid="3847281907869868565">"6 weeks"</item>
-    <item msgid="2942654998558867799">"7 weeks"</item>
-    <item msgid="2115529325850052227">"8 weeks"</item>
-    <item msgid="1396675336665198092">"9 weeks"</item>
-    <item msgid="3178819129208998649">"10 weeks"</item>
-    <item msgid="2727959579637914171">"11 weeks"</item>
-    <item msgid="8708754966127584739">"12 weeks"</item>
-  </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Done"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Set time"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Save as playlist"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Clear playlist"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Music"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Music playlist"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Music"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videos"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Music"</string>
-    <string name="playback_failed" msgid="3811851150820251398">"The player doesn\'t support this type of audio file."</string>
-    <string name="cancel" msgid="886559484711947520">"Cancel"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Remove from playlist"</string>
-    <string name="streamloadingtext" msgid="8842426517396356215">"Connecting to <xliff:g id="HOST">%s</xliff:g>…"</string>
-    <string name="mediasearch" msgid="959222971261132292">"Search for <xliff:g id="TERM">%s</xliff:g>, using:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artists…"</string>
-    <string name="working_albums" msgid="8713273699401457426">"Albums…"</string>
-    <string name="working_songs" msgid="2201491972050410684">"Songs…"</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Playlists…"</string>
-    <string name="loading" msgid="1991660396037155453">"Loading…"</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">"Artists"</string>
-    <string name="music_picker_title" msgid="4143865470317360605">"Choose music track"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artists, albums and tracks"</string>
-    <string name="search_hint" msgid="3766854898072633001">"Search Music"</string>
-    <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-    <string name="widget_initial_text" msgid="3166878738860903586">"Touch to choose music."</string>
-    <string name="effectspanel" msgid="8804547581593509614">"Sound effects"</string>
-</resources>
diff --git a/res/values-en-rIN/strings2.xml b/res/values-en-rIN/strings2.xml
deleted file mode 100644
index 4393d0e..0000000
--- a/res/values-en-rIN/strings2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
-</resources>
diff --git a/res/values-et-rEE-keysexposed/strings.xml b/res/values-et-rEE-keysexposed/strings.xml
deleted file mode 100644
index 2217dd7..0000000
--- a/res/values-et-rEE-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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">"Esitusloendi nimi"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Nimeta <xliff:g id="PLAYLIST">%s</xliff:g> ümber:"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Nimeta <xliff:g id="PLAYLIST">%s</xliff:g> ümber:"</string>
-</resources>
diff --git a/res/values-et-rEE-keyshidden/strings.xml b/res/values-et-rEE-keyshidden/strings.xml
deleted file mode 100644
index eb57c5d..0000000
--- a/res/values-et-rEE-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Avage klaviatuur, et lisada oma esitusloendile nimi või valige käsk Salvesta, et lisada sellele nimi „<xliff:g id="PLAYLIST">%s</xliff:g>”."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Avage klaviatuur, et anda esitusloendile <xliff:g id="PLAYLIST">%s</xliff:g> uus nimi."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Avage klaviatuur, et lisada esitusloendile „<xliff:g id="PLAYLIST">%1$s</xliff:g>” uus nimi või valige käsk Salvesta, et lisada sellele nimi „<xliff:g id="NAME">%2$s</xliff:g>”."</string>
-</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
deleted file mode 100644
index ceafaa3..0000000
--- a/res/values-et-rEE/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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 laul"</string>
-  <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> laulu"</item>
-  </plurals>
-  <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"Laule: <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 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albumit"</item>
-  </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Teek"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Peo juhuesitus"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Peo juhuesitus välja lülitatud"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Kustuta"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Kõik juhuesituses"</string>
-    <string name="play_all" msgid="6309622568869321842">"Esita kõik"</string>
-    <string name="delete_artist_desc" msgid="8665759524898379194">"Kas kustutada SD-kaardilt jäädavalt kõik artisti <xliff:g id="ARTIST">%s</xliff:g> lood?"</string>
-    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Kas kustutada USB-mäluseadmelt jäädavalt kõik artisti <xliff:g id="ARTIST">%s</xliff:g> lood?"</string>
-    <string name="delete_album_desc" msgid="8172412873562794429">"Kas kustutada terve album „<xliff:g id="ALBUM">%s</xliff:g>” jäädavalt SD-kaardilt?"</string>
-    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Kas kustutada terve album „<xliff:g id="ALBUM">%s</xliff:g>” jäädavalt USB-mäluseadmelt?"</string>
-    <string name="delete_song_desc" msgid="1842681623848282205">"Kas kustutada lugu „<xliff:g id="SONG">%s</xliff:g>” jäädavalt SD-kaardilt?"</string>
-    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Kas kustutada lugu „<xliff:g id="SONG">%s</xliff:g>” jäädavalt USB-mäluseadmelt?"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 laul kustutati."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> laulu kustutati."</item>
-  </plurals>
-    <string name="scanning" msgid="3529383847223198502">"SD-kaardi skannimine ..."</string>
-    <string name="scanning_nosdcard" msgid="8105284774487360148">"USB-mäluseadme skaneering ..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Esitamine kestab"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Peo juhuesitus"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artistid"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Albumid"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Albumid"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Laulud"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Laulud"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Esitusloendid"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Esitusloendid"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Videod"</string>
-    <string name="all_title" msgid="6880186414437237653">"Kõik meediumid"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artistid"</string>
-    <string name="search_title" msgid="1016971653383739344">"Otsing"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Laulud puuduvad"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Videod puuduvad"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Esitusloendid puuduvad"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Kustuta"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Muuda"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Nimeta ümber"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Esitusloend on kustutatud."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Esitusloend on ümber nimetatud."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Viimati lisatud"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Viimati lisatud"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Interneti-saated"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Interneti-saated"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"SD-kaart puudub"</string>
-    <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"Ei ole USB-mäluseadet"</string>
-    <string name="sdcard_missing_message" msgid="2100061456003981823">"SD-kaart ei ole telefoni sisestatud."</string>
-    <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Teie telefonil ei ole USB-mäluseadet."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"SD-kaart pole saadaval"</string>
-    <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"USB-mäluseade pole saadaval"</string>
-    <string name="sdcard_busy_message" msgid="579981082201215537">"Teie SD-kaart on hõivatud."</string>
-    <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"Teie USB-mäluseade on hõivatud."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD-kaardi viga"</string>
-    <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB-mäluseadme viga"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Teie SD-kaardil tuvastati viga."</string>
-    <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Tuvastati USB-mäluseadme viga."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Tundmatu artist"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Tundmatu album"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Juhuesitus on sisse lülitatud."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Juhuesitus on välja lülitatud."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Kordus on välja lülitatud."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Praeguse laulu kordus."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Kõigi laulude kordamine."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Kasuta telefoni helinana"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Kasuta helinana"</string>
-    <string name="ringtone_set" msgid="5325818347613843130">"„<xliff:g id="NAME">%s</xliff:g>” määratud telefoni helinaks."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Esita"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Lisa esitusloendisse"</string>
-    <string name="queue" msgid="2937629819482787704">"Praegune esitusloend"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Uus"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Uus esitusloend <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 laul esitusloendisse lisatud."</item>
-    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> laulu esitusloendisse lisatud."</item>
-  </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Valitud esitusloend on tühi."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Salvesta"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Kirjuta üle"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Taasesituse probleem"</string>
-    <string name="service_start_error_msg" msgid="7061754255330276478">"Seda lugu ei õnnestunud esitada."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
-  <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 nädal"</item>
-    <item msgid="7487749116155425822">"2 nädalat"</item>
-    <item msgid="1565338360539555185">"3 nädalat"</item>
-    <item msgid="2142986059836933072">"4 nädalat"</item>
-    <item msgid="4332403875260507291">"5 nädalat"</item>
-    <item msgid="3847281907869868565">"6 nädalat"</item>
-    <item msgid="2942654998558867799">"7 nädalat"</item>
-    <item msgid="2115529325850052227">"8 nädalat"</item>
-    <item msgid="1396675336665198092">"9 nädalat"</item>
-    <item msgid="3178819129208998649">"10 nädalat"</item>
-    <item msgid="2727959579637914171">"11 nädalat"</item>
-    <item msgid="8708754966127584739">"12 nädalat"</item>
-  </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Valmis"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Kellaaja määramine"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Salvesta esitusloendina"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Kustuta esitusloend"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Muusika"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Muusika esitusloend"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Muusika"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Videod"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Muusika"</string>
-    <string name="playback_failed" msgid="3811851150820251398">"Pleier ei toeta sellist helifaili tüüpi."</string>
-    <string name="cancel" msgid="886559484711947520">"Tühista"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Eemalda esitusloendist"</string>
-    <string name="streamloadingtext" msgid="8842426517396356215">"Ühendamine vooga <xliff:g id="HOST">%s</xliff:g> …"</string>
-    <string name="mediasearch" msgid="959222971261132292">"Otsi terminit <xliff:g id="TERM">%s</xliff:g>, kasutades:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artistid ..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"Albumid ..."</string>
-    <string name="working_songs" msgid="2201491972050410684">"Laulud ..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Esitusloendid ..."</string>
-    <string name="loading" msgid="1991660396037155453">"Laadimine ..."</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Rajad"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Albumid"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artistid"</string>
-    <string name="music_picker_title" msgid="4143865470317360605">"Muusikaraja valimine"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artistid, albumid ja rajad"</string>
-    <string name="search_hint" msgid="3766854898072633001">"Otsi muusikat"</string>
-    <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSŠZŽTUVWÕÄÖÜXY"</string>
-    <string name="widget_initial_text" msgid="3166878738860903586">"Puudutage muusika valimiseks."</string>
-    <string name="effectspanel" msgid="8804547581593509614">"Heliefektid"</string>
-</resources>
diff --git a/res/values-et-rEE/strings2.xml b/res/values-et-rEE/strings2.xml
deleted file mode 100644
index 4393d0e..0000000
--- a/res/values-et-rEE/strings2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
-</resources>
diff --git a/res/values-fr-rCA-keysexposed/strings.xml b/res/values-fr-rCA-keysexposed/strings.xml
deleted file mode 100644
index e7b7328..0000000
--- a/res/values-fr-rCA-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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 liste de lecture"</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>
-</resources>
diff --git a/res/values-fr-rCA-keyshidden/strings.xml b/res/values-fr-rCA-keyshidden/strings.xml
deleted file mode 100644
index f5eebcf..0000000
--- a/res/values-fr-rCA-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Ouvrez le clavier afin d\'attribuer un nom à la nouvelle liste de lecture ou sélectionnez \"Enregistrer\" pour la nommer \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Ouvrez le clavier pour renommer la liste de lecture \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Ouvrez le clavier pour attribuer un nouveau nom à la liste de lecture \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" ou sélectionnez \"Enregistrer\" pour la nommer \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
-</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
deleted file mode 100644
index 37dbfbd..0000000
--- a/res/values-fr-rCA/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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 titre"</string>
-  <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> titres"</item>
-  </plurals>
-  <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> titres sur <xliff:g id="TOTAL_COUNT">%1$d</xliff:g>"</item>
-  </plurals>
-  <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"Un album"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> albums"</item>
-  </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Bibliothèque"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Lecture aléatoire"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Désactiver la lecture aléatoire"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Supprimer"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Lecture aléatoire de tous les titres"</string>
-    <string name="play_all" msgid="6309622568869321842">"Tout lire"</string>
-    <string name="delete_artist_desc" msgid="8665759524898379194">"Supprimer définitivement tous les titres de \"<xliff:g id="ARTIST">%s</xliff:g>\" de la carte SD?"</string>
-    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Supprimer définitivement tous les titres de \"<xliff:g id="ARTIST">%s</xliff:g>\" de la mémoire de stockage USB?"</string>
-    <string name="delete_album_desc" msgid="8172412873562794429">"Supprimer définitivement l\'album \"<xliff:g id="ALBUM">%s</xliff:g>\" de la carte SD?"</string>
-    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Supprimer définitivement l\'album \"<xliff:g id="ALBUM">%s</xliff:g>\" de la mémoire de stockage USB?"</string>
-    <string name="delete_song_desc" msgid="1842681623848282205">"Supprimer définitivement \"<xliff:g id="SONG">%s</xliff:g>\" de la carte SD?"</string>
-    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Supprimer définitivement \"<xliff:g id="SONG">%s</xliff:g>\" de la mémoire de stockage USB?"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 titre a été supprimé."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> titres ont été supprimés."</item>
-  </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Lecture de la carte SD..."</string>
-    <string name="scanning_nosdcard" msgid="8105284774487360148">"Analyse de la mémoire stockage USB..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"En cours de lecture"</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">"Listes de lecture"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Listes de lecture"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Vidéos"</string>
-    <string name="all_title" msgid="6880186414437237653">"Tous les supports"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artistes"</string>
-    <string name="search_title" msgid="1016971653383739344">"Rechercher"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Aucun titre"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Aucune vidéo"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Aucune liste de lecture"</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">"Liste de lecture supprimée."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"La liste de lecture a été renommée."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Ajoutés récemment"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Ajoutés récemment"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Balados"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Balados"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Aucune carte SD trouvée"</string>
-    <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"Aucune mémoire de stockage USB"</string>
-    <string name="sdcard_missing_message" msgid="2100061456003981823">"Aucune carte SD n\'est insérée dans votre téléphone."</string>
-    <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Votre téléphone ne dispose d\'aucune mémoire de stockage USB."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Carte SD non disponible"</string>
-    <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"Mémoire de stockage USB indisponible"</string>
-    <string name="sdcard_busy_message" msgid="579981082201215537">"Votre carte SD n\'est pas disponible."</string>
-    <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"Votre mémoire de stockage USB n\'est pas disponible."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Erreur de carte SD"</string>
-    <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"Erreur lors de l\'utilisation de la mémoire de stockage USB."</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Une erreur s\'est produite sur votre carte SD."</string>
-    <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Une erreur s\'est produite sur votre mémoire de stockage USB."</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 titres"</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Utiliser comme sonnerie du téléphone"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Utiliser comme sonnerie"</string>
-    <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" a été défini comme sonnerie."</string>
-    <string name="play_selection" msgid="2854921021814550018">"LIRE"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Ajouter à une liste de lecture"</string>
-    <string name="queue" msgid="2937629819482787704">"Liste de lecture actuelle"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Nouveau"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Nouvelle liste de lecture <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1  titre ajouté à la liste de lecture"</item>
-    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> titres ont été ajoutés à la liste de lecture."</item>
-  </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"La liste de lecture sélectionnée est vide."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Enregistrer"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Écraser"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Erreur de lecture"</string>
-    <string name="service_start_error_msg" msgid="7061754255330276478">"Impossible de lire ce titre."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
-  <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 semaine"</item>
-    <item msgid="7487749116155425822">"2 semaines"</item>
-    <item msgid="1565338360539555185">"3 semaines"</item>
-    <item msgid="2142986059836933072">"4 semaines"</item>
-    <item msgid="4332403875260507291">"5 semaines"</item>
-    <item msgid="3847281907869868565">"6 semaines"</item>
-    <item msgid="2942654998558867799">"7 semaines"</item>
-    <item msgid="2115529325850052227">"8 semaines"</item>
-    <item msgid="1396675336665198092">"9 semaines"</item>
-    <item msgid="3178819129208998649">"10 semaines"</item>
-    <item msgid="2727959579637914171">"11 semaines"</item>
-    <item msgid="8708754966127584739">"12 semaines"</item>
-  </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Terminé"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Définir l\'heure"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Enregistrer comme liste de lecture"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Effacer la liste de lecture"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Musique"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Liste de lecture 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="3811851150820251398">"Ce type de fichier audio n\'est pas compatible avec le lecteur."</string>
-    <string name="cancel" msgid="886559484711947520">"Annuler"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Supprimer de la liste de lecture"</string>
-    <string name="streamloadingtext" msgid="8842426517396356215">"Connexion à <xliff:g id="HOST">%s</xliff:g>…"</string>
-    <string name="mediasearch" msgid="959222971261132292">"Rechercher <xliff:g id="TERM">%s</xliff:g> à 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">"Titres..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Listes de lecture…"</string>
-    <string name="loading" msgid="1991660396037155453">"Chargement en cours..."</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Chansons"</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="4143865470317360605">"Sélectionner un titre"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artistes, albums et titres"</string>
-    <string name="search_hint" msgid="3766854898072633001">"Rechercher dans la musique"</string>
-    <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-    <string name="widget_initial_text" msgid="3166878738860903586">"Appuyez pour sélectionner des titres"</string>
-    <string name="effectspanel" msgid="8804547581593509614">"Effets sonores"</string>
-</resources>
diff --git a/res/values-fr-rCA/strings2.xml b/res/values-fr-rCA/strings2.xml
deleted file mode 100644
index 4393d0e..0000000
--- a/res/values-fr-rCA/strings2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
-</resources>
diff --git a/res/values-ms-rMY-keysexposed/strings.xml b/res/values-ms-rMY-keysexposed/strings.xml
deleted file mode 100644
index 51ce8a5..0000000
--- a/res/values-ms-rMY-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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">"Nama senarai main"</string>
-    <string name="rename_playlist_same_prompt" msgid="6311998573141605099">"Namakan semula \"<xliff:g id="PLAYLIST">%s</xliff:g>\" kepada"</string>
-    <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Namakan semula \"<xliff:g id="PLAYLIST">%s</xliff:g>\" kepada"</string>
-</resources>
diff --git a/res/values-ms-rMY-keyshidden/strings.xml b/res/values-ms-rMY-keyshidden/strings.xml
deleted file mode 100644
index 545aa0f..0000000
--- a/res/values-ms-rMY-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Buka papan kekunci untuk menamakan Senarai Main baru anda atau pilih Simpan untuk menamakannya \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Buka papan kekunci untuk memberi nama baru kepada senarai main \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Buka papan kekunci untuk memberi nama baru bagi senarai main \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" atau pilih Simpan untuk menamakannya \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
-</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
deleted file mode 100644
index 5f82cff..0000000
--- a/res/values-ms-rMY/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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 lagu"</string>
-  <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<xliff:g id="COUNT">%d</xliff:g> lagu"</item>
-  </plurals>
-  <plurals name="Nsongscomp">
-    <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> daripada <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> lagu"</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>
-  </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"Perpustakaan"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Rombak parti"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Rombak parti dimatikan"</string>
-    <string name="delete_item" msgid="3363330144534750601">"Padam"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Rombak semua"</string>
-    <string name="play_all" msgid="6309622568869321842">"Mainkan semua"</string>
-    <string name="delete_artist_desc" msgid="8665759524898379194">"Padam semua lagu oleh <xliff:g id="ARTIST">%s</xliff:g> secara kekal dari kad SD?"</string>
-    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"Padam semua lagu dari<xliff:g id="ARTIST">%s</xliff:g> secara kekal dari storan USB?"</string>
-    <string name="delete_album_desc" msgid="8172412873562794429">"Padam seluruh album \"<xliff:g id="ALBUM">%s</xliff:g>\" secara kekal dari kad SD?"</string>
-    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"Padam seluruh album \"<xliff:g id="ALBUM">%s</xliff:g>\" secara kekal dari storan USB?"</string>
-    <string name="delete_song_desc" msgid="1842681623848282205">"Padam \"<xliff:g id="SONG">%s</xliff:g>\" secara kekal dari kad SD?"</string>
-    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"Padam \"<xliff:g id="SONG">%s</xliff:g>\" secara kekal dari storan USB?"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"OK"</string>
-  <plurals name="NNNtracksdeleted">
-    <item quantity="one" msgid="8560276109508404217">"1 lagu telah dipadamkan."</item>
-    <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> lagu dipadamkan"</item>
-  </plurals>
-    <string name="scanning" msgid="3529383847223198502">"Mengimbas kad SD..."</string>
-    <string name="scanning_nosdcard" msgid="8105284774487360148">"Mengimbas storan USB..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Sedang dimainkan"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Rombak parti"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Artis"</string>
-    <string name="albums_menu" msgid="5807982055590211900">"Album"</string>
-    <string name="albums_title" msgid="8773880394961378035">"Album"</string>
-    <string name="tracks_menu" msgid="6942246568246092330">"Lagu"</string>
-    <string name="tracks_title" msgid="3229389424532295124">"Lagu"</string>
-    <string name="playlists_menu" msgid="5382792649771928849">"Senarai main"</string>
-    <string name="playlists_title" msgid="5094238486322957927">"Senarai main"</string>
-    <string name="videos_title" msgid="2066741954354129115">"Video"</string>
-    <string name="all_title" msgid="6880186414437237653">"Semua media"</string>
-    <string name="browse_menu" msgid="5248122473075843289">"Artis"</string>
-    <string name="search_title" msgid="1016971653383739344">"Cari"</string>
-    <string name="no_tracks_title" msgid="8805805388271238471">"Tiada lagu"</string>
-    <string name="no_videos_title" msgid="6218814130364793104">"Tiada video"</string>
-    <string name="no_playlists_title" msgid="4456351945617594418">"Tiada senarai main"</string>
-    <string name="delete_playlist_menu" msgid="8998637685583495247">"Padam"</string>
-    <string name="edit_playlist_menu" msgid="571618502105370684">"Edit"</string>
-    <string name="rename_playlist_menu" msgid="3133463747389494668">"Namakan semula"</string>
-    <string name="playlist_deleted_message" msgid="9008053828193961455">"Senarai main dipadamkan."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Senarai main dinamakan semula."</string>
-    <string name="recentlyadded" msgid="110978416756366953">"Terbaru ditambah"</string>
-    <string name="recentlyadded_title" msgid="3153322287249901914">"Terbaru ditambah"</string>
-    <string name="podcasts_listitem" msgid="8657809279717670634">"Podcast"</string>
-    <string name="podcasts_title" msgid="4928414142496858304">"Podcast"</string>
-    <string name="sdcard_missing_title" msgid="9008284946643270850">"Tiada kad SD"</string>
-    <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"Tiada storan USB"</string>
-    <string name="sdcard_missing_message" msgid="2100061456003981823">"Telefon anda tidak dimasukkan kad SD."</string>
-    <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Telefon anda tidak mempunyai storan USB."</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"Kad SD tidak tersedia"</string>
-    <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"Storan USB tidak tersedia"</string>
-    <string name="sdcard_busy_message" msgid="579981082201215537">"Kad SD anda sibuk."</string>
-    <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"Storan USB anda sibuk."</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"Ralat kad SD"</string>
-    <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"Ralat storan USB"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"Terdapat ralat pada kad SD anda."</string>
-    <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Menghadapi ralat pada storan USB anda."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Artis tidak dikenali"</string>
-    <string name="unknown_album_name" msgid="8525145988941244727">"Album tidak diketahui"</string>
-    <string name="shuffle_on_notif" msgid="5453708337808483943">"Rombak dihidupkan."</string>
-    <string name="shuffle_off_notif" msgid="4251189610017886263">"Rombak dimatikan."</string>
-    <string name="repeat_off_notif" msgid="1149406899083479716">"Ulangan dimatikan."</string>
-    <string name="repeat_current_notif" msgid="1227153936360904196">"Mengulangi lagu semasa."</string>
-    <string name="repeat_all_notif" msgid="6443293055987316642">"Mengulangi semua lagu."</string>
-    <string name="ringtone_menu" msgid="2737472190159134599">"Gunakan sebagai nada dering telefon"</string>
-    <string name="ringtone_menu_short" msgid="3367622038867238133">"Gunakan sebagai nada dering"</string>
-    <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" ditetapkan sebagai nada dering telefon."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Main"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"Tambah ke senarai main"</string>
-    <string name="queue" msgid="2937629819482787704">"Senarai main semasa"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"Baru"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Senarai main baru <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"1 lagu ditambah ke senarai main."</item>
-    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> lagu ditambahkan pada senarai main."</item>
-  </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"Senarai main pilihan kosong."</string>
-    <string name="create_playlist_create_text" msgid="8149755205483279143">"Simpan"</string>
-    <string name="create_playlist_overwrite_text" msgid="2007808383561024706">"Tulis ganti"</string>
-    <string name="service_start_error_title" msgid="8649916852210198813">"Masalah main semula"</string>
-    <string name="service_start_error_msg" msgid="7061754255330276478">"Lagu tidak dapat dimainkan."</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"OK"</string>
-  <string-array name="weeklist">
-    <item msgid="7005918873419323862">"1 minggu"</item>
-    <item msgid="7487749116155425822">"2 minggu"</item>
-    <item msgid="1565338360539555185">"3 minggu"</item>
-    <item msgid="2142986059836933072">"4 minggu"</item>
-    <item msgid="4332403875260507291">"5 minggu"</item>
-    <item msgid="3847281907869868565">"6 minggu"</item>
-    <item msgid="2942654998558867799">"7 minggu"</item>
-    <item msgid="2115529325850052227">"8 minggu"</item>
-    <item msgid="1396675336665198092">"9 minggu"</item>
-    <item msgid="3178819129208998649">"10 minggu"</item>
-    <item msgid="2727959579637914171">"11 minggu"</item>
-    <item msgid="8708754966127584739">"12 minggu"</item>
-  </string-array>
-    <string name="weekpicker_set" msgid="7636608790418067496">"Selesai"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Tetapkan masa"</string>
-    <string name="save_as_playlist" msgid="5180413608901885255">"Simpan sebagai senarai main"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Padam bersih senarai main"</string>
-    <string name="musicbrowserlabel" msgid="3162022214114562892">"Muzik"</string>
-    <string name="musicshortcutlabel" msgid="2602980193508150226">"Senarai main muzik"</string>
-    <string name="mediaplaybacklabel" msgid="6733604841530940397">"Muzik"</string>
-    <string name="videobrowserlabel" msgid="8522326678447494657">"Video"</string>
-    <string name="mediapickerlabel" msgid="4549836003229914299">"Muzik"</string>
-    <string name="playback_failed" msgid="3811851150820251398">"Pemain tidak menyokong jenis fail audio ini."</string>
-    <string name="cancel" msgid="886559484711947520">"Batal"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Alih keluar daripada senarai main"</string>
-    <string name="streamloadingtext" msgid="8842426517396356215">"Menyambung ke <xliff:g id="HOST">%s</xliff:g>…"</string>
-    <string name="mediasearch" msgid="959222971261132292">"Cari <xliff:g id="TERM">%s</xliff:g> menggunakan:"</string>
-    <string name="working_artists" msgid="8678357432732156580">"Artis..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"Album..."</string>
-    <string name="working_songs" msgid="2201491972050410684">"Lagu..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"Senarai main..."</string>
-    <string name="loading" msgid="1991660396037155453">"Memuatkan…"</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"Runut"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"Album"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"Artis"</string>
-    <string name="music_picker_title" msgid="4143865470317360605">"Pilih trek muzik"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"Artis, album dan lagu"</string>
-    <string name="search_hint" msgid="3766854898072633001">"Carian Muzik"</string>
-    <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-    <string name="widget_initial_text" msgid="3166878738860903586">"Sentuh untuk memilih muzik."</string>
-    <string name="effectspanel" msgid="8804547581593509614">"Kesan bunyi"</string>
-</resources>
diff --git a/res/values-ms-rMY/strings2.xml b/res/values-ms-rMY/strings2.xml
deleted file mode 100644
index 4393d0e..0000000
--- a/res/values-ms-rMY/strings2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
-</resources>
diff --git a/res/values-pt-keysexposed/strings.xml b/res/values-pt-keysexposed/strings.xml
index cda97b1..ddcf07c 100644
--- a/res/values-pt-keysexposed/strings.xml
+++ b/res/values-pt-keysexposed/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="942607395076646686">"Nome da playlist"</string>
+    <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>\" como"</string>
     <string name="rename_playlist_diff_prompt" msgid="621210762456614321">"Renomear \"<xliff:g id="PLAYLIST">%s</xliff:g>\" como"</string>
 </resources>
diff --git a/res/values-pt-keyshidden/strings.xml b/res/values-pt-keyshidden/strings.xml
index 03ec48a..0da8c8f 100644
--- a/res/values-pt-keyshidden/strings.xml
+++ b/res/values-pt-keyshidden/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Abra o teclado para dar um nome à sua nova Playlist ou selecione Salvar para nomeá-la como \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"Abra o teclado para dar um novo nome à playlist \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"Abra o teclado para dar um novo nome à playlist \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" ou selecione Salvar para nomeá-la como \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
+    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"Abra o teclado para dar um nome à sua nova Lista de reprodução ou selecione Salvar para nomeá-la como \"<xliff:g id="PLAYLIST">%s</xliff:g>\"."</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="900422624897120958">"Abra o teclado para dar um novo nome à lista de reprodução \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\" ou selecione Salvar para nomeá-la como \"<xliff:g id="NAME">%2$s</xliff:g>\"."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 79c7bed..6c6e003 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -31,8 +31,8 @@
     <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> álbuns"</item>
   </plurals>
     <string name="goto_start" msgid="8979658707407220934">"Biblioteca"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"Modo aleatório"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"Modo aleatório desativado"</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>
@@ -50,7 +50,7 @@
     <string name="scanning" msgid="3529383847223198502">"Verificando o cartão SD…"</string>
     <string name="scanning_nosdcard" msgid="8105284774487360148">"Verificando armazenamento USB…"</string>
     <string name="nowplaying_title" msgid="8342523844307751761">"Em reprodução"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"Modo aleatório"</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>
@@ -68,8 +68,8 @@
     <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">"Playlist excluída."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Playlist renomeada."</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>
@@ -98,14 +98,14 @@
     <string name="ringtone_set" msgid="5325818347613843130">"\"<xliff:g id="NAME">%s</xliff:g>\" definido como toque do telefone."</string>
     <string name="play_selection" msgid="2854921021814550018">"Reproduzir"</string>
     <string name="add_to_playlist" msgid="7110273488645072783">"Adicionar à reprodução"</string>
-    <string name="queue" msgid="2937629819482787704">"Playlist atual"</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 playlist <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="new_playlist_name_template" msgid="905710296728900597">"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 à playlist."</item>
-    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> músicas adicionadas à playlist."</item>
+    <item quantity="one" msgid="422388042993582235">"1 música adicionada à lista de reprodução."</item>
+    <item quantity="other" msgid="7662771987109627255">"<xliff:g id="NUMBER">%d</xliff:g> músicas adicionadas à lista de reprodução."</item>
   </plurals>
-    <string name="emptyplaylist" msgid="6711555673997896344">"A playlist selecionada está vazia."</string>
+    <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>
@@ -127,16 +127,16 @@
   </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 playlist"</string>
-    <string name="clear_playlist" msgid="4565515100924905315">"Limpar playlist"</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">"Playlist de músicas"</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="3811851150820251398">"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 playlist"</string>
+    <string name="remove_from_playlist" msgid="2548577514849026354">"Remover da lista de reprodução"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"Conectando-se a <xliff:g id="HOST">%s</xliff:g>..."</string>
     <string name="mediasearch" msgid="959222971261132292">"Pesquisar <xliff:g id="TERM">%s</xliff:g> usando:"</string>
     <string name="working_artists" msgid="8678357432732156580">"Artistas…"</string>
diff --git a/res/values-zh-rHK-keysexposed/strings.xml b/res/values-zh-rHK-keysexposed/strings.xml
deleted file mode 100644
index a76480e..0000000
--- a/res/values-zh-rHK-keysexposed/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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>
-</resources>
diff --git a/res/values-zh-rHK-keyshidden/strings.xml b/res/values-zh-rHK-keyshidden/strings.xml
deleted file mode 100644
index 0febd0e..0000000
--- a/res/values-zh-rHK-keyshidden/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"開啟鍵盤來為播放清單輸入新名稱，或選取「儲存」將其命名為「<xliff:g id="PLAYLIST">%s</xliff:g>」。"</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"使用鍵盤為「<xliff:g id="PLAYLIST">%s</xliff:g>」播放清單重新命名。"</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"開啟鍵盤輸入播放清單「<xliff:g id="PLAYLIST">%1$s</xliff:g>」的新名稱，或選取「儲存」將其命名為「<xliff:g id="NAME">%2$s</xliff:g>」。"</string>
-</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
deleted file mode 100644
index 346cd04..0000000
--- a/res/values-zh-rHK/strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<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>
-  <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"<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>
-  </plurals>
-  <plurals name="Nalbums">
-    <item quantity="one" msgid="3798955510439465932">"1 張專輯"</item>
-    <item quantity="other" msgid="3047615499770811984">"<xliff:g id="COUNT">%d</xliff:g> 張專輯"</item>
-  </plurals>
-    <string name="goto_start" msgid="8979658707407220934">"音樂庫"</string>
-    <string name="party_shuffle" msgid="8213359225506006168">"派對隨機播放"</string>
-    <string name="party_shuffle_off" msgid="1828744483354711679">"關閉派對隨機播放"</string>
-    <string name="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="8665759524898379194">"將「<xliff:g id="ARTIST">%s</xliff:g>」的所有歌曲從 SD 記憶卡中永久刪除？"</string>
-    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"將「<xliff:g id="ARTIST">%s</xliff:g>」的所有歌曲從 USB 儲存裝置中永久刪除？"</string>
-    <string name="delete_album_desc" msgid="8172412873562794429">"將整張「<xliff:g id="ALBUM">%s</xliff:g>」專輯從 SD 記憶卡中永久刪除？"</string>
-    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"將整張「<xliff:g id="ALBUM">%s</xliff:g>」專輯從 USB 儲存裝置中永久刪除？"</string>
-    <string name="delete_song_desc" msgid="1842681623848282205">"將「<xliff:g id="SONG">%s</xliff:g>」從 SD 記憶卡中永久刪除？"</string>
-    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"將「<xliff:g id="SONG">%s</xliff:g>」從 USB 儲存裝置中永久刪除？"</string>
-    <string name="delete_confirm_button_text" msgid="7008121194944357274">"確定"</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>
-  </plurals>
-    <string name="scanning" msgid="3529383847223198502">"正在掃描 SD 卡..."</string>
-    <string name="scanning_nosdcard" msgid="8105284774487360148">"正在掃描 USB 儲存裝置..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"現正播放"</string>
-    <string name="partyshuffle_title" msgid="6582413231529992125">"派對隨機播放"</string>
-    <string name="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_title_nosdcard" msgid="7984839174824243958">"沒有 USB 儲存裝置"</string>
-    <string name="sdcard_missing_message" msgid="2100061456003981823">"您的手機並未插入 SD 記憶卡。"</string>
-    <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"您的手機沒有 USB 儲存裝置。"</string>
-    <string name="sdcard_busy_title" msgid="1162763571147174655">"無法使用 SD 卡"</string>
-    <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"沒有 USB 儲存裝置可供使用"</string>
-    <string name="sdcard_busy_message" msgid="579981082201215537">"SD 記憶卡忙碌中。"</string>
-    <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"您的 USB 儲存裝置忙碌中。"</string>
-    <string name="sdcard_error_title" msgid="165682155008600643">"SD 卡錯誤"</string>
-    <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB 儲存裝置錯誤"</string>
-    <string name="sdcard_error_message" msgid="4574563894036627855">"您的 SD 卡發生錯誤。"</string>
-    <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"您的 USB 儲存裝置發生錯誤。"</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"未知歌手/創作人"</string>
-    <string name="unknown_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="5325818347613843130">"已將「<xliff:g id="NAME">%s</xliff:g>」設為手機鈴聲。"</string>
-    <string name="play_selection" msgid="2854921021814550018">"播放"</string>
-    <string name="add_to_playlist" msgid="7110273488645072783">"加入播放清單"</string>
-    <string name="queue" msgid="2937629819482787704">"目前播放清單"</string>
-    <string name="new_playlist" msgid="7588112979692632867">"新進榜"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"新播放清單 <xliff:g id="NUMBER">%d</xliff:g>"</string>
-  <plurals name="NNNtrackstoplaylist">
-    <item quantity="one" msgid="422388042993582235">"已將 1 首歌曲加入播放清單。"</item>
-    <item quantity="other" msgid="7662771987109627255">"已將 <xliff:g id="NUMBER">%d</xliff:g> 首歌曲新增至播放清單。"</item>
-  </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="7061754255330276478">"無法播放這首歌曲。"</string>
-    <string name="service_start_error_button" msgid="480888406592240723">"確定"</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>
-  </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="3811851150820251398">"播放器不支援這種音頻檔案。"</string>
-    <string name="cancel" msgid="886559484711947520">"取消"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"從播放清單中移除"</string>
-    <string name="streamloadingtext" msgid="8842426517396356215">"正在連接 <xliff:g id="HOST">%s</xliff:g>..."</string>
-    <string name="mediasearch" msgid="959222971261132292">"透過以下工具，搜尋與「<xliff:g id="TERM">%s</xliff:g>」相符的結果："</string>
-    <string name="working_artists" msgid="8678357432732156580">"歌手/創作人..."</string>
-    <string name="working_albums" msgid="8713273699401457426">"專輯..."</string>
-    <string name="working_songs" msgid="2201491972050410684">"歌曲..."</string>
-    <string name="working_playlists" msgid="4424950806134653351">"播放清單..."</string>
-    <string name="loading" msgid="1991660396037155453">"正在載入..."</string>
-    <string name="sort_by_track" msgid="7662999005554152565">"曲目"</string>
-    <string name="sort_by_album" msgid="2912837715658975248">"專輯"</string>
-    <string name="sort_by_artist" msgid="4607024967813199992">"歌手/創作人"</string>
-    <string name="music_picker_title" msgid="4143865470317360605">"選擇音樂曲目"</string>
-    <string name="search_settings_description" msgid="6520975349259883368">"歌手/創作人、專輯及曲目"</string>
-    <string name="search_hint" msgid="3766854898072633001">"搜尋音樂"</string>
-    <string name="fast_scroll_alphabet" msgid="5548732936480723311">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
-    <string name="widget_initial_text" msgid="3166878738860903586">"輕觸即可選擇音樂。"</string>
-    <string name="effectspanel" msgid="8804547581593509614">"音效"</string>
-</resources>
diff --git a/res/values-zh-rHK/strings2.xml b/res/values-zh-rHK/strings2.xml
deleted file mode 100644
index 4393d0e..0000000
--- a/res/values-zh-rHK/strings2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
-** Copyright 2007, The Android Open Source Project
-**
-** 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. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="notification_artist_album" msgid="4934081953733334979">"<xliff:g id="ALBUM">%2$s</xliff:g>\n<xliff:g id="ARTIST">%1$s</xliff:g>"</string>
-</resources>
diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index d25e929..25d60c7 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -1089,6 +1089,8 @@
         if (mNextPlayPos >= 0) {
             long id = mPlayList[mNextPlayPos];
             mPlayer.setNextDataSource(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + "/" + id);
+        } else {
+            mPlayer.setNextDataSource(null);
         }
     }