diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 760e5e7c..1b4ac78b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -47,7 +47,6 @@
     <string name="save_as_playlist">حفظ كقائمة تشغيل</string>
     <string name="credits_3">الأيقونة من تصميم</string>
     <string name="credits_1">"مشغل الموسيقى فونقراف هو برنامج مجاني بشكلٍ كامل بتصميم أنيق من تصميم"</string>
-    <string name="title_activity_search">بحث</string>
     <string name="no_results">لا توجد نتائج</string>
     <string name="action_re_download_artist_image">تحديث صورة الفنان</string>
     <string name="updating">يتم التحديث...</string>
@@ -83,7 +82,6 @@
     <string name="pref_summary_colored_navigation_bar">في أي مشهد يتم تلوين شريط التنقل</string>
     <string name="pref_title_navigation_bar">شريط تنقل ملون</string>
     <string name="pref_title_set_default_start_page">ضبط صفحة البدء</string>
-    <string name="title_activity_settings">الإعدادات</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>
@@ -113,10 +111,4 @@
     <string name="failed_download_albumart">"تعذر تحميل صور هذا الألبوم."</string>
     <string name="search_hint">البحث في المكتبة...</string>
     <string name="rescanning_media">إعادة تفحص الملفات...</string>
-    <string-array name="update_album_cover_options">
-        <item>تحميل من last.fm</item>
-        <item>اختيار من ذاكرة التخزين الداخلية</item>
-        <item>بحث في الإنترنات</item>
-        <item>حذف الغلاف</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e3d68b58..1480f0ac 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -46,7 +46,6 @@
     <string name="save_as_playlist">Uložit jako playlist...</string>
     <string name="credits_3">Ikonu vytvořil</string>
     <string name="credits_1">"Phonograph je hudební přehrávač, který je úplně zdarma a založen na material designu od"</string>
-    <string name="title_activity_search">Hledat</string>
     <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>
@@ -79,7 +78,6 @@
     <string name="pref_summary_colored_navigation_bar">Zvolte, kde se má zobrazovat barevné záhlaví.</string>
     <string name="pref_title_navigation_bar">Barevné záhlaví</string>
     <string name="pref_title_set_default_start_page">Zvolit výchozí obrazovku</string>
-    <string name="title_activity_settings">Nastavení</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>
@@ -109,10 +107,4 @@
     <string name="failed_download_albumart">"Není možné stáhnout obal tohoto alba."</string>
     <string name="search_hint">Vyhledat zvukové soubory...</string>
     <string name="rescanning_media">Kontrola médií...</string>
-    <string-array name="update_album_cover_options">
-        <item>Stáhnout z Last.fm</item>
-        <item>Zvolit ze souborů</item>
-        <item>Najít na webu</item>
-        <item>Odstranit obal alba</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 462d0f6d..bef8d90f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">Es konnte keine passende Biografie für diesen Interpreten gefunden werden.</string>
     <string name="biography">Biografie</string>
     <string name="audio_focus_denied">Kein Audiofokus.</string>
-    <string name="title_activity_tag_editor">Tags ändern</string>
     <string name="tag_editor">Tags ändern</string>
     <string name="album">Album</string>
     <string name="artist">Interpret</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">Das Feld \"Albumtitel\" oder \"Albuminterpret\" ist leer.</string>
     <string name="writing_file_number">Datei schreiben...</string>
     <string name="saving_changes">Speichere Änderungen...</string>
-    <string name="title_activity_album_tag_editor">Albumtags bearbeiten</string>
     <string name="label_details">Details</string>
     <string name="label_file_name">Dateiname</string>
     <string name="label_file_path">Dateipfad</string>
@@ -55,7 +53,6 @@
     <string name="save_as_playlist">Als Wiedergabeliste speichern</string>
     <string name="credits_3">Icon von</string>
     <string name="credits_1">"Phonograph ist ein kostenloser Musikplayer im Material Design. Gemacht von"</string>
-    <string name="title_activity_search">Suche</string>
     <string name="no_results">Keine Ergebnisse</string>
     <string name="action_re_download_artist_image">Interpretenbild aktualisieren</string>
     <string name="updating">Aktualisiere...</string>
@@ -98,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">In welchen Ansichten die Navigationsleiste gefärbt werden soll</string>
     <string name="pref_title_navigation_bar">Farbige Navigationsleiste</string>
     <string name="pref_title_set_default_start_page">Startseite</string>
-    <string name="title_activity_settings">Einstellungen</string>
     <string name="pref_title_colored_navigation_bar_artists">Interpreten</string>
     <string name="pref_title_colored_navigation_bar_albums">Albumansicht</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Aktuelle Wiedergabe</string>
@@ -148,11 +144,4 @@
     <string name="failed_download_albumart">"Das Cover für dieses Album konnte nicht heruntergeladen werden."</string>
     <string name="search_hint">Durchsuche deine Mediathek</string>
     <string name="rescanning_media">Medien neu scannen...</string>
-    <string name="other">Andere</string>
-    <string-array name="update_album_cover_options">
-        <item>Von Last.fm herunterladen</item>
-        <item>Aus lokalem Speicher wählen</item>
-        <item>Websuche</item>
-        <item>Cover entfernen</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 46fa9782..6cc1db3b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -21,7 +21,6 @@
     <string name="biography_unavailable">Συγγνώμη, δεν βρήκαμε τη βιογραφία αυτού του καλλιτέχνη</string>
     <string name="biography">Βιογραφία</string>
     <string name="audio_focus_denied">Δεν μπορούμε να φέρουμε τον ήχο στο προσκήνιο.</string>
-    <string name="title_activity_tag_editor">Επεξεργασία ετικετών</string>
     <string name="tag_editor">Επεξεργασία ετικετών</string>
     <string name="album">Δίσκος</string>
     <string name="artist">Καλλιτέχνης</string>
@@ -33,7 +32,6 @@
     <string name="album_or_artist_empty">Το πεδιο \"τίτλος του δίσκου\" ή \"καλλιτέχνης του δίσκου\" είναι άδειο</string>
     <string name="writing_file_number">Γίνεται εγγραφή</string>
     <string name="saving_changes">Γίνεται αποθήκευση αλλαγών...</string>
-    <string name="title_activity_album_tag_editor">Επεξεργασία ετικετών δίσκου</string>
     <string name="label_details">Λεπτομέρειες</string>
     <string name="label_file_name">Όνομα αρχείου</string>
     <string name="label_file_path">Διαδρομή αρχείου</string>
@@ -48,13 +46,11 @@
     <string name="save_as_playlist">Αποθήκευση ως λίστα</string>
     <string name="credits_3">Εικονίδιο από</string>
     <string name="credits_1">"Το Phonograph είναι μια εντελώς δωρεάν εφαρμογή βασισμένη στο material design από"</string>
-    <string name="title_activity_search">Αναζήτηση</string>
     <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="title_activity_playlist_detail">Δραστηριότητα λίστας</string>
     <string name="new_playlist_action">Νέα λίστα αναπαραγωγής...</string>
     <string name="action_grid_columns">Στήλες πλέγματος</string>
     <string name="action_grid_columns_land">Στήλες πλέγματος</string>
@@ -87,7 +83,6 @@
     <string name="pref_summary_colored_navigation_bar">Σε ποιές προβολές θα χρωματίζεται η μπάρα πλοήγησης.</string>
     <string name="pref_title_navigation_bar">Έγχρωμη μπάρα πλοήγησης</string>
     <string name="pref_title_set_default_start_page">Αρχική σελίδα</string>
-    <string name="title_activity_settings">Ρυθμίσεις</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>
@@ -117,10 +112,4 @@
     <string name="failed_download_albumart">"Αδυναμία λήψης εξώφυλλου γι αυτό το δίσκο."</string>
     <string name="search_hint">Αναζήτηση στη βιβλιοθήκη...</string>
     <string name="rescanning_media">Σάρωση αρχείων πολυμέσων...</string>
-    <string-array name="update_album_cover_options">
-        <item>Λήψη από το Last.fm</item>
-        <item>Επιλογή από τη συσκευή</item>
-        <item>Αναζήτηση στο διαδίκτυο</item>
-        <item>Διαγραφή εξώφυλλου</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index c5cbc497..ac903fd8 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -28,7 +28,6 @@
     <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</string>
     <string name="tag_editor">Editor de etiquetas</string>
     <string name="album">Álbum</string>
     <string name="artist">Artista</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">El título del álbum o el campo de 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 etiquetas del album</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>
