diff --git a/.circleci/config.yml b/.circleci/config.yml
index fac63d0b..810495d9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -109,22 +109,22 @@ jobs:
           command: |
             export PATH="${JAVA_HOME}/bin:${PATH}"
             mkdir -p /tmp/ultrasonic-release
-            ${ANDROID_HOME}/build-tools/30.0.0/zipalign -v 4 ultrasonic/build/outputs/apk/release/ultrasonic-release-unsigned.apk /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
-            ${ANDROID_HOME}/build-tools/30.0.0/apksigner sign --verbose --ks ~/ultrasonic/ultrasonic-keystore --ks-pass pass:${ULTRASONIC_KEYSTORE_STOREPASS} --key-pass pass:${ULTRASONIC_KEYSTORE_KEYPASS} /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
-            ${ANDROID_HOME}/build-tools/30.0.0/apksigner verify --verbose /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
+            ${ANDROID_HOME}/build-tools/32.0.0/zipalign -v 4 ultrasonic/build/outputs/apk/release/ultrasonic-release-unsigned.apk /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
+            ${ANDROID_HOME}/build-tools/32.0.0/apksigner sign --verbose --ks ~/ultrasonic/ultrasonic-keystore --ks-pass pass:${ULTRASONIC_KEYSTORE_STOREPASS} --key-pass pass:${ULTRASONIC_KEYSTORE_KEYPASS} /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
+            ${ANDROID_HOME}/build-tools/32.0.0/apksigner verify --verbose /tmp/ultrasonic-release/ultrasonic-${CIRCLE_TAG}.apk
       - persist_to_workspace:
           root: /tmp/ultrasonic-release
           paths:
             - ultrasonic-*.apk*
   publish_github_signed_apk:
     docker:
-      - image: cimg/golang
+      - image: cimg/go:1.18
     steps:
       - attach_workspace:
           at: /tmp/ultrasonic-release
       - run:
           name: install ghr
-          command: go get -v github.com/tcnksm/ghr
+          command: go install -v github.com/tcnksm/ghr@latest
       - run:
           name: publish release on github tag
           command: ghr -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} ${CIRCLE_TAG} /tmp/ultrasonic-release
diff --git a/fastlane/metadata/android/en-US/changelogs/103.txt b/fastlane/metadata/android/en-US/changelogs/103.txt
new file mode 100644
index 00000000..a5118cd5
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/103.txt
@@ -0,0 +1,14 @@
+Bug fixes
+- #673: Disabling "Browse Using ID3 Tags" causes artist search result content to mismatch.
+- #679: Keyboard should be hidden when navigating away from Search.
+- #686: In landscape mode, the scroll bar is missing in the about text.
+- #691: TrackCollectionFragment: fix play all button.
+- #698: Track based context menus do not function correctly in most fragments.
+
+Features
+- #669: Option to change language.
+
+Enhancements
+- #654: Update OkHttp.
+- #694: Reword alert for better help.
+- #702: Show Downloads on Play.
diff --git a/fastlane/metadata/android/en-US/changelogs/87.txt b/fastlane/metadata/android/en-US/changelogs/87.txt
deleted file mode 100644
index 02d8a3aa..00000000
--- a/fastlane/metadata/android/en-US/changelogs/87.txt
+++ /dev/null
@@ -1 +0,0 @@
-Refactor and redesign artist list
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/88.txt b/fastlane/metadata/android/en-US/changelogs/88.txt
deleted file mode 100644
index d14070ed..00000000
--- a/fastlane/metadata/android/en-US/changelogs/88.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fall backs to path when comparing tracks and fixes #369
diff --git a/fastlane/metadata/android/en-US/changelogs/89.txt b/fastlane/metadata/android/en-US/changelogs/89.txt
deleted file mode 100644
index 295d18b9..00000000
--- a/fastlane/metadata/android/en-US/changelogs/89.txt
+++ /dev/null
@@ -1 +0,0 @@
-Refactored the application main menu
diff --git a/fastlane/metadata/android/en-US/changelogs/90.txt b/fastlane/metadata/android/en-US/changelogs/90.txt
deleted file mode 100644
index 295d18b9..00000000
--- a/fastlane/metadata/android/en-US/changelogs/90.txt
+++ /dev/null
@@ -1 +0,0 @@
-Refactored the application main menu
diff --git a/fastlane/metadata/android/en-US/changelogs/98.txt b/fastlane/metadata/android/en-US/changelogs/98.txt
index f490f704..e57b310d 100644
--- a/fastlane/metadata/android/en-US/changelogs/98.txt
+++ b/fastlane/metadata/android/en-US/changelogs/98.txt
@@ -9,7 +9,5 @@ Enhancements
 - #568: Rework Downloader.
 - #567: Use semantically correct API endpoint when streaming/downloading.
 - #572: Moved drag handle to the left in the Now Playing list.
-- #585: Added setting to disable Now Playing List sending for incompatible
-  bluetooth devices.
-- #596: Added option whether to create a share on the server when sharing
-  songs.
+- #585: Added setting to disable Now Playing List sending for incompatible bluetooth devices.
+- #596: Added option whether to create a share on the server when sharing songs.
diff --git a/fastlane/metadata/android/es-ES/changelogs/103.txt b/fastlane/metadata/android/es-ES/changelogs/103.txt
new file mode 100644
index 00000000..fdf09f09
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/103.txt
@@ -0,0 +1,14 @@
+Corrección de errores
+- #673: La desactivación de la opción "Examinar mediante etiquetas ID3" hace que el contenido de los resultados de la búsqueda de artistas no coincida.
+- #679: El teclado debería estar oculto cuando se navega fuera de la Búsqueda.
+- #686: En modo apaisado, falta la barra de desplazamiento en el texto de acerca de.
+- #691: TrackCollectionFragment: arreglar el botón de reproducir todo.
+- #698: Los menús contextuales basados en pistas no funcionan correctamente en la mayoría de los fragmentos.
+
+Características
+- #669: Opción de cambio de idioma.
+
+Mejoras
+- #654: Actualización de OkHttp.
+- #694: Reformular la alerta para mejorar la ayuda.
+- #702: Mostrar descargas al reproducir.
diff --git a/fastlane/metadata/android/es-ES/changelogs/87.txt b/fastlane/metadata/android/es-ES/changelogs/87.txt
deleted file mode 100644
index 12e4b660..00000000
--- a/fastlane/metadata/android/es-ES/changelogs/87.txt
+++ /dev/null
@@ -1 +0,0 @@
-Refactorizada y rediseñada la lista de artistas
\ No newline at end of file
diff --git a/fastlane/metadata/android/es-ES/changelogs/88.txt b/fastlane/metadata/android/es-ES/changelogs/88.txt
deleted file mode 100644
index 5fb96891..00000000
--- a/fastlane/metadata/android/es-ES/changelogs/88.txt
+++ /dev/null
@@ -1 +0,0 @@
-Cuando un fichero no tiene etiquetas de número de pista lo ordena por orden alfabético. Además hemos arreglado el bug #369
diff --git a/fastlane/metadata/android/es-ES/changelogs/89.txt b/fastlane/metadata/android/es-ES/changelogs/89.txt
deleted file mode 100644
index 8f7c0e7b..00000000
--- a/fastlane/metadata/android/es-ES/changelogs/89.txt
+++ /dev/null
@@ -1 +0,0 @@
-Refactorizado el menú principal de la aplicación
diff --git a/fastlane/metadata/android/es-ES/changelogs/90.txt b/fastlane/metadata/android/es-ES/changelogs/90.txt
deleted file mode 100644
index 8f7c0e7b..00000000
--- a/fastlane/metadata/android/es-ES/changelogs/90.txt
+++ /dev/null
@@ -1 +0,0 @@
-Refactorizado el menú principal de la aplicación
diff --git a/fastlane/metadata/android/es-ES/changelogs/98.txt b/fastlane/metadata/android/es-ES/changelogs/98.txt
index c53e8d13..9f803cb8 100644
--- a/fastlane/metadata/android/es-ES/changelogs/98.txt
+++ b/fastlane/metadata/android/es-ES/changelogs/98.txt
@@ -1,6 +1,5 @@
 Correción de errores
-- #594: Agregado un intent de PlaybackComplete cuando se completa la
-  reproducción de una canción.
+- #594: Agregado un intent de PlaybackComplete cuando se completa la reproducción de una canción.
 - #593: Corregidas las listas de álbumes.
 - #602: NPE corregido.
 
@@ -8,11 +7,7 @@ Mejoras
 - #558: La llamada a video puede ser estática.
 - #559: Agregado un mejor soporte sin conexión.
 - #568: Se ha reescrito el downloader.
-- #567: Se utiliza el endpoint semánticamente correcto al realizar streaming
-  o descargar.
-- #572: Se ha movido el botón de arrastre de canción hacia la izquierda en
-  la lista de reproducción.
-- #585: Agregada una configuración para deshabilitar el envío de la Lista de
-  reproducción en curso para dispositivos Bluetooth incompatibles.
-- #596: Se agregó la opción de crear un recurso compartido en el servidor al
-  compartir canciones.
+- #567: Se utiliza el endpoint semánticamente correcto al realizar streaming o descargar.
+- #572: Se ha movido el botón de arrastre de canción hacia la izquierda en la lista de reproducción.
+- #585: Agregada una configuración para deshabilitar el envío de la Lista de reproducción en curso para dispositivos Bluetooth incompatibles.
+- #596: Se agregó la opción de crear un recurso compartido en el servidor al compartir canciones.
diff --git a/fastlane/metadata/android/es-ES/changelogs/99.txt b/fastlane/metadata/android/es-ES/changelogs/99.txt
index 08363abc..a187a841 100644
--- a/fastlane/metadata/android/es-ES/changelogs/99.txt
+++ b/fastlane/metadata/android/es-ES/changelogs/99.txt
@@ -2,16 +2,13 @@ Corrección de errores
 - #609: Comportamiento extraño de scrobbling (offset).
 
 Mejoras
-- #599: Se ha movido el selector de servidor y la configuración al menú de
-  navegación.
-- #600: Migración de la utilidad de permisos a Kotlin, aumento del SDK
-  mínimo a 17.
+- #599: Se ha movido el selector de servidor y la configuración al menú de navegación.
+- #600: Migración de la utilidad de permisos a Kotlin, aumento del SDK mínimo a 17.
 - #604: Implementar una vista de Descarga.
 - #613: targetSdkVersion debe ser 30 o superior.
 - #622: Refactorización de eventos.
 - #641: Eliminar el almacenamiento de funciones.
 - #642: Eliminar MergeAdapter y SackOfViewsAdapter.
 - #649: Unificar el manejo del diálogo de error.
-- #652: Manejo de ubicación de caché personalizado actualizado para eliminar
-  isUri.
+- #652: Manejo de ubicación de caché personalizado actualizado para eliminar isUri.
 - #662: Mejorar las migraciones de bases de datos.
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 3cfcdeb6..95196a9c 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         applicationId "org.moire.ultrasonic"
-        versionCode 102
-        versionName "3.1.1"
+        versionCode 103
+        versionName "3.2.0"
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml
index 3c92e9e2..2a8c3889 100644
--- a/ultrasonic/src/main/res/values-cs/strings.xml
+++ b/ultrasonic/src/main/res/values-cs/strings.xml
@@ -119,7 +119,6 @@
     <string name="search.songs">Skladby</string>
     <string name="search.title">Hledat</string>
     <string name="select_album.empty">Média nenalezena</string>
-    <string name="select_album.no_network">Varování: Připojení nedostupné.</string>
     <string name="select_album.no_sdcard">Chyba: SD karta nedostupná.</string>
     <string name="select_album.play_all">Přehrát vše</string>
     <string name="select_artist.all_folders">Všechny adresáře</string>
@@ -181,7 +180,8 @@
     <string name="settings.disc_sort">Řadit skladby podle čísla CD</string>
     <string name="settings.disc_sort_summary">Řadit seznam skladeb dle čísla CD a čísla skladby</string>
     <string name="settings.display_bitrate_summary">Připojovat jméno umělce, bitrate a příponu souboru</string>
-    <string name="settings.download_transition_summary">Při spuštění přehrávání přepnout na aktivitu stahování</string>
+    <string name="settings.gapless_playback">Přehrávání bez pauz</string>
+    <string name="settings.gapless_playback_summary">Zapnout přehrávání bez pauz</string>
     <string name="settings.hide_media_summary">Skrýt hudební soubory před ostatními aplikacemi.</string>
     <string name="settings.hide_media_title">Skrýt před ostatními</string>
     <string name="settings.hide_media_toast">Nabyde účinnosti při příštím skenování hudby systému Android.</string>
@@ -241,10 +241,10 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Historie hledání vyčištěna</string>
     <string name="settings.search_title">Nastavení vyhledávání</string>
