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 d8aa449..7cd675e 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
@@ -75,5 +75,6 @@
   <string name="account_status_unknown">مجهول</string>
   <!--Create account-->
   <string name="account_creation_home">مرحبا بك في Ring</string>
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
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 dbb21da..39dcfac 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
@@ -128,9 +128,7 @@
   <string name="account_link_prompt_pin">Въведете ПИН</string>
   <string name="account_new_button">Създаване на акаунт за Ring</string>
   <string name="account_link_export_button">Свързване на друго устройство с този акаунт</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За да завършите процеса, трябва да пуснете Ring на новото устройство. Създайте нов профил чрез „Свързване на това устройство с акаунт“. Кодът има давност 10 минути.</string>
   <!--Name registration-->
   <string name="error_username_empty">Въведете потребителско име</string>
   <string name="no_registered_name_for_account">Няма открито регистрирано име за този акаунт</string>
@@ -151,6 +149,7 @@
   <string name="account_creation_ring">Създаване на акаунт в Ring</string>
   <string name="account_link_title">Свързване на това устройство</string>
   <string name="account_sip_cannot_be_registered">Акаунтът не може да бъде регистриран</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Въведете парола, за да продължите</string>
   <string name="enter_password">Въведете парола</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 6bfd00c..1d58b75 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
@@ -140,7 +140,6 @@
   <string name="account_link_button">Enllaça aquest dispositiu a un compte</string>
   <string name="account_link_prompt_pin">Introdueix PIN</string>
   <string name="account_new_button">Crear un compte de Ring</string>
-  <string name="account_start_export_button">Genera PIN</string>
   <string name="account_end_export_button">tanca</string>
   <!--Name registration-->
   <string name="register_name">Registrar nom</string>
@@ -152,6 +151,7 @@
   <!--Create account-->
   <string name="account_creation_home">Benvigut a Ring</string>
   <string name="account_creation_profile">Crei el seu perfil</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Introduïu la contrasenya per confirmar</string>
   <string name="enter_password">Introduïu la contrasenya</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 4f2b33d..34840c3 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
@@ -143,9 +143,7 @@
   <string name="account_link_prompt_pin">Zadejte PIN</string>
   <string name="account_new_button">Vytvořit účet Ring</string>
   <string name="account_link_export_button">Připojit k tomuto účtu další zařízení</string>
-  <string name="account_start_export_button">Vygenerovat PIN</string>
   <string name="account_end_export_button">zavřít</string>
-  <string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nK dokončení tohoto procesu otevřete na novém zařízení Ring. Přihlaste se k účtu pomocí „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.</string>
   <!--Name registration-->
   <string name="error_username_empty">Zadejte uživatelské jméno</string>
   <string name="no_registered_name_for_account">Pro tento účet nenalezeno žádné registrované jméno</string>
@@ -166,6 +164,7 @@
   <string name="account_creation_ring">Vytvořit účet Ring</string>
   <string name="account_link_title">Připojit toto zařízení</string>
   <string name="account_sip_cannot_be_registered">Nelze zaregistrovat účet</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Pro potvrzení zadejte heslo</string>
   <string name="enter_password">Zadejte heslo</string>
diff --git a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
index c4146cf..2312f40 100644
--- a/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
+++ b/ring-android/app/src/main/res/values-da-rDK/strings_account.xml
@@ -144,9 +144,7 @@
   <string name="account_new_button">Opret en Ring-konto</string>
   <string name="account_link_export_button">Tilknyt en anden enhed til denne konto</string>
   <string name="account_link_export_info">For at bruge denne konto på andre enheder, skal du først gøre den tilgængelig for Ring. Dette vil generere en PIN-kode som skal indtastes på den nye enhed for at opsætte kontoen. PIN-koden er gyldig i 10 minutter.</string>
-  <string name="account_start_export_button">Generer PIN-kode</string>
   <string name="account_end_export_button">luk</string>
-  <string name="account_end_export_infos">Din PIN-kode er:\n\n%%\n\nFor at afslutte processen skal du åbne Ring på den nye enhed, og oprette en ny konto med \"Tilknyt denne enhed til en konto\". PIN-koden er gyldig i 10 minutter.</string>
   <string name="account_link_export_info_light">For at bruge denne konto på andre enheder, skal du først gøre den tilgængelig for Ring. Dette vil generere en PIN-kode som skal indtastes på den nye enhed for at opsætte kontoen. PIN-koden er gyldig i 10 minutter.</string>
   <string name="account_export_title">Tilføj enheder</string>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">Opret din Ring-konto</string>
   <string name="account_link_title">Tilknyt denne enhed</string>
   <string name="account_sip_cannot_be_registered">Kan ikke registrere konto</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Indtast adgangskode for at bekræfte</string>
   <string name="enter_password">Indtast adgangskode</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 edd5fee..efe0d3c 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
@@ -105,7 +105,6 @@
   <string name="account_link_button">Dieses Gerät mit einem Ring-Konto verknüpfen</string>
   <string name="account_link_prompt_pin">PIN eingeben</string>
   <string name="account_new_button">Ring-Konto erstellen</string>
