diff --git a/ring-android/app/src/main/res/values-de/strings.xml b/ring-android/app/src/main/res/values-de/strings.xml
index dfb8605..6d3a085 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -15,7 +15,8 @@
   <string name="license">Diese Software wird \"wie sie ist\" ohne Gewährleistung irgendwelcher Art zur Verfügung gestellt. Details finden Sie unter <u>GNU General Public License Version 3 oder höher</u></string>
   <string name="description">Jami ist eine freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer.</string>
   <string name="credits">Würdigung</string>
-  <string name="call_service_description">Dieser Dienst ist notwendig um Anrufe im Vordergrund zu halten. Er läuft nur während eines Anrufs.</string>
+  <string name="call_service_description">Dieser Dienst ist notwendig, um Anrufe im Vordergrund zu halten. Er läuft nur während eines Anrufs.</string>
+  <string name="data_transfer_service_description">Dieser Dienst ist notwendig, um permanente Benachrichtigungen während der Dateiübertragung anzuzeigen. Es läuft nur während der Dateiübertragung.</string>
   <!--About dialog-->
   <string name="developed_by">Entwickelt von</string>
   <string name="designed_by">Entworfen von</string>
@@ -112,6 +113,8 @@
   <string name="send_file">Datei senden</string>
   <string name="hist_file_sent">Datei gesendet</string>
   <string name="hist_file_received">Datei erhalten</string>
+  <string name="conversation_send_audio">Audioaufzeichnung starten</string>
+  <string name="conversation_send_video">Videoaufzeichnung starten</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera Berechtigung</string>
   <string name="permission_dialog_camera_message">Für Video-Konversationen benötigt die Anwendung Zugriff auf die Kamera. Bitte erteilen Sie diese Berechtigung.</string>
@@ -119,7 +122,9 @@
   <string name="ringtone_error_title">Fehler</string>
   <string name="ringtone_error_format_not_supported">Dieses Format wird nicht unterstützt.</string>
   <string name="ringtone_error_size_too_big">Diese Datei ist zu groß. Die maximale Größe ist %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Eigenen Klingelton festlegen</string>
   <string name="ringtone_custom_label">Benutzerdefiniert</string>
+  <string name="ringtone_jami_tones">Jami Töne</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Ring benötigt die Berechtigung \"Kontaktdaten lesen\" für diese Funktion. Bitte erteilen Sie diese.</string>
   <!--Write call log permission-->
@@ -164,6 +169,7 @@
   <string name="prompt_new_username">Neuen Benutzernamen eingeben</string>
   <string name="help_password_choose">Wählen Sie ein sicheres Passwort, an das Sie sich erinnern können, um ihr Jami-Konto zu schützen.</string>
   <string name="help_password_enter">Geben Sie ihr Haupt-Jami-Kontopasswort ein</string>
+  <string name="help_server_enter">URL des Management-Servers eingeben</string>
   <string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Jami-Kontos ein. Benutzen Sie die Funktion \"Exportiere Konto\",bei Jami, um die PIN zu erhalten.</string>
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
@@ -181,6 +187,7 @@
   <string name="share_label">Teilen</string>
   <string name="generic_error_migration">Fehler</string>
   <string name="generic_error_migration_message">Während der Migration ist ein Fehler aufgetreten</string>
+  <string name="title_share_with">Teilen mit...</string>
   <!--Pending contact requests-->
   <string name="accept">Akzeptieren</string>
   <string name="refuse">Verweigern</string>
@@ -200,6 +207,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">Keine Kontaktanfrage gesendet</string>
   <string name="contact_request_sent">Kontaktanfrage gesendet</string>
+  <string name="start_conversation">Unterhaltung starten</string>
   <string name="search_results">Suchergebnisse</string>
   <string name="tv_contact_row_header">Kontakte</string>
   <string name="gallery_error_title">Keine Galerie-App gefunden</string>
