diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 436ae34..b759ad4 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,14 +21,14 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="onesong" msgid="8336826100414159413">"1 skladba"</string>
   <plurals name="Nsongs">
-    <item quantity="other" msgid="5798230388116542981">"Počet skladeb: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="5798230388116542981">"Skladby: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
   <plurals name="Nsongscomp">
     <item quantity="other" msgid="7162294486622945550">"<xliff:g id="COUNT_FOR_ARTIST">%2$d</xliff:g> z celkem <xliff:g id="TOTAL_COUNT">%1$d</xliff:g> skladeb"</item>
   </plurals>
   <plurals name="Nalbums">
     <item quantity="one" msgid="3798955510439465932">"1 album"</item>
-    <item quantity="other" msgid="3047615499770811984">"Počet alb: <xliff:g id="COUNT">%d</xliff:g>"</item>
+    <item quantity="other" msgid="3047615499770811984">"Alba: <xliff:g id="COUNT">%d</xliff:g>"</item>
   </plurals>
     <string name="goto_start" msgid="8979658707407220934">"Knihovna"</string>
     <string name="party_shuffle" msgid="8213359225506006168">"Náhodně – všechny"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ab1dfa5..d952772 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -49,9 +49,9 @@
   </plurals>
     <string name="scanning" msgid="3529383847223198502">"SD-Karte wird gelesenen..."</string>
     <string name="scanning_nosdcard" msgid="8105284774487360148">"USB-Speicher wird gescannt..."</string>
-    <string name="nowplaying_title" msgid="8342523844307751761">"Aktuelle Wiedergabe"</string>
+    <string name="nowplaying_title" msgid="8342523844307751761">"Läuft gerade"</string>
     <string name="partyshuffle_title" msgid="6582413231529992125">"Party-Mix"</string>
-    <string name="artists_title" msgid="8490372367259160067">"Musiker"</string>
+    <string name="artists_title" msgid="8490372367259160067">"Interpreten"</string>
     <string name="albums_menu" msgid="5807982055590211900">"Alben"</string>
     <string name="albums_title" msgid="8773880394961378035">"Alben"</string>
     <string name="tracks_menu" msgid="6942246568246092330">"Titel"</string>
@@ -86,7 +86,7 @@
     <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB-Speicher-Fehler"</string>
     <string name="sdcard_error_message" msgid="4574563894036627855">"Bei der SD-Karte ist ein Fehler aufgetreten."</string>
     <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"Im USB-Speicher ist ein Fehler aufgetreten."</string>
-    <string name="unknown_artist_name" msgid="5567811106415855219">"Unbekannter Musiker"</string>
+    <string name="unknown_artist_name" msgid="5567811106415855219">"Unbekannter Interpret"</string>
     <string name="unknown_album_name" msgid="8525145988941244727">"Unbekanntes Album"</string>
     <string name="shuffle_on_notif" msgid="5453708337808483943">"Zufallsmix ist aktiviert."</string>
     <string name="shuffle_off_notif" msgid="4251189610017886263">"Zufallsmix ist deaktiviert."</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f59056b..25912b1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -34,7 +34,7 @@
     <string name="party_shuffle" msgid="8213359225506006168">"Sesión aleatoria"</string>
     <string name="party_shuffle_off" msgid="1828744483354711679">"Desactivar sesión aleatoria"</string>
     <string name="delete_item" msgid="3363330144534750601">"Eliminar"</string>
-    <string name="shuffle_all" msgid="1388193611787878773">"Aleatorio"</string>
+    <string name="shuffle_all" msgid="1388193611787878773">"Reproducir aleatoriamente"</string>
     <string name="play_all" msgid="6309622568869321842">"Reproducir todo"</string>
     <string name="delete_artist_desc" msgid="8665759524898379194">"¿Eliminar todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> de la tarjeta SD de forma permanente?"</string>
     <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"¿Eliminar todas las canciones de <xliff:g id="ARTIST">%s</xliff:g> del almacenamiento USB de forma permanente?"</string>
@@ -69,7 +69,7 @@
     <string name="edit_playlist_menu" msgid="571618502105370684">"Editar"</string>
     <string name="rename_playlist_menu" msgid="3133463747389494668">"Cambiar nombre"</string>
     <string name="playlist_deleted_message" msgid="9008053828193961455">"Se ha eliminado la lista de reproducción."</string>
-    <string name="playlist_renamed_message" msgid="7187580192703005990">"Se ha cambiado el nombre de la lista de reproducción."</string>
+    <string name="playlist_renamed_message" msgid="7187580192703005990">"Se ha cambiado el nombre de la lista."</string>
     <string name="recentlyadded" msgid="110978416756366953">"Añadidas recientemente"</string>
     <string name="recentlyadded_title" msgid="3153322287249901914">"Añadido recientemente"</string>
     <string name="podcasts_listitem" msgid="8657809279717670634">"Podcasts"</string>