-    <string name="settings.send_bluetooth_album_art_summary">Odesílat obrázky alb přes bluetooth (může způsobit selhávání bluetooth upozornění)</string>
-    <string name="settings.send_bluetooth_album_art">Obrázky alb přes bluetooth</string>
     <string name="settings.send_bluetooth_notification_summary">Odesílat upozornění přehrávání přes bluetooth</string>
     <string name="settings.send_bluetooth_notification">Odesílat bluetooth upozornění</string>
+    <string name="settings.send_bluetooth_album_art_summary">Odesílat obrázky alb přes bluetooth (může způsobit selhávání bluetooth upozornění)</string>
+    <string name="settings.send_bluetooth_album_art">Obrázky alb přes bluetooth</string>
     <string name="settings.server_manage_servers">Spravovat servery</string>
     <string name="settings.server_address">Adresa serveru</string>
     <string name="settings.server_name">Název</string>
@@ -271,8 +271,6 @@
     <string name="settings.theme_title">Vzhled</string>
     <string name="settings.title.allow_self_signed_certificate">Povolit HTTPS certifikáty podepsané samé sebou</string>
     <string name="settings.title.enable_ldap_users_support">Vynutit ověření nešifrovaným heslem</string>
-    <string name="settings.summary.enable_ldap_users_support">Toto vynutí zaslání hesla v nešifrované podobě.
-Šikovné pokud Subsonic server nepodporuje nové API ověřování uživatel.</string>
     <string name="settings.use_folder_for_album_artist">Jména adresářů jako jména umělců</string>
     <string name="settings.use_folder_for_album_artist_summary">Očekává jména hlavních adresářů obsahující jména umělců</string>
     <string name="settings.use_id3">Procházet za použití ID3 tagů</string>
@@ -363,9 +361,6 @@
     <string name="api.subsonic.upgrade_client">Nekompatibilní verze. Aktualizujte prosím Ultrasonic Android aplikaci.</string>
     <string name="api.subsonic.upgrade_server">Nekompatibilní verze. Aktualizujte prosím Subsonic server.</string>
 
+    <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Používat pět hvězdiček pro hodnocení skladeb</string>
-    <string name="settings.five_star_rating_description">Používat pět hvězdiček pro hodnocení skladeb
-        namísto jednoduchého jednohvězdičkového hodnocení.
-    </string>
-
-</resources>
+    </resources>
diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml
index dff7a6f8..03e25e43 100644
--- a/ultrasonic/src/main/res/values-de/strings.xml
+++ b/ultrasonic/src/main/res/values-de/strings.xml
@@ -50,12 +50,14 @@
     <string name="common.play_shuffled">Zufällig spielen</string>
     <string name="common.public">Öffentlich</string>
     <string name="common.save">Speichern</string>
+    <string name="common.select_all">Alle auswählen</string>
     <string name="common.title">Titel</string>
     <string name="common.unpin">Lösen</string>
     <string name="common.various_artists">Mehrere Künstler*innen</string>
     <string name="delete_playlist">Möchtest du %1$s löschen</string>
     <string name="download.bookmark_removed" formatted="false">Lesezeichen entfernt</string>
     <string name="download.bookmark_set_at_position" formatted="false">Lesezeichen gesetzt als %s.</string>
+    <string name="download.empty">Es wird nichts heruntergeladen</string>
     <string name="playlist.empty">Wiedergabeliste ist leer</string>
     <string name="download.jukebox_not_authorized">Fernbedienung ist nicht erlaubt. Bitte Jukebox Modus auf dem Subsonic Server in <b>Benutzer > Einstellungen</b> aktivieren.</string>
     <string name="download.jukebox_off">Fernbedienung ausgeschaltet. Musik wird auf dem Telefon wiedergegeben.</string>
@@ -92,6 +94,21 @@
     <string name="error.label">Fehler</string>
     <string name="jukebox.is_default">Jukebox als Standard</string>
     <string name="lyrics.nomatch">Keine Liedtexte gefunden</string>
+    <string name="language.default">System Default</string>
+    <string name="language.zh_CN">Chinesisch (China)</string>
+    <string name="language.zh_TW">Chinesisch (Taiwan)</string>
+    <string name="language.cs">Tschechisch</string>
+    <string name="language.nl">Niederländisch</string>
+    <string name="language.en">Englisch</string>
+    <string name="language.fr">Französisch</string>
+    <string name="language.de">Deutsch</string>
+    <string name="language.hu">Ungarisch</string>
+    <string name="language.it">Italienisch</string>
+    <string name="language.es">Spanisch</string>
+    <string name="language.pl">Polnisch</string>
+    <string name="language.pt">Portugiesisch</string>
+    <string name="language.pt_BR">Portugiesisch (Brasilianisch)</string>
+    <string name="language.ru">Russisch</string>
     <string name="main.albums_alphaByArtist">Nach Künstler*in</string>
     <string name="main.albums_alphaByName">Nach Namen</string>
     <string name="main.albums_frequent">Am häufigsten gespielt</string>
@@ -110,17 +127,24 @@
     <string name="main.songs_starred">Mit Stern</string>
     <string name="main.songs_title">Titel</string>
     <string name="main.videos">Filme</string>
-    <string name="main.welcome_title">Willkommen</string>
+    <string name="main.welcome_text_demo">Um Ultrasonic mit Deiner eigenen Musik zu verwenden, benötigst Du einen <b>eigenen Server</b>. \n\n➤ Wenn Du die App erst einmal testen möchtest, kann jetzt ein Demo Server hinzugefügt werden. \n\n➤ Sonst kannst Du Deinen Server in den <b>Einstellungen</b> konfigurieren.</string>
+    <string name="main.welcome_title">Willkommen zu Ultrasonic!</string>
+    <string name="main.welcome_cancel">Zu den Einstellungen</string>
     <string name="menu.about">Über</string>
     <string name="menu.common">Allgemein</string>
     <string name="menu.deleted_playlist">Wiedergabeliste %s gelöscht</string>
     <string name="menu.deleted_playlist_error">Löschen der Wiedergabeliste %s ist fehlgeschlagen</string>
     <string name="menu.downloads">Downloads</string>
-    <string name="menu.exit">Ende</string>
+    <string name="menu.exit">Beenden</string>
+    <string name="menu.navigation">Navigation</string>
     <string name="menu.settings">Einstellungen</string>
     <string name="menu.refresh">Aktualisierung</string>
     <string name="music_library.label">Medienbibliothek</string>
     <string name="music_library.label_offline">Offline Medien</string>
+    <string name="music_service.retry">Netzwerkfehler. Neuer Versuch %1$d von %2$d.</string>
+    <string name="parser.artist_count">%d Künstler*innen gefunden</string>
+    <string name="parser.reading">Lese vom Server.</string>
+    <string name="parser.reading_done">Lese vom Server. Fertig!</string>
     <string name="playlist.label">Wiedergabelisten</string>
     <string name="playlist.update_info">Aktualisierungs-Informationen</string>
     <string name="playlist.updated_info">Wiedergabeliste für %s aktualisiert</string>
@@ -133,7 +157,8 @@
     <string name="search.songs">Titel</string>
     <string name="search.title">Suche</string>
     <string name="select_album.empty">Keine Medien gefunden</string>
-    <string name="select_album.no_network">Warnung: kein Netz.</string>
+    <string name="select_album.n_selected">%d Titel ausgewählt</string>
+    <string name="select_album.no_network">Warnung: Kein verwendbares Netz verfügbar.\nWenn Mobile Daten verwendet werden sollen, müssen Downloads in den Einstellungen der jeweiligen Verbindung erlaubt sein.</string>
     <string name="select_album.no_sdcard">Fehler: Keine SD Karte verfügbar.</string>
     <string name="select_album.play_all">Alles wiedergeben</string>
     <string name="select_artist.all_folders">Alle Ordner</string>
@@ -154,8 +179,9 @@
     <string name="settings.buffer_length_5">5 Sekunden</string>
     <string name="settings.buffer_length_60">1 Minute</string>
     <string name="settings.buffer_length_8">8 Sekunden</string>
+    <string name="settings.custom_cache_location">Verwende eigenen Cache Ort</string>
     <string name="settings.cache_location">Ort des Caches</string>
-    <string name="settings.cache_location_error">Ungültiger Ort des Caches, nutze Standard.</string>
+    <string name="settings.cache_location_error">Ungültiger Ort des Caches. Verwende Standard.</string>
     <string name="settings.cache_size">Größe des Caches</string>
     <string name="settings.cache_size_100">100 MB</string>
     <string name="settings.cache_size_1000">1 GB</string>
@@ -181,9 +207,9 @@
     <string name="settings.clear_bookmark_summary">Lesezeichen nach Wiedergabe löschen</string>
     <string name="settings.clear_search_history">Suchverlauf löschen</string>
     <string name="settings.connection_failure">Verbindungsfehler</string>
-    <string name="settings.default_albums">Standard Alben</string>
-    <string name="settings.default_artists">Standard Interpreten</string>
-    <string name="settings.default_songs">Standard Titel</string>
+    <string name="settings.default_albums">Anzahl der Alben</string>
+    <string name="settings.default_artists">Anzahl der Künstler*innen</string>
+    <string name="settings.default_songs">Anzahl der Titel</string>
     <string name="settings.directory_cache_time">Cache-Zeit für Verzeichnisse</string>
     <string name="settings.directory_cache_time_0">Deaktiviert</string>
     <string name="settings.directory_cache_time_1">1 Minute</string>
@@ -196,14 +222,18 @@
     <string name="settings.disc_sort_summary">Sortierung der Titelliste nach CD-Nummer und Titelnummer</string>
     <string name="settings.display_bitrate">Bitrate und Dateiendung anzeigen</string>
     <string name="settings.display_bitrate_summary">Bitrate und Dateityp hinter der Künstler*in anzeigen</string>
-    <string name="settings.download_transition_summary">Herunterladen zusammen mit der Wiedergabe starten.</string>
+    <string name="settings.download_transition">Zeige Aktuelle Wiedergabe bei Play</string>
+    <string name="settings.download_transition_summary">Zeige Aktuelle Wiedergabe nach dem Start der Wiedergabe in der Medienansicht</string>
+    <string name="settings.gapless_playback">Lückenlose Wiedergabe</string>
+    <string name="settings.gapless_playback_summary">Lückenlose Wiedergabe aktivieren</string>
     <string name="settings.hide_media_summary">Musikdateien vor anderen Apps verbergen</string>
     <string name="settings.hide_media_title">Vor anderen verbergen</string>
     <string name="settings.hide_media_toast">Wird beim nächsten Durchsuchen nach Musik durch Android wirksam.</string>
     <string name="settings.increment_time">Sprunglänge</string>
     <string name="settings.invalid_url">Bitte eine gültige URL angeben.</string>
-    <string name="settings.max_albums">Maximale Alben</string>
-    <string name="settings.max_artists">Max Interpeten</string>
+    <string name="settings.invalid_username">Bitte einen gültigen Benutzernamen eingeben (ohne führende Leerzeichen).</string>
+    <string name="settings.max_albums">Max. Anzahl der Alben</string>
+    <string name="settings.max_artists">Max. Anzahl der Künstler*innen</string>
     <string name="settings.max_bitrate_112">112 Kbps</string>
     <string name="settings.max_bitrate_128">128 Kbps</string>
     <string name="settings.max_bitrate_160">160 Kbps</string>
@@ -214,10 +244,10 @@
     <string name="settings.max_bitrate_64">64 Kbps</string>
     <string name="settings.max_bitrate_80">80 Kbps</string>
     <string name="settings.max_bitrate_96">96 Kbps</string>
-    <string name="settings.max_bitrate_mobile">Max Bitrate - Mobil</string>
+    <string name="settings.max_bitrate_mobile">Max. Bitrate - Mobil</string>
     <string name="settings.max_bitrate_unlimited">Unbegrenzt</string>
-    <string name="settings.max_bitrate_wifi">Max Bitrate - WLAN</string>
-    <string name="settings.max_songs">Maximale Titel</string>
+    <string name="settings.max_bitrate_wifi">Max. Bitrate - WLAN</string>
+    <string name="settings.max_songs">Max. Anzahl der Titel</string>
     <string name="settings.media_button_summary">Auf Telefon, Headset und Bluetooth-Media-Tasten reagieren</string>
     <string name="settings.media_button_title">Medien Tasten</string>
     <string name="settings.network_timeout">Netzwerk Zeitüberschreitung</string>
@@ -232,6 +262,8 @@
     <string name="settings.notifications_title">Benachrichtigungen</string>
     <string name="settings.network_title">Netzwerk</string>
     <string name="settings.other_title">Andere Einstellungen</string>
+    <string name="settings.override_language">Sprache ändern</string>
+    <string name="settings.override_language_summary">Nach dem Ändern der Sprache muss die App muss neu startet werden</string>
     <string name="settings.playback_control_title">Wiedergabe Einstellungen</string>
     <string name="settings.preload">Im Voraus zu ladende Titel</string>
     <string name="settings.preload_1">1 Titel</string>