@@ -231,4 +239,6 @@
   <string name="menu_message_delete">Nachricht löschen</string>
   <string name="menu_message_cancel">Nachricht abbrechen</string>
   <string name="menu_delete">Löschen</string>
+  <string name="pref_darkTheme_title">Dunkles Design</string>
+  <string name="pref_darkTheme_summary">Aktivieren Sie immer das dunkle Design, anstatt das Systemverhalten zu verwenden</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index 03813ca..b4185bd 100644
--- a/ring-android/app/src/main/res/values-de/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de/strings_account.xml
@@ -67,6 +67,8 @@
   <string name="account_ringtone_enabled_label">Klingelton benutzen</string>
   <string name="account_ringtone_path_label">Klingeltonpfad</string>
   <string name="account_ringtone_custom_label">Eigenen Klingelton benutzen</string>
+  <string name="account_ringtone_title">Klingelton auswählen</string>
+  <string name="account_ringtone_summary">Wählen Sie einen Klingelton oder nehmen Sie Ihren eigenen</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Video aktivieren</string>
@@ -147,8 +149,9 @@
   <string name="account_sip_success_title">SIP-Konto registriert</string>
   <string name="account_sip_success_message">Sie haben erfolgreich Ihr SIP-Konto registriert.</string>
   <string name="account_sip_register_anyway">Trotzdem registieren</string>
-  <string name="account_link_button">Durch Netzwerk verbinden</string>
-  <string name="account_link_archive_button">Durch Backup verbinden</string>
+  <string name="account_link_device">Verbindung von einem anderen Gerät</string>
+  <string name="account_link_button">Verbindung vom Netzwerk</string>
+  <string name="account_link_archive_button">Verbindung vom Backup</string>
   <string name="account_link_prompt_pin">PIN eingeben</string>
   <string name="account_new_button">Ein Jami-Konto erstellen</string>
   <string name="account_link_export_button">Weiteres Gerät mit diesem Konto verknüpfen</string>
@@ -158,6 +161,11 @@
   <string name="account_end_export_infos">Ihre PIN lautet:\n\n%%\n\nUm den Vorgang abzuschließen öffnen Sie Jami auf dem neuen Gerät. Erstellen Sie ein neues Konto mit \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist 10 Minuten gültig.</string>
   <string name="account_link_export_info_light">Um dieses Konto auf weiteren Geräten zu verwenden, müssen Sie zuerst eine PIN generieren. Diese muss auf dem neuen Gerät eingeben werden, um das Konto zu importieren. Die PIN ist für 10 Minuten gültig.</string>
   <string name="account_export_title">Gerät hinzufügen</string>
+  <string name="account_connect_server_button">Verbindung zum Management-Server</string>
+  <string name="account_connect_button">Verbinden</string>
+  <string name="prompt_server">Jami Management-Server-URL</string>
+  <string name="help_credentials_enter">Geben Sie die Anmeldedaten für Ihr Unternehmen ein</string>
+  <string name="help_connect_password_enter">Geben Sie das Passwort für Ihr Unternehmen ein</string>
   <string name="account_connect_prompt_username">Benutzername</string>
   <!--Name registration-->
   <string name="error_username_empty">Benutzername eingeben</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_preferences.xml b/ring-android/app/src/main/res/values-de/strings_preferences.xml
index 36d8ddd..d132171 100644
--- a/ring-android/app/src/main/res/values-de/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de/strings_preferences.xml
@@ -9,6 +9,8 @@
   <string name="pref_mobileData_summary">Jami die Nutzung von 3G/LTE zusätzlich zum WLAN erlauben</string>
   <string name="pref_pushNotifications_title">Push-Benachrichtigungen</string>
   <string name="pref_pushNotifications_summary">Google-Server verwenden, um Anrufe/Nachrichten im Hintergrund empfangen zu können.</string>
