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 05782b4f746d0e4a8ca28cb8815429ea356d749b..78bda5ef212ec7dc9f622f7e46cda8f4c460ab66 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
@@ -126,7 +126,6 @@
   <string name="account_no_network_title">لا يستطيع الاتصال بالشبكة</string>
   <string name="account_link_prompt_pin">أدخِل رمز الأمان</string>
   <string name="account_new_button">كوّن حساب جامي</string>
-  <string name="account_link_export_button">اربط جهازاً آخر مع هذا الحساب</string>
   <string name="account_connect_prompt_username">اسم المستخدم</string>
   <!--Name registration-->
   <string name="register_username">سجل اسم المستخدم العام</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 5cea5a6694e9b7c15b33f268f7c3af6575ab4526..99d4556e3e205909c6bdab761877cc556697c474 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
@@ -126,7 +126,6 @@
   <string name="account_sip_register_anyway">Регистриране въпреки това</string>
   <string name="account_link_prompt_pin">Въведете ПИН</string>
   <string name="account_new_button">Създаване на профил в Jami</string>
-  <string name="account_link_export_button">Свързване на друго устройство с този акаунт</string>
   <string name="account_start_export_button">Генериране на PIN код</string>
   <string name="account_end_export_button">затваряне</string>
   <string name="account_export_title">Добавяне на устройства</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 502fa3b5d2bd89af92f0b43e0782f99f7888dced..104c4f083873f26b60c858a0286a73079a1aa108 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
@@ -162,7 +162,6 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="account_link_archive_button">Connecta des d\'una còpia de seguretat</string>
   <string name="account_link_prompt_pin">Introdueix PIN</string>
   <string name="account_new_button">Crear un compte Jami</string>
-  <string name="account_link_export_button">Vincula un altre dispositiu a aquest compte</string>
   <string name="account_link_export_info">Per a utilitzar aquest compte en altres dispositius, primer ha d\'exposar-lo a Jami. Això generarà un codi PIN que ha d\'inserir en el nou dispositiu per configurar el compte. El PIN té una validesa de 10 minuts.</string>
   <string name="account_start_export_button">Genera el PIN</string>
   <string name="account_end_export_button">tanca</string>
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 34f95a011a7eb5f5ba2b9faa2649d46b6cf75716..6178fa772ff4af2e5648587351ab0e841c1d1846 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
@@ -189,6 +189,7 @@
   <string name="wizard_skip">Přeskočit</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Název profilu</string>
   <string name="profile_message_warning">Váš profil je sdílen jen s vašimi kontakty</string>
   <string name="open_the_gallery">Otevřít galerii</string>
   <string name="take_a_photo">Pořídit fotku</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 906ca8e634fc30af339e363f92097b7b832cdc30..eb7bd6d79ca825b8ee46bc35ee498ce4046a87a2 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
@@ -134,6 +134,7 @@ Svůj účet můžete upravit později</string>
   <string name="error_passwords_not_equals">Hesla se neshodují</string>
   <string name="export_account_wait_title">Počkejte prosím…</string>
   <string name="export_account_wait_message">Exportují se údaje o účtu</string>
+  <string name="account_export_file">Zálohovat účet</string>
   <string name="account_export_end_decryption_message">Zadaným heslem nebylo možné váš účet odemknout.</string>
   <string name="account_export_end_network_title">Chyba sítě</string>
   <string name="account_export_end_network_message">Nebylo možné exportovat účet do sítě. Zkontrolujte si připojení.</string>
@@ -170,7 +171,7 @@ Prověřte, prosím, své heslo.</string>
   <string name="account_link_archive_button">Připojit ze zálohy</string>
   <string name="account_link_prompt_pin">Zadejte PIN</string>
   <string name="account_new_button">Vytvořit účet Jami</string>
-  <string name="account_link_export_button">Připojit k tomuto účtu další zařízení</string>
+  <string name="account_link_export_button">Připojit nové zařízení</string>
   <string name="account_link_export_info">Pro použití tohoto účtu na dalších zařízeních jej musíte nejdříve vystavit na Jami. Tím se vytvoří kód PIN, který musíte zadat na novém zařízení, kde nastavujete účet. PIN zůstává platný 10 minut.</string>
   <string name="account_start_export_button">Vytvořit PIN</string>
   <string name="account_end_export_button">zavřít</string>
@@ -187,6 +188,7 @@ Prověřte, prosím, své heslo.</string>
   <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>
   <string name="registered_username">Registrované uživatelské jméno</string>
   <string name="register_username">Zaregistrovat veřejné uživatelské jméno</string>
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 18a70604318a2f42e09b4202d7cc60f7c29f6d22..ff2eafdee139643aae3e19eea4c5991bb7d149f1 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
@@ -131,7 +131,7 @@ Du kan rette din konto senere</string>
   <string name="account_sip_success_message">Din SIP-konto blev registreret korrekt.</string>
   <string name="account_sip_register_anyway">Registrer alligevel</string>
   <string name="account_link_prompt_pin">Indtast PIN-kode</string>
-  <string name="account_link_export_button">Tilknyt en anden enhed til denne konto</string>
+  <string name="account_link_export_button">Tilknyt en ny enhed</string>
   <string name="account_start_export_button">Generer PIN</string>
   <string name="account_end_export_button">luk</string>
   <string name="account_export_title">Tilføj enheder</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 7df89e36a363506bcd99444beb9f7f6dab40d28c..1593f81d7b9985a4a98fb963349908f3f18a4d07 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
@@ -113,7 +113,6 @@ Sie können Ihr Konto später ändern.</string>
   <string name="account_sip_success_title">SIP-Konto registriert</string>
   <string name="account_link_prompt_pin">PIN eingeben</string>
   <string name="account_new_button">Jami-Konto erstellen</string>
-  <string name="account_link_export_button">Ein anderes Gerät mit diesem Konto verknüpfen</string>
   <string name="account_link_export_info">Um dieses Konto auf anderen Geräten zu verwenden, müssen Sie es zuerst auf Jami veröffentlichen. Dadurch wird ein PIN-Code erzeugt, den Sie auf dem neuen Gerät bei der Einrichtung des Kontos eingeben müssen. Diese PIN ist für 10 Minuten gültig.</string>
   <string name="account_start_export_button">PIN generieren</string>
   <string name="account_end_export_infos">Ihre PIN ist:\n\n%%\n\nUm diesen Vorgang abzuschließen, müssen Sie Jami auf dem neuen Gerät starten. Erzeugen Sie ein neues Konto mittels \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist für 10 Minuten gültig.</string>
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 2c5a8a556b91bdff734428468ca2eab61678014b..153ec80012431e8077ce533ccaa52dbc23279c44 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -187,6 +187,7 @@
   <string name="wizard_skip">Überspringen</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Name des Profils</string>
   <string name="profile_message_warning">Dein Profil wird nur mit deinen Kontakten geteilt</string>
   <string name="open_the_gallery">Galerie öffnen</string>
   <string name="take_a_photo">Foto machen</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 cf90540dce5482302fb0401dd08b9cbce4fc26ee..b060cc3a669397152ea04ee0254c2107d348a30c 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
@@ -45,6 +45,7 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_device_revocation_unknown_device">Unbekanntes Gerät.</string>
   <string name="account_device_revocation_error_unknown">Unbekannter Fehler.</string>
   <string name="account_password_change">Passwort ändern</string>
+  <string name="account_password_set">Passwort festlegen</string>
   <string name="account_password_change_wait_message">Kontopasswort ändern</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Allgemein</string>
@@ -57,6 +58,8 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_optionnal_category">Weitere Einstellungen</string>
   <string name="account_useragent_label">User Agent</string>
   <string name="account_autoanswer_label">Automatisch antworten</string>
+  <string name="account_rendezvous_label">Rendezvous-Modus</string>
+  <string name="account_rendezvous_summary">Im Rendezvous-Modus werden eingehende Anrufe einem Konferenzraum hinzugefügt.</string>
   <string name="account_upnp_label"> UPnP aktivieren</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
@@ -133,6 +136,7 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="error_passwords_not_equals">Die Passwörter stimmen nicht überein</string>
   <string name="export_account_wait_title">Bitte warten…</string>
   <string name="export_account_wait_message">Kontodaten werden exportiert</string>
+  <string name="account_export_file">Backup Konto</string>
   <string name="account_export_end_decryption_message">Ihr Konto konnte mit dem angegebenen Passwort nicht entsperrt werden</string>
   <string name="account_export_end_network_title">Netzwerkfehler</string>
   <string name="account_export_end_network_message">Das Konto konnte nicht in das Netzwerk exportiert werden. Überprüfen sie ihre Verbindung.</string>
@@ -167,7 +171,7 @@ Sie können ihr Konto später bearbeiten</string>
   <string name="account_link_archive_button">Verbindung vom Backup</string>
   <string name="account_link_prompt_pin">PIN eingeben</string>
   <string name="account_new_button">Ein Jami-Konto erstellen</string>
-  <string name="account_link_export_button">Weiteres Gerät mit diesem Konto verknüpfen</string>
+  <string name="account_link_export_button">Verbinde ein neues Gerät</string>
   <string name="account_link_export_info">Um dieses Konto auf weiteren Geräten zu verwenden, müssen Sie zuerst eine PIN generieren. Diese muss auf dem neuen Gerät eingeben werden, um das Konto zu importieren. Die PIN ist für 10 Minuten gültig.</string>
   <string name="account_start_export_button">PIN generieren</string>
   <string name="account_end_export_button">Schließen</string>
@@ -184,6 +188,7 @@ Sie können ihr Konto später bearbeiten</string>
   <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>
   <string name="registered_username">Benutzername wurde registriert</string>
   <string name="register_username">Öffentlichen Benutzernamen registrieren</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 e581ecbe87d225b68698bce8059195a17073ec62..75238a3181609f8e2ff27cb1166346900d69b626 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
@@ -54,7 +54,6 @@
   <string name="account_export_end_error_title">Σφάλμα</string>
   <string name="account_enter_password">Εισάγετε τον κωδικό πρόσβασης</string>
   <string name="account_link_prompt_pin">Εισάγετε PIN</string>
-  <string name="account_link_export_button">Σύνδεση μιας άλλης συσκευής σε αυτόν το λογαριασμό</string>
   <string name="account_connect_prompt_username">Όνομα χρήστη</string>
   <!--Name registration-->
   <string name="register_username">Καταχώρηση δημόσιου ονόματος χρήστη</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 0a0eb9a9d9c89a82bc448b4eed1e9a60ca9ce62f..d9175ac169e05099f206539df19ddb987ce294f2 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
@@ -165,7 +165,7 @@ Podrá editar su cuenta más tarde.</string>
   <string name="account_link_archive_button">Conectarse desde una copia de seguridad</string>
   <string name="account_link_prompt_pin">Introducir PIN</string>
   <string name="account_new_button">Crear una cuenta de Jami</string>
-  <string name="account_link_export_button">Vincular otro dispositivo a esta cuenta</string>
+  <string name="account_link_export_button">Vincular un nuevo dispositivo</string>
   <string name="account_link_export_info">Para usar esta cuenta en otros dispositivos, primero debés exponerla en Jami. Esto generará un código PIN que deberás introducir en el nuevo dispositivo para configurar la cuenta. El PIN será válido durante 10 minutos.</string>
   <string name="account_start_export_button">Generar PIN</string>
   <string name="account_end_export_button">Cerrar</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 62698f9d78610a212f1f89716b174bdecfd4c51a..cc5c19c093b03bfdde857365c2c96298a6f551b3 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
@@ -167,7 +167,7 @@ Puedes editar tu cuenta luego</string>
   <string name="account_link_archive_button">Conectar desde copia de seguridad</string>
   <string name="account_link_prompt_pin">Ingresa tu PIN</string>
   <string name="account_new_button">Crear una cuenta en Jami</string>
-  <string name="account_link_export_button">Conectar otro dispositivo a esta cuenta</string>
+  <string name="account_link_export_button">Vincular un nuevo dispositivo</string>
   <string name="account_link_export_info">Para usar esta cuenta en otros dispositivos, primero debe exponerla en Jami. Esto generará un código PIN que debe introducir en el nuevo dispositivo para configurar la cuenta. El PIN es valido por 10 minutos.</string>
   <string name="account_start_export_button">Generar PIN</string>
   <string name="account_end_export_button">cerrar</string>
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 d19bb37560708abcb9ae8779ec1c2bbc8bd73d61..5928c7dd15252c866e83e0e3f8ce52e3d0736a19 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
@@ -167,7 +167,7 @@
   <string name="account_link_archive_button">اتصال از طریق پشتیبان</string>
   <string name="account_link_prompt_pin">پین را وارد کنید</string>
   <string name="account_new_button">ایجاد یک حساب جمی</string>
-  <string name="account_link_export_button">پیوند دستگاهی دیگر به این حساب</string>
+  <string name="account_link_export_button">پیوند یک دستگاه جدید</string>
   <string name="account_link_export_info">برای استفاده از این حساب روی دستگاه‌های دیگر، باید ابتدا آن را روی جمی آشکار کنید. این کار یک کد پین تولید خواهد کرد که باید برای برپایی حساب، روی دستگاه جدید وارد کنید. این پین تا 10 دقیقه معتبر است.</string>
   <string name="account_start_export_button">تولید پین</string>
   <string name="account_end_export_button">بستن</string>
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 9e20fb6aea592824a567bea64a31dff0286aacc4..c947cbf1d73e2dd44055eb1d1502253b0f920b9c 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -87,6 +87,8 @@
   <!--Call Fragment-->
   <string name="you_txt_prefix">Sinä:</string>
   <string name="action_call_hangup">Katkaise puhelu</string>
+  <string name="action_call_maximize">Suurenna</string>
+  <string name="action_call_minimize">Vähentää</string>
   <string name="ongoing_call">Tämänhetkinen puhelu</string>
   <string name="hist_in_call">Saapuva puhelu %1$s</string>
   <string name="hist_out_call">Lähtevä puhelu %1$s</string>
@@ -185,6 +187,7 @@
   <string name="wizard_skip">Ohita</string>
   <!--Account Summary-->
   <string name="profile">Profiili</string>
+  <string name="profile_name">Profiilin nimi</string>
   <string name="profile_message_warning">Profiilisi jaetaan vain yhteystietojesi kanssa</string>
   <string name="open_the_gallery">Avaa valokuvat</string>
   <string name="take_a_photo">Ota valokuva</string>
@@ -288,4 +291,5 @@
   <string name="wizard_profile_info">Profiili jaetaan vain yhteystietojen kanssa</string>
   <string name="wizard_profile_button">Tallenna profiili</string>
   <string name="wizard_profile_skip">Ohita ja tee tämä myöhemmin</string>
+  <string name="fab_path_choose">Valitse toinen tiedosto</string>
 </resources>
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 7aadc87f9dbe173c19cc08d8987b67c3a018e4d5..2fe477a5fa6ddfe291e70521c7d3aa00ab6f9dea 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
@@ -56,6 +56,8 @@
   <string name="account_optionnal_category">Valinnaiset asetukset</string>
   <string name="account_useragent_label">Käyttäjän edustaja</string>
   <string name="account_autoanswer_label">Automaattinen vastaus</string>
+  <string name="account_rendezvous_label">Kohtaamistila</string>
+  <string name="account_rendezvous_summary">Kohtaamistilassa saapuvat puhelut lisätään kokoushuoneeseen.</string>
   <string name="account_upnp_label">UPnP päälle</string>
   <string name="account_proxy_field">Välityspalvelin</string>
   <!--Audio Details-->
@@ -132,6 +134,7 @@
   <string name="error_passwords_not_equals">Salasanat eivät täsmää</string>
   <string name="export_account_wait_title">Odota hetki...</string>
   <string name="export_account_wait_message">Tilitietojen vieminen</string>
+  <string name="account_export_file">Varmuuskopioi tili</string>
   <string name="account_export_end_decryption_message">Tiliäsi ei voitu avata toimitetulla salasanalla.</string>
   <string name="account_export_end_network_title">Verkkovirhe</string>
   <string name="account_export_end_network_message">Tunnusta ei voitu viedä verkkoon. Tarkista yhteys.</string>
@@ -166,7 +169,7 @@
   <string name="account_link_archive_button">Yhteyden muodostaminen varmuuskopiosta</string>
   <string name="account_link_prompt_pin">Syötä PIN-koodi</string>
   <string name="account_new_button">Luo Jami-tili</string>
-  <string name="account_link_export_button">Linkitä toinen laite tähän tiliin</string>
+  <string name="account_link_export_button">Linkitä uusi laite</string>
   <string name="account_link_export_info">Jos haluat käyttää tätä tiliä muissa laitteissa, sinun on ensin siirrettävä se Jamiin. Tämä luo PIN-koodin, joka on syötetään uuteen laitteeseen tilin määrittämiseksi. PIN-koodi on voimassa 10 minuuttia.</string>
   <string name="account_start_export_button">Luo PIN-koodi</string>
   <string name="account_end_export_button">sulje</string>
@@ -183,6 +186,7 @@
   <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>
   <string name="registered_username">Rekisteröity käyttäjänimi</string>
   <string name="register_username">Rekisteröi julkinen käyttäjänimi</string>
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 9c949a2d769fb23f433b4658fa9bc12e682158f0..b4bcd3f61bd196573de53c477ce47249b84bdd66 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
@@ -41,4 +41,5 @@
   <string name="plugin_recent_version_exception">Sinulla on uudempi versio: <b>%1$s</b></string>
   <string name="plugin_same_version_exception">Sinulla on sama versio <b>%1$s</b> asennettuna</string>
   <string name="plugin_force_install">pakota \n asennus</string>
+  <string name="plugin_path_image_add">Lisää uusi kuva</string>
 </resources>
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 fce372107ce3b051d9f27940f8c9923aaac8c63f..db850726384eef91cc9ac33f62f5fbae5080950f 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
@@ -14,6 +14,8 @@
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
+  <string name="notif_incoming_call">Appel entrant</string>
+  <string name="notif_outgoing_call">Appel sortant</string>
   <!--Call Fragment-->
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
   <string name="hist_contact_added">Contact ajouté</string>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml b/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml
index 4b7f5c0a75da8a8acbadc2423e648438a9133d44..fb76349beb0cd0de3574d50d8116d60ae5d2d125 100644
--- a/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings_account.xml
@@ -30,9 +30,11 @@
   <!--restore/backup-->
   <string name="account_enter_password">Entrez votre mot de passe</string>
   <string name="account_new_button">Créer un compte Jami</string>
+  <string name="account_link_export_button">Associer un nouvel appareil</string>
   <!--Name registration-->
   <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
+  <string name="account_status_connecting">En cours de connexion</string>
   <string name="account_status_unknown">Inconnu</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml b/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml
index 90ff94ec507ddbe3a5e1c1c83a75f943c42274f5..a7bc5d79fe766f2b9507bda8feee223199bf1d42 100644
--- a/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings_call.xml
@@ -20,6 +20,11 @@ along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_searching">Recherche en cours</string>
+    <string name="call_human_state_incoming">Appel entrant</string>
+    <string name="call_human_state_connecting">En cours de connexion</string>
     <string name="call_human_state_failure">Échec</string>
+    <string name="call_human_state_hold">Mettre en attente</string>
     <!-- Conferences -->
 </resources>