@@ -55,13 +53,11 @@
     <string name="save_as_playlist">Guardar como lista de reproducción</string>
     <string name="credits_3">Icono por</string>
     <string name="credits_1">"Phonograph es un reproductor de música gratuito basado en Material Design hecho por"</string>
-    <string name="title_activity_search">Buscar</string>
     <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="added_x_titles_to_playing_queue">Añadir %1$d a la cola de reproducción</string>
-    <string name="title_activity_playlist_detail">Actividad de la lista de reproducción</string>
     <string name="action_remove_from_playlist">Eliminar 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>
@@ -101,7 +97,6 @@
     <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">Pagina de inicio</string>
-    <string name="title_activity_settings">Ajustes</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">Ver por artista</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Ver reproducción</string>
@@ -109,9 +104,11 @@
     <string name="pref_title_colored_navigation_bar_tag_editor">Editor de etiquetas</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Cualquier lugar</string>
     <string name="pref_title_colored_album_footers">Pie de álbum coloreado</string>
-    <string name="pref_title_fade_play_pause">Reproducir/Pausa Desvanecimiento</string>
+    <string name="pref_title_colored_notification">Notificación coloreada</string>
+    <string name="pref_title_fade_play_pause">"Fundido de audio en Reproducir/Pausa "</string>
+    <string name="pref_title_gapless_playback">Quitar silencio entre canciones</string>
     <string name="pref_title_force_square_album_art">Forzar portada de álbum a cuadrado</string>
-    <string name="pref_title_opaque_toolbar_now_playing">Barra de reproduciendo opaca</string>
+    <string name="pref_title_opaque_toolbar_now_playing">Barra de Reproducción Actual opaca</string>
     <string name="pref_title_opaque_statusbar_now_playing">Barra de estado opaca</string>
     <string name="pref_title_larger_title_box_now_playing">Caja de título grande</string>
     <string name="pref_title_alternative_progress_slider_now_playing">Barra de progreso alternativa</string>
@@ -142,21 +139,16 @@
     <string name="song">Canción</string>
     <string name="pref_only_lollipop">"Solamente disponible en Lollipop"</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="pref_summary_fade_play_pause">"Desvanecimiento en reproducir/pausa."</string>
+    <string name="pref_summary_colored_notification">"La notificación es coloreada basándose en la paleta de colores de la tapa del álbum."</string>
+    <string name="pref_summary_fade_play_pause">"Fundido de volumen de la canción en reproducir/pausar."</string>
+    <string name="pref_summary_gapless_playback">"Elimina el silencio entre dos canciones. Desactivando esta opción, podrían ocurrir problemas en la reproducción."</string>
     <string name="pref_summary_force_square_album_art">La portada del álbum en reproduciendo es forzada a ser cuadrada.</string>
-    <string name="pref_summary_opaque_toolbar_now_playing">La barra en reproduciendo es opaca y no tapa la portada del álbum.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">La barra en Reproducción Actual es opaca y no tapa la portada del álbum.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">La barra de estado es opaca y no cubre la tapa del álbum.</string>
-    <string name="pref_summary_larger_title_box_now_playing">la caja detrás de la tapa del álbum donde el título de la canción y el artista es mas largo que su altura.</string>
-    <string name="pref_summary_alternative_progress_slider_now_playing">Usa una barra de progreso que no cubre la tapa del álbum en vez de el deslizador normal de progreso.</string>
-    <string name="pref_summary_playback_controller_card_now_playing">Mostrar tarjeta detrás de los botones de control de reproducción (reproducir/pausa, etc).</string>
+    <string name="pref_summary_larger_title_box_now_playing">La caja detrás de la tapa del álbum donde se encuentra el título de la canción y el artista es mas largo que su altura.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Usa una barra de progreso que no cubre la tapa del álbum en vez de la barra normal de progreso.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Mostrar tarjeta detrás de los botones de control de reproducción (reproducir/pausar, etc).</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>
-    <string name="other">Otro</string>
-    <string-array name="update_album_cover_options">
-        <item>Descargar de Last.fm</item>
-        <item>Seleccionar de Almacenamiento Interno</item>
-        <item>Busqueda Web</item>
-        <item>Eliminar Carátula</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 6f9f0f39..1279f202 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -46,7 +46,6 @@
     <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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6a7a1e37..70f5d58f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="what_do_you_want_to_share">Que voulez-vous partager ?</string>
-    <string name="currently_listening_to_x_by_x">En train d\'écouter %1$ss de %2$s</string>
+    <string name="currently_listening_to_x_by_x">Vous écoutez %1$s de %2$s</string>
     <string name="the_audio_file">Le fichier audio</string>
     <string name="do_you_want_to_set_x_as_ringtone">Voulez-vous définir %1$ss comme sonnerie ?</string>
     <string name="x_has_been_set_as_ringtone">%1$s a été définie comme sonnerie.</string>
@@ -10,7 +10,7 @@
     <string name="action_settings">"Paramètres"</string>
     <string name="action_about">À propos</string>
     <string name="action_currently_playing">Lecture en cours</string>
-    <string name="action_playing_queue">Liste de lecture</string>
+    <string name="action_playing_queue">File de lecture</string>
     <string name="action_search">Rechercher</string>
     <string name="action_play_next">Prochaine lecture</string>
     <string name="action_add_to_playing_queue">Ajouter à la liste de lecture</string>
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">Nous n\'avons pas trouvé la biographie correspondant à cet artiste.</string>
     <string name="biography">Biographie</string>
     <string name="audio_focus_denied">Aucun focus audio.</string>
-    <string name="title_activity_tag_editor">Éditeur d\'infos</string>
     <string name="tag_editor">Éditeur d\'infos</string>
     <string name="album">Album</string>
     <string name="artist">Artiste</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">Veuillez indiquer le nom et l\'artiste de l\'album.</string>
     <string name="writing_file_number">Fichier en cours d\'écriture</string>
     <string name="saving_changes">Sauvegarde en cours...</string>
-    <string name="title_activity_album_tag_editor">Éditeur d\'album</string>
     <string name="label_details">Détails</string>
     <string name="label_file_name">Nom du fichier</string>
     <string name="label_file_path">Chemin du fichier</string>
@@ -55,7 +53,6 @@
     <string name="save_as_playlist">Sauvegarder</string>
     <string name="credits_3">Icône par</string>
     <string name="credits_1">"Phonograph est un lecteur de musique entièrement gratuit suivant le concept du Material Design. Phonograph vous est apporté par"</string>
-    <string name="title_activity_search">Rechercher</string>
     <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>
@@ -98,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">Dans quelles vues la barre navigation doit être colorée.</string>
     <string name="pref_title_navigation_bar">Barre de navigation colorée</string>
     <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_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>
@@ -107,6 +103,8 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Partout ailleurs</string>
     <string name="pref_title_colored_album_footers">Bas d\'album coloré</string>
     <string name="pref_title_colored_notification">Notification colorée</string>
+    <string name="pref_title_fade_play_pause">Transition lecture/pause</string>
+    <string name="pref_title_gapless_playback">Lecture sans coupure</string>
     <string name="pref_title_force_square_album_art">Vignette carrée</string>
     <string name="pref_title_opaque_toolbar_now_playing">Barre d\'outil opaque</string>
     <string name="pref_title_opaque_statusbar_now_playing">Barre d\'état opaque</string>
@@ -139,17 +137,19 @@
     <string name="song">Titre</string>
     <string name="pref_only_lollipop">"Uniquement disponible sur Lollipop."</string>
     <string name="pref_summary_colored_album_footers">"Les bas d\'album dans la grille sont colorés avec la palette de la vignette."</string>
+    <string name="pref_summary_colored_notification">"La notification est colorée en fonction de la vignette de l\'album."</string>
+    <string name="pref_summary_fade_play_pause">"Ajoute une transition fluide lors du passage lecture/pause."</string>
+    <string name="pref_summary_gapless_playback">"Élimine le silence entre deux musiques. Désactiver cette option peut résoudre les éventuels problèmes de lecture."</string>
     <string name="pref_summary_force_square_album_art">La vignette de l\'album dans l\'écran de lecture en cours est forcée à rester carrée.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">La barre d\'outil est opaque et ne recouvre pas la vignette de l\'album.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">La barre d\'état est opaque et ne recouvre pas la vignette de l\'album.</string>
+    <string name="pref_summary_larger_title_box_now_playing">La boîte en dessous de la vignette de l\'album où se trouvent le titre de la musique et l\'artiste est plus large dans sa hauteur.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Utilise une barre de progression qui ne recouvre pas la vignette de l\'album à la place de la barre de progression normale.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Affiche une carte derrière les boutons de lecture (lecture/pause etc.)</string>
     <string name="failed_download_albumart">"Impossible de télécharger la vignette pour cet album."</string>
     <string name="search_hint">Rechercher votre bibliothèque...</string>
     <string name="rescanning_media">Réanalyse des médias…</string>