+  <string name="pref_video_advanced_title">Erweiterte Videoeinstellungen</string>
+  <string name="pref_video_advanced_summary">Ändern Sie die Videobitrate, die Auflösung und den Zugriff auf experimentelle Funktionen</string>
   <string name="pref_hd_summary">Senden von HD-Video aktivieren</string>
   <string name="pref_hwEncode_title">Hardwarebeschleunigtes Encoding aktivieren</string>
   <string name="pref_hwEncode_summary">Experimentelles Feature</string>
@@ -19,6 +21,7 @@
   <string name="pref_startOnBoot_title">Jami beim Hochfahren starten</string>
   <string name="pref_startOnBoot_summary">Jami im Hintergrund laufen lassen wenn das System startet</string>
   <string name="pref_clearHistory_title">Verlauf leeren</string>
+  <string name="pref_clearHistory_summary">Kompletten Gesprächsverlauf löschen. Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="pref_persistNotification_title">Im Hintergrund laufen lassen</string>
   <string name="pref_persistNotification_summary">Jami erlauben im Hintergrund zu laufen, um Anrufe und Nachrichten zu empfangen.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index b20c4b4..fb88ab8 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -113,6 +113,8 @@
   <string name="send_file">Fájl küldése</string>
   <string name="hist_file_sent">Fájl elküldve</string>
   <string name="hist_file_received">Fájl érkezett</string>
+  <string name="conversation_send_audio">Hangüzenet felvétele</string>
+  <string name="conversation_send_video">Videóüzenet felvétele</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kameraengedély</string>
   <string name="permission_dialog_camera_message">A videótársalgások működéséhez szükséges a kamera engedély. Fontolja meg az engedélyezését!</string>
@@ -184,7 +186,7 @@
   <string name="share_your_account_information">Kapcsolati adatok megosztása</string>
   <string name="share_label">Megosztás </string>
   <string name="generic_error_migration">Hiba</string>
-  <string name="generic_error_migration_message">Hiba történt az átvitel során</string>
+  <string name="generic_error_migration_message">Hiba történt az áttelepítés során</string>
   <string name="title_share_with">Megosztás…</string>
   <!--Pending contact requests-->
   <string name="accept">Elfogadás</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_account.xml b/ring-android/app/src/main/res/values-hu/strings_account.xml
index 7d852b3..2244268 100644
--- a/ring-android/app/src/main/res/values-hu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_account.xml
@@ -133,7 +133,7 @@
   <string name="account_migration">Jami fiókja frissíthető.\ nKérjük hogy, adja meg a jelszót.</string>
   <string name="ring_account">Jami fiók</string>
   <string name="ring_account_identity">Személyazonosság</string>
-  <string name="account_migration_title_dialog">Fiók átvitel</string>
+  <string name="account_migration_title_dialog">Fiók áttelepítés</string>
   <string name="account_migration_message_dialog">A fiókjait frissíteni kell. Szeretne a fiók kezelési lapra menni a művelet elvégzéséhez?</string>
   <string name="account_update_needed">Frissítés szükséges</string>
   <string name="account_cannot_be_found_title">A fiók nem található</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 38c2b5b..4a075b0 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
@@ -7,6 +7,7 @@
   <!--Strings related to account creation-->
   <string name="add_ring_account_title">Aggiungi account Jami</string>
   <string name="add_sip_account_title">Aggiungi SIP account</string>
+  <string name="ring_account_default_name">Account Jami %1$s</string>
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Hostname</string>
   <string name="prompt_username">Utente</string>
@@ -66,6 +67,8 @@
   <string name="account_ringtone_enabled_label">Attiva suonerie</string>
   <string name="account_ringtone_path_label">Percorso suonerie</string>
   <string name="account_ringtone_custom_label">Usa suoneria personalizzata</string>