-  <string name="account_start_export_button">PIN generieren</string>
   <!--Name registration-->
   <string name="error_username_empty">Einen Benutzernamen eingeben</string>
   <string name="username_already_taken">Benutzername bereits vergeben</string>
@@ -116,6 +115,7 @@
   <string name="account_status_offline">Offline</string>
   <!--Create account-->
   <string name="account_creation_home">Willkommen bei Ring</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="enter_password">Passwort eingeben</string>
   <string name="revoke_device_title">Gerät widerrufen</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 4ff0ebc..0941195 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -60,6 +60,8 @@
   <string name="notif_current_call_title">Aktueller Anruf mit %1$s</string>
   <string name="notif_current_call">Aktueller Anruf</string>
   <string name="notif_channel_calls">Anrufe</string>
+  <string name="notif_channel_messages">Nachrichten</string>
+  <string name="notif_channel_requests">Anfragen</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Du:</string>
   <string name="action_call_hangup">Auflegen</string>
@@ -153,4 +155,5 @@
   <string name="tv_contact_row_header">Kontakte</string>
   <string name="gallery_error_title">Keine Galerie App gefunden</string>
   <string name="gallery_error_message">Auf dem Gerät wurde keine Applikation gefunden um die Galerie zu öffnen</string>
+  <string name="generic_error">Ein unbekannter Fehler ist aufgetreten</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de/strings_account.xml b/ring-android/app/src/main/res/values-de/strings_account.xml
index d20d684..2a65696 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">Ein Ring-Konto erstellen</string>
   <string name="account_link_export_button">Weiteres Gerät mit diesem Konto verknüpfen</string>
   <string name="account_link_export_info">Um ihr Benutzerkonto auf weiteren Endgeräten zu nutzen, müssen Sie auf dem vorhandenen Endgerät eine PIN generieren. Diese PIN muss anschließend auf dem neu hinzuzufügenden Endgerät eingegeben werden. Diese 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>
-  <string name="account_end_export_infos">Ihre PIN ist:\n\n%%\n\nUm den Prozess abzuschließen, öffnen Sie Ring auf dem neuen Gerät. Erstellen Sie ein Konto mit \"Dieses Gerät mit einem Konto verknüpfen\". Ihre PIN ist 10 Minuten gültig.</string>
   <string name="account_link_export_info_light">Um ihr Benutzerkonto auf weiteren Endgeräten zu nutzen, müssen Sie auf dem vorhandenen Endgerät eine PIN generieren. Diese PIN muss anschließend auf dem neu hinzuzufügenden Endgerät eingegeben werden. Diese PIN ist für 10 Minuten gültig.</string>
   <string name="account_export_title">Gerät hinzufügen</string>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">Erstellen Sie Ihr Ring-Konto</string>
   <string name="account_link_title">Verbinde diese Gerät</string>
   <string name="account_sip_cannot_be_registered">Konto kann nicht registriert werden</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Passwort zur Bestätigung eingeben</string>
   <string name="enter_password">Passwort eingeben</string>
diff --git a/ring-android/app/src/main/res/values-de/strings_call.xml b/ring-android/app/src/main/res/values-de/strings_call.xml
index 6cf2a92..ebac33a 100644
--- a/ring-android/app/src/main/res/values-de/strings_call.xml
+++ b/ring-android/app/src/main/res/values-de/strings_call.xml
@@ -20,6 +20,8 @@
  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 -->
 <resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">Anruf abgebrochen. Kein Mikrofon erkannt.</string>
     <!-- SipCalls -->
     <string name="call_human_state_searching">Suchen</string>
     <string name="call_human_state_incoming">Eingehend</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 50afcf7..719404f 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
@@ -63,5 +63,6 @@
   <string name="account_status_unknown">Άγνωστοι</string>
   <!--Create account-->
   <string name="account_creation_home">Καλώς ήλθατε στο Ring</string>
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-en-rGB/strings_account.xml b/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
index db66ab2..221bcbf 100644
--- a/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
+++ b/ring-android/app/src/main/res/values-en-rGB/strings_account.xml
@@ -18,5 +18,6 @@
   <!--restore/backup-->
   <!--Name registration-->
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-en-rUS/strings_account.xml b/ring-android/app/src/main/res/values-en-rUS/strings_account.xml
index 5fabf7a..e4dbefe 100644
--- a/ring-android/app/src/main/res/values-en-rUS/strings_account.xml
+++ b/ring-android/app/src/main/res/values-en-rUS/strings_account.xml
@@ -17,5 +17,6 @@
   <!--restore/backup-->
   <!--Name registration-->
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index 076adba..0c11b44 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -96,6 +96,7 @@
   <string name="account_status_unknown">Nekonata</string>
   <!--Create account-->
   <string name="account_creation_home">Bonvenu al Ring</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="revoke_device_wait_title">Bonvole atendu…</string>
 </resources>
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 6dc8d95..8883482 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
@@ -143,9 +143,7 @@
   <string name="account_link_prompt_pin">Ingresa tu PIN</string>
   <string name="account_new_button">Crear una cuenta en Ring</string>
   <string name="account_link_export_button">Conectar otro dispositivo a esta cuenta</string>
