From 36611cb4eac89005d2b623a0d30b637da4399812 Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@ring-packaging.cx>
Date: Mon, 5 Oct 2020 13:02:22 -0400
Subject: [PATCH] i18n: automatic bump

Change-Id: Ibe428ec5dec41cdf7b2a38939f1cca5d30f2fa18
---
 ring-android/app/src/main/res/values-ar/strings.xml  |  9 +++++++--
 .../app/src/main/res/values-ar/strings_account.xml   |  4 +---
 ring-android/app/src/main/res/values-bg/strings.xml  |  4 ++--
 .../app/src/main/res/values-bg/strings_account.xml   |  4 +---
 ring-android/app/src/main/res/values-ca/strings.xml  |  4 ++--
 .../app/src/main/res/values-ca/strings_account.xml   |  5 +----
 .../app/src/main/res/values-cs-rCZ/strings.xml       |  9 ++++++---
 .../src/main/res/values-cs-rCZ/strings_account.xml   | 12 +++++-------
 .../main/res/values-cs-rCZ/strings_preferences.xml   |  1 +
 ring-android/app/src/main/res/values-da/strings.xml  |  4 ++--
 .../app/src/main/res/values-da/strings_account.xml   |  2 --
 .../app/src/main/res/values-de-rDE/strings.xml       |  4 ++--
 .../src/main/res/values-de-rDE/strings_account.xml   |  3 +--
 ring-android/app/src/main/res/values-de/strings.xml  |  7 +++++--
 .../app/src/main/res/values-de/strings_account.xml   |  5 +----
 .../src/main/res/values-de/strings_preferences.xml   |  2 ++
 ring-android/app/src/main/res/values-el/strings.xml  |  4 ++--
 ring-android/app/src/main/res/values-eo/strings.xml  |  4 ++--
 .../app/src/main/res/values-es-rAR/strings.xml       |  4 ++--
 .../src/main/res/values-es-rAR/strings_account.xml   |  5 +----
 .../app/src/main/res/values-es-rMX/strings.xml       |  4 ++--
 ring-android/app/src/main/res/values-es/strings.xml  |  4 ++--
 .../app/src/main/res/values-es/strings_account.xml   |  5 +----
 ring-android/app/src/main/res/values-et/strings.xml  |  4 ++--
 ring-android/app/src/main/res/values-eu/strings.xml  |  4 ++--
 .../app/src/main/res/values-eu/strings_account.xml   |  3 ---
 .../app/src/main/res/values-fa-rIR/strings.xml       |  4 ++--
 .../src/main/res/values-fa-rIR/strings_account.xml   |  5 +----
 ring-android/app/src/main/res/values-fi/strings.xml  |  4 ++--
 .../app/src/main/res/values-fi/strings_account.xml   |  4 +---
 .../app/src/main/res/values-fr-rBE/strings.xml       |  4 ++--
 .../src/main/res/values-fr-rBE/strings_account.xml   |  1 -
 .../app/src/main/res/values-fr-rCA/strings.xml       |  4 ++--
 .../src/main/res/values-fr-rCA/strings_account.xml   |  4 ----
 .../app/src/main/res/values-fr-rCH/strings.xml       |  4 ++--
 .../src/main/res/values-fr-rCH/strings_account.xml   |  1 -
 .../app/src/main/res/values-fr-rFR/strings.xml       |  4 ++--
 .../src/main/res/values-fr-rFR/strings_account.xml   |  1 -
 ring-android/app/src/main/res/values-fr/strings.xml  |  4 ++--
 .../app/src/main/res/values-fr/strings_account.xml   |  6 ++----
 ring-android/app/src/main/res/values-gl/strings.xml  |  4 ++--
 .../app/src/main/res/values-gl/strings_account.xml   |  4 ----
 ring-android/app/src/main/res/values-he/strings.xml  |  4 ++--
 .../app/src/main/res/values-hi-rIN/strings.xml       |  4 ++--
 ring-android/app/src/main/res/values-hr/strings.xml  |  4 ++--
 ring-android/app/src/main/res/values-hu/strings.xml  |  6 +++---
 .../app/src/main/res/values-hu/strings_account.xml   |  4 +---
 ring-android/app/src/main/res/values-id/strings.xml  |  4 ++--
 ring-android/app/src/main/res/values-ig/strings.xml  |  4 ++--
 .../app/src/main/res/values-it-rIT/strings.xml       |  5 +++--
 .../src/main/res/values-it-rIT/strings_account.xml   |  5 +----
 ring-android/app/src/main/res/values-it/strings.xml  |  4 ++--
 .../app/src/main/res/values-it/strings_account.xml   |  5 -----
 ring-android/app/src/main/res/values-ja/strings.xml  |  4 ++--
 .../app/src/main/res/values-ja/strings_account.xml   |  7 ++-----
 .../app/src/main/res/values-ko-rKR/strings.xml       |  4 ++--
 ring-android/app/src/main/res/values-lt/strings.xml  |  4 ++--
 .../app/src/main/res/values-lt/strings_account.xml   |  5 +----
 ring-android/app/src/main/res/values-mr/strings.xml  |  4 ++--
 ring-android/app/src/main/res/values-ms/strings.xml  |  4 ++--
 .../app/src/main/res/values-ms/strings_account.xml   |  1 -
 ring-android/app/src/main/res/values-nb/strings.xml  |  4 ++--
 .../app/src/main/res/values-nb/strings_account.xml   |  4 ----
 .../app/src/main/res/values-nl-rBE/strings.xml       |  4 ++--
 .../src/main/res/values-nl-rBE/strings_account.xml   |  5 +----
 .../app/src/main/res/values-nl-rNL/strings.xml       |  4 ++--
 ring-android/app/src/main/res/values-nl/strings.xml  |  4 ++--
 .../app/src/main/res/values-nl/strings_account.xml   |  5 +----
 ring-android/app/src/main/res/values-oc/strings.xml  |  5 +++--
 .../app/src/main/res/values-oc/strings_account.xml   |  1 -
 .../app/src/main/res/values-oc/strings_call.xml      |  2 ++
 ring-android/app/src/main/res/values-pa/strings.xml  |  4 ++--
 .../app/src/main/res/values-pa/strings_account.xml   |  5 -----
 .../app/src/main/res/values-pl-rPL/strings.xml       |  4 ++--
 .../src/main/res/values-pl-rPL/strings_account.xml   |  3 ---
 ring-android/app/src/main/res/values-pl/strings.xml  |  4 ++--
 .../app/src/main/res/values-pl/strings_account.xml   |  7 ++-----
 .../app/src/main/res/values-pt-rBR/strings.xml       |  4 ++--
 .../src/main/res/values-pt-rBR/strings_account.xml   |  6 +-----
 .../app/src/main/res/values-pt-rPT/strings.xml       |  4 ++--
 .../src/main/res/values-pt-rPT/strings_account.xml   |  5 +----
 ring-android/app/src/main/res/values-pt/strings.xml  |  4 ++--
 .../app/src/main/res/values-pt/strings_account.xml   |  5 +----
 .../app/src/main/res/values-ro-rRO/strings.xml       |  8 ++++----
 .../src/main/res/values-ro-rRO/strings_account.xml   | 10 ++++------
 .../main/res/values-ro-rRO/strings_preferences.xml   |  2 +-
 .../app/src/main/res/values-ru-rRU/strings.xml       |  4 ++--
 .../src/main/res/values-ru-rRU/strings_account.xml   |  7 ++-----
 ring-android/app/src/main/res/values-ru/strings.xml  |  4 ++--
 .../app/src/main/res/values-ru/strings_account.xml   |  5 +----
 .../app/src/main/res/values-sk-rSK/strings.xml       |  4 ++--
 .../src/main/res/values-sk-rSK/strings_account.xml   |  5 +----
 ring-android/app/src/main/res/values-sl/strings.xml  |  4 ++--
 .../app/src/main/res/values-sl/strings_account.xml   |  1 -
 .../app/src/main/res/values-sq-rAL/strings.xml       |  4 ++--
 .../src/main/res/values-sq-rAL/strings_account.xml   |  8 +++-----
 ring-android/app/src/main/res/values-sr/strings.xml  |  4 ++--
 ring-android/app/src/main/res/values-sv/strings.xml  |  4 ++--
 .../app/src/main/res/values-sv/strings_account.xml   |  5 -----
 ring-android/app/src/main/res/values-ta/strings.xml  |  4 ++--
 .../app/src/main/res/values-tr-rTR/strings.xml       |  4 ++--
 ring-android/app/src/main/res/values-tr/strings.xml  |  4 ++--
 .../app/src/main/res/values-tr/strings_account.xml   |  7 ++-----
 ring-android/app/src/main/res/values-uk/strings.xml  |  4 ++--
 .../app/src/main/res/values-uk/strings_account.xml   |  3 ---
 .../app/src/main/res/values-zh-rCN/strings.xml       |  6 ++++--
 .../src/main/res/values-zh-rCN/strings_account.xml   |  6 ++----
 .../main/res/values-zh-rCN/strings_preferences.xml   |  1 +
 .../app/src/main/res/values-zh-rTW/strings.xml       |  4 ++--
 .../src/main/res/values-zh-rTW/strings_account.xml   |  4 +---
 ring-android/app/src/main/res/values-zh/strings.xml  |  4 ++--
 111 files changed, 192 insertions(+), 291 deletions(-)

diff --git a/ring-android/app/src/main/res/values-ar/strings.xml b/ring-android/app/src/main/res/values-ar/strings.xml
index dc91db038..6c59894b3 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -91,12 +91,16 @@
   <!--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">ﻻ يمكن تشغيل جامي !</string>
   <string name="start_error_mic_required">جامي يستوجب الحصول على صلاحيات المايكروفون للعمل.</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>
@@ -185,7 +189,7 @@
   <string name="wizard_next">التالي</string>
   <string name="wizard_back">السابق</string>
   <string name="wizard_skip">تخطي</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">ملف شخصي</string>
   <string name="profile_message_warning">حسابك مشارك فقط مع جهات إتصالك</string>
   <string name="open_the_gallery">فتح المعرض</string>
@@ -274,7 +278,7 @@
   <string name="tv_send_audio">إرسال صوت</string>
   <string name="tv_send_video">إرسال وسيط</string>
   <string name="conversation_input_speech_hint">قل شيئا...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">موصى به</string>
   <string name="wizard_status_optional">اختياري</string>
   <string name="wizard_status_required">مطلوب</string>
@@ -290,4 +294,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-ar/strings_account.xml b/ring-android/app/src/main/res/values-ar/strings_account.xml
index 7e31a29f5..05782b4f7 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
@@ -36,7 +36,6 @@
   <!--AccountManagementFragment-->
   <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>
@@ -44,8 +43,6 @@
   <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">تغيير كلمة المرور</string>
-  <string name="account_password_set">تعيين كلمة المرور</string>
   <string name="account_password_change_wait_message">تغيير كلمة مرور الحساب</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">عام</string>
@@ -82,6 +79,7 @@
   <string name="account_stun_enable_label">إستعمال خادم STUN</string>
   <string name="account_stun_server_label">خادم STUN</string>
   <string name="account_accept_files">السماح بالملفات الواردة تلقائيا</string>
+  <string name="account_conversation_settings_title"> إعدادات المحادثات</string>
   <string name="account_accept_files_max_size">الحد الاقصى لحجم الملف كي يتم إستقباله تلقائيا</string>
   <string name="account_accept_files_never">عدم السماح بالاستقبال التلقائي نهائيا</string>
   <string name="account_accept_files_always">السماح بالإستقبال التلقائي دائما</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings.xml b/ring-android/app/src/main/res/values-bg/strings.xml
index 2aa79c647..380596810 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -148,7 +148,7 @@
   <string name="wizard_next">Напред</string>
   <string name="wizard_back">Назад</string>
   <string name="wizard_skip">Пропускане</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Профил</string>
   <string name="profile_message_warning">Профилът Ви се споделя само с контактите Ви</string>
   <string name="open_the_gallery">Отваряне на галерията</string>
@@ -208,6 +208,6 @@
   <string name="tv_audio_play">Пускане</string>
   <string name="tv_audio_pause">Пауза</string>
   <string name="tv_dialog_send">Изпращане</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Създаване на профил</string>
 </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 a31076243..5cea5a669 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
@@ -35,7 +35,6 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Няма регистриран профил</string>
   <string name="normal_accounts_titles">Профили</string>
-  <string name="normal_devices_titles">Познати устройства, свързани с този профил в Jami</string>
   <string name="account_device_revoke">Премахване на устройство</string>
   <string name="account_device_revocation_success_title">Успешно</string>
   <string name="account_device_revocation_success">Устройството е премахнато!</string>
@@ -43,7 +42,7 @@
   <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">Промяна на парола</string>
+  <string name="account_password_change">Промяна на паролата</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Общи</string>
   <string name="account_basic_category">Общи настройки</string>
@@ -135,7 +134,6 @@
   <!--Name registration-->
   <string name="error_username_empty">Въведете потребителско име</string>
   <string name="no_registered_name_for_account">Няма открито регистрирано име за този профил</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-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index 4f6f588bf..1309eafd4 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">Endavant</string>
   <string name="wizard_back">Enrere</string>
   <string name="wizard_skip">Salta</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Perfil</string>
   <string name="profile_message_warning">El vostre perfil només es comparteix amb els vostres contactes</string>
   <string name="open_the_gallery">Obre la galeria</string>
@@ -260,6 +260,6 @@
   <string name="tv_send_audio">Envia àudio</string>
   <string name="tv_send_video">Envia mitjans</string>
   <string name="conversation_input_speech_hint">Digui alguna cosa…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Crea compte</string>
 </resources>
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 ee45175d3..502fa3b5d 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
@@ -36,7 +36,7 @@ Podeu editar el vostre compte més endavant.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">No hi ha cap compte registrat</string>
   <string name="normal_accounts_titles">Comptes</string>
-  <string name="normal_devices_titles">Dispositius coneguts vinculats amb aquest compte de Jami</string>
+  <string name="normal_devices_titles">Dispositius vinculats</string>
   <string name="account_device_revoke">Revoca el dispositiu</string>
   <string name="account_device_revocation_success_title">Èxit</string>
   <string name="account_device_revocation_success">S\'ha revocat el dispositiu!</string>
