diff --git a/app/src/main/res/values-br/translatable.xml b/app/src/main/res/values-br/translatable.xml
index 38742db7..050d3ba0 100644
--- a/app/src/main/res/values-br/translatable.xml
+++ b/app/src/main/res/values-br/translatable.xml
@@ -174,8 +174,6 @@
   <string name="ignore_audiofocus_loss_summary">Kenderc\'hel gant ar seniñ goude bezañ bet kollet ar stiañ aodio penn-da-benn</string>
   <string name="media_button_title">Reoliadus gant selaouelloù/bluetooth</string>
   <string name="media_button_summary">Dleet ivez gant reolerezhioù ICS ar skramm-prenañ.</string>
-  <string name="media_button_beep_title">Bip reolerezhioù ar selaouelloù</string>
-  <string name="media_button_beep_summary">Bip pa vez kemmet an ton gant reolerezhioù ar selaouelloù dre daouglik.</string>
   <string name="headset_only_title">Ezkerzh diavaez hepken</string>
   <string name="headset_only_summary">Mirout ar sonerezh da vezañ sonet dre an uhelgomzerioù diabarzh.</string>
   <string name="headset_pause_title">Ehanañ ma vez diluget</string>
@@ -202,8 +200,6 @@
   <string name="notifications">Rebuzadurioù</string>
   <string name="notification_visibility_title">Skrammañ ar rebuzadurioù</string>
   <string name="notification_action_title">Gwered ar rebuzadur</string>
-  <string name="notification_nag">Rebuzadur trabellek</string>
-  <string name="notification_nag_summary">Kelaou eus ar cheñchamantoù tonioù dre ur rebuzadur plavus</string>
   <string name="playback_screen">Skramm seniñ</string>
   <string name="playback_on_startup_title">Digeriñ d\'al loc\'hadur</string>
   <string name="playback_on_startup_summary">Digeriñ ar skramm seniñ vez loc\'het</string>
diff --git a/app/src/main/res/values-ca/translatable.xml b/app/src/main/res/values-ca/translatable.xml
index 8c9b779e..1005f64f 100644
--- a/app/src/main/res/values-ca/translatable.xml
+++ b/app/src/main/res/values-ca/translatable.xml
@@ -1,10 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Vanilla Music</string>
+  <string name="ok">D\'acord</string>
+  <string name="cancel">Cancel·la</string>
   <!--Playback Activity (main screen)-->
   <string name="no_songs">No s\'ha trobat cap pista al dispositiu.</string>
   <string name="empty_queue">No s\'ha seleccionat cap pista. Trieu de la llibreria o accediu al mode aleatori tocant aquest missatge.</string>
   <string name="settings">Configuració</string>
+  <string name="no_shuffle">Sense mode aleatori</string>
+  <string name="shuffle_songs">Pistes aleatòries</string>
+  <string name="shuffle_songs_continuously">Pistes aleatòries contínuament</string>
+  <string name="shuffle_albums">Àlbums aleatoris</string>
   <string name="no_repeat">No repeteixis</string>
   <string name="repeat">Repeteix</string>
   <string name="repeat_current_song">Repeteix la pista actual</string>
@@ -12,6 +18,7 @@
   <string name="random">Aleatori</string>
   <string name="random_enabling">Mode aleatori habilitat</string>
   <string name="song_load_failed">Ha fallat en reproduir la pista %s. No s\'ha trobat el fitxer o està corrupte.</string>
+  <string name="queue_cleared">S\'ha netejat la llista de reproducció.</string>
   <string name="cover_art">Caràtula</string>
   <string name="close_notification">Tanca la notificació</string>
   <string name="_genre">gènere</string>
@@ -29,16 +36,23 @@
   <string name="overwrite">Sobreescriu</string>
   <string name="delete_playlist">Voleu suprimir la llista de reproducció %s?</string>
   <!--Library-->
+  <string name="enqueue">Afegeix a la cua</string>
+  <string name="enqueue_as_next">Reprodueix el següent element</string>
   <string name="play">Reprodueix</string>
   <string name="edit">Edita</string>
   <string name="rename">Reanomena</string>
   <string name="save_as_playlist">Desa la llista de reproducció al fitxer…</string>
   <string name="add_to_playlist">Afegeix a la llista de reproducció…</string>
+  <string name="add_to_homescreen">Afegeix a la pantalla d\'inici...</string>
+  <string name="add_to">Afegeix a...</string>
+  <string name="playlist">Llista de reproducció</string>
+  <string name="homescreen">Pantalla d\'inici</string>
   <string name="add_to_favorites">Afegeix a favorits</string>
   <string name="remove_from_favorites">Suprimeix dels favorits</string>
   <string name="playlist_favorites">Favorits</string>
   <string name="new_playlist">Llista de reproducció nova…</string>
   <string name="expand">Expandeix</string>
+  <string name="expand_or_play_all">Expandeix o reprodueix-ho tot</string>
   <string name="delete">Suprimeix</string>
   <string name="playback_view">En reproducció</string>
   <string name="sort_by">Ordena per</string>
@@ -117,7 +131,6 @@
   <string name="equalizer">Equalitzador</string>
   <string name="notifications">Notificacions</string>
   <string name="notification_action_title">Acció de la notificació</string>
-  <string name="notification_nag">Notificació molt detallada</string>
   <string name="playback_on_startup_title">Obre en iniciar</string>
   <string name="playback_on_startup_summary">Obre la reproducció en iniciar</string>
   <string name="cover_press_action_title">Acció en tocar la caràtula</string>
diff --git a/app/src/main/res/values-cs/translatable.xml b/app/src/main/res/values-cs/translatable.xml
index b208a0fb..6f8c96c4 100644
--- a/app/src/main/res/values-cs/translatable.xml
+++ b/app/src/main/res/values-cs/translatable.xml
@@ -115,8 +115,6 @@
   <string name="ignore_audiofocus_loss_summary">Přehrávat dále i při trvalé ztrátě zvukového výstupu</string>
   <string name="media_button_title">Ovládání headsetu/bluetooth</string>
   <string name="media_button_summary">Toto je také vyžadováno pro ICS ovládání uzamčené obrazovky.</string>
-  <string name="media_button_beep_title">Kontrolní zvuk sluchátek</string>
-  <string name="media_button_beep_summary">Zvukový signál při přeskočení skladby dvojitým stlačením ovladače headsetu</string>
   <string name="headset_only_title">Pouze externí výstup</string>
   <string name="headset_only_summary">Zabrání přehrávání skladeb vnitřním reproduktorem přístroje.</string>
   <string name="headset_pause_title">Pozastavit při odpojení</string>
@@ -142,8 +140,6 @@
   <string name="cycle_continuous_shuffling_summary">\'Náhodný mód\' přehrává skladby v náhodném pořadí</string>
   <string name="notifications">Upozornění</string>
   <string name="notification_action_title">Akce upozornění</string>
-  <string name="notification_nag">Velmi detailní upozornění</string>
-  <string name="notification_nag_summary">Oznamovat změny skladeb za použití \'Heads-Up-Notification\'</string>
   <string name="playback_screen">Obrazovka přehrávání</string>
   <string name="playback_on_startup_title">Otevřít při spuštění</string>
   <string name="playback_on_startup_summary">Při spuštění otevřít náhled přehrávání</string>
diff --git a/app/src/main/res/values-da/translatable.xml b/app/src/main/res/values-da/translatable.xml
index cb9c7391..478f0dae 100644
--- a/app/src/main/res/values-da/translatable.xml
+++ b/app/src/main/res/values-da/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Fortsætte afspilning på permanent lydfokus</string>
   <string name="media_button_title">Hovedtelefon/Bluetooth kontrol</string>
   <string name="media_button_summary">Påkrævet for ICS låseskærm kontroller.</string>
-  <string name="media_button_beep_title">Hovedtelefon kontrol bip</string>
-  <string name="media_button_beep_summary">Bip efter overspringning af nummer med hovedtelefon kontrol dobbelt klik.</string>
   <string name="headset_only_title">Kun ekstern uddata</string>
   <string name="headset_only_summary">Forhindre musik afspilles gennem interne højttalere.</string>
   <string name="headset_pause_title">Pause når ikke tilsluttet</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Påmindelser</string>
   <string name="notification_visibility_title">Påmindelse synlighed</string>
   <string name="notification_action_title">Påmindelse handling</string>
-  <string name="notification_nag">Meget uddybende påmindelse</string>
-  <string name="notification_nag_summary">Annoncer numre ændringer ved hjælp af en \'Heads-Up påmindelse\'</string>
   <string name="playback_screen">Afspille skærm</string>
   <string name="playback_on_startup_title">Åbne ved opstart</string>
   <string name="playback_on_startup_summary">Åbne afspilning visning ved opstart</string>
diff --git a/app/src/main/res/values-de/translatable.xml b/app/src/main/res/values-de/translatable.xml
index 84a65b22..b35791c6 100644
--- a/app/src/main/res/values-de/translatable.xml
+++ b/app/src/main/res/values-de/translatable.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Vanilla Music</string>
-  <string name="ok">O. K.</string>
+  <string name="ok">OK</string>
   <string name="cancel">Abbrechen</string>
   <!--Playback Activity (main screen)-->
   <string name="no_songs">Keine Titel auf Ihrem Gerät gefunden.</string>
@@ -62,7 +62,7 @@
   <string name="remove">Entfernen</string>
   <string name="play_or_enqueue">Einreihen während Wiedergabe oder wiedergeben, falls pausiert</string>
   <string name="open">Öffnen</string>
-  <string name="go_home">Benutzerverzeichnis</string>
+  <string name="go_home">Startverzeichnis</string>
   <string name="jumping_to_song">Titel bereits in Warteschlange, wird direkt angesprungen …</string>
   <!--As a developer, you should always supply "one" and "other"
 		strings. Your translators will know which strings are actually
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Wiedergabe auch bei permanenter Unterbrechung nicht pausieren</string>
   <string name="media_button_title">Headset-/Bluetooth-Steuerung</string>
   <string name="media_button_summary">Wird auch für Steuerelemente der ICS-Bildschirmsperre benötigt</string>
-  <string name="media_button_beep_title">Headset-Kontrollsignal</string>
-  <string name="media_button_beep_summary">Akustisches Signal nach Überspringen eines Titels via Headset-Steuerung</string>
   <string name="headset_only_title">Nur externer Ausgang</string>
   <string name="headset_only_summary">Verhindert die Musikwiedergabe über interne Lautsprecher</string>
   <string name="headset_pause_title">Pausieren, wenn nicht angeschlossen</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Benachrichtigungen</string>
   <string name="notification_visibility_title">Benachrichtigungssichtbarkeit</string>
   <string name="notification_action_title">Benachrichtigungsaktion</string>