-  <string name="account_start_export_button">Generar PIN</string>
   <string name="account_end_export_button">cerrar</string>
-  <string name="account_end_export_infos">Tu PIN es:\n\n%%\n\nPara completar el proceso, necesitas abrir Ring en el nuevo dispositivo. Crea una nueva cuenta con \"Vincular este dispositivo a una cuenta\". Tu PIN es válido por 10 minutos.</string>
   <!--Name registration-->
   <string name="error_username_empty">Ingresa un nombre de usuario</string>
   <string name="no_registered_name_for_account">No se ha encontrado un nombre registrado con esta cuenta</string>
@@ -166,6 +164,7 @@
   <string name="account_creation_ring">Crear tu cuenta Ring</string>
   <string name="account_link_title">Asociar este dispositivo</string>
   <string name="account_sip_cannot_be_registered">Error al registrar la cuenta</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Escribe la contraseña para confirmar</string>
   <string name="enter_password">Ingresa la contraseña</string>
diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_account.xml b/ring-android/app/src/main/res/values-et-rEE/strings_account.xml
index 2f3f8bd..d324928 100644
--- a/ring-android/app/src/main/res/values-et-rEE/strings_account.xml
+++ b/ring-android/app/src/main/res/values-et-rEE/strings_account.xml
@@ -18,5 +18,6 @@
   <!--Name registration-->
   <string name="account_status_connecting">Ühendab</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 2ec2bec..a5b4b4f 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
@@ -141,9 +141,7 @@
   <string name="account_link_prompt_pin">پین را وارد کنید</string>
   <string name="account_new_button">ساخت یک حساب رینگ</string>
   <string name="account_link_export_button">پیوند افزاره‌ای دیگر به این حساب</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برای کامل کردن فرایند، باید رینگ را روی افزارهٔ نو گشوده و حساب جدیدی را با انتخاب «پیوند این افزاره به یک حساب» ایجاد کنید. پینتان برای ۱۰ دقیقه معتبر است.</string>
   <!--Name registration-->
   <string name="error_username_empty">یک نام کاربری وارد کنید</string>
   <string name="no_registered_name_for_account">هیچ نام ثبت‌شده‌ای برای این حساب پیدا نشد</string>
@@ -164,6 +162,7 @@
   <string name="account_creation_ring">حساب کاربری رینگ خود را بسازید</string>
   <string name="account_link_title">پیوند این افزاره</string>
   <string name="account_sip_cannot_be_registered">نمی‌توان حساب را ثبت کرد</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">رمز عبور خود را مجددا وارد نمایید</string>
   <string name="enter_password">گذرواژه را وارد کنید</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index 61bb16c..b1b0870 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
@@ -81,6 +81,7 @@
   <string name="account_status_unknown">Tuntematon</string>
   <!--Create account-->
   <string name="account_creation_home">Tervetuloa Ringiin</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="revoke_device_wait_title">Odota hetki...</string>
 </resources>
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 e8dba72..15c1234 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">Créer un compte Ring</string>
   <string name="account_link_export_button">Associer un autre appareil à ce compte</string>
   <string name="account_link_export_info">Pour utiliser ce compte sur d\'autres appareils, vous devez l\'exposer sur Ring en premier. Cela va généer un code NIP que vous devez entrer sur le nouveau appareil pour configurer un nouveau compte. Le NIP est valide pour 10 minutes.</string>
-  <string name="account_start_export_button">Générer le NIP</string>
   <string name="account_end_export_button">fermer</string>
-  <string name="account_end_export_infos">Votre NIP est:\n\n%%\n\nPour compléter le processus, vous devez ouvrir Ring sur le nouvel appareil. Créer un nouveau compte avec \"Associer cet appareil à un compte\". Votre NIP est valide pour une durée de 10 minutes.</string>
   <string name="account_link_export_info_light">Pour utiliser ce compte sur d\'autres appareils, vous devez l\'exposer sur Ring en premier. Cela va généer un code NIP que vous devez entrer sur le nouveau appareil pour configurer un nouveau compte. Le NIP est valide pour 10 minutes.</string>
   <string name="account_export_title">ajouter un périphérique </string>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">Créer votre compte Ring</string>
   <string name="account_link_title">Associer cet appareil</string>
   <string name="account_sip_cannot_be_registered">Impossible d\'enregistrer le compte</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Saisir mot de passe pour confirmer</string>
   <string name="enter_password">Entrer le mot de passe</string>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings.xml b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
index 9dcf2a2..d714827 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings.xml
@@ -6,7 +6,7 @@
   <string name="contribute_section">Contribuer</string>
   <string name="version_section">Version</string>
   <string name="no_email_app_installed">Aucun logiciel de messagerie n\'a été trouvé, merci d\'installer un logiciel de messagerie pour nous envoyer un rapport</string>
-  <string name="email_chooser_title">Envoyer un courriel en utilisant&#8230;</string>
+  <string name="email_chooser_title">Envoyer un courriel en utilisant...</string>
   <!--About dialog-->
   <!--RingActivity-->
   <string name="title_activity_sflphone_home">Ring</string>