+  <string name="account_ringtone_title">Scegli una suoneria</string>
+  <string name="account_ringtone_summary">Seleziona una suoneria o scegli la tua</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Attiva Video</string>
@@ -115,6 +118,7 @@
   <string name="error_password_char_count">Minimo 6 caratteri</string>
   <string name="error_passwords_not_equals">Le password non corrispondono</string>
   <string name="export_account_wait_title">Prego attendere...</string>
+  <string name="export_account_wait_message">Esportazione informazioni sull\'account</string>
   <string name="account_export_file">Backup account</string>
   <string name="account_export_end_decryption_message">Impossibile sbloccare l\'account x la con la password inserita.</string>
   <string name="account_export_end_network_title">Errore di rete</string>
@@ -145,6 +149,9 @@
   <string name="account_sip_success_title">Account Sip registrato</string>
   <string name="account_sip_success_message">Hai registrato il tuo account Sip con successo.</string>
   <string name="account_sip_register_anyway">Registrati lo stesso</string>
+  <string name="account_link_device">Connetti da un altro dispositivo</string>
+  <string name="account_link_button">Connetti dalla rete</string>
+  <string name="account_link_archive_button">Connetti dal backup</string>
   <string name="account_link_prompt_pin">Inserisci il PIN</string>
   <string name="account_new_button">Crea un account Jami</string>
   <string name="account_link_export_button">Collega un altro dispositivo a questo account</string>
@@ -154,16 +161,23 @@
   <string name="account_end_export_infos">Il tuo PIN è: \ n \ n%%\ n\nPer completare la procedura, è necessario aprire Jami sul nuovo dispositivo. Crea un nuovo account con \"Collega questo dispositivo a un account\". Il tuo PIN è valido per 10 minuti.</string>
   <string name="account_link_export_info_light">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo sarà un codice che devi configurare. Il PIN è valido per 10 minuti.</string>
   <string name="account_export_title">Aggiungi dispositivi</string>
+  <string name="account_connect_server_button">Connessione al server di gestione</string>
+  <string name="account_connect_button">Connetti</string>
+  <string name="prompt_server">URL del server di gestione Jami</string>
+  <string name="help_credentials_enter">Inserisci le credenziali della tua organizzazione</string>
+  <string name="help_connect_password_enter">Inserisci la password della tua organizzazione</string>
   <string name="account_connect_prompt_username">Utente</string>
   <!--Name registration-->
   <string name="error_username_empty">Inserire un nome utente</string>
   <string name="no_registered_name_for_account">Nessun nome registrato è stato trovato per questo account</string>
+  <string name="username_available">Nome utente disponibile !</string>
   <string name="register_name">Nome registrazione</string>
   <string name="trying_to_register_name">Tentativo di registrazione del nome</string>
   <string name="registered_username">Nome utente registrato</string>
   <string name="register_username">Registra nome utente pubblico (consigliato)</string>
   <string name="username_already_taken">Il nome utente è già utilizzato</string>
   <string name="invalid_username">Nome utente non valido</string>
+  <string name="unknown_error">Errore sconosciuto. Controlla la tua connessione di rete!</string>
   <string name="looking_for_username_availability">La disponibilità del nome utente viene controllata...</string>
   <string name="account_status_connecting">Collegamento</string>
   <string name="account_status_connection_error">Errore di connessione</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
index c3db16f..0807e13 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -9,6 +9,8 @@
   <string name="pref_mobileData_summary">Permetti a Jami su reti 3G / LTE in aggiunta al Wi-Fi</string>
   <string name="pref_pushNotifications_title">Invia notifiche</string>
   <string name="pref_pushNotifications_summary">Utilizza i server di Google per consentire la ricezione di chiamate / messaggi in background</string>
+  <string name="pref_video_advanced_title">Impostazioni video avanzate</string>
+  <string name="pref_video_advanced_summary">Modifica il bitrate del video, la risoluzione e accedi alle funzioni sperimentali</string>
   <string name="pref_hd_summary">Abilita l\'invio di video HD</string>
   <string name="pref_hwEncode_title">Attiva la codifica accelerata</string>
   <string name="pref_hwEncode_summary">Funzioni sperimentali</string>
