diff --git a/app/build.gradle b/app/build.gradle
index 99396906..84885a80 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,8 +23,8 @@ android {
         applicationId "com.kabouzeid.gramophone"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 18
-        versionName "0.9.8b"
+        versionCode 19
+        versionName "0.9.8.1b"
     }
 
     compileOptions {
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/AboutDeveloperDialogHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/AboutDeveloperDialogHelper.java
index 02387fb3..7a5fcf65 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/AboutDeveloperDialogHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/AboutDeveloperDialogHelper.java
@@ -2,6 +2,7 @@ package com.kabouzeid.gramophone.helper;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.afollestad.materialdialogs.MaterialDialog;
@@ -17,7 +18,11 @@ public class AboutDeveloperDialogHelper {
         MaterialDialog dialog = new MaterialDialog.Builder(context)
                 .title(context.getResources().getString(R.string.app_name) + " " + getCurrentVersionName(context))
                 .iconRes(R.drawable.ic_launcher)
-                .content(context.getResources().getText(R.string.credits))
+                .content(TextUtils.concat(context.getResources().getText(R.string.credits_1),
+                        context.getResources().getText(R.string.credits_2),
+                        context.getResources().getText(R.string.credits_3),
+                        context.getResources().getText(R.string.credits_4))
+                )
                 .positiveText(context.getResources().getString(R.string.ok))
                 .callback(new MaterialDialog.ButtonCallback() {
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java
index 7742d695..7a2bea98 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/DeleteSongsDialogHelper.java
@@ -26,7 +26,7 @@ public class DeleteSongsDialogHelper {
         return new MaterialDialog.Builder(context)
                 .title(title)
                 .content(context.getResources().getString(R.string.delete_warning))
-                .positiveText(context.getResources().getString(R.string.ok))
+                .positiveText(context.getResources().getString(R.string.delete))
                 .negativeText(context.getResources().getString(R.string.cancel))
                 .callback(new MaterialDialog.ButtonCallback() {
                     @Override
diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingQueueDialogHelper.java b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingQueueDialogHelper.java
index 819577c6..4110a133 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingQueueDialogHelper.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/helper/PlayingQueueDialogHelper.java
@@ -25,19 +25,12 @@ public class PlayingQueueDialogHelper {
         MaterialDialog dialog = new MaterialDialog.Builder(activity)
                 .title(activity.getResources().getString(R.string.label_current_playing_queue))
                 .customView(R.layout.dialog_playlist, false)
-                .positiveText(activity.getResources().getString(R.string.close))
-                .neutralText(activity.getResources().getString(R.string.save_as_playlist))
+                .positiveText(activity.getResources().getString(R.string.save_as_playlist))
                 .callback(new MaterialDialog.ButtonCallback() {
                     @Override
                     public void onPositive(MaterialDialog dialog) {
                         super.onPositive(dialog);
                         dialog.dismiss();
-                    }
-
-                    @Override
-                    public void onNeutral(MaterialDialog dialog) {
-                        super.onNegative(dialog);
-                        dialog.dismiss();
                         AddToPlaylistDialogHelper.getDialog(activity, playingQueue).show();
                     }
                 })
diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java
index 7cc731bd..fc9ea5a7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/PlaylistsUtil.java
@@ -99,7 +99,7 @@ public class PlaylistsUtil {
             numinserted += resolver.bulkInsert(uri, makeInsertItems(songs, offSet, 1000, base));
         }
 
-        Toast.makeText(context, context.getResources().getString(R.string.inserted_titles_to_playlist_1) + numinserted + context.getResources().getString(R.string.inserted_titles_to_playlist_2) + getNameForPlaylist(context, playlistId) + ".", Toast.LENGTH_SHORT).show();
+        Toast.makeText(context, context.getResources().getString(R.string.inserted_titles_to_playlist_1) + numinserted + context.getResources().getString(R.string.inserted_titles_to_playlist_2), Toast.LENGTH_SHORT).show();
         App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.PLAYLISTS_CHANGED));
     }
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000..40fcdb4f
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Einstellungen</string>
+    <string name="action_about">Über</string>
+    <string name="action_current_playing">Aktuelle Wiedergabe</string>
+    <string name="action_playing_queue">Wiedergabeliste</string>
+    <string name="action_search">Suche</string>
+    <string name="action_play_next">Als nächstes spielen</string>
+    <string name="action_add_to_playing_queue">Zur Wiedergabe hinzufügen</string>
+    <string name="action_remove_from_playing_queue">Von aktueller Wiedergabe entfernen</string>
+    <string name="action_add_to_playlist">Zu Playlist hinzufügen...</string>
+    <string name="action_tag_editor">Tag Editor</string>
+    <string name="action_delete_from_disk">Von Gerät löschen</string>
+    <string name="action_details">Details</string>
+    <string name="action_go_to">Gehe zu...</string>
+    <string name="albums">Alben</string>
+    <string name="artists">Interpreten</string>
+    <string name="genres">Genres</string>
+    <string name="songs">Titel</string>
+    <string name="playlists">Playlists</string>
+    <string name="unknown_artist">Unbekannter Interpret</string>
+    <string name="unknown_album">Unbekanntes Album</string>
+    <string name="untitled_song">Unbenannter Song</string>
+    <string name="nothing_playing">Keine Wiedergabe</string>
+    <string name="unplayable_file">Sorry - es gab einen Fehler bei dem Versuch, diesen Song abzuspielen</string>
+    <string name="biography_unavailable">Sorry, es konnte keine passende Biografie für diesen Interpreten gefunden werden.</string>
+    <string name="biography">Biografie</string>
+    <string name="audio_focus_denied">Wir konnten keinen Audiofokus erlangen.</string>
+    <string name="tag_editor">Tags bearbeiten</string>
+    <string name="song">Titel</string>
+    <string name="album">Album</string>
+    <string name="artist">Interpret</string>
+    <string name="genre">Genre</string>
+    <string name="album_artist">Album Interpret</string>
+    <string name="year">Jahr</string>
+    <string name="track">Track</string>
+    <string name="track_hint">Track (2 für Track 2 oder 3004 für CD 3 Track 4)</string>
+    <string name="album_or_artist_empty">Das Feld \"Album Titel\" oder \"Album Interpret\" ist leer.</string>
+    <string name="writing_file_number">Schreibe Datei</string>
+    <string name="saving_changes">Speichere Änderungen...</string>
+    <string name="label_details">Details</string>
+    <string name="label_file_name">Dateiname</string>
+    <string name="label_file_path">Dateipfad</string>
+    <string name="label_file_size">Größe</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_track_length">Länge</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Sampling Rate</string>
+    <string name="ok">OK</string>
+    <string name="action_go_to_artist">Gehe zu Interpret</string>
+    <string name="action_go_to_album">Gehe zum Album</string>
+    <string name="label_current_playing_queue">Wiedergabeliste</string>
+    <string name="close">Schließen</string>
+    <string name="save_as_playlist">Als Playlist speichern</string>
+    <string name="credits_3">Icon von</string>
+    <string name="credits_1">Gramophone ist ein komplett kostenloser Musik Player im Material Design gemacht von</string>
+    <string name="title_activity_search">Suche</string>
+    <string name="more">mehr</string>
+    <string name="no_results">Keine Ergebnisse</string>
+    <string name="action_re_download_artist_image">Interpret Bild aktualisieren</string>
+    <string name="updated_artist_image_for">Interpret Bild aktualisiert für</string>
+    <string name="updating">Aktualisiere...</string>
+    <string name="loading">Lade...</string>
+    <string name="added_title_to_playing_queue">1 Titel wurde der Wiedergabeliste hinzugefügt.</string>
+    <string name="added_titles_to_playing_queue_1">"Es wurden "</string>
+    <string name="added_titles_to_playing_queue_2">" Titel der Wiedergabeliste hinzugef\u00fcgt."</string>
+    <string name="action_delete_from_playlist">Aus Playlist entfernen</string>
+    <string name="inserted_titles_to_playlist_1">"Es wurden "</string>
+    <string name="inserted_titles_to_playlist_2">" Titel zur Playlist hinzugef\u00fcgt."</string>
+    <string name="action_new_playlist">Neue Playlist</string>
+    <string name="action_grid_columns">Rastergröße</string>
+    <string name="action_grid_columns_land">Rastergröße (Land)</string>
+    <string name="cancel">Abbrechen</string>
+    <string name="created_playlist">"Playlist erstellt "</string>
+    <string name="deleted_playlist">"Playlist gel\u00f6scht "</string>
+    <string name="create_playlist_failed">"Playlist konnte nicht erstellt werden "</string>
+    <string name="delete_playlist">"L\u00f6sche Playlist "</string>
+    <string name="rename_playlist">"Playlist umbenennen "</string>
+    <string name="delete_songs_1">"L\u00f6sche "</string>
+    <string name="delete_songs_2">Titel?</string>
+    <string name="delete_warning">"Achtung: Diese Operation kann nicht rückgängig gemacht werden."</string>
+    <string name="shuffle_all">Alle zufällig wiedergeben</string>
+    <string name="last_opened">Zuletzt geöffnet</string>
+    <string name="title_setting_start_page">Startseite</string>
+    <string name="light_theme_name">Hell</string>
+    <string name="dark_theme_name">Dunkel</string>
+    <string name="equalizer">Equalizer</string>
+    <string name="pref_header_ui">Oberfläche</string>
+    <string name="pref_title_general_theme">Generelles Design</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">Generell</string>
+    <string name="pref_title_set_default_start_page">Setze die standart Startseite</string>
+    <string name="title_activity_settings">Einstellungen</string>
+    <string name="pref_title_transparent_toolbar">Halbtransparente Toolbar</string>
+    <string name="pref_title_show_playback_controller_card">Mediencontroller Karten Hintergrund</string>
+    <string name="pref_title_colored_navigation_bar_artists">Farbige Navigations Leiste der Interpreten</string>
+    <string name="pref_title_colored_navigation_bar_albums">Farbige Navigations Leiste der Alben</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="navigation_drawer_open">Öffne Navigation Drawer</string>
+    <string name="navigation_drawer_close">Schließe Navigation Drawer</string>
+    <string name="delete">löschen</string>
+</resources>
diff --git a/app/src/main/res/values-es-r419/strings.xml b/app/src/main/res/values-es-r419/strings.xml
new file mode 100644
index 00000000..471601fc
--- /dev/null
+++ b/app/src/main/res/values-es-r419/strings.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Configuración</string>
+    <string name="action_about">Acerca de</string>
+    <string name="action_current_playing">Reproduciendo ahora</string>
+    <string name="action_playing_queue">Reproducción actual</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_play_next">"Siguiente "</string>
+    <string name="action_add_to_playing_queue">Agregar a reproducción actual</string>
+    <string name="action_remove_from_playing_queue">Eliminar de reproducción actual</string>
+    <string name="action_add_to_playlist">"Añadir a lista de reproducción "</string>
+    <string name="action_tag_editor">Editor de etiquetas</string>
+    <string name="action_delete_from_disk">Borrar del disco</string>
+    <string name="action_details">Detalles</string>
+    <string name="action_go_to">Ir a</string>
+    <string name="albums">Álbumes</string>
+    <string name="artists">Artistas</string>
+    <string name="genres">Géneros</string>
+    <string name="songs">Canciones</string>
+    <string name="playlists">Listas de reproducción</string>
+    <string name="unknown_artist">Artista desconocido</string>
+    <string name="unknown_album">Álbum desconocido</string>
+    <string name="untitled_song">Canción sin título</string>
+    <string name="nothing_playing">Nada se está reproduciendo</string>
+    <string name="unplayable_file">Disculpe, un error ha ocurrido intentando reproducir esta canción</string>
+    <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="tag_editor">Editor de etiquetas</string>
+    <string name="song">Canción</string>
+    <string name="album">Álbum</string>
+    <string name="artist">Artista</string>
+    <string name="genre">Género</string>
+    <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 () "</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>
+    <string name="label_details">Detalles</string>
+    <string name="label_file_name">Nombre del archivo</string>
+    <string name="label_file_path">Directorio del archivo</string>
+    <string name="label_file_size">Tamaño</string>
+    <string name="label_file_format">Formato</string>
+    <string name="label_track_length">Longitud</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Frecuencia de muestreo</string>
+    <string name="ok">OK</string>
+    <string name="action_go_to_artist">Ir al artista</string>
+    <string name="action_go_to_album">Ir al álbum</string>
+    <string name="label_current_playing_queue">Reproducción actual</string>
+    <string name="close">Cerrar</string>
+    <string name="save_as_playlist">Guardar como lista de reproducción</string>
+    <string name="title_activity_search">Buscar Actividad</string>
+    <string name="more">más</string>
+    <string name="no_results">Sin resultados</string>
+    <string name="action_re_download_artist_image">Actualizar imagen del artista</string>
+    <string name="updated_artist_image_for">Imagen de artista actualizada para</string>
+    <string name="updating">Actualizando...</string>
+    <string name="loading">Cargando...</string>
+    <string name="added_title_to_playing_queue">1 título añadido a la cola de reproducción</string>
+    <string name="added_titles_to_playing_queue_1">Añadido</string>
+    <string name="added_titles_to_playing_queue_2">t\u00edtulos a la reproducci\u00f3n actual</string>
+    <string name="action_delete_from_playlist">Borrar de la lista de reproducción</string>
+    <string name="inserted_titles_to_playlist_1">Insertado</string>
+    <string name="inserted_titles_to_playlist_2">t\u00edtulos a lista de reproducci\u00f3n</string>
+    <string name="action_new_playlist">Nueva lista de reproducción</string>
+    <string name="action_grid_columns">Columnas de la cuadrícula</string>
+    <string name="action_grid_columns_land">Columnas de la cuadrícula (apaisado)</string>
+    <string name="cancel">Cancelar</string>
+    <string name="created_playlist">Lista de reproducci\u00f3n creada</string>
+    <string name="deleted_playlist">Lista de reproducci\u00f3n eliminada</string>
+    <string name="create_playlist_failed">No se pudo crear la lista de reproducci\u00f3n</string>
+    <string name="delete_playlist">"Eliminar lista de reproducci\u00f3n "</string>
+    <string name="rename_playlist">Renombrar lista de reproducci\u00f3n</string>
+    <string name="delete_songs_1">Borrar</string>
+    <string name="delete_songs_2">canciones?</string>
+    <string name="delete_warning">"Advertencia: Esta operación no se puede deshacer"</string>
+    <string name="shuffle_all">Aleatorio</string>
+    <string name="last_opened">Última abierta</string>
+    <string name="title_setting_start_page">Página de inicio</string>
+    <string name="light_theme_name">Claro</string>
+    <string name="dark_theme_name">Oscuro</string>
+    <string name="equalizer">Ecualizador</string>
+    <string name="pref_header_ui">IU</string>
+    <string name="pref_title_general_theme">Tema general</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_set_default_start_page">Establecer como página de inicio</string>
+    <string name="title_activity_settings">Configuración</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_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_close">"Cerrar la barra de navegación "</string>
+</resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
new file mode 100644
index 00000000..0aacd0f3
--- /dev/null
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Ajustes</string>
+    <string name="action_about">Acerca de</string>
+    <string name="action_current_playing">Reproduciendo</string>
+    <string name="action_playing_queue">Cola de reproducción</string>
+    <string name="action_search">Buscar</string>
+    <string name="action_play_next">Reproducir siguiente</string>
+    <string name="action_add_to_playing_queue">Añadir a cola de reproducción</string>
+    <string name="action_remove_from_playing_queue">Quitar de la cola</string>
+    <string name="action_add_to_playlist">Añadir a la lista...</string>
+    <string name="action_tag_editor">Editor de etiquetas</string>
+    <string name="action_delete_from_disk">Borrar del disco</string>
+    <string name="action_details">Detalles</string>
+    <string name="action_go_to">Ir a...</string>
+    <string name="albums">Álbumes</string>
+    <string name="artists">Artistas</string>
+    <string name="genres">Géneros</string>
+    <string name="songs">Canciones</string>
+    <string name="playlists">Listas de reproducción</string>
+    <string name="unknown_artist">Artista Desconocido</string>
+    <string name="unknown_album">Álbum Desconocido</string>
+    <string name="untitled_song">Canción Sin Título</string>
+    <string name="nothing_playing">Nada reproduciendo</string>
+    <string name="unplayable_file">Lo sentimos, se ha producido un error intentando reproducir esta canción</string>
+    <string name="biography_unavailable">Lo sentimos, no fue posible encontrar coincidencias para encontrar la biografía del artista</string>
+    <string name="biography">Biografía</string>
+    <string name="audio_focus_denied">No fuimos capaces de obtener el foco de audio</string>
+    <string name="title_activity_tag_editor">Editor de etiquetas activo</string>
+    <string name="tag_editor">Editor de etiquetas</string>
+    <string name="song">Canción</string>
+    <string name="album">Álbum</string>
+    <string name="artist">Artista</string>
+    <string name="genre">Género</string>
+    <string name="album_artist">Artista del álbum</string>
+    <string name="year">Año</string>
+    <string name="track">Pista</string>
+    <string name="track_hint">"Pista ( 2 para la pista 2 o 3004 para el CD3 pista 4)
+"</string>
+    <string name="album_or_artist_empty">El campo del título del álbum o del artista del álbum está vacío</string>
+    <string name="writing_file_number">Escribiendo archivo</string>
+    <string name="saving_changes">Guardando cambios</string>
+    <string name="title_activity_album_tag_editor">Editor de las etiquetas del álbum activo</string>
+    <string name="label_details">Detalles</string>
+    <string name="label_file_name">Nombre de archivo</string>
+    <string name="label_file_path">Ruta de archivo</string>
+    <string name="label_file_size">Tamaño</string>
+    <string name="label_file_format">Formato</string>
+    <string name="label_track_length">Longitud</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Frecuencia de muestreo</string>
+    <string name="ok">Ok</string>
+    <string name="action_go_to_artist">Ir al artista</string>
+    <string name="action_go_to_album">Ir al álbum</string>
+    <string name="label_current_playing_queue">Cola de reproducción</string>
+    <string name="close">Cerrar</string>
+    <string name="save_as_playlist">Guardar como lista de reproducción</string>
+    <string name="title_activity_search">SearchActivity</string>
+    <string name="more">más</string>
+    <string name="no_results">Sin resultados</string>
+    <string name="action_re_download_artist_image">Actualizar imagen del artista</string>
+    <string name="updated_artist_image_for">Imagen del artista actualizada de</string>
+    <string name="updating">Actualizando...</string>
+    <string name="loading">Cargando...</string>
+    <string name="added_title_to_playing_queue">Añadida una canción a la cola de reproducción.</string>
+    <string name="added_titles_to_playing_queue_1">Añadido</string>
+    <string name="added_titles_to_playing_queue_2">canciones a la cola de reproducci\u00f3n.</string>
+    <string name="action_delete_from_playlist">Borrar de la lista de reproducción</string>
+    <string name="inserted_titles_to_playlist_1">Insertado</string>
+    <string name="inserted_titles_to_playlist_2">canciones a la lista de reproducci\u00f3n.</string>
+    <string name="action_new_playlist">Nueva lista de reproducción</string>
+    <string name="action_grid_columns">Columnas</string>
+    <string name="action_grid_columns_land">Columnas (apaisado)</string>
+    <string name="cancel">Cancelar</string>
+    <string name="created_playlist">Lista creada</string>
+    <string name="deleted_playlist">Borrar lista</string>
+    <string name="create_playlist_failed">No se pudo crear la lista</string>
+    <string name="delete_playlist">Borrar lista</string>
+    <string name="rename_playlist">Renombrar lista</string>
+    <string name="delete_songs_1">Borrar</string>
+    <string name="delete_songs_2">Canciones?</string>
+    <string name="delete_warning">"Advertencia: Esta operación es irreversible."</string>
+    <string name="shuffle_all">Mezclar todas</string>
+    <string name="last_opened">Abierto recientemente</string>
+    <string name="title_setting_start_page">Página de inicio</string>
+    <string name="light_theme_name">Claro</string>
+    <string name="dark_theme_name">Oscuro</string>
+    <string name="equalizer">Ecualizador</string>
+    <string name="pref_header_ui">UI</string>
+    <string name="pref_title_general_theme">Tema general</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_set_default_start_page">Seleccionar pagina de inicio</string>
+    <string name="title_activity_settings">Ajustes</string>
+    <string name="pref_title_transparent_toolbar">"Barra de acción semitransparente "</string>
+    <string name="pref_title_show_playback_controller_card">Tarjeta de fondo en controles de reproducción</string>
+    <string name="pref_title_colored_navigation_bar_artists">Barra de navegación coloreada en vista de artista</string>
+    <string name="pref_title_colored_navigation_bar_albums">Barra de navegación coloreada en vista de álbum</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>
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000..4a92b6e4
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Paramètres</string>
+    <string name="action_about">À propos</string>
+    <string name="action_current_playing">Lecture en cours</string>
+    <string name="action_playing_queue">File de lecture</string>
+    <string name="action_search">Rechercher</string>
+    <string name="action_play_next">Lire ensuite</string>
+    <string name="action_add_to_playing_queue">Ajouter à la file de lecture</string>
+    <string name="action_remove_from_playing_queue">Retirer de la file de lecture</string>
+    <string name="action_add_to_playlist">Ajouter à une playlist...</string>
+    <string name="action_tag_editor">Editeur d\'infos</string>
+    <string name="action_delete_from_disk">Supprimer de la mémoire</string>
+    <string name="action_details">Détails</string>
+    <string name="action_go_to">Aller à...</string>
+    <string name="albums">Albums</string>
+    <string name="artists">Artistes</string>
+    <string name="genres">Genres</string>
+    <string name="songs">Titres</string>
+    <string name="playlists">Playlists</string>
+    <string name="unknown_artist">Artiste Inconnu</string>
+    <string name="unknown_album">Album Inconnu</string>
+    <string name="untitled_song">Titre Inconnu</string>
+    <string name="nothing_playing">Aucune lecture en cours</string>
+    <string name="unplayable_file">Désolé - une erreur est survenue lors de la lecture du titre</string>
+    <string name="biography_unavailable">Désolé, nous n\'avons pas trouvé la biographie correspondant à cet artiste.</string>
+    <string name="biography">Biographie</string>
+    <string name="audio_focus_denied">Nous n\'avons pas pu obtenir le focus audio</string>
+    <string name="tag_editor">Editeur d\'infos</string>
+    <string name="song">Titre</string>
+    <string name="album">Album</string>
+    <string name="artist">Artiste</string>
+    <string name="genre">Genre</string>
+    <string name="album_artist">Artiste de l\'album</string>
+    <string name="year">Année</string>
+    <string name="track">Piste</string>
+    <string name="track_hint">Piste (2 pour piste 2 ou 3004 pour CD3 piste 4)</string>
+    <string name="album_or_artist_empty">Veuillez indiquer le titre et l\'artiste de l\'album.</string>
+    <string name="writing_file_number">Fichier en cours d\'écriture</string>
+    <string name="saving_changes">Sauvegarde des changements...</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>
+    <string name="label_file_size">Taille</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_track_length">Durée</string>
+    <string name="label_bit_rate">Débit</string>
+    <string name="label_sampling_rate">Taux d\'échantillonnage</string>
+    <string name="ok">OK</string>
+    <string name="action_go_to_artist">Voir l\'artiste</string>
+    <string name="action_go_to_album">Voir l\'album</string>
+    <string name="label_current_playing_queue">File de lecture</string>
+    <string name="close">Fermer</string>
+    <string name="save_as_playlist">Sauvegarder en tant que playlist</string>
+    <string name="title_activity_search">Dernières recherches</string>
+    <string name="more">Plus</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="updated_artist_image_for">Image de l\'artiste actualisée pour</string>
+    <string name="updating">Actualisation</string>
+    <string name="loading">Chargement...</string>
+    <string name="added_title_to_playing_queue">1 titre ajouté à la file de lecture.</string>
+    <string name="added_titles_to_playing_queue_1">Ajouté</string>
+    <string name="added_titles_to_playing_queue_2">" titres ajout\u00e9s \u00e0 la file de lecture"</string>
+    <string name="action_delete_from_playlist">Supprimer de la playlist</string>
+    <string name="inserted_titles_to_playlist_1">Ins\u00e9rer</string>
+    <string name="inserted_titles_to_playlist_2">" titres ins\u00e9r\u00e9s dans la playlist "</string>
+    <string name="action_new_playlist">Nouvelle playliste</string>
+    <string name="action_grid_columns">Nombre de colonnes</string>
+    <string name="action_grid_columns_land">Nombre de colonnes (paysage)</string>
+    <string name="cancel">Annuler</string>
+    <string name="created_playlist">"Playlist cr\u00e9\u00e9e "</string>
+    <string name="deleted_playlist">"Playlist supprim\u00e9e "</string>
+    <string name="create_playlist_failed">"Impossible de cr\u00e9er la playlist "</string>
+    <string name="delete_playlist">"Supprimer la playlist "</string>
+    <string name="rename_playlist">"Renommer la playlist "</string>
+    <string name="delete_songs_1">"Supprimer "</string>
+    <string name="delete_songs_2">" titres?"</string>
+    <string name="delete_warning">"Attention : Cette action ne peut être annulée"</string>
+    <string name="shuffle_all">Aléatoire</string>
+    <string name="last_opened">Ouvert dernièrement</string>
+    <string name="title_setting_start_page">Page de démarrage</string>
+    <string name="light_theme_name">Clair</string>
+    <string name="dark_theme_name">Noire</string>
+    <string name="equalizer">Égaliseur</string>
+    <string name="pref_header_ui">UI</string>
+    <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_title_set_default_start_page">Définir la page d\'accueil</string>
+    <string name="title_activity_settings">Réglages</string>
+    <string name="pref_title_transparent_toolbar">Barre d\'outils semi-transparente</string>
+    <string name="pref_title_show_playback_controller_card">Carte de contrôle du lecteur</string>
+    <string name="pref_title_colored_album_footers">Pieds d\'album colorés</string>
+    <string name="no_equalizer">L\'égalisateur n\'a pas été trouvé</string>
+    <string name="no_audio_id">Pas d\'audio, veuillez lire une piste 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>
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000..63e36eda
--- /dev/null
+++ b/app/src/main/res/values-it/strings.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Impostazioni</string>
+    <string name="action_about">Informazioni</string>
+    <string name="action_current_playing">In riproduzione</string>
+    <string name="action_playing_queue">Canzoni in coda</string>
+    <string name="action_search">Cerca</string>
+    <string name="action_play_next">Riproduci successiva</string>
+    <string name="action_add_to_playing_queue">Aggiungi alla coda</string>
+    <string name="action_remove_from_playing_queue">Rimuovi dalla coda</string>
+    <string name="action_add_to_playlist">Aggiungi alla playlist</string>
+    <string name="action_tag_editor">Modifica tag</string>
+    <string name="action_delete_from_disk">Elimina</string>
+    <string name="action_details">Dettagli</string>
+    <string name="action_go_to">Vai a...</string>
+    <string name="albums">Album</string>
+    <string name="artists">Artisti</string>
+    <string name="genres">Generi</string>
+    <string name="songs">Canzoni</string>
+    <string name="playlists">Playlist</string>
+    <string name="unknown_artist">Artista sconosciuto</string>
+    <string name="unknown_album">Album sconosciuto</string>
+    <string name="untitled_song">Canzone senza titolo</string>
+    <string name="nothing_playing">Niente in riproduzione</string>
+    <string name="unplayable_file">Spiacente - si è verificato un errore tentando di riprodurre questa canzone</string>
+    <string name="biography_unavailable">Mi dispiace, non riusciamo a trovare una biografia che corrisponda a questo artista</string>
+    <string name="biography">Biografia</string>
+    <string name="title_activity_tag_editor">AttivitàModificaTag</string>
+    <string name="tag_editor">Modifica tag</string>
+    <string name="song">Canzone</string>
+    <string name="album">Album</string>
+    <string name="artist">Artista</string>
+    <string name="genre">Genere</string>
+    <string name="album_artist">Artista Album</string>
+    <string name="year">Anno</string>
+    <string name="track">Traccia</string>
+    <string name="track_hint">Traccia (2 per 2 o 3004 per CD3 traccia 4)</string>
+    <string name="album_or_artist_empty">Il campo del titolo dell\'album o dell\'artista dell\'album è vuoto.</string>
+    <string name="writing_file_number">Sto scrivendo il file</string>
+    <string name="saving_changes">Sto salvando le modifiche</string>
+    <string name="title_activity_album_tag_editor">AttivitàModificaTagAlbum</string>
+    <string name="label_details">Dettagli</string>
+    <string name="label_file_name">Nome file</string>
+    <string name="label_file_size">Dimensione</string>
+    <string name="label_file_format">Formato</string>
+    <string name="label_track_length">Lunghezza</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Frequenza di campionamento</string>
+    <string name="ok">OK</string>
+    <string name="action_go_to_artist">Vai all\'artista</string>
+    <string name="action_go_to_album">Vai a album</string>
+    <string name="label_current_playing_queue">Riproduci coda</string>
+    <string name="close">Chiudi</string>
+    <string name="save_as_playlist">Salva come playlist</string>
+    <string name="title_activity_search">AttivitàCerca</string>
+    <string name="more">Altro</string>
+    <string name="no_results">Nessun risultato</string>
+    <string name="action_re_download_artist_image">Aggiorna immagine artista</string>
+    <string name="updated_artist_image_for">Aggiorna immagine artista per</string>
+    <string name="updating">Aggiornando...</string>
+    <string name="loading">Caricando..</string>
+    <string name="added_title_to_playing_queue">Aggiunto un brano alla coda.</string>
+    <string name="added_titles_to_playing_queue_1">Aggiunto</string>
+    <string name="title_activity_playlist_detail">DettagliAttivitàPlaylist</string>
+    <string name="action_delete_from_playlist">Elimina dalla playlist</string>
+    <string name="inserted_titles_to_playlist_1">Inserito</string>
+    <string name="action_new_playlist">Nuova playlist</string>
+    <string name="action_grid_columns">Colonne griglia</string>
+    <string name="action_grid_columns_land">Colonne griglia (Landscape)</string>
+    <string name="cancel">Cancella</string>
+    <string name="created_playlist">Playlist creata</string>
+    <string name="deleted_playlist">Playlist eliminata</string>
+    <string name="create_playlist_failed">Impossibile creare la playlist</string>
+    <string name="delete_playlist">Elimina playlist \n</string>
+    <string name="rename_playlist">"Rinomina playlist "</string>
+    <string name="delete_songs_1">Elimina</string>
+    <string name="delete_songs_2">" canzoni?"</string>
+    <string name="delete_warning">"Attenzione: Questa operazione non può essere effettuata."</string>
+    <string name="shuffle_all">Casuale</string>
+    <string name="last_opened">Ultima aperta</string>
+    <string name="title_setting_start_page">Pagina iniziale</string>
+    <string name="light_theme_name">Chiaro</string>
+    <string name="dark_theme_name">Scuro</string>
+    <string name="equalizer">Equalizzatore</string>
+    <string name="pref_header_ui">Interfaccia</string>
+    <string name="pref_title_general_theme">Tema</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">Generali</string>
+    <string name="pref_title_set_default_start_page">Imposta pagina iniziale</string>
+    <string name="title_activity_settings">Impostazioni</string>
+    <string name="pref_title_transparent_toolbar">Barra degli strumenti semi-trasparente</string>
+    <string name="pref_title_colored_navigation_bar_artists">Barra navigazione artista colorata</string>
+    <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>
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000..9b372a0c
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Instellingen</string>
+    <string name="action_about">Omtrent</string>
+    <string name="action_current_playing">Momenteel spelend</string>
+    <string name="action_playing_queue">Afspeellijst</string>
+    <string name="action_search">Zoek</string>
+    <string name="action_play_next">Speel volgende af</string>
+    <string name="action_add_to_playing_queue">Voeg toe aan afspeellijst\"</string>
+    <string name="action_remove_from_playing_queue">Verwijder van afspeellijst</string>
+    <string name="action_add_to_playlist">Voeg toe aan afspeellijst...\"</string>
+    <string name="action_tag_editor">Label Bewerker\"</string>
+    <string name="action_delete_from_disk">Verwijder van schijf\"</string>
+    <string name="action_details">Details</string>
+    <string name="action_go_to">Ga naar...</string>
+    <string name="albums">Albums</string>
+    <string name="artists">Artiesten</string>
+    <string name="genres">Genres</string>
+    <string name="songs">Nummers</string>
+    <string name="playlists">Afspeellijst</string>
+    <string name="unknown_artist">Onbekende artiest</string>
+    <string name="unknown_album">Onbekend Album</string>
+    <string name="untitled_song">Ongetiteld Nummer</string>
+    <string name="nothing_playing">Er wordt niets afgespeeld.</string>
+    <string name="unplayable_file">Sorry - er is een probleem ontstaan tijdens het afspelen van dit nummer</string>
+    <string name="biography_unavailable">Sorry, het is ons niet gelukt om een passende biografie voor deze artiest te vinden.</string>
+    <string name="biography">Biografie</string>
+    <string name="audio_focus_denied">Het is niet gelukt om audio focus te krijgen.</string>
+    <string name="tag_editor">Label Bewerker</string>
+    <string name="song">Nummer</string>
+    <string name="album">Album</string>
+    <string name="artist">Artiest</string>
+    <string name="genre">Genre</string>
+    <string name="album_artist">Album artiest</string>
+    <string name="year">Jaar</string>
+    <string name="track">Nummer</string>
+    <string name="track_hint">Nummer (2 voor nummer 2 of 3004 voor CD3 nummer 4)</string>
+    <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="label_details">Details</string>
+    <string name="label_file_name">Bestandsnaam</string>
+    <string name="label_file_path">Bestandspad</string>
+    <string name="label_file_size">Grootte</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_track_length">Lengte</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Sampling rate</string>
+    <string name="ok">Oké</string>
+    <string name="action_go_to_artist">Ga naar artiest</string>
+    <string name="action_go_to_album">Ga naar album</string>
+    <string name="label_current_playing_queue">Afspeellijst</string>
+    <string name="close">Sluit</string>
+    <string name="save_as_playlist">Sla op als afspeellijst</string>
+    <string name="credits_3">Icoon door</string>
+    <string name="credits_1">Gramophone is een volledig gratis muziekspeler in material design door</string>
+    <string name="title_activity_search">ZoekActiviteit</string>
+    <string name="more">meer</string>
+    <string name="no_results">Geen resultaten</string>
+    <string name="action_re_download_artist_image">Vernieuw artiest afbeelding</string>
+    <string name="updated_artist_image_for">Artiest afbeelding gewijzigd</string>
+    <string name="updating">Wijzigen...</string>
+    <string name="loading">Laden...</string>
+    <string name="added_title_to_playing_queue">1 titel toegevoegd aan de afspeellijst.</string>
+    <string name="added_titles_to_playing_queue_1">Toegevoegd</string>
+    <string name="added_titles_to_playing_queue_2">" titels naar de afspeellijst"</string>
+    <string name="action_delete_from_playlist">Verwijder van afspeellijst</string>
+    <string name="inserted_titles_to_playlist_1">"Ingevoegd "</string>
+    <string name="inserted_titles_to_playlist_2">" titels naar de afspeellijst "</string>
+    <string name="action_new_playlist">Nieuwe afspeellijst</string>
+    <string name="action_grid_columns">Rasterkolommen</string>
+    <string name="action_grid_columns_land">Rasterkolommen (Land)</string>
+    <string name="cancel">Annuleer</string>
+    <string name="created_playlist">"Afspeellijst aangemaakt "</string>
+    <string name="deleted_playlist">"Afspeellijst verwijderd "</string>
+    <string name="create_playlist_failed">"Kan afspeellijst niet verwijderen "</string>
+    <string name="delete_playlist">"Verwijder afspeellijst "</string>
+    <string name="rename_playlist">"Hernoem afspeellijst "</string>
+    <string name="delete_songs_1">"Verwijder "</string>
+    <string name="delete_songs_2">" nummers? "</string>
+    <string name="delete_warning">"Waarschuwing: Deze actie kan niet ongedaan worden gemaakt. "</string>
+    <string name="shuffle_all">Shuffle allemaal</string>
+    <string name="last_opened">Laatst geopend</string>
+    <string name="title_setting_start_page">Start pagina</string>
+    <string name="light_theme_name">Licht</string>
+    <string name="dark_theme_name">Donker</string>
+    <string name="equalizer">Equalizer</string>
+    <string name="pref_header_ui">UI</string>
+    <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_title_set_default_start_page">Stel in als start pagina</string>
+    <string name="title_activity_settings">Instellingen</string>
+    <string name="pref_title_transparent_toolbar">Semi-transparante toolbaar</string>
+    <string name="pref_title_show_playback_controller_card">Afspeelknoppen kaart</string>
+    <string name="pref_title_colored_navigation_bar_artists">Gekleurde navigatiebalk artiesten weergave</string>
+    <string name="pref_title_colored_navigation_bar_albums">Gekleurde navigatiebalk album weergave</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 wat af en probeer het opnieuw</string>
+    <string name="navigation_drawer_open">Open navigatiebalk</string>
+    <string name="navigation_drawer_close">Sluit navigatiebalk</string>
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
new file mode 100644
index 00000000..a80d254a
--- /dev/null
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Ustawienia</string>
+    <string name="action_about">O aplikacji</string>
+    <string name="action_current_playing">Obecnie gra</string>
+    <string name="action_playing_queue">Kolejka odtwarzania</string>
+    <string name="action_search">Szukaj</string>
+    <string name="action_play_next">Odtwarzaj następny</string>
+    <string name="action_add_to_playing_queue">Dodaj do kolejki odtwarzania\'\'</string>
+    <string name="action_remove_from_playing_queue">Usuń z kolejki odtwarzania</string>
+    <string name="action_add_to_playlist">Dodaj do listy odtwarzania...\'\'</string>
+    <string name="action_tag_editor">Edytor Tagów\'\'</string>
+    <string name="action_delete_from_disk">Usuń z urządzenia\'\'</string>
+    <string name="action_details">Szczegóły</string>
+    <string name="action_go_to">Przejdź do...</string>
+    <string name="albums">Albumy</string>
+    <string name="artists">Wykonawcy</string>
+    <string name="genres">Gatunki</string>
+    <string name="songs">Utwory</string>
+    <string name="playlists">Listy odtwarzania</string>
+    <string name="unknown_artist">Nieznany Wykonawca</string>
+    <string name="unknown_album">Nieznany Album</string>
+    <string name="untitled_song">Utwór bez nazwy</string>
+    <string name="nothing_playing">Nic nie gra</string>
+    <string name="unplayable_file">Niestety - wystąpił błąd przy próbie odtworzenia tej piosenki</string>
+    <string name="biography_unavailable">Niestety nie byliśmy w stanie znaleźć biografii dla tego wykonawcy.</string>
+    <string name="biography">Biografia</string>
+    <string name="audio_focus_denied">We were not able to gain audio focus.</string>
+    <string name="title_activity_tag_editor">TagEditorActivity</string>
+    <string name="tag_editor">Edytor Tagów</string>
+    <string name="song">Utwór</string>
+    <string name="album">Album</string>
+    <string name="artist">Wykonawca</string>
+    <string name="genre">Gatunek</string>
+    <string name="album_artist">Wykonawca albumu</string>
+    <string name="year">Rok</string>
+    <string name="track">Numer utworu</string>
+    <string name="track_hint">Numer utworu (2 dla utworu 2 lub 3004 dla CD3 utworu 4)</string>
+    <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>
+    <string name="label_file_size">Rozmiar</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_track_length">Długość</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Częstotliwość próbkowania</string>
+    <string name="ok">Ok</string>
+    <string name="action_go_to_artist">Przejdź do Wykonawcy</string>
+    <string name="action_go_to_album">Przejdź do albumu</string>
+    <string name="label_current_playing_queue">Kolejka odtwarzania</string>
+    <string name="close">Zamknij</string>
+    <string name="save_as_playlist">Zapisz jako listę odtwarzania</string>
+    <string name="title_activity_search">SearchActivity</string>
+    <string name="more">więcej</string>
+    <string name="no_results">Brak wyników</string>
+    <string name="action_re_download_artist_image">Zaktualizuj zdjęcie wykonawcy</string>
+    <string name="updated_artist_image_for">Zaktualizowano zdjęcie wykonawcy</string>
+    <string name="updating">Aktualizowanie...</string>
+    <string name="loading">Ładowanie...</string>
+    <string name="added_title_to_playing_queue">Dodano 1 tytuł do kolejki odtwarzania</string>
+    <string name="added_titles_to_playing_queue_1">Dodane</string>
+    <string name="added_titles_to_playing_queue_2">" tytu\u0142\u00f3w do kolejki odtwarzania."</string>
+    <string name="action_delete_from_playlist">Usuń z listy odtwarzania</string>
+    <string name="inserted_titles_to_playlist_1">"Inserted "</string>
+    <string name="inserted_titles_to_playlist_2">" tytu\u0142\u00f3w do listy odtwarzania "</string>
+    <string name="action_new_playlist">Nowa lista odtwarzania</string>
+    <string name="action_grid_columns">Siatka kolumn</string>
+    <string name="action_grid_columns_land">Siatka kolumn (poziomo)</string>
+    <string name="cancel">Anuluj</string>
+    <string name="created_playlist">"Utworzono list\u0119 odtwarzania "</string>
+    <string name="deleted_playlist">"Usuni\u0119to list\u0119 odtwarzania "</string>
+    <string name="create_playlist_failed">"Nie mo\u017cna utworzy\u0107 listy odtwarzania "</string>
+    <string name="delete_playlist">"Usu\u0144 list\u0119 "</string>
+    <string name="rename_playlist">"Zmie\u0144 nazw\u0119 listy odtwarzania "</string>
+    <string name="delete_songs_1">"Usu\u0144 "</string>
+    <string name="delete_songs_2">" utwor\u00f3w?"</string>
+    <string name="delete_warning">"Ostrzeżenie: Ta operacja może być cofnięta."</string>
+    <string name="shuffle_all">Wszystkie losowo</string>
+    <string name="last_opened">Ostatnio otwarte</string>
+    <string name="title_setting_start_page">Strona startowa</string>
+    <string name="light_theme_name">Jasny</string>
+    <string name="dark_theme_name">Ciemny</string>
+    <string name="equalizer">Korektor</string>
+    <string name="pref_header_ui">Wygląd</string>
+    <string name="pref_title_general_theme">General theme</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">General</string>
+    <string name="pref_title_set_default_start_page">Ustaw domyślną stronę startową</string>
+    <string name="title_activity_settings">Ustawienia</string>
+    <string name="pref_title_transparent_toolbar">Półprzeźroczysty pasek narzędzi</string>
+    <string name="pref_title_show_playback_controller_card">Playback controller card</string>
+    <string name="pref_title_colored_navigation_bar_artists">Kolorowy pasek nawigacyjny wykonawcy</string>
+    <string name="pref_title_colored_navigation_bar_albums">Kolorowy pasek nawigacyjny albumu</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>
+</resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 00000000..91c99045
--- /dev/null
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Configurações</string>
+    <string name="action_about">Sobre</string>
+    <string name="action_current_playing">Tocando agora</string>
+    <string name="action_playing_queue">Fila atual</string>
+    <string name="action_search">Pesquisar</string>
+    <string name="action_play_next">Reproduzir a seguir</string>
+    <string name="action_add_to_playing_queue">Adicionar à fila</string>
+    <string name="action_remove_from_playing_queue">Remover da fila</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 da memória</string>
+    <string name="action_details">Detalhes</string>
+    <string name="action_go_to">Ir para...</string>
+    <string name="albums">Álbuns</string>
+    <string name="artists">Artistas</string>
+    <string name="genres">Gêneros</string>
+    <string name="songs">Músicas</string>
+    <string name="playlists">Playlists</string>
+    <string name="unknown_artist">Artista desconhecido</string>
+    <string name="unknown_album">Álbum desconhecido</string>
+    <string name="untitled_song">Música sem título</string>
+    <string name="nothing_playing">Nada está sendo reproduzido</string>
+    <string name="unplayable_file">Desculpe - ocorreu um erro ao tentar reproduzir essa música</string>
+    <string name="biography_unavailable">Desculpe, mas nós não fomos capazes de encontrar uma biografia para este artista.</string>
+    <string name="biography">Biografia</string>
+    <string name="audio_focus_denied">Não pudemos encontrar o foco do aúdio.</string>
+    <string name="tag_editor">Editor de tags</string>
+    <string name="song">Música</string>
+    <string name="album">Álbum</string>
+    <string name="artist">Artista</string>
+    <string name="genre">Gênero</string>
+    <string name="album_artist">Artista do álbum</string>
+    <string name="year">Ano</string>
+    <string name="track">Faixa</string>
+    <string name="track_hint">Faixa (2 para faixa 2 ou 3004 para CD3 faixa 4)</string>
+    <string name="album_or_artist_empty">O título do álbum ou o campo de texto do artista do álbum está vazio.</string>
+    <string name="writing_file_number">Escrevendo artista</string>
+    <string name="saving_changes">Salvando alterações...</string>
+    <string name="label_details">Detalhes</string>
+    <string name="label_file_name">Nome do arquivo</string>
+    <string name="label_file_path">Local do arquivo</string>
+    <string name="label_file_size">Tamanho</string>
+    <string name="label_file_format">Formato</string>
+    <string name="label_track_length">Extensão</string>
+    <string name="label_bit_rate">Taxa de bits</string>
+    <string name="label_sampling_rate">Taxa de amostragem</string>
+    <string name="ok">OK</string>
+    <string name="action_go_to_artist">Ir para o artista</string>
+    <string name="action_go_to_album">Ir para o álbum</string>
+    <string name="label_current_playing_queue">Reproduzindo lista</string>
+    <string name="close">Fechar</string>
+    <string name="save_as_playlist">Salvar como uma playlist</string>
+    <string name="title_activity_search">Buscar atividade</string>
+    <string name="more">mais</string>
+    <string name="no_results">Nenhum resultado</string>
+    <string name="action_re_download_artist_image">Atualizar imagem do artista</string>
+    <string name="updated_artist_image_for">Imagem do artista atualizada para</string>
+    <string name="updating">Atualizando...</string>
+    <string name="loading">Carregando...</string>
+    <string name="added_title_to_playing_queue">Adicionada uma música para a fila atual de músicas.</string>
+    <string name="added_titles_to_playing_queue_1">Adicionado</string>
+    <string name="added_titles_to_playing_queue_2">" m\u00fasicas para a fila atual."</string>
+    <string name="action_delete_from_playlist">Apagar da playlist</string>
+    <string name="inserted_titles_to_playlist_1">Inserido</string>
+    <string name="inserted_titles_to_playlist_2">" m\u00fasicas para playlist "</string>
+    <string name="action_new_playlist">Nova playlist</string>
+    <string name="action_grid_columns">Colunas da grade</string>
+    <string name="action_grid_columns_land">Colunas da grade (Paisagem)</string>
+    <string name="cancel">Cancelar</string>
+    <string name="created_playlist">"Playlist criada "</string>
+    <string name="deleted_playlist">"Playlist excluida "</string>
+    <string name="create_playlist_failed">"N\u00e3o foi poss\u00edvel criar a playlist "</string>
+    <string name="delete_playlist">"Apagar playlist "</string>
+    <string name="rename_playlist">"Renomear playlist "</string>
+    <string name="delete_songs_1">"Excluir "</string>
+    <string name="delete_songs_2">" M\u00fasicas?"</string>
+    <string name="delete_warning">"Aviso: Esta operação não pode ser desfeita."</string>
+    <string name="shuffle_all">Todas aleatoriamente</string>
+    <string name="last_opened">Abertas recentemente</string>
+    <string name="title_setting_start_page">Página inicial</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">UI</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_title_set_default_start_page">Selecionar página inicial</string>
+    <string name="title_activity_settings">Configurações</string>
+    <string name="pref_title_transparent_toolbar">Barra de ferramentas Semi-Transparente</string>
+    <string name="pref_title_show_playback_controller_card">Cartão de controle de reprodução</string>
+    <string name="pref_title_colored_navigation_bar_artists">Barra de navegação colorida na visualização do artista</string>
+    <string name="pref_title_colored_navigation_bar_albums">Barra de navegação colorida na visualização do álbum</string>
+    <string name="pref_title_colored_album_footers">Rodapés coloridos do álbum</string>
+    <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>
+</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 00000000..586ec97e
--- /dev/null
+++ b/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Setări</string>
+    <string name="action_about">Despre</string>
+    <string name="action_current_playing">În redare</string>
+    <string name="action_playing_queue">Lista de melodii</string>
+    <string name="action_search">Căutare</string>
+    <string name="action_play_next">Redă urmator</string>
+    <string name="action_add_to_playing_queue">Adaugă la lista de melodii</string>
+    <string name="action_remove_from_playing_queue">Șterge din lista de melodii</string>
+    <string name="action_add_to_playlist">Adaugă in playlist</string>
+    <string name="action_tag_editor">Editor Info Melodie</string>
+    <string name="action_delete_from_disk">Șterge</string>
+    <string name="action_details">Detalii</string>
+    <string name="action_go_to">Du-te la...</string>
+    <string name="albums">Albume</string>
+    <string name="artists">Artiști</string>
+    <string name="genres">Genuri</string>
+    <string name="songs">Melodii</string>
+    <string name="playlists">Playlist-uri</string>
+    <string name="unknown_artist">Artist Necunoscut</string>
+    <string name="unknown_album">Album Necunoscut</string>
+    <string name="untitled_song">Melodie fără titlu</string>
+    <string name="nothing_playing">Nimic nu este redat</string>
+    <string name="unplayable_file">Îmi pare rău - a apărut o problemă in încercarea de a reda această melodie</string>
+    <string name="biography_unavailable">Îmi pare rău, nu am putut găsi o biografie potrivită pentru acest artist.</string>
+    <string name="biography">Biografie</string>
+    <string name="audio_focus_denied">Nu am putut să fac rost de focus audio.</string>
+    <string name="tag_editor">Editor info</string>
+    <string name="song">Melodie</string>
+    <string name="album">Album</string>
+    <string name="artist">Artist</string>
+    <string name="genre">Gen</string>
+    <string name="album_artist">Artistul albumului</string>
+    <string name="year">An</string>
+    <string name="track">Număr</string>
+    <string name="track_hint">Număr (2 pentru melodia a doua sau 3004 pentru CD3 melodia 4)</string>
+    <string name="album_or_artist_empty">Campul titlului albumului sau artistul albumului este gol.</string>
+    <string name="writing_file_number">Scriere fișier</string>
+    <string name="saving_changes">Salvare schimbări...</string>
+    <string name="label_details">Detalii</string>
+    <string name="label_file_name">Nume fișier</string>
+    <string name="label_file_path">Locație fișier</string>
+    <string name="label_file_size">Mărime</string>
+    <string name="label_file_format">Format</string>
+    <string name="label_track_length">Durată</string>
+    <string name="label_bit_rate">Bitrate</string>
+    <string name="label_sampling_rate">Rată de sampling</string>
+    <string name="ok">OK</string>
+    <string name="action_go_to_artist">Du-te la artist</string>
+    <string name="action_go_to_album">Du-te la album</string>
+    <string name="label_current_playing_queue">Lista de redare</string>
+    <string name="close">Închide</string>
+    <string name="save_as_playlist">Salvează ca și playlist</string>
+    <string name="title_activity_search">ActivitateaDeCăutare</string>
+    <string name="more">mai mult</string>
+    <string name="no_results">Niciun rezultat</string>
+    <string name="action_re_download_artist_image">Actualizează imagine artist</string>
+    <string name="updated_artist_image_for">Acatualizează imagine artist pentru</string>
+    <string name="updating">Actualizare...</string>
+    <string name="loading">Incărcare...</string>
+    <string name="added_title_to_playing_queue">Adăugat 1 melodie la lista de redare.</string>
+    <string name="added_titles_to_playing_queue_1">Adăugat</string>
+    <string name="added_titles_to_playing_queue_2">melodii la lista de redare.</string>
+    <string name="action_delete_from_playlist">Şterge din playlist</string>
+    <string name="inserted_titles_to_playlist_1">Inserat</string>
+    <string name="inserted_titles_to_playlist_2">" melodie la playlist "</string>
+    <string name="action_new_playlist">Playlist nou</string>
+    <string name="action_grid_columns">Rânduri pe grid</string>
+    <string name="action_grid_columns_land">Rânduri pe grid (Orizontal)</string>
+    <string name="cancel">Anulare</string>
+    <string name="created_playlist">"Creare playlist "</string>
+    <string name="deleted_playlist">"\u015eterge playlist "</string>
+    <string name="create_playlist_failed">"Nu a putut fi creat playlist "</string>
+    <string name="delete_playlist">"\u015eterge playlist "</string>
+    <string name="rename_playlist">"Redenume\u015fte playlist "</string>
+    <string name="delete_songs_1">"\u015eterge "</string>
+    <string name="delete_songs_2">" meoldii?"</string>
+    <string name="delete_warning">"Atenţie: Această operaţie nu poate fi revocată."</string>
+    <string name="shuffle_all">Amestecă toate</string>
+    <string name="last_opened">Ultimul deschis</string>
+    <string name="title_setting_start_page">Pagina de pornire</string>
+    <string name="light_theme_name">Light (Alb)</string>
+    <string name="dark_theme_name">Dark (Negru)</string>
+    <string name="equalizer">Egalizator</string>
+    <string name="pref_header_ui">Interfaţă</string>
+    <string name="pref_title_general_theme">Temă generală</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">General</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_transparent_toolbar">Bară semi-transparentă</string>
+    <string name="pref_title_show_playback_controller_card">Cardul de redare</string>
+    <string name="pref_title_colored_navigation_bar_artists">Bară de navigare artist colorată</string>
+    <string name="pref_title_colored_navigation_bar_albums">Bară de navigare album colorată</string>
+    <string name="pref_title_colored_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>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000..e0ac2de4
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">Настройки</string>
+    <string name="action_about">О программе</string>
+    <string name="action_current_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_playlist">Добавить в список воспроизведения...\"</string>
+    <string name="action_tag_editor">Редактор тэгов</string>
+    <string name="action_delete_from_disk">Удалить с диска\"</string>
+    <string name="action_details">Подробнее</string>
+    <string name="action_go_to">Перейти к...</string>
+    <string name="albums">Альбомы</string>
+    <string name="artists">Исполнители</string>
+    <string name="genres">Жанры</string>
+    <string name="songs">Песни</string>
+    <string name="playlists">Списки воспроизведения</string>
+    <string name="unknown_artist">Неизвестный исполнитель</string>
+    <string name="unknown_album">Неизвестный исполнитель</string>
+    <string name="untitled_song">Неизвестная песня</string>
+    <string name="unplayable_file">Произошла ошибка при попытке проиграть эту песню</string>
+    <string name="biography">Биография</string>
+    <string name="tag_editor">Редактор тэгов</string>
+    <string name="song">Песня</string>
+    <string name="album">Альбом</string>
+    <string name="artist">Исполнитель</string>
+    <string name="genre">Жанр</string>
+    <string name="year">Год</string>
+    <string name="track">Трек</string>
+    <string name="writing_file_number">Запись файла</string>
+    <string name="saving_changes">Сохранение изменений...</string>
+    <string name="label_details">Подробнее</string>
+    <string name="label_file_name">Имя файла</string>
+    <string name="label_file_path">Путь к файлу</string>
+    <string name="label_file_size">Размер</string>
+    <string name="label_file_format">Формат</string>
+    <string name="label_track_length">Длина</string>
+    <string name="label_bit_rate">Битрейт</string>
+    <string name="action_go_to_artist">Перейти к исполнителю</string>
+    <string name="action_go_to_album">Перейти к альбому</string>
+    <string name="label_current_playing_queue">Очередь воспроизведения</string>
+    <string name="close">Закрыть</string>
+    <string name="save_as_playlist">Сохранить как список воспроизведения</string>
+    <string name="more">ещё</string>
+    <string name="no_results">Нет результатов</string>
+    <string name="action_re_download_artist_image">Обновить изображение исполнителя</string>
+    <string name="updating">Обновление...</string>
+    <string name="loading">Загрузка...</string>
+    <string name="added_titles_to_playing_queue_1">Добавлено</string>
+    <string name="action_delete_from_playlist">Удалить из списка воспроизведения</string>
+    <string name="inserted_titles_to_playlist_1">"\u0412\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043e "</string>
+    <string name="action_new_playlist">Новый список воспроизведения</string>
+    <string name="action_grid_columns">Столбцы сетки</string>
+    <string name="action_grid_columns_land">Столбцы сетки (ландшафт)</string>
+    <string name="cancel">Отмена</string>
+    <string name="create_playlist_failed">"\u041d\u0435\u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f "</string>
+    <string name="delete_playlist">"\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f "</string>
+    <string name="rename_playlist">"\u041f\u0435\u0440\u0435\u0438\u043c\u0435\u043d\u043e\u0432\u0430\u0442\u044c \u0441\u043f\u0438\u0441\u043e\u043a \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f "</string>
+    <string name="delete_songs_1">"\u0423\u0434\u0430\u043b\u0438\u0442\u044c "</string>
+    <string name="delete_songs_2">" \u043f\u0435\u0441\u043d\u0438?"</string>
+    <string name="title_setting_start_page">Начальная страница</string>
+    <string name="light_theme_name">Светлая</string>
+    <string name="dark_theme_name">Тёмная</string>
+    <string name="equalizer">Эквалайзер</string>
+    <string name="pref_header_audio">Аудио</string>
+    <string name="pref_title_set_default_start_page">Установить начальную страницу</string>
+    <string name="title_activity_settings">Настройки</string>
+    <string name="pref_title_transparent_toolbar">Полупрозрачная панель инструментов</string>
+    <string name="no_equalizer">Эквалайзер не найден</string>
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000..204ef3ac
--- /dev/null
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="action_settings">设置</string>
+    <string name="action_about">关于</string>
+    <string name="action_current_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_playlist">加入播放列表...\"</string>
+    <string name="action_tag_editor">音乐标签编辑器</string>
+    <string name="action_delete_from_disk">从储存中删除</string>
+    <string name="action_details">详情</string>
+    <string name="action_go_to">打开...</string>
+    <string name="albums">专辑</string>
+    <string name="artists">艺术家</string>
+    <string name="genres">流派</string>
+    <string name="songs">歌曲</string>
+    <string name="playlists">播放列表</string>
+    <string name="unknown_artist">未知艺术家</string>
+    <string name="unknown_album">未知专辑</string>
+    <string name="untitled_song">未命名歌曲</string>
+    <string name="nothing_playing">没有正在播放的曲目</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>
+    <string name="song">曲目</string>
+    <string name="album">专辑</string>
+    <string name="artist">艺术家</string>
+    <string name="genre">流派</string>
+    <string name="album_artist">专辑创作者</string>
+    <string name="year">年份</string>
+    <string name="track">音轨</string>
+    <string name="track_hint">音轨</string>
+    <string name="album_or_artist_empty">专辑名称或专辑创作者栏为空</string>
+    <string name="writing_file_number">写作目录</string>
+    <string name="saving_changes">保存更改</string>
+    <string name="label_details">详情</string>
+    <string name="label_file_name">文件名</string>
+    <string name="label_file_path">文件路径</string>
+    <string name="label_file_size">大小</string>
+    <string name="label_file_format">格式</string>
+    <string name="label_track_length">长度</string>
+    <string name="label_bit_rate">比特率</string>
+    <string name="label_sampling_rate">采样率</string>
+    <string name="ok">完成</string>
+    <string name="action_go_to_artist">艺术家</string>
+    <string name="action_go_to_album">专辑</string>
+    <string name="label_current_playing_queue">播放队列</string>
+    <string name="close">关闭</string>
+    <string name="save_as_playlist">保存为播放列表</string>
+    <string name="credits_3">图标设计者是</string>
+    <string name="credits_1">留声机是一个完全免费并采用质感设计的音乐播放器，开发者是</string>
+    <string name="title_activity_search">搜索</string>
+    <string name="more">更多</string>
+    <string name="no_results">没有找到结果</string>
+    <string name="action_re_download_artist_image">更新歌手图片</string>
+    <string name="updated_artist_image_for">为更新歌手图片</string>
+    <string name="updating">更新中……</string>
+    <string name="loading">加载中……</string>
+    <string name="navigation_drawer_open">弹出导航抽屉</string>
+    <string name="navigation_drawer_close">关闭导航抽屉</string>
+</resources>
diff --git a/app/src/main/res/values/string_constants.xml b/app/src/main/res/values/string_constants.xml
new file mode 100644
index 00000000..36d23a52
--- /dev/null
+++ b/app/src/main/res/values/string_constants.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Gramophone</string>
+    <string name="credits_4">\u0020<a href="http://cookicons.co/">Cookicons</a></string>
+    <string name="credits_2">\u0020<b>Karim Abou Zeid</b>.\n\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a>\n\n</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7bbd270a..998e732e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Gramophone</string>
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="action_settings">Settings</string>
     <string name="action_about">About</string>
     <string name="action_current_playing">Current playing</string>
     <string name="action_playing_queue">Playing queue</string>
     <string name="action_search">Search</string>
     <string name="action_play_next">Play next</string>
-    <string name="action_add_to_playing_queue">Add to playing queue"</string>
+    <string name="action_add_to_playing_queue">Add to playing queue</string>
     <string name="action_remove_from_playing_queue">Remove from playing queue</string>
-    <string name="action_add_to_playlist">Add to playlist…"</string>
-    <string name="action_tag_editor">Tag Editor"</string>
-    <string name="action_delete_from_disk">Delete from disk"</string>
+    <string name="action_add_to_playlist">Add to playlist…</string>
+    <string name="action_tag_editor">Tag Editor</string>
+    <string name="action_delete_from_disk">Delete from disk</string>
     <string name="action_details">Details</string>
     <string name="action_go_to">Go to…</string>
     <string name="albums">Albums</string>
@@ -26,17 +23,12 @@
     <string name="unknown_album">Unknown Album</string>
     <string name="untitled_song">Untitled Song</string>
     <string name="nothing_playing">Nothing is playing</string>
-    <string name="hint_fling_to_open">Fling to toggle the now playing screen</string>
-    <string name="hint_fling_to_go_back">fling to return</string>
-    <string name="hint_press_again_to_exit">Press once again to exit!</string>
     <string name="unplayable_file">Sorry - an error occurred while attempting to play this song</string>
-    <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="biography_unavailable">Sorry, we were not able to find a matching biography for this artist.</string>
     <string name="biography">Biography</string>
     <string name="audio_focus_denied">We were not able to gain audio focus.</string>
-    <string name="title_activity_tag_editor">TagEditorActivity</string>
-    <string name="hello_world">Hello world!</string>
-    <string name="tag_editor">Tag Editor</string>
+    <string name="title_activity_tag_editor">Tag editor</string>
+    <string name="tag_editor">Tag editor</string>
     <string name="song">Song</string>
     <string name="album">Album</string>
     <string name="artist">Artist</string>
@@ -48,7 +40,7 @@
     <string name="album_or_artist_empty">The album title or the album artist text field is empty.</string>
     <string name="writing_file_number">Writing file</string>
     <string name="saving_changes">Saving changes…</string>
-    <string name="title_activity_album_tag_editor">AlbumTagEditorActivity</string>
+    <string name="title_activity_album_tag_editor">Album Tag Editor</string>
     <string name="label_details">Details</string>
     <string name="label_file_name">File name</string>
     <string name="label_file_path">File path</string>
@@ -63,8 +55,9 @@
     <string name="label_current_playing_queue">Playing queue</string>
     <string name="close">Close</string>
     <string name="save_as_playlist">Save as playlist</string>
-    <string name="credits">Gramophone is a completely free material designed music player by <b>Karim Abou Zeid</b>.\n\n<a href="https://plus.google.com/+KarimAbouZeid23697">Google+</a>&#160;&#160;&#160;<a href="https://twitter.com/karim23697">Twitter</a>\n\nIcon by <a href="http://cookicons.co/">Cookicons</a></string>
-    <string name="title_activity_search">SearchActivity</string>
+    <string name="credits_3">Icon by</string>
+    <string name="credits_1">Gramophone is a completely free material designed music player by</string>
+    <string name="title_activity_search">Search</string>
     <string name="more">more</string>
     <string name="no_results">No results</string>
     <string name="action_re_download_artist_image">Update artist image</string>
@@ -72,12 +65,12 @@
     <string name="updating">Updating…</string>
     <string name="loading">Loading…</string>
     <string name="added_title_to_playing_queue">Added 1 title to the playing queue.</string>
-    <string name="added_titles_to_playing_queue_1">Added </string>
+    <string name="added_titles_to_playing_queue_1">Added\u0020</string>
     <string name="added_titles_to_playing_queue_2">\u0020titles to the playing queue.</string>
-    <string name="title_activity_playlist_detail">PlaylistDetailActivity</string>
+    <string name="title_activity_playlist_detail">Playlist Activity</string>
     <string name="action_delete_from_playlist">Delete from playlist</string>
-    <string name="inserted_titles_to_playlist_1">Inserted\u0020</string>
-    <string name="inserted_titles_to_playlist_2">\u0020titles to playlist\u0020</string>
+    <string name="inserted_titles_to_playlist_1">Added\u0020</string>
+    <string name="inserted_titles_to_playlist_2">\u0020titles to playlist.</string>
     <string name="action_new_playlist">New playlist</string>
     <string name="action_grid_columns">Grid columns</string>
     <string name="action_grid_columns_land">Grid columns (Land)</string>
@@ -109,5 +102,8 @@
     <string name="pref_title_colored_album_footers">Colored album footers</string>
     <string name="no_equalizer">No equalizer found</string>
     <string name="no_audio_id">No audio id, play something and try again.</string>
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="delete">delete</string>
 
 </resources>