@@ -21,10 +21,9 @@
   <!--Sections-->
   <string name="menu_item_home">Accueil</string>
   <string name="menu_item_accounts">Gérer des comptes</string>
-  <string name="menu_item_account">Gérer mon compte</string>
   <string name="menu_item_settings">Réglages</string>
   <string name="menu_item_share">Partager mes contacts</string>
-  <string name="menu_item_about">À propos de Ring</string>
+  <string name="menu_item_about">A propos de Ring</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Composer un numéro </string>
   <!--History Fragment-->
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 96ffe66..27a09d6 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
@@ -33,5 +33,6 @@
   <string name="account_status_unknown">Inconnu</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenue sur ring</string>
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index c5195a3..ce18540 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">Créer un compte Ring</string>
   <string name="account_link_export_button">Lier un autre appareil à ce compte</string>
   <string name="account_link_export_info">Pour emmener ce compte sur un autre appareil, vous devez d\'abord l\'exposer sur Ring. Ceci créera un NIP que vous devrez entrer sur le nouvel appareil pour configurer le compte. Le NIP 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>
-  <string name="account_end_export_infos">Votre NIP est:\n\n%%\n\nPour terminer le processus, vous devez ouvrir Ring sur un autre appareil puis créer un nouveau compte avec \"Lier cet appareil à un compte\".  Votre NIP est utilisable pendant 10 minutes.</string>
   <string name="account_link_export_info_light">Pour emmener ce compte sur un autre appareil, vous devez d\'abord l\'exposer sur Ring. Ceci créera un NIP que vous devrez entrer sur le nouvel appareil pour configurer le compte. Le NIP sera valable pendant 10 minutes.</string>
   <string name="account_export_title">Ajoutez des appareils</string>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">Créer votre compte Ring</string>
   <string name="account_link_title">Lier cet appareil</string>
   <string name="account_sip_cannot_be_registered">Impossible d\'enregistrer le compte</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Entrer le mot de passe pour confirmer</string>
   <string name="enter_password">Entrez votre mot de passe</string>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index 9ca8eea..de7c8a6 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
@@ -66,5 +66,6 @@
   <string name="account_status_connecting">מתחבר</string>
   <string name="account_status_unknown">לא מוכר</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings_account.xml b/ring-android/app/src/main/res/values-hi-rIN/strings_account.xml
index 0ae7959..35b59d0 100644
--- a/ring-android/app/src/main/res/values-hi-rIN/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hi-rIN/strings_account.xml
@@ -18,5 +18,6 @@
   <!--restore/backup-->
   <!--Name registration-->
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings_account.xml b/ring-android/app/src/main/res/values-hr/strings_account.xml
index ea08f70..6f0d6f7 100644
--- a/ring-android/app/src/main/res/values-hr/strings_account.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_account.xml
@@ -95,6 +95,7 @@
   <!--Create account-->
   <string name="account_creation_home">Dobrodošli u Ring</string>
   <string name="account_creation_profile">Napravite vaš profil</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="enter_password">Unesite lozinku</string>
   <string name="revoke_device_wait_title">Molim pričekajte...</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 899d321..3d816b4 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
@@ -65,5 +65,6 @@
   <string name="account_status_connecting">Kapcsolódás</string>
   <string name="account_status_unknown">Ismeretlen</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings_account.xml b/ring-android/app/src/main/res/values-id/strings_account.xml
index 737d325..02de8b0 100644
--- a/ring-android/app/src/main/res/values-id/strings_account.xml
+++ b/ring-android/app/src/main/res/values-id/strings_account.xml
@@ -19,5 +19,6 @@
   <!--Name registration-->
   <string name="account_status_unknown">Tidak diketahui</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index 398027a..2903a41 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
@@ -141,9 +141,7 @@
   <string name="account_link_prompt_pin">Inserisci il PIN</string>
   <string name="account_new_button">Crea un account Ring</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_end_export_infos">Il tuo Pin è:\n\n%%\n\nPer completare la procedura, devi aprire Ring nel nuovo dispositivo. Crea un nuovo account con \"Collega questo dispositivo con un account\". Il tuo pin è valido per 10 minuti.</string>
   <!--Name registration-->
   <string name="error_username_empty">Inserire un nome utente</string>
   <string name="no_registered_name_for_account">Nessun nome registrato è stato trovato per questo account</string>
@@ -164,6 +162,7 @@
   <string name="account_creation_ring">Crea il tuo account Ring</string>
   <string name="account_link_title">Collega il dispositivo</string>
   <string name="account_sip_cannot_be_registered">Impossibile registrare l\'account</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Inserire la password per confermare</string>
   <string name="enter_password">Inserire password</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 115e908..5a30f65 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
@@ -110,6 +110,7 @@
   <string name="account_status_unknown">Sconosciuto</string>
   <!--Create account-->
   <string name="account_creation_home">Benvenuto in Ring</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="revoke_device_title">Revoca dispositivo</string>
   <string name="revoke_device_wait_title">Aspettare</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index ab96e61..9679652 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
