diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index 6c59894b3fe5c8399f2dc1ff026db977f3b30867..83ee9b7194dd745f8fdf3594a9a153ef6e977925 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -195,6 +195,8 @@
   <string name="open_the_gallery">فتح المعرض</string>
   <string name="take_a_photo">إلتقاط صورة</string>
   <string name="profile_name_hint">إدخال إسمك</string>
+  <string name="account">حساب</string>
+  <string name="devices">الأجهزة المتصلة</string>
   <!--Share fragment-->
   <string name="share_message">إمسح هذا الكود بإستعمال جامي</string>
   <string name="share_message_no_account">الرجاء إختيار حساب للمشاركة.</string>
diff --git a/ring-android/app/src/main/res/values-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml
index 78bda5ef212ec7dc9f622f7e46cda8f4c460ab66..9dd4a49811f46407474f4d4e68fa5c13bd2d7115 100644
--- a/ring-android/app/src/main/res/values-ar/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_account.xml
@@ -91,6 +91,7 @@
   <string name="account_published_same_as_local_label">منشور مثل المحلي</string>
   <string name="account_published_port_label">نقطة العبور (port) المنشورة</string>
   <string name="account_published_address_label">العنوان المنشور</string>
+  <string name="account_sip_proxy_label">الوكيل</string>
   <!--Security Details-->
   <string name="account_credentials_label">الإعتمادات</string>
   <string name="account_credentials_edit">تعديل بيانات الاعتماد</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index 380596810deea33fd5654fb10b1fdaaeffdd57fc..68937775608bc452237047b3c8301c60d25933d1 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -153,6 +153,8 @@
   <string name="profile_message_warning">Профилът Ви се споделя само с контактите Ви</string>
   <string name="open_the_gallery">Отваряне на галерията</string>
   <string name="take_a_photo">Снимане</string>
+  <string name="registered_name">Регистрирано име</string>
+  <string name="account">Профил</string>
   <!--Share fragment-->
   <string name="share_message">Сканирайте този код с Jami</string>
   <string name="share_message_no_account">Моля, изберете кой профил искате да споделите.</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings_account.xml b/ring-android/app/src/main/res/values-bg/strings_account.xml
index 99d4556e3e205909c6bdab761877cc556697c474..c08770dc126b3cbde168e96f6a93005cf75aa9c6 100644
--- a/ring-android/app/src/main/res/values-bg/strings_account.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_account.xml
@@ -80,6 +80,7 @@
   <string name="account_published_port_label">Публикуван порт</string>
   <string name="account_published_address_label">Публикуван адрес</string>
   <string name="account_proxy_label">DHT прокси</string>
+  <string name="account_sip_proxy_label">Посредник</string>
   <!--Security Details-->
   <string name="account_credentials_label">Идентификационни данни</string>
   <string name="account_credentials_edit">Редактиране на идентификационните данни</string>
@@ -132,7 +133,6 @@
   <string name="account_connect_prompt_username">Потребителско име</string>
   <!--Name registration-->
   <string name="error_username_empty">Въведете потребителско име</string>
-  <string name="no_registered_name_for_account">Няма открито регистрирано име за този профил</string>
   <string name="trying_to_register_name">Протича опит за регистриране на името</string>
   <string name="registered_username">Регистрирано потребителско име</string>
   <string name="register_username">Регистриране на публично потребителско име</string>
@@ -163,6 +163,5 @@
   <string name="rename_device_button">Преименуване на устройството</string>
   <string name="account_rename_device_hint">Изберете ново име за устройството</string>
   <string name="account_device_name_empty">Името на устройството не може да бъде празно</string>
-  <string name="account_device_this_indicator">това устройство</string>
   <string name="account_disabled_indicator">изключено</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 1309eafd4a5eb8d9252aaa548b5092d2e5b1eade..2d6a856ed6826606936bde7ed1e1918840469faf 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -104,6 +104,7 @@
   <string name="share_via">Comparteix via</string>
   <string name="write_a_message">Escriu un missatge</string>
   <string name="scan_qr">Escaneja un codi QR</string>
+  <string name="qr_code">Codi QR</string>
   <string name="ab_action_flipcamera">Canvia la càmera</string>
   <!--Text messages-->
   <string name="send_message">Envia el missatge</string>
@@ -180,6 +181,8 @@
   <string name="profile_message_warning">El vostre perfil només es comparteix amb els vostres contactes</string>
   <string name="open_the_gallery">Obre la galeria</string>
   <string name="take_a_photo">Fes una foto</string>
+  <string name="identity">Identitat</string>
+  <string name="account">Compte</string>
   <!--Share fragment-->
   <string name="share_message">Escaneja aquest codi amb Jami</string>
   <string name="share_message_no_account">Seleccioneu un compte per compartir</string>
diff --git a/ring-android/app/src/main/res/values-ca/strings_account.xml b/ring-android/app/src/main/res/values-ca/strings_account.xml
index 104c4f083873f26b60c858a0286a73079a1aa108..af606af77e766d3211f85857ffaeb9f4c8a262d9 100644
--- a/ring-android/app/src/main/res/values-ca/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_account.xml
@@ -96,6 +96,7 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="account_proxy_enable_label">Utilitza servidor intermediari DHT</string>
   <string name="account_proxy_server_label">Direcció de l\'intermediari DHT</string>
   <string name="account_proxy_server_list_label">URL de la llista d\'intermediaris DHT</string>
+  <string name="account_sip_proxy_label">Intermediari</string>
   <string name="account_peer_discovery_label">Descobriment local de parells</string>
   <string name="account_peer_discovery_enable_label">Activa el descobriment local de parells</string>
   <string name="account_peer_discovery_enable_summary">Connecta a altres nodes DHT anunciats en la nostra xarxa local</string>
@@ -176,7 +177,6 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="account_connect_prompt_username">Nom d\'usuari</string>
   <!--Name registration-->
   <string name="error_username_empty">Inseriu el vostre nom d\'usuari</string>
-  <string name="no_registered_name_for_account">No s\'ha trobat cap nom registrat per aquest compte</string>
   <string name="username_available">Nom d\'usuari disponible !</string>
   <string name="trying_to_register_name">Provant de registrar nom d\'usuari</string>
   <string name="registered_username">Nom d\'usuari registrat</string>
@@ -211,6 +211,5 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="rename_device_button">Canvia el nom del dispositiu</string>
   <string name="account_rename_device_hint">Esculli nou nom de dispositiu</string>
   <string name="account_device_name_empty">El nom del dispositiu no pot estar buit</string>
-  <string name="account_device_this_indicator">aquest dispositiu</string>
   <string name="account_disabled_indicator">deshabilitat</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings_preferences.xml b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
index 963f731f57f7acfecf5865ee74e794df9f5433da..449ee3f201ab92b1311e165038797316a1fcbb27 100644
--- a/ring-android/app/src/main/res/values-ca/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Executa Jami en segon pla quan el sistema s\'inicia.</string>
   <string name="pref_clearHistory_title">Neteja historial</string>
   <string name="pref_clearHistory_summary">Neteja totes les converses de l\'historial. Aquesta acció no pot es desfer.</string>
+  <string name="pref_delete_account_title">Esborrar compte</string>
   <string name="pref_persistNotification_title">Executa en segon pla</string>
   <string name="pref_persistNotification_summary">Permet executar en segon pla per rebre trucades i missatges.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
index 6178fa772ff4af2e5648587351ab0e841c1d1846..2479f0fdd487a0c62c5125f5ceb608432610fd85 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings.xml
@@ -113,6 +113,7 @@
   <string name="share_via">Sdílet přes</string>
   <string name="write_a_message">Napsat zprávu</string>
   <string name="scan_qr">Skenovat kód QR</string>
+  <string name="qr_code">Kód QR</string>
   <string name="ab_action_flipcamera">Otočit kameru</string>
   <string name="ab_action_hidepreview">Skrýt náhled</string>
   <!--Text messages-->
@@ -194,6 +195,11 @@
   <string name="open_the_gallery">Otevřít galerii</string>
   <string name="take_a_photo">Pořídit fotku</string>
   <string name="profile_name_hint">Zadejte své jméno</string>
+  <string name="registered_name">Registrované jméno</string>
+  <string name="identity">Totožnost</string>
+  <string name="account">Účet</string>
+  <string name="link_new_device">Připojit nové zařízení</string>
+  <string name="devices">Připojená zařízení</string>
   <!--Share fragment-->
   <string name="share_message">Skenovat tento kód s Jami</string>
   <string name="share_message_no_account">Vyberte, prosím, účet ke sdílení.</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
index eb7bd6d79ca825b8ee46bc35ee498ce4046a87a2..1afa9556df3d681a688dfcfd60969dced88f1e68 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_account.xml
@@ -98,6 +98,7 @@ Svůj účet můžete upravit později</string>
   <string name="account_proxy_enable_label">Použít proxy DHT</string>
   <string name="account_proxy_server_label">Adresa proxy DHT</string>
   <string name="account_proxy_server_list_label">URL seznamu proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Zjištění místních klientů</string>
   <string name="account_peer_discovery_enable_label">Povolit zjištění místních klientů</string>
   <string name="account_peer_discovery_enable_summary">Připojit se k ostatním uzlům DHT vysílajícím na naší místní síti</string>
@@ -186,7 +187,6 @@ Prověřte, prosím, své heslo.</string>
   <string name="account_connect_prompt_username">Uživatelské jméno</string>
   <!--Name registration-->
   <string name="error_username_empty">Zadejte uživatelské jméno</string>
-  <string name="no_registered_name_for_account">Pro tento účet nenalezeno žádné registrované jméno</string>
   <string name="username_available">Uživatelské jméno je dostupné!</string>
   <string name="register_name">Zaregistrovat jméno</string>
   <string name="trying_to_register_name">Pokus o registraci jména</string>
@@ -223,6 +223,6 @@ Prověřte, prosím, své heslo.</string>
   <string name="rename_device_button">Přejmenovat zařízení</string>
   <string name="account_rename_device_hint">Zvolit si název nového zařízení</string>
   <string name="account_device_name_empty">Název zařízení nemůže být prázdný</string>
-  <string name="account_device_this_indicator">toto zařízení</string>
+  <string name="account_device_this_indicator">Toto zařízení</string>
   <string name="account_disabled_indicator">zakázáno</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
index bb74433b44a2213d4d3f0876513646cfa8698cbc..b88957b280aa4c76cf759619f09143403d514f88 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">Spustit Jami na pozadí po spuštění systému.</string>
   <string name="pref_clearHistory_title">Vymazat historii</string>
   <string name="pref_clearHistory_summary">Vymaže celou historii konverzací. Tento úkon nelze vrátit zpět.</string>
+  <string name="pref_delete_account_title">Odstranit účet</string>
   <string name="pref_persistNotification_title">Běžet na pozadí</string>
   <string name="pref_persistNotification_summary">Umožnit běh na pozadí pro příjem hovorů a zpráv.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-da/strings.xml b/ring-android/app/src/main/res/values-da/strings.xml
index b3d8917aad9fbf4406facdc8c72fae215a943ef2..0588728be9a67afc994a3193c25efa22a9a08335 100644
--- a/ring-android/app/src/main/res/values-da/strings.xml
+++ b/ring-android/app/src/main/res/values-da/strings.xml
@@ -2,7 +2,9 @@
 <resources>
   <!--About-->
   <string name="feedback_section">Tilbagemelding</string>
+  <string name="report">Send os en email</string>
   <string name="section_license">Licens</string>
+  <string name="sponsor_section">Jami er fri software udviklet og understøttet af</string>
   <string name="copyright_section">Ophavsret</string>
   <string name="contribute_section">Bidrag</string>
   <string name="version_section">Version</string>
@@ -12,9 +14,12 @@
   <string name="website_chooser_title">Vis websted med...</string>
   <string name="description">Jami is free software for universal communication which respects the freedoms and privacy of its users. (Näcken)</string>
   <string name="credits">Krediteringer</string>
+  <string name="call_service_description">Denne service er nødvendig for at holde opkald kørende i baggrunden. Den kører kun under opkald.</string>
+  <string name="data_transfer_service_description">Denne service er nødvendig for at vise persistente notifikationer under fil overførelser. Den kører kunder under fil overførelser.</string>
   <!--About dialog-->
   <string name="developed_by">Udviklet af</string>
   <string name="designed_by">Designet af</string>
+  <string name="ringtones_by">Ringetoner af</string>
   <!--RingActivity-->
   <string name="error_no_network">Ingen netværksforbindelse</string>
   <string name="error_mobile_network_available_but_disabled">Venligst tillad adgang til telefon netværk under Indstillinger.</string>
@@ -25,6 +30,7 @@
   <string name="menu_item_accounts">Håndtér konti</string>
   <string name="menu_item_account">Håndter konto</string>
   <string name="menu_item_settings">Indstillinger</string>
+  <string name="menu_item_plugin_list">Plugin Indstillinger</string>
   <string name="menu_item_share">Del min kontakt</string>
   <string name="menu_item_about">Om Jami</string>
   <!--Dialing Fragment-->
@@ -37,6 +43,7 @@
     <item quantity="other">%d samtaler</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Søg efter navn og telefonnummer...</string>
   <string name="choose_number">Vælg et nummer</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -47,27 +54,51 @@
   <string name="notif_incoming_call">Indgående opkald</string>
   <string name="notif_outgoing_call_title">Udgående opkald til %1$s</string>
   <string name="notif_outgoing_call">Udgående opkald</string>
+  <string name="notif_current_call_title">Igangværende opkald med %1$s</string>
   <string name="notif_current_call">Igangværende opkald</string>
+  <string name="notif_channel_call_in_progress">Igangværende Opkald</string>
   <string name="notif_channel_calls">Opkald</string>
   <string name="notif_channel_missed_calls">Ubesvarede opkald</string>
+  <string name="notif_channel_incoming_calls">Indkommende opkald</string>
   <string name="notif_channel_messages">Beskeder</string>
   <string name="notif_channel_requests">Forespørgsler</string>
   <string name="notif_channel_file_transfer">Filoverførsler</string>
+  <string name="notif_channel_sync">Data synkronisering</string>
+  <string name="notif_channel_background_service">Baggrundsservice</string>
+  <string name="notif_channel_background_service_descr">Tillader modtagelse af opkald og meddelelser til enhver tid.</string>
   <string name="notif_group_calls">Opkald</string>
+  <string name="notif_background_service">Jami kører for nuværende i baggrunden</string>
   <string name="notif_mark_as_read">Marker som læst</string>
   <string name="notif_dismiss">Afvis</string>
   <string name="notif_reply">Svar</string>
   <string name="notif_incoming_file_transfer_title">Indgående fil fra %1$s</string>
   <string name="notif_outgoing_file_transfer_title">Sender fil til %1$s</string>
   <string name="notif_incoming_picture">Billede fra %1$s</string>
+  <string name="notif_sync_title">Synkroniserer data...</string>
+  <string name="notif_location_title">Deler lokation med %1$s</string>
+  <string name="location_share_contact">%1$s deler sin lokation med dig</string>
+  <string name="notif_location_multi_title">Deler lokation med %1$d kontakter</string>
+  <string name="notif_location_remaining">%1$dminutter tilbage</string>
+  <string name="notif_location_action_stop">Stop deling af lokation</string>
+  <string name="location_share_action_start">Start deling</string>
+  <string name="location_share_action_stop">Stop deling</string>
+  <string name="location_share_about_title">Kort information</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Dig:</string>
   <string name="action_call_hangup">Læg på</string>
+  <string name="action_call_maximize">Maksimer</string>
+  <string name="action_call_minimize">Reducer</string>
   <string name="ongoing_call">Igangværende opkald</string>
   <string name="hist_in_call">Indgående opkald af %1$s</string>
   <string name="hist_out_call">Udgående opkald af %1$s</string>
+  <string name="start_error_title">Kan ikke starte Jami!</string>
+  <string name="start_error_mic_required">Jami kræver adgang til mikrofonen for at virke.</string>
   <string name="action_call_accept">Besvar opkald</string>
+  <string name="action_call_hold_accept">Put på hold og tag besvar opkald</string>
+  <string name="action_call_end_accept">Afslut og besvar opkald</string>
   <string name="action_call_decline">Afvis</string>
+  <string name="action_call_mic_mute">Sluk mikrofon</string>
+  <string name="action_load_plugin">Indlæs plugin</string>
   <string name="ab_action_speakerphone">Aktiver højtaler</string>
   <string name="ab_action_contact_add">Tilføj til kontakt</string>
   <string name="ab_action_contact_add_question">Tilføj til kontakter?</string>
@@ -80,6 +111,7 @@
   <string name="write_a_message">Skriv en besked</string>
   <string name="scan_qr">Scan QR-kode</string>
   <string name="ab_action_flipcamera">Flip-kamera</string>
+  <string name="ab_action_hidepreview">Skjul forhåndsvisning</string>
   <!--Text messages-->
   <string name="send_message">Send besked</string>
   <string name="message_sending">Sender besked...</string>
@@ -88,6 +120,9 @@
   <string name="send_file">Send fil</string>
   <string name="hist_file_sent">Fil sendt</string>
   <string name="hist_file_received">Fil modtaget</string>
+  <string name="conversation_send_audio">Optag lyd klip</string>
+  <string name="conversation_send_video">Optag video klip</string>
+  <string name="conversation_share_location">Del lokation</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Kamera-tilladelse</string>
   <string name="permission_dialog_camera_message">Video-samtaler kræver kamera-tilladelse for at fungere. Overvej venligst at give denne tilladelse.</string>
@@ -95,6 +130,7 @@
   <string name="ringtone_error_title">Fejl</string>
   <string name="ringtone_error_format_not_supported">Dette format understøttes ikke.</string>
   <string name="ringtone_error_size_too_big">Filen er for stor. Maksimumstørrelsen er %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Anvend en brugerdefineret ringetone</string>
   <string name="ringtone_custom_label">Brugerdefineret</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
@@ -135,6 +171,11 @@
   <string name="profile_message_warning">Din profil vil kun blive delt med dine kontakter</string>
   <string name="open_the_gallery">Åbn galleriet</string>
   <string name="take_a_photo">Tag et billede</string>
+  <string name="registered_name">Registreret navn</string>
+  <string name="identity">Identitet</string>
+  <string name="account">Konto</string>
+  <string name="link_new_device">Tilknyt en ny enhed</string>
+  <string name="devices">Sammenkædede enheder</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Vælg en konto at dele.</string>
   <string name="share_your_account_information">Del min kontaktinformation</string>
@@ -193,5 +234,6 @@
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Send</string>
   <!--Wizard-->
+  <string name="wizard_username_info">Vælg et brugernavn til din konto</string>
   <string name="wizard_password_skip">Opret konto</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da/strings_account.xml b/ring-android/app/src/main/res/values-da/strings_account.xml
index ff2eafdee139643aae3e19eea4c5991bb7d149f1..3194197a76e28a08c0e3443ff62af01ba21b0f1b 100644
--- a/ring-android/app/src/main/res/values-da/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da/strings_account.xml
@@ -81,6 +81,7 @@ Du kan rette din konto senere</string>
   <string name="account_proxy_label">DHT-proxy</string>
   <string name="account_proxy_enable_label">Brug DHT-proxy</string>
   <string name="account_proxy_server_label">Adresse til DHT-proxy</string>
+  <string name="account_sip_proxy_label">Stedfortræder</string>
   <!--Security Details-->
   <string name="account_credentials_label">Legitimeringsoplysninger</string>
   <string name="account_credentials_edit">Rediger Legitimeringsoplysninger</string>
@@ -138,7 +139,6 @@ Du kan rette din konto senere</string>
   <string name="account_connect_prompt_username">Brugernavn</string>
   <!--Name registration-->
   <string name="error_username_empty">Indtast et brugernavn</string>
-  <string name="no_registered_name_for_account">Intet registreret navn fundet for denne konto</string>
   <string name="trying_to_register_name">Forsøger at registrere navn</string>
   <string name="registered_username">Registreret brugernavn</string>
   <string name="register_username">Registrer offentligt brugernavn</string>
@@ -168,6 +168,6 @@ Du kan rette din konto senere</string>
   <string name="rename_device_button">Omdøb enhed</string>
   <string name="account_rename_device_hint">Vælg nyt enhedsnavn</string>
   <string name="account_device_name_empty">Enhedsnavn kan ikke være tom</string>
-  <string name="account_device_this_indicator">denne enhed</string>
+  <string name="account_device_this_indicator">Denne enhed</string>
   <string name="account_disabled_indicator">deaktiveret</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da/strings_preferences.xml b/ring-android/app/src/main/res/values-da/strings_preferences.xml
index b6b6b1d1fbef6df3073195ac178d36c6d79c44be..85440b3f65031f274ef0ccb55105a6c342dfadb9 100644
--- a/ring-android/app/src/main/res/values-da/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-da/strings_preferences.xml
@@ -12,5 +12,6 @@
   <string name="pref_systemContacts_title">Brug systemkontakter</string>
   <string name="pref_systemContacts_summary">Brug systemkontakter til at vise opkaldsdetaljer</string>
   <string name="pref_clearHistory_title">Ryd historiken</string>
+  <string name="pref_delete_account_title">Slet konto</string>
   <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 927870a59c524fd69c687480a72cce202e184a76..5f31ba755b7e15235b275ebb7790b8d78aff1888 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -154,6 +154,7 @@
   <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
   <string name="open_the_gallery">Galerie öffnen</string>
   <string name="take_a_photo">Mache ein Foto</string>
+  <string name="account">Konto</string>
   <!--Share fragment-->
   <string name="share_message">Diesen Code mit Jami scannen</string>
   <string name="share_message_no_account">Bitte wählen Sie ein Konto, das Sie teilen wollen.</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
index 1593f81d7b9985a4a98fb963349908f3f18a4d07..362e2f068943edbd20b6c3abf1b4780fcf7d3e0d 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_account.xml
@@ -77,6 +77,7 @@ Sie können Ihr Konto später ändern.</string>
   <string name="account_proxy_label">DHT Proxy</string>
   <string name="account_proxy_enable_label">DHT Proxy verwenden</string>
   <string name="account_proxy_server_label">DHT Proxy Adresse</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <string name="account_credentials_label">Anmeldeinformationen</string>
   <string name="account_credentials_edit">Anmeldeinformationen bearbeiten</string>
@@ -142,5 +143,4 @@ Sie können Ihr Konto später ändern.</string>
   <string name="rename_device_button">Gerät umbenennen</string>
   <string name="account_rename_device_hint">Wählen Sie einen neuen Gerätenamen</string>
   <string name="account_device_name_empty">Der Gerätename darf nicht leer sein</string>
-  <string name="account_device_this_indicator">dieses Gerät</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
index f12cf670ab049eac5e55c9bf21ce55b5201026af..1a5cdba6a98a177ee451b7c38004d53227ab07a8 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Jami im Hintergrund ausführen während das System startet.</string>
   <string name="pref_clearHistory_title">Verlauf löschen</string>
   <string name="pref_clearHistory_summary">Löschen Sie den gesamten Konversationsverlauf. Diese Aktion kann nicht rückgängig gemacht werden.</string>
+  <string name="pref_delete_account_title">Konto löschen</string>
   <string name="pref_persistNotification_title">Im Hintergrund ausführen</string>
   <string name="pref_persistNotification_summary">Ausführung im Hintergrund zulassen, um Anrufe und Nachrichten zu empfangen.</string>
   <!--Plugin-->
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 153ec80012431e8077ce533ccaa52dbc23279c44..9ebf7094fba467acadeb401deaf0d69df378eee6 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -111,6 +111,7 @@
   <string name="share_via">Teilen mit</string>
   <string name="write_a_message">Sende eine Nachricht</string>
   <string name="scan_qr">QR-Code scannen</string>
+  <string name="qr_code">QR-Code</string>
   <string name="ab_action_flipcamera">Kamerabild kippen</string>
   <string name="ab_action_hidepreview">Vorschau ausblenden</string>
   <!--Text messages-->
@@ -192,6 +193,11 @@
   <string name="open_the_gallery">Galerie öffnen</string>
   <string name="take_a_photo">Foto machen</string>
   <string name="profile_name_hint">Namen eingeben</string>
+  <string name="registered_name">Registrierter Name</string>
+  <string name="identity">Identität</string>
+  <string name="account">Konto</string>
+  <string name="link_new_device">Verbinde ein neues Gerät</string>
+  <string name="devices">Verbundene Geräte</string>
   <!--Share fragment-->
   <string name="share_message">Diesen Code mit Jami scannen</string>
   <string name="share_message_no_account">Bitte wähle ein Konto zum Teilen aus.</string>
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 b060cc3a669397152ea04ee0254c2107d348a30c..ebca72c86448a463db258f66073f002e0f2ada18 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
@@ -100,6 +100,7 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_proxy_enable_label">DHT Proxy nutzen</string>
   <string name="account_proxy_server_label">DHT Proxy Adresse</string>
   <string name="account_proxy_server_list_label">DHT Proxy Liste URL</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Lokale Peer Erkennung</string>
   <string name="account_peer_discovery_enable_label">Erlaube das finden von lokalen Peers</string>
   <string name="account_peer_discovery_enable_summary">Verbinde zu anderen sich meldenden DHT Knoten in unserem lokalen Netzwerk</string>
@@ -186,7 +187,6 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_connect_prompt_username">Benutzername</string>
   <!--Name registration-->
   <string name="error_username_empty">Benutzername eingeben</string>
-  <string name="no_registered_name_for_account">Es wurde kein registrierter Name für dieses Konto gefunden</string>
   <string name="username_available">Benutzername verfügbar !</string>
   <string name="register_name">Registriere Namen</string>
   <string name="trying_to_register_name">Name wird registriert</string>
@@ -223,6 +223,6 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="rename_device_button">Gerät umbenennen</string>
   <string name="account_rename_device_hint">Wählen Sie einen neuen Gerätenamen</string>
   <string name="account_device_name_empty">Geräte darf nicht leer sein</string>
-  <string name="account_device_this_indicator">dieses Gerät</string>
+  <string name="account_device_this_indicator">Dieses Gerät</string>
   <string name="account_disabled_indicator">deaktiviert</string>
 </resources>
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 8cf595af68b2a629d6626471e7138759fae32d6a..093bf2b81809839afd2d92fc13b8cd75db956aaa 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
@@ -26,6 +26,7 @@
   <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_delete_account_title">Konto löschen</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>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 3941ff913e427e6124dc993b52db5ca39abcbae6..af76ab2d3c4c9e60bcefd5325ef1db98882e34a1 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -117,6 +117,7 @@
   <string name="profile_message_warning">Το προφίλ σας διαμοιράζεται μόνο με τις επαφές σας</string>
   <string name="open_the_gallery">Άνοιγμα έκθεσης</string>
   <string name="take_a_photo">Λήψη φωτογραφίας</string>
+  <string name="account">Λογαριασμός</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Επιλέξτε έναν λογαριασμό για διαμοιρασμό.</string>
   <string name="share_your_account_information">Μοίρασε τις πληροφορίες των επαφών μου</string>
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index 75238a3181609f8e2ff27cb1166346900d69b626..103d2cfe7ad721c863ad1faf8b6d6bc42b7b9e8d 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -42,6 +42,7 @@
   <string name="account_preferences_advanced_tab">Για προχωρημένους</string>
   <string name="account_turn_enable_label">Χρήση TURN</string>
   <string name="account_published_address_label">Δημοσιευμένη διεύθυνση</string>
+  <string name="account_sip_proxy_label">Διαμεσολαβητής</string>
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Ασφάλεια</string>
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index 4897c2a4b50d082d96c3d520265815929ca20c8e..77da171dd940ef9a0f555f7cd5653c9713a5bfb9 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -82,6 +82,7 @@
   <string name="wizard_next">Sekva</string>
   <!--Account Summary-->
   <string name="profile">Profilo</string>
+  <string name="account">Konto</string>
   <!--Share fragment-->
   <string name="share_label">Kunhavi</string>
   <string name="generic_error_migration">Eraro</string>
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index 1e765918b02186dde5986e11f4836f7da81cb3c6..d5ba7723bd92025170267fa1290524f6666f532e 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -60,6 +60,7 @@
   <string name="account_published_same_as_local_label">Publikita same kiel local</string>
   <string name="account_published_port_label">Publikito Pordo</string>
   <string name="account_published_address_label">Publikita Adreso</string>
+  <string name="account_sip_proxy_label">Prokura Servilo</string>
   <!--Security Details-->
   <string name="account_credentials_label">Ensalutiloj</string>
   <string name="account_credentials_edit">Redakti ensalutilojn</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings.xml b/ring-android/app/src/main/res/values-es-rAR/strings.xml
index aea1c796f36d2de6555f26996896a1dbb0fd57e8..4cf5ee7b3e2da5e8f64c81f3b149cd196600fe59 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings.xml
@@ -104,6 +104,7 @@
   <string name="share_via">Compartir con</string>
   <string name="write_a_message">Escribí un mensaje</string>
   <string name="scan_qr">Leer código QR</string>
+  <string name="qr_code">Código QR</string>
   <string name="ab_action_flipcamera">Girar cámara</string>
   <string name="ab_action_hidepreview">Ocultar previsualización</string>
   <!--Text messages-->
@@ -184,6 +185,11 @@
   <string name="open_the_gallery">Abrir galería</string>
   <string name="take_a_photo">Tomar foto</string>
   <string name="profile_name_hint">Ingresá tu nombre</string>
+  <string name="registered_name">Nombre Registrado</string>
+  <string name="identity">Identidad</string>
+  <string name="account">Cuenta</string>
+  <string name="link_new_device">Vincular un nuevo dispositivo</string>
+  <string name="devices">Dispositivos vinculados</string>
   <!--Share fragment-->
   <string name="share_message">Escaneá este código con Jami</string>
   <string name="share_message_no_account">Selecciona una cuenta que quieras compartir.</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_account.xml b/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
index d9175ac169e05099f206539df19ddb987ce294f2..2be4b7f3a02219903d5456945f2628d23307b8d4 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_account.xml
@@ -96,6 +96,7 @@ Podrá editar su cuenta más tarde.</string>
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Dirección del proxy DHT</string>
   <string name="account_proxy_server_list_label">Dirección URL del proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descubrimiento de pares locales</string>
   <string name="account_peer_discovery_enable_label">Habilitar descubrimiento de pares locales</string>
   <string name="account_peer_discovery_enable_summary">Conéctese a otros nodos DHT que se anuncian en nuestra red local</string>
@@ -180,7 +181,6 @@ Podrá editar su cuenta más tarde.</string>
   <string name="account_connect_prompt_username">Nombre de usuario</string>
   <!--Name registration-->
   <string name="error_username_empty">Ingresá un nombre de usuario</string>
-  <string name="no_registered_name_for_account">No se encontró ningún nombre registrado para esta cuenta</string>
   <string name="username_available">¡Nombre de usuario disponible!</string>
   <string name="trying_to_register_name">Intentanto registrar nombre</string>
   <string name="registered_username">Nombre de usuario registrado</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
index bd4ff53b6fe53c0c879f83e507e66ced666c1a08..0f09f312566d9bc4e2198f3a1cb9c3a1a5d33c1a 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Ejecutar Jami en segundo plano al iniciar el sistema</string>
   <string name="pref_clearHistory_title">Borrar historial</string>
   <string name="pref_clearHistory_summary">Borrar todo el historial de conversaciones. Esta operación no se puede deshacer.</string>
+  <string name="pref_delete_account_title">Eliminar cuenta</string>
   <string name="pref_persistNotification_title">Ejecutar en segundo plano</string>
   <string name="pref_persistNotification_summary">Permitir ejecutar en segundo plano para recibir llamadas y mensajes.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-es-rMX/strings.xml b/ring-android/app/src/main/res/values-es-rMX/strings.xml
index f6f4e12cb220da2aa31f67abb887927f965bc465..ef40547dfaea256361f868a71a534fdc7ae923e9 100644
--- a/ring-android/app/src/main/res/values-es-rMX/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rMX/strings.xml
@@ -27,6 +27,7 @@
   <!--Contacts-->
   <string name="wizard_next">Siguiente</string>
   <!--Account Summary-->
+  <string name="account">Cuenta</string>
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index ab7a4cc28bbcd5c6719c5b642d74ddf14aed9e5e..ca1017f0ab3d0c33852dc73e5eee873f7f95b2cd 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -88,6 +88,7 @@
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tú:</string>
   <string name="action_call_hangup">Colgar</string>
+  <string name="action_call_maximize">Maximizar</string>
   <string name="ongoing_call">Llamada en curso</string>
   <string name="hist_in_call">Llamada entrante de %1$s</string>
   <string name="hist_out_call">Llamada saliente a %1$s</string>
@@ -110,6 +111,7 @@
   <string name="share_via">Compatir via</string>
   <string name="write_a_message">Escribir un mensaje</string>
   <string name="scan_qr">Escanear código QR</string>
+  <string name="qr_code">Código QR</string>
   <string name="ab_action_flipcamera">Cambiar de cámara</string>
   <string name="ab_action_hidepreview">Ocultar vista previa</string>
   <!--Text messages-->