@@ -45,7 +45,6 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="account_device_revocation_unknown_device">Dispositiu desconegut.</string>
   <string name="account_device_revocation_error_unknown">Error desconegut.</string>
   <string name="account_password_change">Canvia la contrasenya</string>
-  <string name="account_password_set">Estableix contrasenya</string>
   <string name="account_password_change_wait_message">Canviant contrasenya del compte</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
@@ -130,7 +129,6 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="error_passwords_not_equals">No coincideixen les contrasenyes</string>
   <string name="export_account_wait_title">Si us plau espereu...</string>
   <string name="export_account_wait_message">Exportant informació del compte</string>
-  <string name="account_export_file">Fes còpia de seguretat del compte</string>
   <string name="account_export_end_decryption_message">No s\'ha pogut desbloquejar el vostre compte amb la contrasenya que heu proveït</string>
   <string name="account_export_end_network_title">Error de xarxa</string>
   <string name="account_export_end_network_message">No s\'ha pogut exportar el vostre compte per la xarxa. Comproveu la vostre connectivitat.</string>
@@ -181,7 +179,6 @@ Podeu editar el vostre compte més endavant.</string>
   <string name="error_username_empty">Inseriu el vostre nom d\'usuari</string>
   <string name="no_registered_name_for_account">No s\'ha trobat cap nom registrat per aquest compte</string>
   <string name="username_available">Nom d\'usuari disponible !</string>
-  <string name="register_name">Registrar nom</string>
   <string name="trying_to_register_name">Provant de registrar nom d\'usuari</string>
   <string name="registered_username">Nom d\'usuari registrat</string>
   <string name="register_username">Registra nom d\'usuari públic</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 d3c622bab..34f95a011 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
@@ -47,7 +47,7 @@
   </plurals>
   <!--ContactList Fragment-->
   <string name="searchbar_hint">Vyhledat jméno nebo telefonní číslo…</string>
-  <string name="choose_number">Vyberte číslo</string>
+  <string name="choose_number">Zvolte číslo</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
@@ -89,6 +89,8 @@
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vy:</string>
   <string name="action_call_hangup">Zavěsit</string>
+  <string name="action_call_maximize">Maximalizovat</string>
+  <string name="action_call_minimize">Minimalizovat</string>
   <string name="ongoing_call">Probíhající hovor</string>
   <string name="hist_in_call">Příchozí hovor %1$s</string>
   <string name="hist_out_call">Odchozí hovor %1$s</string>
@@ -185,7 +187,7 @@
   <string name="wizard_next">Další</string>
   <string name="wizard_back">Zpět</string>
   <string name="wizard_skip">Přeskočit</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</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>
@@ -274,7 +276,7 @@
   <string name="tv_send_audio">Poslat zvuk</string>
   <string name="tv_send_video">Poslat média</string>
   <string name="conversation_input_speech_hint">Řekněte něco…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Doporučeno</string>
   <string name="wizard_status_optional">Volitelné</string>
   <string name="wizard_status_required">Vyžadováno</string>
@@ -290,4 +292,5 @@
   <string name="wizard_profile_info">Profil je sdílen jen s kontakty</string>
   <string name="wizard_profile_button">Uložit profil</string>
   <string name="wizard_profile_skip">Odložit na později</string>
+  <string name="fab_path_choose">Vybrat jiný soubor</string>
 </resources>
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 63bae9813..906ca8e63 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
@@ -21,7 +21,7 @@
   <string name="dialog_wait_create_details">Prosím vyčkejte, než bude váš účet přidán…</string>
   <string name="dialog_wait_update">Aktualizuje se účet</string>
   <string name="dialog_wait_update_details">Počkejte prosím, než bude váš účet aktualizován…</string>
-  <string name="dialog_warn_ip2ip_account_title">Vytvořit prázdný účet SIP ?</string>
+  <string name="dialog_warn_ip2ip_account_title">Vytvořit prázdný účet SIP?</string>
   <string name="dialog_warn_ip2ip_account_message">Vytváříte prázdný účet SIP bez platného hostitelského jména.
 Budete moci pouze vytvářet a přijímat přímé ip hovory.
 Svůj účet můžete upravit později</string>
@@ -36,7 +36,7 @@ Svůj účet můžete upravit později</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Žádný registrovaný účet</string>
   <string name="normal_accounts_titles">Účty</string>
-  <string name="normal_devices_titles">Známá zařízení připojená k tomuto účtu Jami</string>
+  <string name="normal_devices_titles">Připojená zařízení</string>
   <string name="account_device_revoke">Odebrat zařízení</string>
   <string name="account_device_revocation_success_title">Úspěch</string>
   <string name="account_device_revocation_success">Zařízení je nyní odebráno!</string>
@@ -134,7 +134,6 @@ 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>
@@ -178,7 +177,7 @@ Prověřte, prosím, své heslo.</string>
   <string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nK dokončení tohoto procesu otevřete Jami na novém zařízení. Přihlaste se k účtu pomocí „Připojit toto zařízení k účtu“. Váš PIN zůstává platný 10 minut.</string>
   <string name="account_link_export_info_light">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 pro nastavení účtu zadat na novém zařízení. PIN zůstává platný po 0 minut.</string>
   <string name="account_export_title">Přidat zařízení</string>
-  <string name="account_connect_server_button">Připojit se ke správcovskému serveru.</string>
+  <string name="account_connect_server_button">Připojit se ke správcovskému serveru</string>
   <string name="account_connect_button">Připojit</string>
   <string name="prompt_server">Adresa URL správcovského serveru Jami</string>
   <string name="help_credentials_enter">Zadejte přihlašovací údaje vaší organizace</string>
@@ -188,7 +187,6 @@ 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>
@@ -219,9 +217,9 @@ Prověřte, prosím, své heslo.</string>
   <string name="revoke_device_wait_title">Počkejte prosím…</string>
   <string name="revoke_device_wait_message">Odebírá se účet</string>
   <string name="rename_device_title">Přejmenovat toto zařízení</string>
-  <string name="rename_device_message">Vyberte nový název pro rozeznání tohoto zařízení ve vašem účtu Jami</string>
+  <string name="rename_device_message">Zvolte si nový název pro rozeznání tohoto zařízení ve vašem účtu Jami</string>
   <string name="rename_device_button">Přejmenovat zařízení</string>
-  <string name="account_rename_device_hint">Vybrat název nového zařízení</string>
+  <string name="account_rename_device_hint">Zvolit si název nového zařízení</string>
   <string name="account_device_name_empty">Název zařízení nemůže být prázdný</string>
   <string name="account_device_this_indicator">toto zařízení</string>
   <string name="account_disabled_indicator">zakázáno</string>
diff --git a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
index 92c1da44b..bb74433b4 100644
--- a/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-cs-rCZ/strings_preferences.xml
@@ -41,4 +41,5 @@
   <string name="plugin_recent_version_exception">Máte novější verzi <b>%1$s</b></string>
   <string name="plugin_same_version_exception">Máte nainstalovanou stejnou verzi <b>%1$s</b></string>
   <string name="plugin_force_install">vynutit instalaci</string>
+  <string name="plugin_path_image_add">Přidat nový obrázek</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da/strings.xml b/ring-android/app/src/main/res/values-da/strings.xml
index 40c2d0a1d..b3d8917aa 100644
--- a/ring-android/app/src/main/res/values-da/strings.xml
+++ b/ring-android/app/src/main/res/values-da/strings.xml
@@ -130,7 +130,7 @@
   <string name="wizard_next">Næste</string>
   <string name="wizard_back">Tilbage</string>
   <string name="wizard_skip">Spring over</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Din profil vil kun blive delt med dine kontakter</string>
   <string name="open_the_gallery">Åbn galleriet</string>
@@ -192,6 +192,6 @@
   <string name="tv_audio_play">Afspil</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Send</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Opret konto</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-da/strings_account.xml b/ring-android/app/src/main/res/values-da/strings_account.xml
index 21d5c4332..18a706043 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
@@ -40,7 +40,6 @@ Du kan rette din konto senere</string>
   <string name="account_device_revocation_wrong_password">Forkert adgangskode.</string>
   <string name="account_device_revocation_unknown_device">Ukendt enhed.</string>
   <string name="account_device_revocation_error_unknown">Ukendt fejl.</string>
-  <string name="account_password_change">Skift adgangskode</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generelt</string>
   <string name="account_basic_category">Almindelige Indstillinger</string>
@@ -140,7 +139,6 @@ Du kan rette din konto senere</string>
   <!--Name registration-->
   <string name="error_username_empty">Indtast et brugernavn</string>
   <string name="no_registered_name_for_account">Intet registreret navn fundet for denne konto</string>
-  <string name="register_name">Registrer navn</string>
   <string name="trying_to_register_name">Forsøger at registrere navn</string>
   <string name="registered_username">Registreret brugernavn</string>
   <string name="register_username">Registrer offentligt brugernavn</string>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 8d464a9cc..927870a59 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings.xml
@@ -149,7 +149,7 @@
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
   <string name="wizard_skip">Überspringen</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
   <string name="open_the_gallery">Galerie öffnen</string>
@@ -212,6 +212,6 @@
   <!--TV-->
   <string name="tv_audio_play">Wiedergeben</string>
   <string name="tv_dialog_send">Senden</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Konto erstellen</string>
 </resources>
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 64275125d..7df89e36a 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
@@ -34,13 +34,12 @@ Sie können Ihr Konto später ändern.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Es ist kein Konto registriert</string>
   <string name="normal_accounts_titles">Konten</string>
-  <string name="normal_devices_titles">Bekannte Geräte, die mit diesem Jami-Konto verbunden sind</string>
   <string name="account_device_revoke">Gerät widerrufen</string>
   <string name="account_device_revocation_success_title">Erfolg</string>
   <string name="account_device_revocation_wrong_password">Falsches Passwort.</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_change">Ändere das Passwort</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Allgemein</string>
   <string name="account_basic_category">Grundeinstellungen</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 f5dd711c6..2c5a8a556 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -87,6 +87,8 @@
   <!--Call Fragment-->
   <string name="you_txt_prefix">Du:</string>
   <string name="action_call_hangup">Auflegen</string>
+  <string name="action_call_maximize">Maximiere</string>
+  <string name="action_call_minimize">Reduziere</string>
   <string name="ongoing_call">Derzeitiger Anruf</string>
   <string name="hist_in_call">Eingehender Anruf von %1$s</string>
   <string name="hist_out_call">Ausgehender Anruf von %1$s</string>
@@ -183,7 +185,7 @@
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
   <string name="wizard_skip">Überspringen</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Dein Profil wird nur mit deinen Kontakten geteilt</string>
   <string name="open_the_gallery">Galerie öffnen</string>
@@ -272,7 +274,7 @@
   <string name="tv_send_audio">Audio senden</string>
   <string name="tv_send_video">Medien senden</string>
   <string name="conversation_input_speech_hint">Sag etwas...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Empfohlen</string>
   <string name="wizard_status_optional">Optional</string>
   <string name="wizard_status_required">Notwendig</string>
@@ -288,4 +290,5 @@
   <string name="wizard_profile_info">Profil wird nur mit Kontakten geteilt</string>
   <string name="wizard_profile_button">Profil speichern</string>
   <string name="wizard_profile_skip">Überspringen und später durchführen</string>
+  <string name="fab_path_choose">Wählen Sie eine andere Datei</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 b37ec37df..cf90540dc 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
@@ -36,7 +36,7 @@ Sie können ihr Konto später bearbeiten</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Kein Konto registriert</string>
   <string name="normal_accounts_titles">Konten</string>
-  <string name="normal_devices_titles">Bekannte Geräte, die mit diesem Jami-Konto verknüpft sind</string>
+  <string name="normal_devices_titles">Verbundene Geräte</string>
   <string name="account_device_revoke">Gerät widerrufen</string>
   <string name="account_device_revocation_success_title">Erfolgreich</string>
   <string name="account_device_revocation_success">Gerät wird jetzt widerrufen!</string>
@@ -45,7 +45,6 @@ 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>
@@ -134,7 +133,6 @@ 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">Konto sichern</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>
@@ -186,7 +184,6 @@ 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">Name registrieren</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-de/strings_preferences.xml b/ring-android/app/src/main/res/values-de/strings_preferences.xml
index a1f64efe1..8cf595af6 100644
--- a/ring-android/app/src/main/res/values-de/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de/strings_preferences.xml
@@ -40,4 +40,6 @@
   <string name="plugin_install_failure">Installation des Plugins ist fehlgeschlagen: <b>%1$s</b></string>
   <string name="plugin_recent_version_exception">Sie haben eine neuere Version von: <b>%1$s</b></string>
   <string name="plugin_same_version_exception">Sie haben die gleiche Version von <b>%1$s</b> installiert</string>
+  <string name="plugin_force_install">Erzwinge \n Installation</string>
+  <string name="plugin_path_image_add">Ein neues Bild hinzufügen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings.xml b/ring-android/app/src/main/res/values-el/strings.xml
index 132f0b57b..3941ff913 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -112,7 +112,7 @@
   <string name="prompt_hint_username">Όνομα χρήστη</string>
   <string name="wizard_next">Επόμενο</string>
   <string name="wizard_back">Πίσω</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Προφίλ</string>
   <string name="profile_message_warning">Το προφίλ σας διαμοιράζεται μόνο με τις επαφές σας</string>
   <string name="open_the_gallery">Άνοιγμα έκθεσης</string>
@@ -150,6 +150,6 @@
   <!--TV-->
   <string name="tv_audio_play">Αναπαραγωγή</string>
   <string name="tv_dialog_send">Αποστολή</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Δημιουργία λογαριασμού</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings.xml b/ring-android/app/src/main/res/values-eo/strings.xml
index 1163d7780..4897c2a4b 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -80,7 +80,7 @@
   <string name="prompt_new_password">Nova pasvorto</string>
   <string name="prompt_hint_username">Uzantnomo</string>
   <string name="wizard_next">Sekva</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profilo</string>
   <!--Share fragment-->
   <string name="share_label">Kunhavi</string>
@@ -104,5 +104,5 @@
   <string name="tv_audio_play">Ludi</string>
   <string name="tv_audio_pause">Paŭzi</string>
   <string name="tv_dialog_send">Sendi</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings.xml b/ring-android/app/src/main/res/values-es-rAR/strings.xml