\ No newline at end of file
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 802592b30c78531a365894c906bc76161644a593..e4ae3d951a8e1ad4cbebea18d2cc3692fd34dfec 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
@@ -128,7 +128,7 @@ Vous pourrez modifier votre compte plus tard.</string>
   <string name="account_sip_register_anyway">S\'inscrire de toute façon</string>
   <string name="account_link_prompt_pin">Entrer le NIP</string>
   <string name="account_new_button">Créer un compte Jami</string>
-  <string name="account_link_export_button">Associer un autre appareil à ce compte</string>
+  <string name="account_link_export_button">Associer un nouvel appareil</string>
   <string name="account_start_export_button">Générer le NIP</string>
   <string name="account_end_export_button">fermer</string>
   <string name="account_export_title">ajouter un périphérique </string>
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 fce372107ce3b051d9f27940f8c9923aaac8c63f..db850726384eef91cc9ac33f62f5fbae5080950f 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
@@ -14,6 +14,8 @@
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
+  <string name="notif_incoming_call">Appel entrant</string>
+  <string name="notif_outgoing_call">Appel sortant</string>
   <!--Call Fragment-->
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
   <string name="hist_contact_added">Contact ajouté</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml b/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml
index 4b7f5c0a75da8a8acbadc2423e648438a9133d44..fd33561b50d1c04e9b31c9084da9fa2a7295c68c 100644
--- a/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings_account.xml
@@ -30,6 +30,7 @@
   <!--restore/backup-->
   <string name="account_enter_password">Entrez votre mot de passe</string>
   <string name="account_new_button">Créer un compte Jami</string>
+  <string name="account_link_export_button">Associer un nouvel appareil</string>
   <!--Name registration-->
   <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml b/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml
index 90ff94ec507ddbe3a5e1c1c83a75f943c42274f5..22c27e62d24102e1aacd5656d3ce850be2ef6b36 100644
--- a/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings_call.xml
@@ -20,6 +20,11 @@ along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_searching">Recherche en cours</string>
+    <string name="call_human_state_incoming">Appel entrant</string>
+    <string name="call_human_state_current">Appel en cours</string>
     <string name="call_human_state_failure">Échec</string>
+    <string name="call_human_state_hold">Mettre en attente</string>
     <!-- Conferences -->
 </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
index 0e04e885a34f0afcd04cd88f6a7eb29c75f55760..0ad45e4be28fa854046dd710ae1989a6983c72c2 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
@@ -55,12 +55,13 @@
   <string name="account_enter_password">Entrez votre mot de passe</string>
   <string name="account_link_prompt_pin">Saisissez le code PIN</string>
   <string name="account_new_button">Créer un compte Jami</string>
-  <string name="account_link_export_button">Connecter un autre appareil à ce compte</string>
+  <string name="account_link_export_button">Associer un nouvel appareil</string>
   <string name="account_connect_prompt_username">nom d\'utilisateur</string>
   <!--Name registration-->
   <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
   <string name="register_recommended">Recommandé</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
+  <string name="account_status_connecting">En cours de connexion</string>
   <string name="account_status_unknown">Inconnu</string>
   <string name="account_status_error">Erreur</string>
   <!--Create account-->
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
index afb212142bfc3a177fe6e5be60538dddcce6ff89..4a17c620024a7529afb78a77bf8cfa7cb2d5b4dd 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_call.xml
@@ -20,6 +20,12 @@ along with this program; if not, write to the Free Software
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- SipCalls -->
+    <string name="call_human_state_searching">Recherche en cours</string>
+    <string name="call_human_state_incoming">Appel entrant</string>
+    <string name="call_human_state_connecting">En cours de connexion</string>
+    <string name="call_human_state_ringing">Sonnerie en cours</string>
+    <string name="call_human_state_current">Appel en cours</string>
     <string name="call_human_state_hungup">Terminé</string>
     <string name="call_human_state_failure">Échec</string>
     <string name="call_human_state_hold">Patientez</string>
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 30b7a5433922ac237e005a54a6f46209c04c866e..570486d6e134cf94f55d5330ad7c0300996e0bea 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -187,6 +187,7 @@
   <string name="wizard_skip">Passez</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Nom de profile</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>
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 05fa6d2e4e5d5173a74d331a21ffd09e11d98b45..77dfd3dddec9b3d20adc9f45a77ad06a0c50594d 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
@@ -58,6 +58,8 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_optionnal_category">Réglages optionnels</string>
   <string name="account_useragent_label">User-agent</string>
   <string name="account_autoanswer_label">Décrochage automatique</string>
+  <string name="account_rendezvous_label">Mode rendez-vous</string>
+  <string name="account_rendezvous_summary">Avec le point de rendez-vous, les appels entrants sont rajoutés à un salon de conférence</string>
   <string name="account_upnp_label">Activer UPnP</string>
   <string name="account_proxy_field">Serveur mandataire</string>
   <!--Audio Details-->
@@ -136,6 +138,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="error_passwords_not_equals">Les mots de passe ne sont pas identiques</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_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>
@@ -170,7 +173,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_link_archive_button">Se Connecter à partir d\'une sauvegarde</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">Lier un autre appareil à ce compte</string>
+  <string name="account_link_export_button">Associer un nouvel appareil</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>
@@ -187,6 +190,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <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="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>
   <string name="registered_username">Nom d\'utilisateur enregistré</string>
   <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
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 1cfbf6b4f4cd1613d75cc1e39c86e2aa80b8a0da..779b2fd4d0a562d6ed6f1fdb6e1a4e29353062f5 100644
--- a/ring-android/app/src/main/res/values-gl/strings.xml
+++ b/ring-android/app/src/main/res/values-gl/strings.xml
@@ -31,6 +31,7 @@
   <string name="menu_item_accounts">Xestionar contas</string>
   <string name="menu_item_account">Xestionar conta</string>
   <string name="menu_item_settings">Axustes</string>
+  <string name="menu_item_plugin_list">Axustes dos plugins</string>
   <string name="menu_item_share">Compartir o meu contacto</string>
   <string name="menu_item_about">Acerca de Jami</string>
   <!--Dialing Fragment-->
@@ -82,17 +83,23 @@
   <string name="notif_location_action_stop">Deixar de compartir localización</string>
   <string name="location_share_action_start">Comezar a compartir</string>
   <string name="location_share_action_stop">Deixar de compartir</string>
+  <string name="location_share_about_title">Información do mapa</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Ti:</string>
   <string name="action_call_hangup">Colgar</string>
+  <string name="action_call_maximize">Maximizar</string>
+  <string name="action_call_minimize">Reducir</string>
   <string name="ongoing_call">Chamada en curso</string>
   <string name="hist_in_call">Chamada de %1$s</string>
   <string name="hist_out_call">Chamada a %1$s</string>
   <string name="start_error_title">Jami non pode iniciarse!</string>
   <string name="start_error_mic_required">Jami precisa permiso de acceso ao micrófono para funcionar:</string>
   <string name="action_call_accept">Responder a chamada</string>
+  <string name="action_call_hold_accept">Manter e atender chamada</string>
+  <string name="action_call_end_accept">Rematar e atender chamada</string>
   <string name="action_call_decline">Rexeitar</string>
   <string name="action_call_mic_mute">Apagar micrófono</string>
+  <string name="action_load_plugin">Cargar plugin</string>
   <string name="ab_action_speakerphone">Activar altofalante</string>
   <string name="ab_action_contact_add">Engadir a contactos</string>
   <string name="ab_action_contact_add_question">Engadir a contactos?</string>
@@ -172,15 +179,19 @@
   <string name="prompt_new_username">Escribir novo nome de usuaria</string>
   <string name="prompt_hint_username">Nome de usuaria</string>
   <string name="help_password_choose">Escolle un contrasinal forte e gárdao para protexer a túa conta Jami.</string>
+  <string name="help_password_enter">Escribe o contrasinal da conta Jami</string>
+  <string name="help_server_enter">Escribe o URL do servidor de xestión.</string>
   <string name="help_pin_enter">Escribe o PIN desde a outra conta Jami configurada. Utiliza o apartado \"Exportar conta Jami\" para obter o PIN.</string>
   <string name="wizard_next">Seguinte</string>
   <string name="wizard_back">Atrás</string>
   <string name="wizard_skip">Saltar</string>
   <!--Account Summary-->
   <string name="profile">Perfil</string>
+  <string name="profile_name">Nome do perfil</string>
   <string name="profile_message_warning">O teu perfil só se comparte cos teus contactos</string>
   <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>
   <!--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>
@@ -196,6 +207,7 @@
   <string name="contact_request_title">Nova solicitude de contacto</string>
   <string name="contact_request_msg">Tes %1$s solicitudes de contacto</string>
   <string name="contact_request_account">Para %1$s</string>
+  <string name="no_requests">Non tes solicitudes de contacto</string>
   <string name="message_contact_not_trusted_yet">%s non está nos teus contactos.\nQueres aceptar ou rexeitar esta solicitude de contacto?</string>
   <string name="message_contact_not_trusted">%s non está nos teus contactos.\nEngadir un novo contacto?</string>
   <!--Send contact requests-->
@@ -203,8 +215,10 @@
   <string name="send_request_title">Enviar solicitude de contacto</string>
   <string name="send_request_msg">Tes que enviar unha solicitude de contacto para comunicarte con esta usuaria. Mentras o contacto non acepte a solicitude poderás enviar mensaxes pero o contacto non poderá responder.</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">Sen contactos bloqueados</string>
   <!--Smartlist-->
   <string name="no_contact_request">Non se enviaron solicitudes de contacto</string>
+  <string name="conversation_placeholder">Aínda non tes conversas</string>
   <string name="contact_request_sent">Solicitude de contacto enviada</string>
   <string name="start_conversation">Comezar conversa</string>
   <string name="search_results">Resultados da busca</string>
@@ -262,5 +276,20 @@
   <string name="tv_send_video">Enviar multimedia</string>
   <string name="conversation_input_speech_hint">Dí algo...</string>
   <!--Wizard-->
+  <string name="wizard_status_recommended">Recomendado</string>
+  <string name="wizard_status_optional">Opcional</string>
+  <string name="wizard_status_required">Requerido</string>
+  <string name="wizard_username_info">Escolle un nome de usuaria para a conta</string>
+  <string name="wizard_username_button">Escolle un Nome de Usuaria</string>
+  <string name="wizard_username_skip">Saltar establece nome de usuaria</string>
+  <string name="wizard_password_info">Contrasinal da conta</string>
+  <string name="wizard_password_placeholder">Escolle un contrasinal para cifrar a chave da conta neste dispositivo</string>
+  <string name="wizard_password_button">Escolle un contrasinal</string>
   <string name="wizard_password_skip">Crear conta</string>
+  <string name="wizard_password_switch">Cifra a conta cun contrasinal</string>
+  <string name="wizard_password_warning">Lembra que o contrasinal non pode ser recuperado</string>
+  <string name="wizard_profile_info">O perfil só se comparte cos contactos</string>
+  <string name="wizard_profile_button">Gardar perfil</string>
+  <string name="wizard_profile_skip">Saltar e facer esto máis tarde</string>
+  <string name="fab_path_choose">Escolle outro ficheiro</string>
 </resources>
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 dde64499ff02034d498cd6e3d302a97ff38c2773..51b638e9f8e29aa83fd58b52b927aea760e1ac02 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
@@ -36,6 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Non hai conta rexistrada</string>
   <string name="normal_accounts_titles">Contas</string>
+  <string name="normal_devices_titles">Dispositivos ligados</string>
   <string name="account_device_revoke">Revogar dispositivo</string>
   <string name="account_device_revocation_success_title">Feito</string>
   <string name="account_device_revocation_success">O dispositivo foi revogado!</string>
@@ -44,6 +45,7 @@
   <string name="account_device_revocation_unknown_device">Dispositivo descoñecido.</string>
   <string name="account_device_revocation_error_unknown">Erro descoñecido.</string>
   <string name="account_password_change">Cambiar contrasinal</string>
+  <string name="account_password_set">Establecer contrasinal</string>
   <string name="account_password_change_wait_message">Cambiando contrasinal da conta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Xeral</string>
@@ -80,6 +82,7 @@
   <string name="account_stun_enable_label">Utilizar Stun</string>
   <string name="account_stun_server_label">Servidor Stun</string>
   <string name="account_accept_files">Aceptar ficheiros entrantes automáticamente</string>
+  <string name="account_conversation_settings_title">Axustes da conversa</string>
   <string name="account_accept_files_max_size">Tamaño máximo para aceptar ficheiros de xeito automático</string>
   <string name="account_accept_files_never">Nunca aceptar de xeito automático</string>
   <string name="account_accept_files_always">Aceptar sempre de xeito automático</string>
@@ -105,6 +108,8 @@
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguridade</string>
   <string name="account_srtp_switch_label">Cifrar fluxos de medios(SRTP)</string>
+  <string name="account_srtp_enable_sdes">Activar SDES como protocolo de intercambio de chaves</string>
+  <string name="account_srtp_rtp_fallback">Se SRTP falla utilizar RTP</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Utilizar transporte TLS</string>
@@ -118,6 +123,7 @@
   <string name="account_tls_server_name_label">Nome de servidor</string>
   <string name="account_tls_verify_server_label">Verificar servidor</string>
   <string name="account_tls_verify_client_label">Verificar cliente</string>
+  <string name="account_require_client_certificate_label">TLS require Certificado Cliente</string>
   <string name="account_tls_negotiation_timeout_sec">Caducidade da negociación (seg)</string>
   <string name="account_rtp_max_port">Máximo</string>
   <string name="account_rtp_min_port">Mínimo</string>
@@ -128,6 +134,7 @@
   <string name="error_passwords_not_equals">Non concordan os contrasinais</string>
   <string name="export_account_wait_title">Agarda por favor...</string>
   <string name="export_account_wait_message">Exportando información da conta</string>
+  <string name="account_export_file">Copia de apoio da conta</string>
   <string name="account_export_end_decryption_message">Non se pode desbloquear a conta co contrasinal escrito.</string>
   <string name="account_export_end_network_title">Fallo na rede</string>
   <string name="account_export_end_network_message">Non se pode exportar a conta a rede. Comproba a conectividade.</string>
@@ -157,11 +164,11 @@
   <string name="account_sip_success_title">Conta SIP rexistrada.</string>
   <string name="account_sip_success_message">Rexistraches correctamente a conta SIP.</string>
   <string name="account_sip_register_anyway">Rexistrar igualmente</string>
+  <string name="account_link_device">Conectar desde outro dispositivo</string>
   <string name="account_link_button">Conectar desde a rede</string>
   <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 outro dispositivo a esta conta</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>
@@ -178,9 +185,11 @@
   <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>
   <string name="registered_username">Nome de usuaria rexistrado</string>
   <string name="register_username">Rexistrar o nome público de usuaria</string>
+  <string name="register_recommended">Recomendado</string>
   <string name="username_already_taken">Este nome de usuaria xa está collido</string>
   <string name="invalid_username">Nome de usuaria non válido</string>
   <string name="unknown_error">Erro descoñecido. Comproba a conexión a rede!</string>
diff --git a/ring-android/app/src/main/res/values-gl/strings_content_description.xml b/ring-android/app/src/main/res/values-gl/strings_content_description.xml
index 38226ab63faa6f045e92e326d0a61e8a44007304..d5624d5e4db18422e041f3cba5d9439709f90d8b 100644
--- a/ring-android/app/src/main/res/values-gl/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-gl/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Foto do contacto</string>
   <string name="dial_numeric_pad">Marcador numérico</string>
   <string name="contact_unblock">Desbloquear</string>
+  <string name="video_plugins">Plugins de vídeo</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 e0d194cb2c9065fbdc99b9ed3432f58f6b29826c..8599065d340de0e2cf4a2df4a1d870f1813aaa35 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
@@ -14,6 +14,10 @@
   <string name="pref_hd_summary">Activar vídeo HD</string>
   <string name="pref_hwEncode_title">Activar codificación acelerada</string>
   <string name="pref_hwEncode_summary">Característica experimental</string>
+  <string name="pref_videoBitrate_title">Bitrate do vídeo</string>
+  <string name="pref_videoBitrate_summary">Establecer bitrate por omisión (KB/s)</string>
+  <string name="pref_videoResolution_title">Resolución de vídeo</string>
+  <string name="pref_videoResolution_summary">Establecer a resolución por omisión</string>
   <string name="pref_systemContacts_title">Usar contactos do sistema</string>
   <string name="pref_systemContacts_summary">Usar contactos do sistema para mostrar detalles do contacto.</string>
   <string name="pref_systemDialer_title">Facer as chamadas dos sistema usando Jami</string>
@@ -25,4 +29,17 @@
   <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-->
+  <string name="pref_plugins_title">Plugins</string>
+  <string name="pref_plugins_summary">Activar plugins e establecer os seus parámetros</string>
+  <string name="fab_plugins_add">Engadir un novo plugin</string>
+  <string name="plugin_uninstall_title">Desinstalar plugin ?</string>
+  <string name="plugin_reset_preferences">Restablecer preferencias do plugin</string>
+  <string name="plugin_reset_preferences_summary">Restableceranse os axustes do plugin</string>
+  <string name="plugin_reset_preferences_ask">Desexas restablecer os axustes do plugin ?</string>
+  <string name="plugin_successfully_installed">Plugin <b>%1$s</b> instalado correctamente</string>
+  <string name="plugin_install_failure">Fallo ó instalar o plugin: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">Tes unha versión máis recente de: <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Tes a mesma versión de <b>%1$s</b> instalada</string>
+  <string name="plugin_force_install">forzar \n instalación</string>
+  <string name="plugin_path_image_add">Engadir nova imaxe</string>
 </resources>
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 46e4f15213dd308c77ae7ab6c739d956b61bd778..a1d599a6c27ff03aa45c7893cb8058257d238856 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -1,67 +1,87 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About-->
-  <string name="version_section">גרסא</string>
-  <string name="credits">תודות</string>
+  <string name="feedback_section">משוב</string>
+  <string name="section_license">רישיון</string>
+  <string name="version_section">גרסה</string>
+  <string name="credits">שבחים</string>
   <!--About dialog-->
   <!--RingActivity-->
-  <string name="error_no_network">אין חיבוריות רשת</string>
+  <string name="error_no_network">אין חיבור לרשת</string>
   <!--AB menus-->
   <!--Sections-->
-  <string name="menu_item_accounts">נהל חשבונות</string>
+  <string name="menu_item_accounts">ניהול חשבונות</string>
   <string name="menu_item_settings">הגדרות</string>
+  <string name="menu_item_about">על אודות Jami</string>
   <!--Dialing Fragment-->
   <!--History Fragment-->
   <!--DetailsHistory Fragment-->
   <!--Home Fragment-->
   <!--ContactList Fragment-->
-  <string name="choose_number">בחר מספר</string>
+  <string name="choose_number">נא לבחור מספר</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
-  <string name="notif_incoming_call">קריאה נכנסת</string>
-  <string name="notif_channel_calls">קריאות</string>
-  <string name="notif_group_calls">קריאות</string>
+  <string name="notif_incoming_call">שיחה נכנסת</string>
+  <string name="notif_outgoing_call">שיחה יוצאת</string>
+  <string name="notif_current_call">שיחה יוצאת</string>
+  <string name="notif_channel_calls">שיחות</string>
+  <string name="notif_group_calls">שיחות</string>
   <!--Call Fragment-->
