diff --git a/app/build.gradle b/app/build.gradle
index 83500474..a119a2b5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,7 +28,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 27
-        versionName "0.9.11b DEV"
+        versionName "0.9.12b"
     }
 
     compileOptions {
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a37fbebe..a7ad3807 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -51,6 +51,7 @@
     <string name="no_results">لا توجد نتائج</string>
     <string name="action_re_download_artist_image">تحديث صورة الفنان</string>
     <string name="updating">يتم التحديث...</string>
+    <string name="added_title_to_playing_queue">"تمت الإضافة إلى قائمة الانتظار"</string>
     <string name="action_delete_from_playlist">حذف من قائمة التشغيل</string>
     <string name="new_playlist_action">قائمة تشغيل جديدة...</string>
     <string name="action_grid_columns">عدد قوائم الشبكة</string>
@@ -86,7 +87,6 @@
     <string name="pref_title_set_default_start_page">ضبط صفحة البدء</string>
     <string name="title_activity_settings">الإعدادات</string>
     <string name="pref_title_transparent_toolbar">"شريط الأدوات شبه شفاف"</string>
-    <string name="pref_title_show_playback_controller_card">تحكم كرت التشغيل</string>
     <string name="pref_title_colored_navigation_bar_artists">مشهد الفنان</string>
     <string name="pref_title_colored_navigation_bar_albums">مشهد الألبوم</string>
     <string name="pref_title_colored_navigation_bar_current_playing">مشهد التشغيل</string>
@@ -123,5 +123,4 @@
         <item>بحث في الإنترنات</item>
         <item>حذف الغلاف</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"تمت الإضافة إلى قائمة الانتظار"</string>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 375c33a0..d9368976 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -50,6 +50,7 @@
     <string name="no_results">Žádné výsledky</string>
     <string name="action_re_download_artist_image">Změnit obrázek umělce</string>
     <string name="updating">Aktualizace...</string>
+    <string name="added_title_to_playing_queue">"Přidána 1 skladba do fronty."</string>
     <string name="action_delete_from_playlist">Vymazat z playlistu</string>
     <string name="new_playlist_action">Nový playlist...</string>
     <string name="action_grid_columns">Počet sloupců mřížky</string>
@@ -82,7 +83,6 @@
     <string name="pref_title_set_default_start_page">Zvolit výchozí obrazovku</string>
     <string name="title_activity_settings">Nastavení</string>
     <string name="pref_title_transparent_toolbar">"Průhledné záhlaví"</string>
-    <string name="pref_title_show_playback_controller_card">Karta řadiče přehrávání</string>
     <string name="pref_title_colored_navigation_bar_artists">Barevné záhlaví interpretů</string>
     <string name="pref_title_colored_navigation_bar_albums">Barevné záhlaví alb</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Zobrazení \"Právě hraje\"</string>
@@ -119,5 +119,4 @@
         <item>Najít na webu</item>
         <item>Odstranit obal alba</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"Přidána 1 skladba do fronty."</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 25dd5d07..4b0ec084 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -50,6 +50,7 @@
     <string name="no_results">Keine Ergebnisse</string>
     <string name="action_re_download_artist_image">Interpretenbild aktualisieren</string>
     <string name="updating">Aktualisiere...</string>
+    <string name="added_title_to_playing_queue">"1 Titel wurde der Wiedergabeliste hinzugefügt."</string>
     <string name="added_x_titles_to_playing_queue">%1$d Titel wurden der Wiedergabeliste hinzugefügt.</string>
     <string name="action_delete_from_playlist">Aus Playlist entfernen</string>
     <string name="new_playlist_action">Neue Playlist…</string>
@@ -83,7 +84,6 @@
     <string name="pref_title_set_default_start_page">Startseite</string>
     <string name="title_activity_settings">Einstellungen</string>
     <string name="pref_title_transparent_toolbar">"Halbtransparente Toolbar"</string>
-    <string name="pref_title_show_playback_controller_card">Mediencontroller Karten Hintergrund</string>
     <string name="pref_title_colored_navigation_bar_artists">Interpreten Ansicht</string>
     <string name="pref_title_colored_navigation_bar_albums">Album Ansicht</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Wiedergabe Ansicht</string>
@@ -120,5 +120,4 @@
         <item>Web suche</item>
         <item>Cover entfernen</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"1 Titel wurde der Wiedergabeliste hinzugefügt."</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 1c20b3bd..5fd82abc 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -50,6 +50,7 @@
     <string name="no_results">Κανένα αποτέλεσμα</string>
     <string name="action_re_download_artist_image">Ανανέωση εικόνας καλλιτέχνη</string>
     <string name="updating">Γίνεται ανανέωση...</string>
+    <string name="added_title_to_playing_queue">"Προστέθηκε ένας τίτλος στη σειρά αναπαραγωγής"</string>
     <string name="action_delete_from_playlist">Διαγραφή από τη λίστα αναπαραγωγής</string>
     <string name="new_playlist_action">Νέα λίστα αναπαραγωγής...</string>
     <string name="action_grid_columns">Στήλες πλέγματος</string>
@@ -82,7 +83,6 @@
     <string name="pref_title_set_default_start_page">Αρχική σελίδα</string>
     <string name="title_activity_settings">Ρυθμίσεις</string>
     <string name="pref_title_transparent_toolbar">"Ημι-διαφανής μπάρα εργαλείων"</string>
-    <string name="pref_title_show_playback_controller_card">Κάρτα διαχείρισης αναπαραγωγής</string>
     <string name="pref_title_colored_navigation_bar_artists">Προβολή καλλιτέχνη</string>
     <string name="pref_title_colored_navigation_bar_albums">Προβολή δίσκου</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Προβολή αναπαραγωγής</string>
@@ -119,5 +119,4 @@
         <item>Αναζήτηση στο διαδίκτυο</item>
         <item>Διαγραφή εξώφυλλου</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"Προστέθηκε ένας τίτλος στη σειρά αναπαραγωγής"</string>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index da0b4500..0dd69183 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -3,13 +3,13 @@
     <string name="action_settings">"Ajustes"</string>
     <string name="action_about">Acerca de</string>
     <string name="action_currently_playing">Reproduciendo</string>
-    <string name="action_playing_queue">En cola</string>
+    <string name="action_playing_queue">Cola de reproducción</string>
     <string name="action_search">Buscar</string>
     <string name="action_play_next">Siguiente</string>
-    <string name="action_add_to_playing_queue">Añadir a la cola</string>
-    <string name="action_remove_from_playing_queue">Eliminar de la cola</string>
+    <string name="action_add_to_playing_queue">Añadir a cola de reproducción</string>
+    <string name="action_remove_from_playing_queue">Quitar de la cola de reproducción</string>
     <string name="action_add_to_playlist">Añadir a lista de reproducción...</string>
-    <string name="action_tag_editor">Editor de tags</string>
+    <string name="action_tag_editor">Editor de etiquetas</string>
     <string name="action_delete_from_disk">Borrar del disco</string>
     <string name="action_details">Detalles</string>
     <string name="albums">Álbumes</string>
@@ -21,6 +21,7 @@
     <string name="biography_unavailable">Lo sentimos, no encontramos una biografía correspondiente a éste artista</string>
     <string name="biography">Biografía</string>
     <string name="audio_focus_denied">No podemos encontrar el foco de audio</string>
+    <string name="title_activity_tag_editor">Editor de etiquetas activo</string>
     <string name="tag_editor">Editor de etiquetas</string>
     <string name="album">Álbum</string>
     <string name="artist">Artista</string>
@@ -32,12 +33,13 @@
     <string name="album_or_artist_empty">El campo título del álbum o el artista del álbum está vacío</string>
     <string name="writing_file_number">Escribiendo archivo</string>
     <string name="saving_changes">Guardando cambios...</string>
+    <string name="title_activity_album_tag_editor">Editor de las etiquetas del álbum activo</string>
     <string name="label_details">Detalles</string>
     <string name="label_file_name">Nombre del archivo</string>
     <string name="label_file_path">Ubicación del archivo</string>
     <string name="label_file_size">Tamaño</string>
     <string name="label_file_format">Formato</string>
-    <string name="label_track_length">Longitud</string>
+    <string name="label_track_length">Duración</string>
     <string name="label_bit_rate">Velocidad de Bits</string>
     <string name="label_sampling_rate">Frecuencia de muestreo</string>
     <string name="action_go_to_artist">Ir al artista</string>
@@ -50,6 +52,7 @@
     <string name="no_results">Sin resultados</string>
     <string name="action_re_download_artist_image">Actualizar imagen del artista</string>
     <string name="updating">Actualizando...</string>
+    <string name="added_title_to_playing_queue">"1 título añadido a la cola de reproducción"</string>
     <string name="action_delete_from_playlist">Borrar de la lista de reproducción</string>
     <string name="new_playlist_action">Nueva lista de reproducción...</string>
     <string name="action_grid_columns">Columnas de la cuadrícula</string>
@@ -75,12 +78,13 @@
     <string name="equalizer">Ecualizador</string>
     <string name="pref_header_ui">Interfaz</string>
     <string name="pref_title_general_theme">Tema general</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">General</string>
     <string name="pref_summary_colored_navigation_bar">Selecciona en qué secciones la barra debe tener color</string>
     <string name="pref_title_navigation_bar">Color en la barra de navegación</string>
     <string name="pref_title_set_default_start_page">Establecer como página de inicio</string>
     <string name="title_activity_settings">Ajustes</string>
     <string name="pref_title_transparent_toolbar">"Barra de herramientas semi-transparente"</string>
-    <string name="pref_title_show_playback_controller_card">Controles de reproducción en tarjeta</string>
     <string name="pref_title_colored_navigation_bar_artists">Barra de navegación en Vista del Artista coloreada</string>
     <string name="pref_title_colored_navigation_bar_albums">Barra de navegación de Vista del Álbum coloreada</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Ver reproducción</string>
@@ -107,7 +111,7 @@
     <string name="song">Canción</string>
     <string name="pref_only_lollipop">"Solamente disponible en Lollipop"</string>
     <string name="pref_summary_transparent_toolbar">Contenido visible debajo de la barra de herramientas.</string>
-    <string name="pref_summary_colored_album_footers">"El color pie del álbum en la cuadrícula se basa en la paleta de colores de la tapa del álvum."</string>
+    <string name="pref_summary_colored_album_footers">"El color pie del álbum en la cuadrícula se basa en la paleta de colores de la tapa del álbum."</string>
     <string name="failed_download_albumart">"Imposible descargar portada del álbum"</string>
     <string name="search_hint">Buscar en librería...</string>
     <string name="rescanning_media">Escaneando contenido...</string>
@@ -117,5 +121,4 @@
         <item>Busqueda Web</item>
         <item>Eliminar Carátula</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"1 título añadido a la cola de reproducción"</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 82787692..e1eaf5c2 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -7,7 +7,7 @@
     <string name="action_search">Etsi</string>
     <string name="action_play_next">Toista seuraavaksi</string>
     <string name="action_add_to_playing_queue">Lisää toistojonoon</string>
-    <string name="action_remove_from_playing_queue">Poista toistojonosta</string>
+    <string name="action_remove_from_playing_queue">Poista jonosta</string>
     <string name="action_add_to_playlist">Lisää soittolistaan</string>
     <string name="action_tag_editor">Tagieditori</string>
     <string name="action_delete_from_disk">Poista levyltä</string>
@@ -18,6 +18,61 @@
     <string name="playlists">Soittolistat</string>
     <string name="nothing_playing">Mitään ei toisteta</string>
     <string name="unplayable_file">Virhe toistettaessa kappaletta</string>
-    <string name="biography_unavailable">Emme löytäneet biografiaa tälle artistille</string>
-    <string name="biography">Elämänkerta</string>
+    <string name="biography_unavailable">Biogtagiaa ei löytynyt tälle artistille</string>
+    <string name="biography">Biografia</string>
+    <string name="audio_focus_denied">Ääntä ei voitu toistaa</string>
+    <string name="tag_editor">Tagieditori</string>
+    <string name="album">Albumit</string>
+    <string name="artist">Artistit</string>
+    <string name="genre">Tyylit</string>
+    <string name="album_artist">Albumin artisti</string>
+    <string name="year">Vuosi</string>
+    <string name="track">Kappale</string>
+    <string name="track_hint">"Kappale (2 kappale 2 tai 3004 CD3 kappale 4)"</string>
+    <string name="album_or_artist_empty">Artistialbumin nimi tai albumin artisti -kenttä on tyhjä</string>
+    <string name="writing_file_number">Tiedostoa tallennetaan</string>
+    <string name="saving_changes">Tallennetaan muutokset...</string>
+    <string name="label_details">Yksityiskohdat</string>
+    <string name="label_file_name">Tiedoston nimi</string>
+    <string name="label_file_path">Tiedoston polku</string>
+    <string name="label_file_size">Koko</string>
+    <string name="label_file_format">Tyyppi</string>
+    <string name="label_track_length">Pituus</string>
+    <string name="label_bit_rate">Bittinopeus</string>
+    <string name="label_sampling_rate">Näytteenottotaajuus</string>
+    <string name="action_go_to_artist">Näytä artisti</string>
+    <string name="action_go_to_album">Näytä albumi</string>
+    <string name="label_current_playing_queue">Toistojono</string>
+    <string name="save_as_playlist">Tallenna soittolistana</string>
+    <string name="credits_3">Kuvake</string>
+    <string name="credits_1">"Phonograph on täysin ilmainen material designin omaava musiikkisoitin jonka on tehnyt"</string>
+    <string name="title_activity_search">Etsi</string>
+    <string name="no_results">Ei hakutulosta</string>
+    <string name="action_re_download_artist_image">Päivitä artistin kuva</string>
+    <string name="updating">Päivitetään...</string>
+    <string name="added_title_to_playing_queue">"Kappale lisätty jonoon"</string>
+    <string name="added_x_titles_to_playing_queue">{%1$d} kappaletta lisättiin jonoon</string>
+    <string name="action_delete_from_playlist">Poista soittolistalta</string>
+    <string name="new_playlist_action">Uusi soittolista</string>
+    <string name="action_grid_columns">Ruudukon sarakkeet</string>
+    <string name="action_grid_columns_land">Ruudukon sarakkeet (Vaaka)</string>
+    <string name="inserted_x_songs_into_playlist">{%1$d} kappaletta lisättiin tähän soittolistaan</string>
+    <string name="created_playlist_x">Soittolista {%1$s} luotu</string>
+    <string name="deleted_playlist_x">Soittolista {%1$s} poistettu</string>
+    <string name="couldnot_create_playlist_x">Soittolistaa {%1$s} ei voitu luoda</string>
+    <string name="delete_playlist_x"><![CDATA[Haluatko poistaa soittolistan {<b>}{%1$s}{</b>}?]]></string>
+    <string name="delete_song_x"><![CDATA[Haluatko poistaa kappaleen {<b>}{%1$s}{</b>}?]]></string>
+    <string name="delete_x_songs"><![CDATA[Haluatko poistaa {<b>}{%1$d}{</b>} kappaletta?]]></string>
+    <string name="delete_song_title">Poista Kappale</string>
+    <string name="delete_songs_title">Poista Kappaleet</string>
+    <string name="rename_playlist_title">Nimeä Uudelleen Soittolista</string>
+    <string name="delete_playlist_title">Poista Soittolista</string>
+    <string name="add_playlist_title">"Lisää Soittolistaan"</string>
+    <string name="new_playlist_title">Uusi Soittolista</string>
+    <string name="delete_warning">"Varoitus: Tätä toimintoa ei voida perua."</string>
+    <string name="shuffle_all">Sekoita kaikki</string>
+    <string name="last_opened">Viimeksi avattu</string>
+    <string name="light_theme_name">Vaalea</string>
+    <string name="dark_theme_name">Tumma</string>
+    <string name="equalizer">Taajuuskorjain</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index abe8644e..8442d16b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -34,7 +34,7 @@
     <string name="saving_changes">Sauvegarde en cours...</string>
     <string name="label_details">Détails</string>
     <string name="label_file_name">Nom du fichier</string>
-    <string name="label_file_path">Location du fichier</string>
+    <string name="label_file_path">Chemin du fichier</string>
     <string name="label_file_size">Taille</string>
     <string name="label_file_format">Format</string>
     <string name="label_track_length">Durée</string>
@@ -50,6 +50,8 @@
     <string name="no_results">Aucun résultat</string>
     <string name="action_re_download_artist_image">Actualiser l\'image de l\'artiste</string>
     <string name="updating">Actualisation...</string>
+    <string name="added_title_to_playing_queue">"1 titre ajouté à la file de lecture."</string>
+    <string name="added_x_titles_to_playing_queue">%1$d titres ajoutés à la file de lecture.</string>
     <string name="action_delete_from_playlist">Supprimer de la playlist</string>
     <string name="new_playlist_action">Nouvelle playlist...</string>
     <string name="action_grid_columns">Nombre de colonnes</string>
@@ -82,7 +84,6 @@
     <string name="pref_title_set_default_start_page">Page d\'accueil par défaut</string>
     <string name="title_activity_settings">Paramètres</string>
     <string name="pref_title_transparent_toolbar">"Barre d\'outils semi-transparente"</string>
-    <string name="pref_title_show_playback_controller_card">Carte de contrôle du lecteur</string>
     <string name="pref_title_colored_navigation_bar_artists">Vue artiste</string>
     <string name="pref_title_colored_navigation_bar_albums">Vue album</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Vue lecture en cours</string>
@@ -111,7 +112,7 @@
     <string name="pref_summary_transparent_toolbar">Le contenu qui défile en dessous de la barre d\'outils est visible.</string>
     <string name="pref_summary_colored_album_footers">"Les bas d\'album dans la grille sont colorés avec la palette de la couverture."</string>
     <string name="failed_download_albumart">"Impossible de télécharger la pochette pour cet album."</string>
-    <string name="search_hint">Recherche votre bibliothèque...</string>
+    <string name="search_hint">Rechercher votre bibliothèque...</string>
     <string name="rescanning_media">Réanalyse des médias…</string>
     <string-array name="update_album_cover_options">
         <item>Télécharger depuis Last.fm</item>
@@ -119,5 +120,4 @@
         <item>Recherche internet</item>
         <item>Supprimer la couverture</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"1 titre ajouté à la file de lecture."</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index daf59af7..0bbdcfce 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -10,7 +10,7 @@
     <string name="action_remove_from_playing_queue">Rimuovi dalla coda</string>
     <string name="action_add_to_playlist">Aggiungi alla playlist</string>
     <string name="action_tag_editor">Modifica tag</string>
-    <string name="action_delete_from_disk">Elimina</string>
+    <string name="action_delete_from_disk">Elimina dal dispositivo</string>
     <string name="action_details">Dettagli</string>
     <string name="albums">Album</string>
     <string name="artists">Artisti</string>
@@ -44,7 +44,7 @@
     <string name="label_sampling_rate">Frequenza di campionamento</string>
     <string name="action_go_to_artist">Vai all\'artista</string>
     <string name="action_go_to_album">Vai all\'album</string>
-    <string name="label_current_playing_queue">Riproduci coda</string>
+    <string name="label_current_playing_queue">Coda di riproduzione</string>
     <string name="save_as_playlist">Salva come playlist</string>
     <string name="credits_3">Icona disegnata da</string>
     <string name="credits_1">"Phonograph è un lettore musicale in material design completamente gratuito scritto da"</string>
@@ -52,6 +52,7 @@
     <string name="no_results">Nessun risultato</string>
     <string name="action_re_download_artist_image">Aggiorna immagine artista</string>
     <string name="updating">Aggiornamento...</string>
+    <string name="added_title_to_playing_queue">"Un brano aggiunto alla coda."</string>
     <string name="title_activity_playlist_detail">DettagliAttivitàPlaylist</string>
     <string name="action_delete_from_playlist">Elimina dalla playlist</string>
     <string name="new_playlist_action">Nuova playlist...</string>
@@ -85,7 +86,6 @@
     <string name="pref_title_set_default_start_page">Pagina iniziale</string>
     <string name="title_activity_settings">Impostazioni</string>
     <string name="pref_title_transparent_toolbar">"Barra degli strumenti semitrasparente"</string>
-    <string name="pref_title_show_playback_controller_card">Controlli di riproduzione in stile card</string>
     <string name="pref_title_colored_navigation_bar_artists">Schermata Artista</string>
     <string name="pref_title_colored_navigation_bar_albums">Schermata Album</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Schermata In riproduzione</string>
@@ -122,5 +122,4 @@
         <item>Cerca nel web</item>
         <item>Rimuovi copertina</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"Un brano aggiunto alla coda."</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 72d56453..9856ab69 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -30,14 +30,14 @@
     <string name="track">트렉</string>
     <string name="track_hint">"트렉 (트렉2는 2, CD3 트렉4는 3004 등으로 표기)"</string>
     <string name="album_or_artist_empty">앨범 제목이나 앨범 아티스트 란이 비었습니다.</string>
-    <string name="writing_file_number">파일에 정보 기록 중</string>
+    <string name="writing_file_number">파일에 정보 기록 중...</string>
     <string name="saving_changes">변경사항 저장 중...</string>
     <string name="label_details">세부정보</string>
     <string name="label_file_name">파일 이름</string>
     <string name="label_file_path">파일 경로</string>
     <string name="label_file_size">크기</string>
     <string name="label_file_format">파일 형식</string>
-    <string name="label_track_length">길이(재생 시간)</string>
+    <string name="label_track_length">재생 시간</string>
     <string name="label_bit_rate">비트레이트</string>
     <string name="label_sampling_rate">샘플링 빈도</string>
     <string name="action_go_to_artist">아티스트로 가기</string>
@@ -50,10 +50,12 @@
     <string name="no_results">결과 없음</string>
     <string name="action_re_download_artist_image">아티스트 이미지 변경</string>
     <string name="updating">변경 중...</string>
+    <string name="added_title_to_playing_queue">"재생 대기열에 1개의 음악을 추가했습니다."</string>
+    <string name="added_x_titles_to_playing_queue">%1$d개의 타이틀을 재생 대기열에 추가했습니다.</string>
     <string name="action_delete_from_playlist">재생목록에서 삭제</string>
     <string name="new_playlist_action">새로운 재생목록...</string>
-    <string name="action_grid_columns">가로세로 격자</string>
-    <string name="action_grid_columns_land">가로세로 격자 (가로모드일 때)</string>
+    <string name="action_grid_columns">가로 격자</string>
+    <string name="action_grid_columns_land">가로 격자 (가로모드일 때)</string>
     <string name="inserted_x_songs_into_playlist">이 재생목록에 %1$d개의 음악을 추가했습니다.</string>
     <string name="created_playlist_x">재생 목록 \'%1$s\'을 만들었습니다.</string>
     <string name="deleted_playlist_x">재생목록 \'%1$s\'을 삭제했습니다.</string>
@@ -82,7 +84,6 @@
     <string name="pref_title_set_default_start_page">시작 화면</string>
     <string name="title_activity_settings">설정</string>
     <string name="pref_title_transparent_toolbar">"반투명 툴바"</string>
-    <string name="pref_title_show_playback_controller_card">컨트롤 부분을 카드로 표시</string>
     <string name="pref_title_colored_navigation_bar_artists">아티스트 화면에서</string>
     <string name="pref_title_colored_navigation_bar_albums">앨범 화면에서</string>
     <string name="pref_title_colored_navigation_bar_current_playing">지금 재생 중 화면에서</string>
@@ -101,14 +102,14 @@
     <string name="default_str">기본</string>
     <string name="primary_color">주 색상</string>
     <string name="accent_color">보조 색상 (엑센트)</string>
-    <string name="primary_color_desc">테마의 주 색상입니다. 기본은 인디고색 입니다.</string>
+    <string name="primary_color_desc">테마의 주 색상입니다. 기본은 인디고색입니다.</string>
     <string name="accent_color_desc">테마의 엑센트 색입니다. 기본은 분홍색입니다.</string>
     <string name="update_image">이미지 변경</string>
     <string name="playlist_empty_text">이 재생목록은 비었습니다.</string>
     <string name="no_playlists">재생목록이 없습니다.</string>
     <string name="playlist_name">재생목록 이름</string>
     <string name="song">노래</string>
-    <string name="pref_only_lollipop">"안드로이드 롤리팝(5.0)에서만 가능합니다."</string>
+    <string name="pref_only_lollipop">"안드로이드 롤리팝에서만 가능합니다."</string>
     <string name="pref_summary_transparent_toolbar">툴바 아래 내용이 보이게 합니다.</string>
     <string name="pref_summary_colored_album_footers">"앨범 커버의 색상에 맞추어 앨범 카드가 색칠됩니다."</string>
     <string name="failed_download_albumart">"이 앨범의 앨범 커버를 다운로드할 수 없습니다."</string>
@@ -120,5 +121,4 @@
         <item>인터넷 검색</item>
         <item>커버 없애기</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"재생 대기열에 1개의 음악을 추가했습니다."</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a2c818eb..6688052d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -50,6 +50,8 @@
     <string name="no_results">Geen resultaten</string>
     <string name="action_re_download_artist_image">Artiest afbeelding bijwerken</string>
     <string name="updating">Bijwerken...</string>
+    <string name="added_title_to_playing_queue">"1 titel toegevoegd aan de afspeelwachtrij."</string>
+    <string name="added_x_titles_to_playing_queue">%1$d titels toegevoegd aan de afspeellijst.</string>
     <string name="action_delete_from_playlist">Verwijderen uit afspeellijst</string>
     <string name="new_playlist_action">Nieuwe afspeellijst...</string>
     <string name="action_grid_columns">Rasterkolommen</string>
@@ -59,8 +61,10 @@
     <string name="deleted_playlist_x">Afspeellijst %1$s verwijderd</string>
     <string name="couldnot_create_playlist_x">Kon afspeellijst %1$s niet aanmaken</string>
     <string name="delete_playlist_x"><![CDATA[Wil je de afspeellijst <b>%1$s</b> verwijderen?]]></string>
+    <string name="delete_x_playlists"><![CDATA[Wil je <b>%1$d</b> afspeellijsten verwijderen?]]></string>
     <string name="delete_song_x"><![CDATA[Wil je het nummer <b>%1$s</b> verwijderen?]]></string>
     <string name="delete_x_songs"><![CDATA[Wil je <b>%1$d</b> nummers verwijderen?]]></string>
+    <string name="delete_song_x_from_playlist"><![CDATA[Wil je het nummer <b>%1$s</b> verwijderen van de afspeellijst?]]></string>
     <string name="delete_song_title">Verwijder nummer</string>
     <string name="delete_songs_title">Verwijder nummers</string>
     <string name="rename_playlist_title">Hernoem afspeellijst</string>
@@ -82,7 +86,6 @@
     <string name="pref_title_set_default_start_page">Startpagina</string>
     <string name="title_activity_settings">Instellingen</string>
     <string name="pref_title_transparent_toolbar">"Semi-transparante werkbalk"</string>
-    <string name="pref_title_show_playback_controller_card">Afspeelknoppen kaart</string>
     <string name="pref_title_colored_navigation_bar_artists">Artiest weergave</string>
     <string name="pref_title_colored_navigation_bar_albums">Album weergave</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Afspeelweergave</string>
@@ -119,5 +122,4 @@
         <item>Zoeken op internet</item>
         <item>Verwijder hoes</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"1 titel toegevoegd aan de afspeelwachtrij."</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f6612073..2c4257e0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -52,6 +52,8 @@
     <string name="no_results">Brak wyników</string>
     <string name="action_re_download_artist_image">Zaktualizuj zdjęcie wykonawcy</string>
     <string name="updating">Aktualizowanie...</string>
+    <string name="added_title_to_playing_queue">"Dodano 1 tytuł do kolejki odtwarzania"</string>
+    <string name="added_x_titles_to_playing_queue">Dodano %1$d tytuły do kolejki odtwarzania</string>
     <string name="action_delete_from_playlist">Usuń z listy odtwarzania</string>
     <string name="new_playlist_action">Nowa lista odtwarzania...</string>
     <string name="action_grid_columns">Siatka kolumn</string>
@@ -61,12 +63,18 @@
     <string name="deleted_playlist_x">Usunięto listę odtwarzania %1$s</string>
     <string name="couldnot_create_playlist_x">Nie można utworzyć listy odtwarzania %1$s</string>
     <string name="delete_playlist_x"><![CDATA[ Czy chcesz usunąć listę odtwarzania <b>%1$s</b>? ]]></string>
+    <string name="delete_x_playlists"><![CDATA[Czy chcesz usunąć <b>%1$d</b> listy odtwarzania? ]]></string>
     <string name="delete_song_x"><![CDATA[ Czy chcesz usunąć utwór <b>%1$s</b>? ]]></string>
     <string name="delete_x_songs"><![CDATA[ Czy chcesz usunąć  <b>%1$d</b> utworów? ]]></string>
+    <string name="delete_song_x_from_playlist"><![CDATA[Czy chcesz usunąć utwór <b>%1$s</b> z listy odtwarzania? ]]></string>
+    <string name="delete_x_songs_from_playlist"><![CDATA[Czy chcesz usunąć <b>%1$d</b> utworów z listy odtwarzania? ]]></string>
     <string name="delete_song_title">Usuwanie utworu</string>
     <string name="delete_songs_title">Usuń utwory</string>
+    <string name="delete_song_from_playlist_title">Usuń utwór z listy odtwarzania</string>
+    <string name="delete_songs_from_playlist_title">Usuń utwory z listy odtwarzania</string>
     <string name="rename_playlist_title">Zmień nazwę listy odtwarzania</string>
     <string name="delete_playlist_title">Usuń listę odtwarzania</string>
+    <string name="delete_playlists_title">Usuń listy odtwarzania</string>
     <string name="add_playlist_title">"Dodaj do listy odtwarzania"</string>
     <string name="new_playlist_title">Nowa lista odtwarzania</string>
     <string name="delete_warning">"Ostrzeżenie: Ta operacja nie może być cofnięta"</string>
@@ -84,7 +92,6 @@
     <string name="pref_title_set_default_start_page">Strona startowa</string>
     <string name="title_activity_settings">Ustawienia</string>
     <string name="pref_title_transparent_toolbar">"Przeźroczystość belki nawigacyjnej"</string>
-    <string name="pref_title_show_playback_controller_card">Karta kontrolera odtwarzania</string>
     <string name="pref_title_colored_navigation_bar_artists">Widok wykonawcy</string>
     <string name="pref_title_colored_navigation_bar_albums">Widok albumu</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Widok aktualnie granych</string>
@@ -121,5 +128,4 @@
         <item>Szukaj w sieci</item>
         <item>Usuń okładkę</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"Dodano 1 tytuł do kolejki odtwarzania"</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1ba9e656..d444e0f0 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -50,6 +50,8 @@
     <string name="no_results">Sem resultados</string>
     <string name="action_re_download_artist_image">Atualizar imagem do artista</string>
     <string name="updating">Atualizando...</string>
+    <string name="added_title_to_playing_queue">"1 título adicionado à lista de reprodução"</string>
+    <string name="added_x_titles_to_playing_queue">%1$d faixas adicionadas à lista de reprodução.</string>
     <string name="action_delete_from_playlist">Excluir da playlist</string>
     <string name="new_playlist_action">Nova playlist...</string>
     <string name="action_grid_columns">Colunas da grade</string>
@@ -59,12 +61,24 @@
     <string name="deleted_playlist_x">A playlist %1$s foi excluída</string>
     <string name="couldnot_create_playlist_x">Não foi possível criar a playlist %1$s</string>
     <string name="delete_playlist_x"><![CDATA[ Deseja excluir a playlist <b>%1$s</b>? ]]></string>
+    <string name="delete_x_playlists"><![CDATA[
+ Deseja excluir <b>%1$d</b> playlists? 
+    ]]></string>
     <string name="delete_song_x"><![CDATA[ Deseja excluir a faixa <b>%1$s</b>? ]]></string>
     <string name="delete_x_songs"><![CDATA[ Deseja excluir <b>%1$d</b> faixas? ]]></string>
+    <string name="delete_song_x_from_playlist"><![CDATA[
+ Deseja excluir a música <b>%1$s</b> da playlist? 
+    ]]></string>
+    <string name="delete_x_songs_from_playlist"><![CDATA[
+ Deseja excluir <b>%1$d</b> músicas da playlist? 
+    ]]></string>
     <string name="delete_song_title">Excluir Faixa</string>
     <string name="delete_songs_title">Excluir Faixas</string>
+    <string name="delete_song_from_playlist_title">Deletar música da Playlist</string>
+    <string name="delete_songs_from_playlist_title">Deletar músicas da Playlist</string>
     <string name="rename_playlist_title">Renomear Playlist</string>
     <string name="delete_playlist_title">Excluir Playlist</string>
+    <string name="delete_playlists_title">Apagar Playlists</string>
     <string name="add_playlist_title">"Adicionar à Playlist"</string>
     <string name="new_playlist_title">Nova Playlist</string>
     <string name="delete_warning">"Aviso: Esta operação não pode ser desfeita."</string>
@@ -82,7 +96,6 @@
     <string name="pref_title_set_default_start_page">Página inicial</string>
     <string name="title_activity_settings">Configurações</string>
     <string name="pref_title_transparent_toolbar">"Barra de ferramentas semi-transparente"</string>
-    <string name="pref_title_show_playback_controller_card">Controles estilo cartão</string>
     <string name="pref_title_colored_navigation_bar_artists">Visualização por artistas</string>
     <string name="pref_title_colored_navigation_bar_albums">Visualização por álbuns</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Vista em execução</string>
@@ -119,5 +132,4 @@
         <item>Pesquisar na Internet</item>
         <item>Remover Arte do Album</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"1 título adicionado à lista de reprodução"</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index c60997c7..43baccf6 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -49,6 +49,7 @@
     <string name="no_results">Nenhum resultado</string>
     <string name="action_re_download_artist_image">Atualizar imagem do artista</string>
     <string name="updating">Atualizando...</string>
+    <string name="added_title_to_playing_queue">"Adicionada uma música para a fila atual de músicas."</string>
     <string name="action_delete_from_playlist">Apagar da playlist</string>
     <string name="action_grid_columns">Colunas da grade</string>
     <string name="action_grid_columns_land">Colunas da grade (Paisagem)</string>
@@ -65,7 +66,6 @@
     <string name="pref_title_set_default_start_page">Selecionar página inicial</string>
     <string name="title_activity_settings">Configurações</string>
     <string name="pref_title_transparent_toolbar">"Barra de ferramentas Semi-Transparente"</string>
-    <string name="pref_title_show_playback_controller_card">Cartão de controle de reprodução</string>
     <string name="pref_title_colored_navigation_bar_artists">Barra de navegação colorida na visualização do artista</string>
     <string name="pref_title_colored_navigation_bar_albums">Barra de navegação colorida na visualização do álbum</string>
     <string name="pref_title_colored_album_footers">Rodapés coloridos do álbum</string>
@@ -73,5 +73,4 @@
     <string name="navigation_drawer_open">Abrir área de navegação</string>
     <string name="navigation_drawer_close">"Fechar área de navegação"</string>
     <string name="song">Música</string>
-    <string name="added_title_to_playing_queue">"Adicionada uma música para a fila atual de músicas."</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 738749e9..60c1c4fd 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -49,6 +49,7 @@
     <string name="no_results">Niciun rezultat</string>
     <string name="action_re_download_artist_image">Actualizează imagine artist</string>
     <string name="updating">Actualizare...</string>
+    <string name="added_title_to_playing_queue">"Adăugat 1 melodie la lista de redare."</string>
     <string name="action_delete_from_playlist">Şterge din playlist</string>
     <string name="new_playlist_action">Playlist nou...</string>
     <string name="action_grid_columns">Rânduri pe grid</string>
@@ -80,7 +81,6 @@
     <string name="pref_title_set_default_start_page">Alege pagina de pornire predefinită</string>
     <string name="title_activity_settings">Setări</string>
     <string name="pref_title_transparent_toolbar">"Bară semi-transparentă"</string>
-    <string name="pref_title_show_playback_controller_card">Cardul de redare</string>
     <string name="pref_title_colored_navigation_bar_artists">Bară de navigare artist colorată</string>
     <string name="pref_title_colored_navigation_bar_albums">Bară de navigare album colorată</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Vederea de redare curentă</string>
@@ -98,5 +98,4 @@
     <string name="primary_color">Culoare Primară</string>
     <string name="accent_color">Culoare de accent</string>
     <string name="song">Melodie</string>
-    <string name="added_title_to_playing_queue">"Adăugat 1 melodie la lista de redare."</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b13f32bd..c0b42a54 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -50,6 +50,7 @@
     <string name="no_results">Нет результатов</string>
     <string name="action_re_download_artist_image">Обновить изображение исполнителя</string>
     <string name="updating">Обновление...</string>
+    <string name="added_title_to_playing_queue">"Добавлена 1 композиция в очередь воспроизведения"</string>
     <string name="action_delete_from_playlist">Удалить из списка воспроизведения</string>
     <string name="new_playlist_action">Новый список воспроизведения...</string>
     <string name="action_grid_columns">Столбцы сетки</string>
@@ -82,7 +83,6 @@
     <string name="pref_title_set_default_start_page">Установить начальную страницу</string>
     <string name="title_activity_settings">Настройки</string>
     <string name="pref_title_transparent_toolbar">"Полупрозрачная панель инструментов"</string>
-    <string name="pref_title_show_playback_controller_card">Карточка управления воспроизведением</string>
     <string name="pref_title_colored_navigation_bar_artists">Цветная панель управления ( вид исполнителя )</string>
     <string name="pref_title_colored_navigation_bar_albums">Цветная панель управления ( вид альбома )</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Вид сейчас воспроизводится</string>
@@ -119,5 +119,4 @@
         <item>Поиск в интернете</item>
         <item>Удалить обложку</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"Добавлена 1 композиция в очередь воспроизведения"</string>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 9b0affcd..88fef55e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -50,6 +50,7 @@
     <string name="no_results">Inga resultat</string>
     <string name="action_re_download_artist_image">Uppdatera artistbild</string>
     <string name="updating">Uppdaterar ...</string>
+    <string name="added_title_to_playing_queue">"Lagt till 1 titel till spellistan."</string>
     <string name="action_delete_from_playlist">Radera från spellista</string>
     <string name="new_playlist_action">Ny spellista ...</string>
     <string name="created_playlist_x">Spellista %1$s skapad</string>
@@ -114,5 +115,4 @@ Vill du radera <b>%1$d</b> låtar?
         <item>Weksök</item>
         <item>Ta bort omslag</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"Lagt till 1 titel till spellistan."</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 33e3beca..43606295 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -5,7 +5,7 @@
     <string name="action_currently_playing">Şu anda çalınan</string>
     <string name="action_playing_queue">Çalma Sırası</string>
     <string name="action_search">Ara</string>
-    <string name="action_play_next">Sonraki parça</string>
+    <string name="action_play_next">Sonraki şarkı</string>
     <string name="action_add_to_playing_queue">Çalma sırasına ekle</string>
     <string name="action_remove_from_playing_queue">Çalma sırasından çıkar</string>
     <string name="action_add_to_playlist">Çalma listesine ekle</string>
@@ -14,10 +14,10 @@
     <string name="action_details">Detaylar</string>
     <string name="albums">Albümler</string>
     <string name="artists">Sanatçılar</string>
-    <string name="songs">Parçalar</string>
+    <string name="songs">Şarkılar</string>
     <string name="playlists">Çalma listeleri</string>
-    <string name="nothing_playing">Şu anda çalınan parça yok</string>
-    <string name="unplayable_file">Üzgünüm - Parça oynatılırken bir hata oluştu</string>
+    <string name="nothing_playing">Şu anda çalınan şarkı yok</string>
+    <string name="unplayable_file">Üzgünüm - Şarkı oynatılırken bir hata oluştu</string>
     <string name="biography_unavailable">Üzgünüm, bu sanatçı ile ilgili hiçbir biyografi yazısı bulamadık.</string>
     <string name="biography">Biyografi</string>
     <string name="audio_focus_denied">Sizlere ses odağı kazandırmak mümkün değildi.</string>
@@ -27,8 +27,8 @@
     <string name="genre">Tür</string>
     <string name="album_artist">Albüm sanatçısı</string>
     <string name="year">Yıl</string>
-    <string name="track">Parça</string>
-    <string name="track_hint">"Parça (2. parça için 2 yada CD3 4.parça için 3004)"</string>
+    <string name="track">Şarkı</string>
+    <string name="track_hint">"Şarkı (2. şarkı için 2 yada CD3 4. şarkı için 3004)"</string>
     <string name="album_or_artist_empty">Albüm başlığı veya albüm sanatçısı metin alanı boş.</string>
     <string name="writing_file_number">Dosya yazılıyor</string>
     <string name="saving_changes">Değişiklikler kaydediliyor...</string>
@@ -50,6 +50,8 @@
     <string name="no_results">Sonuç bulunamadı</string>
     <string name="action_re_download_artist_image">Sanatçı resmini güncelle</string>
     <string name="updating">Güncelleniyor...</string>
+    <string name="added_title_to_playing_queue">"Çalma kuyruğuna 1 başlık eklendi"</string>
+    <string name="added_x_titles_to_playing_queue">Çalma kuyruğuna %1$d başlıkları eklendi.</string>
     <string name="action_delete_from_playlist">Çalma listesinden sil</string>
     <string name="new_playlist_action">Yeni çalma listesi</string>
     <string name="action_grid_columns">Izgara sütunları</string>
@@ -59,12 +61,19 @@
     <string name="deleted_playlist_x">Çalma listesi %1$s silindi</string>
     <string name="couldnot_create_playlist_x">Çalma listesi %1$s oluşturulamadı</string>
     <string name="delete_playlist_x"><![CDATA[ Çalma listesi <b>%1$s</b>\'yi silmek istiyor musunuz ? ]]></string>
+    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> oynatma listelerini silmek istiyor musunuz?]]></string>
     <string name="delete_song_x"><![CDATA[ <b>%1$s</b> şarkısını silmek istiyor musunuz? ]]></string>
     <string name="delete_x_songs"><![CDATA[ <b>%1$d</b> bu şarkıları silmek istiyor musunuz? ]]></string>
+    <string name="delete_song_x_from_playlist"><![CDATA[Çalma listesinden <b>%1$s</b> şarkısını silmek istiyor musunuz?]]></string>
+    <string name="delete_x_songs_from_playlist"><![CDATA[Çalma listesinden <b>%1$d</b> şarkılarını silmek istiyor musunuz?
+]]></string>
     <string name="delete_song_title">Şarkıyı Sil</string>
     <string name="delete_songs_title">Şarkıları Sil</string>
+    <string name="delete_song_from_playlist_title">Çalma listesinden şarkı sil</string>
+    <string name="delete_songs_from_playlist_title">Çalma listesinden şarkıları sil</string>
     <string name="rename_playlist_title">Çalma Listesini Yeniden Adlandır</string>
     <string name="delete_playlist_title">Çalma Listesini Sil</string>
+    <string name="delete_playlists_title">Çalma listelerini sil</string>
     <string name="add_playlist_title">"Çalma Listesine Ekle"</string>
     <string name="new_playlist_title">Yeni Çalma Listesi</string>
     <string name="delete_warning">"Uyarı: Bu işlem geri alınamaz."</string>
@@ -72,7 +81,7 @@
     <string name="last_opened">Son dinlenenler</string>
     <string name="light_theme_name">Açık</string>
     <string name="dark_theme_name">Koyu</string>
-    <string name="equalizer">Ekolayzer</string>
+    <string name="equalizer">Ekolayzır</string>
     <string name="pref_header_ui">Kullanıcı Arayüzü</string>
     <string name="pref_title_general_theme">Genel tema</string>
     <string name="pref_header_audio">Ses</string>
@@ -82,7 +91,6 @@
     <string name="pref_title_set_default_start_page">Başlangıç sayfası</string>
     <string name="title_activity_settings">Ayarlar</string>
     <string name="pref_title_transparent_toolbar">"Yarı şeffaf araç çubuğu"</string>
-    <string name="pref_title_show_playback_controller_card">Oynatma kontrolörü kartı</string>
     <string name="pref_title_colored_navigation_bar_artists">Sanatçı görünümü</string>
     <string name="pref_title_colored_navigation_bar_albums">Albüm görünümü</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Şimdi çalınan görünümü</string>
@@ -90,7 +98,7 @@
     <string name="pref_title_colored_navigation_bar_tag_editor">Etiket düxenleyici</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Başka her yer</string>
     <string name="pref_title_colored_album_footers">Renkli albüm alt bilgileri</string>
-    <string name="no_equalizer">Hiçbir ekolayzer bulunamadı</string>
+    <string name="no_equalizer">Hiç ekolayzır bulunamadı</string>
     <string name="no_audio_ID">"Hiçbir ses kimliği yok, bir şarkı çalın ve tekrar deneyin."</string>
     <string name="navigation_drawer_open">Gezinti çekmecesini aç</string>
     <string name="navigation_drawer_close">"Gezinti çekmecesini kapat"</string>
@@ -115,9 +123,8 @@
     <string name="rescanning_media">Medyayı yeniden tara</string>
     <string-array name="update_album_cover_options">
         <item>Last.FM den indir</item>
-        <item>Yerel Depolamayı Seç</item>
+        <item>Varolandan Seç</item>
         <item>Web\'de ara</item>
         <item>Albüm Kapağını Kaldır</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"Çalma sırasına 1 başlık eklendi"</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e866a9d4..aa00e04e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -50,6 +50,8 @@
     <string name="no_results">没有找到结果</string>
     <string name="action_re_download_artist_image">更新歌手图片</string>
     <string name="updating">正在更新…</string>
+    <string name="added_title_to_playing_queue">"该曲目已加入播放队列"</string>
+    <string name="added_x_titles_to_playing_queue">%1$d首曲目已加入播放队列</string>
     <string name="action_delete_from_playlist">从播放列表中删除</string>
     <string name="new_playlist_action">新建播放列表</string>
     <string name="action_grid_columns">专辑列数</string>
@@ -58,13 +60,29 @@
     <string name="created_playlist_x">播放列表%1$s已创建</string>
     <string name="deleted_playlist_x">%1$s播放列表已删除</string>
     <string name="couldnot_create_playlist_x">创建播放列表%1$s失败</string>
-    <string name="delete_playlist_x"><![CDATA[确认要删除以下播放列表：<b>%1$s</b>？]]></string>
+    <string name="delete_playlist_x"><![CDATA[
+确认要删除此播放列表：<b>%1$s</b>？
+    ]]></string>
+    <string name="delete_x_playlists"><![CDATA[
+确认要删除以下<b>%1$d</b>个播放列表？
+    ]]></string>
     <string name="delete_song_x"><![CDATA[确认要删除这首歌：<b>%1$s</b>？]]></string>
-    <string name="delete_x_songs"><![CDATA[确认要删除以下歌曲：<b>%1$d</b>？]]></string>
+    <string name="delete_x_songs"><![CDATA[
+确认要删除以下<b>%1$d</b>首歌曲？
+    ]]></string>
+    <string name="delete_song_x_from_playlist"><![CDATA[
+确认要从播放列表中删除这首歌：<b>%1$s</b>？
+    ]]></string>
+    <string name="delete_x_songs_from_playlist"><![CDATA[
+确认要从播放列表中删除以下<b>%1$d</b>首歌曲？
+    ]]></string>
     <string name="delete_song_title">删除歌曲</string>
     <string name="delete_songs_title">删除歌曲</string>
+    <string name="delete_song_from_playlist_title">从播放列表删除</string>
+    <string name="delete_songs_from_playlist_title">从播放列表删除</string>
     <string name="rename_playlist_title">重命名播放列表</string>
     <string name="delete_playlist_title">删除播放列表</string>
+    <string name="delete_playlists_title">删除播放列表</string>
     <string name="add_playlist_title">"添加到播放列表"</string>
     <string name="new_playlist_title">新建播放列表</string>
     <string name="delete_warning">"警告：该操作无法撤销。"</string>
@@ -82,7 +100,6 @@
     <string name="pref_title_set_default_start_page">设置默认起始页</string>
     <string name="title_activity_settings">设置</string>
     <string name="pref_title_transparent_toolbar">"半透明工具栏"</string>
-    <string name="pref_title_show_playback_controller_card">卡片式播放控制面板</string>
     <string name="pref_title_colored_navigation_bar_artists">在艺术家界面使用变色导航栏</string>
     <string name="pref_title_colored_navigation_bar_albums">在专辑详情界面使用变色导航栏</string>
     <string name="pref_title_colored_navigation_bar_current_playing">正在播放视图</string>
@@ -119,5 +136,4 @@
         <item>通过网络搜索</item>
         <item>删除封面</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"该曲目已加入播放队列"</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index bf78e3b8..6498964c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -50,6 +50,7 @@
     <string name="no_results">無搜尋結果</string>
     <string name="action_re_download_artist_image">更新歌手圖片</string>
     <string name="updating">更新中…</string>
+    <string name="added_title_to_playing_queue">"這歌曲已加入播放佇列"</string>
     <string name="action_delete_from_playlist">從音樂清單移除</string>
     <string name="new_playlist_action">新增音樂清單</string>
     <string name="action_grid_columns">專輯網格列數</string>
@@ -82,7 +83,6 @@
     <string name="pref_title_set_default_start_page">設定預設起始頁</string>
     <string name="title_activity_settings">設定</string>
     <string name="pref_title_transparent_toolbar">"半透明工具列"</string>
-    <string name="pref_title_show_playback_controller_card">卡片式播放控制面板</string>
     <string name="pref_title_colored_navigation_bar_artists">歌手頁面</string>
     <string name="pref_title_colored_navigation_bar_albums">專輯頁面</string>
     <string name="pref_title_colored_navigation_bar_current_playing">播放頁面</string>
@@ -119,5 +119,4 @@
         <item>網路搜尋</item>
         <item>刪除封面</item>
     </string-array>
-    <string name="added_title_to_playing_queue">"這歌曲已加入播放佇列"</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fc7e3373..386b2a76 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,7 +108,6 @@
     <string name="pref_title_set_default_start_page">Start page</string>
     <string name="title_activity_settings">Settings</string>
     <string name="pref_title_transparent_toolbar">Semi-Transparent toolbar</string>
-    <string name="pref_title_show_playback_controller_card">Playback controller card</string>
     <string name="pref_title_colored_navigation_bar_artists">Artist view</string>
     <string name="pref_title_colored_navigation_bar_albums">Album view</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Playing view</string>