-  <string name="notification_nag">Ausführliche Benachrichtigung</string>
-  <string name="notification_nag_summary">Titelwechsel als »Heads-Up«-Benachrichtigung anzeigen</string>
   <string name="playback_screen">Wiedergabeansicht</string>
   <string name="playback_on_startup_title">Beim Start öffnen</string>
   <string name="playback_on_startup_summary">Wiedergabeansicht beim Start öffnen</string>
@@ -207,7 +203,7 @@
   <string name="idle_timeout_title">Inaktivitätsdauer</string>
   <string name="enable_scroll_to_song_title">Zum Titelnamen scrollen</string>
   <string name="enable_scroll_to_song_summary">In Bibliothekslisten zum gerade wiedergegebenen Titel/Album/Interpreten scrollen</string>
-  <string name="queue_enable_scroll_to_song_title">Zu Titelname in Warteschlange scrollen</string>
+  <string name="queue_enable_scroll_to_song_title">Zum Titel in Warteschlange scrollen</string>
   <string name="queue_enable_scroll_to_song_summary">Bei Titelwechsel zum derzeit wiedergegebenen Titel in der Warteschlange scrollen</string>
   <string name="jump_to_enqueued_on_play_title">Bei »Wiedergeben« zu eingereihtem Titel springen</string>
   <string name="jump_to_enqueued_on_play_summary">Falls sich der angefragte Titel bereits in der Warteschlange befindet, diesen anspringen anstatt die Warteschlange zu löschen</string>
@@ -265,8 +261,8 @@
   <string name="toggle_controls">Steuerelemente ein-/ausblenden</string>
   <string name="seek_10s_backward">10 Sekunden zurück springen</string>
   <string name="seek_10s_forward">10 Sekunden vorwärts springen</string>
-  <string name="move_to_top">Nach oben schieben</string>
-  <string name="move_to_bottom">Nach unten schieben</string>
+  <string name="move_to_top">Zum Anfang verschieben</string>
+  <string name="move_to_bottom">Ans Ende verschieben</string>
   <string name="preferences_action_show_queue">Warteschlange anzeigen</string>
   <string name="preferences_action_clear_queue">Warteschlange leeren</string>
   <string name="preferences_action_enqueue_current_album">Album einreihen</string>
@@ -279,7 +275,7 @@
   <string name="second_hint">SS</string>
   <string name="error_invalid_position">Ungültige Position</string>
   <string name="filebrowser_start">Startordner</string>
-  <string name="customize_filebrowser_start">Dateimanager startet in diesem Ordner</string>
+  <string name="customize_filebrowser_start">Dateimanager startet in diesem Verzeichnis</string>
   <string name="select">Auswählen</string>
   <string name="save">Speichern</string>
   <string name="autoplaylist_playcounts_title">Wiedergabeliste automatisch erstellen</string>
@@ -294,6 +290,8 @@
   <string name="playlist_sync_disabled">Deaktiviert</string>
   <string name="playlist_sync_folder_title">Synchronisationsordner</string>
   <string name="playlist_sync_folder_summary">Zu verwendender Ordner für Wiedergabelistensynchronisation</string>
+  <string name="playlist_export_relative_paths_title">Beim Exportieren relative Pfade verwenden</string>
+  <string name="playlist_export_relative_paths_summary">Dateipfade relativ zur Wiedergabeliste referenzieren</string>
   <string name="permission_request_summary">Vanilla Music benötigt Leserechte, um Ihre Musikbibliothek anzuzeigen</string>
   <string name="reverse_sort">Sortierung umkehren</string>
   <string name="share">Teilen …</string>
@@ -321,6 +319,7 @@
   <string name="media_scan_preferences">Suchoptionen</string>
   <string name="media_scan_preferences_change_title">Suchoptionen geändert</string>
   <string name="media_scan_preferences_change_message">Durch Ändern dieser Option wird ein erneutes, vollständiges Durchsuchen Ihrer Bibliothek veranlasst. Möchten Sie fortfahren?</string>
+  <string name="folder_picker_spinner_desc">Verzeichnisstatus:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Gedrückt halten für Ordneroptionen</string>
   <string name="folder_include">Einschließen</string>
diff --git a/app/src/main/res/values-el-rGR/translatable.xml b/app/src/main/res/values-el-rGR/translatable.xml
index 4fde1fab..0692bf95 100644
--- a/app/src/main/res/values-el-rGR/translatable.xml
+++ b/app/src/main/res/values-el-rGR/translatable.xml
@@ -70,7 +70,6 @@
   <!--Preferences-->
   <string name="audio">Ήχος</string>
   <string name="media_button_summary">Αυτό απαιτείται επίσης για τους ελέγχους  ICS lockscreen. </string>
-  <string name="media_button_beep_summary">Μπιπ μετά από παράλειψη ενός κομματιού με διπλό κλικ στον έλεγχο ακουστικων.</string>
   <string name="headset_only_summary">Εμποδίζει τη μουσική από το να παίζεται μέσω των εσωτερικών ηχείων.</string>
   <string name="headset_pause_summary">Παύση όταν τα ακουστικά εχουν αποσυνδεθεί.</string>
   <string name="replaygain_track_summary">Αναπαραγωγή όλων των τραγουδιων σε ίση ηχηρότητα</string>
diff --git a/app/src/main/res/values-eo/translatable.xml b/app/src/main/res/values-eo/translatable.xml
index 476bfe2f..3e459a01 100644
--- a/app/src/main/res/values-eo/translatable.xml
+++ b/app/src/main/res/values-eo/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Pluigi ludadon eĉ dum permanenta perdo de sona fokuso</string>
   <string name="media_button_title">Stiri per butonoj de aŭskultiloj/Bludento</string>
   <string name="media_button_summary">Ankaŭ postulata por ŝlosekranaj stiriloj ĉe Androido 4.0.3.</string>
-  <string name="media_button_beep_title">Pepo de aŭskultila stir-butono</string>
-  <string name="media_button_beep_summary">Pepi dum transsalti muzikaĵon per duobla premo de aŭskultila stir-butono.</string>
   <string name="headset_only_title">Nur ekstera eligo</string>
   <string name="headset_only_summary">Neniam ludi muzikon per internaj laŭtparoliloj.</string>
   <string name="headset_pause_title">Paŭzi je malkonekto</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Atentigo</string>
   <string name="notification_visibility_title">Videblo de la atentigo</string>
   <string name="notification_action_title">Ago de la atentigo</string>
-  <string name="notification_nag">Tre montrema atentigo</string>
-  <string name="notification_nag_summary">Anonci ŝanĝojn de muzikaĵoj per la ĉiam videbla atentigo</string>
   <string name="playback_screen">Ekrano de ludado</string>
   <string name="playback_on_startup_title">Malfermi dum starto</string>
   <string name="playback_on_startup_summary">Montri ekranon de ludado dum starto</string>
@@ -265,6 +261,8 @@
   <string name="toggle_controls">Baskuli stir-butonojn</string>
   <string name="seek_10s_backward">10 sekundoj malantaŭen</string>
   <string name="seek_10s_forward">10 sekundoj antaŭen</string>
+  <string name="move_to_top">Movi plej supren</string>
+  <string name="move_to_bottom">Movi plej suben</string>
   <string name="preferences_action_show_queue">Montri ludvicon</string>
   <string name="preferences_action_clear_queue">Forviŝi ludvicon</string>
   <string name="preferences_action_enqueue_current_album">Envicigi albumon</string>
@@ -321,6 +319,7 @@
   <string name="media_scan_preferences">Agordoj de skanilo</string>
   <string name="media_scan_preferences_change_title">Ŝanĝis agordojn de skanilo</string>
   <string name="media_scan_preferences_change_message">Ŝanĝo de tiu ĉi agordo ekigos plenan reskanon de via muzik-biblioteko. Ĉu vi volas pluigi?</string>
+  <string name="folder_picker_spinner_desc">Stato de dosierujo:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Frapetadu por modifi dosierujajn agordojn</string>
   <string name="folder_include">Inkluzivi</string>
diff --git a/app/src/main/res/values-es/translatable.xml b/app/src/main/res/values-es/translatable.xml
index a5ddd8cd..640b070d 100644
--- a/app/src/main/res/values-es/translatable.xml
+++ b/app/src/main/res/values-es/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Continuar reproduciendo tras haber perdido permanentemente el control sobre el audio </string>
   <string name="media_button_title">Controles para Bluetooth/Auriculares</string>
   <string name="media_button_summary">Esto es necesario para los controles del bloqueo de pantalla en ICS.</string>
-  <string name="media_button_beep_title">Pitido de control de auriculares</string>
-  <string name="media_button_beep_summary">Pitar después de saltar una pista con un doble clic sobre el control de los auriculares.</string>
   <string name="headset_only_title">Salida externa unicamente</string>
   <string name="headset_only_summary">Impide que la música suene por los altavoces internos.</string>
   <string name="headset_pause_title">Pausar cuando se desconecte</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Notificaciones</string>
   <string name="notification_visibility_title">Visibilidad de la notificación</string>
   <string name="notification_action_title">Acción de la notificación</string>
-  <string name="notification_nag">Notificación muy detallada</string>
-  <string name="notification_nag_summary">Avisar de los cambios de pista utilizando una notificación emergente</string>
   <string name="playback_screen">Pantalla de reproducción</string>
   <string name="playback_on_startup_title">Abrir al inicio</string>
   <string name="playback_on_startup_summary">Abrir vista de reproducción al inicio</string>
diff --git a/app/src/main/res/values-fa-rIR/translatable.xml b/app/src/main/res/values-fa-rIR/translatable.xml
index aa2e7036..b81859f8 100644
--- a/app/src/main/res/values-fa-rIR/translatable.xml
+++ b/app/src/main/res/values-fa-rIR/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">نگهداشتن اجرای موزیک هنگام از تغییر کردن تمرکز صدا</string>
   <string name="media_button_title">هدست / کنترل های بلوتوثی</string>
   <string name="media_button_summary">این برای قفل صفحه در ICS مورد نیاز است</string>
-  <string name="media_button_beep_title">بوق کنترل هدست</string>
-  <string name="media_button_beep_summary">اجرای صدای بوق هنگامی که از یک آهنگ با دوبار کلیک بر روی کنترک هدست رد می شود</string>
   <string name="headset_only_title">فقط خروجی های جانبی</string>
   <string name="headset_only_summary">مانع از پخش موسیقی از طریق بلندگوهای داخلی می شود.</string>
   <string name="headset_pause_title">هنگامی که جدا می شود پخش متوقف گردد</string>
diff --git a/app/src/main/res/values-fi/translatable.xml b/app/src/main/res/values-fi/translatable.xml
index be21fc1c..ec31525c 100644
--- a/app/src/main/res/values-fi/translatable.xml
+++ b/app/src/main/res/values-fi/translatable.xml
@@ -62,7 +62,7 @@
   <string name="remove">Poista</string>
   <string name="play_or_enqueue">Lisää jonoon jos toistetaan; toista jos keskeytetty</string>
   <string name="open">Avaa</string>