@@ -240,6 +272,9 @@
     <string name="settings.preload_3">3 Titel</string>
     <string name="settings.preload_5">5 Titel</string>
     <string name="settings.preload_unlimited">Unbegrenzt</string>
+    <string name="settings.playback.resume_play_on_headphones_plug.title">Fortsetzen mit Kopfhörer</string>
+    <string name="settings.playback.resume_play_on_headphones_plug.summary">Die App setzt eine pausierte Wiedergabe beim Anschließen der Kopfhörer fort.</string>
+    <string name="settings.scrobble_summary">Benutzername und Passwort des Scrobble Service(s) müssen im Server gesetzt sein</string>
     <string name="settings.scrobble_title">Gespielte Musik scrobbeln</string>
     <string name="settings.search_1">1</string>
     <string name="settings.search_10">10</string>
@@ -255,19 +290,22 @@
     <string name="settings.search_50">50</string>
     <string name="settings.search_500">500</string>
     <string name="settings.search_75">75</string>
-    <string name="settings.search_history_cleared">Search history cleared</string>
+    <string name="settings.search_history_cleared">Suchhistorie gelöscht</string>
     <string name="settings.search_title">Sucheinstellungen</string>
-    <string name="settings.send_bluetooth_album_art_summary">Albumcover über Bluetooth versenden (kann dazu führen, dass Bluetooth-Benachrichtigungen fehlschlagen)</string>
-    <string name="settings.send_bluetooth_album_art">Album Cover über Bluetooth</string>
     <string name="settings.send_bluetooth_notification_summary">Wiedergabe-Benachrichtigungen über Bluetooth senden</string>
     <string name="settings.send_bluetooth_notification">Bluetooth-Benachrichtigung</string>
-    <string name="settings.server_manage_servers">Manage Servers</string>
+    <string name="settings.send_bluetooth_album_art_summary">Albumcover über Bluetooth versenden (kann dazu führen, dass Bluetooth-Benachrichtigungen fehlschlagen)</string>
+    <string name="settings.send_bluetooth_album_art">Album Cover über Bluetooth</string>
+    <string name="settings.disable_send_now_playing_list_summary">Die aktuellen Wiedergabeliste wird nicht an verbundene Geräte gesendet. Das kann die Kompatibilität mit AVRCP 1.3 Geräten herstellen, wenn die aktuelle Titelanzeige nicht dargestellt wird</string>
+    <string name="settings.disable_send_now_playing_list">Deaktiviere senden der aktuellen Wiedergabeliste</string>
+    <string name="settings.server_manage_servers">Server verwalten</string>
     <string name="settings.server_address">Server Adresse</string>
     <string name="settings.server_name">Name</string>
     <string name="settings.server_password">Kennwort</string>
     <string name="settings.server_scaling_summary">Skalierte Cover vom Server laden (spart Bandbreite)</string>
     <string name="settings.server_scaling_title">Serverseitige Skalierung der Cover</string>
     <string name="settings.server_username">Benutzername</string>
+    <string name="settings.server_color">Server Farbe</string>
     <string name="settings.show_lockscreen_controls">Steuerelemente auf Sperrbildschirm</string>
     <string name="settings.show_lockscreen_controls_summary">Wiedergabeelemente auf dem Sperrbildschirm anzeigen</string>
     <string name="settings.show_notification">Benachrichtigungen anzeigen</string>
@@ -280,18 +318,22 @@
     <string name="settings.show_track_number_summary">Titel mit Nummer anzeigen</string>
     <string name="settings.test_connection_title">Verbindung testen</string>
     <string name="settings.testing_ok">Verbindung OK</string>
-    <string name="settings.testing_unlicensed">Verbindung OK, Server nicht lizensiert.</string>
+    <string name="settings.testing_unlicensed">Verbindung OK, Server nicht lizenziert.</string>
     <string name="settings.theme_light">Hell</string>
     <string name="settings.theme_dark">Dunkel</string>
     <string name="settings.theme_black">Schwarz</string>
     <string name="settings.theme_title">Thema</string>
     <string name="settings.title.allow_self_signed_certificate">Selbst-signierte HTTPS Zertifikate erlauben</string>
     <string name="settings.title.enable_ldap_users_support">LDAP Benutzeranmeldung aktivieren</string>
-    <string name="settings.summary.enable_ldap_users_support">Dies zwingt die App, das Kennwort immer auf die alte Weise zu senden, da Subsonic api keine neue Autorisierung für LDAP-Benutzer unterstützt.</string>
-    <string name="settings.use_folder_for_album_artist">Nutze Ordner für Interpretennamen</string>
-    <string name="settings.use_folder_for_album_artist_summary">Annehmen, dass der Ordner der obersten Ebene der Name der Interpreten ist</string>
+    <string name="settings.summary.enable_ldap_users_support">Dies zwingt die App, das Kennwort immer unverschlüsselt zu senden. Hilfreich wenn der Subsonic Server keine Autorisierungs-API unterstützt.</string>
+    <string name="settings.use_folder_for_album_artist">Nutze den Ordnernamen als Namen der Künstler*in</string>
+    <string name="settings.use_folder_for_album_artist_summary">Annehmen, dass der Ordner nach der Künstler*in benannt ist.</string>
+    <string name="settings.show_now_playing_details_summary">Zeige mehr Song Details in der Wiedergabe (Genre, Jahr, Bitrate)</string>
+    <string name="settings.show_now_playing_details">Zeige Details in der Wiedergabe</string>
     <string name="settings.use_id3">Durchsuchen von ID3-Tags</string>
     <string name="settings.use_id3_summary">Nutze ID3 Tag Methode anstatt Dateisystem-Methode</string>
+    <string name="settings.show_artist_picture">Zeige Bilder in der Liste der Künstler*innen an.</string>
+    <string name="settings.show_artist_picture_summary">Wenn Künstler*innen Bilder zugeordnet sind werden diese in der Liste angezeigt</string>
     <string name="main.video" tools:ignore="UnusedResources">Film</string>
     <string name="settings.wifi_required_summary">Medien nur über gebührenfreie Verbindungen herunterladen</string>
     <string name="settings.wifi_required_title">Nur über WLAN herunterladen</string>
@@ -307,6 +349,7 @@
     <string name="widget.sdcard_missing">Keine SD Karte</string>
     <string name="settings.share_description_default">Standard Beschreibung einer Freigabe</string>
     <string name="settings.sharing_title">Freigaben</string>
+    <string name="settings.sharing_always_ask_for_details_summary">Immer nach einer Beschreibung und einem Ablaufdatum fragen, wenn eine neue Freigabe auf dem Server angelegt wird</string>
     <string name="settings.sharing_always_ask_for_details">Immer nach Details fragen</string>
     <string name="settings.share_expiration_default">Standard Ablaufzeit</string>
     <string name="do_not_show_dialog_again">Dialog nicht wieder anzeigen</string>
@@ -340,24 +383,73 @@
     <string name="share_default_greeting">Hör dir mal die Musik an, die ich mit dir über %s geteilt habe.</string>
     <string name="share_via">Titel teilen über</string>
     <string name="menu.share">Freigabe</string>
-    <string name="download.menu_show_artist">Künstler*in zeigen</string>
+    <string name="download.menu_show_artist">Künstler*in anzeigen</string>
     <string name="albumArt">Album Cover</string>
     <string name="common_multiple_years">Mehrere Jahre</string>
+    <string name="settings.playback.resume_on_bluetooth_device">Wiedergabe fortsetzen, wenn ein Bluetooth Gerät verbunden wurde</string>
+    <string name="settings.playback.pause_on_bluetooth_device">Wiedergabe pausieren, wenn ein Bluetooth Gerät getrennt wurde</string>
+    <string name="settings.playback.bluetooth_all">Alle Bluetooth Geräte</string>
+    <string name="settings.playback.bluetooth_a2dp">Nur Audio (A2DP) Geräte</string>
+    <string name="settings.playback.bluetooth_disabled">Deaktiviert</string>
+    <string name="settings.playback.single_button_bluetooth_device">Bluetooth Gerät mit einer Play/Pause Taste</string>
+    <string name="settings.playback.single_button_bluetooth_device_summary">Dies kann bei älteren Bluetooth Geräten helfen, wenn Play/Pause nicht richtig funktioniert</string>
+    <string name="settings.debug.title">Debug Optionen</string>
+    <string name="settings.debug.log_to_file">Schreibe Debug Log in Datei</string>
+    <string name="settings.debug.log_path">Die Log Dateien sind unter %1$s/%2$s verfügbar</string>
+    <string name="settings.debug.log_summary">%1$s Log Dateien im Verzeichnis %3$s benötigen ~%2$s MB Speicherplatz. Möchtest Du die Dateien behalten?</string>
     <string name="settings.debug.log_keep">Dateien behalten</string>
     <string name="settings.debug.log_delete">Dateien löschen</string>
     <string name="settings.debug.log_deleted">Logeinträge gelöscht</string>
-    <string name="server_selector.label">Configured servers</string>
-    <string name="server_selector.delete_confirmation">Are you sure you want to delete the server?</string>
-    <string name="server_editor.label">Editing server</string>
+    <string name="notification.downloading_title">Lade Medien im Hintergrund runter…</string>
+
+    <string name="server_selector.label">Konfigurierte Server</string>
+    <string name="server_selector.delete_confirmation">Bist Du sicher, dass Du den Server löschen möchtest?</string>
+    <string name="server_editor.label">Server bearbeiten</string>
     <string name="server_editor.new_label">Server hinzufügen</string>
-    <string name="server_editor.leave_confirmation">Are you sure you want to leave and lose your changes?</string>
-    <string name="server_editor.required">This field is required</string>
-    <string name="server_menu.edit">Edit</string>
+    <string name="server_editor.leave_confirmation">Beim Verlassen gehen die Änderungen verloren. Sicher?</string>
+    <string name="server_editor.required">Dieses Feld wird benötigt</string>
+    <string name="server_menu.edit">Bearbeiten</string>
     <string name="server_menu.delete">Löschen</string>
-    <string name="server_menu.move_up">Move up</string>
-    <string name="server_menu.move_down">Move down</string>
-    <string name="server_editor.authentication">Authentication</string>
-    <string name="server_editor.advanced">Advanced settings</string>
+    <string name="server_menu.move_up">Hochschieben</string>
+    <string name="server_menu.move_down">Herunterschieben</string>
+    <string name="server_editor.authentication">Authentifizierung</string>
+    <string name="server_editor.advanced">Erweiterte Einstellungen</string>
+    <string name="server_editor.disabled_feature">Einer oder mehrere Funktionen wurden deaktiviert, da der Server diese nicht unterstützt.\nDu kannst diesen Test jederzeit nochmals ausführen.</string>
+    <string name="server_menu.demo">Demo Server</string>
+
+    <plurals name="select_album_n_songs">
+        <item quantity="one">%d Titel</item>
+        <item quantity="other">%d Titel</item>
+    </plurals>
+    <plurals name="select_album_n_songs_pinned">
+        <item quantity="one">%d Titel zum anheften ausgewählt</item>
+        <item quantity="other">%d Titel zum anheften ausgewählt</item>
+    </plurals>
+    <plurals name="select_album_n_songs_downloaded">
+        <item quantity="one">%d Titel zum herunterladen ausgewählt</item>
+        <item quantity="other">%d Titel zum herunterladen ausgewählt</item>
+    </plurals>
+    <plurals name="select_album_n_songs_unpinned">
+        <item quantity="one">%d Titel losgelöst</item>
+        <item quantity="other">%d Titel losgelöst</item>
+    </plurals>
+    <plurals name="select_album_n_songs_deleted">
+        <item quantity="one">%d Titel gelöscht</item>
+        <item quantity="other">%d Titel gelöscht</item>
+    </plurals>
+    <plurals name="select_album_n_songs_added">
+        <item quantity="one">%d Titel am Ende hinzugefügt</item>
+        <item quantity="other">%d Titel am Ende hinzugefügt</item>
+    </plurals>
+    <plurals name="select_album_n_songs_play_next">
+        <item quantity="one">%d Titel nach aktuellen Titel hinzugefügt</item>
+        <item quantity="other">%d Titel nach aktuellen Titel hinzugefügt</item>
+    </plurals>
+    <plurals name="select_album_donate_dialog_n_trial_days_left">
+        <item quantity="one">%d Tag Testphase übrig</item>
+        <item quantity="other">%d Tage Testphase übrig</item>
+    </plurals>
+
     <!-- Subsonic api errors -->
     <string name="api.subsonic.generic">Allgemeiner API Fehler: %1$s</string>
     <string name="api.subsonic.generic.no.message">Keine Nachricht vom Server erhalten</string>
@@ -368,10 +460,10 @@
     <string name="api.subsonic.requested_data_was_not_found">Angeforderte Daten nicht gefunden.</string>
     <string name="api.subsonic.trial_period_is_over">Der Testzeitraum ist abgelaufen.</string>
     <string name="api.subsonic.upgrade_client">Inkompatible Versionen. Bitte die Ultrasonic App aktualisieren.</string>