index 8d01e0eed..aea1c796f 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings.xml
@@ -178,7 +178,7 @@
   <string name="wizard_next">Siguiente</string>
   <string name="wizard_back">Atrás</string>
   <string name="wizard_skip">Saltar</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Perfil</string>
   <string name="profile_message_warning">Tu perfil sólo es compartido con tus contactos</string>
   <string name="open_the_gallery">Abrir galería</string>
@@ -267,7 +267,7 @@
   <string name="tv_send_audio">Enviar audio</string>
   <string name="tv_send_video">Enviar medios</string>
   <string name="conversation_input_speech_hint">Diga algo...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Recomendado</string>
   <string name="wizard_status_optional">Opcional</string>
   <string name="wizard_status_required">Requerido</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 97c2b3734..0a0eb9a9d 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
@@ -36,7 +36,7 @@ Podrá editar su cuenta más tarde.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">No hay cuenta registrada</string>
   <string name="normal_accounts_titles">Cuentas</string>
-  <string name="normal_devices_titles">Dispositivos conocidos conectados a esta cuenta de Jami</string>
+  <string name="normal_devices_titles">Dispositvos vinculados</string>
   <string name="account_device_revoke">Revocar dispositivo</string>
   <string name="account_device_revocation_success_title">Éxito</string>
   <string name="account_device_revocation_success">¡Se ha revocado el dispositivo!</string>
@@ -45,7 +45,6 @@ Podrá editar su cuenta más tarde.</string>
   <string name="account_device_revocation_unknown_device">Dispositivo desconocido.</string>
   <string name="account_device_revocation_error_unknown">Error desconocido.</string>
   <string name="account_password_change">Cambiar contraseña</string>
-  <string name="account_password_set">Establecer contraseña</string>
   <string name="account_password_change_wait_message">Cambiando la contraseña de la cuenta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
@@ -132,7 +131,6 @@ Podrá editar su cuenta más tarde.</string>
   <string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
   <string name="export_account_wait_title">Por favor espere...</string>
   <string name="export_account_wait_message">Exportando la información de la cuenta</string>
-  <string name="account_export_file">Crear copia de seguridad de la cuenta</string>
   <string name="account_export_end_decryption_message">No se pudo desbloquear la cuenta con la contraseña ingresada.</string>
   <string name="account_export_end_network_title">Error de red</string>
   <string name="account_export_end_network_message">No se pudo exportar su cuenta. Compruebe su conexión a internet.</string>
@@ -184,7 +182,6 @@ Podrá editar su cuenta más tarde.</string>
   <string name="error_username_empty">Ingresá un nombre de usuario</string>
   <string name="no_registered_name_for_account">No se encontró ningún nombre registrado para esta cuenta</string>
   <string name="username_available">¡Nombre de usuario disponible!</string>
-  <string name="register_name">Registrar nombre</string>
   <string name="trying_to_register_name">Intentanto registrar nombre</string>
   <string name="registered_username">Nombre de usuario registrado</string>
   <string name="register_username">Registrar nombre de usuario público</string>
diff --git a/ring-android/app/src/main/res/values-es-rMX/strings.xml b/ring-android/app/src/main/res/values-es-rMX/strings.xml
index 8ec314ce7..f6f4e12cb 100644
--- a/ring-android/app/src/main/res/values-es-rMX/strings.xml
+++ b/ring-android/app/src/main/res/values-es-rMX/strings.xml
@@ -26,7 +26,7 @@
   <!--Conversation-->
   <!--Contacts-->
   <string name="wizard_next">Siguiente</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -38,5 +38,5 @@
   <string name="navigation_item_account">Cuenta</string>
   <!--TV-->
   <string name="tv_audio_play">Reproducir</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings.xml b/ring-android/app/src/main/res/values-es/strings.xml
index fee6772f6..ab7a4cc28 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -184,7 +184,7 @@
   <string name="wizard_next">Siguiente</string>
   <string name="wizard_back">Volver</string>
   <string name="wizard_skip">Saltar</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Perfil</string>
   <string name="profile_message_warning">Tu perfil solamente se comparte con tus contactos</string>
   <string name="open_the_gallery">Abrir la galería</string>
@@ -273,7 +273,7 @@
   <string name="tv_send_audio">Enviar audio</string>
   <string name="tv_send_video">Enviar contenido</string>
   <string name="conversation_input_speech_hint">Di algo…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Recomendado</string>
   <string name="wizard_status_optional">Opcional</string>
   <string name="wizard_status_required">Requerido</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 5a4dae0fa..62698f9d7 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
@@ -36,7 +36,7 @@ Puedes editar tu cuenta luego</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">No hay cuentas registradas</string>
   <string name="normal_accounts_titles">Cuentas</string>
-  <string name="normal_devices_titles">Dispositivos conocidos conectados a esta cuenta de Jami</string>
+  <string name="normal_devices_titles">Dispositivos conectados</string>
   <string name="account_device_revoke">Anular dispositivo</string>
   <string name="account_device_revocation_success_title">Hecho</string>
   <string name="account_device_revocation_success">¡Se ha anulado el dispositivo!</string>
@@ -45,7 +45,6 @@ Puedes editar tu cuenta luego</string>
   <string name="account_device_revocation_unknown_device">Dispositivo desconocido</string>
   <string name="account_device_revocation_error_unknown">Error desconocido.</string>
   <string name="account_password_change">Cambiar contraseña</string>
-  <string name="account_password_set">Establecer Contraseña</string>
   <string name="account_password_change_wait_message">Cambiar contraseña de cuenta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
@@ -134,7 +133,6 @@ Puedes editar tu cuenta luego</string>
   <string name="error_passwords_not_equals">Las contraseñas no coinciden</string>
   <string name="export_account_wait_title">Por favor, espera...</string>
   <string name="export_account_wait_message">Exportando información de cuenta</string>
-  <string name="account_export_file">Cuenta de respaldo</string>
   <string name="account_export_end_decryption_message">Error al desbloquear tu cuenta con la contraseña provista</string>
   <string name="account_export_end_network_title">Error en la red</string>
   <string name="account_export_end_network_message">Error al exportar la cuenta a la red. Verifica tu conectividad.</string>
@@ -186,7 +184,6 @@ Puedes editar tu cuenta luego</string>
   <string name="error_username_empty">Ingresa un nombre de usuario</string>
   <string name="no_registered_name_for_account">No se ha encontrado un nombre registrado con esta cuenta</string>
   <string name="username_available">¡Nombre de usuario disponible!</string>
-  <string name="register_name">Registrar nombre</string>
   <string name="trying_to_register_name">Intentando registrar nombre</string>
   <string name="registered_username">Nombre de usuario registrado</string>
   <string name="register_username">Registrar nombre de usuario público</string>
diff --git a/ring-android/app/src/main/res/values-et/strings.xml b/ring-android/app/src/main/res/values-et/strings.xml
index 4f0c361ea..7a32acc08 100644
--- a/ring-android/app/src/main/res/values-et/strings.xml
+++ b/ring-android/app/src/main/res/values-et/strings.xml
@@ -25,7 +25,7 @@
   <string name="conversation_action_history_clear">Kustuta ajalugu</string>
   <string name="conversation_action_block_this">Blokeeri kontakt</string>
   <!--Contacts-->
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -35,5 +35,5 @@
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Vestlused</string>
   <!--TV-->
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-eu/strings.xml b/ring-android/app/src/main/res/values-eu/strings.xml
index d06dd7ef1..1dd57b6bd 100644
--- a/ring-android/app/src/main/res/values-eu/strings.xml
+++ b/ring-android/app/src/main/res/values-eu/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">Hurrengoa</string>
   <string name="wizard_back">Atzera</string>
   <string name="wizard_skip">Jauzi</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profila</string>
   <string name="profile_message_warning">Zure profila zure kontaktuekin partekatzen da soilik</string>
   <string name="open_the_gallery">Ireki galeria</string>
@@ -253,6 +253,6 @@
   <string name="tv_dialog_send">Bidali</string>
   <string name="tv_send_text">Bidali testua</string>
   <string name="tv_send_audio">Bidali audioa</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Sortu kontua</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-eu/strings_account.xml b/ring-android/app/src/main/res/values-eu/strings_account.xml
index 6061a8334..a88516077 100644
--- a/ring-android/app/src/main/res/values-eu/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eu/strings_account.xml
@@ -37,7 +37,6 @@
   <string name="account_device_revocation_unknown_device">Gailu ezezaguna.</string>
   <string name="account_device_revocation_error_unknown">Errore ezezaguna.</string>
   <string name="account_password_change">Aldatu pasahitza</string>
-  <string name="account_password_set">Ezarri pasahitza</string>
   <string name="account_password_change_wait_message">Kontuaren pasahitza aldatzen</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Orokorra</string>
@@ -91,7 +90,6 @@
   <string name="error_passwords_not_equals">Pasahitzak ez datoz bat</string>
   <string name="export_account_wait_title">Itxaron mesedez...</string>
   <string name="export_account_wait_message">Kontuaren informazioa esportatzen</string>
-  <string name="account_export_file">Egin kontuaren babes-kopia</string>
   <string name="account_export_end_network_title">Sare errorea</string>
   <string name="account_export_end_error_title">Errorea</string>
   <string name="account_enter_password">Sartu pasahitza</string>
@@ -117,7 +115,6 @@
   <!--Name registration-->
   <string name="error_username_empty">Sartu erabiltzaile-izen bat</string>
   <string name="username_available">Erabiltzaile-izena eskuragarri dago!</string>
-  <string name="register_name">Erregistratu izena</string>
   <string name="trying_to_register_name">Izena erregistratzen saiatzen</string>
   <string name="registered_username">Erregistratutako erabiltzaile-izena</string>
   <string name="register_username">Erregistratu izen publikoa</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings.xml b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
index 5903c0862..109cce61c 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings.xml
@@ -183,7 +183,7 @@
   <string name="wizard_next">بعدی</string>
   <string name="wizard_back">بازگشت</string>
   <string name="wizard_skip">پرش</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">نمایه</string>
   <string name="profile_message_warning">نمایه شما تنها با مخاطبانتان هم‌رسانی می‌شود</string>
   <string name="open_the_gallery">گالری را باز کنید</string>
@@ -272,7 +272,7 @@
   <string name="tv_send_audio">ارسال صدا</string>
   <string name="tv_send_video">ارسال محتوای رسانه‌ای</string>
   <string name="conversation_input_speech_hint">چیزی بگویید...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">توصیه‌شده</string>
   <string name="wizard_status_optional">اختیاری</string>
   <string name="wizard_status_required">ضروری</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 a221288ac..d19bb3756 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">هیچ حسابی ثبت نشده است</string>
   <string name="normal_accounts_titles">حساب‌ها</string>
-  <string name="normal_devices_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>
@@ -45,7 +45,6 @@
   <string name="account_device_revocation_unknown_device">دستگاه ناشناس.</string>
   <string name="account_device_revocation_error_unknown">خطای ناشناخته.</string>
   <string name="account_password_change">تغییر گذرواژه</string>
-  <string name="account_password_set">تعیین گذرواژه</string>
   <string name="account_password_change_wait_message">تغییر گذرواژه حساب</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">عمومی</string>
@@ -134,7 +133,6 @@
   <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>
@@ -186,7 +184,6 @@
   <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-fi/strings.xml b/ring-android/app/src/main/res/values-fi/strings.xml
index 8e4cecd77..9e20fb6ae 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -183,7 +183,7 @@
   <string name="wizard_next">Seuraava</string>
   <string name="wizard_back">Takaisin</string>
   <string name="wizard_skip">Ohita</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profiili</string>
   <string name="profile_message_warning">Profiilisi jaetaan vain yhteystietojesi kanssa</string>
   <string name="open_the_gallery">Avaa valokuvat</string>
@@ -272,7 +272,7 @@
   <string name="tv_send_audio">Lähetä ääni</string>
   <string name="tv_send_video">Lähetä media</string>
   <string name="conversation_input_speech_hint">Sano jotakin...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Suositus</string>
   <string name="wizard_status_optional">Valinnainen</string>
   <string name="wizard_status_required">Vaaditaan</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 620d2f7d5..7aadc87f9 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
@@ -34,7 +34,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ei rekistöröityjä tunnuksia</string>
   <string name="normal_accounts_titles">Tunnukset</string>
-  <string name="normal_devices_titles">Tähän Jami-tunnukseen linkitetyt laitteet</string>
+  <string name="normal_devices_titles">Linkitetyt laitteet</string>
   <string name="account_device_revoke">Peruuta laite</string>
   <string name="account_device_revocation_success_title">Onnistui</string>
   <string name="account_device_revocation_success">Laite on nyt peruttu!</string>
@@ -132,7 +132,6 @@
   <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">Varakäyttäjätunnus</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>
@@ -184,7 +183,6 @@
   <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-fr-rBE/strings.xml b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
index a1cf399a6..fce372107 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
@@ -32,7 +32,7 @@
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="wizard_next">Suivant</string>
   <string name="wizard_skip">Passer</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <!--Share fragment-->
   <string name="share_label">Partager</string>
@@ -52,5 +52,5 @@
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
   <string name="tv_dialog_send">Envoyer</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
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 667c159e5..4b7f5c0a7 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
@@ -8,7 +8,6 @@
   <!--Strings related to account deletion-->
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Comptes</string>
-  <string name="account_password_change">Changer mot de passe</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Général</string>
   <string name="account_bootstrap_label">Amorcer</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings.xml b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
index fcea863a3..cb74c5693 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings.xml
@@ -109,7 +109,7 @@
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Précédent</string>
   <string name="wizard_skip">Passer</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Votre profil est partagé avec vos contacts uniquement</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
@@ -152,6 +152,6 @@
   <string name="tv_audio_play">Jouer</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Envoyer</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Créer un compte</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 3c9c1aafe..802592b30 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
@@ -40,8 +40,6 @@ Vous pourrez modifier votre compte plus tard.</string>
   <string name="account_device_revocation_wrong_password">Mauvais mot de passe.</string>
   <string name="account_device_revocation_unknown_device">Appareil inconnu.</string>
   <string name="account_device_revocation_error_unknown">Erreur inconnue.</string>