@@ -190,6 +192,11 @@
   <string name="open_the_gallery">Abrir la galería</string>
   <string name="take_a_photo">Tomar una foto</string>
   <string name="profile_name_hint">Escribe tu nombre</string>
+  <string name="registered_name">Nombre registrado</string>
+  <string name="identity">Identidad</string>
+  <string name="account">Cuenta</string>
+  <string name="link_new_device">Vincular un nuevo dispositivo</string>
+  <string name="devices">Dispositivos vinculados</string>
   <!--Share fragment-->
   <string name="share_message">Escanear este código con Jami</string>
   <string name="share_message_no_account">Seleccione una cuenta para compartir.</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index cc5c19c093b03bfdde857365c2c96298a6f551b3..a66d1c39738620c5d0b78f8b412cacb8c589fae1 100644
--- a/ring-android/app/src/main/res/values-es/strings_account.xml
+++ b/ring-android/app/src/main/res/values-es/strings_account.xml
@@ -45,6 +45,7 @@ Puedes editar tu cuenta luego</string>
   <string name="account_device_revocation_unknown_device">Dispositivo desconocido</string>
   <string name="account_device_revocation_error_unknown">Error desconocido.</string>
   <string name="account_password_change">Cambiar contraseña</string>
+  <string name="account_password_set">Establece una contraseña</string>
   <string name="account_password_change_wait_message">Cambiar contraseña de cuenta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
@@ -97,6 +98,7 @@ Puedes editar tu cuenta luego</string>
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Dirección proxy DHT</string>
   <string name="account_proxy_server_list_label">URL del listado de proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descubrimiento local de pares</string>
   <string name="account_peer_discovery_enable_label">Habilitar descubrimiento local de pares</string>
   <string name="account_peer_discovery_enable_summary">Conectarse a otros nodos DHT que se anuncian en nuestra red local</string>
@@ -133,6 +135,7 @@ Puedes editar tu cuenta luego</string>
   <string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
   <string name="export_account_wait_title">Por favor, espera...</string>
   <string name="export_account_wait_message">Exportando información de cuenta</string>
+  <string name="account_export_file">Crear copia de seguridad de la cuenta</string>
   <string name="account_export_end_decryption_message">Error al desbloquear tu cuenta con la contraseña provista</string>
   <string name="account_export_end_network_title">Error en la red</string>
   <string name="account_export_end_network_message">Error al exportar la cuenta a la red. Verifica tu conectividad.</string>
@@ -182,8 +185,8 @@ Puedes editar tu cuenta luego</string>
   <string name="account_connect_prompt_username">Nombre de usuario</string>
   <!--Name registration-->
   <string name="error_username_empty">Ingresa un nombre de usuario</string>
-  <string name="no_registered_name_for_account">No se ha encontrado un nombre registrado con esta cuenta</string>
   <string name="username_available">¡Nombre de usuario disponible!</string>
+  <string name="register_name">Registra tu nombre</string>
   <string name="trying_to_register_name">Intentando registrar nombre</string>
   <string name="registered_username">Nombre de usuario registrado</string>
   <string name="register_username">Registrar nombre de usuario público</string>
@@ -218,6 +221,6 @@ Puedes editar tu cuenta luego</string>
   <string name="rename_device_button">Renombrar dispositivo</string>
   <string name="account_rename_device_hint">Elige un nuevo nombre para el dispositivo</string>
   <string name="account_device_name_empty">El nombre no puede quedar en blanco</string>
-  <string name="account_device_this_indicator">este dispositivo</string>
+  <string name="account_device_this_indicator">Este dispositivo</string>
   <string name="account_disabled_indicator">desactivado</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_preferences.xml b/ring-android/app/src/main/res/values-es/strings_preferences.xml
index 1e61f7c31b005ce2c43e37d96177e3535348d909..7a9ded57c023e3165407b03b1753097041dacdf4 100644
--- a/ring-android/app/src/main/res/values-es/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">Ejecutar Jami en segundo plano cuando se inicie el sistema.</string>
   <string name="pref_clearHistory_title">Limpiar historial</string>
   <string name="pref_clearHistory_summary">Limpiar el historial de todas las conversaciones. Esta acción no se puede deshacer.</string>
+  <string name="pref_delete_account_title">Borrar cuenta</string>
   <string name="pref_persistNotification_title">Ejecutar en segundo plano</string>
   <string name="pref_persistNotification_summary">Permite ejecutar en segundo plano para recibir llamadas y mensajes.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-eu/strings.xml b/ring-android/app/src/main/res/values-eu/strings.xml
index 1dd57b6bd07a2f1a858244c895ad39b1ebdaf15b..9650721cf4063743cf588ea39ac04ea975d02c3b 100644
--- a/ring-android/app/src/main/res/values-eu/strings.xml
+++ b/ring-android/app/src/main/res/values-eu/strings.xml
@@ -180,6 +180,8 @@
   <string name="profile_message_warning">Zure profila zure kontaktuekin partekatzen da soilik</string>
   <string name="open_the_gallery">Ireki galeria</string>
   <string name="take_a_photo">Atera argazkia</string>
+  <string name="identity">Identitatea</string>
+  <string name="account">Kontua</string>
   <!--Share fragment-->
   <string name="share_message">Eskaneatu kode hau Jami erabiliz</string>
   <string name="share_message_no_account">Hautatu kontu bat partekatzeko.</string>
diff --git a/ring-android/app/src/main/res/values-eu/strings_account.xml b/ring-android/app/src/main/res/values-eu/strings_account.xml
index a8851607779e53670e609480dcd6092ca716f216..471a0208a32e402d2951ab8260f51581ec5cf45d 100644
--- a/ring-android/app/src/main/res/values-eu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eu/strings_account.xml
@@ -69,6 +69,7 @@
   <string name="account_proxy_label">DHT proxya</string>
   <string name="account_proxy_enable_label">Erabili DHT proxya</string>
   <string name="account_proxy_server_label">DHT proxyaren helbidea</string>
+  <string name="account_sip_proxy_label">Proxya</string>
   <!--Security Details-->
   <string name="account_credentials_label">Kredentzialak</string>
   <string name="account_credentials_edit">Editatu kredentzialak</string>
@@ -141,6 +142,6 @@
   <string name="rename_device_button">Aldatu izena gailuari</string>
   <string name="account_rename_device_hint">Aukeratu gailuaren izen berria</string>
   <string name="account_device_name_empty">Gailuaren izena ezin da hutsik laga</string>
-  <string name="account_device_this_indicator">gailu hau</string>
+  <string name="account_device_this_indicator">Gailu hau</string>
   <string name="account_disabled_indicator">desgaituta</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-eu/strings_preferences.xml b/ring-android/app/src/main/res/values-eu/strings_preferences.xml
index 55abddbc2fc57038ae99763a3561a2616414f7f4..8ac72ac2c19465721f02bb88f97ed9d99a685961 100644
--- a/ring-android/app/src/main/res/values-eu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-eu/strings_preferences.xml
@@ -21,6 +21,7 @@
   <string name="pref_startOnBoot_summary">Hasi Jami bigarren planoan sistema abiatzean.</string>
   <string name="pref_clearHistory_title">Garbitu historiala</string>
   <string name="pref_clearHistory_summary">Garbitu elkarrizketa guztien historiala. Ekintza hau ezin da desegin.</string>
+  <string name="pref_delete_account_title">Kontua ezabatu</string>
   <string name="pref_persistNotification_title">Aritu bigarren planoan</string>
   <string name="pref_persistNotification_summary">Baimendu bigarren planoan aritzea deiak eta mezuak jasotzeko.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index 109cce61c5f70e4efc3a467004099b5d0f55c37f..4b6e1bfde1308ef29d5ea3917efaedb2a2a7f640 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -109,6 +109,7 @@
   <string name="share_via">اشتراک از طریق</string>
   <string name="write_a_message">پیامی بنویسید</string>
   <string name="scan_qr">اسکن کد QR</string>
+  <string name="qr_code">کد کیوآر</string>
   <string name="ab_action_flipcamera">چرخاندن دوربین</string>
   <string name="ab_action_hidepreview">مخفی‌کردن پیش‌نمایش</string>
   <!--Text messages-->
@@ -185,10 +186,16 @@
   <string name="wizard_skip">پرش</string>
   <!--Account Summary-->
   <string name="profile">نمایه</string>
+  <string name="profile_name">نام نمایه</string>
   <string name="profile_message_warning">نمایه شما تنها با مخاطبانتان هم‌رسانی می‌شود</string>
   <string name="open_the_gallery">گالری را باز کنید</string>
   <string name="take_a_photo">عکسی بگیرید</string>
   <string name="profile_name_hint">نام خود را وارد کنید</string>
+  <string name="registered_name">نام ثبت شده</string>
+  <string name="identity">هویت</string>
+  <string name="account">حساب</string>
+  <string name="link_new_device">پیوند یک دستگاه جدید</string>
+  <string name="devices">دستگاه‌های پیوند‌ داده‌شده</string>
   <!--Share fragment-->
   <string name="share_message">این رمز را با جمی اسکن کنید</string>
   <string name="share_message_no_account">لطفا برای هم‌رسانی، حسابی را انتخاب کنید.</string>
@@ -288,4 +295,5 @@
   <string name="wizard_profile_info">نمایه فقط با مخاطبین به اشتراک گذاشته می‌شود</string>
   <string name="wizard_profile_button">ذخیره نمایه</string>
   <string name="wizard_profile_skip">رد شوید و این کار را بعدا انجام دهید</string>
+  <string name="fab_path_choose">انتخاب یک فایل دیگر</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 5928c7dd15252c866e83e0e3f8ce52e3d0736a19..d36541a0df4a683a94d209ca845aac816c83c661 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
@@ -45,6 +45,7 @@
   <string name="account_device_revocation_unknown_device">دستگاه ناشناس.</string>
   <string name="account_device_revocation_error_unknown">خطای ناشناخته.</string>
   <string name="account_password_change">تغییر گذرواژه</string>
+  <string name="account_password_set">تعیین گذرواژه</string>
   <string name="account_password_change_wait_message">تغییر گذرواژه حساب</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">عمومی</string>
@@ -97,6 +98,7 @@
   <string name="account_proxy_enable_label"> استفاده از پروکسی DHT</string>
   <string name="account_proxy_server_label">آدرس پروکسی DHT</string>
   <string name="account_proxy_server_list_label">آدرس اینترنتی لیست پروکسی DHT</string>
+  <string name="account_sip_proxy_label">پراکسی</string>
   <string name="account_peer_discovery_label">کاوش همتای محلی</string>
   <string name="account_peer_discovery_enable_label">فعال‌سازی کاوش همتای محلی</string>
   <string name="account_peer_discovery_enable_summary">اتصال به دیگر گره‌های DHT که در شبکه محلی ما تبلیغ می‌کنند</string>
@@ -133,6 +135,7 @@
   <string name="error_passwords_not_equals">گذرواژه‌ها یکسان نیستند</string>
   <string name="export_account_wait_title">لطفا صبر کنید…</string>
   <string name="export_account_wait_message">برون‌برد اطلاعات حساب</string>
+  <string name="account_export_file">پشتیبان‌گیری حساب</string>
   <string name="account_export_end_decryption_message">نمی‌توان قفل حسابتان را با گذرواژه  ارائه‌شده گشود.</string>
   <string name="account_export_end_network_title">خطای شبکه</string>
   <string name="account_export_end_network_message">برون‌برد حساب روی شبکه مقدور نبود. اتصال خود را بررسی کنید.</string>
@@ -182,8 +185,8 @@
   <string name="account_connect_prompt_username">نام کاربری</string>
   <!--Name registration-->
   <string name="error_username_empty">یک نام کاربری وارد کنید</string>
-  <string name="no_registered_name_for_account">هیچ نام ثبت‌شده‌ای برای این حساب پیدا نشد</string>
   <string name="username_available">نام کاربری در‌دسترس است!</string>
+  <string name="register_name">ثبت نام</string>
   <string name="trying_to_register_name">در حال تلاش برای ثبت نام</string>
   <string name="registered_username">نام کاربری ثبت‌شده</string>
   <string name="register_username">ثبت نام کاربری عمومی</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
index a57487ad98b678179b984b773770008548e2b8a5..671e0fbc9a8db190d67f32f6495dcd901111fa18 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">اجرای جمی در پس‌زمینه هنگام آغاز به کار سیستم.</string>
   <string name="pref_clearHistory_title">پاک‌سازی تاریخچه</string>
   <string name="pref_clearHistory_summary">پاک‌سازی تمام سابقه گفت‌وگوها. این کار قابل بازگشت نیست.</string>
+  <string name="pref_delete_account_title">حذف حساب</string>
   <string name="pref_persistNotification_title">اجرا در پس‌زمینه</string>
   <string name="pref_persistNotification_summary">اجازه اجرا در پس‌زمینه برای دریافت تماس‌ها و پیام‌ها.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index c947cbf1d73e2dd44055eb1d1502253b0f920b9c..77f08570dd15ac51ab09136541de47f42b81a5fc 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -111,6 +111,7 @@
   <string name="share_via">Jaa</string>
   <string name="write_a_message">Kirjoita viesti</string>
   <string name="scan_qr">Skannaa QR-koodi</string>
+  <string name="qr_code">QR-koodi</string>
   <string name="ab_action_flipcamera">Käännä kamera</string>
   <string name="ab_action_hidepreview">Piilota esikatselu</string>
   <!--Text messages-->
@@ -192,6 +193,11 @@
   <string name="open_the_gallery">Avaa valokuvat</string>
   <string name="take_a_photo">Ota valokuva</string>
   <string name="profile_name_hint">Kirjoita nimesi</string>
+  <string name="registered_name">Rekisteröity nimi</string>
+  <string name="identity">Tunnistetiedot</string>
+  <string name="account">Tili</string>
+  <string name="link_new_device">Linkitä uusi laite</string>
+  <string name="devices">Linkitetyt laitteet</string>
   <!--Share fragment-->
   <string name="share_message">Skannaa tämä koodi Jamilla</string>
   <string name="share_message_no_account">Valitse jaettava tili.</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index 2fe477a5fa6ddfe291e70521c7d3aa00ab6f9dea..ab5eb0c0ba83c6a66d4f2cb995c8da0ed3be2a28 100644
--- a/ring-android/app/src/main/res/values-fi/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_account.xml
@@ -98,6 +98,7 @@
   <string name="account_proxy_enable_label">Käytä DHT välityspalvelinta</string>
   <string name="account_proxy_server_label">DHT välityspalvelimen osoite</string>
   <string name="account_proxy_server_list_label">DHT-välityspalvelimen luettelon verkko-osoite</string>
+  <string name="account_sip_proxy_label">Välityspalvelin</string>
   <string name="account_peer_discovery_label">Paikallisten vertaislaitteiden haku</string>
   <string name="account_peer_discovery_enable_label">Salli paikallisten vertaislaitteiden haku</string>
   <string name="account_peer_discovery_enable_summary">Yhdistä muihin DHT-solmuihin, jotka ilmoittautuu paikallisessa verkossa</string>
@@ -184,7 +185,6 @@
   <string name="account_connect_prompt_username">Käyttäjänimi</string>
   <!--Name registration-->
   <string name="error_username_empty">Anna käyttäjänimi</string>
-  <string name="no_registered_name_for_account">Tälle tilille ei löytynyt rekisteröityä nimeä</string>
   <string name="username_available">Käyttäjänimi saatavilla !</string>
   <string name="register_name">Rekisteröi nimi</string>
   <string name="trying_to_register_name">Yritetään rekisteröidä nimeä</string>
@@ -221,6 +221,6 @@
   <string name="rename_device_button">Nimeä laite uudelleen</string>
   <string name="account_rename_device_hint">Valitse laitteen uusi nimi</string>
   <string name="account_device_name_empty">Laitteen nimi ei voi olla tyhjä</string>
-  <string name="account_device_this_indicator">tämä laite</string>
+  <string name="account_device_this_indicator">Tämä laite</string>
   <string name="account_disabled_indicator">poistettu</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings_preferences.xml b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
index b4bcd3f61bd196573de53c477ce47249b84bdd66..7dea6bb85fc23899a76dc856c09fdf19bdcbb65b 100644
--- a/ring-android/app/src/main/res/values-fi/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">Aja Jami taustalle, kun järjestelmä käynnistyy.</string>
   <string name="pref_clearHistory_title">Tyhjennä historia</string>
   <string name="pref_clearHistory_summary">Tyhjennä koko keskusteluhistoria. Tätä toimintoa ei voi peruuttaa.</string>
+  <string name="pref_delete_account_title">Poista tili</string>
   <string name="pref_persistNotification_title">Suorita taustalla</string>
   <string name="pref_persistNotification_summary">Salli tausta-ajo vastaanottamaan puheluita ja viestejä.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings.xml b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
index db850726384eef91cc9ac33f62f5fbae5080950f..7503c8d5e2c331daa8c4a4b0a395971bca12d3a4 100644
--- a/ring-android/app/src/main/res/values-fr-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
@@ -36,6 +36,9 @@
   <string name="wizard_skip">Passer</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="account">Compte</string>
+  <string name="link_new_device">Associer un nouvel appareil</string>
+  <string name="devices">Appareils liés</string>
   <!--Share fragment-->
   <string name="share_label">Partager</string>
   <!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index cb74c5693a9c349386804f72ab71315e4e2dd0e8..a61bc7ab416659de485a938eadfc90359d4b1199 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -114,6 +114,10 @@
   <string name="profile_message_warning">Votre profil est partagé avec vos contacts uniquement</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
   <string name="take_a_photo">Prendre un photo.</string>
+  <string name="identity">Identité</string>
+  <string name="account">Compte</string>
+  <string name="link_new_device">Associer un nouvel appareil</string>
+  <string name="devices">Appareils liés</string>
   <!--Share fragment-->
   <string name="share_message_no_account">S\'il vous plaît, sélectionnez un compte à partager.</string>
   <string name="share_your_account_information">Partager mes informations de contact</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
index e4ae3d951a8e1ad4cbebea18d2cc3692fd34dfec..c44dd390b15eec6afb0627ad5f86793dd3f56d81 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_account.xml
@@ -78,6 +78,7 @@ Vous pourrez modifier votre compte plus tard.</string>
   <string name="account_turn_password_label">Mot de passe TURN</string>
   <string name="account_published_port_label">Port publié</string>
   <string name="account_published_address_label">Adresse publiée</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <string name="account_credentials_label">Informations de connexion</string>
   <string name="account_credentials_edit">Modifier les informations de connexion</string>
@@ -135,7 +136,6 @@ Vous pourrez modifier votre compte plus tard.</string>
   <string name="account_connect_prompt_username">Nom d\'utilisateur</string>
   <!--Name registration-->
   <string name="error_username_empty">Entrer le nom d\'utilisateur</string>
-  <string name="no_registered_name_for_account">Aucun nom enregistré trouvé pour ce compte</string>
   <string name="trying_to_register_name">Enregistrement du nom en cours</string>
   <string name="registered_username">Nom d\'utilisateur enregistré</string>
   <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
@@ -166,6 +166,5 @@ Vous pourrez modifier votre compte plus tard.</string>
   <string name="rename_device_button">Renommer l\'appareil</string>
   <string name="account_rename_device_hint">Choisir un nouveau nom d\'appareil</string>
   <string name="account_device_name_empty">Le champ \"nom de l\'appareil\" ne peut être vide</string>
-  <string name="account_device_this_indicator">cet appareil</string>
   <string name="account_disabled_indicator">désactivé</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings.xml b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
index db850726384eef91cc9ac33f62f5fbae5080950f..7503c8d5e2c331daa8c4a4b0a395971bca12d3a4 100644
--- a/ring-android/app/src/main/res/values-fr-rCH/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
@@ -36,6 +36,9 @@
   <string name="wizard_skip">Passer</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="account">Compte</string>
+  <string name="link_new_device">Associer un nouvel appareil</string>
+  <string name="devices">Appareils liés</string>
   <!--Share fragment-->
   <string name="share_label">Partager</string>
   <!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index c7fd5b450d516e0a5706909238b9381cd77a0324..9d5506736f868e13cb9a950b12bdc85cd6b16f77 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -8,7 +8,7 @@
   <string name="copyright_section">droit d\'auteur</string>
   <string name="contribute_section">Contribuer</string>
   <string name="version_section">Version</string>
-  <string name="no_email_app_installed">Aucun logiciel de messagerie n\'a été trouvé, merci d\'installer un logiciel de messagerie pour nous envoyer un rapport</string>
+  <string name="no_email_app_installed">Aucun logiciel de messagerie n\'a été trouvé, veuillez installer un logiciel de messagerie pour nous envoyer un rapport</string>
   <string name="no_browser_app_installed">Aucun navigateur web trouvé, installez-en un pour voir cette page</string>
   <string name="email_chooser_title">Envoyer un courriel en utilisant...</string>
   <string name="website_chooser_title">Voir le site web en utilisant...</string>
@@ -87,6 +87,8 @@
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vous:</string>
   <string name="action_call_hangup">Raccrocher</string>
+  <string name="action_call_maximize">Agrandir</string>
+  <string name="action_call_minimize">Réduire</string>
   <string name="ongoing_call">Appel en cours</string>
   <string name="hist_in_call">Appel entrant de %1$s</string>
   <string name="hist_out_call">Appel sortant de %1$s</string>
@@ -185,10 +187,14 @@
   <string name="wizard_skip">Passer</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Nom du profil</string>
   <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
   <string name="take_a_photo">Prendre une photo</string>
   <string name="profile_name_hint">Entrez votre nom</string>
+  <string name="account">Compte</string>
+  <string name="link_new_device">Associer un nouvel appareil</string>
+  <string name="devices">Appareils liés</string>
   <!--Share fragment-->
   <string name="share_message">Numériser ce code avec Jami</string>
   <string name="share_message_no_account">Sélectionnez un compte à partager.</string>
@@ -217,7 +223,7 @@
   <string name="no_contact_request">Aucune demande de contact envoyée</string>
   <string name="conversation_placeholder">Vous n\'avez pas encore de conversations</string>
   <string name="contact_request_sent">Demande de contact envoyée</string>
-  <string name="start_conversation">Démarrer la conversation</string>
+  <string name="start_conversation">Démarrer une conversation</string>
   <string name="search_results">Résultats de recherche</string>
   <string name="tv_contact_row_header">Contacts</string>
   <string name="gallery_error_title">Aucune application de galerie trouvée</string>
@@ -288,4 +294,5 @@
   <string name="wizard_profile_info">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="wizard_profile_button">Sauvegarder votre profil</string>
   <string name="wizard_profile_skip">Passer et faire ça plus tard</string>
+  <string name="fab_path_choose">Choisir un autre fichier</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 570486d6e134cf94f55d5330ad7c0300996e0bea..9857ddefaf52b1852d7429cd7ac992e2edf78f52 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -83,7 +83,7 @@
   <string name="notif_location_action_stop">Arrêter le partage de position</string>
   <string name="location_share_action_start">Démarrer le partage</string>
   <string name="location_share_action_stop">Arrêter le partage</string>
-  <string name="location_share_about_title">Information sur la carte</string>
+  <string name="location_share_about_title">Informations sur la carte</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vous :</string>
   <string name="action_call_hangup">Raccrochez</string>
@@ -111,6 +111,7 @@
   <string name="share_via">Partager</string>
   <string name="write_a_message">Ecrire un message</string>
   <string name="scan_qr">Scanner un code QR</string>
+  <string name="qr_code">Code QR</string>
   <string name="ab_action_flipcamera">Changer de caméra</string>
   <string name="ab_action_hidepreview">Masquer l\'aperçu</string>
   <!--Text messages-->
@@ -187,11 +188,18 @@
   <string name="wizard_skip">Passez</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
-  <string name="profile_name">Nom de profile</string>
+  <string name="profile_name">Nom de profil</string>
   <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
   <string name="take_a_photo">Prendre une photo</string>
-  <string name="profile_name_hint">Entrer votre nom</string>
+  <string name="profile_name_hint">Entrez votre nom</string>
+  <string name="registered_name">Nom enregistré</string>
+  <string name="no_registered_name">Aucun nom d\'utilisateur enregistré</string>
+  <string name="identity">Identité</string>
+  <string name="account">Compte</string>
+  <string name="link_new_device">Associer un nouvel appareil</string>
+  <string name="devices">Appareils associés</string>
+  <string name="total_devices">Total des appareils</string>
   <!--Share fragment-->
   <string name="share_message">Numériser cet identifiant avec Jami</string>
   <string name="share_message_no_account">Svp, sélectionnez le compte à partager</string>
@@ -283,13 +291,13 @@
   <string name="wizard_username_button">Choisissez un nom d\'utilisateur</string>
   <string name="wizard_username_skip">Passer cette étape</string>
   <string name="wizard_password_info">Mot  de passe du compte</string>
-  <string name="wizard_password_placeholder">Choisissez un mot de passe pour encrypter la clé de votre compte sur cet appareil</string>
+  <string name="wizard_password_placeholder">Choisissez un mot de passe pour chiffrer la clé de votre compte sur cet appareil</string>
   <string name="wizard_password_button">Choisir un mot de passe</string>
   <string name="wizard_password_skip">Créer le compte</string>
-  <string name="wizard_password_switch">Encrypter mon compte avec un mot de passe</string>
+  <string name="wizard_password_switch">Chiffrer le compte avec un mot de passe</string>
   <string name="wizard_password_warning">Notez que le mot de passe ne peut pas être récupéré</string>
   <string name="wizard_profile_info">Votre profil n\'est partagé qu\'avec vos contacts</string>
-  <string name="wizard_profile_button">Sauvegardez votre profile</string>
-  <string name="wizard_profile_skip">Passez cette étape et faire cela ultérieurement</string>
+  <string name="wizard_profile_button">Sauvegardez votre profil</string>
+  <string name="wizard_profile_skip">Passer cette étape et faire cela ultérieurement</string>
   <string name="fab_path_choose">Choisir un autre fichier</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index 77dfd3dddec9b3d20adc9f45a77ad06a0c50594d..0f11c44f7ca989372f7a9aa67e503c2e2132e598 100644
--- a/ring-android/app/src/main/res/values-fr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_account.xml
@@ -46,6 +46,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_device_revocation_error_unknown">Erreur inconnue.</string>
   <string name="account_password_change">Changer le mot de passe</string>
   <string name="account_password_set">Mettre un mot de passe</string>
+  <string name="account_password_summary">Gérer le mot de passe du compte</string>
   <string name="account_password_change_wait_message">Changement du mot de passe du compte</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Général</string>
@@ -102,6 +103,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_proxy_enable_label"> Utiliser un serveur délégataire </string>
   <string name="account_proxy_server_label">Adresse du DHT mandataire</string>
   <string name="account_proxy_server_list_label">URL de la liste des DHT proxy</string>
+  <string name="account_sip_proxy_label">Serveur mandataire</string>
   <string name="account_peer_discovery_label">Découverte des utilisateurs locaux</string>
   <string name="account_peer_discovery_enable_label">Activer la découverte des utilisateurs locaux</string>
   <string name="account_peer_discovery_enable_summary">Se connecter à d\'autres nœuds DHT affichés sur notre réseau local</string>
@@ -139,6 +141,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="export_account_wait_title">Veuillez patienter</string>
   <string name="export_account_wait_message">Exporter les informations du compte</string>
   <string name="account_export_file">Sauvegarder votre compte</string>
+  <string name="account_export_file_summary">Sauvegarder votre compte pour pouvoir le restaurer plus tard</string>
   <string name="account_export_end_decryption_message">Impossible de déverrouiller votre compte en utilisant le mot de passe fourni.</string>
   <string name="account_export_end_network_title">Erreur de réseau</string>
   <string name="account_export_end_network_message">Impossible d\'exporter le compte sur le réseau. Veuillez vérifier votre connexion. </string>
@@ -174,6 +177,8 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_link_prompt_pin">Entrer votre NIP</string>
   <string name="account_new_button">Créer un compte Jami</string>
   <string name="account_link_export_button">Associer un nouvel appareil</string>
+  <string name="account_link_show_button">Montrer %d appareils liés suppléementaires</string>
+  <string name="account_link_hide_button">Cacher les appareils liés</string>
   <string name="account_link_export_info">Pour utiliser ce compte sur d\'autres appareils, vous devez d\'abord l\'afficher sur Jami. Ceci générera un code PIN que vous devrez entrer sur le nouvel appareil pour configurer le compte. Le PIN sera valable pendant 10 minutes. </string>
   <string name="account_start_export_button">Générer un NIP</string>
   <string name="account_end_export_button">fermer</string>
@@ -188,7 +193,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_connect_prompt_username">Nom d\'utilisateur</string>
   <!--Name registration-->
   <string name="error_username_empty">Entrer un nom d\'utilisateur</string>
-  <string name="no_registered_name_for_account">Aucun nom n\'a été trouvé pour ce compte.</string>
+  <string name="no_registered_name_for_account">Aucun nom enregistré</string>
   <string name="username_available">Identifiant disponible !</string>
   <string name="register_name">Enregistrer un nom</string>
   <string name="trying_to_register_name">Enregistrement du nom en cours</string>
@@ -225,6 +230,6 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="rename_device_button">Renommer l\'appareil</string>
   <string name="account_rename_device_hint">Choisissez un nouveau nom d\'appareil</string>
   <string name="account_device_name_empty">Le nom d\'appareil ne peut être vide</string>
-  <string name="account_device_this_indicator">cet appareil</string>
+  <string name="account_device_this_indicator">Cet appareil</string>
   <string name="account_disabled_indicator">désactivé</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_preferences.xml b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
index 2712e0f24a632486ef89e70bbadfdd9e20fceda9..b7a4e3aa5be63c9937b0b3d6d6bfec4ca07867c8 100644
--- a/ring-android/app/src/main/res/values-fr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
@@ -26,6 +26,10 @@
   <string name="pref_startOnBoot_summary">Lancer Jami en arrière plan au démarrage de l\'appareil.</string>
   <string name="pref_clearHistory_title">Effacer l\'historique</string>
   <string name="pref_clearHistory_summary">Effacer tous les historiques de conversation. L\'action est irréversible.</string>
+  <string name="pref_blackList_title">Liste  des comptes bloqués</string>
+  <string name="pref_blackList_summary">Vérifier votre liste des comptes bloqués</string>
+  <string name="pref_delete_account_title">Supprimer le compte</string>
+  <string name="pref_delete_account_summary">Supprimer votre compte de cet appareil</string>
   <string name="pref_persistNotification_title">Fonctionne en arrière-plan</string>
   <string name="pref_persistNotification_summary">Permet de fonctionner en arrière-plan pour recevoir des appels ou des messages</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-gl/strings.xml b/ring-android/app/src/main/res/values-gl/strings.xml
index 779b2fd4d0a562d6ed6f1fdb6e1a4e29353062f5..60b224c3ed2e937a2afcc7b0184329fafe94d362 100644
--- a/ring-android/app/src/main/res/values-gl/strings.xml
+++ b/ring-android/app/src/main/res/values-gl/strings.xml
@@ -111,6 +111,7 @@
   <string name="share_via">Compartir vía</string>
   <string name="write_a_message">Escribe unha mensaxe</string>
   <string name="scan_qr">Escanear código QR</string>
+  <string name="qr_code">Código QR</string>
   <string name="ab_action_flipcamera">Cambiar de cámara</string>
   <string name="ab_action_hidepreview">Agochar vista previa</string>
   <!--Text messages-->
@@ -192,6 +193,11 @@
   <string name="open_the_gallery">Abrir a galería</string>
   <string name="take_a_photo">Tomar fotografía</string>
   <string name="profile_name_hint">Escribe o teu nome</string>
+  <string name="registered_name">Nome rexistrado</string>
+  <string name="identity">Identidade</string>
+  <string name="account">Conta</string>
+  <string name="link_new_device">Ligar un novo dispositio</string>
+  <string name="devices">Dispositivos ligados</string>
   <!--Share fragment-->
   <string name="share_message">Escanea este código con Jami</string>
   <string name="share_message_no_account">Escolle a conta a compartir.</string>
diff --git a/ring-android/app/src/main/res/values-gl/strings_account.xml b/ring-android/app/src/main/res/values-gl/strings_account.xml
index 51b638e9f8e29aa83fd58b52b927aea760e1ac02..7c0aa16599f786fac2a7258a267700c266696255 100644
--- a/ring-android/app/src/main/res/values-gl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-gl/strings_account.xml
@@ -58,6 +58,8 @@
   <string name="account_optionnal_category">Axustes optativos</string>
   <string name="account_useragent_label">User Agent</string>
   <string name="account_autoanswer_label">Resposta automática</string>
+  <string name="account_rendezvous_label">Modo Xuntanza</string>
+  <string name="account_rendezvous_summary">No modo Xuntanza as chamadas entrantes engadiranse a unha sala de conferencia.</string>
   <string name="account_upnp_label">Activar UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
@@ -98,6 +100,7 @@
   <string name="account_proxy_enable_label">Utilizar proxy DHT</string>
   <string name="account_proxy_server_label">Enderezo proxy DHT</string>
   <string name="account_proxy_server_list_label">Lista URL do proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descubrimento de pares locais</string>
   <string name="account_peer_discovery_enable_label">Activar o descubrimento de pares locais</string>
   <string name="account_peer_discovery_enable_summary">Conectar a outros nodos DHT que se anuncian na túa rede local</string>