@@ -142,9 +142,7 @@
   <string name="account_link_prompt_pin">PINを入力してください</string>
   <string name="account_new_button">Ringアカウントを作成</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_end_export_infos">あなたのPINは:\n\n%%\n\nプロセスを完了するには、新しいデバイスでRingを開く必要があります。 「このデバイスをアカウントにリンク」で、新しいアカウントを作成します。 あなたのPINは10分間有効です。</string>
   <!--Name registration-->
   <string name="error_username_empty">ユーザー名を入力してください</string>
   <string name="no_registered_name_for_account">このアカウントの登録名が見つかりません</string>
@@ -165,6 +163,7 @@
   <string name="account_creation_ring">Ringアカウントを作成</string>
   <string name="account_link_title">このデバイスをリンク</string>
   <string name="account_sip_cannot_be_registered">アカウントを登録できません</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">確認のパスワードを入力</string>
   <string name="enter_password">パスワードを入力してください</string>
diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml b/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
index 83d0163..7230650 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings_account.xml
@@ -33,5 +33,6 @@
   <!--Name registration-->
   <!--Create account-->
   <string name="account_creation_profile">프로필 만들기</string>
+  <!--Edit profile-->
   <!--Devices-->
 </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 9278527..a758fe8 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
@@ -135,7 +135,6 @@
   <string name="account_link_prompt_pin">Įveskite PIN</string>
   <string name="account_new_button">Sukurti Ring paskyrą</string>
   <string name="account_link_export_button">Susieti kitą įrenginį su šia paskyra</string>
-  <string name="account_start_export_button">Sukurti Pin</string>
   <string name="account_end_export_button">užverti</string>
   <!--Name registration-->
   <string name="error_username_empty">Įveskite naudotojo vardą</string>
@@ -152,6 +151,7 @@
   <string name="account_creation_home">Sveiki atvykę į Ring</string>
   <string name="account_creation_profile">Susikurkite savo profilį</string>
   <string name="account_sip_cannot_be_registered">Nepavyksta užregistruoti paskyros</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Norėdami patvirtinti, įveskite slaptažodį</string>
   <string name="enter_password">Įveskite slaptažodį</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 e354c07..21a7118 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
@@ -117,9 +117,7 @@
   <string name="account_link_prompt_pin">Masukkan PIN</string>
   <string name="account_new_button">Cipta akaun Ring</string>
   <string name="account_link_export_button">Sambungkan perangkat lain dengan akaun ini</string>
-  <string name="account_start_export_button">Ciptakan PIN</string>
   <string name="account_end_export_button">tutup</string>
-  <string name="account_end_export_infos">PIN anda adalah:\n\n%%\n\nUntuk menyelesaikan proses menyambung, anda mestilah membuka aplikasi Ring pada perangkat baharu. Cipta akaun baharu dengan \\"Sambungkan perangkat ini dengan akaun yang telah sedia ada\\". PIN ini sah selama 10 minit.</string>
   <!--Name registration-->
   <string name="error_username_empty">Masukkan nama pengguna</string>
   <string name="no_registered_name_for_account">Tiada nama berdaftar dengan akaun ini ditemui</string>
@@ -131,6 +129,7 @@
   <string name="account_status_connecting">Menyambung</string>
   <string name="account_status_unknown">Tidak diketahui</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
   <string name="enter_password">Masukkan kata laluan</string>
   <string name="revoke_device_wait_title">Sila tunggu...</string>
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 5241ad3..61f14f4 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">Opprett en Ring-konto</string>
   <string name="account_link_export_button">Lenk en annen enhet til denne kontoen</string>
   <string name="account_link_export_info">For å bruke denne kontoen på andre enheter, må du først synliggjøre den på Ring. Dette vil generere en PIN-kode som du må skrive inn på den nye enheten for å sette opp en konto. PIN-koden er gyldig i 10 minutter.</string>
-  <string name="account_start_export_button">Generer PIN</string>
   <string name="account_end_export_button">lukk</string>
-  <string name="account_end_export_infos">Din PIN er:\n\n%%\n\nFor å fullføre prosessen, må du åpne Ring på den nye enheten. Opprett en ny konto med \"Lenk denne enheten til en konto\". Din PIN-kode er gyldig i 10 minutter.</string>
   <string name="account_link_export_info_light">For å bruke denne kontoen på andre enheter, må du først synliggjøre den på Ring. Dette vil generere en PIN-kode som du må skrive inn på den nye enheten for å sette opp en konto. PIN-koden er gyldig i 10 minutter.</string>
   <string name="account_export_title">Legg til enheter</string>
   <!--Name registration-->
@@ -169,6 +167,7 @@
   <string name="account_creation_ring">Opprett din Ring-konto</string>
   <string name="account_link_title">Lenk denne enheten</string>
   <string name="account_sip_cannot_be_registered">Kan ikke registrere konto</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Skriv inn passord for å bekrefte</string>
   <string name="enter_password">Skriv inn passord</string>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