-  <string name="go_home">Kotihakemisto</string>
+  <string name="go_home">Kotikansio</string>
   <string name="jumping_to_song">Kappale on jo jonossa, ohitetaan…</string>
   <!--As a developer, you should always supply "one" and "other"
 		strings. Your translators will know which strings are actually
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Jatka toistamista pysyvän äänen kohdistuksen menettämisen jälkeen</string>
   <string name="media_button_title">Kuulokkeiden/bluetoothin ohjaimet</string>
   <string name="media_button_summary">Vaadittu myös ICS:n lukitusnäytön ohjaimia varten.</string>
-  <string name="media_button_beep_title">Kuulokeohjauksen piippaus</string>
-  <string name="media_button_beep_summary">Piippaa kun kappale ohitetaan kuulokkeiden ohjaimella.</string>
   <string name="headset_only_title">Vain ulkoinen ulostulo</string>
   <string name="headset_only_summary">Estää musiikin soiton sisäisistä kaiuttimista.</string>
   <string name="headset_pause_title">Keskeytä kun kuulokkeet irrotetaan</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Ilmoitukset</string>
   <string name="notification_visibility_title">Ilmoituksen näkyvyys</string>
   <string name="notification_action_title">Ilmoitustoiminto</string>
-  <string name="notification_nag">Erittäin runsas ilmoitus</string>
-  <string name="notification_nag_summary">Ilmoita kappaleen vaihtumisesta \'Heads-Up\'-ilmoituksella</string>
   <string name="playback_screen">Toistonäkymä</string>
   <string name="playback_on_startup_title">Avaa käynnistäessä</string>
   <string name="playback_on_startup_summary">Avaa toistonäkymä käynnistäessä</string>
@@ -265,6 +261,8 @@
   <string name="toggle_controls">Näytä/piilota ohjaimet</string>
   <string name="seek_10s_backward">Siirry 10 sekuntia taakse</string>
   <string name="seek_10s_forward">Siirry 10 sekuntia eteen</string>
+  <string name="move_to_top">Siirrä ylös</string>
+  <string name="move_to_bottom">Siirrä alas</string>
   <string name="preferences_action_show_queue">Näytä jono</string>
   <string name="preferences_action_clear_queue">Tyhjennä jono</string>
   <string name="preferences_action_enqueue_current_album">Aseta albumi jonoon</string>
@@ -277,7 +275,7 @@
   <string name="second_hint">SS</string>
   <string name="error_invalid_position">Virheellinen arvo</string>
   <string name="filebrowser_start">Tiedostohallinnan aloitus</string>
-  <string name="customize_filebrowser_start">Tiedostohallinta käynnistyy tästä kansiosta</string>
+  <string name="customize_filebrowser_start">Tiedostonhallinta käynnistyy tästä kansiosta</string>
   <string name="select">Valitse</string>
   <string name="save">Tallenna</string>
   <string name="autoplaylist_playcounts_title">Automaattisen soittolistan luonti</string>
@@ -321,6 +319,7 @@
   <string name="media_scan_preferences">Skannerivalinnat</string>
   <string name="media_scan_preferences_change_title">Skannerivalinnat muuttuivat</string>
   <string name="media_scan_preferences_change_message">Tämän valinnan muuttaminen käynnistää kirjaston täyden läpikäynnin. Haluatko jatkaa?</string>
+  <string name="folder_picker_spinner_desc">Kansion tila:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Pitkä painallus muokkaa kansiovalintoja</string>
   <string name="folder_include">Sisällytä</string>
diff --git a/app/src/main/res/values-fr/translatable.xml b/app/src/main/res/values-fr/translatable.xml
index 2be03abc..efa50c0e 100644
--- a/app/src/main/res/values-fr/translatable.xml
+++ b/app/src/main/res/values-fr/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Continuer la lecture après une perte complète du focus audio</string>
   <string name="media_button_title">Contrôlable par casque/bluetooth</string>
   <string name="media_button_summary">Également nécessaire pour les contrôles de l\'écran verrouillé d\'Android ICS</string>
-  <string name="media_button_beep_title">Bip du contrôle casque</string>
-  <string name="media_button_beep_summary">Bip lors du changement de morceau par double clic avec le contrôle casque</string>
   <string name="headset_only_title">Sortie externe seulement</string>
   <string name="headset_only_summary">Empêche la lecture depuis les haut-parleurs internes</string>
   <string name="headset_pause_title">Mettre en pause à la déconnexion</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Notifications</string>
   <string name="notification_visibility_title">Affichage de la notification</string>
   <string name="notification_action_title">Action de notification</string>
-  <string name="notification_nag">Notification très verbeuse</string>
-  <string name="notification_nag_summary">Annonce les changements de morceau avec une notification flottante</string>
   <string name="playback_screen">Écran de lecture</string>
   <string name="playback_on_startup_title">Ouvrir au démarrage</string>
   <string name="playback_on_startup_summary">Ouvrir l\'écran de lecture au démarrage</string>
@@ -321,6 +317,7 @@
   <string name="media_scan_preferences">Options du scanner</string>
   <string name="media_scan_preferences_change_title">Avertissement</string>
   <string name="media_scan_preferences_change_message">Toute modification entraînera un scan complet de la bibliothèque. Voulez-vous continuer ?</string>
+  <string name="folder_picker_spinner_desc">Statut du Dossier:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Appuyez longuement pour modifier les options des dossiers</string>
   <string name="folder_include">Inclure</string>
diff --git a/app/src/main/res/values-hu/translatable.xml b/app/src/main/res/values-hu/translatable.xml
index 74070d39..ab9d9f3c 100644
--- a/app/src/main/res/values-hu/translatable.xml
+++ b/app/src/main/res/values-hu/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Lejátszás folytatása az audió fókusz végleges elvesztésekor</string>
   <string name="media_button_title">Headset/Bluetooth vezérlés</string>
   <string name="media_button_summary">Ez az ICS képernyőzár kezelőszerveihez is szükséges.</string>
-  <string name="media_button_beep_title">Headset vezérlés visszajelzés</string>
-  <string name="media_button_beep_summary">Sípolás egy szám kihagyása után, ha az a headset dupla kattintásával történt.</string>
   <string name="headset_only_title">Csak külső kimenet</string>
   <string name="headset_only_summary">Megakadályozza, hogy a beépített hangszórókon szóljon a zene.</string>
   <string name="headset_pause_title">Szüneteltetés szétcsatlakozáskor</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Értesítések</string>
   <string name="notification_visibility_title">Értesítések láthatósága</string>
   <string name="notification_action_title">Értesítési művelet</string>
-  <string name="notification_nag">Nagyon bőbeszédű értesítések</string>
-  <string name="notification_nag_summary">Értesítés a számok közötti váltásokról</string>
   <string name="playback_screen">Lejátszási képernyő</string>
   <string name="playback_on_startup_title">Megnyitás indításkor</string>
   <string name="playback_on_startup_summary">A lejátszási nézet megjelenítési indításkor</string>
@@ -321,6 +317,7 @@
   <string name="media_scan_preferences">Átvizsgáló beállítások</string>
   <string name="media_scan_preferences_change_title">Átvizsgáló beállítások módosítva</string>
   <string name="media_scan_preferences_change_message">A beállítás megváltoztatása a gyűjtemény teljes átvizsgálását okozza. Folytatja?</string>
+  <string name="folder_picker_spinner_desc">Könyvtár állapota:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Nyomja meg hosszan a mappabeállítások módosításához</string>
   <string name="folder_include">Belevétel</string>
diff --git a/app/src/main/res/values-in/translatable.xml b/app/src/main/res/values-in/translatable.xml
index 9f1c67c1..d22c10ed 100644
--- a/app/src/main/res/values-in/translatable.xml
+++ b/app/src/main/res/values-in/translatable.xml
@@ -142,8 +142,6 @@
   <string name="ignore_audiofocus_loss_summary">Tetap mainkan saat kehilangan fokus suara</string>
   <string name="media_button_title">Pengendali Set Kepala/Bluetooth</string>
   <string name="media_button_summary">Membutuhkan kontrol pengunci layar ICS</string>
-  <string name="media_button_beep_title">Bip pengendali set kepala</string>
-  <string name="media_button_beep_summary">Bip setelah melompati lagu dengan klik ganda set kepala.</string>
   <string name="headset_only_title">Hanya luaran ekternal</string>
   <string name="headset_only_summary">Non-aktifkan pengeras suara internal</string>
   <string name="headset_pause_title">Jeda saat dicabut</string>
@@ -168,7 +166,6 @@
   <string name="notifications">Pemberitahuan</string>
   <string name="notification_visibility_title">Visibilitas notifikasi</string>
   <string name="notification_action_title">Aksi pemberitahuan</string>
-  <string name="notification_nag_summary">Umumkan perubahan lagu menggunakan Pemberitahuan Mendongak</string>
   <string name="playback_screen">Layar pemutaran</string>
   <string name="playback_on_startup_title">Buka waktu startup</string>
   <string name="playback_on_startup_summary">Buka tampilan pemutaran saat memulai</string>
diff --git a/app/src/main/res/values-it/translatable.xml b/app/src/main/res/values-it/translatable.xml
index aa806684..411b54ad 100644
--- a/app/src/main/res/values-it/translatable.xml
+++ b/app/src/main/res/values-it/translatable.xml
@@ -7,7 +7,7 @@
   <string name="no_songs">Nessun brano trovato sul tuo dispositivo.</string>
   <string name="empty_queue">Nessuna traccia selezionata. Scegline alcune dalla libreria o entra nella modalità casuale premendo su questo messaggio.</string>
   <string name="settings">Impostazioni</string>
-  <string name="no_shuffle">Non mischiare</string>
+  <string name="no_shuffle">Nessuna riproduzione casuale</string>
   <string name="shuffle_songs">Mischia brani</string>
   <string name="shuffle_songs_continuously">Mischia brani continuamente</string>
   <string name="shuffle_albums">Album in shuffle</string>
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Continua a riprodurre alla perdita permanente del focus dell\'audio</string>
   <string name="media_button_title">Controlli cuffie/Bluetooth</string>
   <string name="media_button_summary">Questo è anche richiesto per i controlli ICS lockscreen.</string>
-  <string name="media_button_beep_title">Segnale acustico del controllo cuffie</string>
-  <string name="media_button_beep_summary">Beep dopo aver saltato una traccia con il doppio click sul controllo cuffie.</string>
   <string name="headset_only_title">Solo output esterno</string>
   <string name="headset_only_summary">Previeni la riproduzione della musica attraverso gli altoparlanti interni.</string>
   <string name="headset_pause_title">Metti in pausa quando scollegate</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Notifiche</string>
   <string name="notification_visibility_title">Visibilità delle notifiche</string>
   <string name="notification_action_title">Azione notifica</string>