-    <string name="other">Autre</string>
-    <string-array name="update_album_cover_options">
-        <item>Télécharger depuis Last.fm</item>
-        <item>Choisir sur l\'appareil</item>
-        <item>Recherche internet</item>
-        <item>Supprimer la vignette</item>
-    </string-array>
+    <string name="favorites">Favoris</string>
+    <string name="recently_played">Écouté récemment</string>
+    <string name="my_top_tracks">Mes meilleurs titres</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
new file mode 100644
index 00000000..4eb864e8
--- /dev/null
+++ b/app/src/main/res/values-hr/strings.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="what_do_you_want_to_share">Što želite podijeliti?</string>
+    <string name="currently_listening_to_x_by_x">Trenutno slušate %1$s od %2$s</string>
+    <string name="the_audio_file">Audio datoteka</string>
+    <string name="do_you_want_to_set_x_as_ringtone">Želite li postaviti %1$s kao zvuk zvona?</string>
+    <string name="x_has_been_set_as_ringtone">Postavili ste %1$s kao zvuk zvona.</string>
+    <string name="action_set_as_ringtone">Postavi kao zvuk zvona</string>
+    <string name="action_share">Podijeli</string>
+    <string name="action_settings">"Postavke"</string>
+    <string name="action_about">O</string>
+    <string name="action_currently_playing">Trenutno se reproducira</string>
+    <string name="action_playing_queue">Red čekanja</string>
+    <string name="action_search">Traži</string>
+    <string name="action_play_next">Reproduciraj sljedeće</string>
+    <string name="action_add_to_playing_queue">Dodaj u red čekanja</string>
+    <string name="action_remove_from_playing_queue">Ukloni s reda čekanja</string>
+    <string name="action_add_to_playlist">Dodaj na popis pjesama...</string>
+    <string name="action_tag_editor">Uređivač Tagova</string>
+    <string name="action_delete_from_disk">Obriši s lokalnog spremišta</string>
+    <string name="action_details">Detalji</string>
+    <string name="albums">Albumi</string>
+    <string name="artists">Izvođači</string>
+    <string name="songs">Pjesme</string>
+    <string name="playlists">Popisi pjesama</string>
+    <string name="nothing_playing">Ništa se ne reproducira</string>
+    <string name="unplayable_file">Došlo je do greške prilikom pokušaja reproduciranja ove pjesme.</string>
+    <string name="biography_unavailable">Nismo mogli pronaći biografiju ovog izvođača.</string>
+    <string name="biography">Biografija</string>
+    <string name="audio_focus_denied">Nema audio fokusa.</string>
+    <string name="tag_editor">Uređivač tagova</string>
+    <string name="album">Album</string>
+    <string name="artist">Izvođač</string>
+    <string name="genre">Žanr</string>
+    <string name="album_artist">Izvođač albuma</string>
+    <string name="year">Godina</string>
+    <string name="track">Redni broj</string>
+    <string name="track_hint">"Redni broj (2 za pjesmu broj 2 ili 3004 za CD3 pjesmu broj 4)"</string>
+    <string name="album_or_artist_empty">Polje za naziv ili izvođača albuma je prazno.</string>
+    <string name="writing_file_number">Spremam datoteku</string>
+    <string name="saving_changes">Spremam promjene...</string>
+    <string name="label_details">Detalji</string>
+    <string name="label_file_name">Ime datoteke</string>
+    <string name="label_file_path">Odredište datoteke</string>
+    <string name="label_file_size">Veličina</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_track_length">Duljina</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Sampling rate</string>
+    <string name="action_go_to_artist">Idi na izvođača</string>
+    <string name="action_go_to_album">Idi na album</string>
+    <string name="label_current_playing_queue">Red čekanja</string>
+    <string name="save_as_playlist">Spremi kao popis pjesama</string>
+    <string name="credits_3">Ikonu kreirao</string>
+    <string name="credits_1">"Phonograph je potpuno besplatna materijalno dizajnirana aplikacija za reproduciranje glazbe koju je stvorio"</string>
+    <string name="no_results">Nema rezultata</string>
+    <string name="action_re_download_artist_image">Ažuriraj sliku izvođača</string>
+    <string name="updating">Ažuriram...</string>
+    <string name="added_title_to_playing_queue">"Dodana 1 pjesma u red čekanja."</string>
+    <string name="added_x_titles_to_playing_queue">Dodano %1$d pjesama u red čekanja.</string>
+    <string name="action_remove_from_playlist">Ukloni s popisa pjesama</string>
+    <string name="new_playlist_action">Novi popis pjesama...</string>
+    <string name="action_grid_columns">Rešetka</string>
+    <string name="action_grid_columns_land">Rešetka (Položeno)</string>
+    <string name="inserted_x_songs_into_playlist">Umetnuto %1$d pjesama u popis pjesama.</string>
+    <string name="created_playlist_x">Stvoren popis pjesama %1$s</string>
+    <string name="deleted_playlist_x">Obrisan popis pjesama %1$s</string>
+    <string name="couldnot_create_playlist_x">Nije bilo moguće kreirati popis pjesama %1$s</string>
+    <string name="delete_playlist_x"><![CDATA[Želite li obrisati popis pjesama <b>%1$s</b>?]]></string>
+    <string name="delete_x_playlists"><![CDATA[Želite li obrisati popise pjesama <b>%1$d</b>?]]></string>
+    <string name="delete_song_x"><![CDATA[Želite li obrisati pjesmu <b>%1$s</b>?]]></string>
+    <string name="delete_x_songs"><![CDATA[Želite li obrisati pjesme <b>%1$d</b>?]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Želite li ukloniti pjesmu <b>%1$s</b> s popisa pjesama?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Želite li ukloniti pjesme <b>%1$d</b> s popisa pjesama?]]></string>
+    <string name="delete_song_title">Obriši Pjesmu</string>
+    <string name="delete_songs_title">Obriši Pjesme</string>
+    <string name="remove_song_from_playlist_title">Ukloni Pjesmu s Popisa</string>
+    <string name="remove_songs_from_playlist_title">Ukloni Pjesme s Popisa</string>
+    <string name="rename_playlist_title">Preimenuj Popis Pjesama</string>
+    <string name="delete_playlist_title">Obriši Popis Pjesama</string>
+    <string name="delete_playlists_title">Obriši Popise Pjesama</string>
+    <string name="add_playlist_title">"Dodaj na Popis Pjesama"</string>
+    <string name="new_playlist_title">Novi Popis Pjesama</string>
+    <string name="delete_warning">"Upozorenje: Ovaj postupak nije moguće poništiti."</string>
+    <string name="shuffle_all">Sve nasumično</string>
+    <string name="last_opened">Zadnje otvoreno</string>
+    <string name="light_theme_name">Svijetlo</string>
+    <string name="dark_theme_name">Tamno</string>
+    <string name="equalizer">Ekvalizator</string>
+    <string name="pref_header_colors">Boje</string>
+    <string name="pref_header_now_playing_screen">Prikaz trenutnog reproduciranja</string>
+    <string name="pref_title_general_theme">Općenita tema</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">Općenito</string>
+    <string name="pref_summary_colored_navigation_bar">U kojem prikazu bi navigacijska traka trebala biti obojena.</string>
+    <string name="pref_title_navigation_bar">Obojena navigacijska traka</string>
+    <string name="pref_title_set_default_start_page">Početni ekran</string>
+    <string name="pref_title_colored_navigation_bar_artists">Prikaz izvođača</string>
+    <string name="pref_title_colored_navigation_bar_albums">Prikaz albuma</string>
+    <string name="pref_title_colored_navigation_bar_current_playing">Prikaz reproduciranja</string>
+    <string name="pref_title_colored_navigation_bar_playlists">Prikaz popisa pjesama</string>
+    <string name="pref_title_colored_navigation_bar_tag_editor">Uređivač tagova</string>
+    <string name="pref_title_colored_navigation_bar_other_screens">Bilo gdje drugdje</string>
+    <string name="pref_title_colored_album_footers">Obojana podnožja albuma</string>
+    <string name="pref_title_colored_notification">Obojane obavijesti</string>
+    <string name="pref_title_fade_play_pause">Iščezavanje kod pokreni/pauziraj</string>
+    <string name="pref_title_gapless_playback">Reprodukcija bez prekida</string>
+    <string name="pref_title_force_square_album_art">Četvrtasti omot albuma</string>
+    <string name="pref_title_opaque_toolbar_now_playing">Neprozirna alatna traka</string>
+    <string name="pref_title_opaque_statusbar_now_playing">Neprozirna statusna traka</string>
+    <string name="pref_title_larger_title_box_now_playing">Veći okvir s naslovom</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">Alternativni klizač napretka</string>
+    <string name="pref_title_playback_controller_card_now_playing">Prikaži karticu ispod kontrola reprodukcije</string>
+    <string name="no_equalizer">Ekvalizator nije pronađen</string>
+    <string name="no_audio_ID">"Nema audio ID-a, reproducirajte nešto i pokušajte opet."</string>
+    <string name="navigation_drawer_open">Otvori navigacijsku ladicu</string>
+    <string name="navigation_drawer_close">"Zatvori navigacijsku ladicu"</string>
+    <string name="delete_action">Obriši</string>
+    <string name="remove_action">Ukloni</string>
+    <string name="rename_action">Preimenuj</string>
+    <string name="create_action">Stvori</string>
+    <string name="x_selected">%1$d odabrano</string>
+    <string name="select">Odaberi</string>
+    <string name="default_str">Zadano</string>
+    <string name="primary_color">Primarna Boja</string>
+    <string name="accent_color">Naglašena Boja</string>
+    <string name="primary_color_desc">Primarna boja teme, zadana je indigo plava.</string>
+    <string name="accent_color_desc">Naglašena boja teme, primarna je roza.</string>
+    <string name="update_image">Ažuriraj Sliku</string>
+    <string name="playlist_empty_text">Popis pjesama je prazan</string>
+    <string name="no_playlists">Nema popisa pjesama</string>
+    <string name="no_albums">Nema albuma</string>
+    <string name="no_songs">Nema pjesama</string>
+    <string name="no_artists">Nema izvođača</string>
+    <string name="empty">Prazno</string>
+    <string name="playlist_name">Ime popisa pjesama</string>
+    <string name="song">Pjesma</string>
+    <string name="pref_only_lollipop">"Dostupno samo na Lollipopu."</string>
+    <string name="pref_summary_colored_album_footers">"Podnožje albuma u rešetci je obojano istaknutom bojom omota albuma."</string>
+    <string name="pref_summary_colored_notification">"Obavijesti su obojane istaknutom bojom omota albuma."</string>
+    <string name="pref_summary_fade_play_pause">"Iščezavanje pjesme prilikom početka/pauziranja reprodukcije."</string>
+    <string name="pref_summary_gapless_playback">"Uklanja prekide između dvije pjesme. Isključivanje ove mogućnosti možda će riješiti probleme pri reprodukciji."</string>
+    <string name="pref_summary_force_square_album_art">Omot albuma u prikazu reproduciranja je četvrtast.</string>
+    <string name="pref_summary_opaque_toolbar_now_playing">Alatna traka je neprozirna i ne prekriva omot albuma.</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">Statusna traka je neprozirna i ne prekriva omot albuma.</string>
+    <string name="pref_summary_larger_title_box_now_playing">Okvir ispod omota albuma gdje su prikazani naslov pjesme i izvođač je viši.</string>
+    <string name="pref_summary_alternative_progress_slider_now_playing">Koristi se traka napretka koja ne prekriva omot albuma umjesto uobičajenog klizača.</string>
+    <string name="pref_summary_playback_controller_card_now_playing">Prikazuje karticu ispod gumbića koji služe za kontrolu reprodukcije (pokreni/pauziraj itd.).</string>
+    <string name="failed_download_albumart">"Nije bilo moguće skinuti omot albuma."</string>
+    <string name="search_hint">Pretraži fonoteku...</string>
+    <string name="rescanning_media">Ponovno skeniram medijske datoteke...</string>
+    <string name="favorites">Favoriti</string>
+    <string name="recently_played">Nedavno reproducirano</string>
+    <string name="my_top_tracks">Moje top pjesme</string>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 939c8f4c..fae66ecd 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">Spiacenti - Impossibile trovare una biografia corrispondente a questo artista.</string>
     <string name="biography">Biografia</string>
     <string name="audio_focus_denied">Impossibile ottenere focus audio.</string>