-    <string name="api.subsonic.upgrade_server">Inkompatible Versionen. Bitte den subsonic Server aktualisieren.</string>
+    <string name="api.subsonic.upgrade_server">Inkompatible Versionen. Bitte den Subsonic Server aktualisieren.</string>
 
     <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Fünf-Stern Bewertung</string>
-    <string name="settings.five_star_rating_description">Benutze Bewertungssystem mit fünf Sternen anstatt Lieder mit bloß einem Stern zu markieren.</string>
+    <string name="settings.five_star_rating_description">Benutze Bewertungssystem mit fünf Sternen, anstatt Lieder mit nur mit einem Stern zu markieren.</string>
 
 </resources>
diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml
index 93ee8768..f2f44fc8 100644
--- a/ultrasonic/src/main/res/values-es/strings.xml
+++ b/ultrasonic/src/main/res/values-es/strings.xml
@@ -94,6 +94,21 @@
     <string name="error.label">Error</string>
     <string name="jukebox.is_default">Jukebox por defecto</string>
     <string name="lyrics.nomatch">No se encontraron letras</string>
+    <string name="language.default">Predeterminado del sistema</string>
+    <string name="language.zh_CN">Chino (China)</string>
+    <string name="language.zh_TW">Chino (Taiwan)</string>
+    <string name="language.cs">Checo</string>
+    <string name="language.nl">Holandés</string>
+    <string name="language.en">Inglés</string>
+    <string name="language.fr">Francés</string>
+    <string name="language.de">Alemán</string>
+    <string name="language.hu">Húngaro</string>
+    <string name="language.it">Italiano</string>
+    <string name="language.es">Español</string>
+    <string name="language.pl">Polaco</string>
+    <string name="language.pt">Portugués</string>
+    <string name="language.pt_BR">Portugués (Brasil)</string>
+    <string name="language.ru">Ruso</string>
     <string name="main.albums_alphaByArtist">Por artista</string>
     <string name="main.albums_alphaByName">Por nombre</string>
     <string name="main.albums_frequent">Mas reproducidas</string>
@@ -138,7 +153,7 @@
     <string name="search.title">Buscar</string>
     <string name="select_album.empty">No se han encontrado medios</string>
     <string name="select_album.n_selected">%d pista(s) seleccionada(s).</string>
-    <string name="select_album.no_network">Atención: No hay red disponible.</string>
+    <string name="select_album.no_network">Atención: No hay ninguna red utilizable disponible.\n Si estás utilizando datos móviles, es posible que tengas que permitir las descargas en conexiones con tarificación o en itinerancia en los ajustes.</string>
     <string name="select_album.no_sdcard">Error: No hay tarjeta SD disponible.</string>
     <string name="select_album.play_all">Reproducir todo</string>
     <string name="select_artist.all_folders">Todas las carpetas</string>
@@ -202,8 +217,10 @@
     <string name="settings.disc_sort_summary">Ordena las canciones por el número de disco y el número de pista</string>
     <string name="settings.display_bitrate">Mostrar tasa de bits y la extensión del archivo</string>
     <string name="settings.display_bitrate_summary">Añadir el nombre del artista con la tasa de bits y la extensión del archivo</string>
-    <string name="settings.download_transition">Mostrar descargas en reproducción</string>
-    <string name="settings.download_transition_summary">Mostrar la actividad de descarga cuando comienza la reproducción</string>
+    <string name="settings.download_transition">Mostrar reproduciendo ahora al reproducir</string>
+    <string name="settings.download_transition_summary">Cambiar a reproduciendo ahora después de iniciar la reproducción en la vista multimedia</string>
+    <string name="settings.gapless_playback">Reproducción sin pausas</string>
+    <string name="settings.gapless_playback_summary">Activa la reproducción sin pausas</string>
     <string name="settings.hide_media_summary">Oculta los archivos de música desde otras aplicaciones.</string>
     <string name="settings.hide_media_title">Ocultar desde otras</string>
     <string name="settings.hide_media_toast">Tiene efecto la próxima vez que Android escanee la música de tu dispositivo.</string>
@@ -239,6 +256,8 @@
     <string name="settings.notifications_title">Notificaciones</string>
     <string name="settings.network_title">Red</string>
     <string name="settings.other_title">Otra configuración</string>
+    <string name="settings.override_language">Cambiar el idioma</string>
+    <string name="settings.override_language_summary">Es necesario reiniciar la aplicación después de cambiar el idioma</string>
     <string name="settings.playback_control_title">Configuración del control de reproducción</string>
     <string name="settings.preload">Canciones a precargar</string>
     <string name="settings.preload_1">1 canción</string>
@@ -265,12 +284,12 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Se ha limpiado el historial de búsqueda</string>
     <string name="settings.search_title">Configuración de la búsqueda</string>
+    <string name="settings.send_bluetooth_notification_summary">Enviar notificaciones de reproducción vía Bluetooth</string>
+    <string name="settings.send_bluetooth_notification">Enviar notificaciones Bluetooth</string>
     <string name="settings.send_bluetooth_album_art_summary">Enviar la carátula del álbum vía Bluetooth (Puede causar que las notificaciones Bluetooth fallen)</string>
     <string name="settings.send_bluetooth_album_art">Carátula del Álbum vía Bluetooth</string>
     <string name="settings.disable_send_now_playing_list_summary">La lista de reproducción actual no se enviará a los dispositivos conectados. Esto puede restaurar la compatibilidad con dispositivos AVRCP 1.3, cuando la visualización de la pista actual no se actualiza</string>
     <string name="settings.disable_send_now_playing_list">Desactivar el envío de la lista de reproducción actual</string>
-    <string name="settings.send_bluetooth_notification_summary">Enviar notificaciones de reproducción vía Bluetooth</string>
-    <string name="settings.send_bluetooth_notification">Enviar notificaciones Bluetooth</string>
     <string name="settings.server_manage_servers">Administrar servidores</string>
     <string name="settings.server_address">Dirección del servidor</string>
     <string name="settings.server_name">Nombre</string>
@@ -298,10 +317,11 @@
     <string name="settings.theme_title">Tema</string>
     <string name="settings.title.allow_self_signed_certificate">Permir certificado HTTPS autofirmado</string>
     <string name="settings.title.enable_ldap_users_support">Forzar autenticación de contraseña plana</string>
-    <string name="settings.summary.enable_ldap_users_support">Esto obliga a la aplicación a enviar siempre la contraseña sin cifrar.
-        Útil si el servidor Subsonic no admite la nueva API de autenticación para los usuarios.</string>
+    <string name="settings.summary.enable_ldap_users_support">Esto obliga a la aplicación a enviar siempre la contraseña sin cifrar. Útil si el servidor Subsonic no admite la nueva API de autenticación para los usuarios.</string>
     <string name="settings.use_folder_for_album_artist">Usar carpetas para el nombre del artista</string>
     <string name="settings.use_folder_for_album_artist_summary">Se asume que la carpeta en el nivel mal alto es el nombre del artista del álbum</string>
+    <string name="settings.show_now_playing_details_summary">Mostrar más detalles de la canción en reproduciendo ahora (género, año, bitrate)</string>
+    <string name="settings.show_now_playing_details">Mostrar detalles en reproduciendo ahora</string>
     <string name="settings.use_id3">Navegar usando las etiquetas ID3</string>
     <string name="settings.use_id3_summary">Usar el método de etiquetas ID3 en lugar del método basado en el sistema de ficheros</string>
     <string name="settings.show_artist_picture">Mostrar la imagen del artista en la lista de artistas</string>
@@ -428,8 +448,6 @@
 
     <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Use cinco estrellas para las canciones</string>
-    <string name="settings.five_star_rating_description">Utilice el sistema de calificación de cinco estrellas para canciones
-         en lugar de simplemente marcar / desmarcar elementos.
-    </string>
+    <string name="settings.five_star_rating_description">Utilice el sistema de calificación de cinco estrellas para canciones en lugar de simplemente marcar / desmarcar elementos.</string>
 
 </resources>
diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml
index 38fd3f38..de7d1611 100644
--- a/ultrasonic/src/main/res/values-fr/strings.xml
+++ b/ultrasonic/src/main/res/values-fr/strings.xml
@@ -23,7 +23,7 @@
     <string name="buttons.next">Suivant</string>
     <string name="buttons.previous">Précédent</string>
     <string name="podcasts.label">Podcast</string>
-    <string name="podcasts_channels.empty">Aucune chaîne de podcast enregistré</string>
+    <string name="podcasts_channels.empty">Aucune chaîne de podcast enregistrée</string>
     <string name="button_bar.podcasts">Podcast</string>
     <string name="button_bar.playlists">Playlists</string>
     <string name="button_bar.search">Recherche</string>
@@ -50,12 +50,14 @@
     <string name="common.play_shuffled">Jouer aléatoirement</string>
     <string name="common.public">Public</string>
     <string name="common.save">Enregistrer</string>
+    <string name="common.select_all">Tout sélectionner</string>
     <string name="common.title">Titre</string>
     <string name="common.unpin">Détacher</string>
     <string name="common.various_artists">Artistes divers</string>
     <string name="delete_playlist">Voulez-vous supprimer %1$s</string>
     <string name="download.bookmark_removed" formatted="false">Signet supprimé.</string>
     <string name="download.bookmark_set_at_position" formatted="false">Signet ajouté à %s.</string>
+    <string name="download.empty">Rien ne se télécharge</string>
     <string name="playlist.empty">La playlist est vide</string>
     <string name="download.jukebox_not_authorized">La télécommande n\'est pas autorisée. Veuillez activer le mode jukebox dans <b>Utilisateurs &gt; Paramètres</b> à partir de votre serveur Subsonic.</string>
     <string name="download.jukebox_off">Mode jukebox désactivé. La musique est jouée sur l\'appareil.</string>
@@ -105,6 +107,8 @@
     <string name="main.genres_title">Genres</string>
     <string name="main.music">Musique</string>
     <string name="main.offline">Hors-ligne</string>
+    <string name="main.setup_server">%s - Configurer le serveur</string>
+    <string name="main.shuffle">Lecture aléatoire</string>
     <string name="main.songs_random">Aléatoire</string>
     <string name="main.songs_starred">Favoris</string>
     <string name="main.songs_title">Titres</string>
@@ -134,7 +138,7 @@
     <string name="search.songs">Titres</string>
     <string name="search.title">Recherche</string>
     <string name="select_album.empty">Aucun titre trouvé</string>
-    <string name="select_album.no_network">Avertissement : Aucun réseau disponible.</string>
+    <string name="select_album.n_selected">%d pistes sélectionnées.</string>
     <string name="select_album.no_sdcard">Erreur : Aucune carte SD disponible.</string>
     <string name="select_album.play_all">Tout jouer</string>
     <string name="select_artist.all_folders">Tous les dossiers</string>
@@ -142,7 +146,7 @@
     <string name="select_genre.empty">Aucun genre trouvé</string>
     <string name="select_playlist.empty">Aucune playlist sur le serveur</string>
     <string name="settings.appearance_title">Apparence</string>
-    <string name="settings.buffer_length">Longueur de la mémoire tampon</string>
+    <string name="settings.buffer_length">Taille de la mémoire tampon</string>
     <string name="settings.buffer_length_0">Désactivé</string>
     <string name="settings.buffer_length_1">1 seconde</string>
     <string name="settings.buffer_length_10">10 secondes</string>
@@ -155,6 +159,7 @@
     <string name="settings.buffer_length_5">5 secondes</string>
     <string name="settings.buffer_length_60">1 minute</string>
     <string name="settings.buffer_length_8">8 secondes</string>
+    <string name="settings.custom_cache_location">Utiliser un emplacement personnalisé pour le cache </string>
     <string name="settings.cache_location">Emplacement du cache</string>
     <string name="settings.cache_location_error">Emplacement du cache invalide. Utilisation du cache par défaut.</string>
     <string name="settings.cache_size">Taille du cache</string>
@@ -181,11 +186,11 @@
     <string name="settings.clear_bookmark">Effacer le signet</string>
     <string name="settings.clear_bookmark_summary">Effacer le signet à la fin de la lecture d\'un titre</string>
     <string name="settings.clear_search_history">Effacer l\'historique des recherches</string>
-    <string name="settings.connection_failure">Connection échouée</string>
+    <string name="settings.connection_failure">Échec de la connexion</string>
     <string name="settings.default_albums">Albums par défaut</string>
     <string name="settings.default_artists">Artistes par défaut</string>
     <string name="settings.default_songs">Musiques par défaut</string>
-    <string name="settings.directory_cache_time">Durée du cache</string>
+    <string name="settings.directory_cache_time">Temps de cache du répertoire</string>
     <string name="settings.directory_cache_time_0">Désactivé</string>
     <string name="settings.directory_cache_time_1">1 minute</string>
     <string name="settings.directory_cache_time_10">10 minutes</string>