-  <string name="notification_nag">Notifica molto dettagliata</string>
-  <string name="notification_nag_summary">Annuncia cambi di brano con una notifica \"heads-up\"</string>
   <string name="playback_screen">Schermata riproduzione</string>
   <string name="playback_on_startup_title">Apri all\'avvio</string>
   <string name="playback_on_startup_summary">Apri vista playback all\'avvio</string>
diff --git a/app/src/main/res/values-iw/translatable.xml b/app/src/main/res/values-iw/translatable.xml
index 79e7dc89..b4572f78 100644
--- a/app/src/main/res/values-iw/translatable.xml
+++ b/app/src/main/res/values-iw/translatable.xml
@@ -115,8 +115,6 @@
   <string name="ignore_audiofocus_loss_summary">המשך לנגן באיבוד מיקוד השמע לחלוטין</string>
   <string name="media_button_title">מקשי שליטה באוזניות/Blutooth</string>
   <string name="media_button_summary">זה נדרש גם עבור שליטה ממסך הנעילה ב- ICS.</string>
-  <string name="media_button_beep_title">צפצוף במקשי שליטה</string>
-  <string name="media_button_beep_summary">צפצף לאחר דילוג על רצועה באמצעות הקשה כפולה על מקשי אוזניות</string>
   <string name="headset_only_title">פלט חיצוני בלבד</string>
   <string name="headset_only_summary">מנע מהשמעת מוסיקה מהרמקולים המובנים</string>
   <string name="headset_pause_title">השהה בניתוק</string>
@@ -142,8 +140,6 @@
   <string name="cycle_continuous_shuffling_summary">\'מצב ערבוב\' ינגן רצועות בסדר אקראי לחלוטין</string>
   <string name="notifications">התראות</string>
   <string name="notification_action_title">פעולת התראה</string>
-  <string name="notification_nag">התראה מילולית מאוד</string>
-  <string name="notification_nag_summary">הכרז על שינויי רצועה באמצעות \'התראה קופצת\'</string>
   <string name="playback_screen">מסך נגינה</string>
   <string name="playback_on_startup_title">פתח בהפעלה</string>
   <string name="playback_on_startup_summary">פתח תצוגת נגינה בהפעלה</string>
diff --git a/app/src/main/res/values-ja/translatable.xml b/app/src/main/res/values-ja/translatable.xml
index e1fa2479..98895992 100644
--- a/app/src/main/res/values-ja/translatable.xml
+++ b/app/src/main/res/values-ja/translatable.xml
@@ -142,8 +142,6 @@
   <string name="ignore_audiofocus_loss_summary">オーディオのフォーカスを失っても永久に再生を続けます</string>
   <string name="media_button_title">ヘッドセット/Bluetooth コントロール</string>
   <string name="media_button_summary">ICS ロックスクリーンのコントロールにも必要です。</string>
-  <string name="media_button_beep_title">ヘッドセット コントロール ビープ音</string>
-  <string name="media_button_beep_summary">ヘッドセットのコントロールをダブルクリックして、トラックをスキップした後のビープ音。</string>
   <string name="headset_only_title">外部出力のみ</string>
   <string name="headset_only_summary">内部スピーカーから音楽が再生されないようにします。</string>
   <string name="headset_pause_title">プラグを外した時に一時停止</string>
@@ -170,8 +168,6 @@
   <string name="notifications">通知</string>
   <string name="notification_visibility_title">通知の表示</string>
   <string name="notification_action_title">通知操作</string>
-  <string name="notification_nag">非常に詳細な通知</string>
-  <string name="notification_nag_summary">\'Heads-Up-通知\' を使用してトラックの変更をお知らせします</string>
   <string name="playback_screen">再生画面</string>
   <string name="playback_on_startup_title">起動時に開く</string>
   <string name="playback_on_startup_summary">起動時に再生ビューを開きます</string>
@@ -257,6 +253,8 @@
   <string name="toggle_controls">コントロールを切り替え</string>
   <string name="seek_10s_backward">10 秒前にシーク</string>
   <string name="seek_10s_forward">10 秒先にシーク</string>
+  <string name="move_to_top">先頭に移動</string>
+  <string name="move_to_bottom">最後に移動</string>
   <string name="preferences_action_show_queue">キューを表示</string>
   <string name="preferences_action_clear_queue">キューをクリア</string>
   <string name="preferences_action_enqueue_current_album">アルバムをキューに入れる</string>
@@ -313,6 +311,7 @@
   <string name="media_scan_preferences">スキャナーオプション</string>
   <string name="media_scan_preferences_change_title">スキャナーオプションを変更しました</string>
   <string name="media_scan_preferences_change_message">このオプションを変更すると、ライブラリーのフル再スキャンが始まります。 続行しますか?</string>
+  <string name="folder_picker_spinner_desc">ディレクトリーのステータス:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">長押ししてフォルダーオプションを変更します</string>
   <string name="folder_include">含む</string>
diff --git a/app/src/main/res/values-ko/translatable.xml b/app/src/main/res/values-ko/translatable.xml
index 43cc354a..897b52ec 100644
--- a/app/src/main/res/values-ko/translatable.xml
+++ b/app/src/main/res/values-ko/translatable.xml
@@ -142,8 +142,6 @@
   <string name="ignore_audiofocus_loss_summary">포커스를 잃었을때에도 재생을 유지합니다</string>
   <string name="media_button_title">헤드셋/블루투스 조절</string>
   <string name="media_button_summary">ICS 잠금화면 컨트롤이 필요로 합니다.</string>
-  <string name="media_button_beep_title">헤드셋 조절 음</string>
-  <string name="media_button_beep_summary">헤드셋 컨트롤을 두번눌러 스킵시 비프음 발생.</string>
   <string name="headset_only_title">외부 출력만</string>
   <string name="headset_only_summary">내장 스피커를 통하여 재생 되는것을 방지</string>
   <string name="headset_pause_title">헤드셋 뽑을때 일시 정지</string>
@@ -170,8 +168,6 @@
   <string name="notifications">알림</string>
   <string name="notification_visibility_title">알림 표시</string>
   <string name="notification_action_title">알림을 눌렀을때</string>
-  <string name="notification_nag">매우 잦은 알림</string>
-  <string name="notification_nag_summary">\'Heads-Up-Notification\' 사용중일때 곡 변경 알리기</string>
   <string name="playback_screen">재생 화면</string>
   <string name="playback_on_startup_title">시작 시 열기</string>
   <string name="playback_on_startup_summary">시작시 재생 중 화면 열기</string>
@@ -284,6 +280,8 @@
   <string name="playlist_sync_disabled">비활성</string>
   <string name="playlist_sync_folder_title">동기화 폴더</string>
   <string name="playlist_sync_folder_summary">폴더를 재생목록 동기화에 사용함</string>
+  <string name="playlist_export_relative_paths_title">상대 경로를 사용하여 내보내기</string>
+  <string name="playlist_export_relative_paths_summary">재생 목록과 관련된 참조 파일 경로</string>
   <string name="permission_request_summary">Vanilla Music은 음악 라이브러리를 표시하기 위하여 읽기 권한이 필요합니다
 </string>
   <string name="reverse_sort">반대로 정렬</string>
@@ -312,6 +310,7 @@
   <string name="media_scan_preferences">검색 옵션</string>
   <string name="media_scan_preferences_change_title">검색 옵션이 변경되었습니다</string>
   <string name="media_scan_preferences_change_message">이 옵션을 변경하면 라이브러리를 모두 재 검색합니다. 계속 하시겠습니까?</string>
+  <string name="folder_picker_spinner_desc">디렉토리 상태 : </string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">길게 눌러 폴더 옵션을 수정</string>
   <string name="folder_include">포함</string>
diff --git a/app/src/main/res/values-lv/translatable.xml b/app/src/main/res/values-lv/translatable.xml
index 344a2c0d..b2b25bd2 100644
--- a/app/src/main/res/values-lv/translatable.xml
+++ b/app/src/main/res/values-lv/translatable.xml
@@ -158,8 +158,6 @@
   <string name="ignore_audiofocus_loss_summary">Turpināt atskaņošanu patstāvīga audio fokusa zaudējuma gadījumā</string>
   <string name="media_button_title">Austiņu/Bluetooth vadīklas</string>
   <string name="media_button_summary">Šis ir nepieciešams arī ICS slēgekrāna vadīklām.</string>
-  <string name="media_button_beep_title">Austiņu vadīklu pīkstēšana</string>
-  <string name="media_button_beep_summary">Pīkstēt pēc celiņa izlaišanas ar austiņu vadīklas dubultklikšķi.</string>
   <string name="headset_only_title">Tikai ārēja izvade</string>
   <string name="headset_only_summary">Nepieļauj mūzikas atskaņošanu caur iekšējiem skaļruņiem.</string>
   <string name="headset_pause_title">Pauzēt, kad atvienotas austiņas</string>
@@ -187,8 +185,6 @@
   <string name="notifications">Paziņojumi</string>
   <string name="notification_visibility_title">Paziņojuma redzamība</string>
   <string name="notification_action_title">Paziņojuma darbība</string>
-  <string name="notification_nag">Ļoti runīgs paziņojums</string>
-  <string name="notification_nag_summary">Paziņot par dziesmas maiņu ar uzekrāna paziņojumu</string>
   <string name="playback_screen">Atskaņošanas ekrāns</string>
   <string name="playback_on_startup_title">Atvērt palaižot</string>
   <string name="playback_on_startup_summary">Palaižot programmu, atvērt atskaņošanas skatu</string>
diff --git a/app/src/main/res/values-nl/translatable.xml b/app/src/main/res/values-nl/translatable.xml
index 64681036..cd0b3fd7 100644
--- a/app/src/main/res/values-nl/translatable.xml
+++ b/app/src/main/res/values-nl/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Blijf afspelen bij permanent verlies van audiofocus</string>
   <string name="media_button_title">Koptelefoon-/bluetoothbediening</string>
   <string name="media_button_summary">Dit is ook vereist voor ICS-vergrendelschermbediening.</string>
-  <string name="media_button_beep_title">Pieptoon koptelefoon</string>
-  <string name="media_button_beep_summary">Pieptoon na het overslaan van een nummer m.b.v. een dubbele klik op de koptelefoonbediening.</string>
   <string name="headset_only_title">Alleen externe uitvoer</string>
   <string name="headset_only_summary">Voorkomt dat muziek via de interne luidsprekers wordt afgespeeld.</string>
   <string name="headset_pause_title">Pauzeer bij unpluggen</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Meldingen</string>
   <string name="notification_visibility_title">Zichtbaarheid van meldingen</string>
   <string name="notification_action_title">Meldingsactie</string>
-  <string name="notification_nag">Zeer uitgebreide melding</string>
-  <string name="notification_nag_summary">Kondig het volgende nummer aan met behulp van een \'Heads-Up-melding\'</string>
   <string name="playback_screen">Afspeelscherm</string>
   <string name="playback_on_startup_title">Open bij opstarten</string>
   <string name="playback_on_startup_summary">Open afspeelschermweergave bij opstarten</string>