-    <string name="title_activity_tag_editor">Modifica tag</string>
     <string name="tag_editor">Modifica tag</string>
     <string name="album">Album</string>
     <string name="artist">Artista</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">Il campo \"Album\" o \"Artista album\" è vuoto.</string>
     <string name="writing_file_number">Scrittura file in corso</string>
     <string name="saving_changes">Salvataggio modifiche in corso...</string>
-    <string name="title_activity_album_tag_editor">Modifica tag album</string>
     <string name="label_details">Dettagli</string>
     <string name="label_file_name">Nome file</string>
     <string name="label_file_path">Percorso file</string>
@@ -55,13 +53,11 @@
     <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 realizzato da"</string>
-    <string name="title_activity_search">Cerca</string>
     <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="added_x_titles_to_playing_queue">%1$d titoli aggiunti alla coda.</string>
-    <string name="title_activity_playlist_detail">Attività playlist</string>
     <string name="action_remove_from_playlist">Rimuovi dalla playlist</string>
     <string name="new_playlist_action">Nuova playlist...</string>
     <string name="action_grid_columns">Colonne griglia</string>
@@ -71,9 +67,7 @@
     <string name="deleted_playlist_x">Playlist %1$s eliminata</string>
     <string name="couldnot_create_playlist_x">Impossibile creare playlist %1$s</string>
     <string name="delete_playlist_x"><![CDATA[        Vuoi eliminare la playlist <b>%1$s</b>? ]]></string>
-    <string name="delete_x_playlists"><![CDATA[
-        Vuoi eliminare <b>%1$d</b> playlist? 
-    ]]></string>
+    <string name="delete_x_playlists"><![CDATA[        Vuoi eliminare <b>%1$d</b> playlist? ]]></string>
     <string name="delete_song_x"><![CDATA[        Vuoi eliminare il brano <b>%1$s</b>? ]]></string>
     <string name="delete_x_songs"><![CDATA[        Vuoi eliminare <b>%1$d</b> brani? ]]></string>
     <string name="remove_song_x_from_playlist"><![CDATA[Vuoi rimuovere il brano <b>%1$s</b> dalla playlist?]]></string>
@@ -101,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">In quali schermate colorare la barra di navigazione.</string>
     <string name="pref_title_navigation_bar">Barra di navigazione colorata</string>
     <string name="pref_title_set_default_start_page">Pagina iniziale</string>
-    <string name="title_activity_settings">Impostazioni</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>
@@ -111,6 +104,7 @@
     <string name="pref_title_colored_album_footers">Riquadri album colorati</string>
     <string name="pref_title_colored_notification">Notifica colorata</string>
     <string name="pref_title_fade_play_pause">Dissolvenza su play/pausa</string>
+    <string name="pref_title_gapless_playback">Riproduzione senza intervalli</string>
     <string name="pref_title_force_square_album_art">Copertina in proporzioni quadrate</string>
     <string name="pref_title_opaque_toolbar_now_playing">Toolbar di riproduzione opaca</string>
     <string name="pref_title_opaque_statusbar_now_playing">Status bar opaca</string>
@@ -145,6 +139,7 @@
     <string name="pref_summary_colored_album_footers">"I riquadri degli album nella griglia sono colorati secondo la gamma di colori della copertina."</string>
     <string name="pref_summary_colored_notification">"La notifica è colorata secondo la gamma di colori della copertina."</string>
     <string name="pref_summary_fade_play_pause">"Applica una dissolvenza in entrata/in uscita sul brano su play/pausa"</string>
+    <string name="pref_summary_gapless_playback">"Elimina l'intervallo tra due brani. Disabilitare quest'opzione può risolvere problemi di riproduzione."</string>
     <string name="pref_summary_force_square_album_art">La copertina nella schermata In riproduzione è sempre visualizzata con proporzioni quadrate.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">La toolbar nella schermata In riproduzione è opaca e non copre la copertina.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">La status bar è opaca e non copre la copertina.</string>
@@ -154,11 +149,7 @@
     <string name="failed_download_albumart">"Impossibile scaricare la copertina per quest\'album."</string>
     <string name="search_hint">Cerca nella tua libreria...</string>
     <string name="rescanning_media">Nuova scannerizzazione media in corso...</string>