-  <string name="you_txt_prefix">את(ה):</string>
-  <string name="action_call_hangup">   נתק</string>
+  <string name="you_txt_prefix">אני:</string>
+  <string name="action_call_hangup">   ניתוק</string>
+  <string name="ongoing_call">שיחה יוצאת</string>
+  <string name="hist_in_call">שיחה נכנסת מ%1$s</string>
+  <string name="hist_out_call">שיחה יוצאת אל %1$s</string>
+  <string name="ab_action_audio_call">שיחת שמע</string>
+  <string name="ab_action_video_call">שיחת וידאו</string>
   <!--Text messages-->
-  <string name="send_message">שלח הודעה</string>
-  <string name="message_failed">של</string>
+  <string name="send_message">שליחת הודעה</string>
+  <string name="message_failed">כשל</string>
+  <string name="send_file">שליחת קובץ</string>
   <!--MediaPreferenceFragment-->
   <!--Ringtone activity-->
   <string name="ringtone_error_title">שגיאה</string>
-  <string name="ringtone_custom_label">מותאם</string>
+  <string name="ringtone_error_size_too_big">הקובץ הזה גדול מדי. הגודל המרבי הוא %1$d ק״ב.</string>
+  <string name="ringtone_custom_label">התאמה אישית</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
   <!--Settings-->
   <!--Conversation-->
-  <string name="conversation_action_copy_peer_number">העתק מספר</string>
+  <string name="conversation_action_copy_peer_number">העתקת מספר</string>
   <!--Contacts-->
+  <string name="account_create_title">יצירת חשבון Jami</string>
   <string name="prompt_hint_username">שם משתמש</string>
   <string name="wizard_next">קדימה</string>
+  <string name="wizard_back">חזרה</string>
+  <string name="wizard_skip">דילוג</string>
   <!--Account Summary-->
   <string name="profile">פרופיל</string>
+  <string name="profile_name">שם הפרופיל</string>
   <!--Share fragment-->
+  <string name="share_label">שיתוף</string>
   <string name="generic_error_migration">שגיאה</string>
   <!--Pending contact requests-->
-  <string name="accept">קבל</string>
-  <string name="refuse">סרב</string>
-  <string name="block">חסום</string>
+  <string name="accept">לקבל</string>
+  <string name="refuse">לדחות</string>
+  <string name="block">חסימה</string>
   <!--Send contact requests-->
-  <string name="send_request_button">שלח</string>
+  <string name="send_request_button">שליחה</string>
   <!--Blacklist-->
   <!--Smartlist-->
   <string name="tv_contact_row_header">אנשי קשר</string>
   <!--File Transfer-->
-  <string name="menu_file_share">שתף קובץ</string>
-  <string name="menu_message_copy">העתק</string>
-  <string name="menu_delete">מחק</string>
+  <string name="invalid_file">קובץ לא חוקי</string>
+  <string name="menu_file_open">פתיחת קובץ</string>
+  <string name="menu_file_save">שמירת קובץ</string>
+  <string name="menu_file_share">שיתוף קובץ</string>
+  <string name="menu_message_copy">העתקה</string>
+  <string name="menu_delete">מחיקה</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">דיונים</string>
   <string name="navigation_item_account">חשבון</string>
   <!--TV-->
-  <string name="tv_dialog_send">שלח</string>
+  <string name="tv_dialog_send">שליחה</string>
   <!--Wizard-->
 </resources>
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 fa5b0435eaf432f15cad1be39eaa5916ac449459..2a7515497019b78ddbc7d1dad702255343342cdc 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
@@ -64,12 +64,16 @@
   <string name="account_rtp_min_port">נומינלי</string>
   <!--restore/backup-->
   <string name="account_export_end_error_title">שגיאה</string>
+  <string name="account_new_button">יצירת חשבון Jami</string>
   <string name="account_connect_prompt_username">שם משתמש</string>
   <!--Name registration-->
   <string name="account_status_connecting">מתחבר</string>
   <string name="account_status_unknown">לא מוכר</string>
   <string name="account_status_error">שגיאה</string>
   <!--Create account-->
+  <string name="account_creation_home">ברוך בואך אל Jami</string>
+  <string name="account_creation_profile">יצירת הפרופיל שלך</string>
   <!--Edit profile-->
+  <string name="account_edit_profile">עריכת הפרופיל שלך</string>
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index 0ed1b5341523c3df5de58ea4a388e64db14ba7ba..4a10ffa6fa91be3ce72053c70d1b24e2df7377ef 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -106,7 +106,7 @@
   <string name="hist_contact_added">Kapcsolat hozzáadva</string>
   <string name="hist_invitation_received">Meghívás megérkezett</string>
   <string name="ab_action_audio_call">Hanghívás</string>
-  <string name="ab_action_video_call">Videóhívás</string>
+  <string name="ab_action_video_call">Videohívás</string>
   <string name="ab_action_change_screen_orientation">Képernyő tájolásának megváltoztatása</string>
   <string name="share_via">Megosztás a következőn keresztül:</string>
   <string name="write_a_message">Üzenet írása</string>
@@ -187,6 +187,7 @@
   <string name="wizard_skip">Átugrani</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Profilnév</string>
   <string name="profile_message_warning">A profilja csak a kapcsolataival kerül megosztásra</string>
   <string name="open_the_gallery">Galéria megnyitása</string>
   <string name="take_a_photo">Fotó készítése</string>
@@ -207,8 +208,8 @@
   <string name="contact_request_msg">%1$s kapcsolatkérelme van</string>
   <string name="contact_request_account">Ehhez: %1$s</string>
   <string name="no_requests">Nincs kapcsolatfelvételi kérelem</string>
-  <string name="message_contact_not_trusted_yet">%smég nincs a kapcsolatban Önnel.\nAkkor elfogadja vagy elutasítja ezt a felkérést?</string>
-  <string name="message_contact_not_trusted">%snincs a kapcsolataiban.\nÚj kapcsolat hozzáadása?</string>
+  <string name="message_contact_not_trusted_yet">%s még nincs a kapcsolatban Önnel.\nAkkor elfogadja vagy elutasítja ezt a felkérést?</string>
+  <string name="message_contact_not_trusted">%s nincs a kapcsolataiban.\nÚj kapcsolat hozzáadása?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Elküld</string>
   <string name="send_request_title">Kapcsolatkérelem küldése</string>
@@ -231,10 +232,10 @@
   <string name="file_transfer_status_created">Átvitel előkészítése</string>
   <string name="file_transfer_status_unsupported">nem támogatott</string>
   <string name="file_transfer_status_wait_peer_acceptance">várakozó egyenrangú elfogadás</string>
-  <string name="file_transfer_status_wait_host_acceptance">várakozás a fogadó elfogadásra</string>
+  <string name="file_transfer_status_wait_host_acceptance">várakozó gazdagép elfogadása</string>
   <string name="file_transfer_status_ongoing">folyamatban lévő</string>
   <string name="file_transfer_status_finished">befejezett</string>
-  <string name="file_transfer_status_closed_by_host">bezárva a fogadóval</string>
+  <string name="file_transfer_status_closed_by_host">gazdagép bezárta</string>
   <string name="file_transfer_status_closed_by_peer">bezárva a egyenrangúról</string>
   <string name="file_transfer_status_invalid_pathname">érvénytelen elérési útvonala</string>
   <string name="file_transfer_status_unjoinable_peer">egyenrangú nem csatlakoztatható</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 577fd1a29435cc7d4da0ab23d60fa8f280fe892f..f6c5fbb4217da7461fdef8c3888458cf28008502 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
@@ -58,6 +58,8 @@
   <string name="account_optionnal_category">Választható beállítások</string>
   <string name="account_useragent_label">Felhasználói ügynök</string>
   <string name="account_autoanswer_label">Önműködő hívásfogadása</string>
+  <string name="account_rendezvous_label">Találkozási pont mód</string>
+  <string name="account_rendezvous_summary">A találkozási pont módban a bejövő hívások hozzáadódnak egy konferenciaterembe.</string>
   <string name="account_upnp_label">UPnP engedélyezése</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
@@ -75,7 +77,7 @@
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Haladó</string>
   <string name="account_call_settings_title">Hívás beállítások</string>
-  <string name="account_dht_public_in_calls_label">Az ismeretlen kapcsolatoktól érkező bejövő hívások engedélyezése </string>
+  <string name="account_dht_public_in_calls_label">Az ismeretlen kapcsolatoktól érkező bejövő hívások engedélyezése</string>
   <string name="account_registration_exp_label">Regisztráció lejárata</string>
   <string name="account_local_interface_label">Helyi csatoló</string>
   <string name="account_local_port_label">Helyi kikötő</string>
@@ -115,8 +117,8 @@
   <string name="account_tls_transport_switch_label">TLS titkosítás használata</string>
   <string name="account_tls_port_label">TLS figyelő kikötő</string>
   <string name="account_tls_certificate_list_label">Hitelesítésszolgáltatók</string>
-  <string name="account_tls_certificate_file_label">Tanúsítvány fájl</string>
-  <string name="account_tls_private_key_file_label">Titkos kulcs fájl</string>
+  <string name="account_tls_certificate_file_label">Tanúsítványfájl</string>
+  <string name="account_tls_private_key_file_label">Titkos kulcs fájlja</string>
   <string name="account_tls_password_label">Titkos kulcs jelszava</string>
   <string name="account_tls_method_label">TLS eljárás</string>
   <string name="account_tls_ciphers_label">TLS kódolások</string>
@@ -134,6 +136,7 @@
   <string name="error_passwords_not_equals">A jelszavak nem egyeznek</string>
   <string name="export_account_wait_title">Kérem várjon…</string>
   <string name="export_account_wait_message">Fiókadatok exportálása</string>
+  <string name="account_export_file">Fiók biztonsági mentése</string>
   <string name="account_export_end_decryption_message">Nem sikerült feloldani fiókját a megadott jelszó használatával.</string>
   <string name="account_export_end_network_title">Hálózati hiba</string>
   <string name="account_export_end_network_message">Nem sikerült exportálni a fiókot a hálózaton. Ellenőrizze a kapcsolatot.</string>
@@ -185,6 +188,7 @@
   <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>
   <string name="registered_username">Felhasználónév regisztrálva</string>
   <string name="register_username">Nyilvános felhasználónév bejegyeztetése</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 66ac96a13bceaa7e95dafabe43a2794fdcff8e6a..e38aa51de611bee1561af0f21cfa53d374ca4440 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
@@ -167,7 +167,7 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_link_archive_button">Connetti dal backup</string>
   <string name="account_link_prompt_pin">Inserisci il PIN</string>
   <string name="account_new_button">Crea un account Jami</string>
-  <string name="account_link_export_button">Collega un altro dispositivo a questo account</string>
+  <string name="account_link_export_button">Collega un nuovo dispositivo</string>
   <string name="account_link_export_info">Per utilizzare questo account su altri dispositivi, devi prima esporlo su Jami. Questo sarà un codice che devi configurare. Il PIN è valido per 10 minuti.</string>
   <string name="account_start_export_button">Genera PIN</string>
   <string name="account_end_export_button">chiudi</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 de7e5869b4a466e7512d4792da1b5b64211d414c..0444b7997ed13fa16af4393bdf635739b1313212 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
@@ -133,7 +133,6 @@ Si potra modificare questo account più tardi.</string>
   <string name="account_sip_success_title">Account SIP registrato</string>
   <string name="account_link_prompt_pin">Inserisci PIN</string>
   <string name="account_new_button">Crea un account Jami</string>
-  <string name="account_link_export_button">Collega un altro dispositivo a questo account</string>
   <string name="account_start_export_button">Genera PIN</string>
   <string name="account_end_export_button">chiudi</string>
   <string name="account_export_title">Aggiungi dispositivi</string>
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 439c9705868c49f719fd35d6925cfaf8e1c89ece..d4ef525123e01ec85734660b1909b22e2132f16b 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/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-->
@@ -81,9 +82,12 @@
   <string name="notif_location_action_stop">現在地の共有を停止</string>
   <string name="location_share_action_start">共有を開始</string>
   <string name="location_share_action_stop">共有を停止</string>
+  <string name="location_share_about_title">地図情報</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">あなた:</string>
   <string name="action_call_hangup">通話終了</string>
+  <string name="action_call_maximize">最大化</string>
+  <string name="action_call_minimize">最小化</string>
   <string name="ongoing_call">通話中</string>
   <string name="hist_in_call">%1$s の着信</string>
   <string name="hist_out_call">%1$s の発信</string>
@@ -92,6 +96,7 @@
   <string name="action_call_accept">電話を取る</string>
   <string name="action_call_decline">辞退</string>
   <string name="action_call_mic_mute">マイクをミュート</string>
+  <string name="action_load_plugin">プラグインの読み込み</string>
   <string name="ab_action_speakerphone">スピーカーを有効にする</string>
   <string name="ab_action_contact_add">連絡先に追加</string>
   <string name="ab_action_contact_add_question">連絡先を追加しますか？</string>
@@ -177,6 +182,7 @@
   <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>
@@ -196,6 +202,7 @@
   <string name="contact_request_title">新しい連絡先リクエスト</string>
   <string name="contact_request_msg">%1$s の連絡先リクエストがあります</string>
   <string name="contact_request_account">%1$s に</string>
+  <string name="no_requests">連絡先リクエストはありません</string>
   <string name="message_contact_not_trusted_yet">%s さんはあなたの連絡先に追加されていません。
 この連絡先のリクエストを許可しますか？</string>
   <string name="message_contact_not_trusted">%s さんはあなたの連絡先に追加されていません。
@@ -208,6 +215,7 @@
   <string name="no_blocked_contact">ブロックした連絡先はありません</string>
   <!--Smartlist-->
   <string name="no_contact_request">連絡先のリクエストは送信していません</string>
+  <string name="conversation_placeholder">まだ会話がありません</string>
   <string name="contact_request_sent">連絡先のリクエストを送信しました</string>
   <string name="start_conversation">会話を開始</string>
   <string name="search_results">検索結果</string>
@@ -262,9 +270,18 @@
   <string name="tv_send_text">テキストの送信</string>
   <string name="tv_send_audio">音声の送信</string>
   <string name="tv_send_video">メディアを送信</string>
+  <string name="conversation_input_speech_hint">何か話してください…</string>
   <!--Wizard-->
   <string name="wizard_status_recommended">推奨</string>
+  <string name="wizard_status_optional">オプション</string>
+  <string name="wizard_status_required">必須</string>
+  <string name="wizard_username_info">アカウントのユーザー名を選択</string>
   <string name="wizard_username_button">ユーザー名を選択</string>
   <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_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-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index 624af2553fa8f6ad533fabf1cd1b8067a4edf348..54a69b139828e605ea550b55581477d3b81bdfbf 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
@@ -162,7 +162,7 @@
   <string name="account_link_archive_button">バックアップから接続</string>
   <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_export_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>
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 868366a73204355d44fd809d5707f23ef34f0942..a802e7e6858773ede2fc87e7f59a9219c1544e53 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
@@ -14,6 +14,10 @@
   <string name="pref_hd_summary">HDビデオの送信を有効にする</string>
   <string name="pref_hwEncode_title">高速エンコードを有効にする</string>
   <string name="pref_hwEncode_summary">実験的機能</string>
+  <string name="pref_videoBitrate_title">ビデオのビットレート</string>
+  <string name="pref_videoBitrate_summary">デフォルトの送信ビデオビットレート (KB/s) を選択</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>
@@ -25,4 +29,17 @@
   <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-lt/strings_account.xml b/ring-android/app/src/main/res/values-lt/strings_account.xml
index 58bbe253e514a9f30a36c3b0ab4dcf34c1c63fd5..a1d77170dc30b457d337fd00fa297875f544ff18 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
@@ -162,7 +162,7 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="account_link_archive_button">Prijungti iš atsarginės kopijos</string>
   <string name="account_link_prompt_pin">Įveskite PIN</string>
   <string name="account_new_button">Susikurti Jami paskyrą</string>
-  <string name="account_link_export_button">Susieti kitą įrenginį su šia paskyra</string>
+  <string name="account_link_export_button">Susieti naują įrenginį</string>
   <string name="account_link_export_info">Jei norite naudoti šią paskyrą kituose įrenginiuose, pirmiausia turite ją atskleisti „Jami“. Tai sugeneruos PIN kodą, kurį turite įvesti naujame įrenginyje, kad nustatytumėte paskyrą. PIN kodas galioja 10 minučių.</string>
   <string name="account_start_export_button">Generuoti PIN</string>
   <string name="account_end_export_button">užverti</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 781cadb360daa87e5ea47d5744a6893798d68a38..3d50d32f6c62276b4a601909f56720f8ea42a076 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
@@ -106,7 +106,6 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
   <string name="account_device_added_title">Berjaya menambah perangkat akaun</string>
   <string name="account_device_updated_title">Akaun perangkat telah dikemaskinikan</string>
   <string name="account_link_prompt_pin">Masukkan PIN</string>
-  <string name="account_link_export_button">Sambungkan perangkat lain dengan akaun ini</string>
   <string name="account_end_export_button">tutup</string>
   <string name="account_connect_prompt_username">Nama pengguna</string>
   <!--Name registration-->
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 837d5d9014402878b9f3c52bf56fcccbbef1d184..106a341838ffc88376dd6b3fe9fd7899edb1747b 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
@@ -132,7 +132,7 @@ Du kan endre kontoen din senere</string>
   <string name="account_sip_register_anyway">Registrer uansett</string>
   <string name="account_link_prompt_pin">Skriv inn PIN</string>
   <string name="account_new_button">Opprett en Jami-konto</string>
-  <string name="account_link_export_button">Lenk en annen enhet til denne kontoen</string>
+  <string name="account_link_export_button">Lenk en ny enhet</string>
   <string name="account_start_export_button">Oppretter PIN</string>
   <string name="account_end_export_button">lukk</string>
   <string name="account_export_title">Legg til enheter</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 73bdeb492cbd69f754c283486f3b21922029c944..0a0cdfdb19f5b60b517282339d80c4ebbe6223a1 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
@@ -152,7 +152,7 @@ U kunt uw account later bewerken</string>
   <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Geef pincode in</string>
   <string name="account_new_button">Een Jami-account aanmaken</string>
-  <string name="account_link_export_button">Een ander apparaat aan deze account koppelen</string>
+  <string name="account_link_export_button">Een nieuw apparaat koppelen</string>
   <string name="account_link_export_info">Om deze account op andere apparaten te gebruiken moet u deze eerst op Jami blootstellen. Er zal een pincode gegenereerd worden die u op het nieuwe apparaat ingeeft om de account in te stellen. De pincode is 10 minuten geldig.</string>
   <string name="account_start_export_button">Pincode genereren</string>
   <string name="account_end_export_button">sluiten</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 c9fe184f63180e801745ef4417757e4a2b54d58b..d0eeb4b90ec299d90478492f427e4e8bd7a75bac 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
@@ -152,7 +152,7 @@ U kunt uw account later bewerken</string>
   <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Voer pincode in</string>
   <string name="account_new_button">Een Jami-account aanmaken</string>