@@ -169,6 +172,7 @@
   <string name="account_link_archive_button">Conectar desde copia de apoio</string>
   <string name="account_link_prompt_pin">Escribe o PIN</string>
   <string name="account_new_button">Crear conta Jami</string>
+  <string name="account_link_export_button">Ligar un novo dispositio</string>
   <string name="account_link_export_info">Para usar esta conta en outros dispositivos primeiro tes que exportala en Jami. Esto creará un código PIN que tes que escribir no novo dispositivo para configuralo. O PIN é válido durante 10 minutos.</string>
   <string name="account_start_export_button">Crear PIN</string>
   <string name="account_end_export_button">pechar</string>
@@ -183,7 +187,6 @@
   <string name="account_connect_prompt_username">Nome de usuaria</string>
   <!--Name registration-->
   <string name="error_username_empty">Escribe nome de usuaria</string>
-  <string name="no_registered_name_for_account">Non se atopou nome rexistrado para esta conta</string>
   <string name="username_available">Nome de usuaria dispoñible!</string>
   <string name="register_name">Rexistrar nome</string>
   <string name="trying_to_register_name">Intentando rexistrar nome</string>
@@ -220,6 +223,5 @@
   <string name="rename_device_button">Cambiar nome</string>
   <string name="account_rename_device_hint">Escolle un novo nome</string>
   <string name="account_device_name_empty">O nome non pode quedar baleiro</string>
-  <string name="account_device_this_indicator">este dispositivo</string>
   <string name="account_disabled_indicator">desactivado</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-gl/strings_preferences.xml b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
index 8599065d340de0e2cf4a2df4a1d870f1813aaa35..fd8874bcf8f2ef1a99acf19f1d054d4e7f939005 100644
--- a/ring-android/app/src/main/res/values-gl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">Executar Jami en segundo plano cando se inicia o sistema.</string>
   <string name="pref_clearHistory_title">Eliminar historial</string>
   <string name="pref_clearHistory_summary">Eliminar todo o historial de conversas. Esto non ten volta atrás.</string>
+  <string name="pref_delete_account_title">Eliminar conta</string>
   <string name="pref_persistNotification_title">Executar en segundo plano</string>
   <string name="pref_persistNotification_summary">Permitir a execución en segundo plano para recibir mensaxe e chamadas.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index a1d599a6c27ff03aa45c7893cb8058257d238856..0160325d23a4521f551e981e0e799c17dbc947e1 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -59,6 +59,7 @@
   <!--Account Summary-->
   <string name="profile">פרופיל</string>
   <string name="profile_name">שם הפרופיל</string>
+  <string name="account">חשבון</string>
   <!--Share fragment-->
   <string name="share_label">שיתוף</string>
   <string name="generic_error_migration">שגיאה</string>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index 2a7515497019b78ddbc7d1dad702255343342cdc..72c889675f079ff104e8158a11498c682888e457 100644
--- a/ring-android/app/src/main/res/values-he/strings_account.xml
+++ b/ring-android/app/src/main/res/values-he/strings_account.xml
@@ -44,6 +44,7 @@
   <string name="account_local_port_label">פורט מקומי</string>
   <string name="account_stun_enable_label">השתמש ב-</string>
   <string name="account_stun_server_label">שרת Stun</string>
+  <string name="account_sip_proxy_label">פרוקסי</string>
   <!--Security Details-->
   <string name="account_credentials_label">נתוני התחברות</string>
   <!--SRTP Details-->
diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings.xml b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
index 039fd229dc5bc24930d08f0fc115274bcdcc31d7..b7ba56157499cb5923fb664ffa1b4e2dbc123ec4 100644
--- a/ring-android/app/src/main/res/values-hi-rIN/strings.xml
+++ b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
@@ -34,6 +34,7 @@
   <!--Conversation-->
   <!--Contacts-->
   <!--Account Summary-->
+  <string name="account">खाता</string>
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index bf0cc219b4380a7a5659f465d3cf1cf9668c9513..375aa403138b3243aaccb7ab559fcdedf9bea576 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -144,6 +144,7 @@
   <string name="profile_message_warning">Vaš profil je podjeljen samo sa vašim kontaktima</string>
   <string name="open_the_gallery">Otvorite galeriju</string>
   <string name="take_a_photo">Fotografiraj</string>
+  <string name="account">Račun</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Molim odaberite račun za djeljenje</string>
   <string name="share_label">Podijeli</string>
diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/ring-android/app/src/main/res/values-hr/strings_account.xml
index ff95b73777544d7a78d6c4379214fb931580b13b..3c5c6c8d7d81555e3d78c6caede1d9dbbf127484 100644
--- a/ring-android/app/src/main/res/values-hr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_account.xml
@@ -65,6 +65,7 @@ Moćete urediti vaš račun kasnije</string>
   <string name="account_turn_server_label">TURN poslužitelj</string>
   <string name="account_turn_username_label">TURN korisničko ime</string>
   <string name="account_turn_password_label">TURN lozinka</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sigurnost</string>
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 4a10ffa6fa91be3ce72053c70d1b24e2df7377ef..fcb85a2c900f878b0475c2b1fb297a723a248c4d 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -111,6 +111,7 @@
   <string name="share_via">Megosztás a következőn keresztül:</string>
   <string name="write_a_message">Üzenet írása</string>
   <string name="scan_qr">QR-kód beolvasása</string>
+  <string name="qr_code">QR-kód</string>
   <string name="ab_action_flipcamera">Kamera megfordítása</string>
   <string name="ab_action_hidepreview">Előnézet elrejtése</string>
   <!--Text messages-->
@@ -192,6 +193,11 @@
   <string name="open_the_gallery">Galéria megnyitása</string>
   <string name="take_a_photo">Fotó készítése</string>
   <string name="profile_name_hint">Név megadása</string>
+  <string name="registered_name">Bejegyzett név</string>
+  <string name="identity">Személyazonosság</string>
+  <string name="account">Fiók</string>
+  <string name="link_new_device">Eszköz összekapcsolása fiókhoz</string>
+  <string name="devices">Összekapcsolt eszközök</string>
   <!--Share fragment-->
   <string name="share_message">Olvassa be a kódot a Jami programmal</string>
   <string name="share_message_no_account">Válassza ki a megosztandó fiókot.</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 f6c5fbb4217da7461fdef8c3888458cf28008502..519957eb5b6a127baa496f4361504a72691de945 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
@@ -100,6 +100,7 @@
   <string name="account_proxy_enable_label">DHT proxy használata</string>
   <string name="account_proxy_server_label">DHT proxy címe</string>
   <string name="account_proxy_server_list_label">DHT proxy lista URL-je</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Helyi partner felderítése</string>
   <string name="account_peer_discovery_enable_label">Helyi partner felderítése engedélyezése</string>
   <string name="account_peer_discovery_enable_summary">Csatlakozás más DHT-csomópontokhoz, amelyek a helyi hálózaton hirdetnek</string>
@@ -186,7 +187,6 @@
   <string name="account_connect_prompt_username">Felhasználónév</string>
   <!--Name registration-->
   <string name="error_username_empty">Adjon meg egy felhasználónevet</string>
-  <string name="no_registered_name_for_account">Nem található regisztrált név ehhez a fiókhoz</string>
   <string name="username_available">A felhasználónév elérhető.</string>
   <string name="register_name">Név bejegyzése</string>
   <string name="trying_to_register_name">A név regisztrációjának megkísérlése</string>
@@ -223,6 +223,6 @@
   <string name="rename_device_button">Eszköz átnevezése</string>
   <string name="account_rename_device_hint">Válasszon új eszköznevet</string>
   <string name="account_device_name_empty">Az eszköz neve nem lehet üres</string>
-  <string name="account_device_this_indicator">ez az eszköz</string>
+  <string name="account_device_this_indicator">Ez az eszköz</string>
   <string name="account_disabled_indicator">letiltva</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
index 53758b5f6ab5da87639b814df176e69553ab67fe..7d900f764d2687bc541240159f0b51c2a1120ac3 100644
--- a/ring-android/app/src/main/res/values-hu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">Alkalmazás háttérfuttatása rendszerindításkor</string>
   <string name="pref_clearHistory_title">Előzmények törlése</string>
   <string name="pref_clearHistory_summary">Minden beszélgetés előzmény törlése. Ez a művelet nem vonható vissza.</string>
+  <string name="pref_delete_account_title">Fiók törlése</string>
   <string name="pref_persistNotification_title">Háttérfolyamat engedélyezése</string>
   <string name="pref_persistNotification_summary">Háttérfolyamat engedélyezése hívások és üzenetek fogadásához.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index a0800ac812682c57a0fed9316af9ae137368c932..f8226bbd687023d961f37065ffe4d0e7a17afc39 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -113,6 +113,7 @@
   <string name="profile_message_warning">Profil Anda hanya dibagikan kepada kontak Anda</string>
   <string name="open_the_gallery">Buka galeri</string>
   <string name="take_a_photo">Ambil foto</string>
+  <string name="account">Akun</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Silakan pilih akun untuk dibagikan.</string>
   <string name="share_your_account_information">Bagikan informasi kontak saya</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index 2e6c9a1161bbb480127e564c91c0939cf421ba31..4d23defce0a5ccdfc1c8e25a4ea4e65be943db7a 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -88,12 +88,15 @@
   <string name="you_txt_prefix">Tu:</string>
   <string name="action_call_hangup">Chiudi</string>
   <string name="action_call_maximize">Massimizza</string>
+  <string name="action_call_minimize">Riduci</string>
   <string name="ongoing_call">Chiamata in corso</string>
   <string name="hist_in_call">Chiamata in arrivo di %1$s</string>
   <string name="hist_out_call">Chiamata in uscita di %1$s</string>
   <string name="start_error_title">Jami non si avvia !</string>
   <string name="start_error_mic_required">Jami richiede il controllo del microfono per funzionare</string>
   <string name="action_call_accept">Rispondi</string>
+  <string name="action_call_hold_accept">Attendi e rispondi alla chiamata</string>
+  <string name="action_call_end_accept">Termina e rispondi alla chiamata</string>
   <string name="action_call_decline">Rifiuta</string>
   <string name="action_call_mic_mute">Microfono muto</string>
   <string name="action_load_plugin">Carica plugin</string>
@@ -108,6 +111,7 @@
   <string name="share_via">Condividi con</string>
   <string name="write_a_message">Scrivi un messaggio</string>
   <string name="scan_qr">Leggi codice QR</string>
+  <string name="qr_code">QR Code</string>
   <string name="ab_action_flipcamera">Cambia videocamera</string>
   <string name="ab_action_hidepreview">Nascondi anteprima</string>
   <!--Text messages-->
@@ -184,10 +188,16 @@
   <string name="wizard_skip">Salta</string>
   <!--Account Summary-->
   <string name="profile">Profilo</string>
+  <string name="profile_name">Nome Profilo</string>
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria immagini</string>
   <string name="take_a_photo">Scatta una foto</string>
   <string name="profile_name_hint">Inserisci il tuo nome</string>
+  <string name="registered_name">Nome Registrato</string>
+  <string name="identity">Indentità</string>
+  <string name="account">Account</string>
+  <string name="link_new_device">Collega un nuovo dispositivo</string>
+  <string name="devices">Dispositivi collegati</string>
   <!--Share fragment-->
   <string name="share_message">Scansione questo codice con Jami</string>
   <string name="share_message_no_account">Seleziona un account per la condivisione.</string>
@@ -287,4 +297,5 @@
   <string name="wizard_profile_info">Il profilo è condiviso solo con i contatti</string>
   <string name="wizard_profile_button">Salva il profilo</string>
   <string name="wizard_profile_skip">Salta e fallo più tardi</string>
+  <string name="fab_path_choose">Scegli un altro file</string>
 </resources>
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 e38aa51de611bee1561af0f21cfa53d374ca4440..8fa7cc73109e9b96bbbd7813d615a332929c2f33 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
@@ -45,6 +45,7 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_device_revocation_unknown_device">Dispositivo sconosciuto.</string>
   <string name="account_device_revocation_error_unknown">Errore sconosciuto.</string>
   <string name="account_password_change">Cambia password</string>
+  <string name="account_password_set">Impostare  password</string>
   <string name="account_password_change_wait_message">Modifica della password dell\'account</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generale</string>
@@ -57,6 +58,8 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_optionnal_category">Impostazioni aggiuntive</string>
   <string name="account_useragent_label">User Agent</string>
   <string name="account_autoanswer_label">Risposta automatica</string>
+  <string name="account_rendezvous_label">Modalità Rendezvous </string>
+  <string name="account_rendezvous_summary">In modalità Rendezvous, le chiamate in arrivo verranno aggiunte a una sala conferenze.</string>
   <string name="account_upnp_label">Attiva UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
@@ -97,6 +100,7 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_proxy_enable_label">Usa il proxy DHT</string>
   <string name="account_proxy_server_label">Indirizzo proxy DHT</string>
   <string name="account_proxy_server_list_label">DHT proxy list URL</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Rilevamento peer locali</string>
   <string name="account_peer_discovery_enable_label">Abilita rilevamento peer locale</string>
   <string name="account_peer_discovery_enable_summary">Connettiti ad altri nodi DHT pubblicizzati sulla nostra rete locale</string>
@@ -133,6 +137,7 @@ Potrai modificare il tuo account successivamente</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">Account di backup</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>
   <string name="account_export_end_network_message">Impossibile esportare l\'account sulla rete. Controlla la tua connettività.</string>
@@ -182,8 +187,8 @@ Potrai modificare il tuo account successivamente</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 registro</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</string>
@@ -218,6 +223,6 @@ Potrai modificare il tuo account successivamente</string>
   <string name="rename_device_button">Rinomina il dispositivo</string>
   <string name="account_rename_device_hint">Scegli un nuovo nome per il dispositivo</string>
   <string name="account_device_name_empty">Il nome del dispositivo non può essere vuoto</string>
-  <string name="account_device_this_indicator">questo dispositivo</string>
+  <string name="account_device_this_indicator">Questo dispositivo</string>
   <string name="account_disabled_indicator">disabilitato</string>
 </resources>
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 e6ceb1e745f4d72336a9d6c33733221715f316eb..8528d9bff603e4beb6e34a34bd3072cb877a117b 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
@@ -26,6 +26,7 @@
   <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_delete_account_title">Eliminare l\'account</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>
   <!--Plugin-->
@@ -41,4 +42,5 @@
   <string name="plugin_recent_version_exception">Hai una versione più recente di: <b>%1$s</b></string>
   <string name="plugin_same_version_exception">Hai la stessa versione di <b>%1$s</b> installata</string>
   <string name="plugin_force_install">forza \n installazione</string>
+  <string name="plugin_path_image_add">Aggiungi una nuova immagine</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index 0cc6ce5ae8e9a608684f9b75da74700c563e51aa..0e0497bd691844478a49efe65986d4ecf496f1ee 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -101,6 +101,7 @@
   <string name="share_via">Condividi tramite</string>
   <string name="write_a_message">Scrivi un messaggio</string>
   <string name="scan_qr">Scansiona Codice QR</string>
+  <string name="qr_code">Codice QR</string>
   <string name="ab_action_flipcamera">Gira la videocamera</string>
   <!--Text messages-->
   <string name="send_message">Invia messaggio</string>
@@ -175,6 +176,8 @@
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria</string>
   <string name="take_a_photo">Scatta una foto</string>
+  <string name="identity">Identità</string>
+  <string name="account">Profilo</string>
   <!--Share fragment-->
   <string name="share_message">Scansiona questo codice con Jami</string>
   <string name="share_message_no_account">Per favore seleziona un account da condividere.</string>
diff --git a/ring-android/app/src/main/res/values-it/strings_account.xml b/ring-android/app/src/main/res/values-it/strings_account.xml
index 0444b7997ed13fa16af4393bdf635739b1313212..9eef83cb3f0f637f32db5bcbb3649012601a9948 100644
--- a/ring-android/app/src/main/res/values-it/strings_account.xml
+++ b/ring-android/app/src/main/res/values-it/strings_account.xml
@@ -84,6 +84,7 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Usa proxy DHT</string>
   <string name="account_proxy_server_label">Indirizzo proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenziali</string>
   <string name="account_credentials_edit">Modifica credenziali</string>
@@ -165,6 +166,5 @@ Si potra modificare questo account più tardi.</string>
   <string name="rename_device_button">Rinomina dispositivo</string>
   <string name="account_rename_device_hint">Scegli il nuovo nome del dispositivo</string>
   <string name="account_device_name_empty">Il nome del dispositivo non può essere vuoto</string>
-  <string name="account_device_this_indicator">questo dispositivo</string>
   <string name="account_disabled_indicator">disattivato</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings_preferences.xml b/ring-android/app/src/main/res/values-it/strings_preferences.xml
index 48a192427dfcb45727164eda38c7b4048a2d29a1..d2aa0f270fdf77fc3b1f45946e95d5062b5da76a 100644
--- a/ring-android/app/src/main/res/values-it/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Esegui Jami in background all\'avvio del sistema.</string>
   <string name="pref_clearHistory_title">Cancella cronologia</string>
   <string name="pref_clearHistory_summary">Elimina la cronologia di tutte le conversazioni. Questa azione non può essere annullata.</string>
+  <string name="pref_delete_account_title">Eliminare l\'account</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>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-ja/strings.xml b/ring-android/app/src/main/res/values-ja/strings.xml
index d4ef525123e01ec85734660b1909b22e2132f16b..340316b418226a0b1ac5b355c283bf4743e6272c 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -108,6 +108,7 @@
   <string name="share_via">共有...</string>
   <string name="write_a_message">メッセージを入力</string>
   <string name="scan_qr">QR コードをスキャン</string>
+  <string name="qr_code">QRコード</string>
   <string name="ab_action_flipcamera">カメラを押す</string>
   <string name="ab_action_hidepreview">プレビューを隠す</string>
   <!--Text messages-->
@@ -187,6 +188,11 @@
   <string name="open_the_gallery">ギャラリーを開く</string>
   <string name="take_a_photo">写真を撮る</string>
   <string name="profile_name_hint">名前を入力</string>
+  <string name="registered_name">登録名</string>
+  <string name="identity">ID</string>
+  <string name="account">アカウント</string>
+  <string name="link_new_device">新しいデバイスをリンク</string>
+  <string name="devices">リンクされたデバイス</string>
   <!--Share fragment-->
   <string name="share_message">このコードをJamiでスキャンしてください</string>
   <string name="share_message_no_account">共有するアカウントを選択してください。</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index 54a69b139828e605ea550b55581477d3b81bdfbf..d90108af09d3a3d8bad5aad52b76c1714d6c63d4 100644
--- a/ring-android/app/src/main/res/values-ja/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_account.xml
@@ -96,6 +96,7 @@
   <string name="account_proxy_enable_label">DHTプロキシを使う</string>
   <string name="account_proxy_server_label">DHTプロキシアドレス</string>
   <string name="account_proxy_server_list_label">DHTプロキシリストURL</string>
+  <string name="account_sip_proxy_label">プロキシ</string>
   <string name="account_peer_discovery_label">ローカルピアの探索</string>
   <string name="account_peer_discovery_enable_label">ローカルピアの探索を有効化</string>
   <string name="account_peer_discovery_enable_summary">ローカルネットワーク上の他のDHTノードに接続します</string>
@@ -177,7 +178,6 @@
   <string name="account_connect_prompt_username">ユーザー名</string>
   <!--Name registration-->
   <string name="error_username_empty">ユーザー名を入力してください</string>
-  <string name="no_registered_name_for_account">このアカウントの登録名が見つかりません</string>
   <string name="username_available">使用可能なユーザー名です</string>
   <string name="trying_to_register_name">名前を登録しようとしています</string>
   <string name="registered_username">登録ユーザー名</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings_preferences.xml b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
index a802e7e6858773ede2fc87e7f59a9219c1544e53..944bc4703e867bb9f05cbff9d0a938d73f2598f1 100644
--- a/ring-android/app/src/main/res/values-ja/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">端末の起動時にバックグラウンドで Jami を実行します</string>
   <string name="pref_clearHistory_title">履歴をクリア</string>
   <string name="pref_clearHistory_summary">すべての会話履歴を消去します。この操作は元に戻せません。</string>
+  <string name="pref_delete_account_title">アカウントの削除</string>
   <string name="pref_persistNotification_title">バックグラウンドで実行</string>
   <string name="pref_persistNotification_summary">通話とメッセージの受信をバックグラウンドでも許可する</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings.xml b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
index 97b88b9a1641ebb5cce594e758529f3e130ba8b2..3274b65288d18b6c8c711c40df7f80e5b6c5a19b 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
@@ -29,6 +29,7 @@
   <string name="wizard_next">다음</string>
   <!--Account Summary-->
   <string name="profile">프로필</string>
+  <string name="account">계정</string>
   <!--Share fragment-->
   <!--Pending contact requests-->
   <string name="accept">수락</string>
diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml b/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
index c3b3c1888ea9e20138fcc58592acbad1814b4aed..83a587a175d727d2e6dfd2e703bb71da75d7fdc7 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
@@ -23,6 +23,7 @@
   <!--Advanced Details-->
   <string name="account_turn_enable_label">TURN 사용</string>
   <string name="account_published_address_label">공개 주소</string>
+  <string name="account_sip_proxy_label">프록시</string>
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">보안</string>
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 50d92ed6bcac3573d5fb8d01ac8c7081d17d3f33..f71e277bf1d1e6e7a42a4746356596d973d59006 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -90,6 +90,7 @@
   <string name="share_via">Dalintis per</string>
   <string name="write_a_message">Rašykite žinutę</string>
   <string name="scan_qr">Skenuoti QR kodą</string>
+  <string name="qr_code">QR kodas</string>
   <string name="ab_action_flipcamera">Apversti kamerą</string>
   <!--Text messages-->
   <string name="send_message">Siųsti žinutę</string>
@@ -153,6 +154,11 @@
   <string name="profile_message_warning">Jūsų profilis yra bendrinamas tik su jūsų adresatais</string>
   <string name="open_the_gallery">Atverti galeriją</string>
   <string name="take_a_photo">Padaryti nuotrauką</string>
+  <string name="registered_name">Registruotas vardas</string>
+  <string name="identity">Tapatybė</string>
+  <string name="account">Paskyra</string>
+  <string name="link_new_device">Susieti naują įrenginį</string>
+  <string name="devices">Susieti įrenginiai</string>
   <!--Share fragment-->
   <string name="share_message">Nuskenuokite šį kodą, naudodami Jami</string>
   <string name="share_message_no_account">Pasirinkite norimą bendrinti paskyrą.</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index a1d77170dc30b457d337fd00fa297875f544ff18..fe62cdb7e7e8a3760b5a17384ca135baaa49b982 100644
--- a/ring-android/app/src/main/res/values-lt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_account.xml
@@ -95,6 +95,7 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="account_proxy_enable_label">Naudoti DHT įgaliotąjį serverį</string>
   <string name="account_proxy_server_label">DHT įgaliotojo serverio adresas</string>
   <string name="account_proxy_server_list_label">DHT tarpinio serverio sąrašo URL</string>
+  <string name="account_sip_proxy_label">Įgaliotasis serveris</string>
   <string name="account_peer_discovery_label">Vietinis kolegų atradimas</string>
   <string name="account_peer_discovery_enable_label">Įgalinti vietinį peer atradimą</string>
   <string name="account_peer_discovery_enable_summary">Prisijunkite prie kitų DHT mazgų, reklamuojančių mūsų vietiniame tinkle</string>
@@ -177,7 +178,6 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="account_connect_prompt_username">Naudotojo vardas</string>
   <!--Name registration-->
   <string name="error_username_empty">Įveskite naudotojo vardą</string>
-  <string name="no_registered_name_for_account">Šiai paskyrai nerasta jokio registruoto vardo</string>
   <string name="username_available">Naudotojo vardas prieinamas!</string>
   <string name="trying_to_register_name">Bandoma užregistruoti vardą</string>
   <string name="registered_username">Registruotas naudotojo vardas</string>
@@ -213,6 +213,6 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="rename_device_button">Pervadinti įrenginį</string>
   <string name="account_rename_device_hint">Pasirinkti naują įrenginio pavadinimą</string>
   <string name="account_device_name_empty">Įrenginio pavadinimas negali būti tuščias</string>
-  <string name="account_device_this_indicator">šis įrenginys</string>
+  <string name="account_device_this_indicator">Šis įrenginys</string>
   <string name="account_disabled_indicator">išjungta</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings_preferences.xml b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
index 128c2def500ca4d97e6d609fcee263840e7cd10a..c792093b2bf1f9711a74f8984009badaf0d11e1b 100644
--- a/ring-android/app/src/main/res/values-lt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Sistemos paleidimo metu, paleisti Jami fone.</string>
   <string name="pref_clearHistory_title">Išvalyti istoriją</string>
   <string name="pref_clearHistory_summary">Išvalyti visą pokalbių istoriją. Šio veiksmo negalima bus atšaukti.</string>
+  <string name="pref_delete_account_title">Ištrinti paskyrą</string>
   <string name="pref_persistNotification_title">Paleisti fone</string>
   <string name="pref_persistNotification_summary">Leisti veikti fone, kad būtų priimami skambučiai ir žinutės.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index f6b5045b051ff8adc841e6a8537e44bc33334b94..05484502d48adb2025e0ec37b57cdd07b72e870e 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -88,6 +88,7 @@
   <!--Account Summary-->
   <string name="open_the_gallery">Buka galeri</string>
   <string name="take_a_photo">Ambil gambar</string>
+  <string name="account">Akaun</string>
   <!--Share fragment-->
   <string name="share_your_account_information">Sila pilih akaun untuk dikongsi</string>
   <string name="generic_error_migration">Gagal</string>
diff --git a/ring-android/app/src/main/res/values-ms/strings_account.xml b/ring-android/app/src/main/res/values-ms/strings_account.xml
index 3d50d32f6c62276b4a601909f56720f8ea42a076..7211976d430ac598bd2a9198eeb0742649853fd2 100644
--- a/ring-android/app/src/main/res/values-ms/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_account.xml
@@ -64,6 +64,7 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
   <string name="account_published_same_as_local_label">Alamat pengagihan sama dengan lokal</string>
   <string name="account_published_port_label">Port pengagihan</string>
   <string name="account_published_address_label">Alamat server pengagihan</string>
+  <string name="account_sip_proxy_label">Proksi</string>
   <!--Security Details-->
   <string name="account_credentials_label">Maklumat</string>
   <string name="account_credentials_edit">Ubah maklumat</string>
@@ -110,7 +111,6 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
   <string name="account_connect_prompt_username">Nama pengguna</string>
   <!--Name registration-->
   <string name="error_username_empty">Masukkan nama pengguna</string>
-  <string name="no_registered_name_for_account">Tiada nama berdaftar dengan akaun ini ditemui</string>
   <string name="trying_to_register_name">Sedang mencuba untuk mendaftarkan nama</string>
   <string name="registered_username">Nama telah didaftarkan</string>
   <string name="username_already_taken">Nama pengguna telah digunakan pengguna lain</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index ef06be516715b0db4b2ea37941cea0f6eb7a900e..6b28b34de23052b5e2ae9cc2364c9987c4ad6cbd 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -28,13 +28,14 @@
   <string name="ab_action_chat">Tekstmelding</string>
   <!--Sections-->
   <string name="menu_item_contact_request">Kontaktforespørsler</string>
-  <string name="menu_item_accounts">Styr kontoer</string>
+  <string name="menu_item_accounts">Behandle kontoer</string>
   <string name="menu_item_account">Behandle konto</string>
   <string name="menu_item_settings">Innstillinger</string>
+  <string name="menu_item_plugin_list">Innstillinger tillegg</string>
   <string name="menu_item_share">Del min kontakt</string>
   <string name="menu_item_about">Om Jami</string>
   <!--Dialing Fragment-->
-  <string name="dial_number">Slå et nummer</string>
+  <string name="dial_number">Tast et nummer</string>
   <!--History Fragment-->
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
@@ -43,7 +44,7 @@
     <item quantity="other">%d samtaler</item>
   </plurals>
   <!--ContactList Fragment-->
-  <string name="searchbar_hint">Søk etter navn eller telefonnummer...</string>
+  <string name="searchbar_hint">Søk navn eller telefonnummer...</string>
   <string name="choose_number">Velg et nummer</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -80,19 +81,25 @@
   <string name="notif_location_multi_title">Deling av lokasjon med %1$d kontakter</string>
   <string name="notif_location_remaining">%1$d minutter igjen</string>
   <string name="notif_location_action_stop">Slutt å dele lokasjon</string>
-  <string name="location_share_action_start">Begynn å dele</string>
+  <string name="location_share_action_start">Start delingen</string>
   <string name="location_share_action_stop">Stopp delingen</string>
+  <string name="location_share_about_title">Kartinformasjon</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Deg:</string>
   <string name="action_call_hangup">Legg på</string>
+  <string name="action_call_maximize">Maksimer</string>
+  <string name="action_call_minimize">Reduser</string>
   <string name="ongoing_call">Pågående samtale</string>
   <string name="hist_in_call">Innkommende samtale med %1$s</string>
   <string name="hist_out_call">Utgående samtale med %1$s</string>
   <string name="start_error_title">Klarte ikke starte Jami!</string>
   <string name="start_error_mic_required">Jami krever tilgang til mikrofonen for å virke.</string>
-  <string name="action_call_accept">Ta samtale</string>
+  <string name="action_call_accept">Svar</string>
+  <string name="action_call_hold_accept">Sett på vent og svar</string>
+  <string name="action_call_end_accept">Legg på og svar</string>
   <string name="action_call_decline">Avslå</string>
   <string name="action_call_mic_mute">Koble ut mikrofon</string>
+  <string name="action_load_plugin">Last tillegg</string>
   <string name="ab_action_speakerphone">Aktiver høytaler</string>
   <string name="ab_action_contact_add">Legg til kontakter</string>
   <string name="ab_action_contact_add_question">Legg til kontakter?</string>
@@ -104,7 +111,9 @@
   <string name="share_via">Del via</string>
   <string name="write_a_message">Skriv en melding</string>
   <string name="scan_qr">Skann QR-kode</string>
+  <string name="qr_code">QR kode</string>
   <string name="ab_action_flipcamera">Snu kamera</string>
+  <string name="ab_action_hidepreview">Skjul forhåndsvisning</string>
   <!--Text messages-->
   <string name="send_message">Send melding</string>
   <string name="message_sending">Sender melding…</string>
@@ -132,22 +141,22 @@
   <string name="permission_dialog_write_call_log_message">Jami trenger tilgang til «Skriv samtalelogg» for å aktivere denne egenskapen. Vær så snill å gi tilgang.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skann QR-koden tilhørende kontoen du ønsker å legge til.</string>
-  <string name="title_activity_qrcode">Del kontoen min</string>
+  <string name="title_activity_qrcode">Del min konto</string>
   <string name="error_scan_no_camera_permissions">QR-skanneren krever tilgang til kamera for å virke</string>
   <string name="tab_code">Min kode</string>
-  <string name="tab_scan">Les av kode</string>
+  <string name="tab_scan">Skann kode</string>
   <!--Settings-->
-  <string name="clear_history_dialog_title">Nullstill historikk?</string>
-  <string name="clear_history_dialog_message">Denne handlingen kan ikke tilbakestilles.</string>
-  <string name="clear_history_completed">Historikken har blitt tømt.</string>
+  <string name="clear_history_dialog_title">Slett historikk?</string>
+  <string name="clear_history_dialog_message">Denne handlingen kan ikke angres.</string>
+  <string name="clear_history_completed">Historikken har blitt slettet.</string>
   <!--Conversation-->
   <string name="conversation_details">Kontaktdetaljer</string>
   <string name="conversation_action_delete_this">Slett denne samtalen</string>
   <string name="conversation_action_delete_this_title">Slett denne samtalen?</string>
   <string name="conversation_action_delete_this_message">Denne handlingen kan ikke gjøres om.</string>
   <string name="conversation_action_history_clear">Slett historikk</string>
-  <string name="conversation_action_history_clear_title">Nullstill samtalehistorikken?</string>
-  <string name="conversation_action_history_clear_message">Dette vil permanent nullstille samtalehistorikken.</string>
+  <string name="conversation_action_history_clear_title">Slett samtaleloggen?</string>
+  <string name="conversation_action_history_clear_message">Dette vil definitivt slette samtaleloggen.</string>
   <string name="conversation_action_remove_this">Slett kontakt</string>
   <string name="conversation_action_remove_this_title">Slett denne kontakten?</string>
   <string name="conversation_action_remove_this_message">Dette vil slette denne kontakten og permanent nullstille samtalehistorikken.</string>
@@ -171,15 +180,26 @@
   <string name="prompt_new_username">Skriv inn nytt brukernavn</string>
   <string name="prompt_hint_username">Brukernavn</string>
   <string name="help_password_choose">Velg et sterkt passord som du husker, for å beskytte Jami-kontoen din.</string>
