diff --git a/app/src/main/res/values-ca/translatable.xml b/app/src/main/res/values-ca/translatable.xml
index 8d73a6c9..8c9b779e 100644
--- a/app/src/main/res/values-ca/translatable.xml
+++ b/app/src/main/res/values-ca/translatable.xml
@@ -48,26 +48,15 @@
   <string name="play_or_enqueue">Afegeix a la cua si s\'està reproduint; Reprodueix si està pausat</string>
   <string name="open">Obre</string>
   <string name="go_home">Carpeta principal</string>
-  <plurals name="playing">
-    <item quantity="one">1 pista en reproducció</item>
-    <item quantity="other">%d pistes en reproducció.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 pista a la cua</item>
-    <item quantity="other">%d pistes a la cua.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">S\'ha afegit 1 pista a la llista de reproducció %2$s.</item>
-    <item quantity="other">S\'han afegit %1$d pistes a la llista de reproducció %2$s.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">S\'ha suprimit 1 pista de la llista de reproducció %2$s.</item>
-    <item quantity="other">S\'han suprimit %1$d pistes de la llista de reproducció %2$s.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 pista suprimida.</item>
-    <item quantity="other">%d pistes suprimides.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Ha fallat en suprimir %s.</string>
   <string name="deleted_item">S\'ha suprimit «%s».</string>
   <string name="delete_item">Voleu suprimir «%s»?</string>
diff --git a/app/src/main/res/values-cs/translatable.xml b/app/src/main/res/values-cs/translatable.xml
index a801e08c..c9bc9fe7 100644
--- a/app/src/main/res/values-cs/translatable.xml
+++ b/app/src/main/res/values-cs/translatable.xml
@@ -55,31 +55,15 @@
   <string name="remove">Odstranit</string>
   <string name="play_or_enqueue">Pokud hraje přidat do fronty; Přehrát pokud pozastaveno</string>
   <string name="open">Otevřít</string>
-  <plurals name="playing">
-    <item quantity="one">1 hrající skladba.</item>
-    <item quantity="few">%d hrající skladby.</item>
-    <item quantity="other">%d hrajících skladeb.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 skladba ve frontě.</item>
-    <item quantity="few">%d skladby ve frontě.</item>
-    <item quantity="other">%d skladeb ve frontě.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">1 skladba přidána do playlistu %2$s.</item>
-    <item quantity="few">%1$d skladby přidány do playlistu %2$s.</item>
-    <item quantity="other">%1$d skladeb přidáno do playlistu %2$s.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">1 skladba odstraněna z playlistu %2$s.</item>
-    <item quantity="few">%1$d skladby odstraněny z playlistu %2$s.</item>
-    <item quantity="other">%1$d skladeb odstraněno z playlistu %2$s.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 skladba odstraněna.</item>
-    <item quantity="few">%d skladby odstraněny.</item>
-    <item quantity="other">%d skladeb odstraněno.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Selhalo smazání %s.</string>
   <string name="deleted_item">\'%s\' smazáno.</string>
   <string name="delete_item">Smazat \'%s\'?</string>
diff --git a/app/src/main/res/values-de/translatable.xml b/app/src/main/res/values-de/translatable.xml
index 094b5f48..f2d17b47 100644
--- a/app/src/main/res/values-de/translatable.xml
+++ b/app/src/main/res/values-de/translatable.xml
@@ -57,24 +57,33 @@
   <string name="open">Öffnen</string>
   <string name="go_home">Benutzerverzeichnis</string>
   <string name="jumping_to_song">Titel bereits in Warteschlange, wird direkt angesprungen …</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <plurals name="playing">
-    <item quantity="one">1 Titel wird wiedergegeben.</item>
+    <item quantity="one">%d Titel wird wiedergegeben.</item>
     <item quantity="other">%d Titel werden wiedergegeben.</item>
   </plurals>
   <plurals name="enqueued">
-    <item quantity="one">1 Titel eingereiht.</item>
+    <item quantity="one">%d Titel eingereiht.</item>
     <item quantity="other">%d Titel eingereiht.</item>
   </plurals>
   <plurals name="added_to_playlist">
-    <item quantity="one">1 Titel zur Wiedergabeliste %2$s hinzugefügt.</item>
+    <item quantity="one">%1$d Titel zur Wiedergabeliste %2$s hinzugefügt.</item>
     <item quantity="other">%1$d Titel zur Wiedergabeliste %2$s hinzugefügt.</item>
   </plurals>
   <plurals name="removed_from_playlist">
-    <item quantity="one">1 Titel aus Wiedergabeliste %2$s entfernt.</item>
+    <item quantity="one">%1$d Titel aus Wiedergabeliste %2$s entfernt.</item>
     <item quantity="other">%1$d Titel aus Wiedergabeliste %2$s entfernt.</item>
   </plurals>
   <plurals name="deleted">
-    <item quantity="one">1 Titel gelöscht.</item>
+    <item quantity="one">%d Titel gelöscht.</item>
     <item quantity="other">%d Titel gelöscht.</item>
   </plurals>
   <string name="delete_file_failed">Löschen von %s fehlgeschlagen.</string>
diff --git a/app/src/main/res/values-el-rGR/translatable.xml b/app/src/main/res/values-el-rGR/translatable.xml
index 460448d0..4fde1fab 100644
--- a/app/src/main/res/values-el-rGR/translatable.xml
+++ b/app/src/main/res/values-el-rGR/translatable.xml
@@ -37,6 +37,15 @@
   <string name="done">Ολοκληρώθηκε</string>
   <string name="remove">Αφαίρεση</string>
   <string name="play_or_enqueue">Τοποθέτηση στην σειρα αναμονης αν παίζει? Αναπαραγωγή εάν διακοπεί</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Αποτυχία διαγραφής %s.</string>
   <string name="deleted_item">\'%s\' διαγράφεται.</string>
   <string name="delete_item">Διαγραφή \'%s\'?</string>
diff --git a/app/src/main/res/values-es/translatable.xml b/app/src/main/res/values-es/translatable.xml
index fd33cb70..aefd4c77 100644
--- a/app/src/main/res/values-es/translatable.xml
+++ b/app/src/main/res/values-es/translatable.xml
@@ -2,14 +2,21 @@
 <resources>
   <string name="app_name">Vanilla Music</string>
   <!--Playback Activity (main screen)-->
+  <string name="no_songs">No se han encontrado pistas en tu dispositivo.</string>
+  <string name="empty_queue">No hay ninguna pista seleccionada. Elige alguna desde la biblioteca o accede al modo aleatorio pulsando este mensaje</string>
   <string name="settings">Configuración</string>
-  <string name="no_shuffle">Aleatorio no</string>
-  <string name="shuffle_albums">Albumes aleatorios</string>
+  <string name="no_shuffle">No mezclar</string>
+  <string name="shuffle_songs">Mezclar pistas</string>
+  <string name="shuffle_songs_continuously">Mezclar pistas indefinidamente</string>
+  <string name="shuffle_albums">Mezclar álbumes</string>
   <string name="no_repeat">No repetir</string>
   <string name="repeat">Repetir</string>
+  <string name="repeat_current_song">Repetir la pista actual</string>
+  <string name="stop_current_song">Parar después de la pista actual</string>
   <string name="random">Aleatorio</string>
   <string name="random_enabling">Aleatorio activado</string>
-  <string name="queue_cleared">Lista limpia</string>
+  <string name="song_load_failed">Fallo al cargar la pista %s. Podría faltar o estar corrupta.</string>
+  <string name="queue_cleared">Cola vaciada.</string>
   <string name="cover_art">Carátula</string>
   <string name="close_notification">Cerrar notificación</string>
   <string name="_genre">género</string>
@@ -42,30 +49,55 @@
   <string name="expand">Expandir</string>
   <string name="delete">Eliminar</string>
   <string name="playback_view">Reproduciendo ahora</string>
-  <string name="sort_by">Organizar por</string>
-  <string name="search">Búsqueda</string>
+  <string name="sort_by">Ordenar por</string>
+  <string name="search">Buscar</string>
   <string name="done">Hecho</string>
-  <string name="remove">Quitar</string>
-  <string name="play_or_enqueue">Poner en cola si hay música reproduciéndose, reproducir si está pausado</string>
+  <string name="remove">Eliminar</string>
+  <string name="play_or_enqueue">Poner en cola si hay música reproduciéndose; Reproducir si está pausado</string>
   <string name="open">Abrir</string>
+  <string name="go_home">Directorio de inicio</string>
+  <string name="jumping_to_song">La canción ya está en la cola, saltando...</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Error al eliminar %s.</string>
   <string name="deleted_item">\'%s\' eliminado.</string>
   <string name="delete_item">¿Eliminar \'%s\'?</string>
   <string name="delete_file">¿Eliminar el archivo \'%s\'?</string>
   <string name="artists">Artistas</string>
   <string name="albums">Álbumes</string>
+  <string name="albumartists">Artistas del Álbum</string>
+  <string name="composers">Compositores</string>
+  <string name="songs">Pistas</string>
   <string name="playlists">Listas de reproducción</string>
   <string name="genres">Géneros</string>
   <string name="files">Archivos</string>
+  <string name="artist">Artista</string>
+  <string name="album">Álbum</string>
+  <string name="genre">Género</string>
+  <string name="folder">Carpeta</string>
+  <string name="filename">Nombre de archivo</string>
+  <string name="file_size">Tamaño de archivo</string>
+  <string name="file_time">Fecha de modificación</string>
+  <string name="extension">Extensión</string>
   <string name="unknown">Desconocido</string>
   <string name="play_all">Reproducir todo</string>