@@ -321,6 +317,7 @@
   <string name="media_scan_preferences">Scanneropties</string>
   <string name="media_scan_preferences_change_title">Scanneropties zijn veranderd</string>
   <string name="media_scan_preferences_change_message">Veranderen van deze optie zorgt ervoor dat de gehele bibliotheek opnieuw gescand wordt. Doorgaan?</string>
+  <string name="folder_picker_spinner_desc">Directoriestatus:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Lang aanraken voor het veranderen van de mapopties</string>
   <string name="folder_include">Sluit in</string>
diff --git a/app/src/main/res/values-pl/translatable.xml b/app/src/main/res/values-pl/translatable.xml
index 5b2212bd..1fbcb853 100644
--- a/app/src/main/res/values-pl/translatable.xml
+++ b/app/src/main/res/values-pl/translatable.xml
@@ -166,8 +166,6 @@
   <string name="ignore_audiofocus_loss_summary">Podtrzymuj odtwarzanie przy całkowitej utracie koncentracji dźwięku</string>
   <string name="media_button_title">Sterowanie przyciskami zestawu słuchawkowego/Bluetooth</string>
   <string name="media_button_summary">Wymagane także dla blokady ekranu Androida 4.0+.</string>
-  <string name="media_button_beep_title">Dzwięk przy sterowaniu zestawem słuchawkowym.</string>
-  <string name="media_button_beep_summary">Odtwórz dźwięk po przeskoczeniu do następnego utworu za pomocą podwójnego kliknięcia przyciskiem sterowania zestawu słuchawkowego.</string>
   <string name="headset_only_title">Jedynie wyjście zewnętrzne</string>
   <string name="headset_only_summary">Zapobiega odtwarzaniu dźwięku przez głośnik wewnętrzny urządzenia.</string>
   <string name="headset_pause_title">Zapauzuj po odłączeniu</string>
@@ -194,8 +192,6 @@
   <string name="notifications">Powiadomienie</string>
   <string name="notification_visibility_title">Widoczność powiadomienia</string>
   <string name="notification_action_title">Akcja powiadomienia</string>
-  <string name="notification_nag">Zawsze widoczne powiadomienie</string>
-  <string name="notification_nag_summary">Ogłaszaj zmiany utworów na zawsze przypiętym powiadomieniu</string>
   <string name="playback_screen">Ekran odtwarzania</string>
   <string name="playback_on_startup_title">Otwórz na starcie</string>
   <string name="playback_on_startup_summary">Otwieranie ekranu odtwarzania na starcie</string>
@@ -225,6 +221,8 @@
   <string name="enable_scroll_to_song_summary">Przewiń do aktualnie odtwarzanego utworu/albumu/artysty w widoku biblioteki</string>
   <string name="queue_enable_scroll_to_song_title">Przewiń do odtwarzanego utworu</string>
   <string name="queue_enable_scroll_to_song_summary">Przewiń do obecnie odtwarzanego utworu na liście odtwarzania przy zmianie piosenki</string>
+  <string name="jump_to_enqueued_on_play_title">Przeskocz do utworu w kolejce</string>
+  <string name="jump_to_enqueued_on_play_summary">Jeżeli żądany utwór już znajduje się w kolejce odtwarzania, przeskocz do niego zamiast wymazywać całą kolejkę</string>
   <string name="coverloader_android_title">Załaduj okładkę albumu z systemu Android</string>
   <string name="coverloader_android_summary">Sprawdzanie w wewnętrznej bazie systemu Android w poszukiwaniu okładki albumu</string>
   <string name="coverloader_vanilla_title">Ładowanie okładki albumu z folderu</string>
@@ -306,6 +304,8 @@
   <string name="playlist_sync_disabled">Wyłączono</string>
   <string name="playlist_sync_folder_title">Katalog synchronizacji</string>
   <string name="playlist_sync_folder_summary">Katalog do synchronizacji list odtwarzania</string>
+  <string name="playlist_export_relative_paths_title">Eksportuj używając ścieżek względnych</string>
+  <string name="playlist_export_relative_paths_summary">Ścieżki plików są względne do katalogu z listą odtwarzania</string>
   <string name="permission_request_summary">Vanilla Music potrzebuje uprawnień do wyświetlenia Twojej biblioteki muzycznej</string>
   <string name="reverse_sort">Odwróć sortowanie</string>
   <string name="share">Udostępnij…</string>
@@ -333,6 +333,7 @@
   <string name="media_scan_preferences">Opcje skanowania</string>
   <string name="media_scan_preferences_change_title">Zmieniono opcje skanowania</string>
   <string name="media_scan_preferences_change_message">Zmiana tej opcji spowoduje ponowny skan Twojej biblioteki. Czy chcesz kontynuować?</string>
+  <string name="folder_picker_spinner_desc">Stan katalogu:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Naciśnij i przytrzymaj, aby zmienić opcje katalogów</string>
   <string name="folder_include">Zawrzyj</string>
diff --git a/app/src/main/res/values-pt-rBR/translatable.xml b/app/src/main/res/values-pt-rBR/translatable.xml
index a71669e9..4ae12623 100644
--- a/app/src/main/res/values-pt-rBR/translatable.xml
+++ b/app/src/main/res/values-pt-rBR/translatable.xml
@@ -109,8 +109,6 @@
   <string name="ignore_audiofocus_loss_summary">Manter reprodução ao perder o foco de áudio</string>
   <string name="media_button_title">Controles Headset/Bluetooth</string>
   <string name="media_button_summary">Isto é necessário para o controles na Tela de bloqueio ICS</string>
-  <string name="media_button_beep_title">Sinal de controle para o Headset</string>
-  <string name="media_button_beep_summary">Sinalizar ao avançar uma faixa com duplo clique no controlo do headset</string>
   <string name="headset_only_title">Apenas sáida externa</string>
   <string name="headset_only_summary">Prevenir que a música seja reproduzida pelos altofalantes internos</string>
   <string name="headset_pause_title">Pausar ao desconectar</string>
@@ -133,7 +131,6 @@
   <string name="cycle_continuous_shuffling">Misturar continuamente</string>
   <string name="notifications">Notificações</string>
   <string name="notification_action_title">Ação da notificação</string>
-  <string name="notification_nag">Notificação bem detalhada</string>
   <string name="playback_screen">Tela de reprodução</string>
   <string name="playback_on_startup_title">Abrir quando iniciar</string>
   <string name="playback_on_startup_summary">Abrir lista de reprodução no inicio</string>
diff --git a/app/src/main/res/values-pt/translatable.xml b/app/src/main/res/values-pt/translatable.xml
index 6e216f36..d1d1c397 100644
--- a/app/src/main/res/values-pt/translatable.xml
+++ b/app/src/main/res/values-pt/translatable.xml
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Manter reprodução ao perder o foco áudio</string>
   <string name="media_button_title">Auscultadores/bluetooth</string>
   <string name="media_button_summary">Necessário para os controlos do ecrã de bloqueio ICS</string>
-  <string name="media_button_beep_title">Sinal de auscultador</string>
-  <string name="media_button_beep_summary">Sinalizar ao avançar uma faixa com duplo clique no controlo de auscultador</string>
   <string name="headset_only_title">Apenas saída externa</string>
   <string name="headset_only_summary">Impede que a música seja reproduzida através dos altifalantes internos</string>
   <string name="headset_pause_title">Pausa ao remover</string>
@@ -178,8 +176,6 @@
   <string name="notifications">Notificações</string>
   <string name="notification_visibility_title">Visibilidade da notificação</string>
   <string name="notification_action_title">Ação na notificação</string>
-  <string name="notification_nag">Notificação muito detalhada</string>
-  <string name="notification_nag_summary">Anunciar alteração de faixa com notificação \'Heads-Up\'</string>
   <string name="playback_screen">Ecrã de reprodução</string>
   <string name="playback_on_startup_title">Abrir ao iniciar</string>
   <string name="playback_on_startup_summary">Abrir vista de reprodução ao iniciar</string>
diff --git a/app/src/main/res/values-ru/translatable.xml b/app/src/main/res/values-ru/translatable.xml
index 430a7a6d..24fd1767 100644
--- a/app/src/main/res/values-ru/translatable.xml
+++ b/app/src/main/res/values-ru/translatable.xml
@@ -166,8 +166,6 @@
   <string name="ignore_audiofocus_loss_summary">Не останавливаться после полной потери аудио-фокуса</string>
   <string name="media_button_title">Управление с проводной гарнитуры/Bluetooth</string>
   <string name="media_button_summary">Необходимо для управления воспроизведением с экрана блокировки в ICS (Android 4).</string>
-  <string name="media_button_beep_title">Гудок при управлении с проводной гарнитуры</string>
-  <string name="media_button_beep_summary">При двойном нажатии на кнопку гарнитуры переход к следующей дорожке сопровождается звуком.</string>
   <string name="headset_only_title">Только внешний аудио-вывод</string>
   <string name="headset_only_summary">Запрещает воспроизведение музыки через встроенные динамики.</string>
   <string name="headset_pause_title">Пауза при отсоединении</string>
@@ -194,8 +192,6 @@
   <string name="notifications">Уведомления</string>
   <string name="notification_visibility_title">Отображение уведомления</string>
   <string name="notification_action_title">Реакция уведомления</string>
-  <string name="notification_nag">Навязчивые уведомления</string>
-  <string name="notification_nag_summary">Объявлять смену дорожек, используя \"Heads-Up-Notification\"</string>
   <string name="playback_screen">Экран воспроизведения</string>
   <string name="playback_on_startup_title">Показывать после запуска</string>
   <string name="playback_on_startup_summary">После запуска перейти к экрану воспроизведения</string>
@@ -281,6 +277,8 @@
   <string name="toggle_controls">Тумблер органов управления</string>
   <string name="seek_10s_backward">Отмотать на 10 секунд назад</string>
   <string name="seek_10s_forward">Промотать на 10 секунд</string>
+  <string name="move_to_top">Наверх</string>
+  <string name="move_to_bottom">Вниз</string>
   <string name="preferences_action_show_queue">Показать очередь</string>
   <string name="preferences_action_clear_queue">Убрать остаток очереди</string>
   <string name="preferences_action_enqueue_current_album">Заполнить очередь альбомом</string>
@@ -337,6 +335,7 @@
   <string name="media_scan_preferences">Настройка сканера</string>
   <string name="media_scan_preferences_change_title">Изменение настроек сканера</string>
   <string name="media_scan_preferences_change_message">Изменение этой настройки приведёт к полному сканированию библиотеки. Продолжить?</string>
+  <string name="folder_picker_spinner_desc">Готовность папки:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Длительное нажатие вызовет настройки папки</string>
   <string name="folder_include">Учесть</string>