+  <string name="help_password_enter">Tast inn ditt Jami konto passord.</string>
+  <string name="help_server_enter">Fyll ut URL til administrasjonstjener</string>
   <string name="help_pin_enter">Skriv inn PIN fra en annen ferdig oppsatt Jami-konto.  Bruk «Eksporter Jami-konto»-valget for å få tak i en PIN.</string>
   <string name="wizard_next">Neste</string>
   <string name="wizard_back">Tilbake</string>
   <string name="wizard_skip">Hopp over</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Profilnavn</string>
   <string name="profile_message_warning">Din profil deles bare med dine kontakter</string>
   <string name="open_the_gallery">Åpne galleriet</string>
   <string name="take_a_photo">Ta et bilde</string>
+  <string name="profile_name_hint">Tast inn ditt navn</string>
+  <string name="registered_name">Registrert navn</string>
+  <string name="no_registered_name">Navn ikke registrert</string>
+  <string name="identity">Identitet</string>
+  <string name="account">Konto</string>
+  <string name="link_new_device">Koble til en ny enhet</string>
+  <string name="devices">Koblede enheter</string>
+  <string name="total_devices">Antall enheter:</string>
   <!--Share fragment-->
   <string name="share_message">Søk etter denne koden med Jami</string>
   <string name="share_message_no_account">Velg en konto å dele.</string>
@@ -195,6 +215,7 @@
   <string name="contact_request_title">Ny kontaktforespørsel</string>
   <string name="contact_request_msg">Du har %1$s kontaktforspørsler</string>
   <string name="contact_request_account">For %1$s</string>
+  <string name="no_requests">Du har ingen kontaktforespørsler</string>
   <string name="message_contact_not_trusted_yet">%s er ikke i din kontaktliste enda.\nØnsker du å godta eller avslå denne kontaktforespørselen?</string>
   <string name="message_contact_not_trusted">%s er ikke blant dine kontakter.\nLegg til ny kontakt?</string>
   <!--Send contact requests-->
@@ -202,28 +223,30 @@
   <string name="send_request_title">Send en kontaktforespørsel</string>
   <string name="send_request_msg">Du må sende en kontaktforespørsel for å kommunisere med denne brukeren. Så lenge din kontakt ikke har godtatt forespørselen, kan du sende meldinger som din kontakt ikke kan lese.</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">Ingen blokkerte kontakter</string>
   <!--Smartlist-->
   <string name="no_contact_request">Ingen kontaktforespørsel sendt</string>
+  <string name="conversation_placeholder">Du har ingen samtaler foreløpig</string>
   <string name="contact_request_sent">Kontaktforespørsel sendt</string>
-  <string name="start_conversation">Start samtalen</string>
+  <string name="start_conversation">Ny samtale</string>
   <string name="search_results">Søkeresultater</string>
   <string name="tv_contact_row_header">Kontakter</string>
   <string name="gallery_error_title">Fant ingen galleriprogrammer</string>
   <string name="gallery_error_message">Fant ingen programmer på enheten for åpning av galleri</string>
-  <string name="generic_error">En ukjent feil inntraff</string>
+  <string name="generic_error">En ukjent feil oppstod</string>
   <!--File Transfer-->
   <string name="invalid_file">Ugyldig fil</string>
   <string name="not_able_to_write_file">Kunne ikke skrive fil</string>
   <string name="file_transfer_status_created">igangsetter overføring</string>
-  <string name="file_transfer_status_unsupported">ustøttet</string>
-  <string name="file_transfer_status_wait_peer_acceptance">venter på godkjenning fra likemann</string>
+  <string name="file_transfer_status_unsupported">ikke støttet</string>
+  <string name="file_transfer_status_wait_peer_acceptance">venter på godkjenning fra node</string>
   <string name="file_transfer_status_wait_host_acceptance">venter på godkjenning fra vert</string>
   <string name="file_transfer_status_ongoing">pågår</string>
   <string name="file_transfer_status_finished">fullført</string>
   <string name="file_transfer_status_closed_by_host">lukket av vert</string>
-  <string name="file_transfer_status_closed_by_peer">lukket av likemann</string>
+  <string name="file_transfer_status_closed_by_peer">lukket av node</string>
   <string name="file_transfer_status_invalid_pathname">ugyldig stinavn</string>
-  <string name="file_transfer_status_unjoinable_peer">likemann det ikke går an å koble til</string>
+  <string name="file_transfer_status_unjoinable_peer">node det ikke går an å koble til</string>
   <string name="file_transfer_status_cancelled">avbrutt</string>
   <string name="file_transfer_status_error">mislyktes på grunn av feil</string>
   <string name="file_transfer_status_timed_out">tidsavbrudd</string>
@@ -246,6 +269,7 @@
   <string name="navigation_item_conversation">Samtaler</string>
   <string name="navigation_item_contact_request">Kontaktforespørsler</string>
   <string name="navigation_item_account">Konto</string>
+  <string name="search_results_public_directory">Offentlig katalog</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">Vil du sende lydmelding?</string>
   <string name="tv_send_image_dialog_message">Vil du sende bildet?</string>
@@ -254,9 +278,26 @@
   <string name="tv_audio_play">Spill av</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Send</string>
+  <string name="tv_audio_recording">Opptak pågår...</string>
   <string name="tv_send_text">Send tekst</string>
   <string name="tv_send_audio">Send lyd</string>
   <string name="tv_send_video">Send media</string>
+  <string name="conversation_input_speech_hint">Si noe...</string>
   <!--Wizard-->
-  <string name="wizard_password_skip">Opprett kongo</string>
+  <string name="wizard_status_recommended">Anbefalt</string>
+  <string name="wizard_status_optional">Valgfritt</string>
+  <string name="wizard_status_required">Obligatorisk</string>
+  <string name="wizard_username_info">Velg brukernavn for din konto</string>
+  <string name="wizard_username_button">Velg brukernavn</string>
+  <string name="wizard_username_skip">Hopp over å velge brukernavn</string>
+  <string name="wizard_password_info">Passord konto</string>
+  <string name="wizard_password_placeholder">Velg et passord for å kryptere kontonøkkel på denne enheten</string>
+  <string name="wizard_password_button">Velg passord</string>
+  <string name="wizard_password_skip">Opprett konto</string>
+  <string name="wizard_password_switch">Krypter konto med passord</string>
+  <string name="wizard_password_warning">Legg merke til at passordet ikke kan bli gjenopprettet</string>
+  <string name="wizard_profile_info">Profil deles bare med kontakter</string>
+  <string name="wizard_profile_button">Lagre profil</string>
+  <string name="wizard_profile_skip">Hopp over og gjør dette senere</string>
+  <string name="fab_path_choose">Velg en annen fil</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index 106a341838ffc88376dd6b3fe9fd7899edb1747b..52dcfabb153c441c9a13d154cffa165a41ad3ca5 100644
--- a/ring-android/app/src/main/res/values-nb/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_account.xml
@@ -5,25 +5,28 @@
   <string name="ic_advanced_menu">Avanserte innstillinger</string>
   <string name="ic_blacklist_menu">Blokkerte kontakter</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Opprett Jami konto</string>
   <string name="add_sip_account_title">Legg til SIP-konto</string>
+  <string name="ring_account_default_name">Jami konto %1$s</string>
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Vertsnavn</string>
   <string name="prompt_username">Brukernavn</string>
   <string name="prompt_password">Passord</string>
-  <string name="action_create">Opprett kongo</string>
+  <string name="action_create">Opprett konto</string>
   <string name="action_create_short">Lag</string>
   <string name="action_register">Registrer</string>
   <string name="action_settings">Innstillinger</string>
-  <string name="error_field_required">Dette feltet er påkrevd</string>
+  <string name="error_field_required">Dette feltet er obligatorisk</string>
   <string name="dialog_wait_create">Legger til konto</string>
   <string name="dialog_wait_create_details">Vent litt mens din nye konto blir lagt til…</string>
   <string name="dialog_wait_update">Oppdaterer konto</string>
   <string name="dialog_wait_update_details">Vent mens din nye konto oppdateres…</string>
-  <string name="dialog_warn_ip2ip_account_title">Lag tom SIP-konto?</string>
+  <string name="dialog_warn_ip2ip_account_title">Opprett tom SIP-konto?</string>
   <string name="dialog_warn_ip2ip_account_message">Du er igang med å lage en SIP-konto uten et gyldig vertsnavn.
 Du vil kun være i stand til å gjennomføre direkte IP-samtaler.
 Du kan endre kontoen din senere</string>
   <string name="account_type_ip2ip">IP-konto</string>
+  <string name="help_ring">En Jami-konto lar deg nå folk trygt node til node gjennom et fullstendig distribuert nettverk.</string>
   <string name="help_sip_title">Legg til SIP-kontoen din</string>
   <string name="help_sip">Sett opp en eksisterende SIP-konto.</string>
   <string name="create_sip_account">Legg til SIP-konto</string>
@@ -33,6 +36,7 @@ Du kan endre kontoen din senere</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ingen konto registrert</string>
   <string name="normal_accounts_titles">Kontoer</string>
+  <string name="normal_devices_titles">Tilknyttede enheter</string>
   <string name="account_device_revoke">Tilbakekall enhet</string>
   <string name="account_device_revocation_success_title">Vellykket</string>
   <string name="account_device_revocation_success">Enheten er nå tilbakekalt!</string>
@@ -40,17 +44,23 @@ Du kan endre kontoen din senere</string>
   <string name="account_device_revocation_wrong_password">Feil passord.</string>
   <string name="account_device_revocation_unknown_device">Ukjent enhet.</string>
   <string name="account_device_revocation_error_unknown">Ukjent feil.</string>
+  <string name="account_password_change">Endre passord</string>
+  <string name="account_password_set">Lagre passord</string>
+  <string name="account_password_summary">Administrer kontopassordet ditt.</string>
+  <string name="account_password_change_wait_message">Endrer kontopassord</string>
   <!--Basic Details-->
-  <string name="account_preferences_basic_tab">Generell</string>
-  <string name="account_basic_category">Grunnleggende oppsett</string>
+  <string name="account_preferences_basic_tab">Generelt</string>
+  <string name="account_basic_category">Grunnleggende innstillinger</string>
   <string name="account_alias_label">Kontonavn</string>
   <string name="account_hostname_label">Vertsnavn</string>
   <string name="account_bootstrap_label">Bootstrap</string>
   <string name="account_username_label">Brukernavn</string>
   <string name="account_password_label">Passord</string>
-  <string name="account_optionnal_category">Valgfritt oppsett</string>
+  <string name="account_optionnal_category">Valgfrie innstillinger</string>
   <string name="account_useragent_label">Brukeragent</string>
   <string name="account_autoanswer_label">Autosvar</string>
+  <string name="account_rendezvous_label">Møteplass modus</string>
+  <string name="account_rendezvous_summary">I møteplassmodus vil innkommende samtaler bli lagt til i konferanserommet.</string>
   <string name="account_upnp_label">Aktiver UPnP</string>
   <string name="account_proxy_field">Mellomtjener</string>
   <!--Audio Details-->
@@ -58,19 +68,28 @@ Du kan endre kontoen din senere</string>
   <string name="account_preferences_media_tab">Media</string>
   <string name="account_ringtone_label">Ringetoner</string>
   <string name="account_ringtone_enabled_label">Aktiver ringetoner</string>
-  <string name="account_ringtone_path_label">Ringetonesti</string>
-  <string name="account_ringtone_custom_label">Bruk egen ringetone</string>
+  <string name="account_ringtone_path_label">Sti ringetoner</string>
+  <string name="account_ringtone_custom_label">Bruk tilpasset ringetone</string>
+  <string name="account_ringtone_title">Velg en ringetone</string>
+  <string name="account_ringtone_summary">Velg ringetone, eller velg din egen</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Aktiver video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Avansert</string>
-  <string name="account_call_settings_title">Samtaleoppsett</string>
-  <string name="account_registration_exp_label">Registreringstidsgrense</string>
+  <string name="account_call_settings_title">Samtale innstillinger</string>
+  <string name="account_dht_public_in_calls_label">Tillat anrop fra ukjente kontakter</string>
+  <string name="account_registration_exp_label">Tidsavbrudd registrering</string>
   <string name="account_local_interface_label">Lokalt grensesnitt</string>
   <string name="account_local_port_label">Lokal port</string>
   <string name="account_stun_enable_label">Bruk STUN</string>
   <string name="account_stun_server_label">STUN-tjener</string>
+  <string name="account_accept_files">Tillat innkommende filer automatisk</string>
+  <string name="account_conversation_settings_title">Samtale innstillinger</string>
+  <string name="account_accept_files_max_size">Maks filstørrelse som aksepteres automatisk</string>
+  <string name="account_accept_files_never">Aldri aksepter automatisk</string>
+  <string name="account_accept_files_always">Alltid aksepter automatisk</string>
+  <string name="size_mb">%1$dMB</string>
   <string name="account_turn_enable_label">Bruk TURN</string>
   <string name="account_turn_server_label">TURN-tjener</string>
   <string name="account_turn_username_label">TURN-brukernavn</string>
@@ -81,6 +100,11 @@ Du kan endre kontoen din senere</string>
   <string name="account_proxy_label">DHT-mellomtjener</string>
   <string name="account_proxy_enable_label">Bruk DHT-mellomtjener</string>
   <string name="account_proxy_server_label">DHT-mellomtjeneradresse</string>
+  <string name="account_proxy_server_list_label">URL DHT-mellomtjenerliste</string>
+  <string name="account_sip_proxy_label">Mellomtjener</string>
+  <string name="account_peer_discovery_label">Lokal node detektering</string>
+  <string name="account_peer_discovery_enable_label">Tillat lokal node detektering</string>
+  <string name="account_peer_discovery_enable_summary">Koble til andre DHT-noder som annonserer i vårt lokale nettverk</string>
   <!--Security Details-->
   <string name="account_credentials_label">Identitetsdetaljer</string>
   <string name="account_credentials_edit">Rediger identitetsdetaljer</string>