-  <string name="enqueue_all">Agregar todo a cola</string>
+  <string name="enqueue_all">Añadir todo a cola</string>
+  <string name="all_songs">Todas las pistas</string>
   <string name="more_from_artist">Más del artista</string>
   <string name="more_from_album">Más del álbum</string>
+  <string name="title">Título</string>
   <string name="number_of_tracks">Número de pistas</string>
   <string name="year">Año</string>
-  <string name="date_added">Fecha agregada</string>
+  <string name="date_added">Fecha en que se añadió</string>
   <string name="artist_album">Artista, álbum</string>
+  <string name="artist_year_album">Artista, año, álbum</string>
   <string name="artist_album_track">Artista, álbum, número de pista</string>
   <string name="artist_album_title">Artista, álbum, título</string>
   <string name="artist_year">Artista, año</string>
@@ -75,70 +107,85 @@
   <string name="audio">Audio</string>
   <string name="volume_during_ducking_title">Volumen durante notificaciones</string>
   <string name="volume_during_ducking_summary">Volumen de reproducción:</string>
-  <string name="ignore_audiofocus_loss_summary">Continuar reproduciendo tras haber perdido permanentemente control sobre el audio </string>
-  <string name="media_button_title">Controles Bluetooth/Auriculares</string>
+  <string name="ignore_audiofocus_loss_summary">Continuar reproduciendo tras haber perdido permanentemente el control sobre el audio </string>
+  <string name="media_button_title">Controles para Bluetooth/Auriculares</string>
   <string name="media_button_summary">Esto es necesario para los controles del bloqueo de pantalla en ICS.</string>
   <string name="media_button_beep_title">Pitido de control de auriculares</string>
-  <string name="media_button_beep_summary">Pitar luego de saltar una pista con un doble clic sobre el control de los auriculares</string>
+  <string name="media_button_beep_summary">Pitar después de saltar una pista con un doble clic sobre el control de los auriculares.</string>
   <string name="headset_only_title">Salida externa unicamente</string>