-    <string name="other">Altro</string>
-    <string-array name="update_album_cover_options">
-        <item>Scarica da Last.fm</item>
-        <item>Scegli da archivio locale</item>
-        <item>Cerca nel web</item>
-        <item>Rimuovi copertina</item>
-    </string-array>
+    <string name="favorites">Preferiti</string>
+    <string name="recently_played">Riprodotti di recente</string>
+    <string name="my_top_tracks">Brani preferiti</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 5ec59ce5..f06d35fa 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">이 아티스트와 일치하는 정보를 찾을 수 없습니다.</string>
     <string name="biography">정보</string>
     <string name="audio_focus_denied">Audio focus 권한을 얻을 수 없습니다.</string>
-    <string name="title_activity_tag_editor">테그 편집기</string>
     <string name="tag_editor">테그 편집기</string>
     <string name="album">앨범</string>
     <string name="artist">아티스트</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">앨범 제목이나 앨범 아티스트 란이 비었습니다.</string>
     <string name="writing_file_number">파일에 정보 기록 중...</string>
     <string name="saving_changes">변경사항 저장 중...</string>
-    <string name="title_activity_album_tag_editor">앨범 테크 편집기</string>
     <string name="label_details">세부정보</string>
     <string name="label_file_name">파일 이름</string>
     <string name="label_file_path">파일 경로</string>
@@ -55,7 +53,6 @@
     <string name="save_as_playlist">재생목록으로 저장</string>
     <string name="credits_3">아이콘 제작</string>
     <string name="credits_1">"Phonograph는 완전히 무료인, 마터리얼 디자인이 적용된 음악 플레이어입니다. 제작자 :"</string>
-    <string name="title_activity_search">검색</string>
     <string name="no_results">결과 없음</string>
     <string name="action_re_download_artist_image">아티스트 이미지 변경</string>
     <string name="updating">변경 중...</string>
@@ -98,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">어느 때에 하단바가 색깔이 있어야 하는지 선택합니다.</string>
     <string name="pref_title_navigation_bar">하단바 색깔</string>
     <string name="pref_title_set_default_start_page">시작 화면</string>
-    <string name="title_activity_settings">설정</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>
@@ -106,7 +102,9 @@
     <string name="pref_title_colored_navigation_bar_tag_editor">테그 편집기 화면에서</string>
     <string name="pref_title_colored_navigation_bar_other_screens">기타 다른 모든 곳에서</string>
     <string name="pref_title_colored_album_footers">색칠된 앨범 카드</string>
+    <string name="pref_title_colored_notification">색칠된 알림 컨트롤</string>
     <string name="pref_title_fade_play_pause">재생/일시정지 시 페이드 효과</string>
+    <string name="pref_title_gapless_playback">끊김없이 재생</string>
     <string name="pref_title_force_square_album_art">강제로 정사각형 앨범아트 적용</string>
     <string name="pref_title_opaque_toolbar_now_playing">불투명한 지금 재생 중 툴바</string>
     <string name="pref_title_opaque_statusbar_now_playing">불투명한 상단바</string>
@@ -140,7 +138,9 @@
     <string name="song">노래</string>
     <string name="pref_only_lollipop">"안드로이드 롤리팝에서만 가능합니다."</string>
     <string name="pref_summary_colored_album_footers">"앨범 커버의 색상에 맞추어 앨범 카드가 색칠됩니다."</string>
+    <string name="pref_summary_colored_notification">"알림창에 뜨는 알림 컨트롤이 앨범 아트의 주요 색상으로 칠해집니다."</string>
     <string name="pref_summary_fade_play_pause">"재생/일시정시 시 페이드 인/아웃 효과를 줍니다."</string>
+    <string name="pref_summary_gapless_playback">"곡을 넘어갈 때 간격을 없애 끊김없이 재생합니다. 이 기능을 끄면 곡 전환 관련 문제가 해결될 수 있습니다."</string>
     <string name="pref_summary_force_square_album_art">지금 재생 중 화면의 앨범 아트 이미지가 강제로 정사각형으로 보이게 합니다.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">지금 재생 중 화면 상단의 툴바를 불투명하게 하고, 앨범 아트를 가리지 않게 합니다.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">상단바를 불투명하게 하고 앨범 아트를 가리지 않게 합니다.</string>
@@ -150,11 +150,7 @@
     <string name="failed_download_albumart">"이 앨범의 앨범 커버를 다운로드할 수 없습니다."</string>
     <string name="search_hint">저장소 검색...</string>
     <string name="rescanning_media">미디어 재스캐닝 중...</string>
-    <string name="other">기타</string>
-    <string-array name="update_album_cover_options">
-        <item>Last.fm에서 다운로드</item>
-        <item>저장소에서 고르기</item>
-        <item>인터넷 검색</item>
-        <item>커버 없애기</item>
-    </string-array>
+    <string name="favorites">좋아하는 곡들</string>
+    <string name="recently_played">최근 재생됨</string>
+    <string name="my_top_tracks">내가 좋아하는 트렉</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 995b0cd5..e7ee3d4f 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">Het is niet gelukt een passende biografie te vinden voor deze artiest.</string>
     <string name="biography">Biografie</string>
     <string name="audio_focus_denied">Geen audio focus.</string>
-    <string name="title_activity_tag_editor">Label bewerker</string>
     <string name="tag_editor">Label bewerker</string>
     <string name="album">Album</string>
     <string name="artist">Artiest</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">Album titel of album artiest tekstveld is leeg.</string>
     <string name="writing_file_number">Bestand wegschrijven</string>
     <string name="saving_changes">Wijzigingen opslaan...</string>
-    <string name="title_activity_album_tag_editor">Album label bewerker</string>
     <string name="label_details">Details</string>
     <string name="label_file_name">Bestandsnaam</string>
     <string name="label_file_path">Bestandspad</string>
@@ -55,13 +53,11 @@
     <string name="save_as_playlist">Opslaan als afspeellijst</string>
     <string name="credits_3">Icoon door</string>
     <string name="credits_1">"Phonograph is een volledig gratis muziekspeler in material design door"</string>
-    <string name="title_activity_search">Zoeken</string>
     <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="title_activity_playlist_detail">"Afspeellijst activiteit "</string>
     <string name="action_remove_from_playlist">Verwijder uit afspeellijst</string>
     <string name="new_playlist_action">Nieuwe afspeellijst...</string>
     <string name="action_grid_columns">Rasterkolommen</string>
@@ -99,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">In welke weergaven moet de navigatiebalk gekleurd zijn.</string>
     <string name="pref_title_navigation_bar">Gekleurde navigatiebalk</string>
     <string name="pref_title_set_default_start_page">Startpagina</string>
-    <string name="title_activity_settings">Instellingen</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>
@@ -109,6 +104,7 @@
     <string name="pref_title_colored_album_footers">Gekleurde album footers</string>
     <string name="pref_title_colored_notification">Gekleurde notificatie</string>
     <string name="pref_title_fade_play_pause">Faden bij afspelen/pauze</string>
+    <string name="pref_title_gapless_playback">Afspelen zonder pauzes</string>
     <string name="pref_title_force_square_album_art">Forceer vierkante albumhoes</string>
     <string name="pref_title_opaque_toolbar_now_playing">Ondoorzichtige werkbalk</string>
     <string name="pref_title_opaque_statusbar_now_playing">Ondoorzichtige statusbalk</string>
@@ -143,20 +139,17 @@
     <string name="pref_summary_colored_album_footers">"Album footers in het raster worden gekleurd met het palet van de albumhoes."</string>
     <string name="pref_summary_colored_notification">"Notificatie wordt gekleurd met het palet van de albumhoes."</string>
     <string name="pref_summary_fade_play_pause">"Nummers in- en uitfaden bij afspelen/pauze."</string>
+    <string name="pref_summary_gapless_playback">"Verwijderd de pauze tussen twee nummers. Dit uitzetten kan afspeelfouten mogelijk verhelpen."</string>
     <string name="pref_summary_force_square_album_art">Albumhoes in het afspeelscherm is geforceerd vierkant.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">De werkbalk is ondoorzichtig en bedekt de albumhoes niet.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">De statusbalk is ondoorzichtig en bedekt de albumhoes niet.</string>
-    <string name="pref_summary_larger_title_box_now_playing">De kader onder de albumhoes, waar de artiest en titel wordt getoond, is groter.</string>
+    <string name="pref_summary_larger_title_box_now_playing">De kader onder de albumhoes, waar de artiest en titel worden getoond, is groter.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Gebruikt een progressiebalk die de albumhoes niet bedekt, in plaats van de normale progressiecirkel.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Weergeeft een kaart onder de bedieningsknoppen (afspelen/pauze etc.)</string>
     <string name="failed_download_albumart">"Het lukt niet om de albumhoes te downloaden. "</string>
     <string name="search_hint">Zoek in je bibliotheek...</string>
     <string name="rescanning_media">Media herscannen...</string>