@@ -195,10 +200,10 @@
     <string name="settings.directory_cache_time_60">1 hour</string>
     <string name="settings.disc_sort">Trier les titres par disque</string>
     <string name="settings.disc_sort_summary">Trier la liste des titres par numéro de disques/pistes</string>
-    <string name="settings.display_bitrate">Afficher le Bitrate et l’extension de fichier</string>
-    <string name="settings.display_bitrate_summary">Ajouter le nom d\'artiste, bitrate et suffixe du fichier</string>
-    <string name="settings.download_transition">Afficher le téléchargement lors de la lecture</string>
-    <string name="settings.download_transition_summary">Aller vers les téléchargements lorsque qu\'un titre est écouté</string>
+    <string name="settings.display_bitrate">Afficher le débit et l’extension de fichier</string>
+    <string name="settings.display_bitrate_summary">Ajouter le nom d\'artiste, débit et suffixe du fichier</string>
+    <string name="settings.gapless_playback">Lecture sans interruption</string>
+    <string name="settings.gapless_playback_summary">Activer la lecture sans interruption</string>
     <string name="settings.hide_media_summary">Masquer les fichiers musicaux et les couvertures d\'album aux autres applis (Galerie, Musique, etc.)</string>
     <string name="settings.hide_media_title">Masquer aux autres</string>
     <string name="settings.hide_media_toast">Prendra effet la prochaine fois qu\'Android recensera les médias disponibles sur l\'appareil.</string>
@@ -206,16 +211,16 @@
     <string name="settings.invalid_url">Veuillez spécifier une URL valide.</string>
     <string name="settings.max_albums">Albums maximum</string>
     <string name="settings.max_artists">Artistes maximum</string>
-    <string name="settings.max_bitrate_112">112 Kb/s</string>
-    <string name="settings.max_bitrate_128">128 Kb/s</string>
-    <string name="settings.max_bitrate_160">160 Kb/s</string>
-    <string name="settings.max_bitrate_192">192 Kb/s</string>
-    <string name="settings.max_bitrate_256">256 Kb/s</string>
-    <string name="settings.max_bitrate_32">32 Kb/s</string>
-    <string name="settings.max_bitrate_320">320 Kb/s</string>
-    <string name="settings.max_bitrate_64">64 Kb/s</string>
-    <string name="settings.max_bitrate_80">80 Kb/s</string>
-    <string name="settings.max_bitrate_96">96 Kb/s</string>
+    <string name="settings.max_bitrate_112">112 kbit/s</string>
+    <string name="settings.max_bitrate_128">128 kbit/s</string>
+    <string name="settings.max_bitrate_160">160 kbit/s</string>
+    <string name="settings.max_bitrate_192">192 kbit/s</string>
+    <string name="settings.max_bitrate_256">256 kbit/s</string>
+    <string name="settings.max_bitrate_32">32 kbit/s</string>
+    <string name="settings.max_bitrate_320">320 kbit/s</string>
+    <string name="settings.max_bitrate_64">64 kbit/s</string>
+    <string name="settings.max_bitrate_80">80 kbit/s</string>
+    <string name="settings.max_bitrate_96">96 kbit/s</string>
     <string name="settings.max_bitrate_mobile">Débit maximal - Mobile</string>
     <string name="settings.max_bitrate_unlimited">Illimité</string>
     <string name="settings.max_bitrate_wifi">Débit maximal - Wi-Fi</string>
@@ -260,12 +265,12 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Historique des recherches effacé</string>
     <string name="settings.search_title">Paramètres de recherche</string>
+    <string name="settings.send_bluetooth_notification_summary">Envoyer des notifications de lecture via Bluetooth</string>
+    <string name="settings.send_bluetooth_notification">Envoyer une notification Bluetooth</string>
     <string name="settings.send_bluetooth_album_art_summary">Envoyer la pochette de l\'album via Bluetooth (peut causer l\'échec des notifications Bluetooth)</string>
     <string name="settings.send_bluetooth_album_art">Pochette de l\'album via Bluetooth</string>
     <string name="settings.disable_send_now_playing_list_summary">La liste de lecture ne sera pas envoyée aux appareils connectés. Cela peut restaurer la compatibilité avec les appareils AVRCP 1.3 lorsque l’affichage de la piste actuelle n’est pas mise à jour.</string>
     <string name="settings.disable_send_now_playing_list">Désactiver l’envoi de la liste de lecture</string>
-    <string name="settings.send_bluetooth_notification_summary">Envoyer des notifications de lecture via Bluetooth</string>
-    <string name="settings.send_bluetooth_notification">Envoyer une notification Bluetooth</string>
     <string name="settings.server_manage_servers">Gérer les serveurs</string>
     <string name="settings.server_address">Adresse du serveur</string>
     <string name="settings.server_name">Nom</string>
@@ -283,7 +288,7 @@
     <string name="settings.show_now_playing">Montrer la lecture en cours</string>
     <string name="settings.show_now_playing_summary">Afficher les pistes en cours de lecture dans les autres activités d\'Ultrasonic</string>
     <string name="settings.show_track_number">Afficher le numéro du titre</string>
-    <string name="settings.show_track_number_summary">Inclure son numero lors de l\'affichage d\'un titre</string>
+    <string name="settings.show_track_number_summary">Inclure son numéro lors de l\'affichage d\'un titre</string>
     <string name="settings.test_connection_title">Tester la connexion</string>
     <string name="settings.testing_ok">Connexion correcte</string>
     <string name="settings.testing_unlicensed">Connexion correcte. Serveur sans licence.</string>
@@ -293,8 +298,6 @@
     <string name="settings.theme_title">Thème</string>
     <string name="settings.title.allow_self_signed_certificate">Autoriser le certificat HTTPS auto-signé</string>
     <string name="settings.title.enable_ldap_users_support">Activer la prise en charge des utilisateurs LDAP</string>
-    <string name="settings.summary.enable_ldap_users_support">Cela force l\'application à toujours envoyer le mot de passe en clair.
-        Utile si le serveur Subsonic ne supporte pas la nouvelle API d\'authentification LDAP des utilisateurs.</string>
     <string name="settings.use_folder_for_album_artist">Utiliser les noms des dossiers pour les noms d\'artistes</string>
     <string name="settings.use_folder_for_album_artist_summary">Dossier de niveau supérieur devient le nom de l\'artiste de l\'album</string>
     <string name="settings.use_id3">Naviguer en utilisant les tags ID3</string>
@@ -302,7 +305,9 @@
     <string name="settings.show_artist_picture">Afficher l’image de l’artiste dans la liste</string>
     <string name="settings.show_artist_picture_summary">Affiche l’image de l’artiste dans la liste des artistes si celle-ci est disponible</string>
     <string name="main.video" tools:ignore="UnusedResources">Vidéo</string>
-    <string name="song_details.kbps">%d Kb/s</string>
+    <string name="settings.wifi_required_summary">Télécharger des médias uniquement sur des connexions non mesurées</string>
+    <string name="settings.wifi_required_title">Téléchargement en Wifi uniquement</string>
+    <string name="song_details.kbps">%d kbits/s</string>
     <string name="util.bytes_format.byte">0 o</string>
     <string name="util.bytes_format.gigabyte">0.00 Go</string>
     <string name="util.bytes_format.kilobyte">0 Ko</string>
@@ -313,7 +318,7 @@
     <string name="widget.sdcard_busy">Carte SD non disponible</string>
     <string name="widget.sdcard_missing">Aucune carte SD</string>
     <string name="settings.share_description_default">Description par défaut de la collection partagée</string>
-    <string name="settings.sharing_title">Répartition</string>
+    <string name="settings.sharing_title">Partage</string>
     <string name="settings.sharing_always_ask_for_details_summary">Toujours demander une description et une date d’expiration lors de la création d’un partage sur le serveur</string>
     <string name="settings.sharing_always_ask_for_details">Toujours demander pour plus de détails</string>
     <string name="settings.share_expiration_default">Temps d\'expiration par défaut</string>
@@ -335,7 +340,7 @@
     <string name="settings.share_seconds">Secondes</string>
     <string name="settings.share_minutes">Minutes</string>
     <string name="settings.share_hours">Heures</string>
-    <string name="settings.share_days">Journées</string>
+    <string name="settings.share_days">Jours</string>
     <string name="time_span_disable">Désactiver</string>
     <string name="time_span_disabled">Désactivé</string>
     <string name="save_as_defaults">Enregistrer par défaut</string>
@@ -345,12 +350,18 @@
     <string name="download.share_playlist">Partager playlist</string>
     <string name="download.share_song">Partager la piste actuelle</string>
     <string name="settings.share_greeting_default">Texte par défaut lors d\'un partage</string>
-    <string name="share_default_greeting">Regardez cette musique que j\'ai partagée depuis %s</string>
+    <string name="share_default_greeting">Écoutez donc cette musique que j\'ai partagée depuis %s</string>
     <string name="share_via">Partager des titres via</string>
     <string name="menu.share">Partager</string>
     <string name="download.menu_show_artist">Afficher l\'artiste</string>
     <string name="albumArt">Pochette d\'album</string>
     <string name="common_multiple_years">Années multiples</string>
+    <string name="settings.playback.resume_on_bluetooth_device">Reprendre lorsqu’un appareil Bluetooth se connecte</string>
+    <string name="settings.playback.pause_on_bluetooth_device">Mettre en pause lorsqu’un appareil Bluetooth se déconnecte</string>
+    <string name="settings.playback.bluetooth_all">Tous les appareils Bluetooth</string>
+    <string name="settings.playback.bluetooth_a2dp">Seulement les appareils audio (A2DP)</string>
+    <string name="settings.playback.bluetooth_disabled">Désactivé</string>
+    <string name="settings.playback.single_button_bluetooth_device_summary">Activer cela peut aider sur les anciens appareils Bluetooth lorsque Lecture/Pause ne fonctionne pas correctement</string>
     <string name="settings.debug.title">Paramètres de debug</string>
     <string name="settings.debug.log_to_file">Enregistrer les logs de debug dans des fichiers</string>
     <string name="settings.debug.log_path">Les fichiers de log sont disponibles dans %1$s/%2$s</string>
@@ -375,6 +386,9 @@
     <string name="server_editor.disabled_feature">Une ou plusieurs fonctionnalités ont été désactivées car le serveur ne les prend pas en charge.\nVous pouvez réexécuter ce test à tout moment.</string>
     <string name="server_menu.demo">Serveur de démo</string>
 
+    <string name="about.webpage">Visiter la page web</string>
+    <string name="about.report">Signaler un bug</string>
+    <string name="about.text"><b>Ultrasonic</b> est un client Android de streaming musical gratuit et open-source pour les serveurs compatibles avec l\'API Subsonic (version 1.7.0 ou supérieure). Avec <b>Ultrasonic</b>, vous pouvez facilement diffuser ou télécharger de la musique depuis votre ordinateur personnel vers votre téléphone Android en utilisant votre serveur multimédia compatible Subsonic. Le logiciel du serveur Subsonic nécessite une configuration supplémentaire distincte d\'Ultrasonic. Par défaut, Ultrasonic n\'est pas configuré. Une fois que vous avez mis en place votre propre serveur, veuillez modifier la configuration du serveur afin qu\'il se connecte à votre ordinateur.</string>
     <plurals name="select_album_n_songs">
         <item quantity="one">%d titre</item>
         <item quantity="other">%d titres</item>
@@ -392,9 +406,6 @@
     <string name="api.subsonic.upgrade_client">Versions incompatibles. Veuillez mette à jour l\'application Android Ultrasonic.</string>
     <string name="api.subsonic.upgrade_server">Versions incompatibles. Veuillez mette à jour le serveur Subsonic.</string>
 
+    <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Utiliser les étoiles pour noter les morceaux</string>
-    <string name="settings.five_star_rating_description">Utiliser un système de notation à base d\'étoiles pour les morceaux
-         au lieu de simplement mettre en avant les morceaux.
-    </string>
-
-</resources>
+    </resources>
diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml
index 9fb8f0f0..f7a43478 100644
--- a/ultrasonic/src/main/res/values-hu/strings.xml
+++ b/ultrasonic/src/main/res/values-hu/strings.xml
@@ -128,7 +128,6 @@
     <string name="search.songs">Dalok</string>
     <string name="search.title">Keresés</string>
     <string name="select_album.empty">Nem található média!</string>
-    <string name="select_album.no_network">Figyelem: Hálózat nem áll rendelkezésre!</string>
     <string name="select_album.no_sdcard">Hiba: SD kártya nem áll rendelkezésre!</string>
     <string name="select_album.play_all">Összes lejátszása</string>
     <string name="select_artist.all_folders">Összes mappa</string>
@@ -190,7 +189,8 @@
     <string name="settings.disc_sort">Dalok rendezése albumok szerint</string>
     <string name="settings.disc_sort_summary">Dalok rendezése albumsorszám és dalsorszám szerint.</string>
     <string name="settings.display_bitrate_summary">Bitráta és fájlkiterjesztés megjelenítése az előadónév mellett.</string>