-  <string name="account_link_export_button">Een ander apparaat aan dit account koppelen</string>
+  <string name="account_link_export_button">Een nieuw apparaat koppelen</string>
   <string name="account_link_export_info">Om dit account op andere apparaten te gebruiken dient u deze eerst op Jami bloot te stellen. Er zal een pincode gegenereerd worden die u op het nieuwe apparaat invoert om het account in te stellen. De pincode is 10 minuten geldig.</string>
   <string name="account_start_export_button">Pincode genereren</string>
   <string name="account_end_export_button">sluiten</string>
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 3a1a990a4f20607cd2c11d038331fbead4cb8606..b261973965cfa9ce551fe49d6146f869ef73bd70 100644
--- a/ring-android/app/src/main/res/values-oc/strings.xml
+++ b/ring-android/app/src/main/res/values-oc/strings.xml
@@ -2,6 +2,7 @@
 <resources>
   <!--About-->
   <string name="report"><u>Enviar coma corrièl</u></string>
+  <string name="sponsor_section">Jami es un logicial liure desvolopat e sostengut per</string>
   <string name="email_chooser_title">Mandadís del messatge…</string>
   <string name="description">Jami es un logicial liure per comunicacions universalas que respèctan la libertat e la vida privada de sos utilizaires.</string>
   <string name="credits">Crèdit</string>
@@ -11,6 +12,7 @@
   <!--AB menus-->
   <!--Sections-->
   <string name="menu_item_contact_request">Demanda de contacte</string>
+  <string name="menu_item_accounts">Gerir los comptes</string>
   <string name="menu_item_settings">Paramètres</string>
   <string name="menu_item_about">A prepaus de Jami</string>
   <!--Dialing Fragment-->
@@ -21,6 +23,9 @@
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
+  <string name="notif_missed_incoming_call">Sonada dintrada mancada</string>
+  <string name="notif_missed_outgoing_call">Sonada sortissenta mancada</string>
+  <string name="notif_channel_missed_calls">Sonadas mancadas</string>
   <string name="notif_outgoing_file_transfer_title">Mandadís del fichièr a %1$s</string>
   <!--Call Fragment-->
   <string name="action_call_maximize">Maximizar</string>
@@ -77,4 +82,5 @@
   <string name="tv_send_audio">Enviar un àudio</string>
   <string name="tv_send_video">Enviar un mèdia</string>
   <!--Wizard-->
+  <string name="wizard_password_skip">Crear compte</string>
 </resources>
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 2973646e7534e6de21a5c1b26542ec98a06519f2..1d55479cb86de4d72ac1c6b4e2ded4771634366b 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
@@ -7,13 +7,19 @@
   <!--Strings related to account creation-->
   <string name="prompt_username">Nom d’utilizaire</string>
   <string name="prompt_password">Senha</string>
+  <string name="action_create">Crear compte</string>
   <string name="action_create_short">Crear</string>
   <string name="action_settings">Paramètres</string>
+  <string name="dialog_wait_create">Apondon de compte</string>
+  <string name="dialog_wait_create_details">Esperatz pendent la creacion del compte…</string>
+  <string name="dialog_wait_update">Mesa a nivèl del compte</string>
   <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Suprimir lo compte ?</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Comptes</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
+  <string name="account_alias_label">Nom de compte</string>
   <string name="account_username_label">Nom d’utilizaire</string>
   <string name="account_password_label">Senha</string>
   <string name="account_proxy_field">Servidor mandatari</string>
@@ -34,6 +40,8 @@
   <!--restore/backup-->
   <string name="account_export_end_network_title">Error ret</string>
   <string name="account_export_end_error_title">Error</string>
+  <string name="ring_account">Compte Jami</string>
+  <string name="account_migration_title_dialog">Migracion de compte</string>
   <string name="account_cannot_be_found_title">Impossible de trobar aqueste compte</string>
   <string name="account_no_network_title">Connexion impossibla a la ret</string>
   <string name="account_new_button">Crear un compte Jami</string>
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 7c7faab41d2232d78b61b25252553093b8993c8a..26727ab58d07ee5c3705c2a0211365660aa7d8fc 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -4,20 +4,23 @@
   <string name="feedback_section">ਪ੍ਰਤੀਕਰਮ</string>
   <string name="report"><u>ਸਾਨੂੰ ਈਮੇਲ ਭੇਜੋ</u></string>
   <string name="section_license">ਲਾਇਸੰਸ</string>
-  <string name="sponsor_section">Jami ਇਹਨਾਂ ਵੱਲੋਂ ਵਿਕਸਿਤ ਅਤੇ ਸਮਰਥਿਤ ਮੁਫ਼ਤ ਸਾਫ਼ਟਵੇਅਰ ਹੈ</string>
+  <string name="sponsor_section">Jami ਇਹਨਾਂ ਦਾ ਤਿਆਰ ਕੀਤਾ ਮੁਫ਼ਤ ਸਾਫ਼ਟਵੇਅਰ ਹੈ</string>
   <string name="copyright_section">ਕਾਪੀਰਾਈਟ</string>
   <string name="contribute_section">ਯੋਗਦਾਨ ਪਾਓ</string>
   <string name="version_section">ਵਰਜਨ</string>
   <string name="no_email_app_installed">ਕੋਈ ਈਮੇਲ ਐਪ ਨਹੀਂ ਮਿਲੀ, ਸਾਨੂੰ ਰਿਪੋਰਟ ਭੇਜਣ ਲਈ ਐਪ ਸਥਾਪਤ ਕਰੋ</string>
-  <string name="no_browser_app_installed">ਕੋਈ ਵੈੱਬ ਬ੍ਰਾਊਜ਼ਰ ਨਹੀਂ ਮਿਲਿਆ, ਇਹ ਪੰਨਾ ਦੇਖਣ ਲਈ ਬ੍ਰਾਊਜ਼ਰ ਸਥਾਪਤ ਕਰੋ</string>
+  <string name="no_browser_app_installed">ਕੋਈ ਵੈੱਬ ਬ੍ਰਾਊਜ਼ਰ ਨਹੀਂ ਮਿਲਿਆ, ਇਹ ਪੰਨਾ ਵੇਖਣ ਲਈ ਬ੍ਰਾਊਜ਼ਰ ਸਥਾਪਤ ਕਰੋ</string>
   <string name="email_chooser_title">ਇਹ ਵਰਤ ਕੇ ਮੇਲ ਭੇਜੋ…</string>
-  <string name="website_chooser_title">ਇਹ ਵਰਤ ਕੇ ਵੈੱਬਸਾਈਟ ਦੇਖੋ…</string>
-  <string name="license">ਇਹ ਸਾਫ਼ਟਵੇਅਰ \"ਜਿਵੇਂ ਵੀ ਐ\", ਕਿਸੇ ਵੀ ਵਾਰੰਟੀ ਦੇ ਬਿਨਾਂ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ, <u>GNU General Public License version 3 ਜਾਂ ਬਾਅਦ ਵਾਲੇ ਲਾਇਸੰਸ</u> ਦੇਖੋ</string>
+  <string name="website_chooser_title">ਇਹ ਵਰਤ ਕੇ ਵੈੱਬਸਾਈਟ ਵੇਖੋ…</string>
+  <string name="license">ਇਹ ਸਾਫ਼ਟਵੇਅਰ \"ਜਿਵੇਂ ਵੀ ਐ\", ਕਿਸੇ ਵੀ ਵਰੰਟੀ ਦੇ ਬਿਨਾਂ ਦਿੱਤਾ ਜਾਂਦਾ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ, <u>GNU General Public License version 3 ਜਾਂ ਬਾਅਦ ਵਾਲੇ ਲਾਇਸੰਸ</u> ਵੇਖੋ</string>
   <string name="description">Jami ਦੁਨੀਆ ਭਰ ਵਿੱਚ ਸੰਚਾਰ ਕਰਨ ਲਈ ਮੁਫ਼ਤ ਸਾਫ਼ਟਵੇਅਰ ਹੈ ਜੋ ਆਪਣੇ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਅਜ਼ਾਦੀ ਅਤੇ ਪਰਦੇਦਾਰੀ ਦਾ ਖਿਆਲ ਰੱਖਦਾ ਹੈ।</string>
   <string name="credits">ਸ਼ਲਾਘਾਯੋਗ ਵਿਅਕਤੀ</string>
+  <string name="call_service_description">ਇਹ ਸੇਵਾ ਤੁਹਾਡੀਆਂ ਕਾਲਾਂ ਮੂਹਰੇ ਜਾਰੀ ਰੱਖਣ ਲਈ ਜ਼ਰੂਰੀ ਹੈ। ਇਹ ਸਿਰਫ਼ ਕਾਲਾਂ ਵੇਲੇ ਚੱਲਦੀ ਹੈ।</string>
+  <string name="data_transfer_service_description">ਇਹ ਸੇਵਾ ਫ਼ਾਈਲਾਂ ਦੇ ਤਬਾਦਲੇ ਵੇਲੇ ਸਥਾਈ ਸੂਚਨਾਵਾਂ ਵਿਖਾਉਣ ਲਈ ਜ਼ਰੂਰੀ ਹੈ। ਇਹ ਸਿਰਫ਼ ਫ਼ਾਈਲਾਂ ਦੇ ਤਬਾਦਲੇ ਵੇਲੇ ਚੱਲਦੀ ਹੈ।</string>
   <!--About dialog-->
   <string name="developed_by">ਵਿਕਾਸਕਾਰ</string>
-  <string name="designed_by">ਡਿਜ਼ਾਈਨਰ</string>
+  <string name="designed_by">ਨਮੂਨਾਕਾਰ</string>
+  <string name="ringtones_by">ਘੰਟੀ ਇਹਨਾਂ ਨੇ ਬਣਾਈ</string>
   <!--RingActivity-->
   <string name="error_no_network">ਕੋਈ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ</string>
   <string name="error_mobile_network_available_but_disabled">ਕਿਰਪਾ ਕਰਕੇ ਸੈਟਿੰਗਾਂ ਸਕ੍ਰੀਨ ਵਿੱਚ ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ ਤੱਕ ਪਹੁੰਚ ਦਿਓ।</string>
@@ -25,9 +28,10 @@
   <string name="ab_action_chat">ਲਿਖਤ ਸੁਨੇਹੇ</string>
   <!--Sections-->
   <string name="menu_item_contact_request">ਸੰਪਰਕ ਬੇਨਤੀਆਂ</string>
-  <string name="menu_item_accounts">ਖਾਤਿਆਂ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ</string>
-  <string name="menu_item_account">ਖਾਤੇ ਦਾ ਪ੍ਰਬੰਧਨ ਕਰੋ</string>
+  <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-->
@@ -40,122 +44,154 @@
     <item quantity="other">%d ਗੱਲਾਂਬਾਤਾਂ</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">ਨਾਂ ਜਾਂ ਫ਼ੋਨ ਨੰਬਰ ਖੋਜੋ…</string>
   <string name="choose_number">ਨੰਬਰ ਚੁਣੋ</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
-  <string name="notif_missed_incoming_call">ਖੁੰਝੀ ਆਉਂਦੀ ਕਾਲ</string>
-  <string name="notif_missed_outgoing_call">ਖੁੰਝੀ ਜਾਂਦੀ ਕਾਲ</string>
+  <string name="notif_missed_incoming_call">ਆਉਂਦੀ ਕਾਲ ਖੁੰਝੀ</string>
+  <string name="notif_missed_outgoing_call">ਜਾਂਦੀ ਕਾਲ ਖੁੰਝੀ</string>
   <string name="notif_incoming_call_title">%1$s ਤੋਂ ਆਉਂਦੀ ਕਾਲ</string>
   <string name="notif_incoming_call">ਆਉਂਦੀ ਕਾਲ</string>
   <string name="notif_outgoing_call_title">%1$s ਨੂੰ ਜਾਂਦੀ ਕਾਲ</string>
   <string name="notif_outgoing_call">ਜਾਂਦੀ ਕਾਲ</string>
+  <string name="notif_current_call_title">%1$s ਨਾਲ ਜਾਰੀ ਕਾਲ</string>
   <string name="notif_current_call">ਜਾਂਦੀ ਕਾਲ</string>
+  <string name="notif_channel_call_in_progress">ਕਾਲ ਜਾਰੀ ਹੈ</string>
   <string name="notif_channel_calls">ਕਾਲਾਂ</string>
   <string name="notif_channel_missed_calls">ਖੁੰਝੀਆਂ ਕਾਲਾਂ</string>
+  <string name="notif_channel_incoming_calls">ਆਈਆਂ ਕਾਲਾਂ</string>
   <string name="notif_channel_messages">ਸੁਨੇਹੇ</string>
   <string name="notif_channel_requests">ਬੇਨਤੀਆਂ</string>
   <string name="notif_channel_file_transfer">ਫ਼ਾਈਲ ਤਬਾਦਲਾ</string>
-  <string name="notif_channel_background_service">ਬੈਕਗ੍ਰਾਊਂਡ ਸੇਵਾ</string>
+  <string name="notif_channel_sync">ਡਾਟਾ ਸਮਕਾਲੀਕਰਨ</string>
+  <string name="notif_channel_background_service">ਪਿਛਲੇ ਪਾਸੇ ਚੱਲਦੀ ਸੇਵਾ</string>
   <string name="notif_channel_background_service_descr">ਕਿਸੇ ਵੇਲੇ ਵੀ ਕਾਲਾਂ ਅਤੇ ਸੁਨੇਹੇ ਆਉਣ ਦਿਓ।</string>
   <string name="notif_group_calls">ਕਾਲਾਂ</string>
-  <string name="notif_background_service">Jami ਐਪ ਫਿਲਹਾਲ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲ ਰਹੀ ਹੈ</string>
-  <string name="notif_mark_as_read">ਪੜ੍ਹੇ ਵਜੋਂ ਨਿਸ਼ਾਨ ਲਗਾਓ</string>
+  <string name="notif_background_service">Jami ਐਪ ਫਿਲਹਾਲ ਪਿਛਲੇ ਪਾਸੇ ਚੱਲ ਰਹੀ ਹੈ</string>
+  <string name="notif_mark_as_read">ਪੜ੍ਹੇ ਦਾ ਨਿਸ਼ਾਨ ਲਾਓ</string>
   <string name="notif_dismiss">ਖਾਰਜ ਕਰੋ</string>
   <string name="notif_reply">ਜਵਾਬ ਦਿਓ</string>
   <string name="notif_incoming_file_transfer_title">%1$s ਤੋਂ ਆਉਂਦੀ ਫ਼ਾਈਲ</string>
   <string name="notif_outgoing_file_transfer_title">%1$s ਨੂੰ ਫ਼ਾਈਲ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ</string>
   <string name="notif_incoming_picture">%1$s ਵੱਲੋਂ ਤਸਵੀਰ</string>
+  <string name="notif_sync_title">ਡਾਟੇ ਦਾ ਸਮਕਾਲੀਕਰਨ ਹੋ ਰਿਹਾ ਹੈ…</string>
+  <string name="notif_location_title">%1$s ਨਾਲ ਟਿਕਾਣਾ ਸਾਂਝਾ ਹੋ ਰਿਹਾ ਹੈ</string>
+  <string name="location_share_contact">%1$s ਤੁਹਾਡੇ ਨਾਲ ਟਿਕਾਣਾ ਸਾਂਝਾ ਕਰ ਰਹੇ ਹਨ</string>
+  <string name="notif_location_multi_title">%1$d ਸੰਪਰਕਾਂ ਨਾਲ ਟਿਕਾਣਾ ਸਾਂਝਾ ਹੋ ਰਿਹਾ ਹੈ</string>
+  <string name="notif_location_remaining">%1$d ਮਿੰਟ ਬਾਕੀ</string>
+  <string name="notif_location_action_stop">ਟਿਕਾਣਾ ਸਾਂਝਾ ਕਰਨਾ ਬੰਦ ਕਰੋ</string>
+  <string name="location_share_action_start">ਸਾਂਝਾ ਕਰਨਾ ਸ਼ੁਰੂ ਕਰੋ</string>
+  <string name="location_share_action_stop">ਸਾਂਝਾ ਕਰਨਾ ਬੰਦ ਕਰੋ</string>
+  <string name="location_share_about_title">ਨਕਸ਼ੇ ਦੀ ਜਾਣਕਾਰੀ</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">ਤੁਸੀਂ:</string>
   <string name="action_call_hangup">ਕਾਲ ਕੱਟੋ</string>
+  <string name="action_call_maximize">ਵੱਡਾ ਕਰੋ</string>
+  <string name="action_call_minimize">ਛੋਟਾ ਕਰੋ</string>
   <string name="ongoing_call">ਜਾਂਦੀ ਕਾਲ</string>
   <string name="hist_in_call">%1$s ਤੋਂ ਆਉਂਦੀ ਕਾਲ</string>
   <string name="hist_out_call">%1$s ਨੂੰ ਜਾਂਦੀ ਕਾਲ</string>
   <string name="start_error_title">Jami ਨੂੰ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ !</string>
   <string name="start_error_mic_required">Jami ਨੂੰ ਚੱਲਣ ਲਈ ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ।</string>
-  <string name="action_call_accept">ਕਾਲ ਸੁਣੋ</string>
+  <string name="action_call_accept">ਕਾਲ ਲਓ</string>
+  <string name="action_call_hold_accept">ਕਾਲ ਰੋਕ ਕੇ ਦੂਜੀ ਕਾਲ ਲਓ</string>
+  <string name="action_call_end_accept">ਕਾਲ ਕੱਟ ਕੇ ਦੂਜੀ ਕਾਲ ਲਓ</string>
   <string name="action_call_decline">ਕਾਲ ਕੱਟੋ</string>
-  <string name="action_call_mic_mute">ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਮਿਊਟ ਕਰੋ</string>
+  <string name="action_call_mic_mute">ਮਾਈਕ੍ਰੋਫ਼ੋਨ ਬੰਦ ਕਰੋ</string>
+  <string name="action_load_plugin">ਪਲੱਗਇਨ ਲੋਡ ਕਰੋ</string>
   <string name="ab_action_speakerphone">ਸਪੀਕਰ ਚਾਲੂ ਕਰੋ</string>
-  <string name="ab_action_contact_add">ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੋ</string>
-  <string name="ab_action_contact_add_question">ਸੰਪਰਕਾਂ ਵਿੱਚ ਸ਼ਾਮਲ ਕਰੀਏ?</string>
-  <string name="hist_contact_added">ਸੰਪਰਕ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ</string>
+  <string name="ab_action_contact_add">ਸੰਪਰਕਾਂ ਵਿੱਚ ਜੋੜੋ</string>
+  <string name="ab_action_contact_add_question">ਸੰਪਰਕਾਂ ਵਿੱਚ ਜੋੜੀਏ?</string>
+  <string name="hist_contact_added">ਸੰਪਰਕ ਜੋੜਿਆ ਗਿਆ</string>
   <string name="hist_invitation_received">ਸੱਦਾ ਮਿਲਿਆ</string>
-  <string name="ab_action_audio_call">ਆਡੀਓ ਕਾਲ</string>
+  <string name="ab_action_audio_call">ਅਵਾਜ਼ੀ ਕਾਲ</string>
   <string name="ab_action_video_call">ਵੀਡੀਓ ਕਾਲ</string>
-  <string name="ab_action_change_screen_orientation">ਸਕ੍ਰੀਨ ਦਿਸ਼ਾਮਾਨ ਬਦਲੋ</string>
+  <string name="ab_action_change_screen_orientation">ਸਕ੍ਰੀਨ ਦੀ ਦਿਸ਼ਾ ਬਦਲੋ</string>
   <string name="share_via">ਇਸ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ</string>