@@ -100,7 +100,7 @@
     <string name="add_to_playlist" msgid="7110273488645072783">"Añadir a lista"</string>
     <string name="queue" msgid="2937629819482787704">"Lista de reproducción actual"</string>
     <string name="new_playlist" msgid="7588112979692632867">"Nuevo"</string>
-    <string name="new_playlist_name_template" msgid="905710296728900597">"Lista de reproducción <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="new_playlist_name_template" msgid="905710296728900597">"Lista <xliff:g id="NUMBER">%d</xliff:g>"</string>
   <plurals name="NNNtrackstoplaylist">
     <item quantity="one" msgid="422388042993582235">"Se ha añadido una canción a la lista de reproducción."</item>
     <item quantity="other" msgid="7662771987109627255">"Se han añadido <xliff:g id="NUMBER">%d</xliff:g> canciones a la lista de reproducción."</item>
@@ -136,7 +136,7 @@
     <string name="mediapickerlabel" msgid="4549836003229914299">"Música"</string>
     <string name="playback_failed" msgid="3811851150820251398">"El reproductor no admite este tipo de archivo de audio."</string>
     <string name="cancel" msgid="886559484711947520">"Cancelar"</string>
-    <string name="remove_from_playlist" msgid="2548577514849026354">"Eliminar de lista de reproducción"</string>
+    <string name="remove_from_playlist" msgid="2548577514849026354">"Eliminar de la lista de reproducción"</string>
     <string name="streamloadingtext" msgid="8842426517396356215">"Estableciendo conexión con <xliff:g id="HOST">%s</xliff:g>..."</string>
     <string name="mediasearch" msgid="959222971261132292">"Buscar <xliff:g id="TERM">%s</xliff:g> con:"</string>
     <string name="working_artists" msgid="8678357432732156580">"Artistas…"</string>
diff --git a/res/values-fa-keyshidden/strings.xml b/res/values-fa-keyshidden/strings.xml
index cfec27c..93cb22d 100644
--- a/res/values-fa-keyshidden/strings.xml
+++ b/res/values-fa-keyshidden/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"برای اختصاص یک نام جدید به لیست پخش، صفحه کلید را باز کنید یا برای نامگذاری آن به \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ذخیره را انتخاب کنید."</string>
-    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"برای اختصاص یک نام جدید به لیست پخش \"<xliff:g id="PLAYLIST">%s</xliff:g>\"، صفحه کلید را باز کنید."</string>
-    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"برای اختصاص یک نام جدید به لیست پخش \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\"، صفحه کلید را باز کنید یا برای نامگذاری آن به \"<xliff:g id="NAME">%2$s</xliff:g>\" ذخیره را انتخاب کنید."</string>
+    <string name="create_playlist_create_text_prompt" msgid="2379436619128383935">"برای اختصاص یک نام جدید به لیست پخش، صفحه‌کلید را باز کنید یا برای نامگذاری آن به \"<xliff:g id="PLAYLIST">%s</xliff:g>\" ذخیره را انتخاب کنید."</string>
+    <string name="rename_playlist_same_prompt" msgid="7777541452078260899">"برای اختصاص یک نام جدید به لیست پخش \"<xliff:g id="PLAYLIST">%s</xliff:g>\"، صفحه‌کلید را باز کنید."</string>
+    <string name="rename_playlist_diff_prompt" msgid="900422624897120958">"برای اختصاص یک نام جدید به لیست پخش \"<xliff:g id="PLAYLIST">%1$s</xliff:g>\"، صفحه‌کلید را باز کنید یا برای نامگذاری آن به \"<xliff:g id="NAME">%2$s</xliff:g>\" ذخیره را انتخاب کنید."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index be6a3c0..6f8a1a3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -36,34 +36,34 @@
     <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_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="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="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_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>
@@ -75,27 +75,27 @@
     <string name="podcasts_listitem" msgid="8657809279717670634">"پادکست ها"</string>
     <string name="podcasts_title" msgid="4928414142496858304">"پادکست ها"</string>
     <string name="sdcard_missing_title" msgid="9008284946643270850">"کارت SD موجود نیست"</string>
-    <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"حافظه USB وجود ندارد"</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_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_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_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_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="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="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="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>
@@ -112,45 +112,45 @@
     <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>