-  <string name="headset_only_summary">Impide que la música suene por los altavoces internos</string>
+  <string name="headset_only_summary">Impide que la música suene por los altavoces internos.</string>
   <string name="headset_pause_title">Pausar cuando se desconecte</string>
   <string name="headset_pause_summary">Pausar al desconectar los auriculares.</string>
   <string name="headset_launch_title">Reproducir cuando se conecte</string>
   <string name="headset_launch_summary">Reproducir cuando los auriculares se conecten. (Requiere que la app \'Headphone detector\' se encuentre instalada.)</string>
-  <string name="headset_launch_app_missing">Esta característica requiere que la app \'Headphone detector\' se encuentre instalada.\n¿Quisiera abrir la Play Store para instalar la aplicación?</string>
+  <string name="headset_launch_app_missing">Esta característica requiere que la app \'Headphone detector\' se encuentre instalada.\n¿Te gustaría abrir la Play Store para instalar la aplicación?</string>
   <string name="replaygain">ReplayGain</string>
-  <string name="replaygain_summary">Configurar el manejo de la información de ganancia de reproducción, ReplayGain</string>
-  <string name="replaygain_track_title">Habilitar ganancia de reproducción por pista</string>
-  <string name="replaygain_track_summary">Reproducir todas las pistas a sonoridad equivalente</string>
-  <string name="replaygain_album_title">Habilitar ReplayGain en álbumes</string>
-  <string name="replaygain_album_summary">Preservar dinámica del álbum.</string>
-  <string name="replaygain_bump_title">Pre-amplificación ReplayGain</string>
+  <string name="replaygain_summary">Configurar cómo se maneja la información de ReplayGain</string>
+  <string name="replaygain_track_title">Habilitar ReplayGain por pistas</string>
+  <string name="replaygain_track_summary">Reproducir todas las pistas al mismo volúmen</string>
+  <string name="replaygain_album_title">Habilitar ReplayGain por álbumes</string>
+  <string name="replaygain_album_summary">Preservar la dinámica del álbum.</string>
+  <string name="replaygain_bump_title">Pre-amplificación de ReplayGain</string>
+  <string name="replaygain_untagged_debump_title">Pistas sin etiqueta ReplayGain</string>
   <string name="replaygain_untagged_debump_summary">Reducir volumen un</string>
   <string name="replaygain_preamp_note_title">Nota</string>
-  <string name="replaygain_preamp_note_content">Android no permite a Vanilla Music aumentar el volumen a &gt;100%. Establecer el pre-amplificador a valor alto puede resultar un problema si estás escuchando musica \"tranquila\".\n\nLos valores recomendados son:\n-&gt; -3dB para música clásica/apacible\n-&gt; +3dB para grabaciones pos-2000</string>
+  <string name="replaygain_preamp_note_content">Android no permite a Vanilla Music aumentar el volumen a &gt;100%. Establecer el pre-amplificador a un valor alto puede producir problemas si estás escuchando musica \"tranquila\".\n\nLos valores recomendados son:\n-&gt; -3dB para música clásica/apacible\n-&gt; +3dB para grabaciones post-2000</string>
   <string name="readahead">Habilitar caché de lectura</string>
+  <string name="readahead_summary">Lee anticipadamente la pista que se está reproduciendo. Esta opción podría solucionar problemas de \'cortes\' (causados por una tarjeta SD lenta).</string>
   <string name="equalizer">Ecualizador</string>
   <string name="cycle_continuous_shuffling">Mezcla continua</string>
+  <string name="cycle_continuous_shuffling_summary">El \'Modo mezcla\" reproducirá las pistas siguiendo un orden totalmente aleatorio</string>
   <string name="notifications">Notificaciones</string>
+  <string name="notification_visibility_title">Visibilidad de la notificación</string>
   <string name="notification_action_title">Acción de la notificación</string>
   <string name="notification_nag">Notificación muy detallada</string>
+  <string name="notification_nag_summary">Avisar de los cambios de pista utilizando una notificación emergente</string>
   <string name="playback_screen">Pantalla de reproducción</string>
   <string name="playback_on_startup_title">Abrir al inicio</string>
-  <string name="playback_on_startup_summary">Abrir vista de reproducción al encender</string>
+  <string name="playback_on_startup_summary">Abrir vista de reproducción al inicio</string>
   <string name="display_mode_title">Modo de visualización</string>
-  <string name="swipe_up_action_title">Acción de deslizar hacia arriba</string>
-  <string name="swipe_down_action_title">Acción de deslizar hacia abajo</string>
-  <string name="cover_press_action_title">Acción de toque en la carátula</string>
-  <string name="cover_longpress_action_title">Acción de toque largo en la carátula</string>
+  <string name="swipe_up_action_title">Acción al deslizar hacia arriba</string>
+  <string name="swipe_down_action_title">Acción al deslizar hacia abajo</string>
+  <string name="cover_press_action_title">Acción al tocar la carátula</string>
+  <string name="cover_longpress_action_title">Acción al tocar la carátula de forma prolongada</string>
   <string name="library_screen">Pantalla de biblioteca</string>
   <string name="default_action_title">Acción predeterminada</string>
-  <string name="default_playlist_action_title">Acción predeterminada de lista de reproduccion</string>
-  <string name="accelerometer_shake">Sacudida de acelerómetro</string>
-  <string name="enable_shake_title">Activar la sacudida de acelerómetro</string>
-  <string name="enable_shake_summary">Solo activo cuando está reproduciendo. En algunos dispositivos no funciona cuando la pantalla está apagada .</string>
-  <string name="shake_action_title">Acción de sacudir</string>
+  <string name="default_playlist_action_title">Acción predeterminada de la lista de reproducción</string>
+  <string name="accelerometer_shake">Sacudida del acelerómetro</string>
+  <string name="enable_shake_title">Activar la sacudida del acelerómetro</string>
+  <string name="enable_shake_summary">Solo activo cuando suena la música. En algunos dispositivos no funciona cuando la pantalla está apagada.</string>
+  <string name="shake_action_title">Acción al sacudir</string>
   <string name="shake_threshold_title">Umbral de sacudida</string>
   <string name="misc_features">Características diversas</string>
   <string name="theme">Tema</string>
   <string name="disable_lockscreen_title">Desactivar pantalla de bloqueo</string>
-  <string name="disable_lockscreen_summary">Impedir la activación de la pantalla de bloqueo en la librería o en la pantalla de reproducción</string>
+  <string name="disable_lockscreen_summary">Impedir la activación de la pantalla de bloqueo en la biblioteca o en la pantalla de reproducción</string>
+  <string name="keep_screen_on_title">Mantener la pantalla encendida</string>
+  <string name="keep_screen_on_summary">Mantener la pantalla (y el dispositivo) activos mientras Vanilla Music sea visible</string>
   <string name="use_idle_timeout_title">Activar tiempo de inactividad</string>
-  <string name="use_idle_timeout_summary">Cuando activo, la reproducción será interrumpida dado un tiempo de inactividad</string>
+  <string name="use_idle_timeout_summary">Cuando está activo, la reproducción se detendrá después del tiempo de inactividad especificado</string>
   <string name="idle_timeout_title">Tiempo de inactividad</string>
+  <string name="enable_scroll_to_song_title">Desplazarse al título de la pista</string>
+  <string name="enable_scroll_to_song_summary">Desplazarse a la pista/álbum/artista reproduciéndose actualmente en las listas de la biblioteca</string>
   <string name="coverloader_android_title">Cargar carátula desde Android</string>
   <string name="coverloader_android_summary">Consultar la base de datos multimedia interna de Android para encontrar carátulas</string>
   <string name="coverloader_vanilla_title">Cargar carátula desde carpeta</string>
-  <string name="coverloader_vanilla_summary">Buscar archivos con imágenes llamados cover.jpg, album.jpg o artwork.jpg y mostrarlos como carátula del álbum</string>
+  <string name="coverloader_vanilla_summary">Buscar imágenes llamadas cover.jpg, album.jpg o artwork.jpg y mostrarlas como carátula del álbum</string>
   <string name="coverloader_shadow_title">Cargar carátula desde carpeta oculta</string>
   <string name="coverloader_shadow_summary">Intentar cargar carátulas desde \'/sdcard/Music/.vanilla/ARTISTA/ÁLBUM.jpg\'</string>
   <string name="cover_on_lockscreen_title">Mostrar caratula en pantalla de bloqueo</string>
+  <string name="cover_on_lockscreen_summary">Mostrar la carátula de pista en reproducción en la pantalla de bloqueo</string>
   <string name="double_tap_title">Doble toque en widget</string>
   <string name="double_tap_summary">Tocar dos veces el widget 1x1 abrirá el reproductor. Causa un retraso de 400ms antes de que el widget responda a acciones.</string>
-  <string name="about">Información</string>
+  <string name="scrobble_title">Utilizar la API de Scrobble Droid</string>
+  <string name="scrobble_summary">Hacer Scrobble a Last.fm a través de Scrobble Droid o del Scrobbler sencillo de Last.fm</string>
+  <string name="stock_broadcast_title">Emular las emisiones de origen</string>
+  <string name="stock_broadcast_summary">Enviar las emisiones emulando a las enviadas por el reproductor de origen para que funcione con controles de pantalla de bloqueo, widgets etc. de terceros.</string>
+  <string name="help">Ayuda</string>
+  <string name="about">Acerca de</string>
   <string name="tabs">Orden de pestañas</string>
-  <string name="customize_tab_order">Especificar qué pestañas mostrar y en qué orden</string>
-  <string name="restore_default">Restaurar valores predeterminados</string>
+  <string name="customize_tab_order">Ajustar el orden y visibilidad de las pestañas de la biblioteca</string>
+  <string name="restore_default">Restaurar los valores predeterminados</string>
   <!--The following are for the list preferences-->
   <string name="last_used_action">Última acción</string>
   <string name="never_show">No mostrar nunca</string>
@@ -146,23 +193,28 @@
   <string name="always_show">Mostrar siempre</string>
   <string name="open_main_activity">Abrir biblioteca (por defecto)</string>
   <string name="open_mini_popup">Mostrar notificación en miniatura</string>
+  <string name="skip_to_next_song">Saltar a la siguiente pista</string>
   <string name="open_full_player">Abrir reproductor completo</string>
-  <string name="info_on_cover">Información encima de la carátula</string>
+  <string name="info_on_cover">Información sobre la carátula</string>
   <string name="info_below_cover">Información debajo de la carátula</string>
   <string name="fixed_info">Información fija en la parte superior</string>
   <string name="do_nothing">No hacer nada</string>
   <string name="open_library">Abrir biblioteca</string>
   <string name="play_pause">Reproducir/Pausar</string>
+  <string name="next_song">Siguiente pista</string>
+  <string name="previous_song">Pista anterior</string>
   <string name="next_album">Siguiente álbum</string>
   <string name="previous_album">Álbum anterior</string>
-  <string name="cycle_repeat_mode">Modo repetición en ciclo</string>
-  <string name="cycle_shuffle_mode">Modo mezcla en ciclo</string>
+  <string name="cycle_repeat_mode">Modo repetición cíclico</string>
+  <string name="cycle_shuffle_mode">Modo mezcla cíclico</string>
   <string name="enqueue_current_album">Poner álbum en cola</string>
   <string name="enqueue_current_artist">Poner artista en cola</string>
-  <string name="enqueue_current_genre">Poner genero en cola.</string>
+  <string name="enqueue_current_genre">Poner genero en cola</string>
+  <string name="enqueue_current">Poner en cola...</string>
+  <string name="more_from_current">Mas de...</string>
   <string name="empty_the_queue">Vaciar cola</string>
   <string name="show_queue">Mostrar cola</string>
-  <string name="hide_queue">Esconder cola</string>
+  <string name="hide_queue">Ocultar cola</string>
   <string name="dequeue_rest">Eliminar de la cola el resto</string>
   <string name="toggle_controls">Alternar controles</string>
   <string name="seek_10s_backward">Retroceder 10 segundos</string>
@@ -175,16 +227,52 @@
   <string name="filebrowser_start">Carpeta de inicio del administrador de archivos</string>
   <string name="customize_filebrowser_start">Mostrar este directorio al abrir el administrador de archivos</string>
   <string name="select">Seleccionar</string>
+  <string name="save">Guardar</string>
   <string name="autoplaylist_playcounts_title">Creación automática de lista de reproduccion</string>
   <string name="autoplaylist_playcounts_summary">Crea automáticamente un</string>
   <string name="autoplaylist_playcounts_fmt" formatted="false">%s lista de reproducción con el \'Top %.0f\'</string>
   <string name="autoplaylist_playcounts_disabled">No crear una lista de reproducción automatica</string>
   <string name="autoplaylist_playcounts_name" formatted="false">Top %d</string>
   <string name="permission_request_summary">Vanilla Music necesita permisos de lectura para mostrar tu biblioteca musical</string>
-  <string name="reverse_sort">Orden invertido</string>
+  <string name="reverse_sort">Invertir el orden</string>
   <string name="share">Compartir...</string>
+  <string name="share_failed">Fallo al compartir el archivo</string>
   <string name="sendto">Enviar a...</string>
+  <string name="no_receiving_apps">¡No se encontró ninguna app receptora de este tipo de medios!</string>
+  <string name="media_library">Biblioteca de medios</string>
+  <string name="media_folders_header">Directorios indexados</string>
+  <string name="media_scan_header">Escáner de medios</string>
+  <string name="media_scan_full">Escanear el sistema de ficheros completo (mas lento)</string>
+  <string name="media_scan_drop_db">Limpiar la base de datos de medios</string>
+  <string name="media_scan_start">Iniciar escaneo</string>
+  <string name="media_scan_force_bastp">Siempre utilizar el lector de etiquetas propio</string>
+  <string name="media_scan_group_albums">Agrupar los álbumes por carpeta</string>
+  <string name="media_statistics">Estadísticas</string>
+  <string name="media_stats_tracks">Número de pistas</string>
+  <string name="media_stats_library_playtime">Tiempo total de reproducción (Horas)</string>
+  <string name="media_stats_listen_playtime">Horas de música reproducidas hasta el momento</string>
+  <string name="media_stats_progress">Progreso del escaneo</string>
+  <string name="media_library_scan_running">Escaneando la biblioteca de medios</string>
+  <string name="media_scan_preferences">Opciones del escáner</string>
+  <string name="media_scan_preferences_change_title">Las opciones del escáner han cambiado</string>
+  <string name="media_scan_preferences_change_message">Modificar esta opción comenzará un nuevo re-escaneo completo de tu biblioteca. ¿Quieres continuar?</string>
   <!--Folder selector-->
+  <string name="hint_long_press_to_modify_folder">Pulsación larga para modificar las opciones de carpeta</string>
+  <string name="folder_include">Incluir</string>
+  <string name="folder_exclude">Excluir</string>
+  <string name="folder_neutral">Neutral</string>
   <!--Plugin system-->
+  <string name="plugins">Plugins</string>
   <!--Theme names-->
+  <string name="theme_name_standard_light">Estándar</string>
+  <string name="theme_name_standard_dark">Estándar (Oscuro)</string>
+  <string name="theme_name_grey_light">Gris</string>
+  <string name="theme_name_grey_dark">Gris (Oscuro)</string>
+  <string name="theme_name_orange_light">Naranja</string>
+  <string name="theme_name_orange_dark">Naranja (Oscuro)</string>
+  <string name="theme_name_blue_light">Azul</string>
+  <string name="theme_name_blue_dark">Azul (Oscuro)</string>
+  <string name="theme_name_red_light">Rojo</string>
+  <string name="theme_name_red_dark">Rojo (Oscuro)</string>
+  <string name="theme_name_amoled_dark">Totalmente negro (AMOLED)</string>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/translatable.xml b/app/src/main/res/values-fa-rIR/translatable.xml
index 40fb4ec3..452d1089 100644
--- a/app/src/main/res/values-fa-rIR/translatable.xml
+++ b/app/src/main/res/values-fa-rIR/translatable.xml
@@ -47,6 +47,15 @@
   <string name="remove">حذف</string>
   <string name="play_or_enqueue">اضافه به صف اگر در حال پخش، در غیر این صورت شروع به پخش</string>
   <string name="open">بازکردن</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">حذف %s ناموفق بود.</string>
   <string name="deleted_item">\'%s\' حذف شد.</string>
   <string name="delete_item">\'%s\' پاک شود؟</string>
diff --git a/app/src/main/res/values-fi/translatable.xml b/app/src/main/res/values-fi/translatable.xml
index 315d7b57..7a90f242 100644
--- a/app/src/main/res/values-fi/translatable.xml
+++ b/app/src/main/res/values-fi/translatable.xml
@@ -57,24 +57,33 @@
   <string name="open">Avaa</string>
   <string name="go_home">Kotihakemisto</string>
   <string name="jumping_to_song">Kappale on jo jonossa, ohitetaan…</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <plurals name="playing">
-    <item quantity="one">Toistetaan 1 kappaletta.</item>
-    <item quantity="other">Toistetaan %d kappaletta.</item>
+    <item quantity="one">%d kappale toistossa.</item>
+    <item quantity="other">%d kappaletta toistossa.</item>
   </plurals>
   <plurals name="enqueued">
-    <item quantity="one">1 kappale asetettu jonoon.</item>
-    <item quantity="other">%d kappaletta asetettu jonoon.</item>
+    <item quantity="one">%d kappale jonossa.</item>
+    <item quantity="other">%d kappaletta jonossa.</item>
   </plurals>
   <plurals name="added_to_playlist">
-    <item quantity="one">1 kappale lisätty soittolistaan %2$s.</item>
+    <item quantity="one">%1$d kappale lisätty soittolistaan %2$s.</item>
     <item quantity="other">%1$d kappaletta lisätty soittolistaan %2$s.</item>
   </plurals>
   <plurals name="removed_from_playlist">
-    <item quantity="one">1 kappale poistettu soittolistasta %2$s.</item>
-    <item quantity="other">%1$d kappaletta poistettu soittolistasta %2$s.</item>
+    <item quantity="one">%1$d kappale poistettu soittolistalta %2$s.</item>
+    <item quantity="other">%1$d kappaletta poistettu soittolistalta %2$s.</item>
   </plurals>
   <plurals name="deleted">
-    <item quantity="one">1 kappale poistettu.</item>
+    <item quantity="one">%d kappale poistettu.</item>
     <item quantity="other">%d kappaletta poistettu.</item>
   </plurals>
   <string name="delete_file_failed">Kohteen %s poistaminen epäonnistui.</string>
diff --git a/app/src/main/res/values-fr/translatable.xml b/app/src/main/res/values-fr/translatable.xml
index 822880bd..e8bf9248 100644
--- a/app/src/main/res/values-fr/translatable.xml
+++ b/app/src/main/res/values-fr/translatable.xml
@@ -57,26 +57,15 @@
   <string name="open">Ouvrir</string>
   <string name="go_home">Dossier principal</string>
   <string name="jumping_to_song">Piste déjà en file d\'attente, lecture...</string>
-  <plurals name="playing">
-    <item quantity="one">1 morceau en lecture.</item>
-    <item quantity="other">%d morceaux en lecture.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 morceau dans la file d\'attente.</item>
-    <item quantity="other">%d morceaux dans la file d\'attente.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">1 morceau ajouté à la playlist %2$s.</item>
-    <item quantity="other">%1$d morceaux ajoutés à la playlist %2$s.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">1 morceau enlevé de la playlist %2$s.</item>
-    <item quantity="other">%1$d morceaux enlevés de la playlist %2$s.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 morceau supprimé.</item>
-    <item quantity="other">%d morceaux supprimés.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Échec lors de la suppression %s.</string>
   <string name="deleted_item">\'%s\' supprimé.</string>
   <string name="delete_item">Supprimer \'%s\'?</string>
diff --git a/app/src/main/res/values-hu/translatable.xml b/app/src/main/res/values-hu/translatable.xml
index f80495c5..b2194d1b 100644
--- a/app/src/main/res/values-hu/translatable.xml
+++ b/app/src/main/res/values-hu/translatable.xml
@@ -57,26 +57,15 @@
   <string name="open">Megnyitás</string>
   <string name="go_home">Saját könyvtár</string>
   <string name="jumping_to_song">A szám már a sorban van, ugrás…</string>
-  <plurals name="playing">
-    <item quantity="one">1 szám lejátszása.</item>
-    <item quantity="other">%d szám lejátszása.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 szám a sorban.</item>
-    <item quantity="other">%d szám a sorban.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">1 szám a(z) %2$s lejátszólistához adva.</item>
-    <item quantity="other">%1$d szám a(z) %2$s lejátszólistához adva.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">1 szám eltávolítva a(z) %2$s lejátszólistáról.</item>
-    <item quantity="other">%1$d szám eltávolítva a(z) %2$s lejátszólistáról.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 szám törölve.</item>
-    <item quantity="other">%d szám törölve.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Nem sikerült törölni: %s.</string>
   <string name="deleted_item">„%s” törölve.</string>
   <string name="delete_item">Törli ezt: „%s”?</string>
diff --git a/app/src/main/res/values-in/translatable.xml b/app/src/main/res/values-in/translatable.xml
index a6f3a312..78f69b1c 100644
--- a/app/src/main/res/values-in/translatable.xml
+++ b/app/src/main/res/values-in/translatable.xml
@@ -56,21 +56,15 @@
   <string name="play_or_enqueue">Diurutkan bila diputar; Putar bila di pause</string>
   <string name="open">Open</string>
   <string name="go_home">Beranda</string>
-  <plurals name="playing">
-    <item quantity="other">Memainkan %d lagu.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="other">%d lagu diantrekan.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="other">%1$d lagu ditambahkan ke daftar putar %2$s.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="other">%1$d lagu dihapus dari daftar putar %2$s.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="other">%d lagu dihapus.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Gagal menghapus %s.</string>
   <string name="deleted_item">\'%s\' terhapus.</string>
   <string name="delete_item">Hapus \'%s\'?</string>
diff --git a/app/src/main/res/values-it/translatable.xml b/app/src/main/res/values-it/translatable.xml
index bd0c875b..1c5c5611 100644
--- a/app/src/main/res/values-it/translatable.xml
+++ b/app/src/main/res/values-it/translatable.xml
@@ -57,26 +57,15 @@
   <string name="open">Apri</string>
   <string name="go_home">Cartella home</string>
   <string name="jumping_to_song">Il brano è già nella coda, verrà saltato...</string>
-  <plurals name="playing">
-    <item quantity="one">1 brano in riproduzione.</item>
-    <item quantity="other">%d brani in riproduzione.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 brano in coda.</item>
-    <item quantity="other">%d brani in coda.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">1 brano aggiunto alla playlist %2$s.</item>
-    <item quantity="other">%1$d brani aggiunti alla playlist %2$s.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">1 brano rimosso dalla playlist %2$s.</item>
-    <item quantity="other">%1$d brani rimossi dalla playlist %2$s.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 brano rimosso.</item>
-    <item quantity="other">%d brani rimossi.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Impossibile eliminare %s.</string>
   <string name="deleted_item">\'%s\' eliminato.</string>
   <string name="delete_item">Eliminare \'%s\'?</string>
diff --git a/app/src/main/res/values-iw/translatable.xml b/app/src/main/res/values-iw/translatable.xml
index 9c0ad8b4..841fde14 100644
--- a/app/src/main/res/values-iw/translatable.xml
+++ b/app/src/main/res/values-iw/translatable.xml
@@ -55,26 +55,15 @@
   <string name="remove">הסר</string>
   <string name="play_or_enqueue">הוסף לתור אם פועל; נגן אם בהשהייה</string>
   <string name="open">פתח</string>
-  <plurals name="playing">
-    <item quantity="one">מנגן רצועה אחת.</item>
-    <item quantity="other">%d רצועות מושמעות.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">רצועה אחת הוספה לתור</item>
-    <item quantity="other">%d רצועות הוספו לתור.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">רצועה אחת הוספה לרשימת ההשמעה %2$s</item>
-    <item quantity="other">%1$d רצועות הוספו לרשימת ההשמעה %2$s</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">רצועה אחת הוסרה מרשימת ההשמעה %2$s.</item>
-    <item quantity="other">%1$d רצועות הוסרו מרשימת ההשמעה %2$s</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">רצועה אחת נמחקה.</item>
-    <item quantity="other">%d רצועות נמחקו.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">נכשל במחיקת  %s.</string>
   <string name="deleted_item">%s נמחק.</string>
   <string name="delete_item">האם למחוק את \'%s\'?</string>
diff --git a/app/src/main/res/values-ja/translatable.xml b/app/src/main/res/values-ja/translatable.xml
index c4f7203d..03c9dd09 100644
--- a/app/src/main/res/values-ja/translatable.xml
+++ b/app/src/main/res/values-ja/translatable.xml
@@ -57,6 +57,15 @@
   <string name="open">開く</string>
   <string name="go_home">ホームディレクトリー</string>
   <string name="jumping_to_song">曲はすでにキューに入っています。ジャンプします…</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <plurals name="playing">
     <item quantity="other">%d トラックを再生中。</item>
   </plurals>
diff --git a/app/src/main/res/values-ko/translatable.xml b/app/src/main/res/values-ko/translatable.xml
index 5b54362b..5e5598eb 100644
--- a/app/src/main/res/values-ko/translatable.xml
+++ b/app/src/main/res/values-ko/translatable.xml
@@ -57,21 +57,15 @@
   <string name="open">열기</string>
   <string name="go_home">홈 디렉토리</string>
   <string name="jumping_to_song">노래가 이미 추가되었슴, 이동</string>
-  <plurals name="playing">
-    <item quantity="other">%d 트랙 재생중.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="other">%d곡이 대기열에 추가됨</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="other">%1$d 개의 곡이 플레이리스트 %2$s 에 추가되었습니다..</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="other">%1$d 개의 곡이 재생목록%2$s 에서 제거되었습니다.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="other">%d 트랙 제거됨.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">%s 삭제 실패.</string>
   <string name="deleted_item">\'%s\' 삭제됨.</string>
   <string name="delete_item">\'%s\'를 삭제하시겠습니까?</string>
diff --git a/app/src/main/res/values-lv/translatable.xml b/app/src/main/res/values-lv/translatable.xml
index 751d66a5..bf8f1b2f 100644
--- a/app/src/main/res/values-lv/translatable.xml
+++ b/app/src/main/res/values-lv/translatable.xml
@@ -57,29 +57,38 @@
   <string name="open">Atvērt</string>
   <string name="go_home">Mājas mape</string>
   <string name="jumping_to_song">Dziesma jau ir rindā, pārlec...</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <plurals name="playing">
-    <item quantity="zero">Atskaņo %d celiņu.</item>
-    <item quantity="one">Atskaņo 1 celiņu.</item>
+    <item quantity="zero">Atskaņo %d celiņus.</item>
+    <item quantity="one">Atskaņo %dceliņu.</item>
     <item quantity="other">Atskaņo %d celiņus.</item>
   </plurals>
   <plurals name="enqueued">
-    <item quantity="zero">Ierindots %d dziesmu.</item>
-    <item quantity="one">Ierindota 1 dziesma.</item>
-    <item quantity="other">Ierindotas %d dziesmas.</item>
+    <item quantity="zero">Ierindoti %d celiņi.</item>
+    <item quantity="one">Ierindots %d celiņš.</item>
+    <item quantity="other">Ierindoti %d celiņi.</item>
   </plurals>
   <plurals name="added_to_playlist">
-    <item quantity="zero">Repertuāram %2$s pievienots %1$d dziesmu.</item>
-    <item quantity="one">Repertuāram %2$s  pievienota 1  dziesma.</item>
-    <item quantity="other">Repertuāram %2$s pievienotas %1$d dziesmas.</item>
+    <item quantity="zero">Repertuāram %2$s pievienoti %1$dceliņi.</item>
+    <item quantity="one">Repertuāram %2$s pievienots %1$d celiņš.</item>
+    <item quantity="other">Repertuāram %2$s pievienoti %1$d celiņi.</item>
   </plurals>
   <plurals name="removed_from_playlist">
-    <item quantity="zero">No repertuāra %2$s izņemts %1$d celiņu.</item>
-    <item quantity="one">No repertuāra %2$s izņemts 1 celiņš.</item>
+    <item quantity="zero">No repertuāra %2$s izņemti %1$d celiņi.</item>
+    <item quantity="one">No repertuāra %2$s izņemts %1$d celiņš.</item>
     <item quantity="other">No repertuāra %2$s izņemti %1$d celiņi.</item>
   </plurals>
   <plurals name="deleted">
-    <item quantity="zero">Izdzēsts %d celiņu.</item>
-    <item quantity="one">Izdzēsts 1 celiņš.</item>
+    <item quantity="zero">Izdzēsti %d celiņi.</item>
+    <item quantity="one">Izdzēsts %d celiņš.</item>
     <item quantity="other">Izdzēsti %d celiņi.</item>
   </plurals>
   <string name="delete_file_failed">Neizdevās izdzēst %s.</string>
@@ -168,6 +177,7 @@
   <string name="cycle_continuous_shuffling">Nepārtrauktā sajaukšana</string>
   <string name="cycle_continuous_shuffling_summary">\"Sajaukšanas režīms\" dziesmas atskaņos pilnīgi nejaušā kārtībā</string>
   <string name="notifications">Paziņojumi</string>
+  <string name="notification_visibility_title">Paziņojuma redzamība</string>
   <string name="notification_action_title">Paziņojuma darbība</string>
   <string name="notification_nag">Ļoti runīgs paziņojums</string>
   <string name="notification_nag_summary">Paziņot par dziesmas maiņu ar uzekrāna paziņojumu</string>
@@ -295,4 +305,15 @@
   <!--Plugin system-->
   <string name="plugins">Spraudņi</string>
   <!--Theme names-->
+  <string name="theme_name_standard_light">Standarta</string>
+  <string name="theme_name_standard_dark">Standarta (tumšs)</string>
+  <string name="theme_name_grey_light">Pelēks</string>
+  <string name="theme_name_grey_dark">Pelēks (tumšs)</string>
+  <string name="theme_name_orange_light">Oranžs</string>
+  <string name="theme_name_orange_dark">Oranžs (tumšs)</string>
+  <string name="theme_name_blue_light">Zils</string>
+  <string name="theme_name_blue_dark">Zils (tumšs)</string>
+  <string name="theme_name_red_light">Sarkans</string>
+  <string name="theme_name_red_dark">Sarkans (tumšs)</string>
+  <string name="theme_name_amoled_dark">Ellīgi melns (AMOLED)</string>
 </resources>
diff --git a/app/src/main/res/values-nl/translatable.xml b/app/src/main/res/values-nl/translatable.xml
index 2731d3ec..e14da66f 100644
--- a/app/src/main/res/values-nl/translatable.xml
+++ b/app/src/main/res/values-nl/translatable.xml
@@ -57,26 +57,15 @@
   <string name="open">Openen</string>
   <string name="go_home">Thuismap</string>
   <string name="jumping_to_song">Lied is al in de wachtrij, overslaan...</string>
-  <plurals name="playing">
-    <item quantity="one">1 nummer wordt afgespeeld</item>
-    <item quantity="other">%d nummers worden afgespeeld</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 nummer in de wachtrij</item>
-    <item quantity="other">%d nummers in de wachtrij</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">1 nummer toegevoegd aan afspeellijst %2$s.</item>
-    <item quantity="other">%1$d nummers toegevoegd aan afspeellijst %2$s.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">1 nummer toegevoegd aan afspeellijst %2$s.</item>
-    <item quantity="other">%1$d nummers toegevoegd aan afspeellijst %2$s.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 nummer verwijderd.</item>
-    <item quantity="other">%d numers verwijderd.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Verwijderen van %s is mislukt.</string>
   <string name="deleted_item">\'%s\' verwijderd.</string>
   <string name="delete_item">\'%s\' verwijderen?</string>
diff --git a/app/src/main/res/values-pl/translatable.xml b/app/src/main/res/values-pl/translatable.xml
index ecccfe72..959f8718 100644
--- a/app/src/main/res/values-pl/translatable.xml
+++ b/app/src/main/res/values-pl/translatable.xml
@@ -46,6 +46,15 @@
   <string name="remove">Skasuj</string>
   <string name="play_or_enqueue">Kolejkuj, jeżeli odtwarzane; Odtwórz, jeżeli zapauzowane</string>
   <string name="open">Otwórz</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Nie można usunąć %s.</string>
   <string name="deleted_item">\'%s\' usunięte.</string>
   <string name="delete_item">Usunąć \'%s\'?</string>
diff --git a/app/src/main/res/values-pt-rBR/translatable.xml b/app/src/main/res/values-pt-rBR/translatable.xml
index 7f0b4a49..a71669e9 100644
--- a/app/src/main/res/values-pt-rBR/translatable.xml
+++ b/app/src/main/res/values-pt-rBR/translatable.xml
@@ -57,6 +57,15 @@
   <string name="open">Abrir</string>
   <string name="go_home">Diretório principal</string>
   <string name="jumping_to_song">Faixa já está na fila, saltando...</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Falha ao deletar %s.</string>
   <string name="deleted_item">\'%s\' deletada.</string>
   <string name="delete_item">Deletar \'%s\'?</string>
diff --git a/app/src/main/res/values-pt/translatable.xml b/app/src/main/res/values-pt/translatable.xml
index 5f6ed91b..379125c4 100644
--- a/app/src/main/res/values-pt/translatable.xml
+++ b/app/src/main/res/values-pt/translatable.xml
@@ -57,24 +57,33 @@
   <string name="open">Abrir</string>
   <string name="go_home">Diretório inicial</string>
   <string name="jumping_to_song">A faixa já está na fila de reprodução e será ignorada...</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <plurals name="playing">
-    <item quantity="one">1 faixa em reprodução.</item>
-    <item quantity="other">%d faixas em reprodução.</item>
+    <item quantity="one">A reproduzir %d faixa.</item>
+    <item quantity="other">A reproduzir %d faixas.</item>
   </plurals>
   <plurals name="enqueued">
-    <item quantity="one">1 faixa colocada na fila.</item>
-    <item quantity="other">%d faixas colocadas na fila.</item>
+    <item quantity="one">%d faixa na fila.</item>
+    <item quantity="other">%d faixas na fila.</item>
   </plurals>
   <plurals name="added_to_playlist">
-    <item quantity="one">1 faixa adicionada à lista de reprodução %2$s.</item>
+    <item quantity="one">%1$d faixa adicionada à lista de reprodução %2$s.</item>
     <item quantity="other">%1$d faixas adicionadas à lista de reprodução %2$s.</item>
   </plurals>
   <plurals name="removed_from_playlist">
-    <item quantity="one">1 faixa removida da lista de reprodução %2$s.</item>
+    <item quantity="one">%1$d faixa removida da lista de reprodução %2$s.</item>
     <item quantity="other">%1$d faixas removidas da lista de reprodução %2$s.</item>
   </plurals>
   <plurals name="deleted">
-    <item quantity="one">1 faixa apagada.</item>
+    <item quantity="one">%d faixa apagada.</item>
     <item quantity="other">%d faixas apagadas.</item>
   </plurals>
   <string name="delete_file_failed">Falha ao apagar %s</string>
diff --git a/app/src/main/res/values-sr/translatable.xml b/app/src/main/res/values-sr/translatable.xml
index 72ce238e..274925f3 100644
--- a/app/src/main/res/values-sr/translatable.xml
+++ b/app/src/main/res/values-sr/translatable.xml
@@ -57,31 +57,15 @@
   <string name="open">Отвори</string>
   <string name="go_home">Почетна фасцикла</string>
   <string name="jumping_to_song">Песма је већ у реду пуштња, скачем…</string>
-  <plurals name="playing">
-    <item quantity="one">1 нумера пуштена.</item>
-    <item quantity="few">%d нумере пуштене.</item>
-    <item quantity="other">%d нумера пуштено.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 нумера стављена у ред.</item>
-    <item quantity="few">%d нумере стављене у ред.</item>
-    <item quantity="other">%d нумера стављено у ред.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">1 песма додата на листу нумера %2$s.</item>
-    <item quantity="few">%1$d песме додате на листу нумера %2$s.</item>
-    <item quantity="other">%1$d песама додато на листу нумера %2$s.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">1 песма уклоњена са листе нумера %2$s.</item>
-    <item quantity="few">%1$d песме уклоњене са листе нумера %2$s.</item>
-    <item quantity="other">%1$d песама уклоњено са листе нумера %2$s.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 нумера обрисана.</item>
-    <item quantity="few">%d нумере обрисане.</item>
-    <item quantity="other">%d нумера обрисано.</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">Брисање %s није успело.</string>
   <string name="deleted_item">„%s“ обрисана.</string>
   <string name="delete_item">Да обришем „%s“?</string>
diff --git a/app/src/main/res/values-tr/translatable.xml b/app/src/main/res/values-tr/translatable.xml
index d3c21316..2bfddf0c 100644
--- a/app/src/main/res/values-tr/translatable.xml
+++ b/app/src/main/res/values-tr/translatable.xml
@@ -55,42 +55,44 @@
   <string name="remove">Kaldır</string>
   <string name="play_or_enqueue">Oynatma varsa kuyruğa ekle; duraklatıldıysa oynat</string>
   <string name="open">Aç</string>
-  <plurals name="playing">
-    <item quantity="one">1 parça oynatılıyor.</item>
-    <item quantity="other">%d parça oynatılıyor.</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="one">1 parça sıraya kondu.</item>
-    <item quantity="other">%d parça sıraya kondu.</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="one">1 parça %2$s oynatmalığına eklendi.</item>
-    <item quantity="other">%1$d parça %2$s oynatmalığına eklendi.</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="one">1 parça %2$s oynatmalığından çıkarıldı.</item>
-    <item quantity="other">%1$d parça %2$s oynatmalığından çıkarıldı.</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="one">1 parça silindi.</item>
-    <item quantity="other">%d parça silindi.</item>
-  </plurals>
+  <string name="go_home">Ev dizini</string>
+  <string name="jumping_to_song">Şarkı zaten kuyrukta, atlanıyor...</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">%s silinemedi.</string>
   <string name="deleted_item">\'%s\' silindi.</string>
   <string name="delete_item">\'%s\' silinsin mi?</string>
   <string name="delete_file">\'%s\' silinsin mi?</string>
   <string name="artists">Sanatçılar</string>
   <string name="albums">Albümler</string>
+  <string name="albumartists">Albüm Sanatçıları</string>
+  <string name="composers">Besteciler</string>
   <string name="songs">Parçalar</string>
   <string name="playlists">Oynatmalıklar</string>
   <string name="genres">Türler</string>
   <string name="files">Dosyalar</string>
+  <string name="artist">Sanatçı</string>
+  <string name="album">Albüm</string>
+  <string name="genre">Tür</string>
+  <string name="folder">Klasör</string>
+  <string name="filename">Dosya adı</string>
+  <string name="file_size">Dosya boyutu</string>
+  <string name="file_time">Değiştirilme zamanı</string>
+  <string name="extension">Uzantı</string>
   <string name="unknown">Bilinmeyen</string>
   <string name="play_all">Hepsini oynat</string>
   <string name="enqueue_all">Hepsini kuyruğa ekle</string>
   <string name="all_songs">Tüm parçalar</string>
   <string name="more_from_artist">Bu sanatçıdan daha fazla</string>
   <string name="more_from_album">Bu albümden daha fazla</string>
+  <string name="title">Başlık</string>
   <string name="number_of_tracks">Parça sayısı</string>
   <string name="year">Yıl</string>
   <string name="date_added">Eklenme günayı</string>
@@ -146,6 +148,7 @@
   <string name="cycle_continuous_shuffling">Sürekli karıştır</string>
   <string name="cycle_continuous_shuffling_summary">\'Karıştır kipi\' parçaları tümüyle rastgele sırada çalar</string>
   <string name="notifications">Bildirimler</string>
+  <string name="notification_visibility_title">Bildirim görünürlüğü</string>
   <string name="notification_action_title">Bildirim eylemi</string>
   <string name="notification_nag">Tam sözlü bildirim</string>
   <string name="notification_nag_summary">Parça değişikliklerini \'Ekran Üstü Bildirimi\' ile duyur</string>
@@ -169,6 +172,8 @@
   <string name="theme">Tema</string>
   <string name="disable_lockscreen_title">Kilit ekranını devre dışı bırak</string>
   <string name="disable_lockscreen_summary">Arşiv ekranında veya oynatma ekranındayken kilit ekranını devre dışı bırak</string>
+  <string name="keep_screen_on_title">Ekranı açık tut</string>
+  <string name="keep_screen_on_summary">Vanilya Müzik görünür olduğu zaman ekranı (ve aygıtı) uyanık tut</string>
   <string name="use_idle_timeout_title">Boşta kalma süresini etkinleştir</string>
   <string name="use_idle_timeout_summary">Oynatma belli bir sürelik etkisizliğin ardından durdurulur</string>
   <string name="idle_timeout_title">Boşta kalma süresi</string>
@@ -188,6 +193,7 @@
   <string name="scrobble_summary">Last.fm\'e Scrobble Droid veya Simple Last.fm Scrobbler kullanarak işleyin</string>
   <string name="stock_broadcast_title">Varsayılan yayınları öykün</string>
   <string name="stock_broadcast_summary">Varsayılan müzik oynatıcısı tarafından üçüncü parti kilit ekranı denetimleri ve widgetlar ile çalışması için gönderilen yayınları öykün.</string>
+  <string name="help">Yardım</string>
   <string name="about">Hakkında</string>
   <string name="tabs">Sekme sırası</string>
   <string name="customize_tab_order">Arşiv sekmelerinin sırası ve görünürlüğünü değiştirir</string>
@@ -216,10 +222,12 @@
   <string name="enqueue_current_album">Bu albümü kuyruğa ekle</string>
   <string name="enqueue_current_artist">Bu sanatçıyı kuyruğa ekle</string>
   <string name="enqueue_current_genre">Bu türü kuyruğa ekle</string>
-  <string name="empty_the_queue">Sırayı boşalt</string>
+  <string name="enqueue_current">Kuyruğa ekle...</string>
+  <string name="more_from_current">Daha fazlası...</string>
+  <string name="empty_the_queue">Kuyruğu boşalt</string>
   <string name="show_queue">Kuyruğu göster</string>
   <string name="hide_queue">Kuyruğu gizle</string>
-  <string name="dequeue_rest">Gerisini sıradan çıkar</string>
+  <string name="dequeue_rest">Gerisini kuyruktan çıkar</string>
   <string name="toggle_controls">Denetimleri göster</string>
   <string name="seek_10s_backward">10 saniye geri sar</string>
   <string name="seek_10s_forward">10 saniye ileri sar</string>
@@ -231,6 +239,7 @@
   <string name="filebrowser_start">Dosya yöneticisi ana ekranı</string>
   <string name="customize_filebrowser_start">Dosya yöneticisi bu dizinde başlar</string>
   <string name="select">Seç</string>
+  <string name="save">Kaydet</string>
   <string name="autoplaylist_playcounts_title">Kendiliğinden oynatmalık oluşturma</string>
   <string name="autoplaylist_playcounts_summary">Kendiliğinden oluştur:</string>
   <string name="autoplaylist_playcounts_fmt" formatted="false">%s \'En iyi %.0f parça\'</string>
@@ -239,17 +248,43 @@
   <string name="permission_request_summary">Vanilya Müzik, müzik arşivinizi görüntüleyebilmek için izninize gereksinim duyar</string>
   <string name="reverse_sort">Sıralamayı tersine çevir</string>
   <string name="share">Paylaş…</string>
+  <string name="share_failed">Dosya paylaşımı başarısız</string>
   <string name="sendto">Gönder…</string>
   <string name="no_receiving_apps">Bu ortam türü için uygun uygulama bulunamadı.</string>
   <string name="media_library">Ortam arşivi</string>
+  <string name="media_folders_header">İndekslenmiş dizinler</string>
   <string name="media_scan_header">Ortam tarayıcısı</string>
+  <string name="media_scan_full">Tüm dosya dizgesini tara (daha yavaş)</string>
+  <string name="media_scan_drop_db">Ortam veritabanını temizle</string>
   <string name="media_scan_start">Taramayı başlat</string>
+  <string name="media_scan_force_bastp">Her zaman dahili etiket okuyucuyu kullan</string>
+  <string name="media_scan_group_albums">Albümleri klasöre göre öbekle</string>
   <string name="media_statistics">İstatistikler</string>
   <string name="media_stats_tracks">Parça sayısı</string>
+  <string name="media_stats_library_playtime">Toplam oynatılma süresi (Saat)</string>
+  <string name="media_stats_listen_playtime">Saat cinsinden oynatılan müzik süresi</string>
   <string name="media_stats_progress">Tarama durumu</string>
   <string name="media_library_scan_running">Ortam arşivi taranıyor...</string>
+  <string name="media_scan_preferences">Tarayıcı seçenekleri</string>
+  <string name="media_scan_preferences_change_title">Tarayıcı seçenekleri değiştirildi</string>
+  <string name="media_scan_preferences_change_message">Bu seçeneği değiştirmek arşivinizi yeniden taratacaktır. Sürdürmek istiyor musunuz?</string>
   <!--Folder selector-->
+  <string name="hint_long_press_to_modify_folder">Klasör seçeneklerini değiştirmek için uzun basın</string>
+  <string name="folder_include">İçer</string>
+  <string name="folder_exclude">Dışarıda tut</string>
+  <string name="folder_neutral">Nötral</string>
   <!--Plugin system-->
   <string name="plugins">Eklentiler</string>
   <!--Theme names-->
+  <string name="theme_name_standard_light">Standart</string>
+  <string name="theme_name_standard_dark">Standart (Koyu)</string>
+  <string name="theme_name_grey_light">Gri</string>
+  <string name="theme_name_grey_dark">Gri (Koyu)</string>
+  <string name="theme_name_orange_light">Turuncu</string>
+  <string name="theme_name_orange_dark">Turuncu (Koyu)</string>
+  <string name="theme_name_blue_light">Mavi</string>
+  <string name="theme_name_blue_dark">Mavi (Koyu)</string>
+  <string name="theme_name_red_light">Kırmızı</string>
+  <string name="theme_name_red_dark">Kırmızı (Koyu)</string>
+  <string name="theme_name_amoled_dark">Kapkara (AMOLED)</string>
 </resources>
diff --git a/app/src/main/res/values-vi/translatable.xml b/app/src/main/res/values-vi/translatable.xml
index 15d4b482..f1ea292c 100644
--- a/app/src/main/res/values-vi/translatable.xml
+++ b/app/src/main/res/values-vi/translatable.xml
@@ -2,19 +2,27 @@
 <resources>
   <string name="app_name">Vanilla Music</string>
   <!--Playback Activity (main screen)-->
+  <string name="no_songs">Không tìm thấy bài hát nào trên máy.</string>
+  <string name="empty_queue">Chưa chọn bài hát nào. Hãy chọn bài hát từ thư viện nhạc hoặc chạm vào dòng chữ này để phát ngẫu nhiên các bài hát.</string>
   <string name="settings">Cài đặt</string>
   <string name="no_shuffle">Không trộn bài</string>
+  <string name="shuffle_songs">Trộn bài</string>
+  <string name="shuffle_songs_continuously">Trộn bài liên tục</string>
   <string name="shuffle_albums">Trộn album</string>
   <string name="no_repeat">Không lặp lại</string>
   <string name="repeat">Lặp lại</string>
+  <string name="repeat_current_song">Lặp bài đang phát</string>
+  <string name="stop_current_song">Dừng sau khi hết bài hát đang phát</string>
   <string name="random">Phát ngẫu nhiên</string>
   <string name="random_enabling">Bật ngẫu nhiên</string>
+  <string name="song_load_failed">Không tải được bài hát %s. Có thể tập tin đã mất hoặc bị hỏng.</string>
   <string name="queue_cleared">Đã xoá danh sách phát</string>
   <string name="cover_art">Ảnh album</string>
   <string name="close_notification">Đóng thông báo</string>
   <string name="_genre">Thể loại</string>
   <string name="_track">Bài số</string>
   <string name="_composer">Nhạc sĩ</string>
+  <string name="_path">đường dẫn</string>
   <string name="_format">Định dạng</string>
   <string name="_title">Tiêu đề</string>
   <string name="_artist">Ca sĩ</string>
@@ -47,33 +55,83 @@
   <string name="remove">Xoá</string>
   <string name="play_or_enqueue">Thêm vào danh sách nếu đang phát nhạc; Phát nếu đang dừng</string>
   <string name="open">Mở</string>
+  <string name="go_home">Thư mục gốc</string>
+  <string name="jumping_to_song">Bài hát đã có trong danh sách phát, đang chuyển đến bài hát…</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
+  <plurals name="playing">
+    <item quantity="other">Đang phát %d bài hát.</item>
+  </plurals>
+  <plurals name="enqueued">
+    <item quantity="other">Đã thêm %d bài hát vào danh sách phát.</item>
+  </plurals>
+  <plurals name="added_to_playlist">
+    <item quantity="other">Đã thêm %1$d bài hát vào danh sách %2$s.</item>
+  </plurals>
+  <plurals name="removed_from_playlist">
+    <item quantity="other">Đã xoá %1$d bài hát khỏi danh sách %2$s.</item>
+  </plurals>
+  <plurals name="deleted">
+    <item quantity="other">Đã xoá %d bài hát.</item>
+  </plurals>
   <string name="delete_file_failed">Không xoá được %s.</string>
   <string name="deleted_item">Đã xoá \"%s\".</string>
   <string name="delete_item">Xoá \"%s\"?</string>
   <string name="delete_file">Xoá tập tin \"%s\"?</string>
   <string name="artists">Ca sĩ</string>
   <string name="albums">Album</string>
+  <string name="albumartists">Ca sĩ của album</string>
+  <string name="composers">Nhạc sĩ</string>
+  <string name="songs">Bài hát</string>
   <string name="playlists">Danh sách</string>
   <string name="genres">Thể loại</string>
   <string name="files">Tập tin</string>
+  <string name="artist">Ca sĩ</string>
+  <string name="album">Album</string>
+  <string name="genre">Thể loại</string>
+  <string name="folder">Thư mục</string>
+  <string name="filename">Tên tập tin</string>
+  <string name="file_size">Kích thước tập tin</string>
+  <string name="file_time">Thời gian sửa đổi</string>
+  <string name="extension">Đuôi mở rộng</string>
   <string name="unknown">Không rõ</string>
   <string name="play_all">Phát tất cả</string>
   <string name="enqueue_all">Thêm tất cả vào danh sách phát</string>
+  <string name="all_songs">Tất cả bài hát</string>
   <string name="more_from_artist">Các bài hát khác của ca sĩ</string>
   <string name="more_from_album">Các bài hát khác trong album</string>
+  <string name="title">Tiêu đề</string>
   <string name="number_of_tracks">Số bài hát</string>
   <string name="year">Năm</string>
   <string name="date_added">Được thêm vào ngày</string>
   <string name="artist_album">Ca sĩ, album</string>
+  <string name="artist_year_album">Ca sĩ, năm, album</string>
   <string name="artist_album_track">Ca sĩ, album, số thứ tự bài hát</string>
   <string name="artist_album_title">Ca sĩ, album, tiêu đề</string>
   <string name="artist_year">Ca sĩ, năm</string>
   <string name="album_track">Album, số thứ tự bài hát</string>
   <string name="song_playcount">Lượt nghe</string>
   <!--Preferences-->
+  <plurals name="seconds">
+    <item quantity="other">%d giây</item>
+  </plurals>
+  <plurals name="minutes">
+    <item quantity="other">%d phút</item>
+  </plurals>
+  <plurals name="hours">
+    <item quantity="other">%d giờ</item>
+  </plurals>
   <string name="audio">Âm thanh</string>
   <string name="volume_during_ducking_title">Âm lượng khi có thông báo</string>
   <string name="volume_during_ducking_summary">Âm lượng phát nhạc: </string>
+  <string name="ignore_audiofocus_loss_summary">Vẫn phát nhạc khi bị mất quyền kiểm soát âm thanh vĩnh viễn</string>
   <string name="media_button_title">Điều khiển bằng tai nghe / Bluetooth</string>
   <string name="media_button_summary">Cần phải bật để kích hoạt điều khiển màn hình khoá trên Android ICS</string>
   <string name="media_button_beep_title">Tiếng bíp khi điều khiển bằng tai nghe</string>
@@ -92,15 +150,20 @@
   <string name="replaygain_album_title">Bật ReplayGain cho cả album</string>
   <string name="replaygain_album_summary">Bảo toàn mối quan hệ về âm lượng giữa các bài trong album</string>
   <string name="replaygain_bump_title">Tiền khuếch đại ReplayGain</string>
+  <string name="replaygain_untagged_debump_title">Với các bài không có thông tin ReplayGain</string>
   <string name="replaygain_untagged_debump_summary">Giảm âm lượng đi</string>
   <string name="replaygain_preamp_note_title">Chú ý</string>
   <string name="replaygain_preamp_note_content">Android không cho phép Vanilla Music tăng âm lượng lên quá 100%. Đặt mức tiền khuếch đại quá cao có thể gây ra vấn đề với các bài hát vốn có âm lượng nhỏ. \n\nNên dùng các giá trị:\n-&gt; -3dB đối với nhạc nhỏ / nhạc cổ điển\n-&gt; +3dB đối với nhạc sau năm 2000</string>
   <string name="readahead">Bật đọc trước</string>
+  <string name="readahead_summary">Đọc trước nội dung bài đang phát. Lựa chọn này có thể giải quyết vấn đề nhạc bị dừng (do thẻ nhớ quá chậm).</string>
   <string name="equalizer">Bộ chỉnh âm</string>
   <string name="cycle_continuous_shuffling">Trộn bài liên tiếp</string>
+  <string name="cycle_continuous_shuffling_summary">Chế độ trộn bài sẽ phát nhạc hoàn toàn ngẫu nhiên</string>
   <string name="notifications">Thông báo</string>
+  <string name="notification_visibility_title">Cách hiển thị thông báo</string>
   <string name="notification_action_title">Hành động thông báo</string>
   <string name="notification_nag">Thông báo rất chi tiết</string>
+  <string name="notification_nag_summary">Thông báo chuyển bài bằng \"heads-up notification\"</string>
   <string name="playback_screen">Màn hình phát nhạc</string>
   <string name="playback_on_startup_title">Mở khi khởi động</string>
   <string name="playback_on_startup_summary">Vào giao diện nghe nhạc khi mở ứng dụng</string>
@@ -121,9 +184,13 @@
   <string name="theme">Giao diện</string>
   <string name="disable_lockscreen_title">Tắt màn hình khoá</string>
   <string name="disable_lockscreen_summary">Không cho màn hình khoá hoạt động khi đang trong giao diện thư viện hoặc phát nhạc</string>
+  <string name="keep_screen_on_title">Giữ màn hình sáng</string>
+  <string name="keep_screen_on_summary">Giữ màn hình luôn sáng (và máy luôn bật) khi đang trong ứng dụng Vanilla Music</string>
   <string name="use_idle_timeout_title">Bật hẹn giờ</string>
   <string name="use_idle_timeout_summary">Khi bật tính năng này, nhạc sẽ tự dừng sau một khoảng thời gian không có hành động nào xảy ra</string>
   <string name="idle_timeout_title">Hẹn giờ</string>
+  <string name="enable_scroll_to_song_title">Chuyển đến tên bài</string>
+  <string name="enable_scroll_to_song_summary">Chuyển đến tên bài hát / album / ca sĩ đang nghe trong các danh sách của thư viện nhạc</string>
   <string name="coverloader_android_title">Nạp ảnh từ Android</string>
   <string name="coverloader_android_summary">Dùng ảnh trong cơ sở dữ liệu media của Android</string>
   <string name="coverloader_vanilla_title">Nạp ảnh từ thư mục</string>
@@ -131,10 +198,14 @@
   <string name="coverloader_shadow_title">Nạp ảnh từ thư mục ẩn</string>
   <string name="coverloader_shadow_summary">Nạp ảnh từ \'/sdcard/Music/.vanilla/ARTIST/ALBUM.jpg\'</string>
   <string name="cover_on_lockscreen_title">Hiện ảnh album ở màn hình khoá</string>
+  <string name="cover_on_lockscreen_summary">Hiện ảnh của bài hát đang phát trên màn hình khoá</string>
   <string name="double_tap_title">Nhấn đúp widget</string>
   <string name="double_tap_summary">Nhấn đúp tiện ích (widget) 1x1 sẽ mở trình chơi nhạc. Có độ trễ 400ms.</string>
+  <string name="scrobble_title">Dùng API ScrobbleDroid</string>
+  <string name="scrobble_summary">Gửi thông tin nhạc đến Last.fm thông qua ScrobbleDroid hoặc Simple Last.fm Scrobbler</string>
   <string name="stock_broadcast_title">Giả lập thông báo mặc định</string>
   <string name="stock_broadcast_summary">Giả lập tín hiệu của ứng dụng nghe nhạc gốc trên máy để làm việc với các ứng dụng khoá màn hình, điều khiển nhạc, v.v.</string>
+  <string name="help">Trợ giúp</string>
   <string name="about">Giới thiệu</string>
   <string name="tabs">Thứ tự thẻ</string>
   <string name="customize_tab_order">Sửa thứ tự tab và ẩn tab</string>
@@ -146,6 +217,7 @@
   <string name="always_show">Luôn hiện</string>
   <string name="open_main_activity">Mở thư viện nhạc (mặc định)</string>
   <string name="open_mini_popup">Mở cửa sổ con</string>
+  <string name="skip_to_next_song">Chuyển bài</string>
   <string name="open_full_player">Mở giao diện nghe nhạc đầy đủ</string>
   <string name="info_on_cover">Thông tin trên ảnh album</string>
   <string name="info_below_cover">Thông tin phía dưới ảnh album</string>
@@ -153,6 +225,8 @@
   <string name="do_nothing">Không làm gì</string>
   <string name="open_library">Mở thư viện nhạc</string>
   <string name="play_pause">Phát/Dừng</string>
+  <string name="next_song">Bài tiếp theo</string>
+  <string name="previous_song">Bài trước</string>
   <string name="next_album">Album tiếp theo</string>
   <string name="previous_album">Album trước</string>
   <string name="cycle_repeat_mode">Chuyển chế độ lặp lại</string>
@@ -160,6 +234,8 @@
   <string name="enqueue_current_album">Thêm album vào danh sách phát</string>
   <string name="enqueue_current_artist">Thêm ca sĩ vào danh sách phát</string>
   <string name="enqueue_current_genre">Thêm thể loại vào danh sách phát</string>
+  <string name="enqueue_current">Thêm vào danh sách đang phát…</string>
+  <string name="more_from_current">Các bài hát khác của…</string>
   <string name="empty_the_queue">Xoá danh sách phát</string>
   <string name="show_queue">Hiện danh sách phát</string>
   <string name="hide_queue">Ẩn danh sách phát</string>
@@ -175,6 +251,7 @@
   <string name="filebrowser_start">Thư mục gốc</string>
   <string name="customize_filebrowser_start">Trình duyệt tập tin bắt đầu tại đây</string>
   <string name="select">Chọn</string>
+  <string name="save">Lưu</string>
   <string name="autoplaylist_playcounts_title">Tự tạo danh sách</string>
   <string name="autoplaylist_playcounts_summary">Tự động tạo</string>
   <string name="autoplaylist_playcounts_fmt" formatted="false">danh sách %s \"Top %.0f\"</string>
@@ -182,7 +259,44 @@
   <string name="autoplaylist_playcounts_name" formatted="false">Top %d</string>
   <string name="permission_request_summary">Vanilla Music cần quyền đọc dữ liệu để hiển thị thư viện nhạc của bạn</string>
   <string name="reverse_sort">Sắp xếp ngược lại</string>
+  <string name="share">Chia sẻ…</string>
+  <string name="share_failed">Không chia sẻ được tập tin</string>
+  <string name="sendto">Gửi đến…</string>
+  <string name="no_receiving_apps">Không có ứng dụng nào nhận được loại tập tin này!</string>
+  <string name="media_library">Thư viện nhạc</string>
+  <string name="media_folders_header">Thư mục được theo dõi</string>
+  <string name="media_scan_header">Trình quét nhạc</string>
+  <string name="media_scan_full">Quét toàn bộ hệ thống (chậm hơn)</string>
+  <string name="media_scan_drop_db">Xoá cơ sở dữ liệu nhạc</string>
+  <string name="media_scan_start">Bắt đầu quét</string>
+  <string name="media_scan_force_bastp">Luôn sử dụng trình đọc thông tin có sẵn</string>
+  <string name="media_scan_group_albums">Gộp album theo thư mục</string>
+  <string name="media_statistics">Thống kê</string>
+  <string name="media_stats_tracks">Số bài hát</string>
+  <string name="media_stats_library_playtime">Tổng thời gian nghe nhạc (giờ)</string>
+  <string name="media_stats_listen_playtime">Số giờ đã nghe nhạc</string>
+  <string name="media_stats_progress">Tiến độ quét</string>
+  <string name="media_library_scan_running">Đang quét thư viện nhạc…</string>
+  <string name="media_scan_preferences">Tuỳ chọn quét</string>
+  <string name="media_scan_preferences_change_title">Đã thay đổi tuỳ chọn quét</string>
+  <string name="media_scan_preferences_change_message">Thay đổi tuỳ chọn này sẽ quét lại toàn bộ thư viện. Bạn có muốn tiếp tục không?</string>
   <!--Folder selector-->
+  <string name="hint_long_press_to_modify_folder">Nhấn giữ để thay đổi tuỳ chọn thư mục</string>
+  <string name="folder_include">Bao gồm</string>
+  <string name="folder_exclude">Bỏ qua</string>
+  <string name="folder_neutral">Trung lập</string>
   <!--Plugin system-->
+  <string name="plugins">Môđun</string>
   <!--Theme names-->
+  <string name="theme_name_standard_light">Chuẩn</string>
+  <string name="theme_name_standard_dark">Chuẩn (tối)</string>
+  <string name="theme_name_grey_light">Xám</string>
+  <string name="theme_name_grey_dark">Xám (tối)</string>
+  <string name="theme_name_orange_light">Da cam</string>
+  <string name="theme_name_orange_dark">Da cam (tối)</string>
+  <string name="theme_name_blue_light">Xanh da trời</string>
+  <string name="theme_name_blue_dark">Xanh da trời (tối)</string>
+  <string name="theme_name_red_light">Đỏ</string>
+  <string name="theme_name_red_dark">Đỏ (tối)</string>
+  <string name="theme_name_amoled_dark">Đen tuyền (AMOLED)</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/translatable.xml b/app/src/main/res/values-zh-rCN/translatable.xml
index 8f043bcc..fc122f73 100644
--- a/app/src/main/res/values-zh-rCN/translatable.xml
+++ b/app/src/main/res/values-zh-rCN/translatable.xml
@@ -55,21 +55,15 @@
   <string name="remove">移除</string>
   <string name="play_or_enqueue">如果播放序列；如果暫停播放</string>
   <string name="open">打开</string>
-  <plurals name="playing">
-    <item quantity="other">正在播放 %d 首曲目。</item>
-  </plurals>
-  <plurals name="enqueued">
-    <item quantity="other">队列里有 %d 首曲目。</item>
-  </plurals>
-  <plurals name="added_to_playlist">
-    <item quantity="other">%1$d 首曲目已加入播放列表 %2$s。</item>
-  </plurals>
-  <plurals name="removed_from_playlist">
-    <item quantity="other">%1$d 首曲目已经移出播放列表 %2$s。</item>
-  </plurals>
-  <plurals name="deleted">
-    <item quantity="other">%d 首曲目已删除。</item>
-  </plurals>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <string name="delete_file_failed">删除 %s 失败。</string>
   <string name="deleted_item">“%s”已删除。</string>
   <string name="delete_item">删除“%s”？</string>
diff --git a/app/src/main/res/values-zh-rTW/translatable.xml b/app/src/main/res/values-zh-rTW/translatable.xml
index 63c6270a..bf07ac56 100644
--- a/app/src/main/res/values-zh-rTW/translatable.xml
+++ b/app/src/main/res/values-zh-rTW/translatable.xml
@@ -57,6 +57,15 @@
   <string name="open">開啟</string>
   <string name="go_home">主目錄</string>
   <string name="jumping_to_song">歌曲已經在佇列，轉移...</string>
+  <!--As a developer, you should always supply "one" and "other"
+		strings. Your translators will know which strings are actually
+		needed for their language. Always include %d in "one" because
+		translators will need to use %d for languages where "one"
+		doesn't mean 1 (as explained above).
+
+		Translators should use http://unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules and
+		http://www.unicode.org/cldr/charts/latest/supplemental/language_plural_rules.html, Type cardinal,
+		to see which categories apply to integer numbers in their languages-->
   <plurals name="playing">
     <item quantity="other">播放歌曲 %d。</item>
   </plurals>