@@ -19,6 +21,7 @@
   <string name="pref_startOnBoot_title">Avvia Jami all\'avvio</string>
   <string name="pref_startOnBoot_summary">Esegui Jami in background all\'avvio del sistema.</string>
   <string name="pref_clearHistory_title">Elimina cronologia</string>
+  <string name="pref_clearHistory_summary">Cancella tutta la cronologia delle conversazioni. Questa azione non può essere annullata.</string>
   <string name="pref_persistNotification_title">Esegui in background</string>
   <string name="pref_persistNotification_summary">Consenti l\'esecuzione in background per ricevere chiamate e messaggi.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index 30ae917..e067e3b 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -63,6 +63,7 @@
   <string name="notif_channel_messages">Žinutės</string>
   <string name="notif_channel_requests">Užklausos</string>
   <string name="notif_channel_file_transfer">Failų persiuntimas</string>
+  <string name="notif_channel_background_service">Foninė tarnyba</string>
   <string name="notif_channel_background_service_descr">Leidžia bet kuriuo metu priimti skambučius ir gauti žinutes.</string>
   <string name="notif_group_calls">Skambučiai</string>
   <string name="notif_background_service">Šiuo metu Jami veikia fone</string>
@@ -182,6 +183,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">Jokia adresato užklausa neišsiųsta</string>
   <string name="contact_request_sent">Adresato užklausa išsiųsta</string>
+  <string name="start_conversation">Pradėti pokalbį</string>
   <string name="search_results">Paieškos rezultatai</string>
   <string name="tv_contact_row_header">Adresatai</string>
   <string name="gallery_error_title">Nerasta jokios Galerijos programėlės</string>
@@ -189,6 +191,7 @@
   <string name="generic_error">Įvyko nežinoma klaida</string>
   <!--File Transfer-->
   <string name="invalid_file">Neteisingas failas</string>
+  <string name="not_able_to_write_file">Nepavyko rašyti failo</string>
   <string name="file_transfer_status_created">inicijuojamas persiuntimas</string>
   <string name="file_transfer_status_unsupported">nepalaikoma</string>
   <string name="file_transfer_status_invalid_pathname">neteisingas kelio pavadinimas</string>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings.xml b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
index 4b1e858..44498ad 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
@@ -113,6 +113,8 @@
   <string name="send_file">Bestand versturen</string>
   <string name="hist_file_sent">Bestand verstuurd</string>
   <string name="hist_file_received">Bestand ontvangen</string>
+  <string name="conversation_send_audio">Geluidsbericht opnemen</string>
+  <string name="conversation_send_video">Videobericht opnemen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
   <string name="permission_dialog_camera_message">Videogesprekken vereisen toegang tot de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
@@ -167,6 +169,7 @@
   <string name="prompt_new_username">Geef nieuwe gebruikersnaam in</string>
   <string name="help_password_choose">Kies een sterk paswoord om uw Jami-account te beschermen.</string>
   <string name="help_password_enter">Geef het hoofdpaswoord van uw Jami-account in</string>
+  <string name="help_server_enter">Geef URL van beheerserver in</string>
   <string name="help_pin_enter">Geef de pincode in vanuit uw Jami-account die al is geconfigureerd op een ander apparaat. Gebruik de functie ‘Jami-account exporteren’ om een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
@@ -184,6 +187,7 @@
   <string name="share_label">Delen</string>
   <string name="generic_error_migration">Fout</string>
   <string name="generic_error_migration_message">Er is een fout opgetreden tijdens het migratieproces</string>
+  <string name="title_share_with">Delen met…</string>
   <!--Pending contact requests-->
   <string name="accept">Aanvaarden</string>
   <string name="refuse">Afwijzen</string>