index 4bb5606..a754fe8 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings_account.xml
@@ -35,5 +35,6 @@
   <!--restore/backup-->
   <!--Name registration-->
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index 098062e..26cb521 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">Een Ring-account aanmaken</string>
   <string name="account_link_export_button">Een ander apparaat aan deze account koppelen</string>
   <string name="account_link_export_info">Om deze account op andere apparaten te gebruiken moet je deze eerst op Ring blootstellen. Er zal een pincode gegenereerd worden die je op het nieuwe apparaat invoert 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>
-  <string name="account_end_export_infos">Je pincode is:\n\n%%\n\nOm het proces te voltooien open je Ring op het nieuwe apparaat. Maak een account aan met \"Dit apparaat aan een account koppelen\". De pincode is 10 minuten geldig.</string>
   <string name="account_link_export_info_light">Om deze account op andere apparaten te gebruiken moet je deze eerst op Ring blootstellen. Er zal een pincode gegenereerd worden die je op het nieuwe apparaat invoert om de account in te stellen. De pincode is 10 minuten geldig.</string>
   <string name="account_export_title">Apparaten toevoegen</string>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">Je Ring-account aanmaken</string>
   <string name="account_link_title">Dit apparaat koppelen</string>
   <string name="account_sip_cannot_be_registered">Account kan niet geregistreerd worden</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Voer wachtwoord in om te bevestigen</string>
   <string name="enter_password">Voer wachtwoord in</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_call.xml b/ring-android/app/src/main/res/values-nl/strings_call.xml
index 197866f..db1a5cb 100644
--- a/ring-android/app/src/main/res/values-nl/strings_call.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_call.xml
@@ -22,7 +22,6 @@
 <resources>
     <!-- Call error -->
     <string name="call_error_no_microphone">Oproep geannuleerd. Geen microfoon gevonden.</string>
-
     <!-- SipCalls -->
     <string name="call_human_state_searching">Zoeken</string>
     <string name="call_human_state_incoming">Inkomend</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings_account.xml b/ring-android/app/src/main/res/values-pa/strings_account.xml
index efe3623..68ff34f 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
@@ -16,5 +16,6 @@
   <!--restore/backup-->
   <!--Name registration-->
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
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 9bc35d4..b77ca62 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
@@ -16,5 +16,6 @@
   <!--restore/backup-->
   <!--Name registration-->
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
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 7702d57..7203c59 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
@@ -143,9 +143,7 @@
   <string name="account_link_prompt_pin">Wprowadź PIN</string>
   <string name="account_new_button">Stwórz konto Ring</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_end_export_infos">Twój PIN to:\n\n%%\n\nAby dokończyć proces, musisz otworzyć Ring na nowym urządzeniu. Stwórz nowe konto przez \"Połącz to urządzenie z kontem\". Twój PIN jest aktywny przez 10 minut.</string>
   <!--Name registration-->
   <string name="error_username_empty">Wprowadź nazwę użytkownika</string>
   <string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
@@ -166,6 +164,7 @@
   <string name="account_creation_ring">Stwórz swoje konto Ring</string>
   <string name="account_link_title">Połącz to urządzenie</string>
   <string name="account_sip_cannot_be_registered">Nie można zarejestrować konta</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Wprowadź hasło aby potwierdzić</string>
   <string name="enter_password">Wprowadź hasło</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index 3cce46c..b48867e 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">Criar uma conta no Ring</string>
   <string name="account_link_export_button">Associar outro dispositivo à esta conta.</string>
   <string name="account_link_export_info">Para usar esta conta em outros dispositivos, você precisa primeiro expo-lo ao Ring. Isto irá gerar um código PIN que você precisa introduzir no novo dispositivo para configurar sua conta. o PIN é válido por apenas 10 minutos.</string>
-  <string name="account_start_export_button">Gerar PIN</string>
   <string name="account_end_export_button">fechar</string>
-  <string name="account_end_export_infos">Seu PIN é:\n\n%%\n\nPara completar o processo, você deve abrir o Ring no novo dispositivo. Crie uma nova conta com \"Associar este dispositivo à uma conta\". Seu PIN é válido por 10 minutos.</string>
   <string name="account_link_export_info_light">Para usar esta conta em outros dispositivos, você precisa primeiro expo-lo ao Ring. Isto irá gerar um código PIN que você precisa introduzir no novo dispositivo para configurar sua conta. o PIN é válido por apenas 10 minutos.</string>
   <string name="account_export_title">Adicionar dispositivos</string>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">Criar sua conta Ring</string>
   <string name="account_link_title">Conectar este dispositivo</string>
   <string name="account_sip_cannot_be_registered">Impossível registrar conta.</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Digite senha para confirmar</string>
   <string name="enter_password">Entre a senha</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 89b2004..9f485c5 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
@@ -39,5 +39,6 @@
   <!--Name registration-->
   <string name="account_status_unknown">Desconhecido</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ro/strings_account.xml b/ring-android/app/src/main/res/values-ro/strings_account.xml