-    <string name="settings.download_transition_summary">Letöltési aktivitás megjelenítése a lejátszás indításakor.</string>
+    <string name="settings.gapless_playback">Egybefüggő lejátszás</string>
+    <string name="settings.gapless_playback_summary">Kihagyás (dalszünet) nélküli egybefüggő lejátszás (Gapless).</string>
     <string name="settings.hide_media_summary">Zenefájlok elrejtése egyéb alkalmazások elől.</string>
     <string name="settings.hide_media_title">Elrejtés</string>
     <string name="settings.hide_media_toast">A következő alkalomtól lép életbe, amikor az Android zenefájlokat keres a telefonon.</string>
@@ -252,10 +252,10 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Keresési előzmények törölve.</string>
     <string name="settings.search_title">Keresés beállításai</string>
-    <string name="settings.send_bluetooth_album_art_summary">Albumborító küldése Bluetooth-on (Problémát okozhat a Bluetooth értesítéseknél)</string>
-    <string name="settings.send_bluetooth_album_art">Albumborító Bluetooth-on</string>
     <string name="settings.send_bluetooth_notification_summary">Lejátszási értesítések küldése Bluetooth-on.</string>
     <string name="settings.send_bluetooth_notification">Bluetooth értesítések küldése</string>
+    <string name="settings.send_bluetooth_album_art_summary">Albumborító küldése Bluetooth-on (Problémát okozhat a Bluetooth értesítéseknél)</string>
+    <string name="settings.send_bluetooth_album_art">Albumborító Bluetooth-on</string>
     <string name="settings.server_manage_servers">Kiszolgálók kezelése</string>
     <string name="settings.server_address">Kiszolgáló címe</string>
     <string name="settings.server_name">Név</string>
@@ -282,8 +282,6 @@
     <string name="settings.theme_title">Téma</string>
     <string name="settings.title.allow_self_signed_certificate">Engedélyezze az önaláírt HTTPS tanúsítványt</string>
     <string name="settings.title.enable_ldap_users_support">Az LDAP-felhasználók támogatásának engedélyezése</string>
-    <string name="settings.summary.enable_ldap_users_support">Ez arra kényszeríti az alkalmazást, hogy mindig jelszót küldjön régi módon,
-         mert a Subsonic api nem támogatja az LDAP-felhasználók új engedélyezését.</string>
     <string name="settings.use_folder_for_album_artist">Mappanevek használata az előadók neveként</string>
     <string name="settings.use_folder_for_album_artist_summary">Feltételezi, hogy a legfelső szintű mappa az előadó neve.</string>
     <string name="settings.use_id3">Böngészés ID3 Tag használatával</string>
@@ -372,9 +370,6 @@
     <string name="api.subsonic.upgrade_client">Nem kompatibilis verzió. Kérjük, frissítse az Ultrasonic Android alkalmazást!</string>
     <string name="api.subsonic.upgrade_server">Nem kompatibilis verzió. Kérjük, frissítse a Subsonic kiszolgálót!</string>
 
+    <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Öt csillagos értékelés használata a dalokhoz</string>
-    <string name="settings.five_star_rating_description">Öt csillag használata az értékeléshez az egyszerű
-        csillaggal jelölés helyett.
-    </string>
-
-</resources>
+    </resources>
diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml
index 6d0bdcbc..e4c1ca0c 100644
--- a/ultrasonic/src/main/res/values-it/strings.xml
+++ b/ultrasonic/src/main/res/values-it/strings.xml
@@ -115,7 +115,6 @@
     <string name="search.songs">Canzoni</string>
     <string name="search.title">Cerca</string>
     <string name="select_album.empty">Nessun media trovato</string>
-    <string name="select_album.no_network">Attenzione: nessuna rete disponibile.</string>
     <string name="select_album.no_sdcard">Errore: Nessuna memoria SD disponibile.</string>
     <string name="select_album.play_all">Riproduci tutto</string>
     <string name="select_artist.all_folders">Tutte le cartelle</string>
@@ -177,7 +176,8 @@
     <string name="settings.disc_sort">Ordina Canzoni secondo Disco</string>
     <string name="settings.disc_sort_summary">Ordina lista canzoni secondo il numero disco e traccia</string>
     <string name="settings.display_bitrate_summary">Aggiungi nome artista con bitrare ed estensione file</string>
-    <string name="settings.download_transition_summary">Passa al download quando inizia riproduzione</string>
+    <string name="settings.gapless_playback">Riproduzione Ininterrotta</string>
+    <string name="settings.gapless_playback_summary">Abilita riproduzione ininterrotta</string>
     <string name="settings.hide_media_summary">Nascondi file musicali di altre app</string>
     <string name="settings.hide_media_title">Nascondi Da Altro</string>
     <string name="settings.hide_media_toast">Effettivo alla prossima scansione Android per file musicali sul telefono.</string>
@@ -236,10 +236,10 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Storico ricerche eliminato</string>
     <string name="settings.search_title">Impostazioni ricerca</string>
-    <string name="settings.send_bluetooth_album_art_summary">Invia copertine degli album tramite Bluetooth (potrebbe causare errori nelle notifiche)</string>
-    <string name="settings.send_bluetooth_album_art">Copertine Album tramite Bluetooth</string>
     <string name="settings.send_bluetooth_notification_summary">Invia notifiche di riproduzione via Bluetooth</string>
     <string name="settings.send_bluetooth_notification">Invia notifica Bluetooth</string>
+    <string name="settings.send_bluetooth_album_art_summary">Invia copertine degli album tramite Bluetooth (potrebbe causare errori nelle notifiche)</string>
+    <string name="settings.send_bluetooth_album_art">Copertine Album tramite Bluetooth</string>
     <string name="settings.server_address">Indirizzo Server</string>
     <string name="settings.server_name">Nome</string>
     <string name="settings.server_password">Password</string>
diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml
index 534e08bf..7b7cc123 100644
--- a/ultrasonic/src/main/res/values-nl/strings.xml
+++ b/ultrasonic/src/main/res/values-nl/strings.xml
@@ -94,6 +94,21 @@
     <string name="error.label">Fout</string>
     <string name="jukebox.is_default">Standaard starten in jukebox-modus</string>
     <string name="lyrics.nomatch">Geen songtekst gevonden</string>
+    <string name="language.default">Systeemtaal gebruiken</string>
+    <string name="language.zh_CN">Chinees (China)</string>
+    <string name="language.zh_TW">Chinees (Taiwan)</string>
+    <string name="language.cs">Tsjechisch</string>
+    <string name="language.nl">Nederlands</string>
+    <string name="language.en">Engels</string>
+    <string name="language.fr">Frans</string>
+    <string name="language.de">Duits</string>
+    <string name="language.hu">Hongaars</string>
+    <string name="language.it">Italiaans</string>
+    <string name="language.es">Spaans</string>
+    <string name="language.pl">Pools</string>
+    <string name="language.pt">Portugees</string>
+    <string name="language.pt_BR">Portugees (Brazilië)</string>
+    <string name="language.ru">Russisch</string>
     <string name="main.albums_alphaByArtist">Op artiest</string>
     <string name="main.albums_alphaByName">Op naam</string>
     <string name="main.albums_frequent">Meest afgespeeld</string>
@@ -138,7 +153,7 @@
     <string name="search.title">Zoeken</string>
     <string name="select_album.empty">Geen media gevonden</string>
     <string name="select_album.n_selected">%d nummers geselecteerd</string>
-    <string name="select_album.no_network">Waarschuwing: geen internetverbinding.</string>
+    <string name="select_album.no_network">Waarschuwing: er is geen internetverbinding!\nAls je mobiel internet gebruikt, dan is het noodzakelijk dat je downloads via beperkte verbindingen toestaat in de instellingen.</string>
     <string name="select_album.no_sdcard">Fout: geen SD-kaart beschikbaar.</string>
     <string name="select_album.play_all">Alles afspelen</string>
     <string name="select_artist.all_folders">Alle mappen</string>
@@ -202,8 +217,10 @@
     <string name="settings.disc_sort_summary">Nummerlijst sorteren op schijfnummer en itemnummer</string>
     <string name="settings.display_bitrate">Bitsnelheid en bestandsextensie tonen</string>
     <string name="settings.display_bitrate_summary">Bitsnelheid en bestandsextensie toevoegen aan artiestennaam</string>
-    <string name="settings.download_transition">Downloads tonen bij afspelen</string>
-    <string name="settings.download_transition_summary">Overschakelen naar downloadactiviteit na starten van afspelen</string>
+    <string name="settings.download_transition">Nu aan het afspelen tonen op afspeelscherm</string>
+    <string name="settings.download_transition_summary">Toon ‘Nu aan het afspelen’ in de mediaweergave</string>
+    <string name="settings.gapless_playback">Naadloze overgang</string>
+    <string name="settings.gapless_playback_summary">Naadloze overgang tussen nummers inschakelen</string>
     <string name="settings.hide_media_summary">Muziekbestanden verbergen voor andere apps.</string>
     <string name="settings.hide_media_title">Verbergen voor andere apps</string>
     <string name="settings.hide_media_toast">Dit wordt toegepast bij de volgende keer dat Android je muziek doorzoekt.</string>
@@ -239,6 +256,8 @@
     <string name="settings.notifications_title">Meldingen</string>
     <string name="settings.network_title">Netwerk</string>
     <string name="settings.other_title">Overige instellingen</string>
+    <string name="settings.override_language">Taal afdwingen</string>
+    <string name="settings.override_language_summary">Herstart de app om de wijziging toe te passen</string>
     <string name="settings.playback_control_title">Afspeelbedieningsinstellingen</string>
     <string name="settings.preload">Aantal voor te laden nummers</string>
     <string name="settings.preload_1">1 nummer</string>
@@ -265,12 +284,12 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Zoekgeschiedenis gewist</string>
     <string name="settings.search_title">Zoekinstellingen</string>
+    <string name="settings.send_bluetooth_notification_summary">Afspeelmeldingen sturen via bluetooth</string>
+    <string name="settings.send_bluetooth_notification">Bluetoothmelding sturen</string>
     <string name="settings.send_bluetooth_album_art_summary">Albumhoezen versturen via bluetooth (dit kan leiden tot mislukte bluetoothmeldingen)</string>
     <string name="settings.send_bluetooth_album_art">Albumhoezen versturen via bluetooth</string>
     <string name="settings.disable_send_now_playing_list_summary">De lijst ‘Nu aan het afspelen’ wordt niet gedeeld met verbonden apparaten. Hierdoor wordt de comptabiliteit met AVCRP 1.3-apparaten hersteld als het huidige nummer niet wordt bijgewerkt.</string>
     <string name="settings.disable_send_now_playing_list">‘Nu aan het afspelen’-lijst niet delen</string>
-    <string name="settings.send_bluetooth_notification_summary">Afspeelmeldingen sturen via bluetooth</string>
-    <string name="settings.send_bluetooth_notification">Bluetoothmelding sturen</string>
     <string name="settings.server_manage_servers">Manage Servers</string>
     <string name="settings.server_address">Serveradres</string>
     <string name="settings.server_name">Naam</string>
@@ -298,10 +317,11 @@
     <string name="settings.theme_title">Thema</string>
     <string name="settings.title.allow_self_signed_certificate">Zelf-gesigneerd HTTPS-certificaat toestaan</string>
     <string name="settings.title.enable_ldap_users_support">Ondersteuning voor LDAP-gebruikers inschakelen</string>
-    <string name="settings.summary.enable_ldap_users_support">Dit dwingt de app om het wachtwoord altijd op de ouderwetse manier te versturen,
-        omdat de Subsonic-api geen ondersteuning biedt voor het autoriseren van nieuwe LDAP-gebruikers.</string>
+    <string name="settings.summary.enable_ldap_users_support">Dit dwingt de app om het wachtwoord altijd op de ouderwetse manier te versturen, als de Subsonic-server geen ondersteuning biedt voor het autoriseren via de nieuwe api.</string>
     <string name="settings.use_folder_for_album_artist">Mappen gebruiken voor artiestennaam</string>
     <string name="settings.use_folder_for_album_artist_summary">Aannemen dat de naam van de bovenliggende map de naam van de albumartiest is</string>
+    <string name="settings.show_now_playing_details_summary">Toon meer nummerinformatie op het afspeelscherm (genre, jaar, bitsnelheid)</string>
+    <string name="settings.show_now_playing_details">Details tonen op ‘Nu aan het afspelen’</string>
     <string name="settings.use_id3">Navigeren met behulp van ID3-labels</string>
     <string name="settings.use_id3_summary">ID3-labels gebruiken in plaats van systeemlabels</string>
     <string name="settings.show_artist_picture">Artiestfoto tonen op artiestenlijst</string>
@@ -428,8 +448,6 @@
 
     <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Vijf sterren gebruiken voor nummers</string>