@@ -203,6 +207,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">Geen contactverzoek verstuurd</string>
   <string name="contact_request_sent">Contactverzoek verstuurd</string>
+  <string name="start_conversation">Gesprek beginnen</string>
   <string name="search_results">Zoekresultaten</string>
   <string name="tv_contact_row_header">Contacten</string>
   <string name="gallery_error_title">Geen Galerij-app gevonden</string>
@@ -234,4 +239,6 @@
   <string name="menu_message_delete">Bericht verwijderen</string>
   <string name="menu_message_cancel">Bericht annuleren</string>
   <string name="menu_delete">Verwijderen</string>
+  <string name="pref_darkTheme_title">Donker thema</string>
+  <string name="pref_darkTheme_summary">Donker thema altijd gebruiken in plaats van systeemgedrag te volgen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml b/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
index f50d798..cafc7c4 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
@@ -149,6 +149,7 @@
   <string name="account_sip_success_title">SIP-account geregistreerd</string>
   <string name="account_sip_success_message">Uw SIP-account is met succes geregistreerd.</string>
   <string name="account_sip_register_anyway">Toch registreren</string>
+  <string name="account_link_device">Verbinden vanaf ander apparaat</string>
   <string name="account_link_button">Verbinden uit netwerk</string>
   <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Geef pincode in</string>
@@ -160,6 +161,11 @@
   <string name="account_end_export_infos">Uw pincode is:\n\n%%\n\nOm het proces te voltooien opent u Jami op het nieuwe apparaat. Maak een nieuwe account aan met ‘Dit apparaat aan een account koppelen’. Uw pincode is 10 minuten geldig.</string>
   <string name="account_link_export_info_light">Om deze account op andere apparaten te gebruiken moet u deze eerst op Ring blootstellen. Er zal een pincode gegenereerd worden die u op het nieuwe apparaat ingeeft om de account in te stellen. De pincode is 10 minuten geldig.</string>
   <string name="account_export_title">Apparaten toevoegen</string>
+  <string name="account_connect_server_button">Verbinden met beheerserver</string>
+  <string name="account_connect_button">Verbinden</string>
+  <string name="prompt_server">Jami-beheerserver-URL</string>
+  <string name="help_credentials_enter">Geef de referenties van uw organisatie in</string>
+  <string name="help_connect_password_enter">Geef het paswoord van uw organisatie in</string>
   <string name="account_connect_prompt_username">Gebruikersnaam</string>
   <!--Name registration-->
   <string name="error_username_empty">Geef een gebruikersnaam in</string>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml b/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
index 5704f54..6afeafe 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
@@ -21,6 +21,7 @@
   <string name="pref_startOnBoot_title">Jami automatisch starten</string>
   <string name="pref_startOnBoot_summary">Voer Jami in de achtergrond uit wanneer het systeem gestart wordt.</string>
   <string name="pref_clearHistory_title">Geschiedenis wissen</string>
+  <string name="pref_clearHistory_summary">Wis de geschiedenis van alle gesprekken. Deze handeling kan niet ongedaan gemaakt worden.</string>
   <string name="pref_persistNotification_title">Uitvoeren in achtergrond</string>
   <string name="pref_persistNotification_summary">Maakt het mogelijk om in de achtergrond oproepen en berichten te ontvangen.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index eb4e96d..5905d89 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -113,6 +113,8 @@
   <string name="send_file">Bestand versturen</string>
   <string name="hist_file_sent">Bestand verstuurd</string>
   <string name="hist_file_received">Bestand ontvangen</string>
+  <string name="conversation_send_audio">Geluidsbericht opnemen</string>
+  <string name="conversation_send_video">Videobericht opnemen</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Cameramachtiging</string>
   <string name="permission_dialog_camera_message">Videogesprekken vereisen machtiging voor gebruik van de camera. Gelieve te overwegen deze machtiging alsnog toe te kennen.</string>