-    <string name="other">Anders</string>
-    <string-array name="update_album_cover_options">
-        <item>Downloaden van Last.fm</item>
-        <item>Kies vanuit lokale opslag</item>
-        <item>Zoeken op internet</item>
-        <item>Verwijder hoes</item>
-    </string-array>
+    <string name="favorites">Favorieten</string>
+    <string name="recently_played">Recent afgespeeld</string>
+    <string name="my_top_tracks">Mijn top nummers</string>
 </resources>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 7416ca44..ed13ec05 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -21,7 +21,6 @@
     <string name="biography_unavailable">Orsak, vi fann ingen passande biografi for denne artisten.</string>
     <string name="biography">Biografi</string>
     <string name="audio_focus_denied">We were not able to gain audio focus.</string>
-    <string name="title_activity_tag_editor">Tag editor</string>
     <string name="tag_editor">Tag editor</string>
     <string name="album">Album</string>
     <string name="artist">Artist</string>
@@ -33,7 +32,6 @@
     <string name="album_or_artist_empty">Tekstfeltet for albumtittel eller albumartist er tomt.</string>
     <string name="writing_file_number">Skriv til fil</string>
     <string name="saving_changes">Lagrar endringar...</string>
-    <string name="title_activity_album_tag_editor">Album Tag Editor</string>
     <string name="label_details">Detaljar</string>
     <string name="label_file_name">Filnamn</string>
     <string name="label_file_path">Sti til fil</string>
@@ -48,13 +46,11 @@
     <string name="save_as_playlist">Lagre som speleliste</string>
     <string name="credits_3">Ikon av</string>
     <string name="credits_1">"Phonograph er ein gratis musikkspelar i material design av"</string>
-    <string name="title_activity_search">Søk</string>
     <string name="no_results">Ingen resultat</string>
     <string name="action_re_download_artist_image">Oppdater artistbilete</string>
     <string name="updating">Oppdaterer...</string>
     <string name="added_title_to_playing_queue">"La 1 tittel til songkøen."</string>
     <string name="added_x_titles_to_playing_queue">La %1$d titlar til songkøen.</string>
-    <string name="title_activity_playlist_detail">Spelelisteaktivitet</string>
     <string name="new_playlist_action">Ny speleliste...</string>
     <string name="action_grid_columns">Rutenettkolonnar</string>
     <string name="action_grid_columns_land">Rutenettkolonnar (land)</string>
@@ -92,7 +88,6 @@
     <string name="pref_header_general">Generelt</string>
     <string name="pref_title_navigation_bar">Farga navigasjonslinje</string>
     <string name="pref_title_set_default_start_page">Startside</string>
-    <string name="title_activity_settings">Innstillingar</string>
     <string name="pref_title_colored_navigation_bar_artists">Artistvising</string>
     <string name="pref_title_colored_navigation_bar_albums">Albumvising</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Spelevising</string>
@@ -119,10 +114,4 @@
     <string name="failed_download_albumart">"Ikkje i stand til å laste ned omslagsbilete til dette albumet."</string>
     <string name="search_hint">Søk i biblioteket...</string>
     <string name="rescanning_media">Skanner media på nytt...</string>
-    <string-array name="update_album_cover_options">
-        <item>Last ned frå Last.fm</item>
-        <item>Vel frå lokal lagring</item>
-        <item>Nettsøk</item>
-        <item>Fjern omslagsbilete</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5f47e22f..5ba3c271 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">Niestety nie byliśmy w stanie znaleźć pasującej biografii dla tego wykonawcy</string>
     <string name="biography">Biografia</string>
     <string name="audio_focus_denied">Brak ostrości dźwięku</string>
-    <string name="title_activity_tag_editor">TagEditorActivity</string>
     <string name="tag_editor">Edytor tagów</string>
     <string name="album">Album</string>
     <string name="artist">Wykonawca</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">Pole tekstowe nazwy albumu lub wykonawcy jest puste.</string>
     <string name="writing_file_number">Zapisywanie pliku</string>
     <string name="saving_changes">Zapisywanie zmian...</string>
-    <string name="title_activity_album_tag_editor">AlbumTagEditorActivity</string>
     <string name="label_details">Szczegóły</string>
     <string name="label_file_name">Nazwa pliku</string>
     <string name="label_file_path">Ścieżka pliku</string>
@@ -55,13 +53,11 @@
     <string name="save_as_playlist">Zapisz jako listę odtwarzania</string>
     <string name="credits_3">Ikona</string>
     <string name="credits_1">"Phonograph to całkowicie darmowy odtwarzacz muzyczny, utrzymany w stylistyce Material Design, którego twórcą jest"</string>
-    <string name="title_activity_search">Szukaj</string>
     <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="title_activity_playlist_detail">Aktywność list odtwarzania</string>
     <string name="action_remove_from_playlist">Usuń z listy odtwarzania</string>
     <string name="new_playlist_action">Nowa lista odtwarzania...</string>
     <string name="action_grid_columns">Siatka kolumn</string>
@@ -99,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">Ustaw w którym miejscu pasek nawigacyjny ma być kolorowy</string>
     <string name="pref_title_navigation_bar">Kolorowy pasek nawigacyjny</string>
     <string name="pref_title_set_default_start_page">Strona startowa</string>
-    <string name="title_activity_settings">Ustawienia</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>
@@ -109,6 +104,7 @@
     <string name="pref_title_colored_album_footers">Kolorowa stopka albumu</string>
     <string name="pref_title_colored_notification">Kolorowy odtwarzacz w pasku powiadomień</string>
     <string name="pref_title_fade_play_pause">Wyciszenie podczas odtwarzania/pauzowania</string>
+    <string name="pref_title_gapless_playback">Odtwarzanie bez przerw</string>
     <string name="pref_title_force_square_album_art">Kadrowanie okładek</string>
     <string name="pref_title_opaque_toolbar_now_playing">Nieprzeźroczystość paska narzędzi</string>
     <string name="pref_title_opaque_statusbar_now_playing">Nieprzeźroczystość paska stanu</string>
@@ -143,6 +139,7 @@
     <string name="pref_summary_colored_album_footers">"Stopki albumów w widoku siatki mają tonacje okładek"</string>
     <string name="pref_summary_colored_notification">"Odtwarzacz w pasku powiadomień ma kolor okładki albumu"</string>
     <string name="pref_summary_fade_play_pause">"Wycisza utwór po dotknięciu przycisku odtwarzaj/pauzuj"</string>
+    <string name="pref_summary_gapless_playback">"Eliminuje pauzę pomiędzy dwoma utworami. Wyłączenie tej funkcji może rozwiązać ewentualne problemy z odtwarzaniem"</string>
     <string name="pref_summary_force_square_album_art">Zaznacz, a wymuszone zostanie kadrowanie okładek na ekranie \'\'Obecnie Grane\'\'</string>
     <string name="pref_summary_opaque_toolbar_now_playing">Zaznacz, a pasek narzędzi będzie nieprzeźroczysty i nie zasłoni już okładki</string>
     <string name="pref_summary_opaque_statusbar_now_playing">Zaznacz, a pasek stanu będzie nieprzeźroczysty i nie zasłoni już okładki albumu</string>
@@ -152,11 +149,7 @@
     <string name="failed_download_albumart">"Nie można pobrać okładki dla tego albumu"</string>
     <string name="search_hint">Szukaj w bibliotece...</string>
     <string name="rescanning_media">Ponowny skan nośnika...</string>
-    <string name="other">Inne</string>
-    <string-array name="update_album_cover_options">
-        <item>Pobierz z Last.fm</item>
-        <item>Wybierz z pamięci lokalnej</item>
-        <item>Szukaj w sieci</item>
-        <item>Usuń okładkę</item>
-    </string-array>
+    <string name="favorites">Ulubione</string>
+    <string name="recently_played">Ostatnio grane</string>
+    <string name="my_top_tracks">Moje najlepsze utwory</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 7da347b2..ea3ecea2 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">Desculpe, não conseguimos encontrar a biografia deste artista.</string>
     <string name="biography">Biografia</string>
     <string name="audio_focus_denied">Não conseguimos obter o foco do áudio.</string>
-    <string name="title_activity_tag_editor">Editor de tags</string>
     <string name="tag_editor">Editor de tags</string>
     <string name="album">Álbum</string>
     <string name="artist">Artista</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">O campo de título ou artista do álbum está vazio.</string>
     <string name="writing_file_number">Gravando no arquivo</string>
     <string name="saving_changes">Salvando alterações...</string>