-  <string name="account_password_change">Changer mot de passe</string>
-  <string name="account_password_set">Définir mot de passe</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Général</string>
   <string name="account_basic_category">Réglages de base</string>
@@ -108,7 +106,6 @@ Vous pourrez modifier votre compte plus tard.</string>
   <string name="error_password_char_count">Minimum de 6 caractères</string>
   <string name="error_passwords_not_equals">Les mots de passe ne concordent pas</string>
   <string name="export_account_wait_title">Patientez s\'il vous plaît</string>
-  <string name="account_export_file">Sauvegarder le compte</string>
   <string name="account_export_end_decryption_message">Votre compte n\'a pu être déverrouillé avec 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">L\'exportation du compte sur le réseau a échouée. Vérifier votre connexion.</string>
@@ -139,7 +136,6 @@ Vous pourrez modifier votre compte plus tard.</string>
   <!--Name registration-->
   <string name="error_username_empty">Entrer le nom d\'utilisateur</string>
   <string name="no_registered_name_for_account">Aucun nom enregistré trouvé pour ce compte</string>
-  <string name="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-fr-rCH/strings.xml b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
index a1cf399a6..fce372107 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
@@ -32,7 +32,7 @@
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="wizard_next">Suivant</string>
   <string name="wizard_skip">Passer</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <!--Share fragment-->
   <string name="share_label">Partager</string>
@@ -52,5 +52,5 @@
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
   <string name="tv_dialog_send">Envoyer</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
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 667c159e5..4b7f5c0a7 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
@@ -8,7 +8,6 @@
   <!--Strings related to account deletion-->
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Comptes</string>
-  <string name="account_password_change">Changer mot de passe</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Général</string>
   <string name="account_bootstrap_label">Amorcer</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 f1621ca33..c7fd5b450 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
@@ -183,7 +183,7 @@
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Retour</string>
   <string name="wizard_skip">Passer</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
@@ -272,7 +272,7 @@
   <string name="tv_send_audio">Envoyer de l\'audio</string>
   <string name="tv_send_video">Envoyer le média</string>
   <string name="conversation_input_speech_hint">Dites quelque chose..</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Recommandé</string>
   <string name="wizard_status_optional">Optionnel</string>
   <string name="wizard_status_required">Requis</string>
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 e0f7e41a3..0e04e885a 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
@@ -26,7 +26,6 @@
   <string name="account_delete_dialog_message">Cette action ne peut pas être annulée</string>
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Comptes</string>
-  <string name="account_password_change">changer le mot de passe</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Général</string>
   <string name="account_hostname_label">nom d\'hôte</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 d13de4b77..30b7a5433 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -185,7 +185,7 @@
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Précédent</string>
   <string name="wizard_skip">Passez</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
@@ -274,7 +274,7 @@
   <string name="tv_send_audio">Envoyer le message audio </string>
   <string name="tv_send_video">Envoyer le média</string>
   <string name="conversation_input_speech_hint">Dîtes quelque chose...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Recommandé</string>
   <string name="wizard_status_optional">Optionnel</string>
   <string name="wizard_status_required">Obligatoire</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 06f8e9790..05fa6d2e4 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
@@ -36,7 +36,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Aucun compte enregistré</string>
   <string name="normal_accounts_titles">Comptes</string>
-  <string name="normal_devices_titles">Appareils connus associés à ce compte Jami</string>
+  <string name="normal_devices_titles">Appareils associés</string>
   <string name="account_device_revoke">Révoquer l\'appareil</string>
   <string name="account_device_revocation_success_title">Succès</string>
   <string name="account_device_revocation_success">L\'appareil est maintenant révoqué !</string>
@@ -45,7 +45,7 @@ Vous pouvez modifier votre compte plus tard.</string>
   <string name="account_device_revocation_unknown_device">Appareil inconnu.</string>
   <string name="account_device_revocation_error_unknown">Erreur inconnue.</string>
   <string name="account_password_change">Changer le mot de passe</string>
-  <string name="account_password_set">Définir un mot de passe</string>
+  <string name="account_password_set">Mettre un mot de passe</string>
   <string name="account_password_change_wait_message">Changement du mot de passe du compte</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Général</string>
@@ -136,7 +136,6 @@ 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 le 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>
@@ -188,7 +187,6 @@ 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 9172f68ea..1cfbf6b4f 100644
--- a/ring-android/app/src/main/res/values-gl/strings.xml
+++ b/ring-android/app/src/main/res/values-gl/strings.xml
@@ -176,7 +176,7 @@
   <string name="wizard_next">Seguinte</string>
   <string name="wizard_back">Atrás</string>
   <string name="wizard_skip">Saltar</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">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>
@@ -261,6 +261,6 @@
   <string name="tv_send_audio">Enviar audio</string>
   <string name="tv_send_video">Enviar multimedia</string>
   <string name="conversation_input_speech_hint">Dí algo...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Crear conta</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 cde899da6..dde64499f 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,7 +36,6 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Non hai conta rexistrada</string>
   <string name="normal_accounts_titles">Contas</string>
-  <string name="normal_devices_titles">Dispositivos coñecidos ligados a esta conta Jami</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>
@@ -45,7 +44,6 @@
   <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">Escribe contrasinal</string>
   <string name="account_password_change_wait_message">Cambiando contrasinal da conta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Xeral</string>
@@ -130,7 +128,6 @@
   <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>
@@ -181,7 +178,6 @@
   <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>
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 33d325b65..46e4f1521 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -41,7 +41,7 @@
   <!--Contacts-->
   <string name="prompt_hint_username">שם משתמש</string>
   <string name="wizard_next">קדימה</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">פרופיל</string>
   <!--Share fragment-->
   <string name="generic_error_migration">שגיאה</string>
@@ -63,5 +63,5 @@
   <string name="navigation_item_account">חשבון</string>
   <!--TV-->
   <string name="tv_dialog_send">שלח</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings.xml b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
index ad894ed91..039fd229d 100644
--- a/ring-android/app/src/main/res/values-hi-rIN/strings.xml
+++ b/ring-android/app/src/main/res/values-hi-rIN/strings.xml
@@ -33,7 +33,7 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -44,5 +44,5 @@
   <string name="navigation_item_account">खाता</string>
   <!--TV-->
   <string name="tv_audio_play">शुरू करें</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings.xml b/ring-android/app/src/main/res/values-hr/strings.xml
index 55490ca79..bf0cc219b 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -139,7 +139,7 @@
   <string name="wizard_next">Slijedeće</string>
   <string name="wizard_back">Natrag</string>
   <string name="wizard_skip">Preskoči</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Vaš profil je podjeljen samo sa vašim kontaktima</string>
   <string name="open_the_gallery">Otvorite galeriju</string>
@@ -181,6 +181,6 @@
   <string name="tv_audio_play">izvodi</string>
   <string name="tv_audio_pause">Pauza</string>
   <string name="tv_dialog_send">Pošalji</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Napravi račun</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings.xml b/ring-android/app/src/main/res/values-hu/strings.xml
index e68716140..0ed1b5341 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -11,7 +11,7 @@
   <string name="no_email_app_installed">Nem található e-mail app. Telepítsen egyet, hogy jelentést tudjon küldeni nekünk</string>
   <string name="no_browser_app_installed">Nem található webböngésző app. Telepítsen egyet az oldal megtekintéséhez!</string>
   <string name="email_chooser_title">Levél küldése a következővel…</string>
-  <string name="website_chooser_title">Weboldal megtekintése a következővel…</string>
+  <string name="website_chooser_title">Honlap megtekintése a következővel…</string>
   <string name="license">Ez a szoftver a „jelen állapotában” kerül kiadásra, mindenféle garanciavállalás nélkül. A részletekért lásd a<u>GNU általános nyilvános engedély 3-as vagy újabb verzióját</u></string>
   <string name="description">A Jami (GNU csomag, korábban Ring) egy univerzális és elosztott közlés emelvény, amely tiszteletben tartja a felhasználók szabadságait és magánéletét.</string>
   <string name="credits">Készítők</string>
@@ -185,7 +185,7 @@
   <string name="wizard_next">Tovább</string>
   <string name="wizard_back">Vissza</string>
   <string name="wizard_skip">Átugrani</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</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>
@@ -274,7 +274,7 @@
   <string name="tv_send_audio">Hang küldése</string>
   <string name="tv_send_video">Média küldése</string>
   <string name="conversation_input_speech_hint">Mondjon valamit…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Ajánlott</string>
   <string name="wizard_status_optional">Választható</string>
   <string name="wizard_status_required">Szükséges</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 28671cf62..577fd1a29 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Fiók nincs bejegyezve</string>
   <string name="normal_accounts_titles">Fiókok</string>
-  <string name="normal_devices_titles">A Jami-fiókhoz kapcsolt ismert eszközök</string>
+  <string name="normal_devices_titles">Összekapcsolt eszközök</string>
   <string name="account_device_revoke">Eszköz visszavonása</string>
   <string name="account_device_revocation_success_title">Sikeres</string>
   <string name="account_device_revocation_success">Az eszköz most visszavonásra került.</string>
@@ -134,7 +134,6 @@
   <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>
@@ -186,7 +185,6 @@
   <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 regisztrációja</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-id/strings.xml b/ring-android/app/src/main/res/values-id/strings.xml
index 852b581ce..a0800ac81 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -108,7 +108,7 @@
   <string name="prompt_new_username">Masukkan username baru</string>
   <string name="wizard_next">Selanjutnya</string>
   <string name="wizard_back">Kembali</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Profil Anda hanya dibagikan kepada kontak Anda</string>
   <string name="open_the_gallery">Buka galeri</string>
@@ -136,5 +136,5 @@
   <!--TV-->
   <string name="tv_audio_play">Mainkan</string>
   <string name="tv_dialog_send">Kirim</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ig/strings.xml b/ring-android/app/src/main/res/values-ig/strings.xml
index fa39f8bfd..ff0a1756e 100644
--- a/ring-android/app/src/main/res/values-ig/strings.xml
+++ b/ring-android/app/src/main/res/values-ig/strings.xml
@@ -26,7 +26,7 @@
   <!--Conversation-->
   <!--Contacts-->
   <string name="wizard_next">Nke na-abịa</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -37,5 +37,5 @@
   <!--Bottom Navigation-->
   <!--TV-->
   <string name="tv_dialog_send">Zie</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings.xml b/ring-android/app/src/main/res/values-it-rIT/strings.xml
index f529a59e7..2e6c9a116 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings.xml
@@ -87,6 +87,7 @@
   <!--Call Fragment-->
   <string name="you_txt_prefix">Tu:</string>
   <string name="action_call_hangup">Chiudi</string>
+  <string name="action_call_maximize">Massimizza</string>
   <string name="ongoing_call">Chiamata in corso</string>
   <string name="hist_in_call">Chiamata in arrivo di %1$s</string>
   <string name="hist_out_call">Chiamata in uscita di %1$s</string>
@@ -181,7 +182,7 @@
   <string name="wizard_next">Prossimo</string>
   <string name="wizard_back">Indietro</string>
   <string name="wizard_skip">Salta</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profilo</string>
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria immagini</string>
@@ -270,7 +271,7 @@
   <string name="tv_send_audio">Invia audio</string>
   <string name="tv_send_video">Inviare media</string>
   <string name="conversation_input_speech_hint">Di\' qualcosa…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Consigliato</string>
   <string name="wizard_status_optional">Opzionale</string>
   <string name="wizard_status_required">Necessario</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 c03c53360..66ac96a13 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
@@ -36,7 +36,7 @@ Potrai modificare il tuo account successivamente</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nessun account registrato</string>
   <string name="normal_accounts_titles">Accounts</string>
-  <string name="normal_devices_titles">Dispositivi noti collegati a questo account Jami</string>
+  <string name="normal_devices_titles">Dispositivi collegati</string>
   <string name="account_device_revoke">Revoca dispositivo</string>
   <string name="account_device_revocation_success_title">Successo</string>
   <string name="account_device_revocation_success">Il dispositivo è ora revocato!</string>
@@ -45,7 +45,6 @@ Potrai modificare il tuo account successivamente</string>
   <string name="account_device_revocation_unknown_device">Dispositivo sconosciuto.</string>
   <string name="account_device_revocation_error_unknown">Errore sconosciuto.</string>
   <string name="account_password_change">Cambia password</string>
-  <string name="account_password_set">Imposta password</string>
   <string name="account_password_change_wait_message">Modifica della password dell\'account</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generale</string>
@@ -134,7 +133,6 @@ Potrai modificare il tuo account successivamente</string>
   <string name="error_passwords_not_equals">Le password non corrispondono</string>
   <string name="export_account_wait_title">Prego attendere...</string>
   <string name="export_account_wait_message">Esportazione informazioni sull\'account</string>
-  <string name="account_export_file">Backup account</string>
   <string name="account_export_end_decryption_message">Impossibile sbloccare l\'account x la con la password inserita.</string>
   <string name="account_export_end_network_title">Errore di rete</string>
   <string name="account_export_end_network_message">Impossibile esportare l\'account sulla rete. Controlla la tua connettività.</string>
@@ -186,7 +184,6 @@ Potrai modificare il tuo account successivamente</string>
   <string name="error_username_empty">Inserire un nome utente</string>
   <string name="no_registered_name_for_account">Nessun nome registrato è stato trovato per questo account</string>
   <string name="username_available">Nome utente disponibile !</string>
-  <string name="register_name">Nome registrazione</string>
   <string name="trying_to_register_name">Tentativo di registrazione del nome</string>
   <string name="registered_username">Nome utente registrato</string>
   <string name="register_username">Registra nome utente pubblico</string>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index d122ce02e..0cc6ce5ae 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -170,7 +170,7 @@
   <string name="wizard_next">Seguente</string>
   <string name="wizard_back">Indietro</string>
   <string name="wizard_skip">Salta</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profilo</string>
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria</string>
@@ -243,6 +243,6 @@
   <!--TV-->
   <string name="tv_audio_play">Play</string>
   <string name="tv_dialog_send">Invia</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Crea account</string>
 </resources>
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 5e34b8f19..de7e5869b 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
@@ -36,14 +36,11 @@ Si potra modificare questo account più tardi.</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nessun account registrato</string>
   <string name="normal_accounts_titles">Accounts</string>