@@ -167,6 +169,7 @@
   <string name="prompt_new_username">Voer nieuwe gebruikersnaam in</string>
   <string name="help_password_choose">Kies een sterk wachtwoord om uw Jami-account te beschermen.</string>
   <string name="help_password_enter">Voer het hoofdwachtwoord van uw Jami-account in</string>
+  <string name="help_server_enter">Voer URL van beheerserver in</string>
   <string name="help_pin_enter">Voer de pincode in vanuit uw Jami-account dat al is geconfigureerd op een ander apparaat. Gebruik de functie ‘Jami-account exporteren’ om een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
@@ -184,6 +187,7 @@
   <string name="share_label">Delen</string>
   <string name="generic_error_migration">Fout</string>
   <string name="generic_error_migration_message">Er trad een fout op tijdens het migratieproces</string>
+  <string name="title_share_with">Delen met…</string>
   <!--Pending contact requests-->
   <string name="accept">Accepteren</string>
   <string name="refuse">Afwijzen</string>
@@ -203,6 +207,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">Geen contactverzoek verstuurd</string>
   <string name="contact_request_sent">Contactverzoek verstuurd</string>
+  <string name="start_conversation">Gesprek beginnen</string>
   <string name="search_results">Zoekresultaten</string>
   <string name="tv_contact_row_header">Contacten</string>
   <string name="gallery_error_title">Geen Galerij-app gevonden</string>
@@ -234,4 +239,6 @@
   <string name="menu_message_delete">Bericht verwijderen</string>
   <string name="menu_message_cancel">Bericht annuleren</string>
   <string name="menu_delete">Verwijderen</string>
+  <string name="pref_darkTheme_title">Donker thema</string>
+  <string name="pref_darkTheme_summary">Donker thema altijd gebruiken in plaats van systeemgedrag volgen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index fff6d57..f681169 100644
--- a/ring-android/app/src/main/res/values-nl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_account.xml
@@ -149,6 +149,7 @@
   <string name="account_sip_success_title">SIP-account geregistreerd</string>
   <string name="account_sip_success_message">Uw SIP-account is met succes geregistreerd.</string>
   <string name="account_sip_register_anyway">Toch registreren</string>
+  <string name="account_link_device">Verbinden vanaf ander apparaat</string>
   <string name="account_link_button">Verbinden uit netwerk</string>
   <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Voer pincode in</string>
@@ -160,6 +161,11 @@
   <string name="account_end_export_infos">Uw pincode is:\n\n%%\n\nOm het proces te voltooien opent u Jami op het nieuwe apparaat. Maak een nieuw account aan met ‘Dit apparaat aan een account koppelen’. Uw pincode is 10 minuten geldig.</string>
   <string name="account_link_export_info_light">Om dit account op andere apparaten te gebruiken dient u deze eerst op Ring bloot te stellen. Er zal een pincode gegenereerd worden die u op het nieuwe apparaat invoert om het account in te stellen. De pincode is 10 minuten geldig.</string>
   <string name="account_export_title">Apparaten toevoegen</string>
+  <string name="account_connect_server_button">Verbinden met beheerserver</string>
+  <string name="account_connect_button">Verbinden</string>
+  <string name="prompt_server">Jami-beheerserver-URL</string>
+  <string name="help_credentials_enter">Voer de referenties van uw organisatie in</string>
+  <string name="help_connect_password_enter">Voer het wachtwoord van uw organisatie in</string>
   <string name="account_connect_prompt_username">Gebruikersnaam</string>
   <!--Name registration-->
   <string name="error_username_empty">Voer een gebruikersnaam in</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_preferences.xml b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
index 5704f54..6afeafe 100644
--- a/ring-android/app/src/main/res/values-nl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
@@ -21,6 +21,7 @@
   <string name="pref_startOnBoot_title">Jami automatisch starten</string>
   <string name="pref_startOnBoot_summary">Voer Jami in de achtergrond uit wanneer het systeem gestart wordt.</string>
   <string name="pref_clearHistory_title">Geschiedenis wissen</string>