@@ -88,6 +112,8 @@ Du kan endre kontoen din senere</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sikkerhet</string>
   <string name="account_srtp_switch_label">Krypter mediastrømmer (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Bruk SDES som nøkkelutvekslingsprotokoll</string>
+  <string name="account_srtp_rtp_fallback">Fall tilbake på RTP hvis SRTP feiler</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Bruk TLS-transport</string>
@@ -101,6 +127,7 @@ Du kan endre kontoen din senere</string>
   <string name="account_tls_server_name_label">Tjenernavn</string>
   <string name="account_tls_verify_server_label">Kontroller tjener</string>
   <string name="account_tls_verify_client_label">Kontroller klient</string>
+  <string name="account_require_client_certificate_label">TLS krever klientsertifikat</string>
   <string name="account_tls_negotiation_timeout_sec">Tidsbegresning på forhandling (sek)</string>
   <string name="account_rtp_max_port">Maksimum</string>
   <string name="account_rtp_min_port">Minimum</string>
@@ -108,43 +135,72 @@ Du kan endre kontoen din senere</string>
   <!--restore/backup-->
   <string name="account_new_device_password">Skriv inn hovedpassord for å låse opp konto</string>
   <string name="error_password_char_count">minimum 6 tegn</string>
-  <string name="error_passwords_not_equals">Passordene stemmer ikke</string>
-  <string name="export_account_wait_title">Vent…</string>
+  <string name="error_passwords_not_equals">Passordene samsvarer ikke</string>
+  <string name="export_account_wait_title">Vennligst vent…</string>
+  <string name="export_account_wait_message">Eksporterer kontoinformasjon</string>
+  <string name="account_export_file">Sikkerhetskopier konto</string>
+  <string name="account_export_file_summary">Sikkerhetskopier din konto på din enhet for å gjenopprette den senere.</string>
   <string name="account_export_end_decryption_message">Kunne ikke låse opp kontoen ved bruk av oppgitt passord.</string>
   <string name="account_export_end_network_title">Nettverksfeil</string>
   <string name="account_export_end_network_message">Kunne ikke eksportere kontoen på nettverket. Sjekk dine tilkoblingsinnstillinger.</string>
   <string name="account_export_end_error_title">Feil</string>
-  <string name="account_export_end_error_message">Kunne ikke eksportere konto. En ukjent feil inntraff.</string>
+  <string name="account_export_end_error_message">Kunne ikke eksportere konto. En ukjent feil oppstod.</string>
   <string name="account_enter_password">Skriv inn passord</string>
+  <string name="account_share_body">Kontakt meg via \'%1$s\' på den distribuerte kommunikasjonsplattformen Jami: %2$s</string>
+  <string name="account_share_body_with_username">Kontakt meg \'%1$s\' eller mitt offentlige brukernavn \'%2$s\' på den distribuerte kommunikasjonsplattformen Jami: %3$s</string>
+  <string name="account_contact_me">Kontakt meg på Jami !</string>
   <string name="update_account">Oppdater konto</string>
+  <string name="account_migration">Din Jami konto kan bli oppdatert.\nVennligst tast inn ditt passord.</string>
+  <string name="ring_account">Jami konto</string>
   <string name="ring_account_identity">Identitet</string>
-  <string name="account_migration_title_dialog">Kontoflytting</string>
+  <string name="account_migration_title_dialog">Kontomigrering</string>
   <string name="account_migration_message_dialog">Dine kontoer må oppdateres. Ønsker du å gå til kontobehandling for å utføre dette?</string>
   <string name="account_update_needed">Oppdatering behøves</string>
   <string name="account_cannot_be_found_title">Kan ikke finne konto</string>
+  <string name="account_cannot_be_found_message">Kontoen ble ikke funnet i Jami-nettverket. \ NKontroller at den ble eksportert på Jami fra en eksisterende enhet, og at opplysningene er korrekte.</string>
   <string name="account_sip_cannot_be_registered_message">Du kan fortsette med kontoopprettelsesprosessen eller skrive inn din informasjon her. Redigering er fremdeles mulig senere i kontoinnstillingene.</string>
   <string name="account_no_network_title">Kan ikke koble til nettverket</string>
+  <string name="account_no_network_message">Kunne ikke legge til konto fordi Jami ikke kunne koble til det distribuerte nettverket. Sjekk enhetens tilkobling.</string>
   <string name="account_device_added_title">Kontoenhet lagt til</string>
+  <string name="account_device_added_message">Du har lykkes med å sette opp din Jami konto på denne enheten.</string>
   <string name="account_device_updated_title">Kontoenhet oppdatert</string>
-  <string name="account_cannot_be_updated_message">Kontoenheten kunne ikke oppdateres. Sjekk passordet ditt.</string>
+  <string name="account_device_updated_message">Vellykket oppdatering av din Jami konto.</string>
+  <string name="account_cannot_be_updated_message">Kontoenheten kunne ikke oppdateres. Vennligst kontroller ditt passord.</string>
   <string name="account_sip_success_title">SIP-konto registrert</string>
   <string name="account_sip_success_message">Du har nå registrert din SIP-konto.</string>
   <string name="account_sip_register_anyway">Registrer uansett</string>
-  <string name="account_link_prompt_pin">Skriv inn PIN</string>
+  <string name="account_link_device">Koble til fra en annen enhet</string>
+  <string name="account_link_button">Koble til fra nettverk</string>
+  <string name="account_link_archive_button">Koble til fra sikkerhetskopi</string>
+  <string name="account_link_prompt_pin">Tast inn PIN</string>
   <string name="account_new_button">Opprett en Jami-konto</string>
-  <string name="account_link_export_button">Lenk en ny enhet</string>
-  <string name="account_start_export_button">Oppretter PIN</string>
+  <string name="account_link_export_button">Koble til en ny enhet</string>
+  <string name="account_link_show_button">Vis %d flere tilknyttede enheter</string>
+  <string name="account_link_hide_button">Skjul tilknyttet enhet</string>
+  <string name="account_link_export_info">For å bruke denne kontoen på andre enheter, må du først avdekke den for Jami. Dette vil generere en PIN-kode som du må oppgi på den nye enheten for å konfigurere kontoen. PIN-koden er gyldig i 10 minutter.</string>
+  <string name="account_start_export_button">Generer PIN</string>
   <string name="account_end_export_button">lukk</string>
+  <string name="account_end_export_infos">Din PIN er:\n\n%%\n\nFor å fullføre prosessen, må du åpne Jami på den nye enheten. Opprett en ny konto med \"Koble denne enheten til en konto\". PIN-koden din er gyldig i 10 minutter.</string>
+  <string name="account_link_export_info_light">For å bruke denne kontoen på andre enheter, må du først avdekke den for Jami. Dette vil generere en PIN-kode som du må oppgi på den nye enheten for å konfigurere kontoen. PIN-koden er gyldig i 10 minutter.</string>
   <string name="account_export_title">Legg til enheter</string>
+  <string name="account_connect_server_button">Koble til administrasjonstjener</string>
+  <string name="account_connect_button">Koble til</string>
+  <string name="prompt_server">URL Jami administrasjonstjener</string>
+  <string name="help_credentials_enter">Tast inn opplysninger om din organisasjon</string>
+  <string name="help_connect_password_enter">Tast inn passordet til din organisasjon</string>
   <string name="account_connect_prompt_username">Brukernavn</string>
   <!--Name registration-->
   <string name="error_username_empty">Skriv inn et brukernavn</string>
-  <string name="no_registered_name_for_account">Fant inget registrert navn for denne kontoen</string>
+  <string name="no_registered_name_for_account">Ikke et registrert navn</string>
+  <string name="username_available">Brukernavn tilgjengelig !</string>
+  <string name="register_name">Registrer navn</string>
   <string name="trying_to_register_name">Prøver å registrere navn</string>
   <string name="registered_username">Registrert brukernavn</string>
   <string name="register_username">Registrer offentlig brukernavn</string>
+  <string name="register_recommended">Anbefalt</string>
   <string name="username_already_taken">Brukernavnet er allerede i bruk</string>
   <string name="invalid_username">Ugyldig brukernavn</string>
+  <string name="unknown_error">Ukjent feil. Vennligst sjekk din nettverksforbindelse!</string>
   <string name="looking_for_username_availability">Sjekker hvorvidt brukernavnet er tilgjengelig…</string>
   <string name="account_status_connecting">Kobler opp</string>
   <string name="account_status_connection_error">Tilkoblingsfeil</string>
@@ -155,7 +211,8 @@ Du kan endre kontoen din senere</string>
   <!--Create account-->
   <string name="account_creation_home">Velkommen til Jami</string>
   <string name="account_creation_profile">Opprett din profil</string>
-  <string name="account_link_title">Lenk denne enheten</string>
+  <string name="account_creation_ring">Opprett din Jami konto</string>
+  <string name="account_link_title">Tilknytt denne enheten</string>
   <string name="account_sip_cannot_be_registered">Kan ikke registrere konto</string>
   <!--Edit profile-->
   <string name="account_edit_profile">Rediger profilen din</string>
@@ -164,12 +221,13 @@ Du kan endre kontoen din senere</string>
   <string name="enter_password">Skriv inn passord</string>
   <string name="revoke_device_title">Tilbakekall enhet</string>
   <string name="revoke_device_message">Er du sikker på at du vil tilbakekalle %1$s?</string>
-  <string name="revoke_device_wait_title">Vent…</string>
+  <string name="revoke_device_wait_title">Vennligst vent…</string>
   <string name="revoke_device_wait_message">Tilbakekall enhet</string>
   <string name="rename_device_title">Gi denne enheten nytt navn</string>
+  <string name="rename_device_message">Velg et nytt navn for å identifisere denne enheten på din Jami konto</string>
   <string name="rename_device_button">Gi enhet nytt navn</string>
   <string name="account_rename_device_hint">Velg nytt navn for enhet</string>
-  <string name="account_device_name_empty">Enhetsnavn kan ikke stå tomt</string>
-  <string name="account_device_this_indicator">denne enheten</string>
-  <string name="account_disabled_indicator">avskrudd</string>
+  <string name="account_device_name_empty">Enhetsnavn må fylles ut</string>
+  <string name="account_device_this_indicator">Denne enheten</string>
+  <string name="account_disabled_indicator">deaktivert</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_call.xml b/ring-android/app/src/main/res/values-nb/strings_call.xml
index e8099f5e138525254814270f9e58b57e12ec959d..74e3a723e8a581d5abcb938655ac5f5895aad167 100644
--- a/ring-android/app/src/main/res/values-nb/strings_call.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_call.xml
@@ -34,7 +34,7 @@ along with this program; if not, write to the Free Software
     <string name="call_human_state_busy">Opptatt</string>
     <string name="call_human_state_failure">Mislyktes</string>
     <string name="call_human_state_hold">Parker</string>
-    <string name="call_human_state_unhold">Gjenoppta parkert</string>
+    <string name="call_human_state_unhold">Gjenoppta</string>
     <string name="call_human_state_over">Over</string>
     <!-- Conferences -->
 </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-nb/strings_content_description.xml b/ring-android/app/src/main/res/values-nb/strings_content_description.xml
index 0afd5f498f791e0911917e40d680df99f3a8f862..99d1d7f0849f35d6887a9687b05517f24ef539fd 100644
--- a/ring-android/app/src/main/res/values-nb/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_content_description.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings for xml content description of images-->
-  <string name="contact_quick_call_description">Kjapp samtale</string>
+  <string name="contact_quick_call_description">Hurtigoppringing</string>
   <string name="contact_picture_description">Kontaktbilde</string>
-  <string name="dial_numeric_pad">Numerisk tasteflate</string>
+  <string name="dial_numeric_pad">Numerisk tastatur</string>
   <string name="contact_unblock">Fjern blokkering</string>
+  <string name="video_plugins">Video tillegg</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_preferences.xml b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
index bd87bac34784acb12eafd05e50eb2e9222204b63..2285e11b2894ca0ac697d5b2a5bbc1f5926fc513 100644
--- a/ring-android/app/src/main/res/values-nb/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
@@ -7,22 +7,43 @@
   <string name="pref_category_privacy">Personvern</string>
   <string name="pref_mobileData_title">Mobildata</string>
   <string name="pref_mobileData_summary">Tillat Jami på 3G/LTE-nettverk i tillegg til Wi-Fi</string>
-  <string name="pref_pushNotifications_title">Push-merknader</string>
-  <string name="pref_pushNotifications_summary">Bruk Google-tjenere til å tillate mottak av samtaler/meldinger i bakgrunnen</string>
-  <string name="pref_video_advanced_title">Avanserte innstillinger for video</string>
+  <string name="pref_pushNotifications_title">Push-varsler</string>
+  <string name="pref_pushNotifications_summary">Bruk Google-tjenere for å tillate mottak av samtaler/meldinger i bakgrunnen</string>
+  <string name="pref_video_advanced_title">Avanserte video-innstillinger</string>
   <string name="pref_video_advanced_summary">Endre videobitrate og oppløsning, samt få tilgang til eksperimentelle funksjoner</string>
   <string name="pref_hd_summary">Aktiver sending av HD-video</string>
-  <string name="pref_hwEncode_title">Aktiver aksellerert koding</string>
-  <string name="pref_hwEncode_summary">Eksperimentelt valg</string>
+  <string name="pref_hwEncode_title">Aktiver akselerert koding</string>
+  <string name="pref_hwEncode_summary">Eksperimentell funksjon</string>
+  <string name="pref_videoBitrate_title">Video bitrate</string>
+  <string name="pref_videoBitrate_summary">Velg standardverdi på utgående video bitrate (KB/s)</string>
+  <string name="pref_videoResolution_title">Video oppløsning</string>
+  <string name="pref_videoResolution_summary">Velg standard utgående video oppløsning</string>
   <string name="pref_systemContacts_title">Bruk systemkontakter</string>
   <string name="pref_systemContacts_summary">Bruk systemkontakter for å vise innringerdetaljer</string>
-  <string name="pref_systemDialer_title">Gjennomfør systemanrop med Jami</string>
-  <string name="pref_systemDialer_summary">Bruk Jami til å gjennomføre systemanrop når det er mulig.</string>
+  <string name="pref_systemDialer_title">Benytt Jami til systemanrop</string>
+  <string name="pref_systemDialer_summary">Bruk Jami til systemanrop når det er mulig.</string>
   <string name="pref_startOnBoot_title">Start Jami ved oppstart</string>
   <string name="pref_startOnBoot_summary">Kjør Jami i bakgrunnen når systemet starter.</string>
   <string name="pref_clearHistory_title">Slett historikk</string>
   <string name="pref_clearHistory_summary">Tøm samtalehistorikken. Denne handlingen kan ikke angres.</string>
+  <string name="pref_blackList_title">Blokkeringsliste</string>
+  <string name="pref_blackList_summary">Sjekk din blokkeringsliste.</string>
+  <string name="pref_delete_account_title">Slett konto</string>
+  <string name="pref_delete_account_summary">Slett din konto på denne enheten</string>
   <string name="pref_persistNotification_title">Kjør i bakgrunnen</string>
   <string name="pref_persistNotification_summary">Tillater kjøring i bakgrunnen for å motta samtaler og meldinger.</string>
   <!--Plugin-->
+  <string name="pref_plugins_title">Tillegg</string>
+  <string name="pref_plugins_summary">Aktiver tillegg og angi deres innstillinger</string>
+  <string name="fab_plugins_add">Legg til nytt tillegg</string>
+  <string name="plugin_uninstall_title">Avinstaller tillegg ?</string>
+  <string name="plugin_reset_preferences">Nullstill innstillinger for tillegg</string>
+  <string name="plugin_reset_preferences_summary">Innstillinger for tillegg vil bli nullstilt</string>
+  <string name="plugin_reset_preferences_ask">Ønsker du å nullstille innstillinger for tillegg ?</string>
+  <string name="plugin_successfully_installed">Tillegget <b>%1$s</b> installert</string>
+  <string name="plugin_install_failure">Installasjon av tillegg feilet: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">Du har en nyere versjon av: <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Du har samme versjon av <b>%1$s</b> installert</string>
+  <string name="plugin_force_install">tving \n installasjon</string>
+  <string name="plugin_path_image_add">Legg til et nytt bilde</string>
 </resources>
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 e4c7a86b9e5a3878902122d5f8cce5e2d43478ff..e3d84cd245942290be22093c48fb25ad7f6742a0 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
@@ -104,6 +104,7 @@
   <string name="share_via">Delen via</string>
   <string name="write_a_message">Schrijf een bericht</string>
   <string name="scan_qr">QR-code scannen</string>
+  <string name="qr_code">QR-code</string>
   <string name="ab_action_flipcamera">Camera draaien</string>
   <!--Text messages-->
   <string name="send_message">Bericht versturen</string>
@@ -180,6 +181,11 @@
   <string name="profile_message_warning">Uw profiel wordt enkel gedeeld met uw contacten</string>
   <string name="open_the_gallery">Galerij openen</string>
   <string name="take_a_photo">Foto nemen</string>
+  <string name="registered_name">Geregistreerde naam</string>
+  <string name="identity">Identiteit</string>
+  <string name="account">Account</string>
+  <string name="link_new_device">Een nieuw apparaat koppelen</string>
+  <string name="devices">Gekoppelde apparaten</string>
   <!--Share fragment-->
   <string name="share_message">Scan deze code met Jami</string>
   <string name="share_message_no_account">Selecteer een account om te delen.</string>
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 0a0cdfdb19f5b60b517282339d80c4ebbe6223a1..2e84142674850aa3f1c37e0c709e439bdc65a465 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
@@ -89,6 +89,7 @@ U kunt uw account later bewerken</string>
   <string name="account_proxy_label">DHT-proxy</string>
   <string name="account_proxy_enable_label">DHT-proxy gebruiken</string>
   <string name="account_proxy_server_label">DHT-proxyadres</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <string name="account_credentials_label">Legitimatie</string>
   <string name="account_credentials_edit">Legitimatie wijzigen</string>
@@ -167,7 +168,6 @@ U kunt uw account later bewerken</string>
   <string name="account_connect_prompt_username">Gebruikersnaam</string>
   <!--Name registration-->
   <string name="error_username_empty">Geef een gebruikersnaam in</string>
-  <string name="no_registered_name_for_account">Geen geregistreerde naam gevonden voor deze account</string>
   <string name="username_available">Gebruikersnaam is beschikbaar!</string>
   <string name="trying_to_register_name">Naam wordt geregistreerd</string>
   <string name="registered_username">Geregistreerde gebruikersnaam</string>
@@ -202,6 +202,6 @@ U kunt uw account later bewerken</string>
   <string name="rename_device_button">Apparaat hernoemen</string>
   <string name="account_rename_device_hint">Kies een nieuwe apparaatnaam</string>
   <string name="account_device_name_empty">Apparaatnaam kan niet leeg zijn</string>
-  <string name="account_device_this_indicator">dit apparaat</string>
+  <string name="account_device_this_indicator">Dit apparaat</string>
   <string name="account_disabled_indicator">uitgeschakeld</string>
 </resources>
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 bc8cfb0f94bf89093f41d9feb25ae70928ec91ea..e18ba0d610283fd023fcd45fbaa2d6d614074aa1 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
@@ -22,6 +22,7 @@
   <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_delete_account_title">Account verwijderen</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>
   <!--Plugin-->
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 230b2c4f83cf35033365c660488dd9679209bcbe..7d256650147768869b09f66b659b400cc9184b57 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -104,6 +104,7 @@
   <string name="share_via">Delen via</string>
   <string name="write_a_message">Schrijf een bericht</string>
   <string name="scan_qr">QR-code scannen</string>
+  <string name="qr_code">QR-code</string>
   <string name="ab_action_flipcamera">Camera draaien</string>
   <!--Text messages-->
   <string name="send_message">Bericht versturen</string>
@@ -180,6 +181,11 @@
   <string name="profile_message_warning">Uw profiel wordt enkel gedeeld met uw contacten</string>
   <string name="open_the_gallery">Galerij openen</string>
   <string name="take_a_photo">Foto nemen</string>
+  <string name="registered_name">Geregistreerde naam</string>
+  <string name="identity">Identiteit</string>
+  <string name="account">Account</string>
+  <string name="link_new_device">Een nieuw apparaat koppelen</string>
+  <string name="devices">Gekoppelde apparaten</string>
   <!--Share fragment-->
   <string name="share_message">Scan deze code met Jami</string>
   <string name="share_message_no_account">Selecteer een account om te delen.</string>
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 d0eeb4b90ec299d90478492f427e4e8bd7a75bac..5229b8dd5c98ebb0226fe31756f03030e71873b2 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
@@ -89,6 +89,7 @@ U kunt uw account later bewerken</string>
   <string name="account_proxy_label">DHT-proxy</string>
   <string name="account_proxy_enable_label">DHT-proxy gebruiken</string>
   <string name="account_proxy_server_label">DHT-proxyadres</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <string name="account_credentials_label">Legitimatie</string>
   <string name="account_credentials_edit">Legitimatie wijzigen</string>
@@ -167,7 +168,6 @@ U kunt uw account later bewerken</string>
   <string name="account_connect_prompt_username">Gebruikersnaam</string>
   <!--Name registration-->
   <string name="error_username_empty">Voer een gebruikersnaam in</string>
-  <string name="no_registered_name_for_account">Geen geregistreerde naam gevonden voor dit account</string>
   <string name="username_available">Gebruikersnaam is beschikbaar!</string>
   <string name="trying_to_register_name">Naam wordt geregistreerd</string>
   <string name="registered_username">Geregistreerde gebruikersnaam</string>
@@ -202,6 +202,6 @@ U kunt uw account later bewerken</string>
   <string name="rename_device_button">Apparaat hernoemen</string>
   <string name="account_rename_device_hint">Kies een nieuwe apparaatnaam</string>
   <string name="account_device_name_empty">Apparaatnaam kan niet leeg zijn</string>
-  <string name="account_device_this_indicator">dit apparaat</string>
+  <string name="account_device_this_indicator">Dit apparaat</string>
   <string name="account_disabled_indicator">uitgeschakeld</string>
 </resources>
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 bc8cfb0f94bf89093f41d9feb25ae70928ec91ea..e18ba0d610283fd023fcd45fbaa2d6d614074aa1 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
@@ -22,6 +22,7 @@
   <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_delete_account_title">Account verwijderen</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>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-oc/strings.xml b/ring-android/app/src/main/res/values-oc/strings.xml
index b261973965cfa9ce551fe49d6146f869ef73bd70..23cb9e7fe2ba088cf1c607905e23349c38feb09e 100644
--- a/ring-android/app/src/main/res/values-oc/strings.xml
+++ b/ring-android/app/src/main/res/values-oc/strings.xml
@@ -33,9 +33,11 @@
   <string name="ab_action_contact_add">Ajustar als contactes</string>
   <string name="hist_contact_added">Contacte ajustat</string>
   <string name="hist_invitation_received">Invitacion recebuda</string>
+  <string name="qr_code">Còdi QR</string>
   <!--Text messages-->
   <string name="send_message">Enviar messatge</string>
   <string name="message_sending">Mandadís del messatge…</string>
+  <string name="time_just_now">Ara meteis</string>
   <string name="send_file">Enviar un fichiè</string>
   <!--MediaPreferenceFragment-->
   <!--Ringtone activity-->
@@ -56,6 +58,7 @@
   <string name="wizard_skip">Saultar</string>
   <!--Account Summary-->
   <string name="profile">Perfil</string>
+  <string name="account">Compte</string>
   <!--Share fragment-->
   <string name="generic_error_migration">Error</string>
   <!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-oc/strings_account.xml b/ring-android/app/src/main/res/values-oc/strings_account.xml
index 1d55479cb86de4d72ac1c6b4e2ded4771634366b..693f2fdb41234a2d7284d01a6612c867b0a74e7d 100644
--- a/ring-android/app/src/main/res/values-oc/strings_account.xml
+++ b/ring-android/app/src/main/res/values-oc/strings_account.xml
@@ -32,6 +32,7 @@
   <!--Advanced Details-->
   <string name="account_call_settings_title">Paramètres sonada</string>
   <string name="account_turn_enable_label">Utilizar TURN</string>
+  <string name="account_sip_proxy_label">Servidor mandatari</string>
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguretat</string>
diff --git a/ring-android/app/src/main/res/values-oc/strings_preferences.xml b/ring-android/app/src/main/res/values-oc/strings_preferences.xml
index 834fb0697e2709370d2645b158470cd324de5222..bc59de108423dd40d544798f6a08640a8da5a664 100644
--- a/ring-android/app/src/main/res/values-oc/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-oc/strings_preferences.xml
@@ -3,6 +3,7 @@
   <string name="pref_category_video">Vidèo</string>
   <string name="pref_category_system">Sistèma</string>
   <string name="pref_clearHistory_title">Escafar l’istoric</string>
+  <string name="pref_delete_account_title">Suprimir lo compte</string>
   <!--Plugin-->
   <string name="pref_plugins_title">Extensions</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index 26727ab58d07ee5c3705c2a0211365660aa7d8fc..75c04f866bebc09e78a683c6f900a58d5099212e 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -192,6 +192,9 @@
   <string name="open_the_gallery">ਗੈਲਰੀ ਖੋਲ੍ਹੋ</string>
   <string name="take_a_photo">ਫ਼ੋਟੋ ਖਿੱਚੋ</string>
   <string name="profile_name_hint">ਆਪਣਾ ਨਾਂ ਦਾਖਲ ਕਰੋ</string>
+  <string name="identity">ਪਛਾਣ</string>
+  <string name="account">ਖਾਤਾ</string>
+  <string name="link_new_device">ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜੋ</string>
   <!--Share fragment-->
   <string name="share_message">Jami ਨਾਲ ਇਹ ਕੋਡ ਸਕੈਨ ਕਰੋ</string>
   <string name="share_message_no_account">ਕਿਰਪਾ ਕਰਕੇ ਸਾਂਝਾ ਕਰਨ ਲਈ ਕੋਈ ਖਾਤਾ ਚੁਣੋ।</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings_account.xml b/ring-android/app/src/main/res/values-pa/strings_account.xml
index 1aa59644d4f658f4aa8f1a0ba85240b4ec56a20e..ac58590d63c82099ae8eae00b8786af952aa42d3 100644
--- a/ring-android/app/src/main/res/values-pa/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pa/strings_account.xml
@@ -100,6 +100,7 @@
   <string name="account_proxy_enable_label">DHT ਪ੍ਰੌਕਸੀ ਵਰਤੋ</string>
   <string name="account_proxy_server_label">DHT ਪ੍ਰੌਕਸੀ ਪਤਾ</string>
   <string name="account_proxy_server_list_label">DHT ਪ੍ਰੌਕਸੀ ਸੂਚੀ ਦਾ URL</string>
+  <string name="account_sip_proxy_label">ਪ੍ਰੌਕਸੀ</string>
   <string name="account_peer_discovery_label">ਸਥਾਨਕ ਸਾਥੀ ਦੀ ਭਾਲ</string>
   <string name="account_peer_discovery_enable_label">ਸਥਾਨਕ ਸਾਥੀ ਦੀ ਭਾਲ ਚਾਲੂ ਕਰੋ</string>
   <string name="account_peer_discovery_enable_summary">ਸਾਡੇ ਸਥਾਨਕ ਨੈੱਟਵਰਕ \'ਤੇ ਪੇਸ਼ ਕੀਤੀਆਂ ਹੋਰਾਂ DHT ਗੰਢਾਂ ਨਾਲ ਜੁੜੋ</string>
@@ -186,7 +187,6 @@
   <string name="account_connect_prompt_username">ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <!--Name registration-->
   <string name="error_username_empty">ਵਰਤੋਂਕਾਰ ਨਾਂ ਦਾਖਲ ਕਰੋ</string>
-  <string name="no_registered_name_for_account">ਇਸ ਖਾਤੇ ਲਈ ਕੋਈ ਪੰਜੀਕਿਰਤ ਨਾਂ ਨਹੀਂ ਮਿਲਿਆ</string>
   <string name="username_available">ਵਰਤੋਂਕਾਰ ਨਾਂ ਲੈ ਸਕਦੇ ਹੋ !</string>
   <string name="register_name">ਨਾਂ ਦਰਜ ਕਰੋ</string>
   <string name="trying_to_register_name">ਨਾਂ ਦੇ ਪੰਜੀਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
@@ -223,6 +223,5 @@
   <string name="rename_device_button">ਡੀਵਾਈਸ ਦਾ ਨਾਂ ਬਦਲੋ</string>
   <string name="account_rename_device_hint">ਨਵਾਂ ਡੀਵਾਈਸ ਨਾਂ ਚੁਣੋ</string>
   <string name="account_device_name_empty">ਡੀਵਾਈਸ ਦਾ ਨਾਂ ਲਿਖਣਾ ਲਾਜ਼ਮੀ ਹੈ</string>
-  <string name="account_device_this_indicator">ਇਹ ਡੀਵਾਈਸ</string>
   <string name="account_disabled_indicator">ਬੰਦ ਕੀਤਾ ਗਿਆ</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index edd5bfef7afbe3bdeaaca05f6815843a6002de17..741f0ac405b1a1e1757b8769d18990e169559406 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -153,6 +153,9 @@
   <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
   <string name="open_the_gallery">Otwórz galerię</string>
   <string name="take_a_photo">Zrób zdjęcie</string>
+  <string name="registered_name">Zarejestrowana nazwa</string>
+  <string name="identity">Tożsamość</string>
+  <string name="account">Konto</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Wybierz, proszę, konto które chcesz udostępnić.</string>
   <string name="share_your_account_information">Udostępnij informacje o moim kontakcie</string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
index e95f9d196e54365aa58ec44293bb3d69554db1df..8b807430bd83f6258fb97fbbc92378ccd0f48822 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_account.xml
@@ -83,6 +83,7 @@ Możesz edytować swoje konto później</string>
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Używaj proxy DHT</string>
   <string name="account_proxy_server_label">Adres proxy DHT</string>
+  <string name="account_sip_proxy_label">Pełnomocnik</string>
   <!--Security Details-->
   <string name="account_credentials_label">Detale</string>
   <string name="account_credentials_edit">Edytuj detale</string>
@@ -144,7 +145,6 @@ Możesz edytować swoje konto później</string>
   <string name="account_connect_prompt_username">Nazwa użytkownika</string>
   <!--Name registration-->
   <string name="error_username_empty">Wprowadź nazwę użytkownika</string>
-  <string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
   <string name="trying_to_register_name">Trwa próba rejestracji nazwy</string>
   <string name="registered_username">Zarejestruj nazwę użytkownika</string>
   <string name="register_username">Zarejestruj publiczną nazwę użytkownika</string>
@@ -175,6 +175,6 @@ Możesz edytować swoje konto później</string>
   <string name="rename_device_button">Przemianuj urządzenie</string>
   <string name="account_rename_device_hint">Wybierz nową nazwę dla urządzenia</string>
   <string name="account_device_name_empty">Nazwa urządzenia nie może być pusta</string>
-  <string name="account_device_this_indicator">to urządzenie</string>
+  <string name="account_device_this_indicator">To urządzenie</string>
   <string name="account_disabled_indicator">wyłączone</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
index 5ca6627c1566e48230d0e8c34bbddbd987bb4786..55f52ecd13afe3bc7968df14c8612fd76abf3056 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
@@ -12,5 +12,6 @@
   <string name="pref_systemContacts_title">Użyj kontakty z systemu</string>
   <string name="pref_systemContacts_summary">Użyj kontakty z systemu aby pokazać detale tego który dzwoni</string>
   <string name="pref_clearHistory_title">Wyczyść historię</string>
+  <string name="pref_delete_account_title">Usuń konto</string>
   <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index fa1b6ff18a1529c36d611f01ba12b2d00c7e39d1..bf9b5fb45097b1b88108b043b8dcaba8b6b55c98 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -163,6 +163,11 @@
   <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
   <string name="open_the_gallery">Otwórz galerię</string>
   <string name="take_a_photo">Zrób zdjęcie</string>
+  <string name="registered_name">Zarejestrowana nazwa</string>
+  <string name="identity">Tożsamość</string>
+  <string name="account">Konto</string>
+  <string name="link_new_device">Połącz nowe urządzenie</string>
+  <string name="devices">Połączone urządzenia</string>
   <!--Share fragment-->
   <string name="share_message">Zeskanuj ten kod używając Jami</string>
   <string name="share_message_no_account">Wybierz, proszę, konto które chcesz udostępnić.</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings_account.xml b/ring-android/app/src/main/res/values-pl/strings_account.xml
index b892ee45528f327955c0b1e03a7f270c3e29c966..a01afc79c0a6103fd12c64c1a52ea8a6ac94fa83 100644
--- a/ring-android/app/src/main/res/values-pl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_account.xml
@@ -87,6 +87,7 @@ Możesz edytować swoje konto później</string>
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Używaj proxy DHT</string>
   <string name="account_proxy_server_label">Adres proxy DHT</string>
+  <string name="account_sip_proxy_label">Pełnomocnik</string>
   <!--Security Details-->
   <string name="account_credentials_label">Detale</string>
   <string name="account_credentials_edit">Edytuj detale</string>
@@ -160,7 +161,6 @@ Możesz edytować swoje konto później</string>
   <string name="account_connect_prompt_username">Nazwa użytkownika</string>
   <!--Name registration-->
   <string name="error_username_empty">Wprowadź nazwę użytkownika</string>
-  <string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
   <string name="username_available">Nazwa dostępna!</string>
   <string name="trying_to_register_name">Trwa próba rejestracji nazwy</string>
   <string name="registered_username">Zarejestruj nazwę użytkownika</string>
@@ -195,6 +195,6 @@ Możesz edytować swoje konto później</string>
   <string name="rename_device_button">Przemianuj urządzenie</string>
   <string name="account_rename_device_hint">Wybierz nową nazwę dla urządzenia</string>
   <string name="account_device_name_empty">Nazwa urządzenia nie może być pusta</string>
-  <string name="account_device_this_indicator">to urządzenie</string>
+  <string name="account_device_this_indicator">To urządzenie</string>
   <string name="account_disabled_indicator">wyłączone</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings_preferences.xml b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
index 7ec577f8ae6128ecaa10619c02350f1301993cc2..98d0c67c5d57fc8af27f8c2bd0faa361ba05fb69 100644
--- a/ring-android/app/src/main/res/values-pl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
@@ -19,6 +19,7 @@
   <string name="pref_startOnBoot_title">Uruchamiaj Jami przy starcie</string>
   <string name="pref_startOnBoot_summary">Uruchom Jami w tle, podczas uruchamiania systemu.</string>
   <string name="pref_clearHistory_title">Wyczyść historię</string>
+  <string name="pref_delete_account_title">Usuń konto</string>
   <string name="pref_persistNotification_title">Zezwalaj na pracę w tle</string>
   <string name="pref_persistNotification_summary">Zezwalaj na pracę w tle, aby odbierać rozmowy i wiadomości</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings.xml b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
index 8fdb76e5491b0ff9c20cadb6f1be1f6f8ed7cce7..e656ceb42a6c7a8a4a1d697896ed94e40079e69c 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings.xml
@@ -112,6 +112,7 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="share_via">Compartilhar via</string>
   <string name="write_a_message">Escrever uma mensagem</string>
   <string name="scan_qr">Escanear Código QR</string>
+  <string name="qr_code">Código QR</string>
   <string name="ab_action_flipcamera">Virar câmera</string>
   <string name="ab_action_hidepreview">Oculta visualização</string>
   <!--Text messages-->
@@ -193,6 +194,11 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
   <string name="profile_name_hint">Digite seu nome</string>
+  <string name="registered_name">Nome Registrado</string>
+  <string name="identity">Identificação</string>
+  <string name="account">Conta</string>
+  <string name="link_new_device">Associar um novo dispositivo</string>
+  <string name="devices">Dispositivos vinculados</string>
   <!--Share fragment-->
   <string name="share_message">Digitalize este código com Jami</string>
   <string name="share_message_no_account">Por favor selecione uma conta para compartilhar.</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index 62d9e661a7fea7d32d5e316e2208cb27dacdefc2..194efc0443279875c42ab68bd8ae33c938a331f0 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
@@ -100,6 +100,7 @@
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Endereço do proxy DHT</string>
   <string name="account_proxy_server_list_label">URL da lista de proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descoberta local de pares</string>
   <string name="account_peer_discovery_enable_label">Ativar descoberta local de pares</string>
   <string name="account_peer_discovery_enable_summary">Conecte-se a outros nós DHT que anunciam em nossa rede local</string>
@@ -186,7 +187,6 @@
   <string name="account_connect_prompt_username">Nome de usuário</string>
   <!--Name registration-->
   <string name="error_username_empty">Entre um nome de usuário</string>
-  <string name="no_registered_name_for_account">Nenhum nome registrado encontrado para esta conta</string>
   <string name="username_available">Nome de usuário disponível !</string>
   <string name="register_name">Nome de registro</string>
   <string name="trying_to_register_name">Tentando registrar nome</string>
@@ -223,6 +223,6 @@
   <string name="rename_device_button">Renomear dispositivo</string>
   <string name="account_rename_device_hint">Escolher novo nome de dispositivo</string>
   <string name="account_device_name_empty">Nome do dispositivo não pode estar vazio</string>
-  <string name="account_device_this_indicator">este dispositivo</string>
+  <string name="account_device_this_indicator">Este dispositivo</string>
   <string name="account_disabled_indicator">desabilitado</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
index 82b7e68d752e241267e9c9f2381a917520e0bd24..1a01401bda9f263dde2ce49998c815087f990541 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">Executar o Jami em segundo-plano ao inicializar o sistema.</string>
   <string name="pref_clearHistory_title">Limpar histórico</string>
   <string name="pref_clearHistory_summary">Limpar todo o histórico de conversas. Esta ação não pode ser desfeita.</string>
+  <string name="pref_delete_account_title">Deletar conta</string>
   <string name="pref_persistNotification_title">Executar em segundo-plano</string>
   <string name="pref_persistNotification_summary">Permitir execução em segundo-plano para receber chamadas e mensagens.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings.xml b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
index aeb08f8820ab3d936ee4e8da7d3dec74e7a8bad2..c34d8f83475c0a80277c1416026985e63a9fdcdf 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
@@ -104,6 +104,7 @@
   <string name="share_via">Partilhar através de</string>
   <string name="write_a_message">Escrever uma mensagem</string>
   <string name="scan_qr">Digitalizar Código QR</string>
+  <string name="qr_code">Código QR</string>
   <string name="ab_action_flipcamera">Virar câmara</string>
   <!--Text messages-->
   <string name="send_message">Enviar mensagem</string>
@@ -180,6 +181,11 @@
   <string name="profile_message_warning">O seu perfil é partilhado apenas com seus contactos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
+  <string name="registered_name">Nome Registado</string>
+  <string name="identity">Identificação</string>
+  <string name="account">Conta</string>
+  <string name="link_new_device">Associar a um novo dispositivo</string>
+  <string name="devices">Dispositivos associados</string>
   <!--Share fragment-->
   <string name="share_message">Digitalizar este código com o Jami</string>
   <string name="share_message_no_account">Por favor selecione uma conta para partilhar.</string>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
index db8391a7caa2f3c238a237d3ec048f626ed47de3..a0cc32e0f29160055bcbcfc8a048b65a867b7bc0 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_account.xml
@@ -95,6 +95,7 @@
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Endereço do proxy DHT</string>
   <string name="account_proxy_server_list_label">URL de lista de proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descoberta de membros locais</string>
   <string name="account_peer_discovery_enable_label">Ativar a descoberta de membros locais</string>
   <string name="account_peer_discovery_enable_summary">Ligar a outros nós de DHT a anunciar na rede local</string>
@@ -176,7 +177,6 @@
   <string name="account_connect_prompt_username">Nome de utilizador</string>
   <!--Name registration-->
   <string name="error_username_empty">Introduza um nome de utilizador</string>
-  <string name="no_registered_name_for_account">Não foi encontrado nenhum nome registado para esta conta</string>
   <string name="username_available">Nome de utilizador disponível!</string>
   <string name="trying_to_register_name">A tentar registar o nome</string>
   <string name="registered_username">Nome de utilizador registado</string>
@@ -211,6 +211,6 @@
   <string name="rename_device_button">Alterar nome do dispositivo</string>
   <string name="account_rename_device_hint">Escolha um novo nome do dispositivo</string>
   <string name="account_device_name_empty">O nome do dispositivo não pode estar vazio</string>
-  <string name="account_device_this_indicator">este dispositivo</string>
+  <string name="account_device_this_indicator">Este dispositivo</string>
   <string name="account_disabled_indicator">desativado</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
index a2c61d483b80899e0d8edecbc42d1425149dd09f..30d998f0f739a86e99d75f4e34879da406c63034 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Executar o Jami em segundo plano ao iniciar o sistema.</string>
   <string name="pref_clearHistory_title">Limpar histórico</string>
   <string name="pref_clearHistory_summary">Apagar o histórico de todas as conversas. Esta ação não pode ser revertida.</string>
+  <string name="pref_delete_account_title">Eliminar conta</string>
   <string name="pref_persistNotification_title">Executar em segundo plano</string>
   <string name="pref_persistNotification_summary">Permite ser executado em segundo plano para receber chamadas e mensagens</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index a0e5c657699d8988aeb2e2618adc97dd0e39b26f..560fca495003d5d852d3530639e546d78035e7e0 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -91,6 +91,7 @@
   <string name="share_via">Partilhar através de</string>
   <string name="write_a_message">Escrever uma mensagem</string>
   <string name="scan_qr">Digitalizar Código QR</string>
+  <string name="qr_code">Código QR</string>
   <string name="ab_action_flipcamera">Virar câmara</string>
   <!--Text messages-->
   <string name="send_message">Enviar mensagem</string>
@@ -161,6 +162,11 @@
   <string name="profile_message_warning">O seu perfil é partilhado apenas com seus contactos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
+  <string name="registered_name">Nome Registado</string>
+  <string name="identity">Identificação</string>
+  <string name="account">Conta</string>
+  <string name="link_new_device">Associar a um novo dispositivo</string>
+  <string name="devices">Dispositivos associados</string>
   <!--Share fragment-->
   <string name="share_message">Digitalizar este código com o Jami</string>
   <string name="share_message_no_account">Por favor selecione uma conta para partilhar.</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings_account.xml b/ring-android/app/src/main/res/values-pt/strings_account.xml
index 88138ab75c8751b901cf6bb269a2141434732fe9..95dd0cea7ece7ea7e41115b342d62818ef0cc953 100644
--- a/ring-android/app/src/main/res/values-pt/strings_account.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_account.xml
@@ -87,6 +87,7 @@
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Endereço do proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenciais</string>
   <string name="account_credentials_edit">Editar credenciais</string>
@@ -160,7 +161,6 @@
   <string name="account_connect_prompt_username">Nome de utilizador</string>
   <!--Name registration-->
   <string name="error_username_empty">Introduza um nome de utilizador</string>
-  <string name="no_registered_name_for_account">Não foi encontrado nenhum nome registado para esta conta</string>
   <string name="username_available">Nome de utilizador disponível!</string>
   <string name="trying_to_register_name">A tentar registar o nome</string>
   <string name="registered_username">Nome de utilizador registado</string>
@@ -195,6 +195,6 @@
   <string name="rename_device_button">Alterar nome do dispositivo</string>
   <string name="account_rename_device_hint">Escolha um novo nome do dispositivo</string>
   <string name="account_device_name_empty">O nome do dispositivo não pode estar vazio</string>
-  <string name="account_device_this_indicator">este dispositivo</string>
+  <string name="account_device_this_indicator">Este dispositivo</string>
   <string name="account_disabled_indicator">desativado</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt/strings_preferences.xml b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
index 2ff926b551ef3ae9a305e30533bb1ae2ef8e48d8..3fd84fd904918ee0db8ea99561eaed6d3ea91878 100644
--- a/ring-android/app/src/main/res/values-pt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
@@ -19,6 +19,7 @@
   <string name="pref_startOnBoot_title">Inicializar o Jami ao iniciar</string>
   <string name="pref_startOnBoot_summary">Executar o Jami em segundo plano ao iniciar o sistema.</string>
   <string name="pref_clearHistory_title">Limpar histórico</string>
+  <string name="pref_delete_account_title">Eliminar conta</string>
   <string name="pref_persistNotification_title">Executar em segundo plano</string>
   <string name="pref_persistNotification_summary">Permite ser executado em segundo plano para receber chamadas e mensagens</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings.xml b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
index 5d876ba41aa94d72e0b5538ffaf976ca93ba63d9..d9552c7da091502fe94889ba08f886207e168be4 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
@@ -67,7 +67,7 @@
   <string name="notif_channel_file_transfer">Transfer de fișier</string>
   <string name="notif_channel_sync">Sincronizarea datelor</string>
   <string name="notif_channel_background_service">Serviciu ascuns</string>
-  <string name="notif_channel_background_service_descr">Permite primirea de apeluri și mesaje oricînd.</string>
+  <string name="notif_channel_background_service_descr">Permite mereu primirea de apeluri și mesaje.</string>
   <string name="notif_group_calls">Apeluri</string>
   <string name="notif_background_service">Jami funcționează acum ascuns</string>
   <string name="notif_mark_as_read">Bifează ca citit</string>
@@ -112,6 +112,7 @@
   <string name="share_via">Distribuie prin</string>
   <string name="write_a_message">Scrie un mesaj</string>
   <string name="scan_qr">Scanează Codul QR</string>
+  <string name="qr_code">Cod QR</string>
   <string name="ab_action_flipcamera">Schimbă videocamera</string>
   <string name="ab_action_hidepreview">Ascunde previzualizarea</string>
   <!--Text messages-->
@@ -155,11 +156,11 @@
   <string name="conversation_action_delete_this_title">Ștergi această conversație?</string>
   <string name="conversation_action_delete_this_message">Această acțiune este ireversibilă.</string>
   <string name="conversation_action_history_clear">Șterge cronologia</string>
-  <string name="conversation_action_history_clear_title">Ștergi cronologia conversațiilor?</string>
-  <string name="conversation_action_history_clear_message">Această acțiune va șterge definitiv cronologia conversațiilor.</string>
+  <string name="conversation_action_history_clear_title">Ștergi cronologia conversației?</string>
+  <string name="conversation_action_history_clear_message">Aceasta va șterge definitiv cronologia conversației.</string>
   <string name="conversation_action_remove_this">Șterge contactul</string>
   <string name="conversation_action_remove_this_title">Ștergi acest contact?</string>
-  <string name="conversation_action_remove_this_message">Această acțiune va șterge contactul și va elimina definitiv cronologia conversațiilor.</string>
+  <string name="conversation_action_remove_this_message">Aceasta va șterge contactul și va elimina definitiv cronologia conversației.</string>
   <string name="conversation_action_copy_peer_number">Copiază numărul</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s copiat în notițe</string>
   <string name="conversation_action_select_peer_number">Alege un număr</string>
@@ -193,6 +194,13 @@
   <string name="open_the_gallery">Deschide galeria</string>
   <string name="take_a_photo">Fă o poză</string>
   <string name="profile_name_hint">Introdu numele tău</string>
+  <string name="registered_name">Nume Înscris</string>
+  <string name="no_registered_name">Niciun nume înscris</string>
+  <string name="identity">Identitate</string>
+  <string name="account">Cont</string>
+  <string name="link_new_device">Asociază un nou aparat</string>
+  <string name="devices">Aparate asociate</string>
+  <string name="total_devices">Toate aparatele: </string>
   <!--Share fragment-->
   <string name="share_message">Scanează acest cod cu Jami</string>
   <string name="share_message_no_account">Alege un cont pentru distribuire.</string>
@@ -221,7 +229,7 @@
   <string name="no_contact_request">Nicio cerere de contact nu a fost trimisă</string>
   <string name="conversation_placeholder">Încă nu ai conversații</string>
   <string name="contact_request_sent">Cererea de contact a fost trimisă</string>
-  <string name="start_conversation">Începe conversația</string>
+  <string name="start_conversation">Conversație nouă</string>
   <string name="search_results">Rezultatele căutării</string>
   <string name="tv_contact_row_header">Contacte</string>
   <string name="gallery_error_title">Aplicația Galerie nu a fost găsită</string>
@@ -232,8 +240,8 @@
   <string name="not_able_to_write_file">Fișierul nu poate fi scris</string>
   <string name="file_transfer_status_created">Inițializarea transferului</string>
   <string name="file_transfer_status_unsupported">Neacceptat</string>
-  <string name="file_transfer_status_wait_peer_acceptance">Așteaptă autorizarea destinatarului</string>
-  <string name="file_transfer_status_wait_host_acceptance">Așteaptă autorizarea dispozitivului</string>
+  <string name="file_transfer_status_wait_peer_acceptance">Se așteaptă acceptarea</string>
+  <string name="file_transfer_status_wait_host_acceptance">Se așteaptă acceptarea</string>
   <string name="file_transfer_status_ongoing">în curs</string>
   <string name="file_transfer_status_finished">terminat</string>
   <string name="file_transfer_status_closed_by_host">închisă de dispozitiv</string>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
index 23d7ace181e0221af601922aaca824b1cfa128db..0ede3e13962f0990e0ea41a3ff1929b207feaab5 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
@@ -11,7 +11,7 @@
   <string name="prompt_alias">Alias</string>
   <string name="prompt_hostname">Numele serverului</string>
   <string name="prompt_username">Nume de Utilizator</string>
-  <string name="prompt_password">Parolă</string>
+  <string name="prompt_password">Parola</string>
   <string name="action_create">Creează contul</string>
   <string name="action_create_short">Creează</string>
   <string name="action_register">Înscrie-te</string>
@@ -34,7 +34,7 @@
   <string name="account_delete_dialog_title">Ștergi contul ?</string>
   <string name="account_delete_dialog_message">Această acțiune este ireversibilă.</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">Nu este înscris niciun cont</string>
+  <string name="empty_account_list">Niciun cont înscris</string>
   <string name="normal_accounts_titles">Conturi</string>
   <string name="normal_devices_titles">Aparate asociate</string>
   <string name="account_device_revoke">Elimină aparatul</string>
@@ -46,6 +46,7 @@
   <string name="account_device_revocation_error_unknown">Eroare necunoscută.</string>
   <string name="account_password_change">Schimbă Parola</string>
   <string name="account_password_set">Pune o parolă</string>
+  <string name="account_password_summary">Gestionează parola contului tău.</string>
   <string name="account_password_change_wait_message">Se schimbă parola contului </string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generale</string>
@@ -54,7 +55,7 @@
   <string name="account_hostname_label">Numele serverului</string>
   <string name="account_bootstrap_label">Server de conectare</string>
   <string name="account_username_label">Nume de Utilizator</string>
-  <string name="account_password_label">Parolă</string>
+  <string name="account_password_label">Parola</string>
   <string name="account_optionnal_category">Reglări Facultative</string>
   <string name="account_useragent_label">User Agent</string>
   <string name="account_autoanswer_label">Răspuns Automat</string>
@@ -76,8 +77,8 @@
   <string name="account_video_enable">Activează Video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Avansate</string>
-  <string name="account_call_settings_title">Reglările apelului</string>
-  <string name="account_dht_public_in_calls_label">Permite apelurile primite de la contacte necunoscute</string>
+  <string name="account_call_settings_title">Reglări apeluri</string>
+  <string name="account_dht_public_in_calls_label">Primește apeluri de la persoane necunoscute</string>
   <string name="account_registration_exp_label">Înscrierea a expirat</string>
   <string name="account_local_interface_label">Interfață locală</string>
   <string name="account_local_port_label">Port local</string>
@@ -85,7 +86,7 @@
   <string name="account_stun_server_label">Server STUN</string>
   <string name="account_accept_files">Acceptă automat fișierele primite</string>
   <string name="account_conversation_settings_title">Reglările conversației</string>
-  <string name="account_accept_files_max_size">Dimensiunea maximă a fișierului acceptat automat</string>
+  <string name="account_accept_files_max_size">Mărimea maximă a fișierului acceptat automat</string>
   <string name="account_accept_files_never">Nu accepta niciodată automat</string>
   <string name="account_accept_files_always">Acceptă mereu automat</string>
   <string name="size_mb">%1$d MB</string>
@@ -100,6 +101,7 @@
   <string name="account_proxy_enable_label">Folosește DHT proxy</string>
   <string name="account_proxy_server_label">Adresa proxy DHT</string>
   <string name="account_proxy_server_list_label">Adresa URL a listei de proxy DHT</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Descoperă utilizatori locali</string>
   <string name="account_peer_discovery_enable_label">Activează Descoperă utilizatori locali</string>
   <string name="account_peer_discovery_enable_summary">Conectează-te la alte noduri DHT afișate în rețeaua locală</string>
@@ -127,16 +129,17 @@
   <string name="account_tls_verify_client_label">Verifică Clientul</string>
   <string name="account_require_client_certificate_label">TLS Solicită un Certificat de Client</string>
   <string name="account_tls_negotiation_timeout_sec">Timp de negociere (sec)</string>
-  <string name="account_rtp_max_port">Maxim</string>
-  <string name="account_rtp_min_port">Minim</string>
+  <string name="account_rtp_max_port">Maximum</string>
+  <string name="account_rtp_min_port">Minimum</string>
   <string name="account_rtp_port_range">Interval Port RTP Audio</string>
   <!--restore/backup-->
   <string name="account_new_device_password">Introdu parola principală pentru a debloca contul</string>
-  <string name="error_password_char_count">6 caractere minim</string>
+  <string name="error_password_char_count">minimum 6 caractere</string>
   <string name="error_passwords_not_equals">Parolele nu se potrivesc</string>
   <string name="export_account_wait_title">Așteaptă...</string>
   <string name="export_account_wait_message">Exportă contul Jami</string>
   <string name="account_export_file">Copie de rezervă a contului</string>
+  <string name="account_export_file_summary">Fă o copie de rezervă a contului pentru a-l recupera la nevoie.</string>
   <string name="account_export_end_decryption_message">Contul tău nu poate fi deblocat cu parola furnizată.</string>
   <string name="account_export_end_network_title">Eroare de rețea</string>
   <string name="account_export_end_network_message">Contul nu poate fi exportat în rețea. Verifică conectarea la rețea.</string>
@@ -172,6 +175,8 @@
   <string name="account_link_prompt_pin">Introdu codul PIN</string>
   <string name="account_new_button">Creează un cont Jami</string>
   <string name="account_link_export_button">Asociază un nou aparat</string>
+  <string name="account_link_show_button">Arată încă %d aparate asociate</string>
+  <string name="account_link_hide_button">Ascunde aparatul asociat</string>
   <string name="account_link_export_info">Pentru a folosi acest cont în alte aparate, trebuie să îl expui mai întîi pe Jami. Asta va genera un cod PIN care trebuie introdus în noul aparat pentru a configura contul. Acest PIN e valabil 10 minute.</string>
   <string name="account_start_export_button">Generează PIN</string>
   <string name="account_end_export_button">închide</string>
@@ -186,14 +191,14 @@
   <string name="account_connect_prompt_username">Nume de Utilizator</string>
   <!--Name registration-->
   <string name="error_username_empty">Introdu un nume de utilizator</string>
-  <string name="no_registered_name_for_account">Nu a fost găsit niciun nume înscris pentru acest cont</string>
+  <string name="no_registered_name_for_account">Niciun nume înscris</string>
   <string name="username_available">Nume de utilizator disponibil !</string>
   <string name="register_name">Înscrie numele</string>
   <string name="trying_to_register_name">Se înscrie numele</string>
   <string name="registered_username">Nume de utilizator înscris</string>
   <string name="register_username">Înscrie numele de utilizator public</string>
   <string name="register_recommended">Recomandat</string>
-  <string name="username_already_taken">Nume de utilizator deja ales</string>
+  <string name="username_already_taken">Nume de utilizator ales deja</string>
   <string name="invalid_username">Nume greșit</string>
   <string name="unknown_error">Eroare necunoscută. Verifică conectarea la rețea!</string>
   <string name="looking_for_username_availability">Caut disponibilitatea numelui de utilizator...</string>
@@ -223,6 +228,6 @@
   <string name="rename_device_button">Redenumește aparatul</string>
   <string name="account_rename_device_hint">Alege un nume nou pentru aparat</string>
   <string name="account_device_name_empty">Numele aparatului nu poate fi gol</string>
-  <string name="account_device_this_indicator">acest aparat</string>
+  <string name="account_device_this_indicator">Acest aparat</string>
   <string name="account_disabled_indicator">dezactivat</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
index 0bda0faac8d488810499425da694075dc503ca6b..cc2eea81672e84fb75fb0332457633af656a3da4 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
@@ -8,7 +8,7 @@
   <string name="pref_mobileData_title">Date mobile</string>
   <string name="pref_mobileData_summary">Permite Jami pe rețelele 3G/LTE în plus față de Wi-Fi</string>
   <string name="pref_pushNotifications_title">Notificări</string>
-  <string name="pref_pushNotifications_summary">Utilizează serverele Google pentru a permite primirea de apeluri/mesaje cînd Jami e ascuns</string>
+  <string name="pref_pushNotifications_summary">Utilizează serverele Google pentru a primi apeluri/mesaje cînd Jami e ascuns</string>
   <string name="pref_video_advanced_title">Reglări video avansate</string>
   <string name="pref_video_advanced_summary">Schimbă calitatea video, claritatea și accesul la caracteristicile experimentale</string>
   <string name="pref_hd_summary">Activează trimiterea de video HD</string>
@@ -25,7 +25,11 @@
   <string name="pref_startOnBoot_title">Deschide Jami la pornirea aparatului</string>
   <string name="pref_startOnBoot_summary">Deschide Jami în ascuns la pornirea aparatului.</string>
   <string name="pref_clearHistory_title">Șterge cronologia</string>
-  <string name="pref_clearHistory_summary">Șterge toată cronologia conversațiilor. Această acțiune este ireversibilă.</string>
+  <string name="pref_clearHistory_summary">Șterge cronologia  conversațiilor. Această acțiune este ireversibilă.</string>
+  <string name="pref_blackList_title">Lista de Blocate</string>
+  <string name="pref_blackList_summary">Verifică lista de Blocate.</string>
+  <string name="pref_delete_account_title">Șterge contul</string>
+  <string name="pref_delete_account_summary">Șterge contul tău de pe acest aparat.</string>
   <string name="pref_persistNotification_title">Folosește în ascuns</string>
   <string name="pref_persistNotification_summary">Permite funcționarea în ascuns pentru a primi apeluri și mesaje.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index 4e457b58bfc722cdde5a32fd821e020cf9f5cb45..c7873f73563476d6c364126b4b97628021b11d17 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -31,6 +31,7 @@
   <string name="menu_item_accounts">Учетные записи</string>
   <string name="menu_item_account">Учетные записи</string>
   <string name="menu_item_settings">Настройки</string>
+  <string name="menu_item_plugin_list">Настройки плагинов</string>
   <string name="menu_item_share">Поделиться моей контактной информацией</string>
   <string name="menu_item_about">О Jami</string>
   <!--Dialing Fragment-->
@@ -106,6 +107,7 @@
   <string name="share_via">Поделится</string>
   <string name="write_a_message">Написать сообщение</string>
   <string name="scan_qr">Сканировать QR-код</string>
+  <string name="qr_code">QR-код</string>
   <string name="ab_action_flipcamera">Перевернуть камеру</string>
   <!--Text messages-->
   <string name="send_message">Отправить сообщение</string>
@@ -182,6 +184,9 @@
   <string name="profile_message_warning">Ваш профиль доступен только для ваших контактов</string>
   <string name="open_the_gallery">Открыть галерею</string>
   <string name="take_a_photo">Сфотографировать</string>
+  <string name="registered_name">Зарегистрированное имя</string>
+  <string name="identity">Идентичность</string>
+  <string name="account">Учётная запись</string>
   <!--Share fragment-->
   <string name="share_message">Отсканируйте код с помощью Jami</string>
   <string name="share_message_no_account">Выберите контакт, чтобы поделиться</string>
@@ -263,5 +268,10 @@
   <string name="tv_send_video">Отправить Медиа</string>
   <string name="conversation_input_speech_hint">Скажите что-нибудь...</string>
   <!--Wizard-->
+  <string name="wizard_password_info">Пароль аккаунта</string>
+  <string name="wizard_password_button">Выберите пароль</string>
   <string name="wizard_password_skip">Создать аккаунт</string>
+  <string name="wizard_password_switch">Зашифровать аккаунт с помощью пароля</string>
+  <string name="wizard_password_warning">Учтите, что пароль не может быть восстановлен</string>
+  <string name="wizard_profile_button">Сохранить профиль</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
index 455c8c686f0fd7afd8a65cdcffc25e73a1388297..9576a0a9cbb02b982bc5ad36ef5a11348619847f 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_account.xml
@@ -74,6 +74,7 @@
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Дополнительно</string>
   <string name="account_call_settings_title">Настройки вызовов</string>
+  <string name="account_dht_public_in_calls_label">Разрешить входящие звонки от незнакомых контактов</string>
   <string name="account_registration_exp_label">Регистрация истекает</string>
   <string name="account_local_interface_label">Локальный интерфейс</string>
   <string name="account_local_port_label">Локальный порт</string>
@@ -89,6 +90,7 @@
   <string name="account_proxy_label">DHT прокси</string>
   <string name="account_proxy_enable_label">Использовать DHT прокси</string>
   <string name="account_proxy_server_label">адрес прокси для DHT</string>
+  <string name="account_sip_proxy_label">Прокси</string>
   <!--Security Details-->
   <string name="account_credentials_label">Учетные данные</string>
   <string name="account_credentials_edit">Редактировать учетные данные</string>
@@ -166,7 +168,6 @@
   <string name="account_connect_prompt_username">Имя пользователя</string>
   <!--Name registration-->
   <string name="error_username_empty">Введите имя пользователя</string>
-  <string name="no_registered_name_for_account">Не найдено зарегистрированных имён для этого аккаунта</string>
   <string name="username_available">Имя пользователя доступно !</string>
   <string name="trying_to_register_name">Попробовать зарегистрировать имя</string>
   <string name="registered_username">Зарегистрированное имя пользователя</string>
@@ -201,6 +202,5 @@
   <string name="rename_device_button">Переименовать устройство</string>
   <string name="account_rename_device_hint">Выберите новое имя для устройства</string>
   <string name="account_device_name_empty">В имени устройства должно быть не пусто</string>
-  <string name="account_device_this_indicator">это устройство</string>
   <string name="account_disabled_indicator">отключено</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_content_description.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_content_description.xml
index 37c05f92323bcab3f8549d886f960d20e18da593..9b47bc08dde6b5d1e18fbb2cd26462a390e07ded 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Изображение Контакта</string>
   <string name="dial_numeric_pad">Цифровая клавиатура</string>
   <string name="contact_unblock">Разблокировать</string>
+  <string name="video_plugins">Видео плагины</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml
index 7a83596f8edef572b2462d0288c493cf88fe0a7c..35697f06bc32a5ef0206d0f4cb85aa850a79ba48 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml
@@ -22,7 +22,10 @@
   <string name="pref_startOnBoot_summary">Запускать Jami в фоновом режиме при запуске системы.</string>
   <string name="pref_clearHistory_title">Очистить историю</string>
   <string name="pref_clearHistory_summary">Очистить всю историю переписки. Это действие нельзя будет отменить.</string>
+  <string name="pref_delete_account_title">Удалить аккаунт</string>
   <string name="pref_persistNotification_title">Запустить в фоновом режиме</string>
   <string name="pref_persistNotification_summary">Разрешить работать в фоновом режиме для приема звонков и сообщений.</string>
   <!--Plugin-->
+  <string name="pref_plugins_title">Плагины</string>
+  <string name="pref_plugins_summary">Включить плагины и установить их параметры</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index eaa4e13acc4ccdc565c0a8a2e59522675238f898..19f1b22e938c8b0a3332403d691cb26857a85ad8 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -113,6 +113,7 @@
   <string name="share_via">Отправить с помощью</string>
   <string name="write_a_message">Написать сообщение</string>
   <string name="scan_qr">Сканировать QR код</string>
+  <string name="qr_code">QR-код</string>
   <string name="ab_action_flipcamera">Переключить камеру</string>
   <string name="ab_action_hidepreview">Скрыть предпросмотр</string>
   <!--Text messages-->
@@ -194,6 +195,11 @@
   <string name="open_the_gallery">Открыть галерею</string>
   <string name="take_a_photo">Сфотографировать</string>
   <string name="profile_name_hint">Введите своё имя</string>
+  <string name="registered_name">Зарегистрированное Имя</string>
+  <string name="identity">Идентификатор</string>
+  <string name="account">Аккаунт</string>
+  <string name="link_new_device">Привязать новое устройство</string>
+  <string name="devices">Привязанные устройства</string>
   <!--Share fragment-->
   <string name="share_message">Отсканируйте этот код Jami</string>
   <string name="share_message_no_account">Выберите аккаунт, которым хотите поделиться.</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 6ed9c74a2f322ae9af22eb404280b20392080d7f..5ba6f93c02935b743748eb98761e934fb12fde46 100644
--- a/ring-android/app/src/main/res/values-ru/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_account.xml
@@ -45,6 +45,7 @@
   <string name="account_device_revocation_unknown_device">Неизвестное устройство.</string>
   <string name="account_device_revocation_error_unknown">Неизвестная ошибка.</string>
   <string name="account_password_change">Изменить пароль</string>
+  <string name="account_password_set">Установить пароль</string>
   <string name="account_password_change_wait_message">Смена пароля учетной записи</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Общее</string>
@@ -57,6 +58,8 @@
   <string name="account_optionnal_category">Дополнительные настройки</string>
   <string name="account_useragent_label">Aгент пользователя</string>
   <string name="account_autoanswer_label">Автоответ</string>
+  <string name="account_rendezvous_label">Режим рандеву</string>
+  <string name="account_rendezvous_summary">В режиме Rendezvous входящие звонки будут добавляться в конференц-зал.</string>
   <string name="account_upnp_label">Включить UPnP</string>
   <string name="account_proxy_field">Прокси</string>
   <!--Audio Details-->
@@ -81,6 +84,7 @@
   <string name="account_stun_enable_label">Использовать STUN</string>
   <string name="account_stun_server_label">Сервер STUN</string>
   <string name="account_accept_files">Принимать входящие файлы автоматически</string>
+  <string name="account_conversation_settings_title">Настройки разговора</string>
   <string name="account_accept_files_max_size">Максимальный размер файла для автоматической загрузки</string>
   <string name="account_accept_files_never">Никогда не принимать автоматически</string>
   <string name="account_accept_files_always">Всегда принимать автоматически</string>
@@ -96,6 +100,7 @@
   <string name="account_proxy_enable_label">Использовать DHT прокси</string>
   <string name="account_proxy_server_label">Адрес DHT прокси</string>
   <string name="account_proxy_server_list_label">DHT прокси список URL</string>
+  <string name="account_sip_proxy_label">Прокси</string>
   <string name="account_peer_discovery_label">Обнаружение локальных пиров</string>
   <string name="account_peer_discovery_enable_label">Включить обнаружение локальных пиров</string>
   <string name="account_peer_discovery_enable_summary">Подключаться к другим DHT узлам в локальной сети</string>
@@ -106,6 +111,8 @@
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Безопасность</string>
   <string name="account_srtp_switch_label">Шифровать медиа потоки (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Включить SDES в качестве протокола обмена ключами</string>
+  <string name="account_srtp_rtp_fallback">Возврат к RTP в случае сбоя SRTP</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Использовать TLS</string>
@@ -119,6 +126,7 @@
   <string name="account_tls_server_name_label">Имя сервера</string>
   <string name="account_tls_verify_server_label">Проверка сервера</string>
   <string name="account_tls_verify_client_label">Проверка клиента</string>
+  <string name="account_require_client_certificate_label">TLS требует сертификат клиента</string>
   <string name="account_tls_negotiation_timeout_sec">Тайм-аут согласования (сек)</string>
   <string name="account_rtp_max_port">Максимум</string>
   <string name="account_rtp_min_port">Минимум</string>
@@ -129,6 +137,7 @@
   <string name="error_passwords_not_equals">Пароли не совпадают</string>
   <string name="export_account_wait_title">Пожалуйста, подождите…</string>
   <string name="export_account_wait_message">Экспортирование аккаунта…</string>
+  <string name="account_export_file">Создать резервную копию учётной записи</string>
   <string name="account_export_end_decryption_message">Не удалось разблокировать аккаунт указанным паролем.</string>
   <string name="account_export_end_network_title">Ошибка сети</string>
   <string name="account_export_end_network_message">Не удалось экспортировать аккаунт по сети. Проверьте ваше сетевое соединение.</string>
@@ -158,6 +167,7 @@
   <string name="account_sip_success_title">SIP-аккаунт зарегистрирован</string>
   <string name="account_sip_success_message">Вы успешно зарегистрировали свой SIP-аккаунт.</string>
   <string name="account_sip_register_anyway">Все равно зарегистрироваться</string>
+  <string name="account_link_device">Подключиться с другого устройства</string>
   <string name="account_link_button">Подключение из сети</string>
   <string name="account_link_archive_button">Подключиться из резервной копии</string>
   <string name="account_link_prompt_pin">Введите PIN</string>
@@ -177,8 +187,8 @@
   <string name="account_connect_prompt_username">Имя пользователя</string>
   <!--Name registration-->
   <string name="error_username_empty">Введите имя пользователя</string>
-  <string name="no_registered_name_for_account">Не найдено зарегистрированного имени для этого аккаунта</string>
   <string name="username_available">Имя доступно !</string>
+  <string name="register_name">Зарегистрировать имя</string>
   <string name="trying_to_register_name">Попытка зарегистрировать имя</string>
   <string name="registered_username">Зарегистрированное имя пользователя</string>
   <string name="register_username">Зарегистрировать публичное имя</string>
@@ -213,6 +223,6 @@
   <string name="rename_device_button">Переименовать устройство</string>
   <string name="account_rename_device_hint">Выберите новое название для устройства</string>
   <string name="account_device_name_empty">Название устройства не может быть пустым</string>
-  <string name="account_device_this_indicator">это устройство</string>
+  <string name="account_device_this_indicator">Это устройство</string>
   <string name="account_disabled_indicator">отключен</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_content_description.xml b/ring-android/app/src/main/res/values-ru/strings_content_description.xml
index 3e1b920f1d44b7a8e5a01069ab6086483ab43214..308302906b85ecdedf6781e56b3f28c847b5d11b 100644
--- a/ring-android/app/src/main/res/values-ru/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Фото контакта</string>
   <string name="dial_numeric_pad">Цифровая клавиатура</string>
   <string name="contact_unblock">Разблокировать</string>
+  <string name="video_plugins">Видео плагины</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_preferences.xml b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
index e2dc59b3ff487a0ec42087ec91ac635a74066e3c..ab1ac910f752a3e8d30d55ea3c8c3dc517baadb0 100644
--- a/ring-android/app/src/main/res/values-ru/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
@@ -14,6 +14,10 @@
   <string name="pref_hd_summary">Разрешить отправку видео высокого разрешения</string>
   <string name="pref_hwEncode_title">Включить аппаратное кодирование</string>
   <string name="pref_hwEncode_summary">Экспериментальная опция</string>
+  <string name="pref_videoBitrate_title">Скорость передачи видео</string>
+  <string name="pref_videoBitrate_summary">Выбрать битрейт исходящего видео по умолчанию (кБ/с)</string>
+  <string name="pref_videoResolution_title">Разрешение видео</string>
+  <string name="pref_videoResolution_summary">Выбрать разрешение исходящего видео по умолчанию</string>
   <string name="pref_systemContacts_title">Использовать контакты из адресной книги</string>
   <string name="pref_systemContacts_summary">Использовать данные из адресной книги для отображения информации о звонящем.</string>
   <string name="pref_systemDialer_title">Совершать системные звонки с помощью Jami</string>
@@ -22,8 +26,21 @@
   <string name="pref_startOnBoot_summary">Запускать Jami в фоновом режиме во время старта системы.</string>
   <string name="pref_clearHistory_title">Очистить историю</string>
   <string name="pref_clearHistory_summary">Очистить всю историю разговоров. Это действие нельзя отменить.</string>
+  <string name="pref_delete_account_title">Удалить аккаунт</string>
   <string name="pref_persistNotification_title">Работа в фоновом режиме</string>
   <string name="pref_persistNotification_summary">Разрешить работу в фоновом режиме для принятия звонков и сообщений.</string>
   <!--Plugin-->
   <string name="pref_plugins_title">Плагины</string>
+  <string name="pref_plugins_summary">Включить плагины и установить их параметры</string>
+  <string name="fab_plugins_add">Добавить новый плагин</string>
+  <string name="plugin_uninstall_title">Удалить плагин ?</string>
+  <string name="plugin_reset_preferences">Сбросить настройки плагина</string>
+  <string name="plugin_reset_preferences_summary">Настройки вашего плагина будут установлены по умолчанию</string>
+  <string name="plugin_reset_preferences_ask">Вы хотите сбросить настройки плагина ?</string>
+  <string name="plugin_successfully_installed">Плагин <b>%1$s</b> успешно установлен</string>
+  <string name="plugin_install_failure">Не удалось установить плагин: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">У вас версия более свежая: <b>%1$s</b> </string>
+  <string name="plugin_same_version_exception">У вас установлена та же самая<b>%1$s</b>версия</string>
+  <string name="plugin_force_install">принудительная установка</string>
+  <string name="plugin_path_image_add">Добавить новое изображение</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index 62476db1b9d5258b864c83442ada0d6414fccb21..588d2ef47540f852c7606d71e5dd6dd9a82bac1d 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -106,6 +106,7 @@
   <string name="share_via">Zdieľať pomocou</string>
   <string name="write_a_message">Napísať správu</string>
   <string name="scan_qr">Nasnímať QR kód</string>
+  <string name="qr_code">QR kód</string>
   <string name="ab_action_flipcamera">Otočiť kameru</string>
   <string name="ab_action_hidepreview">Skryť náhľad</string>
   <!--Text messages-->
@@ -183,6 +184,11 @@
   <string name="profile_message_warning">Váš profil je zdieľaný iba s vašimi kontaktmi</string>
   <string name="open_the_gallery">Otvoriť galériu</string>
   <string name="take_a_photo">Zhotoviť fotografiu</string>
+  <string name="registered_name">Registrované meno</string>
+  <string name="identity">Identita</string>
+  <string name="account">Účet</string>
+  <string name="link_new_device">Prepojiť nové zariadenie</string>
+  <string name="devices">Prepojené zariadenia</string>
   <!--Share fragment-->
   <string name="share_message">Nasnímajte tento kód aplikáciou Jami</string>
   <string name="share_message_no_account">Vyberte účet, ktorý chcete zdieľať.</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
index 532f79d92110ce14843b570a00d877289696cba7..5ae94204304ba95bc0923011ad5379c281ccc8e7 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
@@ -96,6 +96,7 @@
   <string name="account_proxy_enable_label">Použiť DHT proxy</string>
   <string name="account_proxy_server_label">DHT proxy adresa</string>
   <string name="account_proxy_server_list_label">DHT proxy list URL</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <string name="account_peer_discovery_label">Lokálne vyhľadávanie peerov</string>
   <string name="account_peer_discovery_enable_label">Povoliť lokálne vyhľadávanie peerov</string>
   <string name="account_peer_discovery_enable_summary">Pripojiť k iným DHT uzlom na rovnakej lokálnej sieti</string>
@@ -177,7 +178,6 @@
   <string name="account_connect_prompt_username">Používateľské meno</string>
   <!--Name registration-->
   <string name="error_username_empty">Zadajte používateľské meno</string>
-  <string name="no_registered_name_for_account">Pre tento účet nebolo nájdené zaregistrované meno</string>
   <string name="username_available">Používateľské meno dostupné!</string>
   <string name="trying_to_register_name">Pokus o registráciu mena</string>
   <string name="registered_username">Registrované používateľské meno</string>
@@ -212,6 +212,6 @@
   <string name="rename_device_button">Premenovať zariadenie</string>
   <string name="account_rename_device_hint">Zvoľte nový názov zariadenia</string>
   <string name="account_device_name_empty">Názov zariadenia nesmie byť prázdny </string>
-  <string name="account_device_this_indicator">toto zariadenie</string>
+  <string name="account_device_this_indicator">Toto zariadenie</string>
   <string name="account_disabled_indicator">vypnuté</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
index 6f6a0df8ff95d82d6c64ecbd647c0bf375aaee14..346b6236910bbf0f787ad211fb084bf82bc122b4 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Spustiť Jami na pozadí pri štarte systému.</string>
   <string name="pref_clearHistory_title">Vymazať históriu</string>
   <string name="pref_clearHistory_summary">Vymazať históriu konverzácie. Táto operácia nemôže byť vrátená. </string>
+  <string name="pref_delete_account_title">Odstrániť účet</string>
   <string name="pref_persistNotification_title">Spustiť na pozadí</string>
   <string name="pref_persistNotification_summary">Povoliť spustenie na pozadí na prijímanie hovorov a spáv.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index bc3b35dd15036855937e22f01d7cc5ecb4718bc2..ff5637ab568bbf4a56cc0f3026e59b78db658473 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -2,27 +2,38 @@
 <resources>
   <!--About-->
   <string name="feedback_section">Povratna informacija</string>
-  <string name="report"><u>Send us an email</u></string>
+  <string name="report"><u>Pošljite nam sporočilol</u></string>
   <string name="section_license">Licenca</string>
   <string name="sponsor_section">Ring je prosto programje, ki ga razvija in podpira</string>
   <string name="copyright_section">Avtorske pravice</string>
   <string name="contribute_section">Prispevaj</string>
   <string name="version_section">Različica</string>
+  <string name="no_email_app_installed">Program za elektronsko pošto ni bil najden. Namestite ga, da nam pošljete poročilo.</string>
+  <string name="no_browser_app_installed">Spletni brskalnik ni bil najden. Namestite ga, če želite videti to stran</string>
   <string name="email_chooser_title">Pošlji e-pošto z ...</string>
   <string name="website_chooser_title">Poglej spletno stran z ...</string>
+  <string name="license">Ta programska oprema je na voljo \"kakršna je\", brez kakršnihkoli garancij. Za podrobnosti glej <u>GNU Splošna javna licenca različice 3 ali novejša</u></string>
+  <string name="description">Jami je brezplačen program za univerzalno komunikacijo, ki spoštuje svobodo in zasebnost svojih uporabnikov.</string>
   <string name="credits">Zasluge</string>
+  <string name="call_service_description">Ta storitev je nujna za delovanje vaših klicev v ospredju. Deluje le med klici.</string>
+  <string name="data_transfer_service_description">Ta storitev je nujna za prikaz obstojnih sporočil med prenosom datotek. Deluje le med prenašanjem datotek.</string>
   <!--About dialog-->
   <string name="developed_by">Razvoj</string>
   <string name="designed_by">Oblikovanje</string>
+  <string name="ringtones_by">Zvojnjenja </string>
   <!--RingActivity-->
-  <string name="error_no_network">Ni mrežne povezave</string>
+  <string name="error_no_network">Ni omrežne povezave</string>
+  <string name="error_mobile_network_available_but_disabled">Dovolite dostop do mobilnega omrežja v nastavitvah.</string>
   <!--AB menus-->
-  <string name="ab_action_chat">Besedilna sporočila</string>
+  <string name="ab_action_chat">Tekstovno sporočanje</string>
   <!--Sections-->
   <string name="menu_item_contact_request">Zahteve za povezavo</string>
-  <string name="menu_item_accounts">Urejanje stikov</string>
+  <string name="menu_item_accounts">Urejanje računov</string>
+  <string name="menu_item_account">Upravljanje računa</string>
   <string name="menu_item_settings">Nastavitve</string>
+  <string name="menu_item_plugin_list">Nastavitve vtičnikov</string>
   <string name="menu_item_share">Deli moje kontakte</string>
+  <string name="menu_item_about">O Jami</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Kliči številko</string>
   <!--History Fragment-->
@@ -31,10 +42,11 @@
   <plurals name="home_conferences_title">
     <item quantity="one">%d pogovor</item>
     <item quantity="two">%d pogovora</item>
-    <item quantity="few">%d pogovorov</item>
+    <item quantity="few">%d pogovori</item>
     <item quantity="other">%d pogovorov</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Išči po imenu ali telefonski številki</string>
   <string name="choose_number">Izberi številko</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
@@ -45,97 +57,247 @@
   <string name="notif_incoming_call">Dohodni klic</string>
   <string name="notif_outgoing_call_title">Odhodni klic do %1$s</string>
   <string name="notif_outgoing_call">Odhodni klic</string>
+  <string name="notif_current_call_title">Aktivni klic z %1$s</string>
   <string name="notif_current_call">Aktivni klic</string>
+  <string name="notif_channel_call_in_progress">Klic poteka</string>
   <string name="notif_channel_calls">Klici</string>
+  <string name="notif_channel_missed_calls">Zgrešeni klici</string>
+  <string name="notif_channel_incoming_calls">Dohodni klici</string>
+  <string name="notif_channel_messages">Sporočila</string>
+  <string name="notif_channel_requests">Zahtevki</string>
+  <string name="notif_channel_file_transfer">Prenos datoteke</string>
+  <string name="notif_channel_sync">Sinhronizacija podatkov</string>
+  <string name="notif_channel_background_service">Storitve v ozadju</string>
+  <string name="notif_channel_background_service_descr">Dovoli sprejemanje klicev in sporočil kadarkoli.</string>
   <string name="notif_group_calls">Klici</string>
+  <string name="notif_background_service">Jami se trenutno izvaja v ozadju</string>
+  <string name="notif_mark_as_read">Označi kot prebrano</string>
+  <string name="notif_dismiss">Opusti</string>
+  <string name="notif_reply">Odgovori</string>
+  <string name="notif_incoming_file_transfer_title">Dohodna datoteka od %1$s</string>
+  <string name="notif_outgoing_file_transfer_title">Pošiljanje datoteke do %1$s</string>
+  <string name="notif_incoming_picture">Slika od %1$s</string>
+  <string name="notif_sync_title">Sinhronizacija podatkov...</string>
+  <string name="notif_location_title">Deljenje lokacije z %1$s</string>
+  <string name="location_share_contact">%1$s deli lokacijo z vami</string>
+  <string name="notif_location_multi_title">Delijenje lokacije s %1$d kontaki</string>
+  <string name="notif_location_remaining">Preostalo je še %1$d minut</string>
+  <string name="notif_location_action_stop">Prenehaj deliti lokacijo</string>
+  <string name="location_share_action_start">Začni deliti</string>
+  <string name="location_share_action_stop">Prenehaj deliti</string>
+  <string name="location_share_about_title">Podatki zemljevida</string>
   <!--Call Fragment-->
-  <string name="you_txt_prefix">Ti:</string>
+  <string name="you_txt_prefix">Vi:</string>
   <string name="action_call_hangup">Prekini</string>
+  <string name="action_call_maximize">Povečaj</string>
+  <string name="action_call_minimize">Zmanjšaj</string>
   <string name="ongoing_call">Aktivni klic</string>
   <string name="hist_in_call">Dohodni klic od %1$s</string>
   <string name="hist_out_call">Odhodni klic do %1$s</string>
-  <string name="action_call_accept">Prevzami klic</string>
+  <string name="start_error_title">Ne morem zagnati Jami-ja!</string>
+  <string name="start_error_mic_required">Jami za delovanje potrebuje dovoljenje za uporabo mikrofona.</string>
+  <string name="action_call_accept">Prevzemi klic</string>
+  <string name="action_call_hold_accept">Zadrži in prevzemi klic</string>
+  <string name="action_call_end_accept">Končaj in prevzemi klic</string>
   <string name="action_call_decline">Zavrni</string>
-  <string name="ab_action_speakerphone">Omogoči zvočnik</string>
-  <string name="ab_action_contact_add">Dodaj v stike</string>
+  <string name="action_call_mic_mute">Izključi mikrofon</string>
+  <string name="action_load_plugin">Naloži vtičnik</string>
+  <string name="ab_action_speakerphone">Vklopi zvočnik</string>
+  <string name="ab_action_contact_add">Dodaj med stike</string>
+  <string name="ab_action_contact_add_question">Dodam med stike?</string>
+  <string name="hist_contact_added">Stik je dodan</string>
+  <string name="hist_invitation_received">Povabilo je sprejeto</string>
   <string name="ab_action_audio_call">Zvočni klic</string>
   <string name="ab_action_video_call">Video klic</string>
   <string name="ab_action_change_screen_orientation">Zammenjaj orientacijo zaslona</string>
   <string name="share_via">Deli preko</string>
   <string name="write_a_message">Napiši sporočilo</string>
   <string name="scan_qr">Preberi QR kodo</string>
+  <string name="qr_code">QR koda</string>
   <string name="ab_action_flipcamera">Zrcali kamero</string>
+  <string name="ab_action_hidepreview">Skrij predogled</string>
   <!--Text messages-->
   <string name="send_message">Pošlji sporočilo</string>
-  <string name="message_sending">Pošiljam sporočilo...</string>
+  <string name="message_sending">Pošiljanje sporočila...</string>
   <string name="message_failed">Neuspelo</string>
   <string name="time_just_now">Ravnokar</string>
+  <string name="send_file">Pošlji datoteko</string>
+  <string name="hist_file_sent">Datoteka je poslana</string>
+  <string name="hist_file_received">Datoteka je sprejeta</string>
+  <string name="conversation_send_audio">Snemaj zvočni posnetek</string>
+  <string name="conversation_send_video">Snemaj video posnetek</string>
+  <string name="conversation_share_location">Deli lokacijo</string>
   <!--MediaPreferenceFragment-->
-  <string name="permission_dialog_camera_title">Dovoljenje kamere</string>
+  <string name="permission_dialog_camera_title">Dovoljenja za kamero</string>
+  <string name="permission_dialog_camera_message">Video pogovori zahtevajo dovoljenja za rabo kamere. Potrdite jih.</string>
   <!--Ringtone activity-->
   <string name="ringtone_error_title">Napaka</string>
   <string name="ringtone_error_format_not_supported">Format ni podprt.</string>
+  <string name="ringtone_error_size_too_big">Ta datoteka je prevelika. Največja velikost je %1$d kB.</string>
+  <string name="ringtone_custom_prompt">Določi lastno zvonjenje</string>
   <string name="ringtone_custom_label">Lastno</string>
+  <string name="ringtone_jami_tones">Jami zvoki</string>
   <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Jami potrebuje dovoljenje za \"dostop do stikov\", da bi uporabili to funkcijo. Potrdite ga.</string>
   <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Jami potrebuje dovoljenje za \"pisanje dnevnika klicev\", da bi uporabili to funkcijo. Potrdite ga.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Preberi QR kodo stika, ki ga želiš dodati.</string>
+  <string name="title_activity_qrcode">Deli moj račun</string>
+  <string name="error_scan_no_camera_permissions">QR bralnik za delovanje potrebuje dovoljenje za kamero</string>
+  <string name="tab_code">Moja koda</string>
+  <string name="tab_scan">Preberi kodo</string>
   <!--Settings-->
-  <string name="clear_history_completed">Zgodovina je bila pobrisana.</string>
+  <string name="clear_history_dialog_title">Počistim zgodovino?</string>
+  <string name="clear_history_dialog_message">Tega dejanja ni mogoče razveljaviti.</string>
+  <string name="clear_history_completed">Zgodovina je bila počiščena.</string>
   <!--Conversation-->
-  <string name="conversation_action_delete_this">Pobriši ta pogovor</string>
-  <string name="conversation_action_delete_this_title">Pobrišem ta pogovor ?</string>
-  <string name="conversation_action_delete_this_message">Te operacije ne morete preklicati.</string>
-  <string name="conversation_action_history_clear">Pobriši zgodovino</string>
-  <string name="conversation_action_remove_this">Pobriši stik</string>
+  <string name="conversation_details">Podrobnosti stika</string>
+  <string name="conversation_action_delete_this">Izbriši ta pogovor</string>
+  <string name="conversation_action_delete_this_title">Izbrišem ta pogovor ?</string>
+  <string name="conversation_action_delete_this_message">Tega dejanja ni mogoče razveljaviti.</string>
+  <string name="conversation_action_history_clear">Počisti zgodovino</string>
+  <string name="conversation_action_history_clear_title">Počistim zgodovino pogovora?</string>
+  <string name="conversation_action_history_clear_message">To bo dokončno počistilo zgodovino pogovora.</string>
+  <string name="conversation_action_remove_this">Izbriši stik</string>
+  <string name="conversation_action_remove_this_title">Izbrišem ta stik?</string>
+  <string name="conversation_action_remove_this_message">To bo izbrisalo stik in dokončno počistilo zgodovino pogovora.</string>
   <string name="conversation_action_copy_peer_number">Kopiraj številko</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s skopirano na odlođižšče</string>
   <string name="conversation_action_select_peer_number">Izberi številko</string>
+  <string name="conversation_action_block_this">Blokiraj stik</string>
+  <string name="conversation_action_go_to_call">Vrnitev na aktivni klic</string>
+  <string name="conversation_open_file_error">Ni nameščene aplikacije za odpiranje te vrste datotek.</string>
+  <string name="clip_contact_uri">Naslov stika</string>
+  <string name="block_contact_dialog_title">Blokiram %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s vas ne bo mogel kontaktirati, dokler ga ne odblokirate.</string>
+  <string name="block_contact_completed">%1$s je blokiran(a).</string>
+  <string name="conversation_contact_is_typing">Stik piše...</string>
   <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Dodaj %1$s?</string>
   <string name="prompt_new_password">Novo geslo</string>
+  <string name="prompt_new_password_optional">Novo geslo (izbirno)</string>
   <string name="prompt_new_password_repeat">Ponovi novo geslo</string>
+  <string name="account_create_title">Ustvari Jami račun</string>
   <string name="prompt_new_username">Vpiši novo uporabniško ime</string>
-  <string name="prompt_hint_username">Uporabnik</string>
+  <string name="prompt_hint_username">Uporabniško ime</string>
+  <string name="help_password_choose">Izberite močno geslo, ki si ga boste zapomnili in z njim zaščitili svoj Jami račun.</string>
+  <string name="help_password_enter">Vnesite glavno geslo svojega Jami računa.</string>
+  <string name="help_server_enter">Vnesite URL upravljalnega stržnika.</string>
+  <string name="help_pin_enter">Vnesite PIN z drugega nastavljenega Jami računa. Uporabite \"izvozi Jami račun\", da pridobite PIN.</string>
   <string name="wizard_next">Naprej</string>
   <string name="wizard_back">Nazaj</string>
+  <string name="wizard_skip">Preskoči</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
-  <string name="profile_message_warning">Tvoj profil je deljen samo s tvojimi stiki</string>
+  <string name="profile_name">Ime profila</string>
+  <string name="profile_message_warning">Vaš profil se deli samo z vašimi stiki</string>
   <string name="open_the_gallery">Odpri galerijo</string>
   <string name="take_a_photo">Slikaj</string>
+  <string name="profile_name_hint">Vnesite svoje ime</string>
+  <string name="registered_name">Registrirano ime</string>
+  <string name="identity">Identiteta</string>
+  <string name="account">Račun</string>
+  <string name="link_new_device">Poveži novo napravo</string>
+  <string name="devices">Povezane naprave</string>
   <!--Share fragment-->
+  <string name="share_message">Preberi kodo z Jamijem.</string>
   <string name="share_message_no_account">Izberi račun, ki ga želiš deliti.</string>
-  <string name="share_your_account_information">Deli informacije mojega stika</string>
+  <string name="share_your_account_information">Deli podatke o mojem stiku</string>
   <string name="share_label">Deli</string>
   <string name="generic_error_migration">Napaka</string>
-  <string name="generic_error_migration_message">Zgodila se je napaka med migracijo</string>
+  <string name="generic_error_migration_message">Zgodila se je napaka med selitvijo</string>
+  <string name="title_share_with">Deli z...</string>
   <!--Pending contact requests-->
   <string name="accept">Sprejmi</string>
   <string name="refuse">Zavrni</string>
   <string name="block">Blokiraj</string>
   <string name="contact_request_title">Zahteva za nov stik</string>
-  <string name="contact_request_msg">Imaš%1$s zahtev za stik</string>
+  <string name="contact_request_msg">Imate%1$s zahtev za stik</string>
   <string name="contact_request_account">Za %1$s</string>
+  <string name="no_requests">Ni zahtev za stik</string>
+  <string name="message_contact_not_trusted_yet">%s se še ne nahaja v vaših stikih.\nAli sprejmate ali zavračate zahtevo za stik?</string>
+  <string name="message_contact_not_trusted">%s se ne nahaja v stikih.\nDodam kot nov stik?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Pošlji</string>
   <string name="send_request_title">Pošlji zahtevo za stik</string>
+  <string name="send_request_msg">Za komuniciranje s tem uporabnikom morate poslati zathevo za stik. Dokler vaš kontakt ne bo potrdil te zahteve, lahko pošiljate sporočila, a na njih ne morete odgovarjati.</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">Ni blokiranih stikov</string>
   <!--Smartlist-->
   <string name="no_contact_request">Ni bilo poslanih zahtev za stik</string>
+  <string name="conversation_placeholder">Trenutno še nimate pogovorov</string>
   <string name="contact_request_sent">Zahteva za stik poslana</string>
+  <string name="start_conversation">Začni pogovor</string>
+  <string name="search_results">Rezultati iskanja</string>
   <string name="tv_contact_row_header">Stiki</string>
+  <string name="gallery_error_title">Ni aplikacije za galerijo</string>
+  <string name="gallery_error_message">Na napravi ni bilo mogoče najti aplikacije za odpiranje galerije</string>
+  <string name="generic_error">Zgodila se je neznana napaka</string>
   <!--File Transfer-->
+  <string name="invalid_file">Napačna datoteka</string>
+  <string name="not_able_to_write_file">Ne morem zapsiati datoteke</string>
+  <string name="file_transfer_status_created">napaka pri vzpostavitvi</string>
+  <string name="file_transfer_status_unsupported">ni podprta</string>
+  <string name="file_transfer_status_wait_peer_acceptance">čakam na portditev soležnika</string>
+  <string name="file_transfer_status_wait_host_acceptance">čakam na potrditev gostitelja</string>
+  <string name="file_transfer_status_ongoing">poteka</string>
+  <string name="file_transfer_status_finished">končano</string>
+  <string name="file_transfer_status_closed_by_host">zaprto s strani gostitelja</string>
+  <string name="file_transfer_status_closed_by_peer">zaprto s strani soležnika</string>
+  <string name="file_transfer_status_invalid_pathname">napačno ime poti</string>
+  <string name="file_transfer_status_unjoinable_peer">soležnika ni mogoče pridružiti</string>
+  <string name="file_transfer_status_cancelled">prekinjeno</string>
+  <string name="file_transfer_status_error">ni uspelo zaradi napake</string>
+  <string name="file_transfer_status_timed_out">poteklo</string>
+  <string name="file_saved_in">Datoteka je shranjena v %s</string>
+  <string name="file_saved_successfully">Datoteka je bila uspešno shranjena</string>
+  <string name="no_space_left_on_device">Na napravi ni prostora</string>
+  <string name="title_media_viewer">Prikazovalnik vsebin</string>
+  <string name="menu_file_open">Odpri datoteko</string>
+  <string name="menu_file_download">Prenesi datoteko</string>
+  <string name="menu_file_save">Shrani datoteko</string>
+  <string name="menu_file_delete">Izbriši datoteko</string>
   <string name="menu_file_share">Deli datoteko</string>
   <string name="menu_message_copy">Kopiraj</string>
+  <string name="menu_message_delete">Izbriši sporočilo</string>
+  <string name="menu_message_cancel">Prekini sporočilo</string>
   <string name="menu_delete">Pobriši</string>
+  <string name="pref_darkTheme_title">Temna tema</string>
+  <string name="pref_darkTheme_summary">Vedno vklopi temno temo, namesto sistemskih nastavitev</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Pogovori</string>
   <string name="navigation_item_contact_request">Zahteve za povezavo</string>
   <string name="navigation_item_account">Račun</string>
+  <string name="search_results_public_directory">Javna mapa</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">Pošljem zvočno sporočilo?</string>
+  <string name="tv_send_image_dialog_message">Pošljem sliko?</string>
+  <string name="tv_send_video_dialog_message">Pošljem video?</string>
+  <string name="tv_media_preview">Predogled</string>
   <string name="tv_audio_play">Predvajaj</string>
   <string name="tv_audio_pause">Pavza</string>
   <string name="tv_dialog_send">Pošlji</string>
+  <string name="tv_audio_recording">Snemanje...</string>
+  <string name="tv_send_text">Pošiljam besedilo</string>
+  <string name="tv_send_audio">Pošiljam zvok</string>
+  <string name="tv_send_video">Pošiljam medij</string>
+  <string name="conversation_input_speech_hint">Recite nekaj...</string>
   <!--Wizard-->
+  <string name="wizard_status_recommended">Priporočeno</string>
+  <string name="wizard_status_optional">Izbirno</string>
+  <string name="wizard_status_required">Zahtevano</string>
+  <string name="wizard_username_info">Izberite uporabniško ime za vaš račun</string>
+  <string name="wizard_username_button">Določite uporabniško ime</string>
+  <string name="wizard_username_skip">Preskočite izbiro uporabniškega imena</string>
+  <string name="wizard_password_info">Geslo računa</string>
+  <string name="wizard_password_placeholder">Izberite geslo za šifriranje ključa računa na tej napravi</string>
+  <string name="wizard_password_button">Izberite geslo</string>
   <string name="wizard_password_skip">Ustvari račun</string>
+  <string name="wizard_password_switch">Šifriraj račun z geslom</string>
+  <string name="wizard_password_warning">Zapomnite si, da gesel ni mogoče obnoviti</string>
+  <string name="wizard_profile_info">Profil se deli le s stiki</string>
+  <string name="wizard_profile_button">Shrani profil</string>
+  <string name="wizard_profile_skip">Preskoči in to naredi kasneje</string>
+  <string name="fab_path_choose">Izberite še eno datoteko</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings_account.xml b/ring-android/app/src/main/res/values-sl/strings_account.xml
index 55b1b2dd9945672915b42a229fb4d9141e4233f1..c56aeebe1bcf8ace3279350410d06234eb00d39d 100644
--- a/ring-android/app/src/main/res/values-sl/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_account.xml
@@ -1,148 +1,228 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account edition screen-->
-  <string name="ic_delete_menu">Pobriši</string>
+  <string name="ic_delete_menu">Izbriši</string>
   <string name="ic_advanced_menu">Napredne nastavitve</string>
   <string name="ic_blacklist_menu">Blokirani stiki</string>
   <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Dodaj Jami račun</string>
   <string name="add_sip_account_title">Dodaj SIP račun</string>
+  <string name="ring_account_default_name">Jami račun %1$s</string>
   <string name="prompt_alias">Alias</string>
-  <string name="prompt_hostname">Strežnik</string>
-  <string name="prompt_username">Uporabnik</string>
+  <string name="prompt_hostname">Ime strežnika gostitelja</string>
+  <string name="prompt_username">Uporabniško ime</string>
   <string name="prompt_password">Geslo</string>
   <string name="action_create">Ustvari račun</string>
   <string name="action_create_short">Ustvari</string>
-  <string name="action_register">Prijavi se</string>
+  <string name="action_register">Registracija</string>
   <string name="action_settings">Nastavitve</string>
   <string name="error_field_required">To polje je zahtevano</string>
   <string name="dialog_wait_create">Dodajanje računa</string>
-  <string name="dialog_wait_create_details">Prosim, počakaj dokler nov račun ne bo dodan...</string>
-  <string name="dialog_wait_update">Posodabljam račun</string>
-  <string name="dialog_wait_update_details">Prosim, počakaj, da bo račun posodobljen...</string>
+  <string name="dialog_wait_create_details">Počakajte, dokler nov račun ne bo dodan...</string>
+  <string name="dialog_wait_update">Posodabljanje računa</string>
+  <string name="dialog_wait_update_details">Počakajte, da bo račun posodobljen...</string>
   <string name="dialog_warn_ip2ip_account_title">Ustvarim prazen SIP račun ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Ustvariti želite SIP račun brez veljavnega imena gostitelja.
+        Lahko boste prejemali in opravili le neposredne Ip klice.
+        Svoj račun lahko uredite kasneje</string>
   <string name="account_type_ip2ip">IP račun</string>
-  <string name="help_sip_title">Dodaj svoj SIP račun</string>
-  <string name="help_sip">Uredi obstoječi SIP računa.</string>
+  <string name="help_ring">Jami račun omogoča varno sporazumevanje z ljudmi preko polno distribuiranega peer to peer omrežja.</string>
+  <string name="help_sip_title">Dodajte svoj SIP račun</string>
+  <string name="help_sip">Uredi obstoječi SIP račun.</string>
   <string name="create_sip_account">Dodaj SIP račun</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Pobrišem račun ?</string>
-  <string name="account_delete_dialog_message">Te operacije ne morete preklicati.</string>
+  <string name="account_delete_dialog_title">Izbrišem račun ?</string>
+  <string name="account_delete_dialog_message">Tega dejanja ni mogoče razveljaviti.</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">Ni prijavljenih računov.</string>
+  <string name="empty_account_list">Ni prijavljenih računov</string>
   <string name="normal_accounts_titles">Računi</string>
-  <string name="account_device_revoke">Odpokliči napravo</string>
+  <string name="normal_devices_titles">Povezane naprave</string>
+  <string name="account_device_revoke">Odstrani napravo</string>
   <string name="account_device_revocation_success_title">Uspeh</string>
-  <string name="account_device_revocation_success">Naprava je zdaj odpoklicana!</string>
-  <string name="account_device_revocation_error_title">Ne morem odpoklicati naprave</string>
+  <string name="account_device_revocation_success">Naprava je zdaj odstranjena!</string>
+  <string name="account_device_revocation_error_title">Ne morem odstraniti naprave</string>
   <string name="account_device_revocation_wrong_password">Napačno geslo.</string>
   <string name="account_device_revocation_unknown_device">neznana naprava.</string>
   <string name="account_device_revocation_error_unknown">Neznana napaka</string>
+  <string name="account_password_change">Spremeni geslo</string>
+  <string name="account_password_set">Določi geslo</string>
+  <string name="account_password_change_wait_message">Spreminjanje gesla računa</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Splošno</string>
   <string name="account_basic_category">Osnovne nastavitve</string>
   <string name="account_alias_label">Ime računa</string>
-  <string name="account_hostname_label">Strežnik</string>
-  <string name="account_username_label">Uporabnik</string>
+  <string name="account_hostname_label">Ime strežnika gostitelja</string>
+  <string name="account_bootstrap_label">Začetni nalagalnik</string>
+  <string name="account_username_label">Uporabniško ime</string>
   <string name="account_password_label">Geslo</string>
-  <string name="account_optionnal_category">Opcijske nastavitve</string>
+  <string name="account_optionnal_category">Izbirne nastavitve</string>
+  <string name="account_useragent_label">Uporabniški agent</string>
   <string name="account_autoanswer_label">Samodejni odgovor</string>
-  <string name="account_upnp_label">Omogoči PnP</string>
-  <string name="account_proxy_field">Proxy</string>
+  <string name="account_rendezvous_label">Deluj kot točka srečevanja</string>
+  <string name="account_rendezvous_summary">V načinu točka srečevanja bodo vsi klici dodani v konferenčni prostor</string>
+  <string name="account_upnp_label">Omogoči UPnP</string>
+  <string name="account_proxy_field">Posredniški strežnik</string>
   <!--Audio Details-->
-  <string name="account_audio_label">Avdio</string>
+  <string name="account_audio_label">Zvok</string>
   <string name="account_preferences_media_tab">Mediji</string>
-  <string name="account_ringtone_label">Zvonenja</string>
-  <string name="account_ringtone_enabled_label">Vključi zvonenja</string>
-  <string name="account_ringtone_path_label">Pot do zvonenj</string>
-  <string name="account_ringtone_custom_label">Uporabi svoje zvonjenje</string>
+  <string name="account_ringtone_label">Zvonjenja</string>
+  <string name="account_ringtone_enabled_label">Vključi zvonjenja</string>
+  <string name="account_ringtone_path_label">Pot do zvonjenj</string>
+  <string name="account_ringtone_custom_label">Uporabi lastno zvonjenje</string>
+  <string name="account_ringtone_title">Izberi zvonjenje</string>
+  <string name="account_ringtone_summary">Izberite zvonjenje ali določite lastno</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
   <string name="account_video_enable">Omogoči video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Napredno</string>
   <string name="account_call_settings_title">Nastavitve Klicev</string>
+  <string name="account_dht_public_in_calls_label">Dovoli klice neznanih stikov</string>
   <string name="account_registration_exp_label">Registracija poteče</string>
   <string name="account_local_interface_label">Lokalni vmesnik</string>
   <string name="account_local_port_label">Lokalna vrata</string>
   <string name="account_stun_enable_label">Uporabi STUN</string>
   <string name="account_stun_server_label">STUN strežnik</string>
+  <string name="account_accept_files">Samodejni prejem dohodnih datotek</string>
+  <string name="account_conversation_settings_title">Nastavitve pogovorov</string>
+  <string name="account_accept_files_max_size">Največja dovoljena velikost za samodejno prejemanje</string>
+  <string name="account_accept_files_never">Nikoli ne prejemaj samodejno</string>
+  <string name="account_accept_files_always">Vedno prejmi samodejno</string>
+  <string name="size_mb">%1$d MB</string>
   <string name="account_turn_enable_label">Uporabi TURN</string>
   <string name="account_turn_server_label">TURN strežnik</string>
-  <string name="account_turn_username_label">TURN uporabnik</string>
+  <string name="account_turn_username_label">TURN uporabniško ime</string>
   <string name="account_turn_password_label">TURN geslo</string>
-  <string name="account_published_same_as_local_label">Objavi isto kot lokalno</string>
-  <string name="account_published_port_label">Objavi vrata</string>
-  <string name="account_published_address_label">Objavi naslov</string>
+  <string name="account_published_same_as_local_label">Objavljen enako kot lokalni</string>
+  <string name="account_published_port_label">Objavljena vrata</string>
+  <string name="account_published_address_label">Objavljeni naslov</string>
+  <string name="account_proxy_label">DHT posredniški strežnik</string>
+  <string name="account_proxy_enable_label">Uporabi DHT posredniški strežnik</string>
+  <string name="account_proxy_server_label">Naslov DHT posredniškega strežnika</string>
+  <string name="account_proxy_server_list_label">URL naslov DHT posredniškega strežnika</string>
+  <string name="account_sip_proxy_label">Posredniški strežnik</string>
+  <string name="account_peer_discovery_label">Najdi lokalnega soležnika</string>
+  <string name="account_peer_discovery_enable_label">Vklopi lokalno odkrivanje soležnikov</string>
+  <string name="account_peer_discovery_enable_summary">Poveži se na druga DHT vozilšča, ki objavljajo na lokalnem omrežju.</string>
   <!--Security Details-->
+  <string name="account_credentials_label">Poverila</string>
+  <string name="account_credentials_edit">Uredi poverila</string>
+  <string name="account_credentials_add">Dodaj poverila</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Varnost</string>
+  <string name="account_srtp_switch_label">Šifriranje pretoka podatkov (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Vklopi SDES kot protokol za izmenjavo ključa</string>
+  <string name="account_srtp_rtp_fallback">Uporabi zasilni RTP kadar SRTP ni mogoč</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Uporabi TLS transport</string>
-  <string name="account_tls_port_label">Vrata za sprejem TLS</string>
+  <string name="account_tls_port_label">Vrata  TLS poslušalnika</string>
+  <string name="account_tls_certificate_list_label">Izdajatelji certifikata</string>
   <string name="account_tls_certificate_file_label">Datoteka certifikata</string>
-  <string name="account_tls_private_key_file_label">Datoteka osebnega ključa</string>
-  <string name="account_tls_password_label">Geslo osebnega ključa</string>
+  <string name="account_tls_private_key_file_label">Datoteka zasebnega ključa</string>
+  <string name="account_tls_password_label">Geslo zasebnega ključa</string>
   <string name="account_tls_method_label">TLS metoda</string>
-  <string name="account_tls_ciphers_label">TLS čiperji</string>
-  <string name="account_tls_server_name_label">Strežnik</string>
+  <string name="account_tls_ciphers_label">TLS šifrirniki</string>
+  <string name="account_tls_server_name_label">Ime strežnika</string>
   <string name="account_tls_verify_server_label">Preveri strežnik</string>
   <string name="account_tls_verify_client_label">Preveri odjemalca</string>
-  <string name="account_tls_negotiation_timeout_sec">Čas usklajevanja (sek)</string>
+  <string name="account_require_client_certificate_label">TLS potrebuje certifikat odjemalca</string>
+  <string name="account_tls_negotiation_timeout_sec">Čas usklajevanja (v sekundah)</string>
   <string name="account_rtp_max_port">Največ</string>
   <string name="account_rtp_min_port">Najmanj</string>
   <string name="account_rtp_port_range">Omočje RTP vrat</string>
   <!--restore/backup-->
-  <string name="account_new_device_password">Vnesi glavno geslo, da odkleneš račun</string>
-  <string name="error_password_char_count">najmanj 6 znakov</string>
-  <string name="error_passwords_not_equals">Gesli nista enaki</string>
-  <string name="export_account_wait_title">Prosim, počakaj...</string>
-  <string name="account_export_end_network_title">Napaka mreže</string>
+  <string name="account_new_device_password">Za odklep računa, vnesite glavno geslo</string>
+  <string name="error_password_char_count">potrebnih je vsaj 6 znakov</string>
+  <string name="error_passwords_not_equals">Gesli se ne ujemata</string>
+  <string name="export_account_wait_title">Počakajte...</string>
+  <string name="export_account_wait_message">Izvažanje podatkov računa</string>
+  <string name="account_export_file">Varnostno kopiranje računa</string>
+  <string name="account_export_end_decryption_message">Vašega računa ni bilo mogoče odkleniti s podanim geslom.</string>
+  <string name="account_export_end_network_title">Napaka na omrežju</string>
+  <string name="account_export_end_network_message">Računa ni bilo mogoče izvoziti preko omrežja. Preverite povezavo.</string>
   <string name="account_export_end_error_title">Napaka</string>
-  <string name="account_enter_password">Vnesi geslo</string>
+  <string name="account_export_end_error_message">Računa ni bilo mogoče izvoziti. Zgodila se je neznana napaka.</string>
+  <string name="account_enter_password">Vnesite geslo</string>
+  <string name="account_share_body">Kontaktiraj me z uporabo \'%1$s\' na Jami razpršeni komunikacijski platformi: %2$s</string>
+  <string name="account_share_body_with_username">Kontaktiraj me z uporabo \'%1$s\' ali mojim javnim uporabniškim imenom \'%2$s\' na Jami razpršeni komunikacijski platformi: %3$s </string>
+  <string name="account_contact_me">Kontaktiraj me na Jamiju!</string>
   <string name="update_account">Posodobi račun</string>
+  <string name="account_migration">Vaš Jami račun je mogoče posodobiti.\nVnesite geslo.</string>
+  <string name="ring_account">Jami račun</string>
   <string name="ring_account_identity">Identiteta</string>
-  <string name="account_migration_title_dialog">Migracija računa</string>
+  <string name="account_migration_title_dialog">Selitev računa</string>
+  <string name="account_migration_message_dialog">Vaši računi morajo biti posodobljeni. Želite na zaslon za urejanje računa, da to izvedete?</string>
   <string name="account_update_needed">Potrebna je posodobitev</string>
   <string name="account_cannot_be_found_title">Ne najdem računa</string>
-  <string name="account_no_network_title">Ne morem se povezati na mrežo</string>
-  <string name="account_device_added_title">Naprava dodana</string>
-  <string name="account_device_updated_title">Naprava računa posodobljena</string>
-  <string name="account_sip_success_title">SIP račun prijavljen</string>
-  <string name="account_sip_success_message">Uspešno si prijavil svoj SIP račun.</string>
-  <string name="account_sip_register_anyway">Vseeno prijavi</string>
-  <string name="account_link_prompt_pin">Vnesi PIN</string>
+  <string name="account_cannot_be_found_message">Računa ni bilo mogoče najti v Jami omrežju.\nPreverite ali je bilo izvoženo na Jami iz obstoječe naprave in da so bili posredovani pravi podatki.</string>
+  <string name="account_sip_cannot_be_registered_message">Lahko nadaljujete z ustvarjanjem računa ali tukaj uredite svoje podatke. Urejanje je še možno tudi kasneje v nastavitvah računa.</string>
+  <string name="account_no_network_title">Ne morem se povezati z omrežjem</string>
+  <string name="account_no_network_message">Računa ni bilo mogoče dodati, ker se Jami ni mogel povezati z razpršenim omrežjem. Preverite povezavo.</string>
+  <string name="account_device_added_title">Naprava računa je dodana</string>
+  <string name="account_device_added_message">Svoj Jami račun se uspešno namestili na to napravo</string>
+  <string name="account_device_updated_title">Naprava računa je posodobljena</string>
+  <string name="account_device_updated_message">Uspešno ste posodobili svoj Jami račun.</string>
+  <string name="account_cannot_be_updated_message">Naprave računa ni bilo mogoče posodobiti. Preverite geslo.</string>
+  <string name="account_sip_success_title">SIP račun je registriran</string>
+  <string name="account_sip_success_message">Uspešno ste registrirali SIP račun.</string>
+  <string name="account_sip_register_anyway">Vseeno registriraj</string>
+  <string name="account_link_device">Poveži se z druge naprave</string>
+  <string name="account_link_button">Poveči se iz omrežja</string>
+  <string name="account_link_archive_button">Poveži se se iz varnostne kopije</string>
+  <string name="account_link_prompt_pin">Vnesite PIN</string>
+  <string name="account_new_button">Ustvari Jami račun</string>
+  <string name="account_link_export_button">Poveži novo napravo</string>
+  <string name="account_link_export_info">Da bi uporabili ta račun na drugo napravi, jo morate najprej razkriti na Jamiju. To bo ustvarilo PIN kodo, ki jo morate vnesti v novo napravo, da bi ustvarili račun. PIN je veljaven 10 minut.</string>
+  <string name="account_start_export_button">Ustvari PIN</string>
   <string name="account_end_export_button">zapri</string>
+  <string name="account_end_export_infos">Vaš PIN je:\n\n%%\n\nZa dokončanje postopka morate odpreti Jami na novi napravi. Ustvarite nov račun preko \"Poveži to napravo z računom\". Vaš PIN je veljaven 10 minut.</string>
+  <string name="account_link_export_info_light">Da bi uporabili ta račun na drugi napravi, jo morate najprej razkriti na Jamiju. To bo ustvarilo PIN kodo, ki jo morate vnesti v novo napravo, da ustvarite račun. PIN je veljaven 10 minut.</string>
+  <string name="account_export_title">Dodaj naprave</string>
+  <string name="account_connect_server_button">Povezava na upravljalni strežnik</string>
+  <string name="account_connect_button">Poveži</string>
+  <string name="prompt_server">URL naslov Jami upravljalnega strežnika</string>
+  <string name="help_credentials_enter">Vnesite podatke o svoji organizaciji</string>
+  <string name="help_connect_password_enter">Vnesite geslo svoje organizacije</string>
   <string name="account_connect_prompt_username">Uporabnik</string>
   <!--Name registration-->
-  <string name="error_username_empty">Vnesi uporabniško ime</string>
-  <string name="trying_to_register_name">Poskusi prijaviti ime</string>
-  <string name="registered_username">Prijavljeno uporabniško ime</string>
-  <string name="register_username">Prijavi javno ime</string>
+  <string name="error_username_empty">Vnesite uporabniško ime</string>
+  <string name="username_available">Uporabniško ime je na voljo!</string>
+  <string name="register_name">Registriraj ime</string>
+  <string name="trying_to_register_name">Poskus registracije imena</string>
+  <string name="registered_username">Registrirano uporabniško ime</string>
+  <string name="register_username">Registriraj javno uporabniško ime</string>
+  <string name="register_recommended">Priporočeno</string>
   <string name="username_already_taken">Uporabniško ime je že oddano</string>
   <string name="invalid_username">Neveljavno uporabniško ime</string>
+  <string name="unknown_error">Neznana napaka. Preverite omrežno povezavo!</string>
   <string name="looking_for_username_availability">Preverjam ali je uporabniško ime na voljo...</string>
   <string name="account_status_connecting">Povezujem</string>
   <string name="account_status_connection_error">Napaka med povezovanjem</string>
   <string name="account_status_online">Povezan</string>
   <string name="account_status_unknown">Neznano</string>
-  <string name="account_status_offline">Odjavljen</string>
+  <string name="account_status_offline">Brez povezave</string>
   <string name="account_status_error">Napaka</string>
   <!--Create account-->
-  <string name="account_creation_profile">Ustvari svoj profil</string>
-  <string name="account_link_title">Poveži to naoravo</string>
+  <string name="account_creation_home">Dobrodošli v Jami</string>
+  <string name="account_creation_profile">Ustvari profil</string>
+  <string name="account_creation_ring">Ustvari Jami račun</string>
+  <string name="account_link_title">Poveži to napravo</string>
   <string name="account_sip_cannot_be_registered">Ne morem prijaviti računa</string>
   <!--Edit profile-->
+  <string name="account_edit_profile">Uredi profil</string>
   <!--Devices-->
-  <string name="account_revoke_device_hint">Vnesi geslo za potrditev</string>
-  <string name="enter_password">Vnesi geslo</string>
-  <string name="revoke_device_title">Odpokliči napravo</string>
-  <string name="revoke_device_wait_title">Prosim, počakaj...</string>
-  <string name="revoke_device_wait_message">Odpoklic naprave</string>
+  <string name="account_revoke_device_hint">Vnesite geslo za potrditev</string>
+  <string name="enter_password">Vnesite geslo</string>
+  <string name="revoke_device_title">Odstrani napravo</string>
+  <string name="revoke_device_message">Ali ste prepričani, da želite odstraniti %1$s?</string>
+  <string name="revoke_device_wait_title">Počakajte...</string>
+  <string name="revoke_device_wait_message">Odstranitev naprave</string>
   <string name="rename_device_title">Preimenuj to napravo</string>
+  <string name="rename_device_message">Izberite novo ime za identifikacijo te naprave v vašem Jami računu</string>
   <string name="rename_device_button">Preimenuj napravo</string>
-  <string name="account_rename_device_hint">Izberi novo ime naprave</string>
+  <string name="account_rename_device_hint">Izberite novo ime naprave</string>
   <string name="account_device_name_empty">Ime naprave ne more biti prazno</string>
-  <string name="account_device_this_indicator">ta naprava</string>
-  <string name="account_disabled_indicator">izključena</string>
+  <string name="account_device_this_indicator">Ta naprava</string>
+  <string name="account_disabled_indicator">onemogočeno</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings_call.xml b/ring-android/app/src/main/res/values-sl/strings_call.xml
index 38a9b7e81a59211b57aa53cd43fe3e594fef5d36..1690fe22a07b0c0590da05b47bdf049e73faabc2 100644
--- a/ring-android/app/src/main/res/values-sl/strings_call.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_call.xml
@@ -20,17 +20,21 @@ along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">Klic je bil prekinjen, ker ni bilo mogoče najti mikrofona.</string>
+    <string name="call_error_no_camera_no_microphone">Klic je bil prekinjen, ker ni bilo mogoče najti mikrofona ali kamere.</string>
+
     <!-- SipCalls -->
-    <string name="call_human_state_searching">Iščem</string>
+    <string name="call_human_state_searching">Iskanje</string>
     <string name="call_human_state_incoming">Dohodni</string>
     <string name="call_human_state_connecting">Povezujem</string>
     <string name="call_human_state_ringing">Zvoni</string>
-    <string name="call_human_state_current">Sprejemam</string>
-    <string name="call_human_state_hungup">Končano</string>
+    <string name="call_human_state_current">Pogovor</string>
+    <string name="call_human_state_hungup">Končan</string>
     <string name="call_human_state_busy">Zasedeno</string>
     <string name="call_human_state_failure">Neuspelo</string>
-    <string name="call_human_state_hold">Čakanje</string>
-    <string name="call_human_state_unhold">Vrnjen</string>
+    <string name="call_human_state_hold">Zadržano</string>
+    <string name="call_human_state_unhold">Sproščen</string>
     <string name="call_human_state_over">Končano</string>
     <!-- Conferences -->
 </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-sl/strings_content_description.xml b/ring-android/app/src/main/res/values-sl/strings_content_description.xml
index 72709a44d9897cea614989e74d7bf8cbe77469b3..bb6424e5b3022f153cd474a5e7f41577f4420ff6 100644
--- a/ring-android/app/src/main/res/values-sl/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Slika stika</string>
   <string name="dial_numeric_pad">Numerična tipkovnica</string>
   <string name="contact_unblock">Odblokiraj</string>
+  <string name="video_plugins">Video vtičniki</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings_preferences.xml b/ring-android/app/src/main/res/values-sl/strings_preferences.xml
index b7462f5d33b233d4b77210da90b09b5090e6f4b0..225e8fc6cbd7be3a0ddfecc99a30362bbd4d6463 100644
--- a/ring-android/app/src/main/res/values-sl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_preferences.xml
@@ -1,13 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="pref_category_network">Mreža</string>
+  <string name="pref_category_network">Omrežje</string>
   <string name="pref_category_contacts">Stiki</string>
   <string name="pref_category_video">Video</string>
   <string name="pref_category_system">Sistem</string>
   <string name="pref_category_privacy">Zasebnost</string>
   <string name="pref_mobileData_title">Mobilni podatki</string>
+  <string name="pref_mobileData_summary">Dovoli da Jami poleg Wifi uporablja tudi 3G/LTE omrežja</string>
+  <string name="pref_pushNotifications_title">Potisna sporočila</string>
+  <string name="pref_pushNotifications_summary">Uporaba Google strežnikov sprejemanje klicev/sporočil v ozadju</string>
+  <string name="pref_video_advanced_title">Napredne nastavitve videa</string>
+  <string name="pref_video_advanced_summary">Spremeni bitno hitrost videa, ločljivost, kot tudi eksperimentalne funkcije</string>
+  <string name="pref_hd_summary">Omogoči pošiljanje HD videa</string>
+  <string name="pref_hwEncode_title">Vklppi pospešeno kodiranje</string>
+  <string name="pref_hwEncode_summary">Eksperimentalno</string>
+  <string name="pref_videoBitrate_title">Bitna hitrost videa</string>
+  <string name="pref_videoBitrate_summary">Izberite privzeto izhodno bitno hitrost videa (kB/s)</string>
+  <string name="pref_videoResolution_title">Video ločljivost</string>
+  <string name="pref_videoResolution_summary">Izberite privzeto izhodno ločljivost videa</string>
   <string name="pref_systemContacts_title">Uporabi sistemske stike</string>
-  <string name="pref_systemContacts_summary">Uporabi sistemske stike za prikaz podatkov klicatelja.</string>
-  <string name="pref_clearHistory_title">Pobriši zgodovino</string>
+  <string name="pref_systemContacts_summary">Uporabi sistemske stike za prikaz podrobnosti o klicatelju.</string>
+  <string name="pref_systemDialer_title">Uporabi Jami za izvedbo klicev sistema</string>
+  <string name="pref_systemDialer_summary">Kadar je to mogoče, za izvedbo klicev sistema uporabi Jami.</string>
+  <string name="pref_startOnBoot_title">Zaženi Jami ob zagonu</string>
+  <string name="pref_startOnBoot_summary">Ob zagonu sistema zaženi Jami v ozadju.</string>
+  <string name="pref_clearHistory_title">Počisti zgodovino</string>
+  <string name="pref_clearHistory_summary">Izbriše vso zgodovino pogovorov. Tega dejanja ni mogoče razveljaviti.</string>
+  <string name="pref_delete_account_title">Izbriši račun</string>
+  <string name="pref_persistNotification_title">Zagon v ozadju</string>
+  <string name="pref_persistNotification_summary">Dovoli izvajanje v ozadju za sprejemanje klicev in sporočil.</string>
   <!--Plugin-->
+  <string name="pref_plugins_title">Vtičniki</string>
+  <string name="pref_plugins_summary">Vklopite vtičnike in določite njihove parametre</string>
+  <string name="fab_plugins_add">Dodaj nov vtičnik</string>
+  <string name="plugin_uninstall_title">Odtrsanim vtičnik?</string>
+  <string name="plugin_reset_preferences">Ponastavi nastavitve vtičnika</string>
+  <string name="plugin_reset_preferences_summary">Nastavitve vašega vtičnika bodo ponastavljene</string>
+  <string name="plugin_reset_preferences_ask">Ali bi radi ponastavili nastavitve vtičnika?</string>
+  <string name="plugin_successfully_installed">Vtičnik <b>%1$s</b> je bil uspešno nameščen</string>
+  <string name="plugin_install_failure">Namestiev vtičnika ni uspela: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">Nameščeno imate novejšo različico <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Nameščeno imate isto različico <b>%1$s</b></string>
+  <string name="plugin_force_install">prisili \n namestitev</string>
+  <string name="plugin_path_image_add">Dodaj novo sliko</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 a24a955cd8acae82295b6b0b15a3eb7827f4bc94..585ab19568edb529cc6b053c886787cb1fca703f 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
@@ -111,6 +111,7 @@
   <string name="share_via">Ndajeni përmes</string>
   <string name="write_a_message">Shkruani një mesazh</string>
   <string name="scan_qr">Skanoni Kodin QR</string>
+  <string name="qr_code">Kod QR</string>
   <string name="ab_action_flipcamera">Rrotulloni kamerën</string>
   <string name="ab_action_hidepreview">Fshihe paraparjen</string>
   <!--Text messages-->
@@ -192,6 +193,13 @@
   <string name="open_the_gallery">Hape galerinë</string>
   <string name="take_a_photo">Bëni një foto</string>
   <string name="profile_name_hint">Jepni emrin tuaj</string>
+  <string name="registered_name">Emër i Regjistruar</string>
+  <string name="no_registered_name">Pa emër të regjistruar</string>
+  <string name="identity">Identitet</string>
+  <string name="account">Llogari</string>
+  <string name="link_new_device">Lidhni një pajisje të re</string>
+  <string name="devices">Pajisje të lidhura</string>
+  <string name="total_devices">Pajisje gjithsej:</string>
   <!--Share fragment-->
   <string name="share_message">Skanojeni këtë kod me Jami-n</string>
   <string name="share_message_no_account">Ju lutemi, përzgjidhni një llogari për ndarje me të.</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
index 7c53b6d298738ec86fba1c854ae77edebb24f5bd..838ff749d7a3f5062ac9d2a49d9accf38014fc30 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_account.xml
@@ -46,6 +46,7 @@
   <string name="account_device_revocation_error_unknown">Gabim i panjohur.</string>
   <string name="account_password_change">Ndryshoni Fjalëkalimin</string>
   <string name="account_password_set">Caktoni Fjalëkalimin</string>
+  <string name="account_password_summary">Administroni fjalëkalimin e llogarisë tuaj.</string>
   <string name="account_password_change_wait_message">Po ndryshohet fjalëkalim llogarie</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Të përgjithshme</string>
@@ -100,6 +101,7 @@
   <string name="account_proxy_enable_label">Përdor ndërmjetës DHT</string>
   <string name="account_proxy_server_label">Adresë ndërmjetësi DHT</string>
   <string name="account_proxy_server_list_label">URL liste ndërmjetësish DHT</string>
+  <string name="account_sip_proxy_label">Ndërmjetës</string>
   <string name="account_peer_discovery_label">Pikasje ortakësh vendorë</string>
   <string name="account_peer_discovery_enable_label">Aktivizo pikasje ortakësh vendorë</string>
   <string name="account_peer_discovery_enable_summary">Lidhu me nyje të tjera DHT që reklamohen në rrjetin tonë vendor</string>
@@ -137,6 +139,7 @@
   <string name="export_account_wait_title">Ju lutemi, pritni…</string>
   <string name="export_account_wait_message">Po eksportohen të dhëna llogarie</string>
   <string name="account_export_file">Kopjeruani Llogari</string>
+  <string name="account_export_file_summary">Kopjeruajeni llogarinë tuaj në pajisjen tuaj për ta rikthyer më vonë.</string>
   <string name="account_export_end_decryption_message">S\’u zhbllokua dot llogaria juaj duke përdorur fjalëkalimin e dhënë.</string>
   <string name="account_export_end_network_title">Gabim rrjeti</string>
   <string name="account_export_end_network_message">S\’u eksportua dot llogari te rrjeti. Kontrolloni lidhjen tuaj në rrjet.</string>
@@ -172,6 +175,8 @@
   <string name="account_link_prompt_pin">Jepni PIN-in</string>
   <string name="account_new_button">Krijoni një llogari Jami</string>
   <string name="account_link_export_button">Lidhni një pajisje të re</string>
+  <string name="account_link_show_button">Shfaq %d pajisje të tjera të lidhura</string>
+  <string name="account_link_hide_button">Fshihe pajisjen e lidhur</string>
   <string name="account_link_export_info">Që të përdorni këtë llogari në pajisje të tjera, së pari duhet t\ia ekspozoni atë Jami-t. Kështu do të prodhohet një kod PIN që duhet ta jepni te pajisja e re për të rregulluar llogarinë. PIN-i vlen për 10 minuta.</string>
   <string name="account_start_export_button">Prodho PIN</string>
   <string name="account_end_export_button">mbylle</string>
@@ -186,7 +191,7 @@
   <string name="account_connect_prompt_username">Emër përdoruesi</string>
   <!--Name registration-->
   <string name="error_username_empty">Jepni një emër përdoruesi</string>
-  <string name="no_registered_name_for_account">S\’u gjet emër i regjistruar për këtë llogari</string>
+  <string name="no_registered_name_for_account">Pa emër të regjistruar</string>
   <string name="username_available">Emër përdoruesi i pazënë!</string>
   <string name="register_name">Regjistroni Emër</string>
   <string name="trying_to_register_name">Po provohet të regjistrohet emri</string>
@@ -223,6 +228,6 @@
   <string name="rename_device_button">Riemërtoje pajisjen</string>
   <string name="account_rename_device_hint">Zgjidhni një emër të ri për pajisjen</string>
   <string name="account_device_name_empty">Emri i pajisjes s\’mund të jetë i zbrazët</string>
-  <string name="account_device_this_indicator">këtë pajisje</string>
+  <string name="account_device_this_indicator">Këtë pajisje</string>
   <string name="account_disabled_indicator">e çaktivizuar</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
index a39536c2c18518b4e278a216042e99edd5863f11..a04c6fdd61eaf16a759e0d54ee252ea2681cd92e 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
@@ -26,6 +26,10 @@
   <string name="pref_startOnBoot_summary">Xhirojeni Jami-n në prapaskenë, kur niset sistemi.</string>
   <string name="pref_clearHistory_title">Spastroje historikun</string>
   <string name="pref_clearHistory_summary">Spastroni krejt historikun e bisedave, Ky veprim nuk mund të zhbëhet.</string>
+  <string name="pref_blackList_title">Listë bllokimesh</string>
+  <string name="pref_blackList_summary">Kontrolloni listën tuaj të bllokimeve.</string>
+  <string name="pref_delete_account_title">Fshije llogarinë</string>
+  <string name="pref_delete_account_summary">Fshini llogarinë tuaj prej kësaj pajisjeje</string>
   <string name="pref_persistNotification_title">Xhiro në prapaskenë</string>
   <string name="pref_persistNotification_summary">Lejoni xhirimin në prapaskenë që të merrni thirrje dhe mesazhe.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-sv/strings.xml b/ring-android/app/src/main/res/values-sv/strings.xml
index ba2a6598d31fa77856bd0bf41739d3aa6fca9982..ff8b230f9f0e4b17dc27879d2b9d2f4da5462768 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -93,6 +93,7 @@
   <string name="share_via">Dela via</string>
   <string name="write_a_message">Skriv ett meddelande</string>
   <string name="scan_qr">Skanna QR-kod</string>
+  <string name="qr_code">QR-kod</string>
   <string name="ab_action_flipcamera">Vänd kameran</string>
   <!--Text messages-->
   <string name="send_message">Skicka meddelande</string>
@@ -163,6 +164,11 @@
   <string name="profile_message_warning">Din profil delas endast med dina kontakter</string>
   <string name="open_the_gallery">Öppna galleriet</string>
   <string name="take_a_photo">Ta ett foto</string>
+  <string name="registered_name">Registrerat namn</string>
+  <string name="identity">Identitet</string>
+  <string name="account">Konto</string>
+  <string name="link_new_device">Koppla en ny enhet</string>
+  <string name="devices">Kopplade enheter</string>
   <!--Share fragment-->
   <string name="share_message">Skanna den här koden med Jami</string>
   <string name="share_message_no_account">Välj ett konto att dela.</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index efa8d7cf35434bebde567e9c614424b4caab63b1..4169fdae4bb54b3ed5e3801d683e85b3fe25a445 100644
--- a/ring-android/app/src/main/res/values-sv/strings_account.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_account.xml
@@ -87,6 +87,7 @@ Du kan ändra kontot senare.</string>
   <string name="account_proxy_label">DHT proxy</string>
   <string name="account_proxy_enable_label">Använd DHT proxy</string>
   <string name="account_proxy_server_label">DHT proxyadress</string>
+  <string name="account_sip_proxy_label">Proxy</string>
   <!--Security Details-->
   <string name="account_credentials_label">Inloggningsuppgifter</string>
   <string name="account_credentials_edit">Redigera inloggningsuppgifter</string>
@@ -161,7 +162,6 @@ Du kan ändra kontot senare.</string>
   <string name="account_connect_prompt_username">Användarnamn</string>
   <!--Name registration-->
   <string name="error_username_empty">Ange ett användarnamn</string>
-  <string name="no_registered_name_for_account">Inget registrerat namn hittades för detta konto</string>
   <string name="username_available">Användarnamnet tillgängligt!</string>
   <string name="trying_to_register_name">Försöker registrera namnet</string>
   <string name="registered_username">Registrerat namn</string>
@@ -197,6 +197,6 @@ Du kan ändra kontot senare.</string>
   <string name="rename_device_button">Byt namn på enhet</string>
   <string name="account_rename_device_hint">Välj nytt enhetsnamn</string>
   <string name="account_device_name_empty">Enhetsnamnet kan inte lämnas tomt</string>
-  <string name="account_device_this_indicator">denna enhet</string>
+  <string name="account_device_this_indicator">Denna enhet</string>
   <string name="account_disabled_indicator">inaktiverad</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sv/strings_preferences.xml b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
index cb71d91120f1f2fc2a0a0b526ce93d5b6f9f07b6..88e8a0fcc8b2d9f678612c58508bc1a05a070321 100644
--- a/ring-android/app/src/main/res/values-sv/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
@@ -19,6 +19,7 @@
   <string name="pref_startOnBoot_title">Starta Jami vid systemstart</string>
   <string name="pref_startOnBoot_summary">Kör Jami i bakgrunden när systemet startas</string>
   <string name="pref_clearHistory_title">Rensa historik</string>
+  <string name="pref_delete_account_title">Ta bort konto</string>
   <string name="pref_persistNotification_title">Kör i bakgrunden</string>
   <string name="pref_persistNotification_summary">Tillåt bakgrundskörning för inkommande samtal och meddelanden.</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index ab3ec5e0d8f1985924ff8095a93c634a939d12e0..82ba3c5962e6e34b18fa51003a58789a05a3239b 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -104,6 +104,7 @@
   <string name="share_via">Paylaş</string>
   <string name="write_a_message">Bir ileti yaz</string>
   <string name="scan_qr">Kare Kod Tara</string>
+  <string name="qr_code">QR kod</string>
   <string name="ab_action_flipcamera">Kamerayı ters çevir</string>
   <!--Text messages-->
   <string name="send_message">İleti gönder</string>
@@ -180,6 +181,11 @@
   <string name="profile_message_warning">Profiliniz sadece kayıtlı kişilerinizle paylaşılıyor</string>
   <string name="open_the_gallery">Galeriyi aç</string>
   <string name="take_a_photo">Fotoğraf çek</string>
+  <string name="registered_name">Kayıtlı Ad</string>
+  <string name="identity">Kimlik</string>
+  <string name="account">Hesap</string>
+  <string name="link_new_device">Yeni bir aygıt bağlayın</string>
+  <string name="devices">Bağlı Aygıtlar</string>
   <!--Share fragment-->
   <string name="share_message">Bu kodu Jami ile tarayın</string>
   <string name="share_message_no_account">Lütfen paylaşmak için bir hesap seçin.</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings_account.xml b/ring-android/app/src/main/res/values-tr/strings_account.xml
index 5c7f85e38b5a6045510befe8f02567237e71b3db..45d9d718e8ecd903701fe31c3e729ca6298d401e 100644
--- a/ring-android/app/src/main/res/values-tr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_account.xml
@@ -96,6 +96,7 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="account_proxy_enable_label">DHT vekil sunucu kullan</string>
   <string name="account_proxy_server_label">DHT vekil adresi</string>
   <string name="account_proxy_server_list_label">DHT proxy listesi URL</string>
+  <string name="account_sip_proxy_label">Vekil</string>
   <string name="account_peer_discovery_label">Yerel bağlantı bulma</string>
   <string name="account_peer_discovery_enable_label">Yerel bağlantı bulmayı etkinleştir</string>
   <string name="account_peer_discovery_enable_summary">Yerel ağımızdaki diğer DHT reklamlarına bağlanın</string>
@@ -177,7 +178,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="account_connect_prompt_username">Kullanıcı adı</string>
   <!--Name registration-->
   <string name="error_username_empty">Bir kullanıcı adı gir</string>
-  <string name="no_registered_name_for_account">Bu hesap için kaydedilmiş ad bulunamadı</string>
   <string name="username_available">Kullanıcı adı geçerli !</string>
   <string name="trying_to_register_name">Ad kaydedilmeye çalışılıyor</string>
   <string name="registered_username">Kaydedilen kullanıcı adı</string>
@@ -212,6 +212,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="rename_device_button">Aygıtı yeniden adlandır</string>
   <string name="account_rename_device_hint">Yeni aygıt adı seç</string>
   <string name="account_device_name_empty">Aygıt adı boş bırakılamaz</string>
-  <string name="account_device_this_indicator">bu aygıt</string>
+  <string name="account_device_this_indicator">Bu aygıt</string>
   <string name="account_disabled_indicator">devre dışı</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings_preferences.xml b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
index 1852f1f1765618922138d85b18d540a898d704f4..3bf70a86cf6620cd36511f3e7deefd68fd328148 100644
--- a/ring-android/app/src/main/res/values-tr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
@@ -22,6 +22,7 @@
   <string name="pref_startOnBoot_summary">Sistem başladığında Jami\'yi arkaplanda çalıştır.</string>
   <string name="pref_clearHistory_title">Geçmişi temizle</string>
   <string name="pref_clearHistory_summary">Tüm konuşma geçmişini temizle. Bu işlem geri alınamaz.</string>
+  <string name="pref_delete_account_title">Hesabı sil</string>
   <string name="pref_persistNotification_title">Arkaplanda çalıştır</string>
   <string name="pref_persistNotification_summary">Arka planda çalışan çağrı  ve iletileri almak için izin ver</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 6d6f6d024d542831fb8866f9d88d9c68377193b6..3c3b4ff917bc5e437a45aa0e0db8c7fc1be39e1c 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -159,6 +159,10 @@
   <string name="profile_message_warning">Ваш профіль бачитимуть лише ваші контакти</string>
   <string name="open_the_gallery">Відкрити галерею</string>
   <string name="take_a_photo">Зробити фото</string>
+  <string name="registered_name">Зареєстроване ім\'я</string>
+  <string name="identity">Особа</string>
+  <string name="account">Аккаунт</string>
+  <string name="devices">Прив\'язані пристрої</string>
   <!--Share fragment-->
   <string name="share_message">Зіскануйте цей код у Джамі</string>
   <string name="share_message_no_account">Будь ласка, оберіть обліковий запис, щоб поділитися.</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings_account.xml b/ring-android/app/src/main/res/values-uk/strings_account.xml
index 64df8540eef0a765532388dcfb4d699425fe027b..2d783d6c9462f17dd2d5be8bc5dd87a219fdfcf5 100644
--- a/ring-android/app/src/main/res/values-uk/strings_account.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_account.xml
@@ -80,6 +80,7 @@
   <string name="account_published_same_as_local_label">Опубліковано такий же як і локальний</string>
   <string name="account_published_port_label">Публічний порт</string>
   <string name="account_published_address_label">Опублікована адреса</string>
+  <string name="account_sip_proxy_label">Проксі</string>
   <!--Security Details-->
   <string name="account_credentials_label">Облікові дані</string>
   <string name="account_credentials_edit">Змінити облікові дані</string>
@@ -149,7 +150,6 @@
   <string name="account_connect_prompt_username">Ім’я</string>
   <!--Name registration-->
   <string name="error_username_empty">Ввести ім\'я користувача</string>
-  <string name="no_registered_name_for_account">Не знайдено зареєстрованого імені для цього облікового запису</string>
   <string name="trying_to_register_name">Спроба реєстрації імені</string>
   <string name="registered_username">Зареєстроване ім\'я користувача</string>
   <string name="register_username">Зареєструвати публічне ум\'я користувача</string>
@@ -181,6 +181,6 @@
   <string name="rename_device_button">Перейменувати пристрій</string>
   <string name="account_rename_device_hint">Вибрати нову назву для пристрою</string>
   <string name="account_device_name_empty">Назва пристрою не може бути порожньою</string>
-  <string name="account_device_this_indicator">цей пристрій</string>
+  <string name="account_device_this_indicator">Цей пристрій</string>
   <string name="account_disabled_indicator">вимкнено</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-uk/strings_preferences.xml b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
index c439afd3793916dcec608e7473f7c46f1668a04c..524eb16a7a804b493848437452302372dcd3b392 100644
--- a/ring-android/app/src/main/res/values-uk/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
@@ -14,5 +14,6 @@
   <string name="pref_startOnBoot_title">Запускати Джамі після включення пристрою</string>
   <string name="pref_startOnBoot_summary">Дозволити Джамі працювати на задньому плані, коли вмикається пристрій.</string>
   <string name="pref_clearHistory_title">Видалити історію</string>
+  <string name="pref_delete_account_title">Видалити обліковий запис</string>
   <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index 4153a7463afb3c0f10da99f750b761dfafd0d9e1..ea040e908306aa7c699f2d1ad6a1a06f863e610f 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
@@ -110,6 +110,7 @@
   <string name="share_via">通过…共享</string>
   <string name="write_a_message">写消息</string>
   <string name="scan_qr">扫描二维码</string>
+  <string name="qr_code">二维码</string>
   <string name="ab_action_flipcamera">翻转摄像头</string>
   <string name="ab_action_hidepreview">隐藏预览</string>
   <!--Text messages-->
@@ -191,6 +192,11 @@
   <string name="open_the_gallery">打开照片库</string>
   <string name="take_a_photo">拍照</string>
   <string name="profile_name_hint">输入您的名字</string>
+  <string name="registered_name">已注册名称</string>
+  <string name="identity">身份</string>
+  <string name="account">账户</string>
+  <string name="link_new_device">关联新设备</string>
+  <string name="devices">链接设备</string>
   <!--Share fragment-->
   <string name="share_message">用 Jami 扫描此码</string>
   <string name="share_message_no_account">请选择要共享的账户。</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index 96a452adc48e3da31ad73a2a9ba8888dbf5dd663..4ee6b5336da7d0721c897d14b66e0518d35ac062 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
@@ -100,6 +100,7 @@
   <string name="account_proxy_enable_label">使用 DHT 代理</string>
   <string name="account_proxy_server_label">DHT 代理地址</string>
   <string name="account_proxy_server_list_label">DHT 代理列表 URL </string>
+  <string name="account_sip_proxy_label">代理</string>
   <string name="account_peer_discovery_label">本地对等方发现</string>
   <string name="account_peer_discovery_enable_label">启用本地对等方发现</string>
   <string name="account_peer_discovery_enable_summary">连接至在本地网络宣告的 DHT 节点</string>
@@ -186,7 +187,6 @@
   <string name="account_connect_prompt_username">用户名</string>
   <!--Name registration-->
   <string name="error_username_empty">输入用户名</string>
-  <string name="no_registered_name_for_account">该账户尚未注册用户名</string>
   <string name="username_available">用户名可用!</string>
   <string name="register_name">注册名称</string>
   <string name="trying_to_register_name">正在尝试注册用户名</string>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
index 05e44323aedb3234014720203bfe205db6b21c7f..138fedd05d0705858d44a77dc12fc60ad601452f 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
@@ -26,6 +26,7 @@
   <string name="pref_startOnBoot_summary">系统启动时在后台运行 Jami。</string>
   <string name="pref_clearHistory_title">清除历史记录</string>
   <string name="pref_clearHistory_summary">清除所有会话历史记录。该操作无法撤销。</string>
+  <string name="pref_delete_account_title">删除账户</string>
   <string name="pref_persistNotification_title">后台运行</string>
   <string name="pref_persistNotification_summary">允许在后台运行以接收电话和消息。</string>
   <!--Plugin-->
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 c410ecd0c20dc1235a28dbb6cb7932fe42a7177f..260ec470b597464bd70425c106fe062453f3b82c 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
@@ -110,6 +110,7 @@
   <string name="share_via">分享經由</string>
   <string name="write_a_message">寫訊息</string>
   <string name="scan_qr">掃描 QR Code</string>
+  <string name="qr_code">QR Code</string>
   <string name="ab_action_flipcamera">翻轉攝影機</string>
   <string name="ab_action_hidepreview">隱藏預覽</string>
   <!--Text messages-->
@@ -191,6 +192,13 @@
   <string name="open_the_gallery">開啟相簿</string>
   <string name="take_a_photo">照相</string>
   <string name="profile_name_hint">輸入您的名字</string>
+  <string name="registered_name">已註冊的名稱</string>
+  <string name="no_registered_name">未註冊名稱</string>
+  <string name="identity">身份</string>
+  <string name="account">帳號</string>
+  <string name="link_new_device">連結新裝置</string>
+  <string name="devices">已連結的裝置</string>
+  <string name="total_devices">總裝置:</string>
   <!--Share fragment-->
   <string name="share_message">使用 Jami 掃描此條碼</string>
   <string name="share_message_no_account">請選取要分享的帳號。</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
index 2ce747a23377174f8d9fce8ce09ef17b15e04278..87f9e2447300f4c69372e36084028cc1a1186843 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
@@ -46,6 +46,7 @@
   <string name="account_device_revocation_error_unknown">未知的錯誤。</string>
   <string name="account_password_change">變更密碼</string>
   <string name="account_password_set">設定密碼</string>
+  <string name="account_password_summary">管理您的帳號密碼。</string>
   <string name="account_password_change_wait_message">正在變更帳號密碼</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">一般</string>
@@ -100,6 +101,7 @@
   <string name="account_proxy_enable_label">使用 DHT 代理伺服器</string>
   <string name="account_proxy_server_label">DHT 代理伺服器位置</string>
   <string name="account_proxy_server_list_label">DHT 代理伺服器清單 URL</string>
+  <string name="account_sip_proxy_label">代理服務器</string>
   <string name="account_peer_discovery_label">區域夥伴探索</string>
   <string name="account_peer_discovery_enable_label">啟用區域夥伴探索</string>
   <string name="account_peer_discovery_enable_summary">連線到我們的區域網路上發佈的其他 DHT 節點</string>
@@ -137,6 +139,7 @@
   <string name="export_account_wait_title">請等待...</string>
   <string name="export_account_wait_message">正在匯出帳號資訊</string>
   <string name="account_export_file">備份帳號</string>
+  <string name="account_export_file_summary">將您的帳號備份到裝置上以便稍後復原。</string>
   <string name="account_export_end_decryption_message">無法使用您提供的密碼來解鎖您的帳號。</string>
   <string name="account_export_end_network_title">網路錯誤</string>
   <string name="account_export_end_network_message">無法在網路上匯出帳號。檢查您的連線。</string>
@@ -172,6 +175,8 @@
   <string name="account_link_prompt_pin">輸入 PIN 碼</string>
   <string name="account_new_button">建立 Jami 帳號</string>
   <string name="account_link_export_button">連結新裝置</string>
+  <string name="account_link_show_button">顯示 %d 個已連結的裝置</string>
+  <string name="account_link_hide_button">隱藏已連結的裝置</string>
   <string name="account_link_export_info">要在其他裝置上使用這個帳號,您必須先在 Jami 上揭露它。這將會生成一個您必須在新裝置上輸入以設定帳號的 PIN 碼。PIN 碼在 10 分鐘內有效。</string>
   <string name="account_start_export_button">生成 PIN 碼</string>
   <string name="account_end_export_button">關閉</string>
@@ -186,7 +191,7 @@
   <string name="account_connect_prompt_username">使用者名稱</string>
   <!--Name registration-->
   <string name="error_username_empty">輸入使用者名稱</string>
-  <string name="no_registered_name_for_account">找不到這個帳號已註冊的名稱</string>
+  <string name="no_registered_name_for_account">無已註冊的名稱</string>
   <string name="username_available">使用者名稱可用!</string>
   <string name="register_name">註冊名稱</string>
   <string name="trying_to_register_name">正在嘗試註冊名稱</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index 527e54a0411b272a1935ac4cf9bf3e392363615b..094ab7ffaf2b9f6a55cd30998478de63c0183a4a 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -26,6 +26,10 @@
   <string name="pref_startOnBoot_summary">開機時在背景啟動 Jami</string>
   <string name="pref_clearHistory_title">清除記錄</string>
   <string name="pref_clearHistory_summary">清除所有對話歷史。此動作無法復原。</string>
+  <string name="pref_blackList_title">封鎖清單</string>
+  <string name="pref_blackList_summary">檢查您的封鎖清單。</string>
+  <string name="pref_delete_account_title">刪除帳號</string>
+  <string name="pref_delete_account_summary">從此裝置刪除您的帳號</string>
   <string name="pref_persistNotification_title">在背景執行</string>
   <string name="pref_persistNotification_summary">允許在背景中執行以接收通話與訊息。</string>
   <!--Plugin-->
diff --git a/ring-android/app/src/main/res/values-zh/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index 8927400cfc537d43baf29cc453f94beb761cf4f5..142bcc56131071b253be62a9a8456ef958c9d811 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -31,6 +31,7 @@
   <string name="wizard_next">下一步</string>
   <!--Account Summary-->
   <string name="profile">個人檔案</string>
+  <string name="account">帳號</string>
   <!--Share fragment-->
   <string name="share_label">分享</string>
   <!--Pending contact requests-->
diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/ring-android/app/src/main/res/values-zh/strings_account.xml
index 039c361e88aba53a5ba14baa91048873d15c2c23..7d57148d34f8eb47da4b67afb525df0d4384b343 100644
--- a/ring-android/app/src/main/res/values-zh/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_account.xml
@@ -30,6 +30,7 @@
   <string name="account_preferences_advanced_tab">進階</string>
   <string name="account_turn_enable_label">使用</string>
   <string name="account_published_address_label">公開發佈地址</string>
+  <string name="account_sip_proxy_label">代理</string>
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">安全</string>