-  <string name="normal_devices_titles">Dispositivi noti collegati a questo account Jami</string>
   <string name="account_device_revoke">Revoca dispositivo</string>
   <string name="account_device_revocation_success_title">Successo</string>
   <string name="account_device_revocation_wrong_password">Password errata.</string>
   <string name="account_device_revocation_unknown_device">Dispositivo sconosciuto.</string>
   <string name="account_device_revocation_error_unknown">Errore sconosciuto.</string>
-  <string name="account_password_change">Cambia password</string>
-  <string name="account_password_set">Imposta password</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generale</string>
   <string name="account_basic_category">Impostazioni base</string>
@@ -117,7 +114,6 @@ Si potra modificare questo account più tardi.</string>
   <string name="error_passwords_not_equals">Le password no corrispondono</string>
   <string name="export_account_wait_title">Aspettare</string>
   <string name="export_account_wait_message">Esportazione informazioni account in corso</string>
-  <string name="account_export_file">Backup account</string>
   <string name="account_export_end_decryption_message">Impossibile sbloccare il tuo account con la password inserita</string>
   <string name="account_export_end_network_title">Errore di rete</string>
   <string name="account_export_end_network_message">Impossibile esportare l\'account sulla rete. Verifica la connettività.</string>
@@ -145,7 +141,6 @@ Si potra modificare questo account più tardi.</string>
   <!--Name registration-->
   <string name="error_username_empty">Inserisci un nome utente</string>
   <string name="username_available">Nome utente disponibile !</string>
-  <string name="register_name">Registra nome</string>
   <string name="registered_username">Nome utente registrato</string>
   <string name="username_already_taken">Nome utente già utilizzato</string>
   <string name="invalid_username">Nome utente non valido</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 7834406c9..439c97058 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">次へ</string>
   <string name="wizard_back">戻る</string>
   <string name="wizard_skip">スキップ</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">プロフィール</string>
   <string name="profile_message_warning">プロフィールは連絡先以外に共有されません</string>
   <string name="open_the_gallery">ギャラリーを開く</string>
@@ -262,7 +262,7 @@
   <string name="tv_send_text">テキストの送信</string>
   <string name="tv_send_audio">音声の送信</string>
   <string name="tv_send_video">メディアを送信</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">推奨</string>
   <string name="wizard_username_button">ユーザー名を選択</string>
   <string name="wizard_password_info">アカウントのパスワード</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 33831aa1d..624af2553 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">アカウントが登録されていません</string>
   <string name="normal_accounts_titles">アカウント</string>
-  <string name="normal_devices_titles">このJamiアカウントにリンクされている既知のデバイス</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>
@@ -44,8 +44,7 @@
   <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">パスワードを変更</string>
-  <string name="account_password_set">パスワードを設定</string>
+  <string name="account_password_change">パスワードの変更</string>
   <string name="account_password_change_wait_message">アカウントのパスワードを変更中</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">全般</string>
@@ -130,7 +129,6 @@
   <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>
@@ -181,7 +179,6 @@
   <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-ko-rKR/strings.xml b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
index 395ef8544..97b88b9a1 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings.xml
@@ -27,7 +27,7 @@
   <!--Contacts-->
   <string name="prompt_hint_username">사용자명</string>
   <string name="wizard_next">다음</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">프로필</string>
   <!--Share fragment-->
   <!--Pending contact requests-->
@@ -44,5 +44,5 @@
   <!--TV-->
   <string name="tv_audio_play">재생</string>
   <string name="tv_audio_pause">멈춤</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-lt/strings.xml b/ring-android/app/src/main/res/values-lt/strings.xml
index eaa7981ed..50d92ed6b 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -148,7 +148,7 @@
   <string name="wizard_next">Kitas</string>
   <string name="wizard_back">Atgal</string>
   <string name="wizard_skip">Praleisti</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profilis</string>
   <string name="profile_message_warning">Jūsų profilis yra bendrinamas tik su jūsų adresatais</string>
   <string name="open_the_gallery">Atverti galeriją</string>
@@ -222,7 +222,7 @@
   <string name="tv_dialog_send">Siųsti</string>
   <string name="tv_send_text">Siųsti tekstą</string>
   <string name="tv_send_audio">Siųsti garsą</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Rekomenduojamas</string>
   <string name="wizard_password_skip">Sukurti paskyrą</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 63fd475f0..58bbe253e 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
@@ -36,7 +36,7 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nėra užregistruotų paskyrų</string>
   <string name="normal_accounts_titles">Paskyros</string>
-  <string name="normal_devices_titles">Žinomi, su šia Jami paskyra susieti, įrenginiai</string>
+  <string name="normal_devices_titles">Susieti įrenginiai</string>
   <string name="account_device_revoke">Panaikinti įrenginį</string>
   <string name="account_device_revocation_success_title">Pavyko</string>
   <string name="account_device_revocation_success">Dabar įrenginys yra panaikintas!</string>
@@ -45,7 +45,6 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="account_device_revocation_unknown_device">Nežinomas įrenginys.</string>
   <string name="account_device_revocation_error_unknown">Nežinoma klaida.</string>
   <string name="account_password_change">Pakeisti slaptažodį</string>
-  <string name="account_password_set">Nustatyti slaptažodį</string>
   <string name="account_password_change_wait_message">Keičiamas paskyros slaptažodis</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Bendra</string>
@@ -131,7 +130,6 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="error_passwords_not_equals">Slaptažodžiai nesutampa</string>
   <string name="export_account_wait_title">Prašome palaukti...</string>
   <string name="export_account_wait_message">Eksportuojama paskyros informacija</string>
-  <string name="account_export_file">Padaryti paskyros atsarginę kopiją</string>
   <string name="account_export_end_decryption_message">Naudojant pateiktą slaptažodį, nepavyko atrakinti jūsų paskyros.</string>
   <string name="account_export_end_network_title">Tinklo klaida</string>
   <string name="account_export_end_network_message">Nepavyko eksportuoti paskyrą tinkle. Patikrinkite savo tinklo ryšį.</string>
@@ -181,7 +179,6 @@ Vėliau, galėsite pataisyti savo paskyros informaciją</string>
   <string name="error_username_empty">Įveskite naudotojo vardą</string>
   <string name="no_registered_name_for_account">Šiai paskyrai nerasta jokio registruoto vardo</string>
   <string name="username_available">Naudotojo vardas prieinamas!</string>
-  <string name="register_name">Registruoti vardą</string>
   <string name="trying_to_register_name">Bandoma užregistruoti vardą</string>
   <string name="registered_username">Registruotas naudotojo vardas</string>
   <string name="register_username">Registruoti viešąjį naudotojo vardą</string>
diff --git a/ring-android/app/src/main/res/values-mr/strings.xml b/ring-android/app/src/main/res/values-mr/strings.xml
index e2b55b4f5..b596131f0 100644
--- a/ring-android/app/src/main/res/values-mr/strings.xml
+++ b/ring-android/app/src/main/res/values-mr/strings.xml
@@ -28,7 +28,7 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -38,5 +38,5 @@
   <!--Bottom Navigation-->
   <!--TV-->
   <string name="tv_audio_play">प्ले करा</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings.xml b/ring-android/app/src/main/res/values-ms/strings.xml
index 255d2dd0e..f6b5045b0 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -85,7 +85,7 @@
   <string name="prompt_new_password_repeat">Ulang kata laluan baharu</string>
   <string name="prompt_new_username">Masukkan nama pengguna baharu</string>
   <string name="prompt_hint_username">Nama pengguna</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="open_the_gallery">Buka galeri</string>
   <string name="take_a_photo">Ambil gambar</string>
   <!--Share fragment-->
@@ -103,6 +103,6 @@
   <string name="navigation_item_account">Akaun</string>
   <!--TV-->
   <string name="tv_audio_play">Main</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Cipta akaun</string>
 </resources>
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 196b14631..781cadb36 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
@@ -112,7 +112,6 @@ Anda masih akan dapat mengubah maklumat akaun anda pada masa hadapan</string>
   <!--Name registration-->
   <string name="error_username_empty">Masukkan nama pengguna</string>
   <string name="no_registered_name_for_account">Tiada nama berdaftar dengan akaun ini ditemui</string>
-  <string name="register_name">Daftarkan nama</string>
   <string name="trying_to_register_name">Sedang mencuba untuk mendaftarkan nama</string>
   <string name="registered_username">Nama telah didaftarkan</string>
   <string name="username_already_taken">Nama pengguna telah digunakan pengguna lain</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings.xml b/ring-android/app/src/main/res/values-nb/strings.xml
index f35e01510..ef06be516 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">Neste</string>
   <string name="wizard_back">Tilbake</string>
   <string name="wizard_skip">Hopp over</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Din profil deles bare med dine kontakter</string>
   <string name="open_the_gallery">Åpne galleriet</string>
@@ -257,6 +257,6 @@
   <string name="tv_send_text">Send tekst</string>
   <string name="tv_send_audio">Send lyd</string>
   <string name="tv_send_video">Send media</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Opprett kongo</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nb/strings_account.xml b/ring-android/app/src/main/res/values-nb/strings_account.xml
index f5959dcdf..837d5d901 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
@@ -33,7 +33,6 @@ Du kan endre kontoen din senere</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Ingen konto registrert</string>
   <string name="normal_accounts_titles">Kontoer</string>
-  <string name="normal_devices_titles">Kjente enheter koblet til denne Jami-kontoen</string>
   <string name="account_device_revoke">Tilbakekall enhet</string>
   <string name="account_device_revocation_success_title">Vellykket</string>
   <string name="account_device_revocation_success">Enheten er nå tilbakekalt!</string>
@@ -41,7 +40,6 @@ Du kan endre kontoen din senere</string>
   <string name="account_device_revocation_wrong_password">Feil passord.</string>
   <string name="account_device_revocation_unknown_device">Ukjent enhet.</string>
   <string name="account_device_revocation_error_unknown">Ukjent feil.</string>
-  <string name="account_password_change">Endre passord</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generell</string>
   <string name="account_basic_category">Grunnleggende oppsett</string>
@@ -112,7 +110,6 @@ Du kan endre kontoen din senere</string>
   <string name="error_password_char_count">minimum 6 tegn</string>
   <string name="error_passwords_not_equals">Passordene stemmer ikke</string>
   <string name="export_account_wait_title">Vent…</string>
-  <string name="account_export_file">Sikkerhetskopier konto</string>
   <string name="account_export_end_decryption_message">Kunne ikke låse opp kontoen ved bruk av oppgitt passord.</string>
   <string name="account_export_end_network_title">Nettverksfeil</string>
   <string name="account_export_end_network_message">Kunne ikke eksportere kontoen på nettverket. Sjekk dine tilkoblingsinnstillinger.</string>
@@ -143,7 +140,6 @@ Du kan endre kontoen din senere</string>
   <!--Name registration-->
   <string name="error_username_empty">Skriv inn et brukernavn</string>
   <string name="no_registered_name_for_account">Fant inget registrert navn for denne kontoen</string>
-  <string name="register_name">Registrer navn</string>
   <string name="trying_to_register_name">Prøver å registrere navn</string>
   <string name="registered_username">Registrert brukernavn</string>
   <string name="register_username">Registrer offentlig brukernavn</string>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings.xml b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
index 9530d22d7..e4c7a86b9 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
   <string name="wizard_skip">Overslaan</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profiel</string>
   <string name="profile_message_warning">Uw profiel wordt enkel gedeeld met uw contacten</string>
   <string name="open_the_gallery">Galerij openen</string>
@@ -258,6 +258,6 @@
   <string name="tv_send_text">Verzend Tekst</string>
   <string name="tv_send_audio">Verzend Audio</string>
   <string name="tv_send_video">Verzend Media</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Account aanmaken</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml b/ring-android/app/src/main/res/values-nl-rBE/strings_account.xml
index db1a5c36c..73bdeb492 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
@@ -36,7 +36,7 @@ U kunt uw account later bewerken</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Geen account geregistreerd</string>
   <string name="normal_accounts_titles">Accounts</string>
-  <string name="normal_devices_titles">Gekende apparaten gekoppeld aan deze Jami-account</string>
+  <string name="normal_devices_titles">Gekoppelde apparaten</string>
   <string name="account_device_revoke">Apparaat intrekken</string>
   <string name="account_device_revocation_success_title">Klaar</string>
   <string name="account_device_revocation_success">Het apparaat is nu ingetrokken!</string>
@@ -45,7 +45,6 @@ U kunt uw account later bewerken</string>
   <string name="account_device_revocation_unknown_device">Onbekend apparaat.</string>
   <string name="account_device_revocation_error_unknown">Onbekende fout.</string>
   <string name="account_password_change">Paswoord wijzigen</string>
-  <string name="account_password_set">Paswoord instellen</string>
   <string name="account_password_change_wait_message">Accountpaswoord wordt gewijzigd</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Algemeen</string>
@@ -120,7 +119,6 @@ U kunt uw account later bewerken</string>
   <string name="error_passwords_not_equals">Paswoorden komen niet overeen</string>
   <string name="export_account_wait_title">Even geduld…</string>
   <string name="export_account_wait_message">Accountinformatie wordt geëxporteerd</string>
-  <string name="account_export_file">Back-up maken van account</string>
   <string name="account_export_end_decryption_message">Kon uw account niet ontgrendelen met het ingegeven paswoord.</string>
   <string name="account_export_end_network_title">Netwerkfout</string>
   <string name="account_export_end_network_message">Kon account niet exporteren over het netwerk. Controleer uw netwerkverbinding.</string>
@@ -171,7 +169,6 @@ U kunt uw account later bewerken</string>
   <string name="error_username_empty">Geef een gebruikersnaam in</string>
   <string name="no_registered_name_for_account">Geen geregistreerde naam gevonden voor deze account</string>
   <string name="username_available">Gebruikersnaam is beschikbaar!</string>
-  <string name="register_name">Naam registreren</string>
   <string name="trying_to_register_name">Naam wordt geregistreerd</string>
   <string name="registered_username">Geregistreerde gebruikersnaam</string>
   <string name="register_username">Registreer een openbare gebruikersnaam</string>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings.xml b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