diff --git a/app/src/main/res/values-sr/translatable.xml b/app/src/main/res/values-sr/translatable.xml
index 1a5583cf..72f52309 100644
--- a/app/src/main/res/values-sr/translatable.xml
+++ b/app/src/main/res/values-sr/translatable.xml
@@ -153,8 +153,6 @@
   <string name="ignore_audiofocus_loss_summary">Настави пуштање по трајном губитку фокуса</string>
   <string name="media_button_title">Управљање слушалицама/блутутом</string>
   <string name="media_button_summary">Потребно за контроле закључаног екрана за Ајскрим Сендвич.</string>
-  <string name="media_button_beep_title">Контролни звучни сигнал слушалица</string>
-  <string name="media_button_beep_summary">Пушта звучни сигнал након прескакања нумере двокликом на тастер слушалица.</string>
   <string name="headset_only_title">Само спољашњи излаз</string>
   <string name="headset_only_summary">Спречава пуштање музике на уграђене звучнике.</string>
   <string name="headset_pause_title">Паузирај по искључењу</string>
@@ -181,8 +179,6 @@
   <string name="notifications">Обавештења</string>
   <string name="notification_visibility_title">Видљивост обавештења</string>
   <string name="notification_action_title">Радња обавештења</string>
-  <string name="notification_nag">Веома исцрпно обавештење</string>
-  <string name="notification_nag_summary">Објави промене нумера користећи „Heads-Up“ обавештење</string>
   <string name="playback_screen">Екран пуштања</string>
   <string name="playback_on_startup_title">Отвори по покретању</string>
   <string name="playback_on_startup_summary">Отвара екран пуштања по покретању</string>
diff --git a/app/src/main/res/values-sv/translatable.xml b/app/src/main/res/values-sv/translatable.xml
index 8c71804f..fd44d909 100644
--- a/app/src/main/res/values-sv/translatable.xml
+++ b/app/src/main/res/values-sv/translatable.xml
@@ -4,7 +4,7 @@
   <string name="ok">OK</string>
   <string name="cancel">Avbryt</string>
   <!--Playback Activity (main screen)-->
-  <string name="no_songs">Inga låtar hittade på enheten.</string>
+  <string name="no_songs">Inga låtar hittades på din enhet.</string>
   <string name="empty_queue">Inga låtar valda. Välj några från biblioteket eller ange slumpmässigt läge genom att trycka på det här meddelandet.</string>
   <string name="settings">Inställningar</string>
   <string name="no_shuffle">Blanda inte</string>
@@ -150,8 +150,6 @@
   <string name="ignore_audiofocus_loss_summary">Fortsätt spela på permanent ljudfokusförlust</string>
   <string name="media_button_title">Headset/Bluetooth-kontroller</string>
   <string name="media_button_summary">Detta är också nödvändigt för ICS-låsskärmskontroller.</string>
-  <string name="media_button_beep_title">Headset-kontrollsignal</string>
-  <string name="media_button_beep_summary">Pip efter att ha hoppat över en låt med ett dubbelklick för headsetkontrollen.</string>
   <string name="headset_only_title">Endast extern utgång</string>
   <string name="headset_only_summary">Förhindrar att musik spelas upp via de interna högtalarna.</string>
   <string name="headset_pause_title">Pausa när de urkopplas</string>
@@ -172,14 +170,12 @@
   <string name="replaygain_preamp_note_content">Android tillåter inte Vanilla Music att höja volymen till &gt;100%. Ställa in förförstärken till ett högt värde kan orsaka problem om du lyssnar på \"tyst\" musik.\n\nRekommendrade värden är:\n-&gt; -3dB för tyst/klassisk musik\n-&gt; +3dB för post-2000 inspelningar</string>
   <string name="readahead">Aktivera att läsa vidare</string>
   <string name="readahead_summary">Läs vidare den aktuella låten. Det här alternativet kan lösa \"ljudavbrotts\"-problem. (orsakas av ett långsam SD-kort)</string>
-  <string name="equalizer">Equalizer</string>
+  <string name="equalizer">Frekvenskorrigerare</string>
   <string name="cycle_continuous_shuffling">Blanda kontinuerligt</string>
   <string name="cycle_continuous_shuffling_summary">\"Blandningsläge\" kommer att spela upp låtar i helt slumpmässig ordning</string>
   <string name="notifications">Aviseringar</string>
   <string name="notification_visibility_title">Synlighet för aviseringar</string>
   <string name="notification_action_title">Åtgärder för aviseringar</string>
-  <string name="notification_nag">Mycket utförlig avisering</string>
-  <string name="notification_nag_summary">Meddela låtändringar med hjälp av en \"Heads-Up-Avisering\"</string>
   <string name="playback_screen">Uppspelningsskärm</string>
   <string name="playback_on_startup_title">Öppna vid start</string>
   <string name="playback_on_startup_summary">Öppna uppspelningsvyn vid start</string>
@@ -309,7 +305,7 @@
   <string name="media_scan_header">Medieskanner</string>
   <string name="media_scan_full">Skanna hela filsystemet (långsammare)</string>
   <string name="media_scan_drop_db">Ta bort mediadatabasen</string>
-  <string name="media_scan_start">Starta skanningen</string>
+  <string name="media_scan_start">Starta skanning</string>
   <string name="media_scan_force_bastp">Använder alltid inbyggda taggläsaren</string>
   <string name="media_scan_group_albums">Gruppera album efter mapp</string>
   <string name="media_statistics">Statistik</string>
@@ -321,6 +317,7 @@
   <string name="media_scan_preferences">Inställningar för skannern</string>
   <string name="media_scan_preferences_change_title">Inställningarna för skannern ändrade</string>
   <string name="media_scan_preferences_change_message">Om du ändrar det här inställningen startar du en fullständig omskanning av ditt bibliotek. Vill du fortsätta?</string>
+  <string name="folder_picker_spinner_desc">Status för mappen:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Långt tryck för att ändra mappalternativ</string>
   <string name="folder_include">Inkludera</string>
diff --git a/app/src/main/res/values-tr/translatable.xml b/app/src/main/res/values-tr/translatable.xml
index 996fc111..4807a72e 100644
--- a/app/src/main/res/values-tr/translatable.xml
+++ b/app/src/main/res/values-tr/translatable.xml
@@ -32,35 +32,35 @@
   <string name="_year">yıl</string>
   <string name="_replaygain">seseşit</string>
   <!--New Playlist Dialog-->
-  <string name="choose_playlist_name">Oynatmalık adını seç</string>
+  <string name="choose_playlist_name">Çalma listesi adını seç</string>
   <string name="create">Oluştur</string>
   <string name="overwrite">Üzerine yaz</string>
-  <string name="delete_playlist">Oynatmalık %s silinsin mi?</string>
+  <string name="delete_playlist">Çalma listesi %s silinsin mi?</string>
   <!--Library-->
   <string name="enqueue">Kuyruğa ekle</string>
-  <string name="enqueue_as_next">Sonrakini oynat</string>
-  <string name="play">Oynat</string>
+  <string name="enqueue_as_next">Sonrakini çal</string>
+  <string name="play">Çal</string>
   <string name="edit">Düzenle</string>
   <string name="rename">Yeniden adlandır</string>
   <string name="save_as_playlist">Çalma listesi olarak kaydet...</string>
   <string name="add_to_playlist">Çalma listesine ekle...</string>
   <string name="add_to_homescreen">Ana ekrana ekle...</string>
   <string name="add_to">Şuraya ekle...</string>
-  <string name="playlist">Oynatmalık</string>
+  <string name="playlist">Çalma listesi</string>
   <string name="homescreen">Ana ekran</string>
   <string name="add_to_favorites">Gözdelere ekle</string>
   <string name="remove_from_favorites">Gözdelerden kaldır</string>
   <string name="playlist_favorites">Gözdeler</string>
-  <string name="new_playlist">Yeni oynatmalık...</string>
+  <string name="new_playlist">Yeni çalma listesi...</string>
   <string name="expand">Genişlet</string>
-  <string name="expand_or_play_all">Genişlet veya hepsini oynat</string>
+  <string name="expand_or_play_all">Genişlet veya hepsini çal</string>
   <string name="delete">Sil</string>
-  <string name="playback_view">Şimdi oynatılıyor</string>
+  <string name="playback_view">Şimdi çalınıyor</string>
   <string name="sort_by">Sırala</string>
   <string name="search">Ara</string>
   <string name="done">Bitti</string>
   <string name="remove">Kaldır</string>
-  <string name="play_or_enqueue">Oynatma varsa kuyruğa ekle; duraklatıldıysa oynat</string>
+  <string name="play_or_enqueue">Çalınıyorsa kuyruğa ekle; duraklatıldıysa çal</string>
   <string name="open">Aç</string>
   <string name="go_home">Ev dizini</string>
   <string name="jumping_to_song">Şarkı zaten kuyrukta, atlanıyor...</string>
@@ -74,8 +74,8 @@
 		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
 		to see which categories apply to integer numbers in their languages-->
   <plurals name="playing">
-    <item quantity="one">%d parça oynatılıyor.</item>
-    <item quantity="other">%d parça oynatılıyor.</item>
+    <item quantity="one">%d parça çalınıyor.</item>
+    <item quantity="other">%d parça çalınıyor.</item>
   </plurals>
   <plurals name="enqueued">
     <item quantity="one">%d parça kuyruğa alındı.</item>
@@ -83,11 +83,11 @@
   </plurals>
   <plurals name="added_to_playlist">
     <item quantity="one"> %1$d parça %2$s oynatmalığına eklendi.</item>
-    <item quantity="other">%1$d parça %2$s oynatmalığına eklendi.</item>
+    <item quantity="other">%1$d parça %2$s çalma listesine eklendi.</item>
   </plurals>
   <plurals name="removed_from_playlist">
     <item quantity="one">%1$d parça %2$s oynatmalığından kaldırıldı.</item>
-    <item quantity="other">%1$d parça %2$s oynatmalığından kaldıldı.</item>
+    <item quantity="other">%1$d parça %2$s çalma listesinden kaldırıldı.</item>
   </plurals>
   <plurals name="deleted">
     <item quantity="one">%d parça silindi.</item>
@@ -102,7 +102,7 @@
   <string name="albumartists">Albüm Sanatçıları</string>
   <string name="composers">Besteciler</string>
   <string name="songs">Parçalar</string>
-  <string name="playlists">Oynatmalıklar</string>
+  <string name="playlists">Listeler</string>
   <string name="genres">Türler</string>
   <string name="files">Dosyalar</string>
   <string name="artist">Sanatçı</string>
@@ -114,7 +114,7 @@
   <string name="file_time">Değiştirilme zamanı</string>
   <string name="extension">Uzantı</string>
   <string name="unknown">Bilinmeyen</string>
-  <string name="play_all">Hepsini oynat</string>
+  <string name="play_all">Hepsini çal</string>
   <string name="enqueue_all">Hepsini kuyruğa ekle</string>
   <string name="all_songs">Tüm parçalar</string>
   <string name="details">Ayrıntılar</string>