+    <item msgid="7005918873419323862">"۱ هفته"</item>
+    <item msgid="7487749116155425822">"۲ هفته"</item>
+    <item msgid="1565338360539555185">"۳ هفته"</item>
+    <item msgid="2142986059836933072">"۴ هفته"</item>
+    <item msgid="4332403875260507291">"۵ هفته"</item>
+    <item msgid="3847281907869868565">"۶ هفته"</item>
+    <item msgid="2942654998558867799">"۷ هفته"</item>
+    <item msgid="2115529325850052227">"۸ هفته"</item>
+    <item msgid="1396675336665198092">"۹ هفته"</item>
+    <item msgid="3178819129208998649">"۱۰ هفته"</item>
+    <item msgid="2727959579637914171">"۱۱ هفته"</item>
+    <item msgid="8708754966127584739">"۱۲ هفته"</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="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="videobrowserlabel" msgid="8522326678447494657">"ویدئوها"</string>
     <string name="mediapickerlabel" msgid="4549836003229914299">"موسیقی"</string>
-    <string name="playback_failed" msgid="3811851150820251398">"پخش‌کننده از این نوع فایل صوتی پشتیبانی نمیکند."</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="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="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_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>
+    <string name="effectspanel" msgid="8804547581593509614">"جلوه‌های صوتی"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e45cfde..0764d56 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -35,20 +35,20 @@
     <string name="party_shuffle_off" msgid="1828744483354711679">"Karışık albüm oluşturma kapalı"</string>
     <string name="delete_item" msgid="3363330144534750601">"Sil"</string>
     <string name="shuffle_all" msgid="1388193611787878773">"Tümünü karıştır"</string>
-    <string name="play_all" msgid="6309622568869321842">"Tümünü yürüt"</string>
+    <string name="play_all" msgid="6309622568869321842">"Tümünü çal"</string>
     <string name="delete_artist_desc" msgid="8665759524898379194">"<xliff:g id="ARTIST">%s</xliff:g> adlı sanatçının tüm şarkıları SD karttan kalıcı olarak silinsin mi?"</string>
-    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"<xliff:g id="ARTIST">%s</xliff:g> adlı sanatçının bütün şarkıları USB depolama biriminden kalıcı olarak silinsin mi?"</string>
+    <string name="delete_artist_desc_nosdcard" msgid="5729059309796497914">"<xliff:g id="ARTIST">%s</xliff:g> adlı sanatçının bütün şarkıları USB bellekten kalıcı olarak silinsin mi?"</string>
     <string name="delete_album_desc" msgid="8172412873562794429">"\"<xliff:g id="ALBUM">%s</xliff:g>\" albümünün tamamı SD karttan kalıcı olarak silinsin mi?"</string>
-    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"<xliff:g id="ALBUM">%s</xliff:g> albümünün tamamı USB depolama biriminden kalıcı olarak silinsin mi?"</string>
+    <string name="delete_album_desc_nosdcard" msgid="8612559166069885285">"<xliff:g id="ALBUM">%s</xliff:g> albümünün tamamı USB bellekten kalıcı olarak silinsin mi?"</string>
     <string name="delete_song_desc" msgid="1842681623848282205">"\"<xliff:g id="SONG">%s</xliff:g>\" şarkısını SD karttan kalıcı olarak silmek istiyor musunuz?"</string>
-    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"\"<xliff:g id="SONG">%s</xliff:g>\" şarkısını USB depolama biriminden kalıcı olarak silmek istiyor musunuz?"</string>
+    <string name="delete_song_desc_nosdcard" msgid="5064973032624148730">"\"<xliff:g id="SONG">%s</xliff:g>\" şarkısını USB bellekten kalıcı olarak silmek istiyor musunuz?"</string>
     <string name="delete_confirm_button_text" msgid="7008121194944357274">"Tamam"</string>
   <plurals name="NNNtracksdeleted">
     <item quantity="one" msgid="8560276109508404217">"1 şarkı silindi."</item>
     <item quantity="other" msgid="5156740163031225200">"<xliff:g id="SONGS_TO_DELETE">%d</xliff:g> şarkı silindi."</item>
   </plurals>
     <string name="scanning" msgid="3529383847223198502">"SD kart taranıyor..."</string>
-    <string name="scanning_nosdcard" msgid="8105284774487360148">"USB dep br taranıyor…"</string>
+    <string name="scanning_nosdcard" msgid="8105284774487360148">"USB bellek taranıyor…"</string>
     <string name="nowplaying_title" msgid="8342523844307751761">"Şimdi yürütülüyor"</string>
     <string name="partyshuffle_title" msgid="6582413231529992125">"Karışık albüm oluşturma"</string>
     <string name="artists_title" msgid="8490372367259160067">"Sanatçılar"</string>