index 8119d1c56..d04436be9 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings.xml
@@ -45,7 +45,7 @@
   <string name="conversation_action_select_peer_number">Selecteer een nummer</string>
   <!--Contacts-->
   <string name="prompt_hint_username">Gebruikersnaam</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -56,5 +56,5 @@
   <!--Bottom Navigation-->
   <!--TV-->
   <string name="tv_audio_play">Spelen</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings.xml b/ring-android/app/src/main/res/values-nl/strings.xml
index 7c48309ef..230b2c4f8 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
   <string name="wizard_skip">Overslaan</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profiel</string>
   <string name="profile_message_warning">Uw profiel wordt enkel gedeeld met uw contacten</string>
   <string name="open_the_gallery">Galerij openen</string>
@@ -257,6 +257,6 @@
   <string name="tv_send_text">Verstuur Tekst</string>
   <string name="tv_send_audio">Verstuur Audio</string>
   <string name="tv_send_video">Verstuur Media</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Account aanmaken</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl/strings_account.xml b/ring-android/app/src/main/res/values-nl/strings_account.xml
index f8590e638..c9fe184f6 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
@@ -36,7 +36,7 @@ U kunt uw account later bewerken</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Geen account geregistreerd</string>
   <string name="normal_accounts_titles">Accounts</string>
-  <string name="normal_devices_titles">Bekende apparaten gekoppeld aan dit Jami-account</string>
+  <string name="normal_devices_titles">Gekoppelde apparaten</string>
   <string name="account_device_revoke">Apparaat intrekken</string>
   <string name="account_device_revocation_success_title">Klaar</string>
   <string name="account_device_revocation_success">Het apparaat is nu ingetrokken!</string>
@@ -45,7 +45,6 @@ U kunt uw account later bewerken</string>
   <string name="account_device_revocation_unknown_device">Onbekend apparaat.</string>
   <string name="account_device_revocation_error_unknown">Onbekende fout.</string>
   <string name="account_password_change">Wachtwoord wijzigen</string>
-  <string name="account_password_set">Wachtwoord instellen</string>
   <string name="account_password_change_wait_message">Accountwachtwoord wordt gewijzigd</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Algemeen</string>
@@ -120,7 +119,6 @@ U kunt uw account later bewerken</string>
   <string name="error_passwords_not_equals">Wachtwoorden komen niet overeen</string>
   <string name="export_account_wait_title">Even geduld…</string>
   <string name="export_account_wait_message">Accountinformatie wordt geëxporteerd</string>
-  <string name="account_export_file">Reservekopie van account maken</string>
   <string name="account_export_end_decryption_message">Kon uw account niet ontgrendelen met het opgegeven wachtwoord.</string>
   <string name="account_export_end_network_title">Netwerkfout</string>
   <string name="account_export_end_network_message">Kon account niet exporteren over het netwerk. Controleer uw netwerkverbinding.</string>
@@ -171,7 +169,6 @@ U kunt uw account later bewerken</string>
   <string name="error_username_empty">Voer een gebruikersnaam in</string>
   <string name="no_registered_name_for_account">Geen geregistreerde naam gevonden voor dit account</string>
   <string name="username_available">Gebruikersnaam is beschikbaar!</string>
-  <string name="register_name">Naam registreren</string>
   <string name="trying_to_register_name">Naam wordt geregistreerd</string>
   <string name="registered_username">Geregistreerde gebruikersnaam</string>
   <string name="register_username">Registreer een openbare gebruikersnaam</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 7583a11fd..3a1a990a4 100644
--- a/ring-android/app/src/main/res/values-oc/strings.xml
+++ b/ring-android/app/src/main/res/values-oc/strings.xml
@@ -23,6 +23,7 @@
   <!--Notifications-->
   <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>
   <string name="action_call_decline">Regetar</string>
   <string name="ab_action_contact_add">Ajustar als contactes</string>
   <string name="hist_contact_added">Contacte ajustat</string>
@@ -48,7 +49,7 @@
   <string name="wizard_next">Seguent</string>
   <string name="wizard_back">Tornar</string>
   <string name="wizard_skip">Saultar</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Perfil</string>
   <!--Share fragment-->
   <string name="generic_error_migration">Error</string>
@@ -75,5 +76,5 @@
   <string name="tv_send_text">Enviar un tèxt</string>
   <string name="tv_send_audio">Enviar un àudio</string>
   <string name="tv_send_video">Enviar un mèdia</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </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 cbaf8e116..2973646e7 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
@@ -12,7 +12,6 @@
   <!--Strings related to account deletion-->
   <!--AccountManagementFragment-->
   <string name="normal_accounts_titles">Comptes</string>
-  <string name="account_password_change">Cambiar senhal</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">General</string>
   <string name="account_username_label">Nom d’utilizaire</string>
diff --git a/ring-android/app/src/main/res/values-oc/strings_call.xml b/ring-android/app/src/main/res/values-oc/strings_call.xml
index d36019912..fba0b031c 100644
--- a/ring-android/app/src/main/res/values-oc/strings_call.xml
+++ b/ring-android/app/src/main/res/values-oc/strings_call.xml
@@ -20,6 +20,8 @@ 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">Recèrca</string>
     <string name="call_human_state_connecting">Connexion</string>
     <!-- Conferences -->
 </resources>
\ No newline at end of file
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 5624cba05..7c7faab41 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -152,7 +152,7 @@
   <string name="wizard_next">ਅੱਗੇ</string>
   <string name="wizard_back">ਪਿੱਛੇ</string>
   <string name="wizard_skip">ਲੰਘਾਓ</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile_message_warning">ਤੁਹਾਡਾ ਪ੍ਰੋਫਾਈਲ ਸਿਰਫ਼ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਂਦਾ ਹੈ</string>
   <string name="open_the_gallery">ਗੈਲਰੀ ਖੋਲ੍ਹੋ</string>
   <string name="take_a_photo">ਫ਼ੋਟੋ ਖਿੱਚੋ</string>
@@ -216,6 +216,6 @@
   <!--TV-->
   <string name="tv_audio_play">ਚਲਾਓ</string>
   <string name="tv_dialog_send">ਭੇਜੋ</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">ਖਾਤਾ ਬਣਾਓ</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 dfc0ac003..23a3c912f 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
@@ -36,7 +36,6 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">ਕਿਸੇ ਖਾਤੇ ਦਾ ਪੰਜੀਕਰਨ ਨਹੀਂ ਕੀਤਾ ਗਿਆ</string>
   <string name="normal_accounts_titles">ਖਾਤੇ</string>
-  <string name="normal_devices_titles">ਇਸ Jami ਖਾਤੇ ਨਾਲ ਲਿੰਕ ਕੀਤੇ ਜਾਣੇ-ਪਛਾਣੇ ਡੀਵਾਈਸ</string>
   <string name="account_device_revoke">ਡੀਵਾਈਸ ਹਟਾਓ</string>
   <string name="account_device_revocation_success_title">ਸਫਲਤਾ</string>
   <string name="account_device_revocation_success">ਡੀਵਾਈਸ ਹੁਣ ਹਟ ਗਿਆ ਹੈ!</string>
@@ -44,8 +43,6 @@
   <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">ਪਾਸਵਰਡ ਬਦਲੋ</string>
-  <string name="account_password_set">ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ</string>
   <string name="account_password_change_wait_message">ਖਾਤਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">ਸਧਾਰਨ</string>
@@ -116,7 +113,6 @@
   <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>
@@ -161,7 +157,6 @@
   <!--Name registration-->
   <string name="error_username_empty">ਵਰਤੋਂਕਾਰ ਨਾਂ ਦਾਖਲ ਕਰੋ</string>
   <string name="no_registered_name_for_account">ਇਸ ਖਾਤੇ ਲਈ ਕੋਈ ਪੰਜੀਕਿਰਤ ਨਾਂ ਨਹੀਂ ਮਿਲਿਆ</string>
-  <string name="register_name">ਨਾਂ ਦਾ ਪੰਜੀਕਰਨ ਕਰੋ</string>
   <string name="trying_to_register_name">ਨਾਂ ਦੇ ਪੰਜੀਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
   <string name="registered_username">ਪੰਜੀਕਿਰਤ ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <string name="username_already_taken">ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲਿਆ ਗਿਆ</string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index e99535a8e..edd5bfef7 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
@@ -148,7 +148,7 @@
   <string name="wizard_next">Następne</string>
   <string name="wizard_back">Wstecz</string>
   <string name="wizard_skip">Pomiń</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
   <string name="open_the_gallery">Otwórz galerię</string>
@@ -209,6 +209,6 @@
   <!--TV-->
   <string name="tv_audio_play">Graj</string>
   <string name="tv_dialog_send">Wyślij</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Stwórz konto</string>
 </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 479047d19..c6f6a4987 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
@@ -34,7 +34,6 @@ Możesz edytować swoje konto później</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nie masz zarejestrowanego konta</string>
   <string name="normal_accounts_titles">Konta</string>
-  <string name="normal_devices_titles">Znane urządzenia połączone z tym kontem Jami</string>
   <string name="account_device_revoke">Odwołaj urządzenie</string>
   <string name="account_device_revocation_success_title">Sukces</string>
   <string name="account_device_revocation_success">Urządzenie jest odwołane!</string>
@@ -42,7 +41,6 @@ Możesz edytować swoje konto później</string>
   <string name="account_device_revocation_wrong_password">Błędne hasło.</string>
   <string name="account_device_revocation_unknown_device">Nieznane urządzenie.</string>
   <string name="account_device_revocation_error_unknown">Nieznany błąd.</string>
-  <string name="account_password_change">Zmień hasło</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generalne</string>
   <string name="account_basic_category">Ustawienia Podstawowe</string>
@@ -148,7 +146,6 @@ Możesz edytować swoje konto później</string>
   <!--Name registration-->
   <string name="error_username_empty">Wprowadź nazwę użytkownika</string>
   <string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
-  <string name="register_name">Zarejestruj nazwę</string>
   <string name="trying_to_register_name">Trwa próba rejestracji nazwy</string>
   <string name="registered_username">Zarejestruj nazwę użytkownika</string>
   <string name="register_username">Zarejestruj publiczną nazwę użytkownika</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index c9fac60c9..fa1b6ff18 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -158,7 +158,7 @@
   <string name="wizard_next">Następne</string>
   <string name="wizard_back">Wstecz</string>
   <string name="wizard_skip">Pomiń</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
   <string name="open_the_gallery">Otwórz galerię</string>
@@ -230,6 +230,6 @@
   <string name="tv_audio_play">Odtwarzaj</string>
   <string name="tv_audio_pause">Pauza</string>
   <string name="tv_dialog_send">Wyślij</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Stwórz konto</string>
 </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 0ef3bba71..49cdffd14 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
@@ -36,7 +36,7 @@ Możesz edytować swoje konto później</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nie masz zarejestrowanego konta</string>
   <string name="normal_accounts_titles">Konta</string>
-  <string name="normal_devices_titles">Znane urządzenia połączone z tym kontem Jami</string>
+  <string name="normal_devices_titles">Połączone Urządzenia</string>
   <string name="account_device_revoke">Odwołaj urządzenie</string>
   <string name="account_device_revocation_success_title">Sukces</string>
   <string name="account_device_revocation_success">Urządzenie jest odwołane!</string>
@@ -44,8 +44,7 @@ Możesz edytować swoje konto później</string>
   <string name="account_device_revocation_wrong_password">Błędne hasło.</string>
   <string name="account_device_revocation_unknown_device">Nieznane urządzenie.</string>
   <string name="account_device_revocation_error_unknown">Nieznany błąd.</string>
-  <string name="account_password_change">Zmień hasło</string>
-  <string name="account_password_set">Ustaw hasło</string>
+  <string name="account_password_change">Zmień Hasło</string>
   <string name="account_password_change_wait_message">Zmienianie hasła do konta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generalne</string>
@@ -118,7 +117,6 @@ Możesz edytować swoje konto później</string>
   <string name="error_passwords_not_equals">Hasła nie pasują do siebie</string>
   <string name="export_account_wait_title">Proszę czekać…</string>
   <string name="export_account_wait_message">Eksportowanie informacji o koncie</string>
-  <string name="account_export_file">Wykonaj kopię zapasową</string>
   <string name="account_export_end_decryption_message">Nie można było odblokować twojego konta podanym hasłem.</string>
   <string name="account_export_end_network_title">Błąd sieci</string>
   <string name="account_export_end_network_message">Nie można eksportować konta w tej sieci. Sprawdź swoje połączenie.</string>
@@ -164,7 +162,6 @@ Możesz edytować swoje konto później</string>
   <string name="error_username_empty">Wprowadź nazwę użytkownika</string>
   <string name="no_registered_name_for_account">Nie znaleziono żadnej nazwy zarejestrowanej dla tego konta </string>
   <string name="username_available">Nazwa dostępna!</string>
-  <string name="register_name">Zarejestruj nazwę</string>
   <string name="trying_to_register_name">Trwa próba rejestracji nazwy</string>
   <string name="registered_username">Zarejestruj nazwę użytkownika</string>
   <string name="register_username">Zarejestruj publiczną nazwę użytkownika</string>
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 f0fe881ff..1a5c9c597 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
@@ -184,7 +184,7 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
   <string name="wizard_skip">Pular</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Perfil</string>
   <string name="profile_message_warning">Seu perfil é compartilhado apenas com seus contatos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
@@ -273,7 +273,7 @@ Para maiores detalhes, consulte a <u>Licença GPL versão 3 ou mais recente</u><
   <string name="tv_send_audio">Enviar Áudio</string>
   <string name="tv_send_video">Enviar Mídia</string>
   <string name="conversation_input_speech_hint">Fale algo...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Recomendado</string>
   <string name="wizard_status_optional">Opcional</string>
   <string name="wizard_status_required">Requerido</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 6b0140fce..d00f407b4 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,7 +36,6 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nenhuma conta registrada</string>
   <string name="normal_accounts_titles">Contas</string>
-  <string name="normal_devices_titles">Dispositivos conhecidos associados à esta conta do Jami</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,8 +43,7 @@
   <string name="account_device_revocation_wrong_password">Senha Incorreta.</string>
   <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">Mudar senha</string>
-  <string name="account_password_set">Definir senha</string>
+  <string name="account_password_change">Alterar senha</string>
   <string name="account_password_change_wait_message">Alterando senha da conta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Geral</string>
@@ -134,7 +132,6 @@
   <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">Cópia de segurança 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>