-  <string name="write_a_message">ਸੁਨੇਹਾ ਲਿਖੋ</string>
+  <string name="write_a_message">ਕੋਈ ਸੁਨੇਹਾ ਲਿਖੋ</string>
   <string name="scan_qr">QR ਕੋਡ ਸਕੈਨ ਕਰੋ</string>
   <string name="ab_action_flipcamera">ਕੈਮਰਾ ਪਲਟਾਓ</string>
+  <string name="ab_action_hidepreview">ਝਲਕ ਲੁਕਾਓ</string>
   <!--Text messages-->
   <string name="send_message">ਸੁਨੇਹਾ ਭੇਜੋ</string>
   <string name="message_sending">ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…</string>
-  <string name="message_failed">ਅਸਫਲ ਰਿਹਾ</string>
+  <string name="message_failed">ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ</string>
   <string name="time_just_now">ਹੁਣੇ ਹੀ</string>
   <string name="send_file">ਫ਼ਾਈਲ ਭੇਜੋ</string>
   <string name="hist_file_sent">ਫ਼ਾਈਲ ਭੇਜੀ ਗਈ</string>
   <string name="hist_file_received">ਫ਼ਾਈਲ ਮਿਲੀ</string>
+  <string name="conversation_send_audio">ਅਵਾਜ਼ੀ ਹਿੱਸਾ ਰਿਕਾਰਡ ਕਰੋ</string>
+  <string name="conversation_send_video">ਵੀਡੀਓ ਹਿੱਸਾ ਰਿਕਾਰਡ ਕਰੋ</string>
+  <string name="conversation_share_location">ਟਿਕਾਣਾ ਸਾਂਝਾ ਕਰੋ</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">ਕੈਮਰਾ ਇਜਾਜ਼ਤ</string>
   <string name="permission_dialog_camera_message">ਵੀਡੀਓ ਗੱਲਾਂਬਾਤਾਂ ਕਰਨ ਲਈ ਕੈਮਰਾ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ। ਇਜਾਜ਼ਤ ਚਾਲੂ ਕਰਨ ਬਾਰੇ ਵਿਚਾਰੋ।</string>
   <!--Ringtone activity-->
   <string name="ringtone_error_title">ਗੜਬੜ</string>
-  <string name="ringtone_error_format_not_supported">ਇਸ ਵੰਨਗੀ ਦੀ ਸੁਵਿਧਾ ਨਹੀਂ ਹੈ।</string>
+  <string name="ringtone_error_format_not_supported">ਇਸ ਵੰਨਗੀ ਵਿੱਚ ਨਹੀਂ ਵਰਤ ਸਕਦੇ।</string>
   <string name="ringtone_error_size_too_big">ਇਹ ਫ਼ਾਈਲ ਬਹੁਤ ਵੱਡੀ ਹੈ। ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ %1$dkB ਹੋਵੇ।</string>
+  <string name="ringtone_custom_prompt">ਮਨਮਰਜ਼ੀ ਦੀ ਘੰਟੀ ਲਗਾਓ</string>
+  <string name="ringtone_custom_label">ਮਨਮਰਜ਼ੀ</string>
+  <string name="ringtone_jami_tones">Jami ਟੱਲੀਆਂ</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami ਨੂੰ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਕਰਨ ਲਈ \"ਸੰਪਰਕ ਪੜ੍ਨ\" ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Jami ਨੂੰ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਚਾਲੂ ਕਰਨ ਲਈ \"ਕਾਲ ਲੌਗ ਲਿਖਣ\" ਦੀ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਇਜਾਜ਼ਤ ਦਿਓ।</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">ਉਸ ਖਾਤੇ ਦਾ QR ਕੋਡ ਸਕੈਨ ਕਰੋ, ਜਿਸਨੂੰ ਤੁਸੀਂ ਸ਼ਾਮਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।</string>
+  <string name="scan_qr_account_message">ਉਸ ਖਾਤੇ ਦਾ QR ਕੋਡ ਸਕੈਨ ਕਰੋ, ਜਿਸਨੂੰ ਤੁਸੀਂ ਜੋੜਨਾ ਚਾਹੁੰਦੇ ਹੋ।</string>
   <string name="title_activity_qrcode">ਮੇਰਾ ਖਾਤਾ ਸਾਂਝਾ ਕਰੋ</string>
   <string name="error_scan_no_camera_permissions">QR ਸਕੈਨਰ ਨੂੰ ਚੱਲਣ ਲਈ ਕੈਮਰਾ ਇਜਾਜ਼ਤਾਂ ਦੀ ਲੋੜ ਹੈ</string>
   <string name="tab_code">ਮੇਰਾ ਕੋਡ</string>
   <string name="tab_scan">ਕੋਡ ਸਕੈਨ ਕਰੋ</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">ਇਤਿਹਾਸ ਮਿਟਾਈਏ?</string>
-  <string name="clear_history_dialog_message">ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।</string>
-  <string name="clear_history_completed">ਇਤਿਹਾਸ ਮਿਟਾਇਆ ਜਾ ਚੁੱਕਾ ਹੈ।</string>
+  <string name="clear_history_dialog_message">ਇਹ ਕਾਰਵਾਈ ਹੋਣ ਤੋਂ ਬਾਅਦ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ।</string>
+  <string name="clear_history_completed">ਇਤਿਹਾਸ ਮਿਟ ਗਿਆ ਹੈ।</string>
   <!--Conversation-->
   <string name="conversation_details">ਸੰਪਰਕ ਵੇਰਵੇ</string>
   <string name="conversation_action_delete_this">ਇਹ ਗੱਲਬਾਤ ਮਿਟਾਓ</string>
   <string name="conversation_action_delete_this_title">ਇਹ ਗੱਲਬਾਤ ਮਿਟਾਈਏ?</string>
-  <string name="conversation_action_delete_this_message">ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।</string>
+  <string name="conversation_action_delete_this_message">ਇਹ ਕਾਰਵਾਈ ਹੋਣ ਤੋਂ ਬਾਅਦ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ।</string>
   <string name="conversation_action_history_clear">ਇਤਿਹਾਸ ਮਿਟਾਓ</string>
-  <string name="conversation_action_history_clear_title">ਗੱਲਬਾਤ ਇਤਿਹਾਸ ਮਿਟਾਈਏ?</string>
+  <string name="conversation_action_history_clear_title">ਗੱਲਬਾਤ ਦਾ ਇਤਿਹਾਸ ਮਿਟਾਈਏ?</string>
   <string name="conversation_action_history_clear_message">ਇੰਝ ਕਰਨ ਨਾਲ ਗੱਲਬਾਤ ਇਤਿਹਾਸ ਮਿਟ ਜਾਵੇਗਾ।</string>
   <string name="conversation_action_remove_this">ਸੰਪਰਕ ਮਿਟਾਓ</string>
   <string name="conversation_action_remove_this_title">ਇਹ ਸੰਪਰਕ ਮਿਟਾਈਏ?</string>
-  <string name="conversation_action_remove_this_message">ਇੰਝ ਕਰਨ ਨਾਲ ਸੰਪਰਕ ਅਤੇ ਗੱਲਬਾਤ ਇਤਿਹਾਸ ਮਿਟ ਜਾਵੇਗਾ।</string>
+  <string name="conversation_action_remove_this_message">ਇੰਝ ਕਰਨ ਨਾਲ ਸੰਪਰਕ ਅਤੇ ਗੱਲਬਾਤ ਦਾ ਇਤਿਹਾਸ ਮਿਟ ਜਾਵੇਗਾ।</string>
   <string name="conversation_action_copy_peer_number">ਨੰਬਰ ਕਾਪੀ ਕਰੋ</string>
-  <string name="conversation_action_copied_peer_number_clipboard">%1$s ਨੂੰ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ</string>
-  <string name="conversation_action_select_peer_number">ਨੰਬਰ ਚੁਣੋ</string>
-  <string name="conversation_action_block_this">ਸੰਪਰਕ ਬਲਾਕ ਕਰੋ</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s ਨੂੰ ਚੂੰਢੀ-ਤਖਤੀ \'ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ</string>
+  <string name="conversation_action_select_peer_number">ਕੋਈ ਨੰਬਰ ਚੁਣੋ</string>
+  <string name="conversation_action_block_this">ਸੰਪਰਕ \'ਤੇ ਬੰਦਸ਼ ਲਗਾਓ</string>
   <string name="conversation_action_go_to_call">ਜਾਂਦੀ ਕਾਲ \'ਤੇ ਵਾਪਸ ਜਾਓ</string>
   <string name="conversation_open_file_error">ਇਸ ਫ਼ਾਈਲ ਕਿਸਮ ਨੂੰ ਖੋਲ੍ਹਣ ਵਾਲੀ ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਸਥਾਪਤ ਨਹੀਂ ਹੈ।</string>
   <string name="clip_contact_uri">ਸੰਪਰਕ ਦਾ ਪਤਾ</string>
-  <string name="block_contact_dialog_title">%1$s ਨੂੰ ਬਲਾਕ ਕਰੀਏ?</string>
-  <string name="block_contact_dialog_message">%1$s ਤੁਹਾਨੂੰ ਤਦ ਤੱਕ ਸੰਪਰਕ ਨਹੀਂ ਕਰ ਸਕਣਗੇ, ਜਦ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਨੂੰ ਅਣਬਲਾਕ ਨਹੀਂ ਕਰਦੇ।</string>
-  <string name="block_contact_completed">%1$sਨੂੰ ਬਲਾਕ ਕੀਤਾ ਗਿਆ।</string>
+  <string name="block_contact_dialog_title">%1$s \'ਤੇ ਬੰਦਸ਼ ਲਗਾਈਏ?</string>
+  <string name="block_contact_dialog_message">%1$s ਤੁਹਾਨੂੰ ਤਦ ਤੱਕ ਸੰਪਰਕ ਨਹੀਂ ਕਰ ਸਕਣਗੇ, ਜਦ ਤੱਕ ਤੁਸੀਂ ਉਹਨਾਂ ਤੋਂ ਬੰਦਸ਼ ਨਹੀਂ ਹਟਾਉਂਦੇ।</string>
+  <string name="block_contact_completed">%1$s \'ਤੇ ਬੰਦਸ਼ ਲਗਾਈ ਗਈ।</string>
+  <string name="conversation_contact_is_typing">ਸੰਪਰਕ ਲਿਖ ਰਹੇ ਹਨ…</string>
   <!--Contacts-->
-  <string name="add_call_contact_number_to_contacts">%1$s ਨੂੰ ਸ਼ਾਮਲ ਕਰੀਏ?</string>
+  <string name="add_call_contact_number_to_contacts">%1$s ਨੂੰ ਜੋੜੀਏ?</string>
   <string name="prompt_new_password">ਨਵਾਂ ਪਾਸਵਰਡ</string>
-  <string name="prompt_new_password_optional">ਨਵਾਂ ਪਾਸਵਰਡ (ਵਿਕਲਪਿਕ)</string>
+  <string name="prompt_new_password_optional">ਨਵਾਂ ਪਾਸਵਰਡ (ਮਰਜ਼ੀ ਮੁਤਾਬਕ)</string>
   <string name="prompt_new_password_repeat">ਨਵਾਂ ਪਾਸਵਰਡ ਦੁਹਰਾਓ</string>
   <string name="account_create_title">Jami ਖਾਤਾ ਬਣਾਓ</string>
-  <string name="prompt_new_username">ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਨਾਮ ਦਾਖਲ ਕਰੋ</string>
+  <string name="prompt_new_username">ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਨਾਂ ਦਾਖਲ ਕਰੋ</string>
   <string name="prompt_hint_username">ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <string name="help_password_choose">ਆਪਣੇ Jami ਖਾਤੇ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਅਜਿਹਾ ਮਜ਼ਬੂਤ ਪਾਸਵਰਡ ਚੁਣੋ ਜੋ ਤੁਹਾਨੂੰ ਯਾਦ ਰਹੇ।</string>
-  <string name="help_pin_enter">ਕਿਸੇ ਹੋਰ ਸੰਰੂਪਣ ਕੀਤੇ Jami ਖਾਤੇ ਤੋਂ ਪਿੰਨ ਦਾਖਲ ਕਰੋ। ਪਿੰਨ ਹਾਸਲ ਕਰਨ ਲਈ \"Jami ਖਾਤਾ ਨਿਰਯਾਤ ਕਰੋ\" ਵਿਸ਼ੇਸ਼ਤਾ ਵਰਤੋ।</string>
+  <string name="help_password_enter">ਆਪਣਾ ਮੁੱਖ Jami ਖਾਤਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ।</string>
+  <string name="help_server_enter">ਪ੍ਰਬੰਧ ਸਰਵਰ ਦਾ URLਦਾਖਲ ਕਰੋ।</string>
+  <string name="help_pin_enter">ਕਿਸੇ ਹੋਰ ਥਾਂ ਮੌਜੂਦ Jami ਖਾਤੇ ਤੋਂ ਪਿੰਨ ਦਾਖਲ ਕਰੋ। ਪਿੰਨ ਹਾਸਲ ਕਰਨ ਲਈ \"Jami ਖਾਤਾ ਨਿਰਯਾਤ ਕਰੋ\" ਵਿਸ਼ੇਸ਼ਤਾ ਵਰਤੋ।</string>
   <string name="wizard_next">ਅੱਗੇ</string>
   <string name="wizard_back">ਪਿੱਛੇ</string>
-  <string name="wizard_skip">ਲੰਘਾਓ</string>
+  <string name="wizard_skip">ਛੱਡੋ</string>
   <!--Account Summary-->
-  <string name="profile_message_warning">ਤੁਹਾਡਾ ਪ੍ਰੋਫਾਈਲ ਸਿਰਫ਼ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਂਦਾ ਹੈ</string>
+  <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>
   <!--Share fragment-->
   <string name="share_message">Jami ਨਾਲ ਇਹ ਕੋਡ ਸਕੈਨ ਕਰੋ</string>
   <string name="share_message_no_account">ਕਿਰਪਾ ਕਰਕੇ ਸਾਂਝਾ ਕਰਨ ਲਈ ਕੋਈ ਖਾਤਾ ਚੁਣੋ।</string>
@@ -163,59 +199,97 @@
   <string name="share_label">ਸਾਂਝਾ ਕਰੋ</string>
   <string name="generic_error_migration">ਗੜਬੜ</string>
   <string name="generic_error_migration_message">ਤਬਾਦਲੇ ਵੇਲੇ ਕੋਈ ਗੜਬੜ ਹੋਈ</string>
+  <string name="title_share_with">ਇਹਨਾਂ ਨਾਲ ਸਾਂਝਾ ਕਰੋ…</string>
   <!--Pending contact requests-->
   <string name="accept">ਮਨਜ਼ੂਰ ਕਰੋ</string>
   <string name="refuse">ਨਾ-ਮਨਜ਼ੂਰ ਕਰੋ</string>
-  <string name="block">ਬਲਾਕ ਕਰੋ</string>
+  <string name="block">ਬੰਦਸ਼ ਲਗਾਓ</string>
   <string name="contact_request_title">ਨਵੀਂ ਸੰਪਰਕ ਬੇਨਤੀ</string>
   <string name="contact_request_msg">ਤੁਹਾਡੇ ਕੋਲ %1$s ਸੰਪਰਕ ਬੇਨਤੀਆਂ ਹਨ</string>
   <string name="contact_request_account">%1$s ਲਈ</string>
+  <string name="no_requests">ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਸੰਪਰਕ ਬੇਨਤੀ ਨਹੀਂ ਹੈ</string>
   <string name="message_contact_not_trusted_yet">%s ਫਿਲਹਾਲ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਨਹੀਂ ਹਨ।\nਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਬੇਨਤੀ ਮਨਜ਼ੂਰ ਜਾਂ ਨਾ-ਮਨਜ਼ੂਰ ਕਰਨੀ ਹੈ?</string>
-  <string name="message_contact_not_trusted">%s ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਨਹੀਂ ਹਨ।\nਨਵਾਂ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੀਏ?</string>
+  <string name="message_contact_not_trusted">%s ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਨਹੀਂ ਹਨ।\nਨਵਾਂ ਸੰਪਰਕ ਜੋੜੀਏ?</string>
   <!--Send contact requests-->
   <string name="send_request_button">ਭੇਜੋ</string>
   <string name="send_request_title">ਸੰਪਰਕ ਬੇਨਤੀ ਭੇਜੋ</string>
-  <string name="send_request_msg">ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਲਈ ਤੁਹਾਡਾ ਸੰਪਰਕ ਬੇਨਤੀ ਭੇਜਣਾ ਲਾਜ਼ਮੀ ਹੈ। ਤੁਹਾਡੇ ਸੰਪਰਕ ਵੱਲੋਂ ਬੇਨਤੀ ਮਨਜ਼ੂਰ ਨਾ ਕੀਤੇ ਜਾਣ ਤੱਕ, ਤੁਸੀਂ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ ਪਰ ਉਹ ਜਵਾਬ ਨਹੀਂ ਦੇ ਸਕਣਗੇ।</string>
+  <string name="send_request_msg">ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਗੱਲ ਕਰਨ ਲਈ ਸੰਪਰਕ ਬੇਨਤੀ ਭੇਜਣਾ ਲਾਜ਼ਮੀ ਹੈ। ਤੁਹਾਡੇ ਸੰਪਰਕ ਵੱਲੋਂ ਬੇਨਤੀ ਮਨਜ਼ੂਰ ਨਾ ਕੀਤੇ ਜਾਣ ਤੱਕ, ਤੁਸੀਂ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ ਪਰ ਉਹ ਜਵਾਬ ਨਹੀਂ ਦੇ ਸਕਣਗੇ।</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">ਕਿਸੇ ਸੰਪਰਕ \'ਤੇ ਬੰਦਸ਼ ਨਹੀਂ ਹੈ</string>
   <!--Smartlist-->
-  <string name="no_contact_request">ਕੋਈ ਵੀ ਸੰਪਰਕ ਬੇਨਤੀ ਨਹੀਂ ਭੇਜੀ ਗਈ</string>
+  <string name="no_contact_request">ਕੋਈ ਸੰਪਰਕ ਬੇਨਤੀ ਨਹੀਂ ਭੇਜੀ ਗਈ</string>
+  <string name="conversation_placeholder">ਤੁਸੀਂ ਫ਼ਿਲਹਾਲ ਕਿਸੇ ਨਾਲ ਗੱਲਬਾਤ ਨਹੀਂ ਕੀਤੀ</string>
   <string name="contact_request_sent">ਸੰਪਰਕ ਬੇਨਤੀ ਭੇਜੀ ਗਈ</string>
+  <string name="start_conversation">ਗੱਲਬਾਤ ਸ਼ੁਰੂ ਕਰੋ</string>
   <string name="search_results">ਖੋਜ ਨਤੀਜੇ</string>
   <string name="tv_contact_row_header">ਸੰਪਰਕ</string>
   <string name="gallery_error_title">ਕੋਈ ਗੈਲਰੀ ਐਪ ਨਹੀਂ ਮਿਲੀ</string>
   <string name="gallery_error_message">ਗੈਲਰੀ ਖੋਲ੍ਹਣ ਲਈ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਕੋਈ ਐਪਲੀਕੇਸ਼ਨ ਨਹੀਂ ਮਿਲੀ</string>