@@ -130,7 +130,7 @@
   <string name="artist_album_title">Sanatçı, albüm, başlık</string>
   <string name="artist_year">Sanatçı, yıl</string>
   <string name="album_track">Albüm, parça numarası</string>
-  <string name="song_playcount">Oynatma sayısı</string>
+  <string name="song_playcount">Çalma sayısı</string>
   <!--Preferences-->
   <plurals name="seconds">
     <item quantity="one">%d saniye</item>
@@ -146,23 +146,21 @@
   </plurals>
   <string name="audio">Ses</string>
   <string name="volume_during_ducking_title">Bildirim sırasında ses düzeyi</string>
-  <string name="volume_during_ducking_summary">Oynatma ses düzeyi</string>
-  <string name="ignore_audiofocus_loss_summary">Sürekli ses odak kaybında oynatmayı sürdür</string>
+  <string name="volume_during_ducking_summary">Çalma ses düzeyi</string>
+  <string name="ignore_audiofocus_loss_summary">Sürekli ses odak kaybında çalmayı sürdür</string>
   <string name="media_button_title">Kulaklık/Bluetooth denetimleri</string>
   <string name="media_button_summary">Bu aynı zamanda ICS kilit ekranı denetimleri için de gereklidir.</string>
-  <string name="media_button_beep_title">Kulaklık denetim bipi</string>
-  <string name="media_button_beep_summary">Kulaklık düğmesine iki kez basınca izi atlayıp biple.</string>
   <string name="headset_only_title">Yalnızca harici çıkış</string>
-  <string name="headset_only_summary">Müziğin dahili hoparlörlerden oynatılmasını engeller.</string>
+  <string name="headset_only_summary">Müziğin dahili hoparlörlerden çalınmasını engeller.</string>
   <string name="headset_pause_title">Çıkarıldığında duraklat</string>
   <string name="headset_pause_summary">Kulaklıklar takılı olmadığında müziği duraklatır.</string>