index f2d1abc..fa3c9f7 100644
--- a/ring-android/app/src/main/res/values-ro/strings_account.xml
+++ b/ring-android/app/src/main/res/values-ro/strings_account.xml
@@ -57,6 +57,7 @@
   <!--Name registration-->
   <string name="account_status_unknown">Necunoscut</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
   <string name="revoke_device_wait_title">Așteptați vă rog...</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 354068a..cf2964f 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
@@ -92,6 +92,7 @@
   <string name="account_status_unknown">Неизвестно</string>
   <!--Create account-->
   <string name="account_creation_home">Добро пожаловать в Ring</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="revoke_device_wait_title">Пожалуйста, подождите...</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 a16ada8..298b0ab 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
@@ -143,9 +143,7 @@
   <string name="account_link_prompt_pin">Введите PIN</string>
   <string name="account_new_button">Создать аккаунт Ring</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_end_export_infos">Ваш PIN:\n\n%%\n\nДля завершения процесса нужно открыть Ring на новом устройстве и выбрать \"Привязать это устройство к аккаунту\". Ваш PIN действителен в течение 10 минут.</string>
   <!--Name registration-->
   <string name="error_username_empty">Введите имя пользователя</string>
   <string name="no_registered_name_for_account">Не найдено зарегистрированного имени для этого аккаунта</string>
@@ -166,6 +164,7 @@
   <string name="account_creation_ring">Создать свой аккаунт Ring</string>
   <string name="account_link_title">Привязать это устройство</string>
   <string name="account_sip_cannot_be_registered">Не удалось зарегистрировать аккаунт</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Введите пароль для подтверждения</string>
   <string name="enter_password">Введите пароль</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_account.xml
index ed50710..0be762f 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
@@ -32,6 +32,7 @@
   <!--Name registration-->
   <string name="account_status_unknown">Neznámy</string>
   <!--Create account-->
+  <!--Edit profile-->
   <!--Devices-->
   <string name="enter_password">Zadaj heslo</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sl/strings_account.xml b/ring-android/app/src/main/res/values-sl/strings_account.xml
index 67643fe..41beca0 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
@@ -120,7 +120,6 @@
   <string name="account_link_prompt_pin">Vnesi PIN</string>
   <string name="account_new_button">Ustvari Ring račun</string>
   <string name="account_link_export_button">Poveži drugo napravo s tem računom</string>
-  <string name="account_start_export_button">Ustvari PIN</string>
   <string name="account_end_export_button">zapri</string>
   <!--Name registration-->
   <string name="error_username_empty">Vnesi uporabniško ime</string>
@@ -141,6 +140,7 @@
   <string name="account_creation_ring">Ustvari svoj Ring račun</string>
   <string name="account_link_title">Poveži to naoravo</string>
   <string name="account_sip_cannot_be_registered">Ne morem prijaviti računa</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Vnesi geslo za potrditev</string>
   <string name="enter_password">Vnesi geslo</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 d041711..6c9767c 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
@@ -143,9 +143,7 @@
   <string name="account_new_button">Krijoni një llogari Ring</string>
   <string name="account_link_export_button">Lidhni te kjo llogari një pajisje tjetër</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ë Ring-ut. 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">Prodhoje PIN-in</string>
   <string name="account_end_export_button">mbylle</string>
-  <string name="account_end_export_infos">PIN-i juaj është:\n\n%%\n\nQë të plotësoni procesin, duhet të hapni Ring-un në pajisjen e re. Krijoni një llogari të re përmes \"Lidhe këtë pajisje me një llogari\". PIN-i juaj vlen për 10 minuta.</string>
   <string name="account_link_export_info_light">Që të përdorni këtë llogari në pajisje të tjera, së pari duhet t\ia ekspozoni atë Ring-ut. 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_export_title">Shtoni pajisje</string>
   <!--Name registration-->
@@ -169,6 +167,7 @@
   <string name="account_creation_ring">Krijoni llogarinë tuaj Ring</string>
   <string name="account_link_title">Lidhe këtë pajisje</string>
   <string name="account_sip_cannot_be_registered">S\’regjistrohet dot llogaria</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Jepni fjalëkalimin që ta ripohoni</string>
   <string name="enter_password">Jepni fjalëkalimin</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_account.xml b/ring-android/app/src/main/res/values-sv/strings_account.xml
index 2824365..b6a1e13 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">Skapa ett Ring-konto</string>
   <string name="account_link_export_button">Koppla en annan enhet till detta konto</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å Ring. 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 åtgärden, måste du nu öppna Ring på den nya enheten. Skapa ett nytt konto med \"Koppla den här enheten till ett konto\". PIN-koden ä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å Ring. 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>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">Skapa ditt Ring-konto</string>
   <string name="account_link_title">Länka den här enheten</string>
   <string name="account_sip_cannot_be_registered">Kan inte registrera konto</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Ange lösenord för att bekräfta</string>
   <string name="enter_password">Ange lösenord</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_call.xml b/ring-android/app/src/main/res/values-sv/strings_call.xml
index baaa277..def751c 100644
--- a/ring-android/app/src/main/res/values-sv/strings_call.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_call.xml
@@ -22,7 +22,6 @@
 <resources>
     <!-- Call error -->
     <string name="call_error_no_microphone">Samtalet avbrutet. Ingen mikrofon hittades.</string>