@@ -186,7 +183,6 @@
   <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">Registrar nome</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-rPT/strings.xml b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
index 184619060..aeb08f882 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
   <string name="wizard_skip">Ignorar</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Perfil</string>
   <string name="profile_message_warning">O seu perfil é partilhado apenas com seus contactos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
@@ -258,6 +258,6 @@
   <string name="tv_send_text">Enviar Texto</string>
   <string name="tv_send_audio">Enviar Áudio</string>
   <string name="tv_send_video">Enviar media</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Criar conta</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 ca79efd0c..e3254f1c4 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nenhuma conta registada</string>
   <string name="normal_accounts_titles">Contas</string>
-  <string name="normal_devices_titles">Dispositivos conhecidos ligados a esta conta Jami...</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">O dispositivo foi revogado!</string>
@@ -45,7 +45,6 @@
   <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 palavra-chave</string>
-  <string name="account_password_set">Definir palavra-chave</string>
   <string name="account_password_change_wait_message">Alterar palavra-chave da conta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Geral</string>
@@ -129,7 +128,6 @@
   <string name="error_passwords_not_equals">As palavras-chave não são iguais</string>
   <string name="export_account_wait_title">Por favor aguarde...</string>
   <string name="export_account_wait_message">Exportar a informação da conta</string>
-  <string name="account_export_file">Conta de cópia de segurança</string>
   <string name="account_export_end_decryption_message">Não foi possível desbloquear a sua conta utilizando a palavra-chave 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 a sua conexão..</string>
@@ -180,7 +178,6 @@
   <string name="error_username_empty">Introduza um nome de utilizador</string>
   <string name="no_registered_name_for_account">Não foi encontrado nenhum nome registado para esta conta</string>
   <string name="username_available">Nome de utilizador disponível!</string>
-  <string name="register_name">Registar nome</string>
   <string name="trying_to_register_name">A tentar registar o nome</string>
   <string name="registered_username">Nome de utilizador registado</string>
   <string name="register_username">Registar nome de utilizador público</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings.xml b/ring-android/app/src/main/res/values-pt/strings.xml
index 42af0f2dd..a0e5c6576 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -156,7 +156,7 @@
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
   <string name="wizard_skip">Ignorar</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Perfil</string>
   <string name="profile_message_warning">O seu perfil é partilhado apenas com seus contactos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
@@ -225,6 +225,6 @@
   <string name="tv_audio_play">Reproduzir</string>
   <string name="tv_audio_pause">Pausa</string>
   <string name="tv_dialog_send">Enviar</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Criar conta</string>
 </resources>
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 1e2435771..1972bc93b 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nenhuma conta registada</string>
   <string name="normal_accounts_titles">Contas</string>
-  <string name="normal_devices_titles">Dispositivos conhecidos ligados a esta conta</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">O dispositivo foi revogado!</string>
@@ -45,7 +45,6 @@
   <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 palavra-chave</string>
-  <string name="account_password_set">Definir palavra-chave</string>
   <string name="account_password_change_wait_message">Alterar palavra-chave da conta</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Geral</string>
@@ -118,7 +117,6 @@
   <string name="error_passwords_not_equals">As palavras-chave não são iguais</string>
   <string name="export_account_wait_title">Por favor aguarde...</string>
   <string name="export_account_wait_message">Exportar a informação da conta</string>
-  <string name="account_export_file">Conta de cópia de segurança</string>
   <string name="account_export_end_decryption_message">Não foi possível desbloquear a sua conta utilizando a palavra-chave 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 a sua conexão..</string>
@@ -164,7 +162,6 @@
   <string name="error_username_empty">Introduza um nome de utilizador</string>
   <string name="no_registered_name_for_account">Não foi encontrado nenhum nome registado para esta conta</string>
   <string name="username_available">Nome de utilizador disponível!</string>
-  <string name="register_name">Registar nome</string>
   <string name="trying_to_register_name">A tentar registar o nome</string>
   <string name="registered_username">Nome de utilizador registado</string>
   <string name="register_username">Registar nome de utilizador público</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 87f713f58..44d4b3519 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
@@ -182,11 +182,11 @@
   <string name="help_password_choose">Alege o parolă complexă pe care să ți-o amintești, pentru a proteja contul tău Jami.</string>
   <string name="help_password_enter">Introdu parola principală a contului tău Jami.</string>
   <string name="help_server_enter">Introdu URL-ul serverului de administrare</string>
-  <string name="help_pin_enter">Introdu codul PIN obținut prin crearea unui alt cont Jami. Folosește opțiunea \"Exportă contul Jami\" pentru a obține un cod PIN.</string>
+  <string name="help_pin_enter">Introdu codul PIN obținut de la un cont Jami. Folosește opțiunea \"Exportă contul Jami\" pentru a obține codul PIN.</string>
   <string name="wizard_next">Înainte</string>
   <string name="wizard_back">Înapoi</string>
   <string name="wizard_skip">Omite</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Profilul tău este distribuit doar contactelor tale</string>
   <string name="open_the_gallery">Deschide galeria</string>
@@ -275,7 +275,7 @@
   <string name="tv_send_audio">Trimite Audio</string>
   <string name="tv_send_video">Trimite Media</string>
   <string name="conversation_input_speech_hint">Spune ceva...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Recomandat</string>
   <string name="wizard_status_optional">Facultativ</string>
   <string name="wizard_status_required">Obligatoriu</string>
@@ -283,7 +283,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 cheia contului pe acest dispozitiv</string>
+  <string name="wizard_password_placeholder">Alege o parolă pentru a cifra contul tău pe acest dispozitiv</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 7af07a110..4902ba767 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,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Nu este înscris niciun cont</string>
   <string name="normal_accounts_titles">Conturi</string>
-  <string name="normal_devices_titles">Dispozitivele cunoscute asociate acestui cont Jami</string>
+  <string name="normal_devices_titles">Dispozitive asociate</string>
   <string name="account_device_revoke">Elimină dispozitivul</string>
   <string name="account_device_revocation_success_title">Succes</string>
   <string name="account_device_revocation_success">Dispozitivul este acum eliminat!</string>
@@ -44,8 +44,8 @@
   <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_error_unknown">Eroare necunoscută.</string>
-  <string name="account_password_change">Schimbă parola</string>
-  <string name="account_password_set">Alege parola</string>
+  <string name="account_password_change">Schimbă Parola</string>
+  <string name="account_password_set">Pune o parolă</string>
   <string name="account_password_change_wait_message">Se schimbă parola contului </string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Generale</string>
@@ -100,7 +100,7 @@
   <string name="account_proxy_server_list_label">Adresa URL a listei de proxy DHT</string>
   <string name="account_peer_discovery_label">Descoperă utilizatori locali</string>
   <string name="account_peer_discovery_enable_label">Activează Descoperă utilizatori locali</string>
-  <string name="account_peer_discovery_enable_summary">Conectează-te la alte noduri DHT afișate în rețeaua noastră locală</string>
+  <string name="account_peer_discovery_enable_summary">Conectează-te la alte noduri DHT afișate în rețeaua locală</string>
   <!--Security Details-->
   <string name="account_credentials_label">Date de autentificare</string>
   <string name="account_credentials_edit">Modifică datele de autentificare</string>
@@ -134,7 +134,6 @@
   <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>
@@ -186,7 +185,6 @@
   <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>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
index 896d2614c..0bda0faac 100644
--- a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
@@ -32,7 +32,7 @@
   <string name="pref_plugins_title">Extensii</string>
   <string name="pref_plugins_summary">Activează extensiile și reglează-le parametrii</string>
   <string name="fab_plugins_add">Adaugă o extensie nouă</string>
-  <string name="plugin_uninstall_title">Dezinstalezi extensia ?</string>
+  <string name="plugin_uninstall_title">Dezinstalezi extensia?</string>
   <string name="plugin_reset_preferences">Restabilește reglările inițiale ale extensiei</string>
   <string name="plugin_reset_preferences_summary">Reglările extensiei vor reveni ca la început</string>
   <string name="plugin_reset_preferences_ask">Vrei să restabilești reglările inițiale ale extensiei ?</string>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings.xml b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
index 99f04a8f6..4e457b58b 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings.xml
@@ -177,7 +177,7 @@
   <string name="wizard_next">Далее</string>
   <string name="wizard_back">Назад</string>
   <string name="wizard_skip">Пропустить</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Профиль</string>
   <string name="profile_message_warning">Ваш профиль доступен только для ваших контактов</string>
   <string name="open_the_gallery">Открыть галерею</string>
@@ -262,6 +262,6 @@
   <string name="tv_send_audio">Отправить Запись</string>
   <string name="tv_send_video">Отправить Медиа</string>
   <string name="conversation_input_speech_hint">Скажите что-нибудь...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Создать аккаунт</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 b2f61982a..058d1b549 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Нет зарегистрированного аккаунта</string>
   <string name="normal_accounts_titles">Учетные записи</string>
-  <string name="normal_devices_titles">Устройства, привязанные к этому аккаунту Jami</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>
@@ -44,8 +44,7 @@
   <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">Изменить пароль</string>
-  <string name="account_password_set">Задать пароль</string>
+  <string name="account_password_change">Изменить Пароль</string>
   <string name="account_password_change_wait_message">Изменение пароля аккаунта</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Основные</string>
@@ -120,7 +119,6 @@
   <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>
@@ -171,7 +169,6 @@
   <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-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 54ecee6df..fc3f72382 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -182,7 +182,7 @@
   <string name="wizard_next">Далее</string>
   <string name="wizard_back">Назад</string>
   <string name="wizard_skip">Пропустить</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Профиль</string>
   <string name="profile_message_warning">Ваш профиль доступен только вашим контактам</string>
   <string name="open_the_gallery">Открыть галерею</string>
@@ -271,7 +271,7 @@
   <string name="tv_send_audio">Отправить аудио</string>
   <string name="tv_send_video">Отправить медиа</string>
   <string name="conversation_input_speech_hint">Скажите что-нибудь...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">Рекомендуется</string>
   <string name="wizard_status_optional">По желанию</string>
   <string name="wizard_status_required">Требуется</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 278de5445..825fcc78b 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Нет зарегистрированных аккаунтов</string>
   <string name="normal_accounts_titles">Аккаунты</string>
-  <string name="normal_devices_titles">Устройства, привязанные к этому аккаунту Jami</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>
@@ -45,7 +45,6 @@
   <string name="account_device_revocation_unknown_device">Неизвестное устройство.</string>
   <string name="account_device_revocation_error_unknown">Неизвестная ошибка.</string>
   <string name="account_password_change">Изменить пароль</string>
-  <string name="account_password_set">Установить пароль</string>
   <string name="account_password_change_wait_message">Смена пароля учетной записи</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Общее</string>
@@ -130,7 +129,6 @@
   <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>
@@ -181,7 +179,6 @@
   <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-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index 2fb5aa443..62476db1b 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
@@ -178,7 +178,7 @@
   <string name="wizard_next">Ďalej</string>
   <string name="wizard_back">Späť</string>
   <string name="wizard_skip">Preskočiť</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Váš profil je zdieľaný iba s vašimi kontaktmi</string>
   <string name="open_the_gallery">Otvoriť galériu</string>
@@ -264,6 +264,6 @@
   <string name="tv_send_audio">Poslať Audio</string>
   <string name="tv_send_video">Poslať Médiá</string>
   <string name="conversation_input_speech_hint">Povedzte niečo...</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Vytvoriť účet</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 21b8426f2..a48e7de96 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Žiadny registrovaný účet</string>
   <string name="normal_accounts_titles">Účty</string>
-  <string name="normal_devices_titles">Zariadenia prepojené s týmto Jami účtom</string>
+  <string name="normal_devices_titles">Prepojené zariadenia</string>
   <string name="account_device_revoke">Odobrať zariadenie</string>
   <string name="account_device_revocation_success_title">Úspech</string>
   <string name="account_device_revocation_success">Zariadenie bolo odobrané!</string>
@@ -45,7 +45,6 @@
   <string name="account_device_revocation_unknown_device">Neznáme zariadenie.</string>
   <string name="account_device_revocation_error_unknown">Neznáma chyba.</string>
   <string name="account_password_change">Zmeniť heslo</string>
-  <string name="account_password_set">Nastaviť heslo</string>
   <string name="account_password_change_wait_message">Zmena hesla účtu</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Všeobecné</string>
@@ -130,7 +129,6 @@
   <string name="error_passwords_not_equals">Heslá sa nezhodujú</string>
   <string name="export_account_wait_title">Čakajte, prosím...</string>
   <string name="export_account_wait_message">Exportovanie údajov o účte</string>
-  <string name="account_export_file">Zálohovať účet</string>
   <string name="account_export_end_decryption_message">Nemohli sme odomknúť váš účet na základe zadaného hesla.</string>
   <string name="account_export_end_network_title">Chyba siete</string>
   <string name="account_export_end_network_message">Účet sa nedal exportovať na sieť. Skontrolujte pripojenie vášho zariadenia.</string>
@@ -181,7 +179,6 @@
   <string name="error_username_empty">Zadajte používateľské meno</string>
   <string name="no_registered_name_for_account">Pre tento účet nebolo nájdené zaregistrované meno</string>
   <string name="username_available">Používateľské meno dostupné!</string>
-  <string name="register_name">Registrovať meno</string>
   <string name="trying_to_register_name">Pokus o registráciu mena</string>
   <string name="registered_username">Registrované používateľské meno</string>
   <string name="register_username">Registrovať verejné používateľské meno</string>
diff --git a/ring-android/app/src/main/res/values-sl/strings.xml b/ring-android/app/src/main/res/values-sl/strings.xml
index b2af08f42..bc3b35dd1 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -98,7 +98,7 @@
   <string name="prompt_hint_username">Uporabnik</string>
   <string name="wizard_next">Naprej</string>
   <string name="wizard_back">Nazaj</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Tvoj profil je deljen samo s tvojimi stiki</string>
   <string name="open_the_gallery">Odpri galerijo</string>
@@ -136,6 +136,6 @@
   <string name="tv_audio_play">Predvajaj</string>
   <string name="tv_audio_pause">Pavza</string>
   <string name="tv_dialog_send">Pošlji</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Ustvari račun</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 8095ed83f..673937c16 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
