diff --git a/app/build.gradle b/app/build.gradle
index a2e6d55e..1b4515f5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "com.kabouzeid.gramophone"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 20
-        versionName "0.9.9b"
+        versionCode 21
+        versionName "0.9.9.1b"
     }
 
     compileOptions {
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b4255fb3..8d799d1d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="action_settings">"Nastavení"</string>
     <string name="action_about">O aplikaci</string>
+    <string name="action_currently_playing">Přehrávač</string>
     <string name="action_playing_queue">Fronta</string>
     <string name="action_search">Hledat</string>
     <string name="action_play_next">Další skladba</string>
@@ -91,7 +92,6 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Všude jinde</string>
     <string name="pref_title_colored_album_footers">Barevné zápatí alb</string>
     <string name="no_equalizer">Ekvalizér nenalezen</string>
-    <string name="no_audio_ID">Neznámé ID hudby, přehrajte něco jiného a zkuste to znovu.</string>
     <string name="navigation_drawer_open">Otevřít navigační záložku</string>
     <string name="navigation_drawer_close">Zavřít navigační záložku</string>
     <string name="delete_action">Smazat</string>
@@ -110,4 +110,12 @@
     <string name="pref_only_lollipop">Dostupné pouze ve verzi Lollipop.</string>
     <string name="pref_summary_transparent_toolbar">Permanentní zobrazení záhlaví (při scrollování).</string>
     <string name="pref_summary_colored_album_footers">Názvy alb v mřížce jsou obarvena podle jejich obalu.</string>
+    <string name="failed_download_albumart">Není možné stáhnout obal tohoto alba.</string>
+    <string name="search_hint">Vyhledat zvukové soubory...</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 85fd8fd1..e0f8e5bb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -92,7 +92,7 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Überall sonst</string>
     <string name="pref_title_colored_album_footers">Farbige Balken unter den Alben</string>
     <string name="no_equalizer">Es wurde kein Equalizer gefunden</string>
-    <string name="no_audio_ID">Keine Audio ID gefunden, gib ein anderes Lied wieder und versuch es nochmal.</string>
+    <string name="no_audio_ID">Keine Audio ID, spiele etwas ab und versuche es erneut.</string>
     <string name="navigation_drawer_open">Öffne Navigation Drawer</string>
     <string name="navigation_drawer_close">Schließe Navigation Drawer</string>
     <string name="delete_action">Löschen</string>
@@ -113,7 +113,7 @@
     <string name="pref_summary_colored_album_footers">Die Titel der Alben im Raster passend zu ihrer Cover Farbe färben.</string>
     <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">Geänderte Dateien werden erneut gescannt</string>
+    <string name="rescanning_media">Medien werden erneut eingescannt...</string>
     <string-array name="update_album_cover_options">
         <item>Von Last.fm herunterladen</item>
         <item>Aus lokalem Speicher wählen</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e8ecad21..ab9ae2b0 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="action_settings">"Ρυθμίσεις "</string>
     <string name="action_about">Σχετικά με εμάς</string>
+    <string name="action_currently_playing">Παίζει τώρα</string>
     <string name="action_playing_queue">Σειρά τραγουδιών</string>
     <string name="action_search">Αναζήτηση</string>
     <string name="action_play_next">Αναπαραγωγή επόμενου</string>
@@ -16,8 +17,8 @@
     <string name="songs">Τραγούδια</string>
     <string name="playlists">Λίστες</string>
     <string name="nothing_playing">Δεν παίζει τίποτα</string>
-    <string name="unplayable_file">Συγγνώμη - Υπήρξε σφάλμα όταν έπαιξε το τραγούδι</string>
-    <string name="biography_unavailable">Συγγνώμη, δεν μπορούμε βιογραφία που να ταιριάζει με αυτόν τον καλλιτέχνη</string>
+    <string name="unplayable_file">Συγγνώμη - Υπήρξε σφάλμα στην προσπάθεια αναπαραγωγής</string>
+    <string name="biography_unavailable">Συγγνώμη, δεν μπορούμε τη βιογραφία αυτού του καλλιτέχνη</string>
     <string name="biography">Βιογραφία</string>
     <string name="audio_focus_denied">Δεν μπορούμε να πάρουμε συγκέντρωση του ήχου</string>
     <string name="tag_editor">Επεξεργασία ετικετών</string>
@@ -86,10 +87,11 @@
     <string name="select">Επιλογή</string>
     <string name="default_str">Προεπιλογή</string>
     <string name="primary_color">Πρωτεύον χρώμα</string>
-    <string name="primary_color_desc">Το πρωτεύον χρώμα θέματος, η προεπιλογή είναι λουλακί</string>
+    <string name="primary_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">Διαθέσιμο μόνο στο Lollipop.</string>
 </resources>
diff --git a/app/src/main/res/values-es-r419/strings.xml b/app/src/main/res/values-es-r419/strings.xml
index 5c2d215c..705ba0f0 100644
--- a/app/src/main/res/values-es-r419/strings.xml
+++ b/app/src/main/res/values-es-r419/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <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_search">Buscar</string>
     <string name="action_play_next">Próxima canción</string>
@@ -27,7 +28,7 @@
     <string name="album_artist">Artista del álbum</string>
     <string name="year">Año</string>
     <string name="track">Canción</string>
-    <string name="track_hint">Pista (2 para pista 2 or 3004 para CD3 pista 4)</string>
+    <string name="track_hint">Pista (2 para pista 2 ó 3004 para CD3 pista 4)</string>
     <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>
@@ -77,16 +78,19 @@
     <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_title_navigation_bar">Barra de navegación coloreada</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>
+    <string name="pref_title_colored_navigation_bar_playlists">Ver lista de reproducción</string>
+    <string name="pref_title_colored_navigation_bar_tag_editor">Editor de etiquetas</string>
     <string name="pref_title_colored_album_footers">Pie de álbum coloreado</string>
     <string name="no_equalizer">No se encontró ningún ecualizador</string>
-    <string name="no_audio_ID">Sin id de audio, toca algo e intenta nuevamente</string>
-    <string name="navigation_drawer_open">Abrir cajón de navegación</string>
+    <string name="navigation_drawer_open">Abrir barra de navegación</string>
     <string name="navigation_drawer_close">"Cerrar la barra de navegación "</string>
     <string name="delete_action">Borrar</string>
     <string name="rename_action">Renombrar</string>
@@ -101,4 +105,13 @@
     <string name="no_playlists">No hay listas de reproducción</string>
     <string name="playlist_name">Nombre de la lista de reproducción</string>
     <string name="song">Canción</string>
+    <string name="pref_only_lollipop">Solamente disponible en Lollipop</string>
+    <string name="failed_download_albumart">Imposible descargar portada del álbum</string>
+    <string name="search_hint">Buscar en librería...</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-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 9434117f..0f9f8770 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -95,7 +95,6 @@
     <string name="pref_title_colored_navigation_bar_other_screens">En el resto de sitios</string>
     <string name="pref_title_colored_album_footers">Pie de álbum coloreado</string>
     <string name="no_equalizer">No se encontró ecualizador</string>
-    <string name="no_audio_ID">No se identificó audio, intenta reproducir nuevamente</string>
     <string name="navigation_drawer_open">Abrir cajón de navegación</string>
     <string name="navigation_drawer_close">Cerrar cajón de navegación</string>
     <string name="delete_action">Borrar</string>
@@ -116,7 +115,6 @@
     <string name="pref_summary_colored_album_footers">Los pies de álbum de la cuadrícula están coloreados con las paletas de colores de sus respectivas portadas.</string>
     <string name="failed_download_albumart">No se puede descargar la portada del álbum.</string>
     <string name="search_hint">Buscar en librería...</string>
-    <string name="rescanning_media">Reescaneando archivos modificados</string>
     <string-array name="update_album_cover_options">
         <item>Descargar de Last.fm</item>
         <item>Escoger de disco duro</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1e8cc9f6..584ead1c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2,6 +2,7 @@
 <resources>
     <string name="action_settings">"Paramètres"</string>
     <string name="action_about">À propos</string>
+    <string name="action_currently_playing">Lecture actuelle</string>
     <string name="action_playing_queue">File de lecture</string>
     <string name="action_search">Rechercher</string>
     <string name="action_play_next">Lire ensuite</string>
@@ -77,9 +78,9 @@
     <string name="pref_title_general_theme">Thème général</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Général</string>
-    <string name="pref_summary_colored_navigation_bar">Définir quand la barre navigation doit être colorée.</string>
+    <string name="pref_summary_colored_navigation_bar">Dans quelle vue 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">Définir la page d\'accueil</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_transparent_toolbar">Barre d\'outils semi-transparente</string>
     <string name="pref_title_show_playback_controller_card">Carte de contrôle du lecteur</string>
@@ -91,7 +92,6 @@
     <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="no_equalizer">Aucun égaliseur trouvé</string>
-    <string name="no_audio_ID">Aucun audio, veuillez lire un titre puis réessayer</string>
     <string name="navigation_drawer_open">Ouvrir le volet de navigation</string>
     <string name="navigation_drawer_close">Fermer le volet de navigation</string>
     <string name="delete_action">Supprimer</string>
@@ -110,4 +110,12 @@
     <string name="pref_only_lollipop">Uniquement disponible sur Lollipop.</string>
     <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-array name="update_album_cover_options">
+        <item>Télécharger depuis Last.fm</item>
+        <item>Choisir depuis le stockage interne</item>
+        <item>Recherche internet</item>
+        <item>Supprimer la couverture</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 385e796e..3324f99a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -69,7 +69,6 @@
     <string name="pref_title_colored_navigation_bar_albums">Barra navigazione album colorata</string>
     <string name="pref_title_colored_album_footers">Piè di pagina album colorati</string>
     <string name="no_equalizer">Nessun equalizzatore trovato</string>
-    <string name="no_audio_ID">Nessun audio id, riproduci qualcosa e riprova</string>
     <string name="navigation_drawer_open">Apri la barra di navigazione</string>
     <string name="navigation_drawer_close">Chiudi la barra di navigazione</string>
     <string name="song">Canzone</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 95316234..989a5681 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -78,21 +78,20 @@
     <string name="pref_title_general_theme">Standaard thema</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Algemeen</string>
-    <string name="pref_summary_colored_navigation_bar">Selecteer waar de navigatiebalk gekleurd moet zijn.</string>
+    <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">Instellen als startpagina</string>
+    <string name="pref_title_set_default_start_page">Standaard 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">Artiesten weergave</string>
     <string name="pref_title_colored_navigation_bar_albums">Album weergave</string>
-    <string name="pref_title_colored_navigation_bar_current_playing">Huidige speelweergave</string>
+    <string name="pref_title_colored_navigation_bar_current_playing">Afspeelweergave</string>
     <string name="pref_title_colored_navigation_bar_playlists">Afspeellijst weergave</string>
     <string name="pref_title_colored_navigation_bar_tag_editor">Label bewerker</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Overal elders</string>
     <string name="pref_title_colored_album_footers">Gekleurde album footers</string>
     <string name="no_equalizer">Geen equalizer gevonden</string>
-    <string name="no_audio_ID">Geen audio ID, speel iets af en probeer het nogmaals.</string>
     <string name="navigation_drawer_open">Open navigatiebalk</string>
     <string name="navigation_drawer_close">Sluit navigatiebalk</string>
     <string name="delete_action">Verwijderen</string>
@@ -100,9 +99,9 @@
     <string name="select">Selecteer</string>
     <string name="default_str">Standaard</string>
     <string name="primary_color">Primaire kleur</string>
-    <string name="accent_color">Accent kleur</string>
-    <string name="primary_color_desc">De primaire themakleur is standaard indigo.</string>
-    <string name="accent_color_desc">De accent themakleur is standaard roze.</string>
+    <string name="accent_color">Accentkleur</string>
+    <string name="primary_color_desc">De primaire kleur is standaard indigo.</string>
+    <string name="accent_color_desc">De accentkleur is standaard roze.</string>
     <string name="update_image">Afbeelding bijwerken</string>
     <string name="playlist_empty_text">Deze afspeellijst is leeg</string>
     <string name="no_playlists">Geen afspeellijsten</string>
@@ -113,7 +112,6 @@
     <string name="pref_summary_colored_album_footers">"Album footers in het raster worden gekleurd met het palet van de albumhoes. "</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">Opnieuw scannen van gewijzigde bestanden</string>
     <string-array name="update_album_cover_options">
         <item>Downloaden van Last.fm</item>
         <item>Kies vanuit lokale opslag</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 41ce9f17..82d49f2d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -94,7 +94,6 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Wszędzie</string>
     <string name="pref_title_colored_album_footers">Kolorowe stopki albumu</string>
     <string name="no_equalizer">Nie znaleziono korektora</string>
-    <string name="no_audio_ID">Brak ID dźwięku, puść coś i spróbuj ponownie</string>
     <string name="navigation_drawer_open">Otwórz pasek nawigacji</string>
     <string name="navigation_drawer_close">Zamknij pasek nawigacji</string>
     <string name="delete_action">Usuń</string>
@@ -115,7 +114,6 @@
     <string name="pref_summary_colored_album_footers">Stopki albumu w siatce są w tonacji okładki albumu</string>
     <string name="failed_download_albumart">Nie można pobrać okładki dla tego albumu</string>
     <string name="search_hint">Przeszukuje bibliotekę...</string>
-    <string name="rescanning_media">Ponowne skanowanie zmienionych plików</string>
     <string-array name="update_album_cover_options">
         <item>Pobierz z Last.fm</item>
         <item>Wybierz z pamięci lokalnej</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5361ebc0..deb1318a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -2,14 +2,15 @@
 <resources>
     <string name="action_settings">"Configurações"</string>
     <string name="action_about">Sobre</string>
+    <string name="action_currently_playing">Em execução</string>
     <string name="action_playing_queue">Fila de execução</string>
     <string name="action_search">Pesquisar</string>
-    <string name="action_play_next">Reproduzir a seguir</string>
+    <string name="action_play_next">Tocar próxima</string>
     <string name="action_add_to_playing_queue">Adicionar à fila</string>
     <string name="action_remove_from_playing_queue">Remover da fila atual</string>
     <string name="action_add_to_playlist">Adicionar à playlist...</string>
     <string name="action_tag_editor">Editor de tags</string>
-    <string name="action_delete_from_disk">Excluir do dispositivo</string>
+    <string name="action_delete_from_disk">Apagar</string>
     <string name="action_details">Detalhes</string>
     <string name="albums">Álbuns</string>
     <string name="artists">Artistas</string>
@@ -19,7 +20,7 @@
     <string name="unplayable_file">Desculpe - ocorreu um erro ao tentar reproduzir esta faixa</string>
     <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 fomos capazes de obter o foco do áudio.</string>
+    <string name="audio_focus_denied">Não conseguimos obter o foco do áudio.</string>
     <string name="tag_editor">Editor de tags</string>
     <string name="album">Álbum</string>
     <string name="artist">Artista</string>
@@ -51,7 +52,7 @@
     <string name="updating">Atualizando...</string>
     <string name="added_title_to_playing_queue">"1 título adicionado à fila de reprodução.  "</string>
     <string name="action_delete_from_playlist">Excluir da lista</string>
-    <string name="new_playlist_action">Nova playlist...</string>
+    <string name="new_playlist_action">Nova lista de reprodução...</string>
     <string name="action_grid_columns">Colunas da grade</string>
     <string name="action_grid_columns_land">Colunas da grade (Horizontal)</string>
     <string name="inserted_x_songs_into_playlist">%1$d faixas foram inseridas nesta playlist.</string>
@@ -68,30 +69,29 @@
     <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>
-    <string name="shuffle_all">Misturar todas</string>
+    <string name="shuffle_all">Embaralhar todas</string>
     <string name="last_opened">Última executada</string>
     <string name="light_theme_name">Claro</string>
     <string name="dark_theme_name">Escuro</string>
     <string name="equalizer">Equalizador</string>
-    <string name="pref_header_ui">INTERFACE</string>
+    <string name="pref_header_ui">Interface</string>
     <string name="pref_title_general_theme">Tema geral</string>
     <string name="pref_header_audio">Áudio</string>
     <string name="pref_header_general">Geral</string>
-    <string name="pref_summary_colored_navigation_bar">Definir onde a barra de navegação deve ser colorido.</string>
+    <string name="pref_summary_colored_navigation_bar">Em quais telas 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">Definir página inicial</string>
+    <string name="pref_title_set_default_start_page">Página inicial padrão</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 da execução atual</string>
+    <string name="pref_title_colored_navigation_bar_current_playing">Vista em execução</string>
     <string name="pref_title_colored_navigation_bar_playlists">Vista da playlist</string>
     <string name="pref_title_colored_navigation_bar_tag_editor">Editor de tags</string>
     <string name="pref_title_colored_navigation_bar_other_screens">Todos os outros lugares</string>
     <string name="pref_title_colored_album_footers">Colorir rodapés de álbuns</string>
     <string name="no_equalizer">Nenhum equalizador encontrado</string>
-    <string name="no_audio_ID">Sem id de áudio, reproduza alguma coisa e tente novamente.</string>
     <string name="navigation_drawer_open">Abrir gaveta de navegação</string>
     <string name="navigation_drawer_close">Fechar gaveta de navegação</string>
     <string name="delete_action">Excluir</string>
@@ -108,6 +108,14 @@
     <string name="playlist_name">Nome da playlist</string>
     <string name="song">Música</string>
     <string name="pref_only_lollipop">Apenas disponível no Lollipop.</string>
-    <string name="pref_summary_transparent_toolbar">Scrolling conteúdo debaixo da barra de ferramentas é visível.</string>
-    <string name="pref_summary_colored_album_footers">Rodapés álbum na grade são coloridos com as capas dos álbuns paleta.</string>
+    <string name="pref_summary_transparent_toolbar">Conteúdo rolando abaixo da barra de ferramentas é visível.</string>
+    <string name="pref_summary_colored_album_footers">Rodapés de álbum na grade são coloridos com as paletas correspondentes.</string>
+    <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-array name="update_album_cover_options">
+        <item>Baixar da Last.fm</item>
+        <item>Escolher do Armazenamento Local</item>
+        <item>Pesquisar 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 a47655b8..13c713ee 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -71,7 +71,6 @@
     <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>
     <string name="no_equalizer">Nenhum equalizador encontrado</string>
-    <string name="no_audio_ID">Nenhuma identificação de áudio, reproduza algo e tente novamente.</string>
     <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>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 89820d44..0f5e0010 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -90,7 +90,6 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Oriunde altundeva</string>
     <string name="pref_title_colored_album_footers">Bară detalii album colorată</string>
     <string name="no_equalizer">Niciun egalizator găsit</string>
-    <string name="no_audio_ID">Nicio identificare audio, redă ceva şi încearcă din nou.</string>
     <string name="navigation_drawer_open">Deschide sertarul de navigație</string>
     <string name="navigation_drawer_close">Închide sertarul de navigație</string>
     <string name="delete_action">Șterge</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 88fde263..0fd27b56 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -92,7 +92,6 @@
     <string name="pref_title_colored_navigation_bar_other_screens">Во всех остальных</string>
     <string name="pref_title_colored_album_footers">Цветная панель названия альбома</string>
     <string name="no_equalizer">Эквалайзер не найден</string>
-    <string name="no_audio_ID">Нет аудио, воспроизведите что-нибудь и попробуйте ещё раз.</string>
     <string name="navigation_drawer_open">Открыть панель навигации</string>
     <string name="navigation_drawer_close">Закрыть панель навигации</string>
     <string name="delete_action">Удалить</string>
@@ -113,7 +112,6 @@
     <string name="pref_summary_colored_album_footers">Панели альбомов в сетке окрашены цветом из палитры обложки альбома.</string>
     <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>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 637f4645..219da446 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -92,7 +92,6 @@
     <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_audio_ID">Hiçbir ses kimliği bulunamadı, 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>
     <string name="delete_action">Sil</string>
@@ -112,11 +111,11 @@
     <string name="pref_summary_transparent_toolbar">Araç çubuğunun altına kaydırılan içerik görünüyor.</string>
     <string name="pref_summary_colored_album_footers">Izgara içindeki albüm alt bilgisi albüm arkaplanı paletiyle renklendirildi.</string>
     <string name="failed_download_albumart">Bu albüm için kapak indirilemiyor.</string>
-    <string name="rescanning_media">Değiştirilen dosyalatı yeniden tara</string>
+    <string name="search_hint">Kütüphaneniz taranıyor...</string>
     <string-array name="update_album_cover_options">
         <item>Last.FM den indir</item>
-        <item>Pick from Local Storage</item>
-        <item>Web\'te ara</item>
+        <item>Yerel Depolamayı Seç</item>
+        <item>Albüm Kapağını Kaldır</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 dfa8b831..7f7dd55f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2,14 +2,15 @@
 <resources>
     <string name="action_settings">"设置"</string>
     <string name="action_about">关于</string>
-    <string name="action_playing_queue">播放队列</string>
+    <string name="action_currently_playing">正在播放</string>
+    <string name="action_playing_queue">播放列表</string>
     <string name="action_search">搜索</string>
     <string name="action_play_next">下一首</string>
-    <string name="action_add_to_playing_queue">加入播放队列</string>
-    <string name="action_remove_from_playing_queue">从播放队列移除</string>
+    <string name="action_add_to_playing_queue">加入播放列表</string>
+    <string name="action_remove_from_playing_queue">从播放列表移除</string>
     <string name="action_add_to_playlist">加入播放列表</string>
     <string name="action_tag_editor">音乐标签编辑器</string>
-    <string name="action_delete_from_disk">从储存中删除</string>
+    <string name="action_delete_from_disk">从sd卡上删除</string>
     <string name="action_details">详情</string>
     <string name="albums">专辑</string>
     <string name="artists">艺术家</string>
@@ -43,8 +44,8 @@
     <string name="action_go_to_album">打开专辑</string>
     <string name="label_current_playing_queue">播放队列</string>
     <string name="save_as_playlist">保存为播放列表</string>
-    <string name="credits_3">图标设计者是</string>
-    <string name="credits_1">留声机是一个完全免费并采用质感设计的音乐播放器，开发者是</string>
+    <string name="credits_3">图标设计师：</string>
+    <string name="credits_1">Gramophone 是一个完全免费并采用质感设计的音乐播放器，开发者是</string>
     <string name="title_activity_search">搜索</string>
     <string name="no_results">没有找到结果</string>
     <string name="action_re_download_artist_image">更新歌手图片</string>
@@ -70,8 +71,8 @@
     <string name="delete_warning">"警告：该操作无法撤销。"</string>
     <string name="shuffle_all">随机播放全部曲目</string>
     <string name="last_opened">最后打开</string>
-    <string name="light_theme_name">Light</string>
-    <string name="dark_theme_name">Dark</string>
+    <string name="light_theme_name">浅色</string>
+    <string name="dark_theme_name">暗色</string>
     <string name="equalizer">均衡器</string>
     <string name="pref_header_ui">界面</string>
     <string name="pref_title_general_theme">全局主题</string>
@@ -91,7 +92,6 @@
     <string name="pref_title_colored_navigation_bar_other_screens">其他任何地方</string>
     <string name="pref_title_colored_album_footers">使用变色的专辑标签</string>
     <string name="no_equalizer">没有找到均衡器</string>
-    <string name="no_audio_ID">没有音频ID，请播放曲目并重试。</string>
     <string name="navigation_drawer_open">弹出导航抽屉</string>
     <string name="navigation_drawer_close">关闭导航抽屉</string>
     <string name="delete_action">删除</string>
@@ -110,4 +110,12 @@
     <string name="pref_only_lollipop">仅适用于 Lollipop</string>
     <string name="pref_summary_transparent_toolbar">滚动页面时使工具栏之后的内容可见。</string>
     <string name="pref_summary_colored_album_footers">专辑队列视图中专辑页脚会根据专辑封面的色调进行变色。</string>
+    <string name="failed_download_albumart">专辑信息下载失败</string>
+    <string name="search_hint">正在扫描</string>
+    <string-array name="update_album_cover_options">
+        <item>Download from Last.fm</item>
+        <item>Pick from Local Storage</item>
+        <item>通过网络搜索</item>
+        <item>删除封面</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index fc60282b..09f54a33 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2,14 +2,15 @@
 <resources>
     <string name="action_settings">"設定"</string>
     <string name="action_about">關於</string>
+    <string name="action_currently_playing">正在播放</string>
     <string name="action_playing_queue">播放佇列</string>
     <string name="action_search">搜尋</string>
-    <string name="action_play_next">下一首</string>
+    <string name="action_play_next">稍後播放</string>
     <string name="action_add_to_playing_queue">加入佇列</string>
     <string name="action_remove_from_playing_queue">從播放佇列移除</string>
     <string name="action_add_to_playlist">加入音樂清單…</string>
     <string name="action_tag_editor">編輯音樂標籤</string>
-    <string name="action_delete_from_disk">從本儲存裝置刪除</string>
+    <string name="action_delete_from_disk">從本裝置刪除</string>
     <string name="action_details">詳細資訊</string>
     <string name="albums">專輯</string>
     <string name="artists">歌手</string>
@@ -39,8 +40,8 @@
     <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>
-    <string name="action_go_to_album">前往該專輯</string>
+    <string name="action_go_to_artist">前往該歌手頁面</string>
+    <string name="action_go_to_album">前往該專輯頁面</string>
     <string name="label_current_playing_queue">播放佇列</string>
     <string name="save_as_playlist">儲存為音樂清單</string>
     <string name="credits_3">圖示設計者為</string>
@@ -52,8 +53,8 @@
     <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>
-    <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>
@@ -83,15 +84,14 @@
     <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>
-    <string name="pref_title_colored_navigation_bar_playlists">音樂清單</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>
+    <string name="pref_title_colored_navigation_bar_playlists">音樂清單頁面</string>
     <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="no_equalizer">沒有找到均衡器</string>
-    <string name="no_audio_ID">沒有音訊ID，請重新嘗試播放歌曲。</string>
     <string name="navigation_drawer_open">打開側選單</string>
     <string name="navigation_drawer_close">關閉側選單</string>
     <string name="delete_action">刪除</string>
@@ -108,5 +108,14 @@
     <string name="playlist_name">音樂清單名稱</string>
     <string name="song">歌曲</string>
     <string name="pref_only_lollipop">只適用於Lollipop。</string>
-    <string name="pref_summary_transparent_toolbar">當滾動頁面時，可看到工具列下方的內容。</string>
+    <string name="pref_summary_transparent_toolbar">當滾動頁面時，可看到工具列下層的內容。</string>
+    <string name="pref_summary_colored_album_footers">在專輯頁面中的專輯標籤會隨其封面顏色而改變。</string>
+    <string name="failed_download_albumart">無法下載此專輯資訊。</string>
+    <string name="search_hint">正在掃描…</string>
+    <string-array name="update_album_cover_options">
+        <item>從Last.fm下載</item>
+        <item>從本儲存裝置選取</item>
+        <item>網路搜尋</item>
+        <item>刪除封面</item>
+    </string-array>
 </resources>