@@ -75,17 +75,17 @@
     <string name="podcasts_listitem" msgid="8657809279717670634">"Podcast\'ler"</string>
     <string name="podcasts_title" msgid="4928414142496858304">"Podcast\'ler"</string>
     <string name="sdcard_missing_title" msgid="9008284946643270850">"SD kart yok"</string>
-    <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"USB dep br yok"</string>
+    <string name="sdcard_missing_title_nosdcard" msgid="7984839174824243958">"USB bellek yok"</string>
     <string name="sdcard_missing_message" msgid="2100061456003981823">"Telefonunuza takılı SD kart yok."</string>
-    <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Telefonunuzda USB depolama birimi yok."</string>
+    <string name="sdcard_missing_message_nosdcard" msgid="4459620970330194881">"Telefonunuzda USB bellek yok."</string>
     <string name="sdcard_busy_title" msgid="1162763571147174655">"SD kart kullanılamıyor"</string>
-    <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"USB dep br kullanlmyor"</string>
+    <string name="sdcard_busy_title_nosdcard" msgid="3319125156566499501">"USB bellek kullanılamıyor"</string>
     <string name="sdcard_busy_message" msgid="579981082201215537">"SD kartınız meşgul."</string>
-    <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"USB depolama biriminiz meşgul."</string>
+    <string name="sdcard_busy_message_nosdcard" msgid="1493449756827869166">"USB belleğiniz meşgul."</string>
     <string name="sdcard_error_title" msgid="165682155008600643">"SD kart hatası"</string>
-    <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB dep br hatası"</string>
+    <string name="sdcard_error_title_nosdcard" msgid="7564338137076303931">"USB bellek hatası"</string>
     <string name="sdcard_error_message" msgid="4574563894036627855">"SD kartınızda bir hatayla karşılaşıldı."</string>
-    <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"USB depolm birimnzd bir hatayla karşılaşıldı."</string>
+    <string name="sdcard_error_message_nosdcard" msgid="4983430848526821234">"USB belleğinizde bir hatayla karşılaşıldı."</string>
     <string name="unknown_artist_name" msgid="5567811106415855219">"Bilinmeyen sanatçı"</string>
     <string name="unknown_album_name" msgid="8525145988941244727">"Bilinmeyen albüm"</string>
     <string name="shuffle_on_notif" msgid="5453708337808483943">"Karıştırma açık."</string>
@@ -96,7 +96,7 @@
     <string name="ringtone_menu" msgid="2737472190159134599">"Telefon zil sesi olarak kullan"</string>
     <string name="ringtone_menu_short" msgid="3367622038867238133">"Zil sesi olarak kullan"</string>
     <string name="ringtone_set" msgid="5325818347613843130">"<xliff:g id="NAME">%s</xliff:g> telefon zil sesi olarak ayarlandı."</string>
-    <string name="play_selection" msgid="2854921021814550018">"Yürüt"</string>
+    <string name="play_selection" msgid="2854921021814550018">"Çal"</string>
     <string name="add_to_playlist" msgid="7110273488645072783">"Şarkı listesine ekle"</string>
     <string name="queue" msgid="2937629819482787704">"Geçerli şarkı listesi"</string>
     <string name="new_playlist" msgid="7588112979692632867">"Yeni"</string>
@@ -126,7 +126,7 @@
     <item msgid="8708754966127584739">"12 hafta"</item>
   </string-array>
     <string name="weekpicker_set" msgid="7636608790418067496">"Bitti"</string>
-    <string name="weekpicker_title" msgid="699535378922101701">"Saati ayarla"</string>
+    <string name="weekpicker_title" msgid="699535378922101701">"Saati ayarlayın"</string>
     <string name="save_as_playlist" msgid="5180413608901885255">"Şarkı listesi olarak kaydet"</string>
     <string name="clear_playlist" msgid="4565515100924905315">"Şarkı listesini temizle"</string>
     <string name="musicbrowserlabel" msgid="3162022214114562892">"Müzik"</string>
diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index f872da2..9773987 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -1024,6 +1024,16 @@
             stop(false);
 
             mCursor = getCursorForId(mPlayList[mPlayPos]);
+            if (mCursor.getCount() == 0) {
+                mCursor.close();
+                mCursor = null;
+                gotoIdleState();
+                if (mIsSupposedToBePlaying) {
+                    mIsSupposedToBePlaying = false;
+                    notifyChange(PLAYSTATE_CHANGED);
+                }
+                return;
+            }
             while(!open(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI + "/" + mCursor.getLong(IDCOLIDX))) {
                 if (mOpenFailedCounter++ < 10 &&  mPlayListLen > 1) {
                     int pos = getNextPosition(false);