-    <string name="title_activity_album_tag_editor">Editor de Tags de Álbum</string>
     <string name="label_details">Detalhes</string>
     <string name="label_file_name">Nome do arquivo</string>
     <string name="label_file_path">Endereço do arquivo</string>
@@ -55,13 +53,11 @@
     <string name="save_as_playlist">Salvar como playlist</string>
     <string name="credits_3">Ícone por</string>
     <string name="credits_1">"O Phonograph é um player de música completamente grátis com Material Design feito por"</string>
-    <string name="title_activity_search">Pesquisar</string>
     <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="title_activity_playlist_detail">Atividade da Lista de Reprodução</string>
     <string name="action_remove_from_playlist">Remover da playlist</string>
     <string name="new_playlist_action">Nova playlist...</string>
     <string name="action_grid_columns">Colunas da grade</string>
@@ -99,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">Definir onde a barra de navegação deve ser colorida.</string>
     <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
     <string name="pref_title_set_default_start_page">Página inicial</string>
-    <string name="title_activity_settings">Configurações</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>
@@ -109,6 +104,7 @@
     <string name="pref_title_colored_album_footers">Rodapés de álbuns coloridos</string>
     <string name="pref_title_colored_notification">Notificação colorida</string>
     <string name="pref_title_fade_play_pause">Diminuir tocar/pausar</string>
+    <string name="pref_title_gapless_playback">Reprodução continua</string>
     <string name="pref_title_force_square_album_art">Forçar a capa do álbum quadrada</string>
     <string name="pref_title_opaque_toolbar_now_playing">Barra de ações opaca</string>
     <string name="pref_title_opaque_statusbar_now_playing">Barra de status opaca</string>
@@ -143,6 +139,7 @@
     <string name="pref_summary_colored_album_footers">"Rodapés de álbum na grade são coloridos com as paletas correspondentes."</string>
     <string name="pref_summary_colored_notification">"A notificação é colorida com a cor mais vibrante do álbum."</string>
     <string name="pref_summary_fade_play_pause">"Diminuir musica na entrada/saída no tocar/pausar."</string>
+    <string name="pref_summary_gapless_playback">"Elimina a lacuna entre duas músicas. Desativar essa pode corrigir problemas de reprodução."</string>
     <string name="pref_summary_force_square_album_art">A arte do álbum na tela de execução agora é forçado a ser quadrado.</string>
     <string name="pref_summary_opaque_toolbar_now_playing">A barra de ações está opaca e não cobre mais a capa do álbum.</string>
     <string name="pref_summary_opaque_statusbar_now_playing">A Barra de status é opaca e não cobre a capa do álbum.</string>
@@ -152,11 +149,4 @@
     <string name="failed_download_albumart">"Não foi possível fazer o download da arte para este álbum."</string>
     <string name="search_hint">Pesquisar na sua biblioteca...</string>
     <string name="rescanning_media">Verificando mídia novamente...</string>
-    <string name="other">Outro</string>
-    <string-array name="update_album_cover_options">
-        <item>Baixar do Last.fm</item>
-        <item>Escolher do Armazenamento Local</item>
-        <item>Pesquisa na Internet</item>
-        <item>Remover Arte do Album</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 877b9cf3..ce1c2b32 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -45,7 +45,6 @@
     <string name="save_as_playlist">Salvar como uma playlist</string>
     <string name="credits_3">Ícone por</string>
     <string name="credits_1">"Phonograph é um player de música completamente grátis com Material Design feito por"</string>
-    <string name="title_activity_search">Pesquisar</string>
     <string name="no_results">Nenhum resultado</string>
     <string name="action_re_download_artist_image">Atualizar imagem do artista</string>
     <string name="updating">Atualizando...</string>
@@ -62,7 +61,6 @@
     <string name="pref_header_audio">Áudio</string>
     <string name="pref_header_general">Geral</string>
     <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_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>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index d0d32779..5279a344 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -45,7 +45,6 @@
     <string name="save_as_playlist">Salvează ca și playlist</string>
     <string name="credits_3">Iconița de</string>
     <string name="credits_1">"Phonograph este o aplicație complet gratuită bazată pe Material Design făcută de"</string>
-    <string name="title_activity_search">ActivitateaDeCăutare</string>
     <string name="no_results">Niciun rezultat</string>
     <string name="action_re_download_artist_image">Actualizează imagine artist</string>
     <string name="updating">Actualizare...</string>
@@ -77,7 +76,6 @@
     <string name="pref_header_general">General</string>
     <string name="pref_title_navigation_bar">Bară de navigare colorată</string>
     <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_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>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 13fa26e8..187b3044 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -21,7 +21,6 @@
     <string name="biography_unavailable">Извините, биография для этого исполнителя не найдена.</string>
     <string name="biography">Биография</string>
     <string name="audio_focus_denied">Невозможно получить аудио фокус.</string>
-    <string name="title_activity_tag_editor">Редактор тэгов</string>
     <string name="tag_editor">Редактор тэгов</string>
     <string name="album">Альбом</string>
     <string name="artist">Исполнитель</string>
@@ -33,7 +32,6 @@
     <string name="album_or_artist_empty">Поля название альбома или альбом исполнителя пусты</string>
     <string name="writing_file_number">Запись файла</string>
     <string name="saving_changes">Сохранение изменений...</string>
-    <string name="title_activity_album_tag_editor">Редактор тэгов альбома</string>
     <string name="label_details">Подробнее</string>
     <string name="label_file_name">Имя файла</string>
     <string name="label_file_path">Путь к файлу</string>
@@ -48,13 +46,11 @@
     <string name="save_as_playlist">Сохранить как список воспроизведения</string>
     <string name="credits_3">Дизайн иконки</string>
     <string name="credits_1">"Phonograph - полностью бесплатный музыкальный плеер в материальном стиле, созданный"</string>
-    <string name="title_activity_search">Поиск</string>
     <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="title_activity_playlist_detail">Активность списка воспроизведения</string>
     <string name="new_playlist_action">Новый список воспроизведения...</string>
     <string name="action_grid_columns">Столбцы сетки</string>
     <string name="action_grid_columns_land">Столбцы сетки (ландшафт)</string>
@@ -87,7 +83,6 @@
     <string name="pref_summary_colored_navigation_bar">Установить, где панель навигации должна быть цветной.</string>
     <string name="pref_title_navigation_bar">Цветная панель управления</string>
     <string name="pref_title_set_default_start_page">Установить начальную страницу</string>
-    <string name="title_activity_settings">Настройки</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>
@@ -117,10 +112,4 @@
     <string name="failed_download_albumart">"Невозможно загрузить обложку для этого альбома."</string>
     <string name="search_hint">Поиск библиотеки...</string>
     <string name="rescanning_media">Повторное сканирование медиа...</string>
-    <string-array name="update_album_cover_options">
-        <item>Скачать с Last.fm</item>
-        <item>Выбрать из локального хранилища</item>
-        <item>Поиск в интернете</item>
-        <item>Удалить обложку</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 317030a3..b150f676 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -46,7 +46,6 @@
     <string name="save_as_playlist">Spara som spellista</string>
     <string name="credits_3">Ikon av</string>
     <string name="credits_1">"Phonograph är en helt gratis musikspelare med Material Design av"</string>
-    <string name="title_activity_search">Sök</string>
     <string name="no_results">Inga resultat</string>
     <string name="action_re_download_artist_image">Uppdatera artistbild</string>
     <string name="updating">Uppdaterar ...</string>
@@ -82,7 +81,6 @@ Vill du radera <b>%1$d</b> låtar?
     <string name="pref_summary_colored_navigation_bar">I vilken vy navigeringslisten skall vara färgad</string>
     <string name="pref_title_navigation_bar">Färgad navigeringslist</string>
     <string name="pref_title_set_default_start_page">Startsida</string>
-    <string name="title_activity_settings">Inställningar</string>
     <string name="pref_title_colored_navigation_bar_artists">Artistvy</string>
     <string name="pref_title_colored_navigation_bar_albums">Albumvy</string>
     <string name="pref_title_colored_navigation_bar_current_playing">Spelarvy</string>
@@ -106,10 +104,4 @@ Vill du radera <b>%1$d</b> låtar?
     <string name="failed_download_albumart">"Kan inte ladda ner bild för detta album."</string>
     <string name="search_hint">Sök i ditt bibliotek ...</string>
     <string name="rescanning_media">Återskannar media ...</string>
-    <string-array name="update_album_cover_options">
-        <item>Ladda ner från Last.fm</item>
-        <item>Välj från lokal lagring</item>
-        <item>Weksök</item>
-        <item>Ta bort omslag</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index d151ad6c..be18d0a9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">Bu sanatçı ile ilgili hiçbir biyografi yazısı bulamadık.</string>
     <string name="biography">Biyografi</string>
     <string name="audio_focus_denied">Ses odağı sağlanamıyor.</string>