-  <string name="generic_error">ਕੋਈ ਅਗਿਆਤ ਗੜਬੜ ਹੋਈ</string>
+  <string name="generic_error">ਕੋਈ ਅਣਜਾਣ ਗੜਬੜ ਹੋਈ</string>
   <!--File Transfer-->
-  <string name="invalid_file">ਅਵੈਧ ਫ਼ਾਈਲ</string>
+  <string name="invalid_file">ਅਢੁਕਵੀਂ ਫ਼ਾਈਲ</string>
   <string name="not_able_to_write_file">ਫ਼ਾਈਲ ਲਿਖੀ ਨਹੀਂ ਜਾ ਸਕੀ</string>
   <string name="file_transfer_status_created">ਤਬਾਦਲਾ ਸ਼ੁਰੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
   <string name="file_transfer_status_unsupported">ਸੁਵਿਧਾ ਨਹੀਂ</string>
   <string name="file_transfer_status_wait_peer_acceptance">ਸਾਥੀ ਦੀ ਮਨਜ਼ੂਰੀ ਦੀ ਉਡੀਕ ਹੋ ਰਹੀ ਹੈ</string>
   <string name="file_transfer_status_wait_host_acceptance">ਮੇਜ਼ਬਾਨ ਦੀ ਮਨਜ਼ੂਰੀ ਦੀ ਉਡੀਕ ਹੋ ਰਹੀ ਹੈ</string>
   <string name="file_transfer_status_ongoing">ਜਾਰੀ</string>
-  <string name="file_transfer_status_finished">ਮੁਕੰਮਲ ਹੋਇਆ</string>
-  <string name="file_transfer_status_closed_by_host">ਮੇਜ਼ਬਾਨ ਵੱਲੋਂ ਬੰਦ ਕੀਤਾ ਗਿਆ</string>
-  <string name="file_transfer_status_closed_by_peer">ਸਾਥੀ ਵੱਲੋਂ ਬੰਦ ਕੀਤਾ ਗਿਆ</string>
-  <string name="file_transfer_status_invalid_pathname">ਰਾਹ ਦਾ ਅਵੈਧ ਨਾਮ</string>
+  <string name="file_transfer_status_finished">ਪੂਰਾ ਹੋਇਆ</string>
+  <string name="file_transfer_status_closed_by_host">ਮੇਜ਼ਬਾਨ ਨੇ ਬੰਦ ਕੀਤਾ</string>
+  <string name="file_transfer_status_closed_by_peer">ਸਾਥੀ ਨੇ ਬੰਦ ਕੀਤਾ</string>
+  <string name="file_transfer_status_invalid_pathname">ਰਾਹ ਦਾ ਅਢੁਕਵਾਂ ਨਾਮ</string>
   <string name="file_transfer_status_unjoinable_peer">ਗੈਰ-ਜੁੜਨਯੋਗ ਸਾਥੀ</string>
-  <string name="file_saved_in">ਫ਼ਾਈਲ %s ਵਿੱਚ ਰੱਖਿਅਤ ਕੀਤੀ ਗਈ</string>
-  <string name="no_space_left_on_device">ਡੀਵਾਈਸ ਵਿੱਚ ਜਗ੍ਹਾ ਭਰ ਗਈ ਹੈ</string>
+  <string name="file_transfer_status_cancelled">ਰੱਦ ਹੋਇਆ</string>
+  <string name="file_transfer_status_error">ਗੜਬੜ ਕਾਰਨ ਤਬਾਦਲਾ ਨਹੀਂ ਹੋਇਆ</string>
+  <string name="file_transfer_status_timed_out">ਸਮਾਂ ਖਤਮ ਹੋਇਆ</string>
+  <string name="file_saved_in">ਫ਼ਾਈਲ %s ਵਿੱਚ ਸਾਂਭੀ ਗਈ</string>
+  <string name="file_saved_successfully">ਫ਼ਾਈਲ ਸਾਂਭੀ ਗਈ</string>
+  <string name="no_space_left_on_device">ਡੀਵਾਈਸ ਵਿੱਚ ਜਗ੍ਹਾ ਖਾਲੀ ਨਹੀਂ ਹੈ</string>
   <string name="title_media_viewer">ਮੀਡੀਆ ਵਿਊਅਰ</string>
   <string name="menu_file_open">ਫ਼ਾਈਲ ਖੋਲ੍ਹੋ</string>
   <string name="menu_file_download">ਫ਼ਾਈਲ ਡਾਊਨਲੋਡ ਕਰੋ</string>
+  <string name="menu_file_save">ਫ਼ਾਈਲ ਸਾਂਭੋ</string>
   <string name="menu_file_delete">ਫ਼ਾਈਲ ਮਿਟਾਓ</string>
   <string name="menu_file_share">ਫ਼ਾਈਲ ਸਾਂਝੀ ਕਰੋ</string>
-  <string name="menu_message_copy">ਕਾਪੀ ਕਰੋ</string>
+  <string name="menu_message_copy">ਨਕਲ ਲਾਹੋ</string>
   <string name="menu_message_delete">ਸੁਨੇਹਾ ਮਿਟਾਓ</string>
   <string name="menu_message_cancel">ਸੁਨੇਹਾ ਰੱਦ ਕਰੋ</string>
   <string name="menu_delete">ਮਿਟਾਓ</string>
+  <string name="pref_darkTheme_title">ਕਾਲਾ ਥੀਮ</string>
+  <string name="pref_darkTheme_summary">ਸਿਸਟਮ ਦੀ ਮਰਜ਼ੀ ਦੀ ਬਜਾਏ ਹਮੇਸ਼ਾ ਕਾਲਾ ਥੀਮ ਚਾਲੂ ਕਰੋ</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">ਗੱਲਾਂਬਾਤਾਂ</string>
   <string name="navigation_item_contact_request">ਸੰਪਰਕ ਬੇਨਤੀਆਂ</string>
   <string name="navigation_item_account">ਖਾਤਾ</string>
+  <string name="search_results_public_directory">ਜਨਤਕ ਨਾਮਾਵਲੀ</string>
   <!--TV-->
+  <string name="tv_send_audio_dialog_message">ਅਵਾਜ਼ੀ ਸੁਨੇਹਾ ਭੇਜੀਏ?</string>
+  <string name="tv_send_image_dialog_message">ਤਸਵੀਰ ਭੇਜੀਏ?</string>
+  <string name="tv_send_video_dialog_message">ਵੀਡੀਓ ਭੇਜੀਏ?</string>
+  <string name="tv_media_preview">ਝਲਕ ਵੇਖੋ</string>
   <string name="tv_audio_play">ਚਲਾਓ</string>
+  <string name="tv_audio_pause">ਰੋਕੋ</string>
   <string name="tv_dialog_send">ਭੇਜੋ</string>
+  <string name="tv_audio_recording">ਰਿਕਾਰਡ ਹੋ ਰਹੀ ਹੈ…</string>
+  <string name="tv_send_text">ਲਿਖਤ ਸੁਨੇਹਾ ਭੇਜੋ</string>
+  <string name="tv_send_audio">ਅਵਾਜ਼ੀ ਸੁਨੇਹਾ ਭੇਜੋ</string>
+  <string name="tv_send_video">ਮੀਡੀਆ ਭੇਜੋ</string>
+  <string name="conversation_input_speech_hint">ਕੁਝ ਕਹੋ…</string>
   <!--Wizard-->
+  <string name="wizard_status_recommended">ਸਿਫ਼ਾਰਸ਼ੀ</string>
+  <string name="wizard_status_optional">ਮਰਜ਼ੀ ਮੁਤਾਬਕ</string>
+  <string name="wizard_status_required">ਲੁੜੀਂਦਾ</string>
+  <string name="wizard_username_info">ਆਪਣੇ ਖਾਤੇ ਲਈ ਕੋਈ ਵਰਤੋਂਕਾਰ ਨਾਂ ਚੁਣੋ</string>
+  <string name="wizard_username_button">ਵਰਤੋਂਕਾਰ ਨਾਂ ਚੁਣੋ</string>
+  <string name="wizard_username_skip">ਵਰਤੋਂਕਾਰ ਨਾਂ ਚੁਣਨਾ ਛੱਡੋ</string>
+  <string name="wizard_password_info">ਖਾਤੇ ਦਾ ਪਾਸਵਰਡ</string>
+  <string name="wizard_password_placeholder">ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਖਾਤਾ ਕੁੰਜੀ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਕੋਈ ਪਾਸਵਰਡ ਚੁਣੋ</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_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-pa/strings_account.xml b/ring-android/app/src/main/res/values-pa/strings_account.xml
index 23a3c912fc904569226fbf5a9c38e363506a8e9d..1aa59644d4f658f4aa8f1a0ba85240b4ec56a20e 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
@@ -3,39 +3,40 @@
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">ਮਿਟਾਓ</string>
   <string name="ic_advanced_menu">ਉੱਨਤ ਸੈਟਿੰਗਾਂ</string>
-  <string name="ic_blacklist_menu">ਬਲਾਕ ਕੀਤੇ ਸੰਪਰਕ</string>
+  <string name="ic_blacklist_menu">ਸੰਪਰਕ ਜਿਨ੍ਹਾਂ \'ਤੇ ਬੰਦਸ਼ ਹੈ</string>
   <!--Strings related to account creation-->
-  <string name="add_ring_account_title">Jami ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ</string>
-  <string name="add_sip_account_title">SIP ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="add_ring_account_title">Jami ਖਾਤਾ ਜੋੜੋ</string>
+  <string name="add_sip_account_title">SIP ਖਾਤਾ ਜੋੜੋ</string>
   <string name="ring_account_default_name">Jami ਖਾਤਾ %1$s</string>
   <string name="prompt_alias">ਦੂਜਾ ਨਾਂ</string>
-  <string name="prompt_hostname">ਹੋਸਟਨਾਮ</string>
+  <string name="prompt_hostname">ਮੇਜ਼ਬਾਨ ਦਾ ਨਾਂ</string>
   <string name="prompt_username">ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <string name="prompt_password">ਪਾਸਵਰਡ</string>
   <string name="action_create">ਖਾਤਾ ਬਣਾਓ</string>
   <string name="action_create_short">ਬਣਾਓ</string>
-  <string name="action_register">ਪੰਜੀਕਰਨ ਕਰੋ</string>
+  <string name="action_register">ਦਰਜ ਹੋਵੋ</string>
   <string name="action_settings">ਸੈਟਿੰਗਾਂ</string>
-  <string name="error_field_required">ਇਹ ਖੇਤਰ ਲੋੜੀਂਦਾ ਹੈ</string>
-  <string name="dialog_wait_create">ਖਾਤਾ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
-  <string name="dialog_wait_create_details">ਕਿਰਪਾ ਕਰਕੇ ਤੁਹਾਡਾ ਨਵਾਂ ਖਾਤਾ ਸ਼ਾਮਲ ਕੀਤੇ ਜਾਣ ਤੱਕ ਉਡੀਕ ਕਰੋ…</string>
+  <string name="error_field_required">ਇਹ ਖੇਤਰ ਲੁੜੀਂਦਾ ਹੈ</string>
+  <string name="dialog_wait_create">ਖਾਤਾ ਜੋੜਿਆ ਜਾ ਰਿਹਾ ਹੈ</string>
+  <string name="dialog_wait_create_details">ਕਿਰਪਾ ਕਰਕੇ ਤੁਹਾਡਾ ਨਵਾਂ ਖਾਤਾ ਜੋੜੇ ਜਾਣ ਤੱਕ ਉਡੀਕ ਕਰੋ…</string>
   <string name="dialog_wait_update">ਖਾਤਾ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
   <string name="dialog_wait_update_details">ਕਿਰਪਾ ਕਰਕੇ ਤੁਹਾਡਾ ਨਵਾਂ ਖਾਤਾ ਅੱਪਡੇਟ ਕੀਤੇ ਜਾਣ ਤੱਕ ਉਡੀਕ ਕਰੋ…</string>
   <string name="dialog_warn_ip2ip_account_title">ਖਾਲੀ SIP ਖਾਤਾ ਬਣਾਈਏ ?</string>
-  <string name="dialog_warn_ip2ip_account_message">ਤੁਸੀਂ ਅਵੈਧ ਹੋਸਟਨਾਮ ਨਾਲ SIP ਖਾਤਾ ਬਣਾਉਣ ਲੱਗੇ ਹੋ।
+  <string name="dialog_warn_ip2ip_account_message">ਤੁਸੀਂ ਮੇਜ਼ਬਾਨ ਦੇ ਅਢੁਕਵੇਂ ਨਾਂ ਨਾਲ SIP ਖਾਤਾ ਬਣਾਉਣ ਲੱਗੇ ਹੋ।
         ਤੁਸੀਂ ਸਿਰਫ਼ ਸਿੱਧੀਆਂ ਆਈ.ਪੀ. ਕਾਲਾਂ ਕਰ ਸਕੋਗੇ ਅਤੇ ਲੈ ਸਕੋਗੇ।
         ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਆਪਣੇ ਖਾਤੇ ਦਾ ਸੰਪਾਦਨ ਕਰ ਸਕਦੇ ਹੋ</string>
   <string name="account_type_ip2ip">ਆਈ.ਪੀ. ਖਾਤਾ</string>
-  <string name="help_ring">Jami ਖਾਤੇ ਨਾਲ ਤੁਸੀਂ ਸਾਥੀ ਤੋਂ ਸਾਥੀ ਵਿਧੀ ਵਾਲੇ ਸੰਪੂਰਨ ਵੰਡਮਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਲੋਕਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹੋ।</string>
-  <string name="help_sip_title">ਆਪਣਾ SIP ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ</string>
-  <string name="help_sip">ਕਿਸੇ ਮੌਜੂਦਾ SIP ਖਾਤੇ ਦਾ ਸੰਰੂਪਣ ਕਰੋ।</string>
-  <string name="create_sip_account">SIP ਖਾਤਾ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="help_ring">Jami ਖਾਤੇ ਨਾਲ ਤੁਸੀਂ ਸਾਥੀ ਤੋਂ ਸਾਥੀ ਵਾਲੇ ਸੰਪੂਰਨ ਵੰਡਮਈ ਨੈੱਟਵਰਕ ਰਾਹੀਂ ਲੋਕਾਂ ਨੂੰ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਸੰਪਰਕ ਕਰ ਸਕਦੇ ਹੋ।</string>
+  <string name="help_sip_title">ਆਪਣਾ SIP ਖਾਤਾ ਜੋੜੋ</string>
+  <string name="help_sip">ਕਿਸੇ ਮੌਜੂਦਾ SIP ਖਾਤੇ ਵਿੱਚ ਫ਼ੇਰਬਦਲ ਕਰੋ।</string>
+  <string name="create_sip_account">SIP ਖਾਤਾ ਜੋੜੋ</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">ਖਾਤਾ ਮਿਟਾਈਏ ?</string>
-  <string name="account_delete_dialog_message">ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।</string>
+  <string name="account_delete_dialog_message">ਇਹ ਕਾਰਵਾਈ ਹੋਣ ਤੋਂ ਬਾਅਦ ਬਦਲੀ ਨਹੀਂ ਜਾ ਸਕਦੀ।</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">ਕਿਸੇ ਖਾਤੇ ਦਾ ਪੰਜੀਕਰਨ ਨਹੀਂ ਕੀਤਾ ਗਿਆ</string>
+  <string name="empty_account_list">ਕੋਈ ਖਾਤਾ ਦਰਜ ਨਹੀਂ ਕੀਤਾ ਗਿਆ</string>
   <string name="normal_accounts_titles">ਖਾਤੇ</string>
+  <string name="normal_devices_titles">ਜੁੜੇ ਹੋਏ ਡੀਵਾਈਸ</string>
   <string name="account_device_revoke">ਡੀਵਾਈਸ ਹਟਾਓ</string>
   <string name="account_device_revocation_success_title">ਸਫਲਤਾ</string>
   <string name="account_device_revocation_success">ਡੀਵਾਈਸ ਹੁਣ ਹਟ ਗਿਆ ਹੈ!</string>
@@ -43,53 +44,74 @@
   <string name="account_device_revocation_wrong_password">ਗਲਤ ਪਾਸਵਰਡ।</string>
   <string name="account_device_revocation_unknown_device">ਅਣਪਛਾਤਾ ਡੀਵਾਈਸ।</string>
   <string name="account_device_revocation_error_unknown">ਅਣਪਛਾਤੀ ਗੜਬੜ।</string>
-  <string name="account_password_change_wait_message">ਖਾਤਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ</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>
   <string name="account_basic_category">ਮੂਲ ਸੈਟਿੰਗਾਂ</string>
   <string name="account_alias_label">ਖਾਤੇ ਦਾ ਨਾਂ</string>
-  <string name="account_hostname_label">ਹੋਸਟਨਾਮ</string>
+  <string name="account_hostname_label">ਮੇਜ਼ਬਾਨ ਦਾ ਨਾਂ</string>
   <string name="account_bootstrap_label">ਬੂਟਸਟ੍ਰੈਪ</string>
   <string name="account_username_label">ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <string name="account_password_label">ਪਾਸਵਰਡ</string>
-  <string name="account_optionnal_category">ਵਿਕਲਪਿਕ ਸੈਟਿੰਗਾਂ</string>
+  <string name="account_optionnal_category">ਮਰਜ਼ੀ ਵਾਲੀਆਂ ਸੈਟਿੰਗਾਂ</string>
   <string name="account_useragent_label">ਵਰਤੋਂਕਾਰ ਏਜੰਟ</string>
   <string name="account_autoanswer_label">ਸਵੈ-ਜਵਾਬ</string>
+  <string name="account_rendezvous_label">ਤੈਅ ਸਮੇਂ \'ਤੇ ਇਕੱਠ ਵਾਲਾ ਮੋਡ</string>
+  <string name="account_rendezvous_summary">ਤੈਅ ਸਮੇਂ \'ਤੇ ਇਕੱਠ ਵਾਲੇ ਮੋਡ ਵਿੱਚ, ਆਉਂਦੀਆਂ ਕਾਲਾਂ ਨੂੰ ਸਭਾ ਵਾਲੇ ਕਮਰੇ ਵਿੱਚ ਜੋੜਿਆ ਜਾਵੇਗਾ।</string>
   <string name="account_upnp_label">UPnP ਚਾਲੂ ਕਰੋ</string>
   <string name="account_proxy_field">ਪ੍ਰੌਕਸੀ</string>
   <!--Audio Details-->
-  <string name="account_audio_label">ਆਡੀਓ</string>
+  <string name="account_audio_label">ਅਵਾਜ਼</string>
   <string name="account_preferences_media_tab">ਮੀਡੀਆ</string>
-  <string name="account_ringtone_label">ਰਿੰਗਟੋਨ</string>
-  <string name="account_ringtone_enabled_label">ਰਿੰਗਟੋਨਾਂ ਚਾਲੂ ਕਰੋ</string>
-  <string name="account_ringtone_path_label">ਰਿੰਗਟੋਨ ਦਾ ਰਾਹ</string>
-  <string name="account_ringtone_custom_label">ਵਿਉਂਤੀ ਰਿੰਗਟੋਨ ਵਰਤੋ</string>
+  <string name="account_ringtone_label">ਘੰਟੀਆਂ</string>
+  <string name="account_ringtone_enabled_label">ਘੰਟੀਆਂ ਚਾਲੂ ਕਰੋ</string>
+  <string name="account_ringtone_path_label">ਘੰਟੀ ਦਾ ਰਾਹ</string>
+  <string name="account_ringtone_custom_label">ਮਨਮਰਜ਼ੀ ਦੀ ਘੰਟੀ ਵਰਤੋ</string>
+  <string name="account_ringtone_title">ਕੋਈ ਘੰਟੀ ਚੁਣੋ</string>
+  <string name="account_ringtone_summary">ਕੋਈ ਘੰਟੀ ਚੁਣੋ ਜਾਂ ਖੁਦ ਕੁਝ ਚੁਣੋ</string>
   <!--Video Details-->
   <string name="account_video_label">ਵੀਡੀਓ</string>
   <string name="account_video_enable">ਵੀਡੀਓ ਚਾਲੂ ਕਰੋ</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">ਉੱਨਤ</string>