-    <string name="settings.five_star_rating_description">Toon vijf sterren om nummers te beoordelen
-         in plaats van items toe te voegen aan of te verwijderen uit de favorieten.
-    </string>
+    <string name="settings.five_star_rating_description">Toon vijf sterren om nummers te beoordelen in plaats van items toe te voegen aan of te verwijderen uit de favorieten.</string>
 
 </resources>
diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml
index 9caa2b90..459080d4 100644
--- a/ultrasonic/src/main/res/values-pl/strings.xml
+++ b/ultrasonic/src/main/res/values-pl/strings.xml
@@ -119,7 +119,6 @@
     <string name="search.songs">Utwory</string>
     <string name="search.title">Wyszukiwanie</string>
     <string name="select_album.empty">Brak mediów</string>
-    <string name="select_album.no_network">Uwaga: sieć niedostępna.</string>
     <string name="select_album.no_sdcard">Błąd: Niedostępna karta SD.</string>
     <string name="select_album.play_all">Odtwórz wszystkie</string>
     <string name="select_artist.all_folders">Wszystkie foldery</string>
@@ -181,7 +180,8 @@
     <string name="settings.disc_sort">Sortuj utwory wg dysku</string>
     <string name="settings.disc_sort_summary">Sortuje listę utworów wg numeru dysku i numeru utworu</string>
     <string name="settings.display_bitrate_summary">Dołącza bitrate i typ pliku do nazwy artysty</string>
-    <string name="settings.download_transition_summary">Wyświetla postęp pobierania podczas odtwarzania</string>
+    <string name="settings.gapless_playback">Odtwarzanie bez przerw</string>
+    <string name="settings.gapless_playback_summary">Włącz odtwarzanie bez przerw między utworami</string>
     <string name="settings.hide_media_summary">Ukrywa pliki muzyczne przed innymi aplikacjami.</string>
     <string name="settings.hide_media_title">Ukryj pliki</string>
     <string name="settings.hide_media_toast">Efekt widoczny będzie po następnym skanowaniu muzyki przez system Android</string>
@@ -241,10 +241,10 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Wyczyść historię wyszukiwania</string>
     <string name="settings.search_title">Ustawienia wyszukiwania</string>
-    <string name="settings.send_bluetooth_album_art_summary">Wysyła okładki przez Bluetooth (może powodować problemy z powiadomieniami)</string>
-    <string name="settings.send_bluetooth_album_art">Okładki przez Bluetooth</string>
     <string name="settings.send_bluetooth_notification_summary">Wysyła powiadomienia o odtwarzaniu przez Bluetooth</string>
     <string name="settings.send_bluetooth_notification">Wysyłaj powiadomienia Bluetooth</string>
+    <string name="settings.send_bluetooth_album_art_summary">Wysyła okładki przez Bluetooth (może powodować problemy z powiadomieniami)</string>
+    <string name="settings.send_bluetooth_album_art">Okładki przez Bluetooth</string>
     <string name="settings.server_manage_servers">Manage Servers</string>
     <string name="settings.server_address">Adres serwera</string>
     <string name="settings.server_name">Nazwa</string>
@@ -270,8 +270,6 @@
     <string name="settings.theme_title">Motyw</string>
     <string name="settings.title.allow_self_signed_certificate">Zezwalaj na własne certyfikaty HTTPS</string>
     <string name="settings.title.enable_ldap_users_support">Włącz wsparcie dla użytkowników LDAP</string>
-    <string name="settings.summary.enable_ldap_users_support">To ustawienie wymusza, aby aplikacja wysyłała hasło w stary sposób,
-ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników LDAP.</string>
     <string name="settings.use_folder_for_album_artist">Używaj folderów jako nazw artystów</string>
     <string name="settings.use_folder_for_album_artist_summary">Zakłada, że folder najwyższego poziomu jest nazwą artysty albumu</string>
     <string name="settings.use_id3">Przeglądaj używając tagów ID3</string>
@@ -353,9 +351,6 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników
     <string name="api.subsonic.upgrade_client">Brak zgodności wersji. Uaktualnij aplikację Ultrasonic na Androida.</string>
     <string name="api.subsonic.upgrade_server">Brak zgodności wersji. Uaktualnij serwer Subsonic.</string>
 
+    <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Użyj pięciu gwiazdek dla utworów</string>
-    <string name="settings.five_star_rating_description">W przypadku utworów użyj systemu pięciu gwiazdek
-         zamiast po prostu grać gwiazdkami / bez gwiazd.
-    </string>
-
-</resources>
+    </resources>
diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
index c7f4b36c..6f9098f1 100644
--- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml
+++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
@@ -134,7 +134,6 @@
     <string name="search.songs">Músicas</string>
     <string name="search.title">Pesquisar</string>
     <string name="select_album.empty">Nenhuma mídia encontrada</string>
-    <string name="select_album.no_network">Aviso: Nenhuma rede disponível.</string>
     <string name="select_album.no_sdcard">Erro: Nenhum cartão SD disponível.</string>
     <string name="select_album.play_all">Tocar Tudo</string>
     <string name="select_artist.all_folders">Todas as Pastas</string>
@@ -197,8 +196,8 @@
     <string name="settings.disc_sort_summary">Classificar músicas pelo número do álbum e faixas</string>
     <string name="settings.display_bitrate">Mostrar Bitrate se Sufixo do Arquivo</string>
     <string name="settings.display_bitrate_summary">Adicionar o nome do artista com a taxa de bits e sufixo do arquivo</string>
-    <string name="settings.download_transition">Mostrar Downloads na Reprodução</string>
-    <string name="settings.download_transition_summary">Transição para atividade de download quando iniciar reprodução</string>
+    <string name="settings.gapless_playback">Reprodução sem Interrupção</string>
+    <string name="settings.gapless_playback_summary">Ativar reprodução sem interrupção</string>
     <string name="settings.hide_media_summary">Esconder arquivos de músicas de outros aplicativos</string>
     <string name="settings.hide_media_title">Esconder de Outros</string>
     <string name="settings.hide_media_toast">Será efetivado na próxima vez que o Android procurar por músicas em seu celular.</string>
@@ -260,12 +259,12 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Histórico de pesquisas apagado</string>
     <string name="settings.search_title">Configurações de Pesquisa</string>
+    <string name="settings.send_bluetooth_notification_summary">Enviar notificações de reprodução via Bluetooth</string>
+    <string name="settings.send_bluetooth_notification">Notificações via Bluetooth</string>
     <string name="settings.send_bluetooth_album_art_summary">Enviar a arte do álbum via Bluetooth (Pode causar falhas nas notificações do Bluetooth)</string>
     <string name="settings.send_bluetooth_album_art">Arte do Álbum via Bluetooth</string>
     <string name="settings.disable_send_now_playing_list_summary">A Lista Tocando Agora não será enviada aos dispositivos conectados. Isso pode restaurar a compatibilidade com dispositivos AVRCP 1.3 quando a exibição da trilha atual não é atualizada</string>
     <string name="settings.disable_send_now_playing_list">Desativar Envio da Lista Tocando Agora</string>
-    <string name="settings.send_bluetooth_notification_summary">Enviar notificações de reprodução via Bluetooth</string>
-    <string name="settings.send_bluetooth_notification">Notificações via Bluetooth</string>
     <string name="settings.server_manage_servers">Gerenciar Servidores</string>
     <string name="settings.server_address">Endereço do Servidor</string>
     <string name="settings.server_name">Nome</string>
@@ -292,8 +291,6 @@
     <string name="settings.theme_title">Tema</string>
     <string name="settings.title.allow_self_signed_certificate">Permitir o certificado HTTPS auto-assinado</string>
     <string name="settings.title.enable_ldap_users_support">Forçar autenticação não criptografada</string>
-    <string name="settings.summary.enable_ldap_users_support">Isso força o aplicativo a sempre enviar a senha na forma antiga,
-         porque a api Subsonic não suporta a nova autorização para usuários LDAP.</string>
     <string name="settings.use_folder_for_album_artist">Usar Pasta para Nome do Artista</string>
     <string name="settings.use_folder_for_album_artist_summary">Assumir que a pasta mais acima é o nome do artista</string>
     <string name="settings.use_id3">Navegar Usando Etiquetas ID3</string>
@@ -391,9 +388,6 @@
     <string name="api.subsonic.upgrade_client">Versões incompativeis. Atualize o aplicativo Ultrasonic para Android.</string>
     <string name="api.subsonic.upgrade_server">Versões incompativeis. Atualize o servidor Ultrasonic.</string>
 
+    <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Usar Classif. 5 Estrelas para Músicas</string>
-    <string name="settings.five_star_rating_description">Usar o sistema de classificação de 5 estrelas para músicas
-         em vez de simplesmente estrelar/não estrelar itens
-    </string>
-
-</resources>
+    </resources>
diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml
index 04600188..43fe5bf3 100644
--- a/ultrasonic/src/main/res/values-pt/strings.xml
+++ b/ultrasonic/src/main/res/values-pt/strings.xml
@@ -119,7 +119,6 @@
     <string name="search.songs">Músicas</string>
     <string name="search.title">Pesquisar</string>
     <string name="select_album.empty">Nenhuma mídia encontrada</string>
-    <string name="select_album.no_network">Aviso: Nenhuma rede disponível.</string>
     <string name="select_album.no_sdcard">Erro: Nenhum cartão SD disponível.</string>
     <string name="select_album.play_all">Tocar Tudo</string>
     <string name="select_artist.all_folders">Todas as Pastas</string>
@@ -181,7 +180,8 @@
     <string name="settings.disc_sort">Classificar Músicas por Álbum</string>
     <string name="settings.disc_sort_summary">Classificar músicas pelo número do álbum e faixas.</string>
     <string name="settings.display_bitrate_summary">Adiciona o nome do artista com a taxa de bits e sufixo do ficheiro</string>
-    <string name="settings.download_transition_summary">Transição para atividade de download quando iniciar reprodução</string>
+    <string name="settings.gapless_playback">Reprodução sem Interrupção</string>
+    <string name="settings.gapless_playback_summary">Habilita reprodução sem interrupção</string>
     <string name="settings.hide_media_summary">Esconder músicas de outros aplicativos.</string>
     <string name="settings.hide_media_title">Esconder de Outros</string>
     <string name="settings.hide_media_toast">Será realizado na próxima vez que o Android procurar por músicas em seu telemóvel.</string>
@@ -241,10 +241,10 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">Histórico de pesquisas apagado</string>
     <string name="settings.search_title">Configurações de Pesquisa</string>
-    <string name="settings.send_bluetooth_album_art_summary">Envia a arte do álbum via Bluetooth (Pode causar falhas nas notificações do Bluetooth)</string>
-    <string name="settings.send_bluetooth_album_art">Arte do Álbum via Bluetooth</string>
     <string name="settings.send_bluetooth_notification_summary">Envia notificações de reprodução via Bluetooth</string>
     <string name="settings.send_bluetooth_notification">Notificações via Bluetooth</string>
+    <string name="settings.send_bluetooth_album_art_summary">Envia a arte do álbum via Bluetooth (Pode causar falhas nas notificações do Bluetooth)</string>
+    <string name="settings.send_bluetooth_album_art">Arte do Álbum via Bluetooth</string>
     <string name="settings.server_manage_servers">Manage Servers</string>
     <string name="settings.server_address">Endereço do Servidor</string>
     <string name="settings.server_name">Nome</string>
@@ -270,8 +270,6 @@
     <string name="settings.theme_title">Tema</string>
     <string name="settings.title.allow_self_signed_certificate">Permitir o certificado HTTPS auto-assinado</string>
     <string name="settings.title.enable_ldap_users_support">Ative o suporte para usuários LDAP</string>
-    <string name="settings.summary.enable_ldap_users_support">Isso força o aplicativo a enviar sempre a senha de forma antiga,
-         porque a api Subsonic não suporta a nova autorização para usuários LDAP.</string>
     <string name="settings.use_folder_for_album_artist">Usar Pasta para Nome do Artista</string>
     <string name="settings.use_folder_for_album_artist_summary">Assumir que a pasta mais acima é o nome do artista</string>
     <string name="settings.use_id3">Navegar Usando Etiquetas ID3</string>
@@ -351,9 +349,6 @@
     <string name="api.subsonic.upgrade_client">Versões incompativeis. Atualize o aplicativo Ultrasonic para Android.</string>
     <string name="api.subsonic.upgrade_server">Versões incompativeis. Atualize o servidor Ultrasonic.</string>
 
+    <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Use classificação de cinco estrelas para músicas</string>
-    <string name="settings.five_star_rating_description">Use o sistema de classificação de cinco estrelas para músicas
-         em vez de simplesmente estrelar / não estrelar itens.
-    </string>
-
-</resources>
+    </resources>
diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml
index 8c2fcbc0..78490e76 100644
--- a/ultrasonic/src/main/res/values-ru/strings.xml
+++ b/ultrasonic/src/main/res/values-ru/strings.xml
@@ -28,7 +28,9 @@
     <string name="button_bar.playlists">Плейлист</string>
     <string name="button_bar.search">Поиск</string>
     <string name="chat.send_a_message">Отправить сообщение</string>