-
     <!-- SipCalls -->
     <string name="call_human_state_searching">Söker</string>
     <string name="call_human_state_incoming">Inkommande</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 ce2c69e..6c5d498 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
@@ -143,9 +143,7 @@
   <string name="account_link_prompt_pin">PIN\'i gir</string>
   <string name="account_new_button">Bir Ring hesabı oluştur</string>
   <string name="account_link_export_button">Başka aygıtı bu hesaba bağla</string>
-  <string name="account_start_export_button">Pin Oluştur</string>
   <string name="account_end_export_button">kapat</string>
-  <string name="account_end_export_infos">Pin\'iniz:\n\n%%\n\nSüreci tamamlamak için yeni aygıtta Ring\'i açmanız gerekiyor. \"Bu aygıtı bir hesaba bağla\" ile yeni hesap oluşturun. Pin\'iniz 10 dakikalığına geçerlidir.</string>
   <!--Name registration-->
   <string name="error_username_empty">Bir kullanıcı adı gir</string>
   <string name="no_registered_name_for_account">Bu hesap için kaydedilmiş ad bulunamadı</string>
@@ -166,6 +164,7 @@
   <string name="account_creation_ring">Ring hesabınızı oluşturun</string>
   <string name="account_link_title">Bu aygıtı bağla</string>
   <string name="account_sip_cannot_be_registered">Hesap kaydedilemiyor</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">Onaylamak için parolayı girin</string>
   <string name="enter_password">Parolayı gir</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 48c0c62..c7c5239 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
@@ -96,6 +96,7 @@
   <string name="account_status_unknown">Невідомий</string>
   <!--Create account-->
   <string name="account_creation_home">Вітаємо у Ring</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="revoke_device_wait_title">Будь ласка зачекайте</string>
 </resources>
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 c5550cf..f420db0 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
@@ -143,9 +143,7 @@
   <string name="account_link_prompt_pin">输入PIN</string>
   <string name="account_new_button">创建Ring帐户</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_end_export_infos">您的PIN是：\n\n%%\n\n要继续，请在新设备上打开Ring，点击“将此设备与一个帐户进行连接”。您的PIN将在10分钟内有效。</string>
   <!--Name registration-->
   <string name="error_username_empty">输入用户名</string>
   <string name="no_registered_name_for_account">该帐户尚未注册用户名</string>
@@ -166,6 +164,7 @@
   <string name="account_creation_ring">创建您的Ring帐户</string>
   <string name="account_link_title">连接此设备</string>
   <string name="account_sip_cannot_be_registered">无法注册帐户</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">输入密码以确认</string>
   <string name="enter_password">输入密码</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 3b3324a..b1bd60d 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
@@ -144,9 +144,7 @@
   <string name="account_new_button">建立一個 Ring 帳號</string>
   <string name="account_link_export_button">連結其他裝置到這個帳號</string>
   <string name="account_link_export_info">要在其他裝置上使用這個帳號，您必須先在 Ring 上揭露它。這將會生成一個您必須在新裝置上輸入以設定帳號的 PIN 碼。PIN 碼在 10 分鐘內有效。</string>
-  <string name="account_start_export_button">生成 PIN 碼</string>
   <string name="account_end_export_button">關閉</string>
-  <string name="account_end_export_infos">您的 PIN 碼是：\n\n%%\n\n要完成過程，您需要在新裝置上開啟 Ring。以「連結這個裝置到一個帳號」來建立新帳號。您的 PIN 碼在 10 分鐘內有效。</string>
   <string name="account_link_export_info_light">要在其他裝置上使用這個帳號，您必須先在 Ring 上揭露它。這將會生成一個您必須在新裝置上輸入以設定帳號的 PIN 碼。PIN 碼在 10 分鐘內有效。</string>
   <string name="account_export_title">新增裝置</string>
   <!--Name registration-->
@@ -170,6 +168,7 @@
   <string name="account_creation_ring">建立您的 Ring 帳號</string>
   <string name="account_link_title">連結此裝置</string>
   <string name="account_sip_cannot_be_registered">無法註冊帳號</string>
+  <!--Edit profile-->
   <!--Devices-->
   <string name="account_revoke_device_hint">輸入密碼以確認</string>
   <string name="enter_password">輸入密碼</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
index 982eb6f..7915062 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_call.xml
@@ -22,7 +22,6 @@
 <resources>
     <!-- Call error -->
     <string name="call_error_no_microphone">通話已取消。未偵測到麥克風。</string>
-
     <!-- SipCalls -->
     <string name="call_human_state_searching">搜尋</string>
     <string name="call_human_state_incoming">來電</string>
diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/ring-android/app/src/main/res/values-zh/strings_account.xml
index dcbe74d..9fcadc6 100644
--- a/ring-android/app/src/main/res/values-zh/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_account.xml
@@ -40,5 +40,6 @@
   <!--Create account-->
   <string name="account_creation_home">歡迎使用Ring</string>
   <string name="account_creation_profile">创建你的个人资料</string>
+  <!--Edit profile-->
   <!--Devices-->
 </resources>