-  <string name="account_registration_exp_label">ਪੰਜੀਕਰਨ ਦੀ ਮਿਆਦ</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>
   <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>
+  <string name="size_mb">%1$d MB</string>
   <string name="account_turn_enable_label">TURN ਵਰਤੋ</string>
   <string name="account_turn_server_label">TURN ਸਰਵਰ</string>
   <string name="account_turn_username_label">TURN ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <string name="account_turn_password_label">TURN ਪਾਸਵਰਡ</string>
-  <string name="account_published_same_as_local_label">ਸਥਾਨਕ ਵਾਂਗ ਦਿਖਾਇਆ ਗਿਆ</string>
-  <string name="account_published_port_label">ਦਿਖਾਇਆ ਗਿਆ ਪੋਰਟ</string>
+  <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_proxy_label">DHT ਪ੍ਰੌਕਸੀ</string>
   <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_peer_discovery_label">ਸਥਾਨਕ ਸਾਥੀ ਦੀ ਭਾਲ</string>
+  <string name="account_peer_discovery_enable_label">ਸਥਾਨਕ ਸਾਥੀ ਦੀ ਭਾਲ ਚਾਲੂ ਕਰੋ</string>
+  <string name="account_peer_discovery_enable_summary">ਸਾਡੇ ਸਥਾਨਕ ਨੈੱਟਵਰਕ \'ਤੇ ਪੇਸ਼ ਕੀਤੀਆਂ ਹੋਰਾਂ DHT ਗੰਢਾਂ ਨਾਲ ਜੁੜੋ</string>
   <!--Security Details-->
   <string name="account_credentials_label">ਵਰਤੋਂਕਾਰ ਨਾਂ/ਪਾਸਵਰਡ</string>
   <string name="account_credentials_edit">ਵਰਤੋਂਕਾਰ ਨਾਂ/ਪਾਸਵਰਡ ਦਾ ਸੰਪਾਦਨ ਕਰੋ</string>
   <string name="account_credentials_add">ਵਰਤੋਂਕਾਰ ਨਾਂ/ਪਾਸਵਰਡ ਸ਼ਾਮਲ ਕਰੋ</string>
   <!--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"> SRTP ਦੇ ਨਾ ਚੱਲਣ \'ਤੇ RTP \'ਤੇ ਵਾਪਸ ਆਓ</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">TLS ਸਾਧਨ ਵਰਤੋ</string>
@@ -103,6 +125,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>
@@ -113,6 +136,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>
@@ -142,25 +166,36 @@
   <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">ਪਿੰਨ ਦਾਖਲ ਕਰੋ</string>
   <string name="account_new_button">Jami ਖਾਤਾ ਬਣਾਓ</string>
-  <string name="account_link_export_button">ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ ਨੂੰ ਇਸ ਖਾਤੇ ਨਾਲ ਲਿੰਕ ਕਰੋ</string>
+  <string name="account_link_export_button">ਨਵਾਂ ਡੀਵਾਈਸ ਜੋੜੋ</string>
   <string name="account_link_export_info">ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਇਹ ਖਾਤਾ ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ Jami \'ਤੇ ਇਸਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਪਵੇਗਾ। ਇੰਝ ਕਰਨ ਨਾਲ ਪਿੰਨ ਕੋਡ ਸਿਰਜਿਆ ਜਾਵੇਗਾ ਜਿਸਨੂੰ ਤੁਹਾਨੂੰ ਖਾਤੇ ਦੇ ਸੈੱਟਅੱਪ ਵੇਲੇ ਨਵੇਂ ਡੀਵਾਈਸ \'ਤੇ ਦਾਖਲ ਕਰਨਾ ਪਵੇਗਾ। ਪਿੰਨ 10 ਮਿੰਟਾਂ ਲਈ ਵੈਧ ਰਹਿੰਦਾ ਹੈ।</string>
   <string name="account_start_export_button">ਪਿੰਨ ਸਿਰਜੋ</string>
   <string name="account_end_export_button">ਬੰਦ ਕਰੋ</string>
   <string name="account_end_export_infos">ਤੁਹਾਡਾ ਪਿੰਨ:\n\n%%\n\nਸੈੱਟਅੱਪ ਪੂਰਾ ਕਰਨ ਲਈ, ਤੁਹਾਨੂੰ ਨਵੇਂ ਡੀਵਾਈਸ \'ਤੇ Jami ਖੋਲ੍ਹਣ ਦੀ ਲੋੜ ਹੈ। \"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਕਿਸੇ ਖਾਤੇ ਨਾਲ ਲਿੰਕ ਕਰੋ\" ਨਾਲ ਨਵਾਂ ਖਾਤਾ ਬਣਾਓ। ਤੁਹਾਡਾ ਪਿੰਨ 10 ਮਿੰਟਾਂ ਲਈ ਵੈਧ ਰਹਿੰਦਾ ਹੈ।</string>
   <string name="account_link_export_info_light">ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਇਹ ਖਾਤਾ ਵਰਤਣ ਲਈ, ਤੁਹਾਨੂੰ ਪਹਿਲਾਂ Jami \'ਤੇ ਇਸਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਪਵੇਗਾ। ਇੰਝ ਕਰਨ ਨਾਲ ਪਿੰਨ ਕੋਡ ਸਿਰਜਿਆ ਜਾਵੇਗਾ ਜਿਸਨੂੰ ਤੁਹਾਨੂੰ ਖਾਤੇ ਦੇ ਸੈੱਟਅੱਪ ਵੇਲੇ ਨਵੇਂ ਡੀਵਾਈਸ \'ਤੇ ਦਾਖਲ ਕਰਨਾ ਪਵੇਗਾ। ਪਿੰਨ 10 ਮਿੰਟਾਂ ਲਈ ਵੈਧ ਰਹਿੰਦਾ ਹੈ।</string>
   <string name="account_export_title">ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ</string>
+  <string name="account_connect_server_button">ਪ੍ਰਬੰਧ ਸਰਵਰ ਨਾਲ ਜੋੜੋ</string>
+  <string name="account_connect_button">ਜੋੜੋ</string>
+  <string name="prompt_server">Jami ਪ੍ਰਬੰਧ ਸਰਵਰ ਦਾ URL</string>
+  <string name="help_credentials_enter">ਆਪਣੀ ਸੰਸਥਾ ਸਬੰਧੀ ਨਾਂ ਦਾਖਲ ਕਰੋ</string>
+  <string name="help_connect_password_enter">ਆਪਣੀ ਸੰਸਥਾ ਸਬੰਧੀ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ</string>
   <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>
+  <string name="register_recommended">ਸਿਫ਼ਾਰਸ਼ੀ</string>
   <string name="username_already_taken">ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲਿਆ ਗਿਆ</string>
   <string name="invalid_username">ਅਵੈਧ ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
+  <string name="unknown_error">ਅਣਪਛਾਤੀ ਗੜਬੜ। ਕਿਰਪਾ ਕਰਕੇ ਆਪਣਾ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ ਦੀ ਜਾਂਚ ਕਰੋ!</string>
   <string name="looking_for_username_availability">ਵਰਤੋਂਕਾਰ ਨਾਂ ਦੀ ਉਪਲਬਧਤਾ ਲੱਭੀ ਜਾ ਰਹੀ ਹੈ…</string>
   <string name="account_status_connecting">ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ</string>
   <string name="account_status_connection_error">ਕਨੈਕਸ਼ਨ ਗੜਬੜ</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 c6f6a49876b72bc7705384b1b31fee1b5a5fd28d..e95f9d196e54365aa58ec44293bb3d69554db1df 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
@@ -136,7 +136,6 @@ Możesz edytować swoje konto później</string>
   <string name="account_sip_register_anyway">Zarejestruj mimo to</string>
   <string name="account_link_prompt_pin">Wprowadź PIN</string>
   <string name="account_new_button">Utwórz konto Jami</string>
-  <string name="account_link_export_button">Połącz kolejne urządzenie z tym kontem</string>
   <string name="account_start_export_button">Generuj PIN</string>
   <string name="account_end_export_button">zamknij</string>
   <string name="account_export_title">Dodaj urządzenia</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 49cdffd14b83f5b64fb493fd12942c94d3c25e86..b892ee45528f327955c0b1e03a7f270c3e29c966 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
@@ -150,7 +150,7 @@ Możesz edytować swoje konto później</string>
   <string name="account_link_archive_button">Połącz z kopii zapasowej</string>
   <string name="account_link_prompt_pin">Wprowadź PIN</string>
   <string name="account_new_button">Stwórz konto Jami</string>
-  <string name="account_link_export_button">Połącz kolejne urządzenie z tym kontem</string>
+  <string name="account_link_export_button">Połącz nowe urządzenie</string>
   <string name="account_link_export_info">Aby korzystać z tego konta na innych urządzeniach, musisz najpierw udostępnić je w Jami. To wygeneruje kod PIN, który musisz wprowadzić na nowym urządzeniu aby dodać konto. PIN jest ważny przez 10 minut. </string>
   <string name="account_start_export_button">Generuj PIN</string>
   <string name="account_end_export_button">zamknij</string>
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 1a5c9c59774fe3f322cff6bfb0075601b9efff70..8fdb76e5491b0ff9c20cadb6f1be1f6f8ed7cce7 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
@@ -88,6 +88,8 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <!--Call Fragment-->
   <string name="you_txt_prefix">Você:</string>
   <string name="action_call_hangup">Desligar</string>
+  <string name="action_call_maximize">Maximizar</string>
+  <string name="action_call_minimize">Reduzir</string>
   <string name="ongoing_call">Chamada em andamento</string>
   <string name="hist_in_call">Recebimento de chamada %1$s</string>
   <string name="hist_out_call">Chamada de saída %1$s</string>
@@ -186,6 +188,7 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="wizard_skip">Pular</string>
   <!--Account Summary-->
   <string name="profile">Perfil</string>
+  <string name="profile_name">Nome do perfil</string>
   <string name="profile_message_warning">Seu perfil é compartilhado apenas com seus contatos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
@@ -289,4 +292,5 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="wizard_profile_info">O perfil só é compartilhado com contatos</string>
   <string name="wizard_profile_button">Salvar perfil</string>
   <string name="wizard_profile_skip">Pular e fazer depois</string>
+  <string name="fab_path_choose">Escolha outro arquivo</string>
 </resources>
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 d00f407b458a1f10dd3e223541cc338cb66bb2f2..62d9e661a7fea7d32d5e316e2208cb27dacdefc2 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
@@ -36,6 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nenhuma conta registrada</string>
   <string name="normal_accounts_titles">Contas</string>
+  <string name="normal_devices_titles">Dispositivos associados</string>
   <string name="account_device_revoke">Revogar dispositivo</string>
   <string name="account_device_revocation_success_title">Sucesso</string>
   <string name="account_device_revocation_success">Dispositivo foi revogado!</string>
@@ -44,6 +45,7 @@
   <string name="account_device_revocation_unknown_device">Dispositivo desconhecido.</string>
   <string name="account_device_revocation_error_unknown">Erro desconhecido.</string>
   <string name="account_password_change">Alterar senha</string>
+  <string name="account_password_set">Configurar senha</string>
   <string name="account_password_change_wait_message">Alterando senha da conta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Geral</string>
@@ -56,6 +58,8 @@
   <string name="account_optionnal_category">Configurações opcionais</string>
   <string name="account_useragent_label">Agente de usuário</string>
   <string name="account_autoanswer_label">Resposta automática</string>
+  <string name="account_rendezvous_label">Modo de Encontro</string>
+  <string name="account_rendezvous_summary">No Modo de Encontro, as chamadas recebidas serão adicionadas a uma sala de conferência.</string>
   <string name="account_upnp_label">Habilitar UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
@@ -132,6 +136,7 @@
   <string name="error_passwords_not_equals">Senhas não correspondem</string>
   <string name="export_account_wait_title">Por favor, aguarde...</string>
   <string name="export_account_wait_message">Exportando informações da conta</string>
+  <string name="account_export_file">Backup da conta</string>
   <string name="account_export_end_decryption_message">Não foi possível desbloquear sua conta utilizando a senha fornecida.</string>
   <string name="account_export_end_network_title">Erro de rede</string>
   <string name="account_export_end_network_message">Não foi possível exportar a conta na rede. Verifique sua conexão.</string>
@@ -166,7 +171,7 @@
   <string name="account_link_archive_button">Conectar-se a partir do backup</string>
   <string name="account_link_prompt_pin">Entre o PIN</string>
   <string name="account_new_button">Criar uma conta no Jami</string>
-  <string name="account_link_export_button">Associar outro dispositivo à esta conta</string>
+  <string name="account_link_export_button">Associar um novo dispositivo</string>
   <string name="account_link_export_info">Para usar esta conta em outros dispositivos, você deve antes expô-la no Jami. Isso gerará um código PIN que você deverá entrar no novo dispositivo para configurar a conta. Este PIN é válido por 10 minutos.</string>
   <string name="account_start_export_button">Gerar código PIN</string>
   <string name="account_end_export_button">fechar</string>
@@ -183,6 +188,7 @@
   <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>
   <string name="registered_username">Nome de usuário registrado</string>
   <string name="register_username">Registrar nome de usuário público</string>
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 f93ee382d1729b68432ac68e223bfaa60de87058..82b7e68d752e241267e9c9f2381a917520e0bd24 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
@@ -41,4 +41,5 @@
   <string name="plugin_recent_version_exception">Você tem uma versão mais recente de: <b>%1$s</b></string>
   <string name="plugin_same_version_exception">Você tem a mesma versão de <b>%1$s</b> instalada</string>
   <string name="plugin_force_install">forçar a instalação</string>
+  <string name="plugin_path_image_add">Adicionar uma nova imagem</string>
 </resources>
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 e3254f1c404e94b9a2610ed473916fbb1d9b1a34..db8391a7caa2f3c238a237d3ec048f626ed47de3 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
@@ -161,7 +161,7 @@
   <string name="account_link_archive_button">Conectar da cópia de segurança</string>
   <string name="account_link_prompt_pin">Introduza o PIN</string>
   <string name="account_new_button">Criar uma conta Jami</string>
-  <string name="account_link_export_button">Associar outro dispositivo a esta conta</string>
+  <string name="account_link_export_button">Associar a um novo dispositivo</string>
   <string name="account_link_export_info">Para usar esta conta noutros dispositivos, necessita primeiro de expo-lo ao Jami. Isto irá gerar um código PIN que necessita de introduzir no novo dispositivo para configurar a sua conta. O PIN é válido por apenas 10 minutos.</string>
   <string name="account_start_export_button">Gerar código PIN</string>
   <string name="account_end_export_button">fechar</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 1972bc93bcd3ed92fca5829f669f5b74d465eb99..88138ab75c8751b901cf6bb269a2141434732fe9 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
@@ -150,7 +150,7 @@
   <string name="account_link_archive_button">Conectar da cópia de segurança</string>
   <string name="account_link_prompt_pin">Introduza o PIN</string>
   <string name="account_new_button">Criar uma conta Jami</string>
-  <string name="account_link_export_button">Associar outro dispositivo a esta conta</string>
+  <string name="account_link_export_button">Associar a um novo dispositivo</string>
   <string name="account_link_export_info">Para usar esta conta noutros dispositivos, necessita primeiro de expo-lo ao Jami. Isto irá gerar um código PIN que necessita de introduzir no novo dispositivo para configurar a sua conta. O PIN é válido por apenas 10 minutos.</string>
   <string name="account_start_export_button">Gerar código PIN</string>
   <string name="account_end_export_button">fechar</string>
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 44d4b3519dc05766029fec694e541268c3f340b9..5d876ba41aa94d72e0b5538ffaf976ca93ba63d9 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
@@ -188,6 +188,7 @@
   <string name="wizard_skip">Omite</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Numele profilului</string>
   <string name="profile_message_warning">Profilul tău este distribuit doar contactelor tale</string>
   <string name="open_the_gallery">Deschide galeria</string>
   <string name="take_a_photo">Fă o poză</string>
@@ -283,7 +284,7 @@
   <string name="wizard_username_button">Alege Numele de Utilizator</string>
   <string name="wizard_username_skip">Saltă alegerea numelui de utilizator</string>
   <string name="wizard_password_info">Parola contului</string>
-  <string name="wizard_password_placeholder">Alege o parolă pentru a cifra contul tău pe acest dispozitiv</string>
+  <string name="wizard_password_placeholder">Alege o parolă pentru a cifra contul tău pe acest aparat</string>
   <string name="wizard_password_button">Alege parola</string>
   <string name="wizard_password_skip">Creează contul</string>
   <string name="wizard_password_switch">Cifrează contul cu parolă</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 4902ba767056331dfa72ad3735bc981d18637c24..23d7ace181e0221af601922aaca824b1cfa128db 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
@@ -36,13 +36,13 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nu este înscris niciun cont</string>
   <string name="normal_accounts_titles">Conturi</string>
-  <string name="normal_devices_titles">Dispozitive asociate</string>
-  <string name="account_device_revoke">Elimină dispozitivul</string>
+  <string name="normal_devices_titles">Aparate asociate</string>
+  <string name="account_device_revoke">Elimină aparatul</string>
   <string name="account_device_revocation_success_title">Succes</string>
-  <string name="account_device_revocation_success">Dispozitivul este acum eliminat!</string>
-  <string name="account_device_revocation_error_title">Dispozitivul nu poate fi eliminat</string>
+  <string name="account_device_revocation_success">Aparatul este acum eliminat!</string>
+  <string name="account_device_revocation_error_title">Aparatul nu poate fi eliminat</string>
   <string name="account_device_revocation_wrong_password">Parolă greșită.</string>
-  <string name="account_device_revocation_unknown_device">Dispozitiv necunoscut.</string>
+  <string name="account_device_revocation_unknown_device">Aparat necunoscut.</string>
   <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>
@@ -58,6 +58,8 @@
   <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>
+  <string name="account_rendezvous_label">Modalitate Întîlnire</string>
+  <string name="account_rendezvous_summary">În modalitatea Întîlnire, apelurile primite vor fi adăugate la o sală de conferințe.</string>
   <string name="account_upnp_label">Activează UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
@@ -134,6 +136,7 @@
   <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_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>
@@ -151,30 +154,30 @@
   <string name="account_migration_message_dialog">Conturile tale trebuie actualizate. Vrei să te duci la \"Gestionează cont\" pentru a face acest lucru ?</string>
   <string name="account_update_needed">Actualizare necesară</string>
   <string name="account_cannot_be_found_title">Nu pot găsi contul</string>