@@ -117,7 +117,6 @@
   <string name="account_connect_prompt_username">Uporabnik</string>
   <!--Name registration-->
   <string name="error_username_empty">Vnesi uporabniško ime</string>
-  <string name="register_name">Prijavi ime</string>
   <string name="trying_to_register_name">Poskusi prijaviti ime</string>
   <string name="registered_username">Prijavljeno uporabniško ime</string>
   <string name="register_username">Prijavi javno ime</string>
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 76c530e0c..568575608 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
@@ -185,7 +185,7 @@
   <string name="wizard_next">Pasuesi</string>
   <string name="wizard_back">Mbrapsht</string>
   <string name="wizard_skip">Anashkaloje</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Profili juaj ndahet vetëm me kontaktet tuaja</string>
   <string name="open_the_gallery">Hape galerinë</string>
@@ -274,7 +274,7 @@
   <string name="tv_send_audio">Dërgoni Audio</string>
   <string name="tv_send_video">Dërgoni Media</string>
   <string name="conversation_input_speech_hint">Thoni diçka…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">E rekomanduar</string>
   <string name="wizard_status_optional">Opsionale</string>
   <string name="wizard_status_required">E domosdoshme</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 619795dca..0b2b23f9d 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">S\’ka llogari të regjistruar</string>
   <string name="normal_accounts_titles">Llogari</string>
-  <string name="normal_devices_titles">Pajisje të njohura që lidhen te kjo llogari Jami</string>
+  <string name="normal_devices_titles">Pajisje të Lidhura</string>
   <string name="account_device_revoke">Shfuqizoje pajisjes</string>
   <string name="account_device_revocation_success_title">Sukses</string>
   <string name="account_device_revocation_success">Pajisja tani është shfuqizuar!</string>
@@ -44,8 +44,8 @@
   <string name="account_device_revocation_wrong_password">Fjalëkalim gabuar.</string>
   <string name="account_device_revocation_unknown_device">Pajisje e panjohur.</string>
   <string name="account_device_revocation_error_unknown">Gabim i panjohur.</string>
-  <string name="account_password_change">Ndryshoni fjalëkalimin</string>
-  <string name="account_password_set">Caktoni fjalëkalimin</string>
+  <string name="account_password_change">Ndryshoni Fjalëkalimin</string>
+  <string name="account_password_set">Caktoni Fjalëkalimin</string>
   <string name="account_password_change_wait_message">Po ndryshohet fjalëkalim llogarie</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Të përgjithshme</string>
@@ -134,7 +134,6 @@
   <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">Kopjeruaje llogarinë</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>
@@ -186,7 +185,6 @@
   <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-sr/strings.xml b/ring-android/app/src/main/res/values-sr/strings.xml
index c19540213..5d0ee65d6 100644
--- a/ring-android/app/src/main/res/values-sr/strings.xml
+++ b/ring-android/app/src/main/res/values-sr/strings.xml
@@ -39,7 +39,7 @@
   <!--Contacts-->
   <string name="account_create_title">Napravi Jami profil</string>
   <string name="wizard_back">Nazad</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -48,5 +48,5 @@
   <!--File Transfer-->
   <!--Bottom Navigation-->
   <!--TV-->
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
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 9c8a18f0b..65bf20e25 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -158,7 +158,7 @@
   <string name="wizard_next">Nästa</string>
   <string name="wizard_back">Tillbaka</string>
   <string name="wizard_skip">Hopa över</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Din profil delas endast med dina kontakter</string>
   <string name="open_the_gallery">Öppna galleriet</string>
@@ -227,6 +227,6 @@
   <string name="tv_audio_play">Spela</string>
   <string name="tv_audio_pause">Paus</string>
   <string name="tv_dialog_send">Skicka</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Skapa konto</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 ece6c59de..de1d8a6d1 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,7 +36,6 @@ 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">Kända enheter, kopplade till detta Jami-konto</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>
@@ -44,8 +43,6 @@ Du kan ändra kontot senare.</string>
   <string name="account_device_revocation_wrong_password">Fel lösenord.</string>
   <string name="account_device_revocation_unknown_device">Okänd enhet.</string>
   <string name="account_device_revocation_error_unknown">Okänt fel.</string>
-  <string name="account_password_change">Byt lösenord</string>
-  <string name="account_password_set">Ange lösenord</string>
   <string name="account_password_change_wait_message">Ändrar kontolösenord</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Allmänt</string>
@@ -119,7 +116,6 @@ Du kan ändra kontot senare.</string>
   <string name="error_passwords_not_equals">Lösenorden stämmer inte</string>
   <string name="export_account_wait_title">Vänta...</string>
   <string name="export_account_wait_message">Exporterar kontoinformation</string>
-  <string name="account_export_file">Säkerhetskopiera konto</string>
   <string name="account_export_end_decryption_message">Kunde inte låsa upp ditt konto med det givna lösenordet.</string>
   <string name="account_export_end_network_title">Nätverksfel</string>
   <string name="account_export_end_network_message">Kunde inte exportera kontot över nätverket. Kontrollera din uppkoppling.</string>
@@ -165,7 +161,6 @@ Du kan ändra kontot senare.</string>
   <string name="error_username_empty">Ange ett användarnamn</string>
   <string name="no_registered_name_for_account">Inget registrerat namn hittades för detta konto</string>
   <string name="username_available">Användarnamnet tillgängligt!</string>
-  <string name="register_name">Registrera namn</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>
diff --git a/ring-android/app/src/main/res/values-ta/strings.xml b/ring-android/app/src/main/res/values-ta/strings.xml
index bcd21a230..1207f0e9e 100644
--- a/ring-android/app/src/main/res/values-ta/strings.xml
+++ b/ring-android/app/src/main/res/values-ta/strings.xml
@@ -28,7 +28,7 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -37,5 +37,5 @@
   <!--File Transfer-->
   <!--Bottom Navigation-->
   <!--TV-->
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr-rTR/strings.xml b/ring-android/app/src/main/res/values-tr-rTR/strings.xml
index a74ad9695..2f3174a07 100644
--- a/ring-android/app/src/main/res/values-tr-rTR/strings.xml
+++ b/ring-android/app/src/main/res/values-tr-rTR/strings.xml
@@ -48,7 +48,7 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <!--Share fragment-->
   <!--Pending contact requests-->
   <!--Send contact requests-->
@@ -57,5 +57,5 @@
   <!--File Transfer-->
   <!--Bottom Navigation-->
   <!--TV-->
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-tr/strings.xml b/ring-android/app/src/main/res/values-tr/strings.xml
index 37c6679ca..ab3ec5e0d 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -175,7 +175,7 @@
   <string name="wizard_next">İleri</string>
   <string name="wizard_back">Geri</string>
   <string name="wizard_skip">Atla</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Profil</string>
   <string name="profile_message_warning">Profiliniz sadece kayıtlı kişilerinizle paylaşılıyor</string>
   <string name="open_the_gallery">Galeriyi aç</string>
@@ -261,6 +261,6 @@
   <string name="tv_send_audio">Ses gönder</string>
   <string name="tv_send_video">Medya gönder</string>
   <string name="conversation_input_speech_hint">Bir şey söyle…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Hesap oluştur</string>
 </resources>
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 11212186b..42d9c71d9 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
@@ -36,7 +36,7 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">Kayıtlı hesap yok</string>
   <string name="normal_accounts_titles">Hesaplar</string>
-  <string name="normal_devices_titles">Bu Jami hesabına bağlı bilinen aygıtlar</string>
+  <string name="normal_devices_titles">Bağlı Aygıtlar</string>
   <string name="account_device_revoke">Aygıtı iptal et</string>
   <string name="account_device_revocation_success_title">Başarılı</string>
   <string name="account_device_revocation_success">Aygıt şimdi iptal edildi!</string>
@@ -44,8 +44,7 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="account_device_revocation_wrong_password">Yanlış parola</string>
   <string name="account_device_revocation_unknown_device">Bilinmeyen aygıt.</string>
   <string name="account_device_revocation_error_unknown">Bilinmeyen hata.</string>
-  <string name="account_password_change">Parolayı değiştir</string>
-  <string name="account_password_set">Parola ayarla</string>
+  <string name="account_password_change">Parolayı Değiştir</string>
   <string name="account_password_change_wait_message">Hesap parolasını değiştir </string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Genel</string>
@@ -130,7 +129,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="error_passwords_not_equals">Parolalar eşleşmedi</string>
   <string name="export_account_wait_title">Lütfen bekleyin...</string>
   <string name="export_account_wait_message">Hesap bilgilerini dışa aktar</string>
-  <string name="account_export_file">Hesabı yedekle</string>
   <string name="account_export_end_decryption_message">Sağlanan parola kullanılarak hesabınızın kilidi açılamıyor.</string>
   <string name="account_export_end_network_title">Ağ hatası</string>
   <string name="account_export_end_network_message">Hesap ağda dışa aktarılamadı. Bağlanabilirliğinizi denetleyin.</string>
@@ -181,7 +179,6 @@ Hesabınızı daha sonra düzenleyebilirsiniz</string>
   <string name="error_username_empty">Bir kullanıcı adı gir</string>
   <string name="no_registered_name_for_account">Bu hesap için kaydedilmiş ad bulunamadı</string>
   <string name="username_available">Kullanıcı adı geçerli !</string>
-  <string name="register_name">Adı kaydet</string>
   <string name="trying_to_register_name">Ad kaydedilmeye çalışılıyor</string>
   <string name="registered_username">Kaydedilen kullanıcı adı</string>
   <string name="register_username">Halka açık kullanıcı adı kaydet</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings.xml b/ring-android/app/src/main/res/values-uk/strings.xml
index 759fca61e..6d6f6d024 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -154,7 +154,7 @@
   <string name="wizard_next">Далі</string>
   <string name="wizard_back">Назад</string>
   <string name="wizard_skip">Пропустити</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">Профіль</string>
   <string name="profile_message_warning">Ваш профіль бачитимуть лише ваші контакти</string>
   <string name="open_the_gallery">Відкрити галерею</string>
@@ -199,6 +199,6 @@
   <string name="tv_audio_play">Програти</string>
   <string name="tv_audio_pause">Пауза</string>
   <string name="tv_dialog_send">Відправити</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_password_skip">Створити обліковий запис</string>
 </resources>
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 c82bf4bcd..91e78b759 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
@@ -35,7 +35,6 @@
   <!--AccountManagementFragment-->
   <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,7 +42,6 @@
   <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">Змінити пароль</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Головні</string>
   <string name="account_basic_category">Базові налаштування</string>
@@ -153,7 +151,6 @@
   <!--Name registration-->
   <string name="error_username_empty">Ввести ім\'я користувача</string>
   <string name="no_registered_name_for_account">Не знайдено зареєстрованого імені для цього облікового запису</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-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index 74042eab6..5de38be38 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
@@ -86,6 +86,8 @@
   <!--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>
@@ -182,7 +184,7 @@
   <string name="wizard_next">下一步</string>
   <string name="wizard_back">上一步</string>
   <string name="wizard_skip">跳过</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">账户资料</string>
   <string name="profile_message_warning">您的账户资料仅与您的通讯录共享</string>
   <string name="open_the_gallery">打开照片库</string>
@@ -271,7 +273,7 @@
   <string name="tv_send_audio">发送音频</string>
   <string name="tv_send_video">发送媒体文件</string>
   <string name="conversation_input_speech_hint">说点什么…</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">推荐</string>
   <string name="wizard_status_optional">选填</string>
   <string name="wizard_status_required">必填</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 b3253f846..3b87bd8bd 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">没有已注册账户</string>
   <string name="normal_accounts_titles">账户</string>
-  <string name="normal_devices_titles">连接到此 Jami 账户的已知设备</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>
@@ -44,7 +44,7 @@
   <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">更改密码</string>
+  <string name="account_password_change">更改用户名</string>
   <string name="account_password_set">设置密码</string>
   <string name="account_password_change_wait_message">更改用户密码</string>
   <!--Basic Details-->
@@ -134,7 +134,6 @@
   <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>
@@ -186,7 +185,6 @@
   <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-rCN/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
index 75a290128..05e44323a 100644
--- a/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rCN/strings_preferences.xml
@@ -41,4 +41,5 @@
   <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">强制 \n 安装</string>
+  <string name="plugin_path_image_add">添加一个新图片</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings.xml b/ring-android/app/src/main/res/values-zh-rTW/strings.xml
index 51ff75a02..4b3c0adba 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
@@ -184,7 +184,7 @@
   <string name="wizard_next">下一個</string>
   <string name="wizard_back">前一個</string>
   <string name="wizard_skip">略過</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">介紹</string>
   <string name="profile_message_warning">您的介紹僅與您的聯絡人分享</string>
   <string name="open_the_gallery">開啟相簿</string>
@@ -273,7 +273,7 @@
   <string name="tv_send_audio">傳送音訊</string>
   <string name="tv_send_video">傳送媒體</string>
   <string name="conversation_input_speech_hint">說點東西……</string>
-  <!--WIZARD-->
+  <!--Wizard-->
   <string name="wizard_status_recommended">建議</string>
   <string name="wizard_status_optional">選擇性</string>
   <string name="wizard_status_required">必填</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 c4effff3b..0c37d0017 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
@@ -36,7 +36,7 @@
   <!--AccountManagementFragment-->
   <string name="empty_account_list">沒有註冊的帳號</string>
   <string name="normal_accounts_titles">帳號</string>
-  <string name="normal_devices_titles">連結到這個 Jami 帳號的已知裝置</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>
@@ -134,7 +134,6 @@
   <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>
@@ -186,7 +185,6 @@
   <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/strings.xml b/ring-android/app/src/main/res/values-zh/strings.xml
index 9012796a8..8927400cf 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -29,7 +29,7 @@
   <!--Contacts-->
   <string name="prompt_hint_username">使用者名</string>
   <string name="wizard_next">下一步</string>
-  <!--MenuHeaderView-->
+  <!--Account Summary-->
   <string name="profile">個人檔案</string>
   <!--Share fragment-->
   <string name="share_label">分享</string>
@@ -51,5 +51,5 @@
   <string name="tv_audio_play">播放</string>
   <string name="tv_audio_pause">暫停</string>
   <string name="tv_dialog_send">發送</string>
-  <!--WIZARD-->
+  <!--Wizard-->
 </resources>
-- 
GitLab