+    <string name="common.album">Альбом</string>
     <string name="common.appname">Ultrasonic</string>
+    <string name="common.artist">Артист</string>
     <string name="common.cancel">Отмена</string>
     <string name="common.comment">Комментарий</string>
     <string name="common.confirm">Подтвердить</string>
@@ -48,11 +50,14 @@
     <string name="common.play_shuffled">Играть в случайном порядке</string>
     <string name="common.public">Публичный</string>
     <string name="common.save">Сохранить</string>
+    <string name="common.select_all">Выбрать все</string>
+    <string name="common.title">Заголовок</string>
     <string name="common.unpin">Открепить</string>
     <string name="common.various_artists">Различные исполнители</string>
     <string name="delete_playlist">Вы хотите удалить %1$s</string>
     <string name="download.bookmark_removed" formatted="false">Закладка удалена</string>
     <string name="download.bookmark_set_at_position" formatted="false">Закладка установлена ​​на %s</string>
+    <string name="download.empty">Нечего загружать</string>
     <string name="playlist.empty">Плейлист пустой</string>
     <string name="download.jukebox_not_authorized">Пульт дистанционного управления не допускается. Пожалуйста, включите режим музыкального автомата в <b> Пользователи &gt; Настройки </b>на вашем Subsonic сервере.</string>
     <string name="download.jukebox_off">Пульт управления выключен. Музыка играет на телефоне</string>
@@ -89,6 +94,16 @@
     <string name="error.label">Ошибка</string>
     <string name="jukebox.is_default">Jukebox по умолчанию</string>
     <string name="lyrics.nomatch">Текст не найден</string>
+    <string name="language.default">Системный</string>
+    <string name="language.zh_CN">Китайский (Китай)</string>
+    <string name="language.zh_TW">Китайский (Тайвань)</string>
+    <string name="language.cs">Чешский</string>
+    <string name="language.nl">Датский</string>
+    <string name="language.en">Английский</string>
+    <string name="language.de">Немецкий</string>
+    <string name="language.pt">Португальский</string>
+    <string name="language.pt_BR">Португальский (Бразилия)</string>
+    <string name="language.ru">Русский</string>
     <string name="main.albums_alphaByArtist">По исполнителю</string>
     <string name="main.albums_alphaByName">По имени</string>
     <string name="main.albums_frequent">Самое популярное</string>
@@ -113,6 +128,7 @@
     <string name="menu.common">Общий</string>
     <string name="menu.deleted_playlist">Удалить плейлист %s</string>
     <string name="menu.deleted_playlist_error">Не удалось удалить плейлист %s</string>
+    <string name="menu.downloads">Загрузки</string>
     <string name="menu.exit">Выход</string>
     <string name="menu.settings">Настройки</string>
     <string name="menu.refresh">Обновить</string>
@@ -130,7 +146,6 @@
     <string name="search.songs">Песни</string>
     <string name="search.title">Поиск</string>
     <string name="select_album.empty">Медиа не найдена</string>
-    <string name="select_album.no_network">Предупреждение: сеть недоступна.</string>
     <string name="select_album.no_sdcard">Ошибка: нет SD-карты</string>
     <string name="select_album.play_all">Воспроизвести все</string>
     <string name="select_artist.all_folders">Все папки</string>
@@ -192,7 +207,8 @@
     <string name="settings.disc_sort">Время кэша каталогов</string>
     <string name="settings.disc_sort_summary">Сортировать список песен по номеру диска и треку</string>
     <string name="settings.display_bitrate_summary">Добавить имя исполнителя с битрейтом и суффиксом файла</string>
-    <string name="settings.download_transition_summary">Переход к загрузке активности при запуске воспроизведения</string>
+    <string name="settings.gapless_playback">Воспроизведение без промежутка</string>
+    <string name="settings.gapless_playback_summary">Включить воспроизведение без паузы</string>
     <string name="settings.hide_media_summary">Включить воспроизведение без паузы</string>
     <string name="settings.hide_media_title">Скрыть от других</string>
     <string name="settings.hide_media_toast">Вступает в силу в следующий раз, Android сканирует ваш телефон на предмет музыки</string>
@@ -254,10 +270,10 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">История поиска очищена</string>
     <string name="settings.search_title">Настройки поиска</string>
-    <string name="settings.send_bluetooth_album_art_summary">Отправить обложку альбома через Bluetooth (может привести к сбою уведомлений Bluetooth)</string>
-    <string name="settings.send_bluetooth_album_art">Обложка альбома через Bluetooth</string>
     <string name="settings.send_bluetooth_notification_summary">Отправлять уведомления о воспроизведении через Bluetooth</string>
     <string name="settings.send_bluetooth_notification">Отправить уведомление Bluetooth</string>
+    <string name="settings.send_bluetooth_album_art_summary">Отправить обложку альбома через Bluetooth (может привести к сбою уведомлений Bluetooth)</string>
+    <string name="settings.send_bluetooth_album_art">Обложка альбома через Bluetooth</string>
     <string name="settings.server_manage_servers">Управление серверами</string>
     <string name="settings.server_address">Адрес сервера</string>
     <string name="settings.server_name">Имя</string>
@@ -284,8 +300,6 @@
     <string name="settings.theme_title">Оформление</string>
     <string name="settings.title.allow_self_signed_certificate">Разрешить самоподписанный сертификат HTTPS</string>
     <string name="settings.title.enable_ldap_users_support">Принудительная аутентификация по обычному паролю</string>
-    <string name="settings.summary.enable_ldap_users_support">Это заставляет приложение всегда отправлять пароль в незашифрованном виде.
-        Полезно, если сервер Subsonic не поддерживает новый API аутентификации пользователей.</string>
     <string name="settings.use_folder_for_album_artist">Использовать папки для имени исполнителя</string>
     <string name="settings.use_folder_for_album_artist_summary">Предположим, папка верхнего уровня - это имя исполнителя альбома</string>
     <string name="settings.use_id3">Обзор с использованием тегов ID3</string>
@@ -379,8 +393,6 @@
     <string name="api.subsonic.upgrade_client">Несовместимые версии. Пожалуйста, обновите приложение Ultrasonic для Android.</string>
     <string name="api.subsonic.upgrade_server">Несовместимые версии. Пожалуйста, обновите Subsonic сервер.</string>
 
+    <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">Использовать пятизвездочный рейтинг для песен</string>
-    <string name="settings.five_star_rating_description">Использовать пятизвездочную систему рейтинга для песен
-        вместо того, чтобы просто ставить/не ставить звезды.</string>
-
-</resources>
+    </resources>
diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
index c1ee0952..3cba252c 100644
--- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml
+++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
@@ -64,6 +64,7 @@
     <string name="download.jukebox_offline">离线模式不支持远程控制</string>
     <string name="download.jukebox_on">打开远程控制，音乐将在服务端播放。</string>
     <string name="download.jukebox_server_too_old">远程控制不支持，请升级您的 Subsonic服务器。</string>
+    <string name="download.jukebox_volume">远程音量</string>
     <string name="download.menu_equalizer">均衡器</string>
     <string name="download.menu_jukebox_off">关闭 Jukebox</string>
     <string name="download.menu_jukebox_on">开启 Jukebox</string>
@@ -106,6 +107,8 @@
     <string name="main.genres_title">流派</string>
     <string name="main.music">音乐</string>
     <string name="main.offline">离线</string>
+    <string name="main.setup_server">%s - 已设置服务器</string>
+    <string name="main.shuffle">随机播放</string>
     <string name="main.songs_random">随机</string>
     <string name="main.songs_starred">收藏夹</string>
     <string name="main.songs_title">歌曲</string>
@@ -135,7 +138,7 @@
     <string name="search.songs">歌曲</string>
     <string name="search.title">搜索</string>
     <string name="select_album.empty">找不到歌曲</string>
-    <string name="select_album.no_network">警告：网络不可用</string>
+    <string name="select_album.n_selected">已选择 %d 首曲目</string>
     <string name="select_album.no_sdcard">错误：没有SD卡</string>
     <string name="select_album.play_all">播放所有</string>
     <string name="select_artist.all_folders">所有文件夹</string>
@@ -243,6 +246,7 @@
     <string name="settings.preload_5">5 首歌</string>
     <string name="settings.preload_unlimited">不限制</string>
     <string name="settings.scrobble_summary">请记得在服务器上的 Scrobble 服务中设置您的用户名和密码</string>
+    <string name="settings.scrobble_title">Scrobble我的播放列表</string>
     <string name="settings.search_1">1</string>
     <string name="settings.search_10">10</string>
     <string name="settings.search_100">100</string>
@@ -259,12 +263,12 @@
     <string name="settings.search_75">75</string>
     <string name="settings.search_history_cleared">搜索记录已清除</string>
     <string name="settings.search_title">搜索设置</string>
+    <string name="settings.send_bluetooth_notification_summary">通过蓝牙发送播放通知</string>
+    <string name="settings.send_bluetooth_notification">发送蓝牙通知</string>
     <string name="settings.send_bluetooth_album_art_summary">通过蓝牙发送专辑封面（可能导致蓝牙通知失败）</string>
     <string name="settings.send_bluetooth_album_art">通过蓝牙发送专辑封面</string>
     <string name="settings.disable_send_now_playing_list_summary">现在播放列表不会发送到已连接的设备。 当前曲目显示未更新时，这可能会恢复AVRCP 1.3的设备的兼容性。</string>
     <string name="settings.disable_send_now_playing_list">禁用发送正在播放列表</string>
-    <string name="settings.send_bluetooth_notification_summary">通过蓝牙发送播放通知</string>
-    <string name="settings.send_bluetooth_notification">发送蓝牙通知</string>
     <string name="settings.server_manage_servers">管理服务器</string>
     <string name="settings.server_address">服务器地址</string>
     <string name="settings.server_name">名称</string>
@@ -292,8 +296,6 @@
     <string name="settings.theme_title">主题</string>
     <string name="settings.title.allow_self_signed_certificate">允许自签名 HTTPS 证书</string>
     <string name="settings.title.enable_ldap_users_support">强制原始密码认证</string>
-    <string name="settings.summary.enable_ldap_users_support">这会强制应用始终以未加密的方式发送密码。
- 如果 Subsonic 服务器不支持新的用户身份验证 API，则很有用。</string>
     <string name="settings.use_folder_for_album_artist">将艺术家名称作为文件夹</string>
     <string name="settings.use_folder_for_album_artist_summary">将艺术家名称作为顶层文件夹名</string>
     <string name="settings.use_id3">使用 ID3 标签浏览</string>
@@ -352,6 +354,12 @@
     <string name="download.menu_show_artist">显示艺术家</string>
     <string name="albumArt">albumArt</string>
     <string name="common_multiple_years">Multiple Years</string>
+    <string name="settings.playback.resume_on_bluetooth_device">连接蓝牙设备时恢复播放</string>
+    <string name="settings.playback.pause_on_bluetooth_device">断开蓝牙设备时暂停播放</string>
+    <string name="settings.playback.bluetooth_all">所有蓝牙设备</string>
+    <string name="settings.playback.bluetooth_a2dp">仅音频 (A2DP) 设备</string>
+    <string name="settings.playback.bluetooth_disabled">已禁用</string>
+    <string name="settings.playback.single_button_bluetooth_device_summary">当播放/暂停无法正常工作时，启用此功能可能对较旧的蓝牙设备有所帮助</string>
     <string name="settings.debug.title">调试选项</string>
     <string name="settings.debug.log_to_file">将调试日志写入文件</string>
     <string name="settings.debug.log_path">日志文件可在 %1$s/%2$s 获取</string>
@@ -376,6 +384,9 @@
     <string name="server_editor.disabled_feature">一项或多项功能被禁用，因为此服务器不支持它们。\您可以随时再次运行此测试。</string>
     <string name="server_menu.demo">试用服务器</string>
 
+    <string name="about.webpage">访问网页</string>
+    <string name="about.report">提交漏洞报告</string>
+    <string name="about.text"><b>Ultrasonic</b>是一个免费且开源的安卓流式音乐客户端，支持 Subsonic API（1.7.0版本以上）兼容的服务端。\n\n通过使用 <b>Ultrasonic</b> 你可以轻松的从你的电脑上的Subsonic兼容服务端流式传输或者下载音乐。 Subsonic服务端与Ultrasonic都需要额外的配置才可使用。\n\n默认情况下，Ultrasonic并未进行配置，当服务端配置完成后，请确保配置允许客户端连接到你的计算机。</string>
     <plurals name="select_album_n_songs">
         <item quantity="other">%d 首曲目</item>
     </plurals>
@@ -412,7 +423,4 @@
 
     <!-- Subsonic features  -->
     <string name="settings.five_star_rating_title">为歌曲使用五星评分</string>
-    <string name="settings.five_star_rating_description">对歌曲使用五星级评级系统
-而不是简单地为项目加星标/取消星标。</string>
-
-</resources>
+    </resources>