-  <string name="account_cannot_be_found_message">Contul nu poate fi găsit în rețeaua Jami.\nAsigură-te că a fost exportat pe Jami de pe un dispozitiv existent și datele de autentificare sînt corecte.</string>
+  <string name="account_cannot_be_found_message">Contul nu poate fi găsit în rețeaua Jami.\nAsigură-te că a fost exportat pe Jami dintr-un aparat existent și datele de autentificare sînt corecte.</string>
   <string name="account_sip_cannot_be_registered_message">Poți continua cu procesul de creare a contului sau poți modifica informațiile tale aici. Modificarea e posibilă ulterior în reglările contului.</string>
   <string name="account_no_network_title">Nu mă pot conecta la rețea</string>
   <string name="account_no_network_message">Contul nu poate fi adăugat deoarece Jami nu se poate conecta la rețea. Verifică conectarea la rețea.</string>
-  <string name="account_device_added_title">Cont adăugat</string>
-  <string name="account_device_added_message">Ai configurat cu succes contul Jami pe acest dispozitiv.</string>
-  <string name="account_device_updated_title">Dispozitiv actualizat</string>
+  <string name="account_device_added_title">Aparat adăugat</string>
+  <string name="account_device_added_message">Ai configurat cu succes contul Jami în acest aparat.</string>
+  <string name="account_device_updated_title">Aparat actualizat</string>
   <string name="account_device_updated_message">Ai actualizat cu succes contul tău Jami.</string>
-  <string name="account_cannot_be_updated_message">Dispozitivul asociat nu poate fi actualizat. Verifică parola.</string>
+  <string name="account_cannot_be_updated_message">Aparatul asociat nu poate fi actualizat. Verifică parola.</string>
   <string name="account_sip_success_title">Cont SIP înscris</string>
   <string name="account_sip_success_message">Ai înscris cu succes contul tău SIP.</string>
   <string name="account_sip_register_anyway">Înscrie-te oricum</string>
-  <string name="account_link_device">Conectează-te de la alt dispozitiv</string>
+  <string name="account_link_device">Conectează-te de la alt aparat</string>
   <string name="account_link_button">Conectează-te dintr-o rețea</string>
   <string name="account_link_archive_button">Conectează-te de la o copie de rezervă</string>
   <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ă alt dispozitiv acestui cont</string>
-  <string name="account_link_export_info">Pentru a utiliza acest cont pe alte dispozitive, trebuie să îl expui mai întîi pe Jami. Asta va genera un cod PIN pe care trebuie să-l introduci pe noul dispozitiv pentru a configura contul. Acest PIN este valabil 10 minute.</string>
+  <string name="account_link_export_button">Asociază un nou aparat</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>
-  <string name="account_end_export_infos">PIN-ul tău este:\n\n%%\n\nPentru a completa procesul, trebuie să deschizi Jami pe noul dispozitiv. Creează un cont nou cu \"Asociază acest dispozitiv unui cont\". Codul tău PIN este valabil 10 minute.</string>
-  <string name="account_link_export_info_light">Pentru a utiliza acest cont pe alte dispozitive, trebuie să îl expui mai întîi pe Jami. Asta va genera un cod PIN pe care trebuie să-l introduci pe noul dispozitiv pentru a configura contul. Acest PIN este valabil 10 minute.</string>
-  <string name="account_export_title">Adaugă dispozitive</string>
+  <string name="account_end_export_infos">PIN-ul tău este:\n\n%%\n\nPentru a completa procesul, trebuie să deschizi Jami în noul aparat. Creează un cont nou cu \"Asociază acest aparat unui cont\". Codul tău PIN este valabil 10 minute.</string>
+  <string name="account_link_export_info_light">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_export_title">Adaugă aparate</string>
   <string name="account_connect_server_button">Conectează-te la serverul de administrare</string>
   <string name="account_connect_button">Conectează</string>
   <string name="prompt_server">URL-ul serverului de administrare Jami</string>
@@ -185,6 +188,7 @@
   <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="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>
@@ -203,22 +207,22 @@
   <string name="account_creation_home">Bine ai venit pe Jami</string>
   <string name="account_creation_profile">Creează profilul tău</string>
   <string name="account_creation_ring">Creează contul tău Jami</string>
-  <string name="account_link_title">Asociază acest dispozitiv</string>
+  <string name="account_link_title">Asociază acest aparat</string>
   <string name="account_sip_cannot_be_registered">Nu pot înscrie contul</string>
   <!--Edit profile-->
   <string name="account_edit_profile">Modifică profilul tău</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">Introdu parola pentru confirmare</string>
   <string name="enter_password">Introdu parola</string>
-  <string name="revoke_device_title">Elimină dispozitivul</string>
+  <string name="revoke_device_title">Elimină aparatul</string>
   <string name="revoke_device_message">Sigur vrei să elimini %1$s ?</string>
   <string name="revoke_device_wait_title">Te rog așteaptă...</string>
-  <string name="revoke_device_wait_message">Se elimină dispozitivul</string>
-  <string name="rename_device_title">Redenumește acest dispozitiv</string>
-  <string name="rename_device_message">Alege un nume nou pentru a identifica acest dispozitiv în contul tău Jami</string>
-  <string name="rename_device_button">Redenumește dispozitivul</string>
-  <string name="account_rename_device_hint">Alege un nume nou pentru dispozitiv</string>
-  <string name="account_device_name_empty">Numele dispozitivului nu poate fi gol</string>
-  <string name="account_device_this_indicator">acest dispozitiv</string>
+  <string name="revoke_device_wait_message">Se elimină aparatul</string>
+  <string name="rename_device_title">Redenumește acest aparat</string>
+  <string name="rename_device_message">Alege un nume nou pentru a identifica acest aparat în contul tău Jami</string>
+  <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_disabled_indicator">dezactivat</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 058d1b549b24eb52d207a7c5eb1ebf4af763751d..455c8c686f0fd7afd8a65cdcffc25e73a1388297 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
@@ -152,7 +152,6 @@
   <string name="account_link_archive_button">Подключиться через резервную копию</string>
   <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_export_info">Чтобы использовать эту учетную запись на других устройствах, вы должны сначала предоставить ее в Jami. При этом будет сгенерирован PIN-код, который необходимо ввести на новом устройстве. PIN-код действителен в течение 10 минут.</string>
   <string name="account_start_export_button">Сгенерировать PIN </string>
   <string name="account_end_export_button">закрыть</string>
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 fc3f72382861c626326cce1bceb7e4513c7ecc6e..eaa4e13acc4ccdc565c0a8a2e59522675238f898 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -85,15 +85,20 @@
   <string name="notif_location_action_stop">Остановить трансляцию геопозиции</string>
   <string name="location_share_action_start">Начать трансляцию</string>
   <string name="location_share_action_stop">Остановить трансляцию</string>
+  <string name="location_share_about_title">Информация о карте</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Вы:</string>
   <string name="action_call_hangup">Повесить трубку</string>
+  <string name="action_call_maximize">Максимизировать</string>
+  <string name="action_call_minimize">Уменьшить</string>
   <string name="ongoing_call">Исходящий вызов</string>
   <string name="hist_in_call">Входящий звонок %1$s</string>
   <string name="hist_out_call">Исходящий звонок %1$s</string>
   <string name="start_error_title">Невозможно запустить Jami!</string>
   <string name="start_error_mic_required">Для работы Jami требуется разрешение на использование микрофона.</string>
   <string name="action_call_accept">Принять</string>
+  <string name="action_call_hold_accept">Задержать и ответить на звонок</string>
+  <string name="action_call_end_accept">Завершить и ответить на звонок</string>
   <string name="action_call_decline">Отклонить</string>
   <string name="action_call_mic_mute">Выключить микрофон</string>
   <string name="action_load_plugin">Загрузить дополнение</string>
@@ -184,6 +189,7 @@
   <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>
@@ -287,4 +293,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-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 825fcc78bcb0af15671937abe1bd3c449421ad37..6ed9c74a2f322ae9af22eb404280b20392080d7f 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
@@ -162,7 +162,7 @@
   <string name="account_link_archive_button">Подключиться из резервной копии</string>
   <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_export_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>
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 65b100b99817cef29f72282a20bd9fbb10d5fd0e..e2dc59b3ff487a0ec42087ec91ac635a74066e3c 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
@@ -25,4 +25,5 @@
   <string name="pref_persistNotification_title">Работа в фоновом режиме</string>
   <string name="pref_persistNotification_summary">Разрешить работу в фоновом режиме для принятия звонков и сообщений.</string>
   <!--Plugin-->
+  <string name="pref_plugins_title">Плагины</string>
 </resources>
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 a48e7de961e583e5d3d88b3e66a8e16b756be138..532f79d92110ce14843b570a00d877289696cba7 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
@@ -162,7 +162,7 @@
   <string name="account_link_archive_button">Pripojiť zo zálohy</string>
   <string name="account_link_prompt_pin">Zadajte PIN</string>
   <string name="account_new_button">Vytvoriť Jami účet</string>
-  <string name="account_link_export_button">Prepojiť ďalšie zariadenie s týmto účtom</string>
+  <string name="account_link_export_button">Prepojiť nové zariadenie</string>
   <string name="account_link_export_info">Aby ste mohli tento účet používať na viacerých zariadeniach, musíte ho najprv sprístupniť na Jami. Vygeneruje sa PIN kód, ktorý je potrebný zadať na novom zariadení. Tento kód bude funkčný 10 minút.</string>
   <string name="account_start_export_button">Vygenerovať PIN</string>
   <string name="account_end_export_button">Zavrieť</string>
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 673937c16b69d5f03b824f7b26722da8360abde8..55b1b2dd9945672915b42a229fb4d9141e4233f1 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
@@ -112,7 +112,6 @@
   <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_link_export_button">Poveži drugo napravo s tem računom</string>
   <string name="account_end_export_button">zapri</string>
   <string name="account_connect_prompt_username">Uporabnik</string>
   <!--Name registration-->
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 56857560894e380e7857e48c3de1d3e9b929bcd7..a24a955cd8acae82295b6b0b15a3eb7827f4bc94 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
@@ -187,6 +187,7 @@
   <string name="wizard_skip">Anashkaloje</string>
   <!--Account Summary-->
   <string name="profile">Profil</string>
+  <string name="profile_name">Emër Profili</string>
   <string name="profile_message_warning">Profili juaj ndahet vetëm me kontaktet tuaja</string>
   <string name="open_the_gallery">Hape galerinë</string>
   <string name="take_a_photo">Bëni një foto</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 0b2b23f9d175cbdecc8249c479d96426d656b403..7c53b6d298738ec86fba1c854ae77edebb24f5bd 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
@@ -58,6 +58,8 @@
   <string name="account_optionnal_category">Rregullime Opsionale</string>
   <string name="account_useragent_label">Agjent Përdoruesi</string>
   <string name="account_autoanswer_label">Vetëpërgjigje</string>
+  <string name="account_rendezvous_label">Mënyra Rendezvous</string>
+  <string name="account_rendezvous_summary">Nën mënyrën Rendezvous, thirrjet ardhëse do të shtohen te një dhomë konference.</string>
   <string name="account_upnp_label">Aktivizo UPnP</string>
   <string name="account_proxy_field">Ndërmjetës</string>
   <!--Audio Details-->
@@ -134,6 +136,7 @@
   <string name="error_passwords_not_equals">Fjalëkalimet nuk përputhen</string>
   <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_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>
@@ -168,7 +171,7 @@
   <string name="account_link_archive_button">Lidhje prej kopjeruajtjeje</string>
   <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 te kjo llogari një pajisje tjetër</string>
+  <string name="account_link_export_button">Lidhni një pajisje të re</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>
@@ -185,6 +188,7 @@
   <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="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>
   <string name="registered_username">Emër përdoruesi i regjistruar</string>
   <string name="register_username">Regjistroni emër publik përdoruesi</string>
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 65bf20e25f34c03ee48e9dbb842834eec84c5f4c..ba2a6598d31fa77856bd0bf41739d3aa6fca9982 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -228,5 +228,10 @@
   <string name="tv_audio_pause">Paus</string>
   <string name="tv_dialog_send">Skicka</string>
   <!--Wizard-->
+  <string name="wizard_status_recommended">Rekommendera</string>
+  <string name="wizard_status_optional">Valfri</string>
+  <string name="wizard_status_required">Obligatorisk</string>
+  <string name="wizard_username_info">Välj användarnamn för ditt konto</string>
   <string name="wizard_password_skip">Skapa konto</string>
+  <string name="wizard_password_switch">Kryptera kontot med lösenord</string>
 </resources>
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 de1d8a6d1883cb16cb7780b67b1cd452914378a4..efa8d7cf35434bebde567e9c614424b4caab63b1 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
@@ -36,6 +36,7 @@ Du kan ändra kontot senare.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Inget konto registrerat</string>
   <string name="normal_accounts_titles">Konton</string>
+  <string name="normal_devices_titles">Länkade enheter</string>
   <string name="account_device_revoke">Återkalla enhet</string>
   <string name="account_device_revocation_success_title">Slutfört</string>
   <string name="account_device_revocation_success">Enheten är inte återkallad!</string>
@@ -149,13 +150,14 @@ Du kan ändra kontot senare.</string>
   <string name="account_link_archive_button">Anslut från säkerhetskopia</string>
   <string name="account_link_prompt_pin">Ange PIN-kod</string>
   <string name="account_new_button">Skapa ett Jami-konto</string>
-  <string name="account_link_export_button">Koppla en annan enhet till detta konto</string>
+  <string name="account_link_export_button">Koppla en ny enhet</string>
   <string name="account_link_export_info">För att använda detta konto på en annan enhet, måste du först exponera det på Jami. Detta genererar en PIN-kod som du måste ange på den nya enheten för att öppna kontot. Pin-koden är giltig i 10 minuter.</string>
   <string name="account_start_export_button">Generera PIN-kod</string>
   <string name="account_end_export_button">stäng</string>
   <string name="account_end_export_infos">Din PIN-kod är:\n\n%%\n\nFör att slutföra processen måste du starta Jami på den nya enheten. Skapa ett nytt konto med \"Koppla denna enhet till ett konto\". Din PIN-kod är giltig i 10 minuter.</string>
   <string name="account_link_export_info_light">För att använda detta konto på en annan enhet, måste du först exponera det på Jami. Detta genererar en PIN-kod som du måste ange på den nya enheten för att öppna kontot. Pin-koden är giltig i 10 minuter.</string>
   <string name="account_export_title">Lägg till enheter</string>
+  <string name="account_connect_button">Anslut</string>
   <string name="account_connect_prompt_username">Användarnamn</string>
   <!--Name registration-->
   <string name="error_username_empty">Ange ett användarnamn</string>
@@ -164,6 +166,7 @@ Du kan ändra kontot senare.</string>
   <string name="trying_to_register_name">Försöker registrera namnet</string>
   <string name="registered_username">Registrerat namn</string>
   <string name="register_username">Registrera offentligt användarnamn</string>
+  <string name="register_recommended">Rekommendera</string>
   <string name="username_already_taken">Användarnamnet finns redan</string>
   <string name="invalid_username">Ogiltigt användarnamn</string>
   <string name="unknown_error">Okänt fel! Kontrollera din nätverksanslutning.</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 42d9c71d905f85b976ae5a0b6a91cd6c53c3ea2b..5c7f85e38b5a6045510befe8f02567237e71b3db 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
@@ -162,7 +162,7 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="account_link_archive_button">Yedeklemeden bağlan</string>
   <string name="account_link_prompt_pin">PIN\'i gir</string>
   <string name="account_new_button">Bir Jami hesabı oluştur</string>
-  <string name="account_link_export_button">Başka aygıtı bu hesaba bağla</string>
+  <string name="account_link_export_button">Yeni bir aygıt bağlayın</string>
   <string name="account_link_export_info">Bu hesabı başka aygıtlarda kullanmak için önce Jami\'de açmalısınız. Bu, hesabı kurmak için yeni aygıtta girmeniz gereken bir PIN kodu oluşturacak. PIN 10 dakikalığına geçerlidir.</string>
   <string name="account_start_export_button">PIN oluştur</string>
   <string name="account_end_export_button">kapat</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 91e78b7596e4dbcc04720d4a6376e6ad887950ed..64df8540eef0a765532388dcfb4d699425fe027b 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
@@ -140,7 +140,6 @@
   <string name="account_sip_register_anyway">Зареєструвати все одно</string>
   <string name="account_link_prompt_pin">Ввести PIN-код</string>
   <string name="account_new_button">Створити обліковий запис Джамі</string>
-  <string name="account_link_export_button">Прив\'язати інший пристрій до цього облікового запису</string>
   <string name="account_link_export_info">Для використання цього облікового запису на інших пристроях, вам необхідно надати доступ до нього в Джамі. При цьому буде згенеровано PIN-код, який вам необхідно буде ввести на іншому пристрої, щоб налаштувати обліковий запис. PIN-код дійсний протягом 10 хвилин.</string>
   <string name="account_start_export_button">Отримати новий PIN-код</string>
   <string name="account_end_export_button">закрити</string>
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 5de38be3861d1afb5f801e68efa53ee9e70bde64..4153a7463afb3c0f10da99f750b761dfafd0d9e1 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
@@ -186,6 +186,7 @@
   <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>
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 3b87bd8bd01e02313a3d3d023fd9687f7d2d9763..96a452adc48e3da31ad73a2a9ba8888dbf5dd663 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
@@ -58,6 +58,8 @@
   <string name="account_optionnal_category">可选设置</string>
   <string name="account_useragent_label">用户代理</string>
   <string name="account_autoanswer_label">自动应答</string>
+  <string name="account_rendezvous_label">集合点模式</string>
+  <string name="account_rendezvous_summary">在集合点模式中，传入呼叫将加入会议房间。</string>
   <string name="account_upnp_label">启用 UPnP</string>
   <string name="account_proxy_field">代理</string>
   <!--Audio Details-->
@@ -134,6 +136,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>
@@ -168,7 +171,7 @@
   <string name="account_link_archive_button">从备份文件关联</string>
   <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_export_button">关联新设备</string>
   <string name="account_link_export_info">要在其他设备上使用此账户，您必须先在 Jami 上公开它。这将生成一个 PIN 码，您必须在新设备上输入该 PIN 码才能设置此账户。PIN 码有效期为 10 分钟。</string>
   <string name="account_start_export_button">生成 PIN 码</string>
   <string name="account_end_export_button">关闭</string>
@@ -185,6 +188,7 @@
   <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-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 4b3c0adba33ec0ef41a035a1e65e804e64eed8a2..c410ecd0c20dc1235a28dbb6cb7932fe42a7177f 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
@@ -186,6 +186,7 @@
   <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>
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 0c37d00178c0d508c978aab4d13852461d77e4c1..2ce747a23377174f8d9fce8ce09ef17b15e04278 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
@@ -58,6 +58,8 @@
   <string name="account_optionnal_category">選擇性的設定</string>
   <string name="account_useragent_label">使用者代理</string>
   <string name="account_autoanswer_label">自動答覆</string>
+  <string name="account_rendezvous_label">Rendezvous 模式</string>
+  <string name="account_rendezvous_summary">在 Rendezvous 模式中，來電會被新增到會議室中。</string>
   <string name="account_upnp_label">啟用 UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
@@ -134,6 +136,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>
@@ -168,7 +171,7 @@
   <string name="account_link_archive_button">從備份連線</string>
   <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_export_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>
@@ -185,6 +188,7 @@
   <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>