-  <string name="headset_launch_title">Takıldığında oynat</string>
-  <string name="headset_launch_summary">Kulaklıklar takıldığında oynatmaya başla (\'Kulaklık Bulucu\' uygulamasının yüklü olmasını gerektirir).</string>
+  <string name="headset_launch_title">Takıldığında çal</string>
+  <string name="headset_launch_summary">Kulaklıklar takıldığında çalmaya başla (\'Kulaklık Bulucu\' uygulamasının yüklü olmasını gerektirir).</string>
   <string name="headset_launch_app_missing">Bu özellik \'Kulaklık Bulucu\' uygulamasının yüklü olmasını gerektirir.\nBu uygulamayı yüklemek için Play Store\'u şimdi açmak ister misiniz?</string>
   <string name="replaygain">Ses Eşitleme</string>
   <string name="replaygain_summary">Ses Eşitleme bilgisinin nasıl kullanılacağını düzenle</string>
   <string name="replaygain_track_title">Parça başına Ses Eşitlemeyi etkinleştir</string>
-  <string name="replaygain_track_summary">Tüm parçaları aynı ses düzeyinde oynat</string>
+  <string name="replaygain_track_summary">Tüm parçaları aynı ses düzeyinde çal</string>
   <string name="replaygain_album_title">Albüm Ses Eşitlemeyi etkinleştir</string>
   <string name="replaygain_album_summary">Albüm dinamiklerini koru</string>
   <string name="replaygain_bump_title">Pre-amp Ses Eşitlemesi</string>
@@ -171,18 +169,16 @@
   <string name="replaygain_preamp_note_title">Not</string>
   <string name="replaygain_preamp_note_content">Android Vanilya Müzik\'in ses düzeyini &gt;%100\'e çıkartmasına izin vermiyor. Pre-amp\'ı daha yüksek bir değere çıkarmak özellikle \"sessiz\" müzikler dinlerken sorunlara neden olabilir.\n\nTavsiye edilen değerler: sessiz/klasik müzik için \n-&gt; -3dB -2000 yılı sonrası kayıtlar için +3dB\'dir.</string>
   <string name="readahead">Önbelleğe yazmayı etkinleştir</string>
-  <string name="readahead_summary">Şu anda oynatılan parçayı önden oku. Bu seçenek \'ses kaybı\' sorunlarını çözebilir (genelde yavaş SD kart nedenli).</string>
+  <string name="readahead_summary">Şu anda çalınan parçayı önden oku. Bu seçenek \'ses kaybı\' sorunlarını çözebilir (genelde yavaş SD kart nedenli).</string>
   <string name="equalizer">Ses Efektleri</string>
   <string name="cycle_continuous_shuffling">Sürekli karıştır</string>
   <string name="cycle_continuous_shuffling_summary">\'Karıştır kipi\' parçaları tümüyle rastgele sırada çalar</string>
   <string name="notifications">Bildirimler</string>
   <string name="notification_visibility_title">Bildirim görünürlüğü</string>
   <string name="notification_action_title">Bildirim eylemi</string>
-  <string name="notification_nag">Tam sözlü bildirim</string>
-  <string name="notification_nag_summary">Parça değişikliklerini \'Ekran Üstü Bildirimi\' ile duyur</string>
-  <string name="playback_screen">Oynatma ekranı</string>
+  <string name="playback_screen">Çalma ekranı</string>
   <string name="playback_on_startup_title">Başlangıçta aç</string>
-  <string name="playback_on_startup_summary">Başlangıçta oynatım görünümünü açar</string>
+  <string name="playback_on_startup_summary">Başlangıçta çalma görünümünü açar</string>
   <string name="display_mode_title">Görüntü kipi</string>
   <string name="swipe_up_action_title">Yukarı çekme eylemi</string>
   <string name="swipe_down_action_title">Aşağı çekme eylemi</string>
@@ -190,7 +186,7 @@
   <string name="cover_longpress_action_title">Kapağa uzun dokunma eylemi</string>
   <string name="library_screen">Arşiv ekranı</string>
   <string name="default_action_title">Öntanımlı eylem</string>
-  <string name="default_playlist_action_title">Oynatmalıklar için öntanımlı eylem</string>
+  <string name="default_playlist_action_title">Çalma listeleri için öntanımlı eylem</string>
   <string name="accelerometer_shake">İvmeölçer sallama</string>
   <string name="enable_shake_title">İvmeölçer sallamasını etkinleştir</string>
   <string name="enable_shake_summary">Yalnızca müzik çalarken etkindir. Bazı aygıtlarda ekran kapalıyken çalışmaz.</string>
@@ -199,17 +195,17 @@
   <string name="misc_features">Diğer özellikler</string>
   <string name="theme">Tema</string>
   <string name="disable_lockscreen_title">Kilit ekranını devre dışı bırak</string>
-  <string name="disable_lockscreen_summary">Arşiv ekranında veya oynatma ekranındayken kilit ekranını devre dışı bırak</string>
+  <string name="disable_lockscreen_summary">Arşiv veya çalma ekranındayken kilit ekranını devre dışı bırak</string>
   <string name="keep_screen_on_title">Ekranı açık tut</string>
   <string name="keep_screen_on_summary">Vanilya Müzik görünür olduğu zaman ekranı (ve aygıtı) uyanık tut</string>
   <string name="use_idle_timeout_title">Boşta kalma süresini etkinleştir</string>
-  <string name="use_idle_timeout_summary">Oynatma belli bir sürelik etkisizliğin ardından durdurulur</string>
+  <string name="use_idle_timeout_summary">Çalma belli bir sürelik etkisizliğin ardından durdurulur</string>
   <string name="idle_timeout_title">Boşta kalma süresi</string>
   <string name="enable_scroll_to_song_title">Parça adına kaydır</string>
-  <string name="enable_scroll_to_song_summary">Arşiv listelerinde şu anda oynatılan parça/albüm/sanatçı adına kaydır</string>
+  <string name="enable_scroll_to_song_summary">Arşiv listelerinde şu anda çalınan parça/albüm/sanatçı adına kaydır</string>
   <string name="queue_enable_scroll_to_song_title">Kuyruktaki parça adına kaydır</string>
-  <string name="queue_enable_scroll_to_song_summary">Parça değişiminde kuyrukta şu anda oynatılan parçaya kaydır</string>
-  <string name="jump_to_enqueued_on_play_title">\'Oynat\'mada kuyruğa eklenmiş parçaya atla</string>
+  <string name="queue_enable_scroll_to_song_summary">Parça değişiminde kuyrukta şu anda çalınan parçaya kaydır</string>
+  <string name="jump_to_enqueued_on_play_title">\'Çalma\'da kuyruğa eklenmiş parçaya atla</string>
   <string name="jump_to_enqueued_on_play_summary">Eğer istenen parça zaten kuyruktaysa kuyruğu temizlemek yerine parçaya atla</string>
   <string name="coverloader_android_title">Android\'ten albüm resmi yükle</string>
   <string name="coverloader_android_summary">Android iç veritabanını albüm resimleri için sorgula</string>
@@ -220,13 +216,13 @@
   <string name="coverloader_inline_title">Dosya etiketlerinden kapak resimleri yükle</string>
   <string name="coverloader_inline_summary">Dosya etiketlerinden gömülü albüm kapaklarını yüklemeye çalışır</string>
   <string name="cover_on_lockscreen_title">Kilit ekranında kapak resmini göster</string>
-  <string name="cover_on_lockscreen_summary">Şu anda oynatılan parçanın albüm resmini kilit ekranında göster</string>
+  <string name="cover_on_lockscreen_summary">Şu anda çalınan parçanın albüm resmini kilit ekranında göster</string>
   <string name="double_tap_title">İkili dokunma pencereciği</string>
-  <string name="double_tap_summary">1x1 widget\'a iki kez basmak oynatıcıyı açar. 400ms\'lik bir gecikme ile çalışır.</string>
+  <string name="double_tap_summary">1x1 widget\'a iki kez basmak çaları açar. 400ms\'lik bir gecikme ile çalışır.</string>
   <string name="scrobble_title">Scrobble Droid API\'sini kullan</string>
   <string name="scrobble_summary">Last.fm\'e Scrobble Droid veya Simple Last.fm Scrobbler kullanarak işleyin</string>
   <string name="stock_broadcast_title">Varsayılan yayınları öykün</string>
-  <string name="stock_broadcast_summary">Varsayılan müzik oynatıcısı tarafından üçüncü parti kilit ekranı denetimleri ve widgetlar ile çalışması için gönderilen yayınları öykün.</string>
+  <string name="stock_broadcast_summary">Varsayılan müzik çalar tarafından 3. parti kilit ekranı denetimleri ve uygulamacıklar ile çalışması için öykünen yayınlar gönder.</string>
   <string name="help">Yardım</string>
   <string name="about">Hakkında</string>
   <string name="tabs">Sekme sırası</string>
@@ -235,18 +231,18 @@
   <!--The following are for the list preferences-->
   <string name="last_used_action">Son kullanılan eylem</string>
   <string name="never_show">Hiçbir zaman gösterme</string>
-  <string name="show_when_playing">Oynatırken göster (varsayılan)</string>
+  <string name="show_when_playing">Çalarken göster (varsayılan)</string>
   <string name="always_show">Her zaman göster</string>
   <string name="open_main_activity">Arşivi aç (varsayılan)</string>
   <string name="open_mini_popup">Ufak pıtlayanı aç</string>
   <string name="skip_to_next_song">Sonraki parçaya atla</string>
-  <string name="open_full_player">Tüm oynatıcıyı aç</string>
+  <string name="open_full_player">Tam çaları aç</string>
   <string name="info_on_cover">Bilgi kapak resmi üstünde</string>
   <string name="info_below_cover">Bilgi kapak resmi altında</string>
   <string name="fixed_info">Bilgi üstte sabit</string>
   <string name="do_nothing">Hiçbir şey yapmaz</string>
   <string name="open_library">Arşivi aç</string>
-  <string name="play_pause">Oynat/Duraklat</string>
+  <string name="play_pause">Çal/Duraklat</string>
   <string name="next_song">Sonraki parça</string>
   <string name="previous_song">Önceki parça</string>
   <string name="next_album">Sonraki albüm</string>
@@ -265,6 +261,8 @@
   <string name="toggle_controls">Denetimleri göster</string>
   <string name="seek_10s_backward">10 saniye geri sar</string>
   <string name="seek_10s_forward">10 saniye ileri sar</string>
+  <string name="move_to_top">Tepeye taşı</string>
+  <string name="move_to_bottom">Alta taşı</string>
   <string name="preferences_action_show_queue">Kuyruğu göster</string>
   <string name="preferences_action_clear_queue">Kuyruğu temizle</string>
   <string name="preferences_action_enqueue_current_album">Albümü kuyruğa ekle</string>
@@ -280,20 +278,20 @@
   <string name="customize_filebrowser_start">Dosya yöneticisi bu dizinde başlar</string>
   <string name="select">Seç</string>
   <string name="save">Kaydet</string>
-  <string name="autoplaylist_playcounts_title">Kendiliğinden oynatmalık oluşturma</string>
+  <string name="autoplaylist_playcounts_title">Kendiliğinden çalma listesi oluşturma</string>
   <string name="autoplaylist_playcounts_summary">Kendiliğinden oluştur:</string>
   <string name="autoplaylist_playcounts_fmt" formatted="false">%s \'En iyi %.0f parça\'</string>
-  <string name="autoplaylist_playcounts_disabled">Kendiliğinden oynatmalık oluşturma!</string>
+  <string name="autoplaylist_playcounts_disabled">Kendiliğinden çalma listesi oluşturma!</string>
   <string name="autoplaylist_playcounts_name" formatted="false">En iyi %d</string>
-  <string name="playlist_sync_mode_title">Oynatmalık eşitlemesi</string>
+  <string name="playlist_sync_mode_title">Çalma listesi eşitlemesi</string>
   <string name="playlist_sync_all">Toptan eşitleme</string>
   <string name="playlist_sync_only_import">M3U içe aktar ancak dışa aktarma</string>
   <string name="playlist_sync_only_export">M3U\'ya yaz, ancak içe aktarma</string>
   <string name="playlist_sync_disabled">Kapatılmış</string>
   <string name="playlist_sync_folder_title">Eşitleme klasörü</string>
-  <string name="playlist_sync_folder_summary">Oynatmalık eşitlemesi için kullanılacak klasör</string>
+  <string name="playlist_sync_folder_summary">Çalma listesi eşitlemesi için kullanılacak klasör</string>
   <string name="playlist_export_relative_paths_title">Göreceli yol adları kullanarak dışa aktar</string>
-  <string name="playlist_export_relative_paths_summary">Oynatmalığa bağlı dosya yol adlarını bağla</string>
+  <string name="playlist_export_relative_paths_summary">Çalma listesine göreli dosya yollarına başvur</string>
   <string name="permission_request_summary">Vanilya Müzik, müzik arşivinizi görüntüleyebilmek için izninize gereksinim duyar</string>
   <string name="reverse_sort">Sıralamayı tersine çevir</string>
   <string name="share">Paylaş…</string>
@@ -314,13 +312,14 @@
   <string name="media_scan_group_albums">Albümleri klasöre göre öbekle</string>
   <string name="media_statistics">İstatistikler</string>
   <string name="media_stats_tracks">Parça sayısı</string>
-  <string name="media_stats_library_playtime">Toplam oynatılma süresi (Saat)</string>
-  <string name="media_stats_listen_playtime">Saat cinsinden oynatılan müzik süresi</string>
+  <string name="media_stats_library_playtime">Toplam çalma süresi (Saat)</string>
+  <string name="media_stats_listen_playtime">Saat cinsinden çalınan müzik süresi</string>
   <string name="media_stats_progress">Tarama durumu</string>
   <string name="media_library_scan_running">Ortam arşivi taranıyor...</string>
   <string name="media_scan_preferences">Tarayıcı seçenekleri</string>
   <string name="media_scan_preferences_change_title">Tarayıcı seçenekleri değiştirildi</string>
   <string name="media_scan_preferences_change_message">Bu seçeneği değiştirmek arşivinizi yeniden taratacaktır. Sürdürmek istiyor musunuz?</string>
+  <string name="folder_picker_spinner_desc">Dizin Durumu:</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">Klasör seçeneklerini değiştirmek için uzun basın</string>
   <string name="folder_include">İçer</string>
diff --git a/app/src/main/res/values-vi/translatable.xml b/app/src/main/res/values-vi/translatable.xml
index f1ea292c..b39a256f 100644
--- a/app/src/main/res/values-vi/translatable.xml
+++ b/app/src/main/res/values-vi/translatable.xml
@@ -134,8 +134,6 @@
   <string name="ignore_audiofocus_loss_summary">Vẫn phát nhạc khi bị mất quyền kiểm soát âm thanh vĩnh viễn</string>
   <string name="media_button_title">Điều khiển bằng tai nghe / Bluetooth</string>
   <string name="media_button_summary">Cần phải bật để kích hoạt điều khiển màn hình khoá trên Android ICS</string>
-  <string name="media_button_beep_title">Tiếng bíp khi điều khiển bằng tai nghe</string>
-  <string name="media_button_beep_summary">Phát tiếng bíp sau khi nhấn đúp nút trên tai nghe để chuyển bài</string>
   <string name="headset_only_title">Chỉ phát qua ngõ ra</string>
   <string name="headset_only_summary">Không cho phát nhạc bằng loa của máy.</string>
   <string name="headset_pause_title">Tạm dừng khi rút tai nghe</string>
@@ -162,8 +160,6 @@
   <string name="notifications">Thông báo</string>
   <string name="notification_visibility_title">Cách hiển thị thông báo</string>
   <string name="notification_action_title">Hành động thông báo</string>
-  <string name="notification_nag">Thông báo rất chi tiết</string>
-  <string name="notification_nag_summary">Thông báo chuyển bài bằng \"heads-up notification\"</string>
   <string name="playback_screen">Màn hình phát nhạc</string>
   <string name="playback_on_startup_title">Mở khi khởi động</string>
   <string name="playback_on_startup_summary">Vào giao diện nghe nhạc khi mở ứng dụng</string>
diff --git a/app/src/main/res/values-zh-rCN/translatable.xml b/app/src/main/res/values-zh-rCN/translatable.xml
index 92dc43f4..e10d3857 100644
--- a/app/src/main/res/values-zh-rCN/translatable.xml
+++ b/app/src/main/res/values-zh-rCN/translatable.xml
@@ -142,8 +142,6 @@
   <string name="ignore_audiofocus_loss_summary">失去焦点时持续播放</string>
   <string name="media_button_title">耳机 / 蓝牙控制</string>
   <string name="media_button_summary">此特性也需要 ICS 锁屏控制器。</string>
-  <string name="media_button_beep_title">耳机控制提示音</string>
-  <string name="media_button_beep_summary">使用耳机控制器连按两次以后切换到下一曲目，并发出哔的一声。</string>
   <string name="headset_only_title">仅外部输出</string>
   <string name="headset_only_summary">防止经由内部扬声器播放音乐</string>
   <string name="headset_pause_title">拔出时暂停</string>
@@ -170,8 +168,6 @@
   <string name="notifications">通知</string>
   <string name="notification_visibility_title">通知可见性</string>
   <string name="notification_action_title">通知动作</string>
-  <string name="notification_nag">非常详尽的通知</string>
-  <string name="notification_nag_summary">以“抬头通知”的方式通知曲目改变</string>
   <string name="playback_screen">回放画面</string>
   <string name="playback_on_startup_title">启动时打开</string>
   <string name="playback_on_startup_summary">启动时打开播放界面</string>
@@ -309,6 +305,7 @@
   <string name="media_scan_preferences">扫描选项</string>
   <string name="media_scan_preferences_change_title">已更改扫描选项</string>
   <string name="media_scan_preferences_change_message">更改此选项将完全重新开始扫描您的媒体库。你想继续吗？</string>
+  <string name="folder_picker_spinner_desc">文件夹状态：</string>
   <!--Folder selector-->
   <string name="hint_long_press_to_modify_folder">长按以编辑文件夹选项</string>
   <string name="folder_include">包括</string>
diff --git a/app/src/main/res/values-zh-rTW/translatable.xml b/app/src/main/res/values-zh-rTW/translatable.xml
index 017b40a4..41973e75 100644
--- a/app/src/main/res/values-zh-rTW/translatable.xml
+++ b/app/src/main/res/values-zh-rTW/translatable.xml
@@ -142,8 +142,6 @@
   <string name="ignore_audiofocus_loss_summary">在永久性音訊焦點遺失時繼續播放</string>
   <string name="media_button_title">耳機/藍牙控制</string>
   <string name="media_button_summary">這也需要由 ICS 螢幕鎖定控制。</string>
-  <string name="media_button_beep_title">耳機控制嗶音</string>
-  <string name="media_button_beep_summary">嗶音之後以耳機控制按兩下跳一個曲目。</string>
   <string name="headset_only_title">僅外部輸出</string>
   <string name="headset_only_summary">防止經由內部喇叭播放音樂。</string>
   <string name="headset_pause_title">耳機拔出時暫停</string>
@@ -170,8 +168,6 @@
   <string name="notifications">通知</string>
   <string name="notification_visibility_title">通知明顯度</string>
   <string name="notification_action_title">通知啟動</string>
-  <string name="notification_nag">非常詳細的通知</string>
-  <string name="notification_nag_summary">通報歌曲的更換使用 \'抬頭顯示通知\'</string>
   <string name="playback_screen">回播畫面</string>
   <string name="playback_on_startup_title">啟動時開啟</string>
   <string name="playback_on_startup_summary">啟動時開啟回播檢視</string>