+  <string name="pref_clearHistory_summary">Wis de geschiedenis van alle gesprekken. Deze handeling kan niet ongedaan gemaakt worden.</string>
   <string name="pref_persistNotification_title">Uitvoeren in achtergrond</string>
   <string name="pref_persistNotification_summary">Maakt het mogelijk om in de achtergrond oproepen en berichten te ontvangen.</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index 77eb113..4f79d31 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
@@ -113,6 +113,8 @@
   <string name="send_file">Dërgo kartelë</string>
   <string name="hist_file_sent">Kartela u dërgua</string>
   <string name="hist_file_received">Kartela u mor</string>
+  <string name="conversation_send_audio">Incizoni copëz zanore</string>
+  <string name="conversation_send_video">Regjistroni copës video</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Leje për kamerën</string>
   <string name="permission_dialog_camera_message">Që të funksionojnë, bisedat me video lypin doemos leje për kamerën. Ju lutemi, shihni mundësinë e akordimit të saj.</string>
@@ -167,6 +169,7 @@
   <string name="prompt_new_username">Jepni emër përdoruesi të ri</string>
   <string name="help_password_choose">Për të mbrojtur llogarinë tuaj Jami, zgjidhni fjalëkalim të fuqishëm që do ta mbani mend.</string>
   <string name="help_password_enter">Jepni fjalëkalimin e llogarisë suaj kryesore Jami</string>
+  <string name="help_server_enter">Jepni URL-në e shërbyesit të administrimeve</string>
   <string name="help_pin_enter">Jepni PIN-in prej një llogarie tjetër Jami të formësuar. Përdorni veçorinë \"eksportoje llogarinë në Jami\" që të merrni një PIN.</string>
   <string name="wizard_next">Pasuesi</string>
   <string name="wizard_back">Mbrapsht</string>
@@ -184,6 +187,7 @@
   <string name="share_label">Ndajeni me të tjerë</string>
   <string name="generic_error_migration">Gabim</string>
   <string name="generic_error_migration_message">Ndodhi një gabim gjatë migrimit</string>
+  <string name="title_share_with">Ndajeni me…</string>
   <!--Pending contact requests-->
   <string name="accept">Pranoje</string>
   <string name="refuse">Hidhe tej</string>
@@ -203,6 +207,7 @@
   <!--Smartlist-->
   <string name="no_contact_request">S\’është dërguar ndonjë kërkesë kontakti</string>
   <string name="contact_request_sent">Kërkesa e kontaktit u dërgua</string>
+  <string name="start_conversation">Nisni bisedë</string>
   <string name="search_results">Përfundime Kërkimi</string>
   <string name="tv_contact_row_header">Kontakte</string>
   <string name="gallery_error_title">S\’u gjet aplikacion galerie</string>
@@ -234,4 +239,6 @@
   <string name="menu_message_delete">Fshije mesazhin</string>
   <string name="menu_message_cancel">Anuloje mesazhin</string>
   <string name="menu_delete">Fshije</string>
+  <string name="pref_darkTheme_title">Temë e errët</string>
+  <string name="pref_darkTheme_summary">Aktivizo përherë temën e errët, në vend të përdorimit të sjelljes së sistemit</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 6013cf8..bc369f3 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
@@ -112,6 +112,8 @@
   <string name="send_file">傳送檔案</string>
   <string name="hist_file_sent">檔案已傳送</string>
   <string name="hist_file_received">檔案已收到</string>
+  <string name="conversation_send_audio">錄製音訊片段</string>
+  <string name="conversation_send_video">錄製視訊片段</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">攝影機權限</string>
   <string name="permission_dialog_camera_message">視訊通話需要攝影機權限以正常運作。請考慮啟用它。</string>