-    <string name="title_activity_tag_editor">Etiket düzenleyicisi</string>
     <string name="tag_editor">Etiket düzenleyici</string>
     <string name="album">Albüm</string>
     <string name="artist">Sanatçı</string>
@@ -40,7 +39,6 @@
     <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>
-    <string name="title_activity_album_tag_editor">Albüm etiket düzenleyicisi</string>
     <string name="label_details">Ayrıntılar</string>
     <string name="label_file_name">Dosya adı</string>
     <string name="label_file_path">Dosya yolu</string>
@@ -55,13 +53,11 @@
     <string name="save_as_playlist">Çalma listesi olarak kaydet</string>
     <string name="credits_3">Simge tasarımı</string>
     <string name="credits_1">"Phonograph tamamen ücretsiz material tasarıma sahip bir müzik çalardır. Yapan"</string>
-    <string name="title_activity_search">Ara</string>
     <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="title_activity_playlist_detail">Çalma listesi etkinliği</string>
     <string name="action_remove_from_playlist">Çalma listesinden kaldır</string>
     <string name="new_playlist_action">Yeni çalma listesi</string>
     <string name="action_grid_columns">Izgara sütunları</string>
@@ -99,7 +95,6 @@
     <string name="pref_summary_colored_navigation_bar">Boyanması gereken gezinti çubuğunu ayarla</string>
     <string name="pref_title_navigation_bar">Renkli gezinti çubuğu</string>
     <string name="pref_title_set_default_start_page">Başlangıç sayfası</string>
-    <string name="title_activity_settings">Ayarlar</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">Şuan çalınan görünümü</string>
@@ -151,11 +146,4 @@
     <string name="failed_download_albumart">"Bu albüm için kapak indirilemiyor."</string>
     <string name="search_hint">Kütüphaneniz taranıyor...</string>
     <string name="rescanning_media">Medyayı yeniden tara</string>
-    <string name="other">diğer</string>
-    <string-array name="update_album_cover_options">
-        <item>Last.FM den indir</item>
-        <item>Varolandan Seç</item>
-        <item>Web\'de ara</item>
-        <item>Albüm Kapağını Kaldır</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f9cf9dbb..c1ba1898 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">抱歉，不能找到与该艺术家匹配的个人简介。</string>
     <string name="biography">歌手简介</string>
     <string name="audio_focus_denied">无法获取音频焦点。</string>
-    <string name="title_activity_tag_editor">标签编辑器</string>
     <string name="tag_editor">音频标签编辑器</string>
     <string name="album">专辑</string>
     <string name="artist">艺术家</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">专辑名称或专辑创作者栏为空</string>
     <string name="writing_file_number">正在写入文档</string>
     <string name="saving_changes">正在保存更改</string>
-    <string name="title_activity_album_tag_editor">专辑标签编辑器</string>
     <string name="label_details">详情</string>
     <string name="label_file_name">文件名</string>
     <string name="label_file_path">文件路径</string>
@@ -55,13 +53,11 @@
     <string name="save_as_playlist">保存为播放列表</string>
     <string name="credits_3">图标设计师：</string>
     <string name="credits_1">"Phonograph 是一个完全免费并采用质感设计的音乐播放器，开发者是"</string>
-    <string name="title_activity_search">搜索</string>
     <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="title_activity_playlist_detail">播放列表操作</string>
     <string name="action_remove_from_playlist">从播放列表移除</string>
     <string name="new_playlist_action">新建播放列表</string>
     <string name="action_grid_columns">专辑列数</string>
@@ -105,7 +101,6 @@
     <string name="pref_summary_colored_navigation_bar">设置在哪些界面应用变色导航栏</string>
     <string name="pref_title_navigation_bar">变色导航栏</string>
     <string name="pref_title_set_default_start_page">设置默认起始页</string>
-    <string name="title_activity_settings">设置</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>
@@ -115,6 +110,7 @@
     <string name="pref_title_colored_album_footers">使用变色的专辑标签</string>
     <string name="pref_title_colored_notification">使用变色的通知栏</string>
     <string name="pref_title_fade_play_pause">淡入/出音量（播放/暂停）</string>
+    <string name="pref_title_gapless_playback">连续播放</string>
     <string name="pref_title_force_square_album_art">强制使用方形专辑封面</string>
     <string name="pref_title_opaque_toolbar_now_playing">正在播放界面使用不透明工具栏</string>
     <string name="pref_title_opaque_statusbar_now_playing">不透明状态栏</string>
@@ -149,6 +145,7 @@
     <string name="pref_summary_colored_album_footers">"专辑队列视图中专辑页脚会根据专辑封面的色调进行变色。"</string>
     <string name="pref_summary_colored_notification">"使用与专辑封面色彩相对应的通知栏消息背景"</string>
     <string name="pref_summary_fade_play_pause">"播放/暂停歌曲时使用淡入/出效果"</string>
+    <string name="pref_summary_gapless_playback">"消除两首歌曲之间的间隔。禁用该选项或许能修复某些播放问题。"</string>
     <string name="pref_summary_force_square_album_art">在正在播放界中强制使用方形专辑封面</string>
     <string name="pref_summary_opaque_toolbar_now_playing">使正在播放界面的工具栏不透明并且并遮盖住部分专辑封面</string>
     <string name="pref_summary_opaque_statusbar_now_playing">状态栏不透明并且不会遮挡专辑封面</string>
@@ -158,11 +155,7 @@
     <string name="failed_download_albumart">"专辑信息下载失败"</string>
     <string name="search_hint">正在扫描</string>
     <string name="rescanning_media">正在重新扫描媒体库…</string>
-    <string name="other">其他</string>
-    <string-array name="update_album_cover_options">
-        <item>从Last.fm下载</item>
-        <item>从本地储存中选取</item>
-        <item>通过网络搜索</item>
-        <item>删除封面</item>
-    </string-array>
+    <string name="favorites">收藏夹</string>
+    <string name="recently_played">最近播放</string>
+    <string name="my_top_tracks">最爱曲目</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 b914dec7..baa7e0b0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -28,7 +28,6 @@
     <string name="biography_unavailable">對不起，無法找到與這位歌手相符的個人簡介</string>
     <string name="biography">個人簡介</string>
     <string name="audio_focus_denied">無法獲得音訊焦點</string>
-    <string name="title_activity_tag_editor">編輯音樂標籤</string>
     <string name="tag_editor">編輯音樂標籤</string>
     <string name="album">專輯</string>
     <string name="artist">歌手</string>
@@ -40,7 +39,6 @@
     <string name="album_or_artist_empty">專輯名稱或專輯創作者欄是空的。</string>
     <string name="writing_file_number">正在寫入檔案</string>
     <string name="saving_changes">正在儲存變更…</string>
-    <string name="title_activity_album_tag_editor">編輯專輯標籤</string>
     <string name="label_details">詳細資訊</string>
     <string name="label_file_name">檔案名稱</string>
     <string name="label_file_path">檔案路徑</string>
@@ -55,13 +53,11 @@
     <string name="save_as_playlist">儲存為音樂清單</string>
     <string name="credits_3">圖示設計者為</string>
     <string name="credits_1">"Phonograph 是一個完全免費且遵從 Material Design 的音樂播放器，開發者為"</string>
-    <string name="title_activity_search">搜尋</string>
     <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="title_activity_playlist_detail">音樂清單活動</string>
     <string name="new_playlist_action">新增音樂清單</string>
     <string name="action_grid_columns">專輯網格列數</string>
     <string name="action_grid_columns_land">專輯網格列數（橫向）</string>
@@ -98,7 +94,6 @@
     <string name="pref_summary_colored_navigation_bar">設定在哪些頁面啟用可變色的導航列</string>
     <string name="pref_title_navigation_bar">變色導航列</string>
     <string name="pref_title_set_default_start_page">設定預設起始頁</string>
-    <string name="title_activity_settings">設定</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>
@@ -133,11 +128,4 @@
     <string name="failed_download_albumart">"無法下載此專輯資訊。"</string>
     <string name="search_hint">正在掃描…</string>
     <string name="rescanning_media">正在重新掃描媒體庫…</string>
-    <string name="other">其他</string>
-    <string-array name="update_album_cover_options">
-        <item>從 Last.FM 下載</item>
-        <item>從本儲存裝置選取</item>
-        <item>網路搜尋</item>
-        <item>刪除封面</item>
-    </string-array>
 </resources>