i18n: automatic bump

Change-Id: I5f6c1ac25e0b4122663b3d2bb30b3b0bec57a4f4
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 b02abd9..60b79ec 100644
--- a/ring-android/app/src/main/res/values-ar/strings.xml
+++ b/ring-android/app/src/main/res/values-ar/strings.xml
@@ -173,9 +173,8 @@
   <string name="prompt_new_password_repeat">كرر كلمة المرور الجديدة</string>
   <string name="account_create_title">كوّن حساب جامي</string>
   <string name="prompt_new_username">أدخل إسم مستخدم جديد</string>
+  <string name="prompt_hint_username">اسم المستخدم</string>
   <string name="help_password_choose">إختار كلمة مرور قوية يمكنك تذكرها لحماية حساب جامي الخاص بك.</string>
-  <string name="help_password_enter">أدخل كلمة مرور حساب جامي الرئيسي</string>
-  <string name="help_server_enter">أدخل رابط خادم الإدارة</string>
   <string name="help_pin_enter">أدخل الرقم السري من حساب جامي آخر مكوّن. إستعمل \"تصدير حساب جامي\" للحصول على رقم سري.</string>
   <string name="wizard_next">التالي</string>
   <string name="wizard_back">السابق</string>
@@ -185,7 +184,6 @@
   <string name="profile_message_warning">حسابك مشارك فقط مع جهات إتصالك</string>
   <string name="open_the_gallery">إفتح المعرض</string>
   <string name="take_a_photo">إلتقط صورة</string>
-  <string name="profile_name_hint">أدخل إسمك (إختياري)</string>
   <!--Share fragment-->
   <string name="share_message">إمسح هذا الكود بإستعمال جامي</string>
   <string name="share_message_no_account">الرجاء إختيار حساب للمشاركة.</string>
@@ -201,7 +199,6 @@
   <string name="contact_request_title">طلب تواصل جديد</string>
   <string name="contact_request_msg">لديك %1$s طلبات تواصل</string>
   <string name="contact_request_account">ل%1$s</string>
-  <string name="no_requests">0 طلبات تواصل</string>
   <string name="message_contact_not_trusted_yet">%s ليس في جهات إتصالك بعد.\nهل تقبل أم ترفض هذا الإتصال؟</string>
   <string name="message_contact_not_trusted">%s ليس في جهات إتصالك.\nإضافة جهة إتصال جديدة؟</string>
   <!--Send contact requests-->
@@ -209,7 +206,6 @@
   <string name="send_request_title">أرسل طلب إتصال</string>
   <string name="send_request_msg">يجب أن ترسل طلب تواصل لتتواصل مع هذا المستخدم. طالما لم يقبل المستخدم هذا الطلب, يمكنك إرسال رسائل و لكنه لن يستطيع الرد.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 جهات إتصال محظورة</string>
   <!--Smartlist-->
   <string name="no_contact_request">لم يتم إرسال طلب تواصل</string>
   <string name="contact_request_sent">تم إرسال طلب تواصل</string>
@@ -261,4 +257,6 @@
   <string name="tv_dialog_send">أرسل</string>
   <string name="tv_send_text">أرسل نص</string>
   <string name="tv_send_audio">أرسل صوت</string>
+  <!--WIZARD-->
+  <string name="wizard_password_skip">إنشاء حساب</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 afaff4f..638b838 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
@@ -70,6 +70,7 @@
   <string name="account_credentials_add">إضافة بيانات الاعتماد</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">تأمين</string>
+  <string name="account_srtp_switch_label">تشفير تيارات الميديا (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">إستعمل المواصلات TLS</string>
@@ -100,6 +101,7 @@
   <string name="account_link_export_button">اربط جهازاً آخر مع هذا الحساب</string>
   <string name="account_connect_prompt_username">اسم المستخدم</string>
   <!--Name registration-->
+  <string name="register_username">سجل اسم المستخدم العام</string>
   <string name="account_status_connecting">يتم الإتصال</string>
   <string name="account_status_unknown">مجهول</string>
   <string name="account_status_error">خطأ</string>
diff --git a/ring-android/app/src/main/res/values-ar/strings_preferences.xml b/ring-android/app/src/main/res/values-ar/strings_preferences.xml
index a6ff7a7..99fd56d 100644
--- a/ring-android/app/src/main/res/values-ar/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ar/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">مسح كامل سجل المحادثات. لا يمكن التراجع عن هذا الخيار فيما بعد.</string>
   <string name="pref_persistNotification_title">التشغيل في الخلفية</string>
   <string name="pref_persistNotification_summary">السماح بالتشغيل في الخلفية لاستقبال المكالمات والرسائل.</string>
+  <!--Plugin-->
 </resources>
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 6071756..2aa79c6 100644
--- a/ring-android/app/src/main/res/values-bg/strings.xml
+++ b/ring-android/app/src/main/res/values-bg/strings.xml
@@ -142,8 +142,8 @@
   <string name="prompt_new_password_repeat">Повторете новата парола</string>
   <string name="account_create_title">Създаване на профил в Jami</string>
   <string name="prompt_new_username">Въведете ново потребителско име</string>
+  <string name="prompt_hint_username">Потребителско име</string>
   <string name="help_password_choose">Изберете сигурна парола, която ще запомните, за да е защитен профилът ви.</string>
-  <string name="help_password_enter">Въведете основната си парола за Jami</string>
   <string name="help_pin_enter">Въведете ПИН-кода на друг настроен профил за Jami. Използвайте функцията „Изнасяне на профила от Jami“, за да получите ПИН.</string>
   <string name="wizard_next">Напред</string>
   <string name="wizard_back">Назад</string>
@@ -153,7 +153,6 @@
   <string name="profile_message_warning">Профилът Ви се споделя само с контактите Ви</string>
   <string name="open_the_gallery">Отваряне на галерията</string>
   <string name="take_a_photo">Снимане</string>
-  <string name="profile_name_hint">Въведете името си (незадължително)</string>
   <!--Share fragment-->
   <string name="share_message">Сканирайте този код с Jami</string>
   <string name="share_message_no_account">Моля, изберете кой профил искате да споделите.</string>
@@ -168,7 +167,6 @@
   <string name="contact_request_title">Заявка за свързване с нов контакт</string>
   <string name="contact_request_msg">Имате %1$s заявки за свързване с нови контакти</string>
   <string name="contact_request_account">За %1$s</string>
-  <string name="no_requests">0 заявки за свързване с нови контакти</string>
   <string name="message_contact_not_trusted_yet">%sвсе още не е в контактите ви.\nПриемате ли или отказвате тази заявка за контакт? </string>
   <string name="message_contact_not_trusted">%s не е в контактите ви.\nДобавяне на контакт?</string>
   <!--Send contact requests-->
@@ -176,7 +174,6 @@
   <string name="send_request_title">Изпращане на заявка за свързване с нов контакт</string>
   <string name="send_request_msg">Трябва да изпратите заявка за контакт, за да комуникирате с този потребител. Докато вашият контакт не е приел заявката, можете да изпращате съобщения, но той няма да може да отговори.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 блокирани контакти</string>
   <!--Smartlist-->
   <string name="no_contact_request">Няма изпратени заявки за свързване с нови контакти</string>
   <string name="contact_request_sent">Заявката за свързване с нов контакт е изпратена</string>
@@ -211,4 +208,6 @@
   <string name="tv_audio_play">Пускане</string>
   <string name="tv_audio_pause">Пауза</string>
   <string name="tv_dialog_send">Изпращане</string>
+  <!--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 644f8ff..a310762 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
@@ -138,6 +138,7 @@
   <string name="register_name">Регистриране на име</string>
   <string name="trying_to_register_name">Протича опит за регистриране на името</string>
   <string name="registered_username">Регистрирано потребителско име</string>
+  <string name="register_username">Регистриране на публично потребителско име</string>
   <string name="username_already_taken">Потребителското име е вече заето</string>
   <string name="invalid_username">Грешно потребителско име</string>
   <string name="looking_for_username_availability">Проверяване дали потребителското име е свободно…</string>
diff --git a/ring-android/app/src/main/res/values-bg/strings_preferences.xml b/ring-android/app/src/main/res/values-bg/strings_preferences.xml
index 1c2551c..d4ba33f 100644
--- a/ring-android/app/src/main/res/values-bg/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-bg/strings_preferences.xml
@@ -21,4 +21,5 @@
   <string name="pref_clearHistory_title">Изчистване на историята</string>
   <string name="pref_persistNotification_title">Фонов режим</string>
   <string name="pref_persistNotification_summary">Jami работи във фонов режим, за да получава повиквания и съобщения.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ca/strings.xml b/ring-android/app/src/main/res/values-ca/strings.xml
index f9fe31b..4f6f588 100644
--- a/ring-android/app/src/main/res/values-ca/strings.xml
+++ b/ring-android/app/src/main/res/values-ca/strings.xml
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Torneu a inserir la contrasenya nova</string>
   <string name="account_create_title">Crear un compte Jami</string>
   <string name="prompt_new_username">Escriviu un nom d\'usuari</string>
+  <string name="prompt_hint_username">Nom d\'usuari</string>
   <string name="help_password_choose">Escull una contrasenya forta que puguis recordar per protegir el teu compte Jami.</string>
-  <string name="help_password_enter">Inseriu la contrasenya del vostre compte Jami</string>
-  <string name="help_server_enter">Inseriu la URL del servei de gestió</string>
   <string name="help_pin_enter">Inseriu el PIN d\'un altre compte Jami configurat. Utilitza l\'opció «exportar compte Jami» per obtenir un PIN.</string>
   <string name="wizard_next">Endavant</string>
   <string name="wizard_back">Enrere</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">El vostre perfil només es comparteix amb els vostres contactes</string>
   <string name="open_the_gallery">Obre la galeria</string>
   <string name="take_a_photo">Fes una foto</string>
-  <string name="profile_name_hint">Introduïu el vostre nom (opcional)</string>
   <!--Share fragment-->
   <string name="share_message">Escaneja aquest codi amb Jami</string>
   <string name="share_message_no_account">Seleccioneu un compte per compartir</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Petició nova de contacte</string>
   <string name="contact_request_msg">Teniu %1$s peticions de contacte</string>
   <string name="contact_request_account">Per %1$s</string>
-  <string name="no_requests">0 peticions de contacte</string>
   <string name="message_contact_not_trusted_yet">%s no està als seus contactes encara.\nVoleu acceptar o rebutjar aquesta petició de contacte?</string>
   <string name="message_contact_not_trusted">%s no està als seus contactes.\n Afegir un nou contacte?</string>
   <!--Send contact requests-->
@@ -205,7 +202,6 @@
   <string name="send_request_title">Envia una petició de contacte</string>
   <string name="send_request_msg">Ha d\'enviar una petició de contacte per comunicar-se amb aquest usuari. Mentre el seu contacte no accepti la petició, pot enviar missatges però ell no podrà respondre\'ls.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contactes blocats</string>
   <!--Smartlist-->
   <string name="no_contact_request">No s\'ha enviat cap petició de contacte</string>
   <string name="contact_request_sent">S\'ha enviat una petició de contacte</string>
@@ -264,4 +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-->
+  <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 42e4369..588db94 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">Afegeix les credencials</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguretat</string>
+  <string name="account_srtp_switch_label">Xifra el flux de mitjans (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Utilitza transport TLS</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">Compte Sip registrat</string>
   <string name="account_sip_success_message">Ha registrat amb èxit el seu compte Sip.</string>
   <string name="account_sip_register_anyway">Registre de totes maneres</string>
-  <string name="account_link_device">Connecta des d\'un altre dispositiu</string>
   <string name="account_link_button">Connecta des de la xarxa</string>
   <string name="account_link_archive_button">Connecta des d\'una còpia de seguretat</string>
   <string name="account_link_prompt_pin">Introdueix PIN</string>
@@ -183,7 +183,7 @@
   <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 (recomanat)</string>
+  <string name="register_username">Registra nom d\'usuari públic</string>
   <string name="username_already_taken">Nom d\'usuari ja registrat.</string>
   <string name="invalid_username">Nom d\'usuari invalid</string>
   <string name="unknown_error">Error desconegut. Si us plau, comprovi la seva connexió a la xarxa!</string>
diff --git a/ring-android/app/src/main/res/values-ca/strings_preferences.xml b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
index ac2f62c..963f731 100644
--- a/ring-android/app/src/main/res/values-ca/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ca/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Neteja totes les converses de l\'historial. Aquesta acció no pot es desfer.</string>
   <string name="pref_persistNotification_title">Executa en segon pla</string>
   <string name="pref_persistNotification_summary">Permet executar en segon pla per rebre trucades i missatges.</string>
+  <!--Plugin-->
 </resources>
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 a1df470..d772086 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
@@ -144,8 +144,8 @@
   <string name="prompt_new_password_repeat">Zopakujte nové heslo</string>
   <string name="account_create_title">Vytvořit účet Jami</string>
   <string name="prompt_new_username">Zadejte nové uživatelské jméno</string>
+  <string name="prompt_hint_username">Uživatelské jméno</string>
   <string name="help_password_choose">K ochraně účtu Jami si zvolte silné heslo, které si dovedete zapamatovat.</string>
-  <string name="help_password_enter">Zadejte hlavní heslo ke svému účtu Jami</string>
   <string name="help_pin_enter">Zadejte PIN z jiného nastaveného účtu Jami. Abyste PIN získali, použijte volbu „vyvést účet u Jami“.</string>
   <string name="wizard_next">Další</string>
   <string name="wizard_back">Zpět</string>
@@ -155,7 +155,6 @@
   <string name="profile_message_warning">Váš profil je sdílen jen s vašimi kontakty</string>
   <string name="open_the_gallery">Otevřít galerii</string>
   <string name="take_a_photo">Pořídit fotku</string>
-  <string name="profile_name_hint">Zadejte své jméno (volitelné)</string>
   <!--Share fragment-->
   <string name="share_message">Skenovat tento kód s Jami</string>
   <string name="share_message_no_account">Vyberte, prosím, účet ke sdílení.</string>
@@ -170,14 +169,13 @@
   <string name="contact_request_title">Nová žádost o kontakt</string>
   <string name="contact_request_msg">Máte %1$s žádostí o kontakt</string>
   <string name="contact_request_account">Pro %1$s</string>
-  <string name="no_requests">0 žádostí o kontakt</string>
   <string name="message_contact_not_trusted_yet">%sještě není ve vašich kontaktech.\nPřijmete anebo odmítnete tuto žádost o kontakt?</string>
   <string name="message_contact_not_trusted">%snení ve vašich kontaktech.\nPřidat nové spojení?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Odeslat</string>
   <string name="send_request_title">Poslat žádost o kontakt</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blokovaných kontaktů</string>
+  <string name="no_blocked_contact">Žádné blokované kontakty</string>
   <!--Smartlist-->
   <string name="no_contact_request">Neposlána žádná žádost o kontakt</string>
   <string name="contact_request_sent">Poslána žádost o kontakt</string>
@@ -216,4 +214,6 @@
   <string name="tv_audio_play">Přehrát</string>
   <string name="tv_audio_pause">Pozastavit</string>
   <string name="tv_dialog_send">Odeslat</string>
+  <!--WIZARD-->
+  <string name="wizard_password_skip">Vytvořit účet</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 0981eb2..e9ed1de 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
@@ -90,6 +90,7 @@
   <string name="account_credentials_add">Přidat ověřovací údaje</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Zabezpečení</string>
+  <string name="account_srtp_switch_label">Šifrovat datový tok (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Použít Transport TLS</string>
@@ -160,7 +161,7 @@
   <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 (pokusné)</string>
+  <string name="register_username">Zaregistrovat veřejné uživatelské jméno</string>
   <string name="username_already_taken">Uživatelské jméno je již obsazené</string>
   <string name="invalid_username">Neplatné uživatelské jméno</string>
   <string name="looking_for_username_availability">Zjišťuje se dostupnost uživatelského jména…</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 6fc76e7..f7c0753 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
@@ -20,4 +20,5 @@
   <string name="pref_clearHistory_title">Vymazat historii</string>
   <string name="pref_persistNotification_title">Běžet na pozadí</string>
   <string name="pref_persistNotification_summary">Umožnit běh na pozadí pro příjem hovorů a zpráv.</string>
+  <!--Plugin-->
 </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 8600ab5..40c2d0a 100644
--- a/ring-android/app/src/main/res/values-da/strings.xml
+++ b/ring-android/app/src/main/res/values-da/strings.xml
@@ -126,6 +126,7 @@
   <string name="prompt_new_password_optional">Ny adgangskode (valgfrit)</string>
   <string name="prompt_new_password_repeat">Gentag ny adgangskode</string>
   <string name="prompt_new_username">Indtast nyt brugernavn</string>
+  <string name="prompt_hint_username">Brugernavn</string>
   <string name="wizard_next">Næste</string>
   <string name="wizard_back">Tilbage</string>
   <string name="wizard_skip">Spring over</string>
@@ -134,7 +135,6 @@
   <string name="profile_message_warning">Din profil vil kun blive delt med dine kontakter</string>
   <string name="open_the_gallery">Åbn galleriet</string>
   <string name="take_a_photo">Tag et billede</string>
-  <string name="profile_name_hint">Indtast dit navn (valgfrit)</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Vælg en konto at dele.</string>
   <string name="share_your_account_information">Del min kontaktinformation</string>
@@ -148,7 +148,6 @@
   <string name="contact_request_title">Ny kontakt-anmodning</string>
   <string name="contact_request_msg">Du har %1$s kontakt-anmodninger</string>
   <string name="contact_request_account">For %1$s</string>
-  <string name="no_requests">0 kontaktforespørgsler</string>
   <string name="message_contact_not_trusted_yet">%s er ikke blandt dine kontakter endnu.\nVil du acceptere eller afvise denne kontaktforespørgsel?</string>
   <string name="message_contact_not_trusted">%s er ikke i dine \"kontakter\".\nTilføj en ny kontakt?</string>
   <!--Send contact requests-->
@@ -156,7 +155,6 @@
   <string name="send_request_title">Send en kontaktforespørgsel</string>
   <string name="send_request_msg">Du skal sende en kontaktforespørgsel for at kunne skrive sammen  med denne bruger. Så længe personen ikke har godkendt forespørgslen, kan du afsende beskeder men personen vil ikke være i stand til at besvare dem. </string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blokerede kontakter</string>
   <!--Smartlist-->
   <string name="no_contact_request">Ingen kontaktforespørgsler afsendt</string>
   <string name="contact_request_sent">Kontaktforespørgsel afsendt</string>
@@ -194,4 +192,6 @@
   <string name="tv_audio_play">Afspil</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Send</string>
+  <!--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 c398a25..16a9a9b 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
@@ -87,6 +87,7 @@
   <string name="account_credentials_add">Tilføj Legitimeringsoplysninger</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sikkerhed</string>
+  <string name="account_srtp_switch_label">Krypter mediestrømme (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Brug TLS-transport</string>
@@ -141,7 +142,7 @@
   <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 (anbefales)</string>
+  <string name="register_username">Registrer offentligt brugernavn</string>
   <string name="username_already_taken">Brugernavn er allerede taget</string>
   <string name="invalid_username">Ugyldigt brugernavn</string>
   <string name="looking_for_username_availability">Tjekker efter om brugernavnet er ledigt...</string>
diff --git a/ring-android/app/src/main/res/values-da/strings_preferences.xml b/ring-android/app/src/main/res/values-da/strings_preferences.xml
index 802696c..b6b6b1d 100644
--- a/ring-android/app/src/main/res/values-da/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-da/strings_preferences.xml
@@ -12,4 +12,5 @@
   <string name="pref_systemContacts_title">Brug systemkontakter</string>
   <string name="pref_systemContacts_summary">Brug systemkontakter til at vise opkaldsdetaljer</string>
   <string name="pref_clearHistory_title">Ryd historiken</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings.xml b/ring-android/app/src/main/res/values-de-rDE/strings.xml
index 6aa66fa..8d464a9 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
@@ -143,8 +143,8 @@
   <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
   <string name="account_create_title">Jami-Konto erstellen</string>
   <string name="prompt_new_username">Neuen Benutzername eingeben</string>
+  <string name="prompt_hint_username">Benutzername</string>
   <string name="help_password_choose">Wählen Sie ein sicheres Passwort und merken Sie es sich um Ihre Jami-Zugangsdaten zu schützen.</string>
-  <string name="help_password_enter">Geben Sie das Passwort für Ihre Jami-Konto ein.</string>
   <string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Jami-Kontos ein. Verwenden Sie die Funktion \"Jami-Konto exportieren\", um eine PIN zu erhalten.</string>
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
@@ -154,7 +154,6 @@
   <string name="profile_message_warning">Ihr Profil wird nur mit Ihren Kontakten geteilt</string>
   <string name="open_the_gallery">Galerie öffnen</string>
   <string name="take_a_photo">Mache ein Foto</string>
-  <string name="profile_name_hint">Name eingeben (optional)</string>
   <!--Share fragment-->
   <string name="share_message">Diesen Code mit Jami scannen</string>
   <string name="share_message_no_account">Bitte wählen Sie ein Konto, das Sie teilen wollen.</string>
@@ -169,7 +168,6 @@
   <string name="contact_request_title">Neue Kontaktanfrage</string>
   <string name="contact_request_msg">Du hast %1$s Kontaktanfragen</string>
   <string name="contact_request_account">Für %1$s</string>
-  <string name="no_requests">0 Kontaktanfragen</string>
   <string name="message_contact_not_trusted_yet">%s ist noch nicht in Ihrer Kontaktliste.\nWollen Sie diese Kontaktanfrage annehmen oder ablehnen?</string>
   <string name="message_contact_not_trusted">%s ist nicht in Ihrer Kontaktliste.\nEinen neuen Kontakt hinzufügen?</string>
   <!--Send contact requests-->
@@ -177,7 +175,6 @@
   <string name="send_request_title">Eine Kontaktanfrage verschicken</string>
   <string name="send_request_msg">Es ist eine Kontaktanfrage nötig, um mit dem Kontakt zu kommunizieren. So lange diese Anfrage vom Gegenüber nicht akzeptiert wurde, können weiterhin Nachrichten gesendet werden, aber dieser kann nicht antworten.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blockierte Kontakte</string>
   <!--Smartlist-->
   <string name="no_contact_request">Keine Kontaktanfrage verschickt</string>
   <string name="contact_request_sent">Kontaktanfrage verschickt</string>
@@ -215,4 +212,6 @@
   <!--TV-->
   <string name="tv_audio_play">Wiedergeben</string>
   <string name="tv_dialog_send">Senden</string>
+  <!--WIZARD-->
+  <string name="wizard_password_skip">Konto erstellen</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
index 2e8c4d3..f12cf67 100644
--- a/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-de-rDE/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Löschen Sie den gesamten Konversationsverlauf. Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="pref_persistNotification_title">Im Hintergrund ausführen</string>
   <string name="pref_persistNotification_summary">Ausführung im Hintergrund zulassen, um Anrufe und Nachrichten zu empfangen.</string>
+  <!--Plugin-->
 </resources>
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 960eaa0..62a4f29 100644
--- a/ring-android/app/src/main/res/values-de/strings.xml
+++ b/ring-android/app/src/main/res/values-de/strings.xml
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Neues Passwort wiederholen</string>
   <string name="account_create_title">Ein Jami-Konto erstellen</string>
   <string name="prompt_new_username">Neuen Benutzernamen eingeben</string>
+  <string name="prompt_hint_username">Benutzername</string>
   <string name="help_password_choose">Wählen Sie ein sicheres Passwort, an das Sie sich erinnern können, um ihr Jami-Konto zu schützen.</string>
-  <string name="help_password_enter">Geben Sie ihr Haupt-Jami-Kontopasswort ein</string>
-  <string name="help_server_enter">URL des Management-Servers eingeben</string>
   <string name="help_pin_enter">Geben Sie die PIN eines anderen konfigurierten Jami-Kontos ein. Benutzen Sie die Funktion \"Exportiere Jami-Konto\", um eine PIN zu erhalten.</string>
   <string name="wizard_next">Weiter</string>
   <string name="wizard_back">Zurück</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">Dein Profil wird nur mit deinen Kontakten geteilt</string>
   <string name="open_the_gallery">Galerie öffnen</string>
   <string name="take_a_photo">Foto machen</string>
-  <string name="profile_name_hint">Name eingeben (optional)</string>
   <!--Share fragment-->
   <string name="share_message">Diesen Code mit Jami scannen</string>
   <string name="share_message_no_account">Bitte wähle ein Konto zum Teilen aus.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Neue Kontaktanfrage</string>
   <string name="contact_request_msg">Du hast %1$s Kontaktanfragen</string>
   <string name="contact_request_account">Für %1$s</string>
-  <string name="no_requests">0 Kontaktanfragen</string>
   <string name="message_contact_not_trusted_yet">%s ist noch nicht in deiner Kontaktliste.\nDiese Kontaktanfrage annehmen oder ablehnen?</string>
   <string name="message_contact_not_trusted">%s ist nicht in deiner Kontaktliste.\nNeuen Kontakt hinzufügen?</string>
   <!--Send contact requests-->
@@ -205,7 +202,7 @@
   <string name="send_request_title">Sende eine Kontaktanfrage</string>
   <string name="send_request_msg">Du musst eine Kontaktanfrage senden, um mit diesem Benutzer zu kommunizieren. Solange dein Kontakt die Anfrage nicht akzeptiert hat, kannst du Nachrichten senden, aber er wird nicht in der Lage sein, zu antworten.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blockierte Kontakte</string>
+  <string name="no_blocked_contact">Keine gesperrten Kontakte</string>
   <!--Smartlist-->
   <string name="no_contact_request">Keine Kontaktanfrage gesendet</string>
   <string name="contact_request_sent">Kontaktanfrage gesendet</string>
@@ -264,4 +261,13 @@
   <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-->
+  <string name="wizard_status_recommended">Empfohlen</string>
+  <string name="wizard_password_info">Kontopasswort</string>
+  <string name="wizard_password_button">Passwort wählen</string>
+  <string name="wizard_password_skip">Konto erstellen</string>
+  <string name="wizard_password_warning">Beachten Sie, dass das Passwort nicht wiederhergestellt werden kann</string>
+  <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>
 </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 b21dd84..428199e 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
@@ -105,6 +105,9 @@
   <string name="account_credentials_add">Anmeldedaten hinzufügen</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sicherheit</string>
+  <string name="account_srtp_switch_label">Medienströme verschlüsseln (SRTP)</string>
+  <string name="account_srtp_enable_sdes">SDES als Schlüsselaustauschprotokoll verwenden</string>
+  <string name="account_srtp_rtp_fallback">Rückgriff auf RTP, wenn SRTP fehlschlägt</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">TLS-Transportverschlüsselung benutzen</string>
@@ -158,7 +161,7 @@
   <string name="account_sip_success_title">SIP-Konto registriert</string>
   <string name="account_sip_success_message">Sie haben erfolgreich Ihr SIP-Konto registriert.</string>
   <string name="account_sip_register_anyway">Trotzdem registieren</string>
-  <string name="account_link_device">Verbindung von einem anderen Gerät</string>
+  <string name="account_link_device">Verbindung von einem anderen Gerät aus herstellen</string>
   <string name="account_link_button">Verbindung vom Netzwerk</string>
   <string name="account_link_archive_button">Verbindung vom Backup</string>
   <string name="account_link_prompt_pin">PIN eingeben</string>
@@ -183,7 +186,8 @@
   <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 (empfohlen)</string>
+  <string name="register_username">Öffentlichen Benutzernamen registrieren</string>
+  <string name="register_recommended">Empfohlen</string>
   <string name="username_already_taken">Dieser Benutzername ist bereits vergeben</string>
   <string name="invalid_username">Ungültiger Benutzername</string>
   <string name="unknown_error">Unbekannter Fehler. Bitte überprüfen sie ihre Netzwerkverbindung!</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 d132171..f8df953 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
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Kompletten Gesprächsverlauf löschen. Diese Aktion kann nicht rückgängig gemacht werden.</string>
   <string name="pref_persistNotification_title">Im Hintergrund laufen lassen</string>
   <string name="pref_persistNotification_summary">Jami erlauben im Hintergrund zu laufen, um Anrufe und Nachrichten zu empfangen.</string>
+  <!--Plugin-->
 </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 29ea767..106a3ba 100644
--- a/ring-android/app/src/main/res/values-el/strings.xml
+++ b/ring-android/app/src/main/res/values-el/strings.xml
@@ -88,6 +88,7 @@
   <string name="prompt_new_password">Νέο συνθηματικό</string>
   <string name="prompt_new_password_repeat">Επανάληψη νέου συνθηματικού</string>
   <string name="prompt_new_username">Εισάγετε νέο ψευδώνυμο</string>
+  <string name="prompt_hint_username">Όνομα χρήστη</string>
   <string name="wizard_next">Επόμενο</string>
   <string name="wizard_back">Πίσω</string>
   <!--MenuHeaderView-->
@@ -95,7 +96,6 @@
   <string name="profile_message_warning">Το προφίλ σας διαμοιράζεται μόνο με τις επαφές σας</string>
   <string name="open_the_gallery">Άνοιγμα έκθεσης</string>
   <string name="take_a_photo">Λήψη φωτογραφίας</string>
-  <string name="profile_name_hint">Εισάγετε το όνομα σας (προαιρετικό)</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Επιλέξτε έναν λογαριασμό για διαμοιρασμό.</string>
   <string name="share_your_account_information">Μοίρασε τις πληροφορίες των επαφών μου</string>
@@ -109,12 +109,10 @@
   <string name="contact_request_title">Νέο αίτημα επαφής</string>
   <string name="contact_request_msg">Έχετε %1$sαίτημα(τα) επαφής</string>
   <string name="contact_request_account">Για %1$s</string>
-  <string name="no_requests">0 αιτήματα επαφής</string>
   <!--Send contact requests-->
   <string name="send_request_button">Αποστολή</string>
   <string name="send_request_title">Αποστολή αίτημα επαφής</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 Μπλοκαρισμένες επαφές</string>
   <!--Smartlist-->
   <string name="no_contact_request">Δεν έχουν αποσταλλέι αιτήματα επαφής</string>
   <string name="contact_request_sent">Αίτημα επαφής εστάλει</string>
@@ -131,4 +129,6 @@
   <!--TV-->
   <string name="tv_audio_play">Αναπαραγωγή</string>
   <string name="tv_dialog_send">Αποστολή</string>
+  <!--WIZARD-->
+  <string name="wizard_password_skip">Δημιουργία λογαριασμού</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-el/strings_account.xml b/ring-android/app/src/main/res/values-el/strings_account.xml
index 200808b..e581ecb 100644
--- a/ring-android/app/src/main/res/values-el/strings_account.xml
+++ b/ring-android/app/src/main/res/values-el/strings_account.xml
@@ -45,6 +45,7 @@
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Ασφάλεια</string>
+  <string name="account_srtp_switch_label">Κρυπτογράφηση ροών μέσων (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_rtp_port_range">Εύρος θυρών RTP ήχου</string>
@@ -56,6 +57,7 @@
   <string name="account_link_export_button">Σύνδεση μιας άλλης συσκευής σε αυτόν το λογαριασμό</string>
   <string name="account_connect_prompt_username">Όνομα χρήστη</string>
   <!--Name registration-->
+  <string name="register_username">Καταχώρηση δημόσιου ονόματος χρήστη</string>
   <string name="username_already_taken">Το όνομα χρήστη ήδη χρησιμοποιείται</string>
   <string name="invalid_username">Μη έγκυρο όνομα χρήστη</string>
   <string name="account_status_connecting">Συνδέεται</string>
diff --git a/ring-android/app/src/main/res/values-el/strings_preferences.xml b/ring-android/app/src/main/res/values-el/strings_preferences.xml
index 8d2ceba..e9df06e 100644
--- a/ring-android/app/src/main/res/values-el/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-el/strings_preferences.xml
@@ -5,4 +5,5 @@
   <string name="pref_category_video">Βίντεο</string>
   <string name="pref_category_system">Σύστημα</string>
   <string name="pref_mobileData_title">Δεδομένα κινητού</string>
+  <!--Plugin-->
 </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 e47916c..1163d77 100644
--- a/ring-android/app/src/main/res/values-eo/strings.xml
+++ b/ring-android/app/src/main/res/values-eo/strings.xml
@@ -78,6 +78,7 @@
   <string name="conversation_action_select_peer_number">Elektu numeron</string>
   <!--Contacts-->
   <string name="prompt_new_password">Nova pasvorto</string>
+  <string name="prompt_hint_username">Uzantnomo</string>
   <string name="wizard_next">Sekva</string>
   <!--MenuHeaderView-->
   <string name="profile">Profilo</string>
@@ -103,4 +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-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-eo/strings_account.xml b/ring-android/app/src/main/res/values-eo/strings_account.xml
index b0adcc0..1e76591 100644
--- a/ring-android/app/src/main/res/values-eo/strings_account.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_account.xml
@@ -66,6 +66,7 @@
   <string name="account_credentials_add">Aldoni ensalutilojn</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sekuro</string>
+  <string name="account_srtp_switch_label">Ĉifri aŭdvidfuojn (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Uzi TLS Transporton</string>
diff --git a/ring-android/app/src/main/res/values-eo/strings_preferences.xml b/ring-android/app/src/main/res/values-eo/strings_preferences.xml
index 5d3c511..9017c74 100644
--- a/ring-android/app/src/main/res/values-eo/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-eo/strings_preferences.xml
@@ -9,4 +9,5 @@
   <string name="pref_systemContacts_title">Uzi sistemajn kontaktojn</string>
   <string name="pref_systemContacts_summary">Uzi sistemajn kontaktojn por montri detalojn de la vokanto.</string>
   <string name="pref_clearHistory_title">Vakigi historion</string>
+  <!--Plugin-->
 </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 dedd979..8d01e0e 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
@@ -102,9 +102,10 @@
   <string name="ab_action_video_call">Videollamada</string>
   <string name="ab_action_change_screen_orientation">Cambiar orientación de pantalla</string>
   <string name="share_via">Compartir con</string>
-  <string name="write_a_message">Escribir un mensaje</string>
-  <string name="scan_qr">Escanear código QR</string>
+  <string name="write_a_message">Escribí un mensaje</string>
+  <string name="scan_qr">Leer código QR</string>
   <string name="ab_action_flipcamera">Girar cámara</string>
+  <string name="ab_action_hidepreview">Ocultar previsualización</string>
   <!--Text messages-->
   <string name="send_message">Enviar mensaje</string>
   <string name="message_sending">Enviando mensaje...</string>
@@ -169,9 +170,10 @@
   <string name="prompt_new_password_repeat">Repetir nueva contraseña</string>
   <string name="account_create_title">Crear una cuenta de Jami</string>
   <string name="prompt_new_username">Escribir nuevo usuario</string>
+  <string name="prompt_hint_username">Nombre de usuario</string>
   <string name="help_password_choose">Elegí una contraseña robusta que recuerdes para proteger tu cuenta de Jami.</string>
-  <string name="help_password_enter">Ingresá la contraseña de tu cuenta principal de Jami</string>
-  <string name="help_server_enter">Ingresá la URL del servidor de gestión</string>
+  <string name="help_password_enter">Ingrese la contraseña de su cuenta principal Jami.</string>
+  <string name="help_server_enter">Ingrese la URL del servidor de administración.</string>
   <string name="help_pin_enter">Ingresá el PIN de la cuenta de Jami configurada en el otro dispositivo. Para obtener el PIN seleccioná la opción \"Exportar cuenta de Jami\".</string>
   <string name="wizard_next">Siguiente</string>
   <string name="wizard_back">Atrás</string>
@@ -181,7 +183,7 @@
   <string name="profile_message_warning">Tu perfil sólo es compartido con tus contactos</string>
   <string name="open_the_gallery">Abrir galería</string>
   <string name="take_a_photo">Tomar foto</string>
-  <string name="profile_name_hint">Escribí tu nombre (opcional)</string>
+  <string name="profile_name_hint">Ingresá tu nombre</string>
   <!--Share fragment-->
   <string name="share_message">Escaneá este código con Jami</string>
   <string name="share_message_no_account">Selecciona una cuenta que quieras compartir.</string>
@@ -197,7 +199,7 @@
   <string name="contact_request_title">Nueva solicitud de contacto</string>
   <string name="contact_request_msg">Tenés %1$s solicitudes de contacto</string>
   <string name="contact_request_account">Para %1$s</string>
-  <string name="no_requests">0 solicitudes de contacto</string>
+  <string name="no_requests">No tenés solicitudes de contacto</string>
   <string name="message_contact_not_trusted_yet">%s no está en tus contactos. ¿Quieres aceptar o rechazar la solicitud de este contacto?</string>
   <string name="message_contact_not_trusted">%s no está entre tus contactos.\n¿Agregar nuevo contacto?</string>
   <!--Send contact requests-->
@@ -205,9 +207,10 @@
   <string name="send_request_title">Enviar solicitud de contacto</string>
   <string name="send_request_msg">Debes enviar una solicitud de contacto para comunicarte con este usuario. Si tu contacto no ha aceptado la solicitud, podrás enviar mensajes, pero él no podrá responder.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contactos bloqueados</string>
+  <string name="no_blocked_contact">No hay contactos bloqueados</string>
   <!--Smartlist-->
   <string name="no_contact_request">No se enviaron solicitudes de contacto</string>
+  <string name="conversation_placeholder">Todavía no tienes conversaciones</string>
   <string name="contact_request_sent">Solicitud de contacto enviada</string>
   <string name="start_conversation">Comenzar una conversación</string>
   <string name="search_results">Resultados de la búsqueda</string>
@@ -250,11 +253,34 @@
   <string name="navigation_item_conversation">Conversaciones</string>
   <string name="navigation_item_contact_request">Solicitudes de contacto</string>
   <string name="navigation_item_account">Cuenta</string>
+  <string name="search_results_public_directory">Directorio público</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">¿Enviar mensaje de audio?</string>
+  <string name="tv_send_image_dialog_message">¿Enviar la imagen?</string>
+  <string name="tv_send_video_dialog_message">¿Enviar el video?</string>
+  <string name="tv_media_preview">Previsualización</string>
   <string name="tv_audio_play">Reproducir</string>
   <string name="tv_audio_pause">Pausar</string>
   <string name="tv_dialog_send">Enviar</string>
+  <string name="tv_audio_recording">Grabando...</string>
   <string name="tv_send_text">Enviar texto</string>
   <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-->
+  <string name="wizard_status_recommended">Recomendado</string>
+  <string name="wizard_status_optional">Opcional</string>
+  <string name="wizard_status_required">Requerido</string>
+  <string name="wizard_username_info">Elija un nombre de usuario para su cuenta</string>
+  <string name="wizard_username_button">Eligí tu nombre de usuario</string>
+  <string name="wizard_username_skip">Omitir elección de nombre de usuario</string>
+  <string name="wizard_password_info">Contraseña de cuenta</string>
+  <string name="wizard_password_placeholder">Eligí una contraseña para cifrar la clave de la cuenta en este dispositivo</string>
+  <string name="wizard_password_button">Elegí tu contraseña</string>
+  <string name="wizard_password_skip">Crear cuenta</string>
+  <string name="wizard_password_switch">Cifrar cuenta con contraseña</string>
+  <string name="wizard_password_warning">Tenga en cuenta que la contraseña no se puede recuperar</string>
+  <string name="wizard_profile_info">Tu perfil sólo es compartido con tus contactos</string>
+  <string name="wizard_profile_button">Guardar perfil</string>
+  <string name="wizard_profile_skip">Saltear y hacerlo más tarde</string>
 </resources>
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 37df4b0..8b7766d 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
@@ -74,11 +74,17 @@
   <string name="account_video_enable">Permitir video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Avanzadas</string>
+  <string name="account_dht_public_in_calls_label">Permitir llamadas entrantes de contactos desconocidos</string>
   <string name="account_registration_exp_label">Caducidad del registro</string>
   <string name="account_local_interface_label">Interfaz Local</string>
   <string name="account_local_port_label">Puerto Local</string>
   <string name="account_stun_enable_label">Usar STUN</string>
   <string name="account_stun_server_label">Servidor STUN</string>
+  <string name="account_accept_files">Aceptar archivos entrantes automáticamente</string>
+  <string name="account_accept_files_max_size">Tamaño máximo de archivo para aceptación automática</string>
+  <string name="account_accept_files_never">Nunca aceptar automáticamente</string>
+  <string name="account_accept_files_always">Siempre aceptar automáticamente</string>
+  <string name="size_mb">%1$dMB</string>
   <string name="account_turn_enable_label">Usar TURN</string>
   <string name="account_turn_server_label">Servidor TURN</string>
   <string name="account_turn_username_label">Usuario TURN</string>
@@ -89,12 +95,19 @@
   <string name="account_proxy_label">Proxy DHT</string>
   <string name="account_proxy_enable_label">Usar proxy DHT</string>
   <string name="account_proxy_server_label">Dirección del proxy DHT</string>
+  <string name="account_proxy_server_list_label">Dirección URL del proxy DHT</string>
+  <string name="account_peer_discovery_label">Descubrimiento de pares locales</string>
+  <string name="account_peer_discovery_enable_label">Habilitar descubrimiento de pares locales</string>
+  <string name="account_peer_discovery_enable_summary">Conéctese a otros nodos DHT que se anuncian en nuestra red local</string>
   <!--Security Details-->
   <string name="account_credentials_label">Credenciales</string>
   <string name="account_credentials_edit">Editar credenciales</string>
   <string name="account_credentials_add">Añadir credenciales</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguridad</string>
+  <string name="account_srtp_switch_label">Cifrar los flujos de medios (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Habilitar SDES para el protocolo intercambio de claves</string>
+  <string name="account_srtp_rtp_fallback">Replegar a RTP en caso de que falle SRTP</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usar TLS</string>
@@ -111,7 +124,7 @@
   <string name="account_tls_negotiation_timeout_sec">Tiempo de espera de negociación (s)</string>
   <string name="account_rtp_max_port">Máximo</string>
   <string name="account_rtp_min_port">Mínimo</string>
-  <string name="account_rtp_port_range">Intervalo de puertos de audio RTP</string>
+  <string name="account_rtp_port_range">Intervalo para puertos de audio RTP</string>
   <!--restore/backup-->
   <string name="account_new_device_password">Indroduzca la contraseña principal para desbloquear su cuenta</string>
   <string name="error_password_char_count">6 carateres mínimo</string>
@@ -173,7 +186,8 @@
   <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 (recomendado)</string>
+  <string name="register_username">Registrar nombre de usuario público</string>
+  <string name="register_recommended">Recomendado</string>
   <string name="username_already_taken">Nombre de usuario ya en uso</string>
   <string name="invalid_username">Nombre de usuario inválido</string>
   <string name="unknown_error">Error desconocido. ¡Revisar la conexión a internet!</string>
diff --git a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
index 6007208..bd4ff53 100644
--- a/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es-rAR/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Borrar todo el historial de conversaciones. Esta operación no se puede deshacer.</string>
   <string name="pref_persistNotification_title">Ejecutar en segundo plano</string>
   <string name="pref_persistNotification_summary">Permitir ejecutar en segundo plano para recibir llamadas y mensajes.</string>
+  <!--Plugin-->
 </resources>
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 cf424ca..8ec314c 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
@@ -38,4 +38,5 @@
   <string name="navigation_item_account">Cuenta</string>
   <!--TV-->
   <string name="tv_audio_play">Reproducir</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-es-rMX/strings_preferences.xml b/ring-android/app/src/main/res/values-es-rMX/strings_preferences.xml
index fcf4e4c..45cb22a 100644
--- a/ring-android/app/src/main/res/values-es-rMX/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es-rMX/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_video">Video</string>
+  <!--Plugin-->
 </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 7b1cf28..c36d413 100644
--- a/ring-android/app/src/main/res/values-es/strings.xml
+++ b/ring-android/app/src/main/res/values-es/strings.xml
@@ -106,6 +106,7 @@
   <string name="write_a_message">Escribir un mensaje</string>
   <string name="scan_qr">Escanear código QR</string>
   <string name="ab_action_flipcamera">Cambiar de cámara</string>
+  <string name="ab_action_hidepreview">Ocultar vista previa</string>
   <!--Text messages-->
   <string name="send_message">Enviar mensaje</string>
   <string name="message_sending">Enviando mensaje...</string>
@@ -170,9 +171,10 @@
   <string name="prompt_new_password_repeat">Repite la nueva contraseña</string>
   <string name="account_create_title">Crear una cuenta en Jami</string>
   <string name="prompt_new_username">Ingresa un nuevo nombre de usuario</string>
+  <string name="prompt_hint_username">Nombre de usuario</string>
   <string name="help_password_choose">Elige una contraseña robusta que recuerdes para proteger tu cuenta de Jami.</string>
-  <string name="help_password_enter">Ingresa la contraseña de tu cuenta principal de Jami</string>
-  <string name="help_server_enter">Introduzca la URL del servidor de gestión</string>
+  <string name="help_password_enter">Ingrese la contraseña de su cuenta principal de Jami</string>
+  <string name="help_server_enter">Ingrese la URL del servidor de gestión</string>
   <string name="help_pin_enter">Ingresa el PIN de otra cuenta de Jami configurada. Utiliza la opción \"Exportar cuenta en Jami\" para obtener un PIN.</string>
   <string name="wizard_next">Siguiente</string>
   <string name="wizard_back">Volver</string>
@@ -182,7 +184,7 @@
   <string name="profile_message_warning">Tu perfil solamente se comparte con tus contactos</string>
   <string name="open_the_gallery">Abrir la galería</string>
   <string name="take_a_photo">Tomar una foto</string>
-  <string name="profile_name_hint">Escribe tu nombre (opcional)</string>
+  <string name="profile_name_hint">Escribe tu nombre</string>
   <!--Share fragment-->
   <string name="share_message">Escanear este código con Jami</string>
   <string name="share_message_no_account">Seleccione una cuenta para compartir.</string>
@@ -198,7 +200,7 @@
   <string name="contact_request_title">Nueva solicitud de contacto</string>
   <string name="contact_request_msg">Tienes %1$ssolicitudes de contacto</string>
   <string name="contact_request_account">Para %1$s</string>
-  <string name="no_requests">0 solicitudes de contacto</string>
+  <string name="no_requests">No tienes solicitudes de contacto</string>
   <string name="message_contact_not_trusted_yet">%s no está en sus contactos aún.\n¿Acepta o rechaza esta solicitud de contacto?</string>
   <string name="message_contact_not_trusted">%s no esta en tus contactos.\n¿Agregar un nuevo contacto?</string>
   <!--Send contact requests-->
@@ -206,9 +208,10 @@
   <string name="send_request_title">Enviar una solicitud de contacto</string>
   <string name="send_request_msg">Debe enviar una solicitud de contacto para comunicarse con este usuario. Hasta que su contacto no haya aceptado la solicitud, puede enviar mensajes pero no podrá contestarle.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contactos bloqueados</string>
+  <string name="no_blocked_contact">No hay contactos bloqueados</string>
   <!--Smartlist-->
   <string name="no_contact_request">No se ha enviado ninguna solicitud de contacto</string>
+  <string name="conversation_placeholder">Aún no tenés conversaciones</string>
   <string name="contact_request_sent">Solicitud de contacto enviada</string>
   <string name="start_conversation">¡Comienza la conversación!</string>
   <string name="search_results">Resultados de búsqueda</string>
@@ -251,6 +254,7 @@
   <string name="navigation_item_conversation">Conversaciones</string>
   <string name="navigation_item_contact_request">Solicitudes de contacto</string>
   <string name="navigation_item_account">Cuenta</string>
+  <string name="search_results_public_directory">Directorio público</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">¿Enviar mensaje de audio?</string>
   <string name="tv_send_image_dialog_message">¿Enviar la imagen?</string>
@@ -259,7 +263,25 @@
   <string name="tv_audio_play">Reproducir</string>
   <string name="tv_audio_pause">Pausar</string>
   <string name="tv_dialog_send">Enviar</string>
+  <string name="tv_audio_recording">Grabando...</string>
   <string name="tv_send_text">Enviar texto</string>
   <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-->
+  <string name="wizard_status_recommended">Recomendado</string>
+  <string name="wizard_status_optional">Opcional</string>
+  <string name="wizard_status_required">Requerido</string>
+  <string name="wizard_username_info">Elija un nombre de usuario para su cuenta</string>
+  <string name="wizard_username_button">Elija un nombre de usuario</string>
+  <string name="wizard_username_skip">Omitir elección de nombre de usuario</string>
+  <string name="wizard_password_info">Contraseña de cuenta</string>
+  <string name="wizard_password_placeholder">Elija una contraseña para cifrar la clave de la cuenta en este dispositivo</string>
+  <string name="wizard_password_button">Elija una contraseña</string>
+  <string name="wizard_password_skip">Crear cuenta</string>
+  <string name="wizard_password_switch">Cifrar cuenta con contraseña</string>
+  <string name="wizard_password_warning">Tenga en cuenta que la contraseña no se puede recuperar</string>
+  <string name="wizard_profile_info">Su perfil solamente es compartido comparte con sus contactos</string>
+  <string name="wizard_profile_button">Guardar perfil</string>
+  <string name="wizard_profile_skip">Omitir y hacerlo más tarde</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-es/strings_account.xml b/ring-android/app/src/main/res/values-es/strings_account.xml
index 6d9fb9e..143e505 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
@@ -105,6 +105,9 @@
   <string name="account_credentials_add">Agregar credenciales</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguridad</string>
+  <string name="account_srtp_switch_label">Flujo de medio cifrado (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Habilite SDES para el protocolo de intercambio de claves</string>
+  <string name="account_srtp_rtp_fallback">Retractarse a RTP si falla el cifrado</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usar protocolo TLS</string>
@@ -183,7 +186,8 @@
   <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 publico (recomendado)</string>
+  <string name="register_username">Registrar nombre de usuario público</string>
+  <string name="register_recommended">Recomendado</string>
   <string name="username_already_taken">El nombre de usuario ya está en uso</string>
   <string name="invalid_username">Nombre de usuario no válido</string>
   <string name="unknown_error">Error desconocido. ¡Revisa tu conección a la red!</string>
diff --git a/ring-android/app/src/main/res/values-es/strings_preferences.xml b/ring-android/app/src/main/res/values-es/strings_preferences.xml
index 598e117..5567ed8 100644
--- a/ring-android/app/src/main/res/values-es/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-es/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Limpiar el historial de todas las conversaciones. Esta acción no se puede deshacer.</string>
   <string name="pref_persistNotification_title">Ejecutar en segundo plano</string>
   <string name="pref_persistNotification_summary">Permite ejecutar en segundo plano para recibir llamadas y mensajes.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-et-rEE/strings_preferences.xml b/ring-android/app/src/main/res/values-et-rEE/strings_preferences.xml
index fcf4e4c..45cb22a 100644
--- a/ring-android/app/src/main/res/values-et-rEE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-et-rEE/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_video">Video</string>
+  <!--Plugin-->
 </resources>
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 994bee8..4f0c361 100644
--- a/ring-android/app/src/main/res/values-et/strings.xml
+++ b/ring-android/app/src/main/res/values-et/strings.xml
@@ -35,4 +35,5 @@
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Vestlused</string>
   <!--TV-->
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-et/strings_preferences.xml b/ring-android/app/src/main/res/values-et/strings_preferences.xml
index ee0051f..a5c4da0 100644
--- a/ring-android/app/src/main/res/values-et/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-et/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_clearHistory_title">Kustuta ajalugu</string>
+  <!--Plugin-->
 </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 f2fc459..d06dd7e 100644
--- a/ring-android/app/src/main/res/values-eu/strings.xml
+++ b/ring-android/app/src/main/res/values-eu/strings.xml
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Errepikatu pasahitz berria</string>
   <string name="account_create_title">Sortu Jami kontua</string>
   <string name="prompt_new_username">Sartu erabiltzaile-izen berria</string>
+  <string name="prompt_hint_username">Erabiltzaile-izena</string>
   <string name="help_password_choose">Hautatu gogoratuko duzun pasahitz sendo bat zure Jami kontua babesteko.</string>
-  <string name="help_password_enter">Sortu zure Jami kontuaren pasahitza</string>
-  <string name="help_server_enter">Sartu kudeaketa zerbitzariaren URLa</string>
   <string name="help_pin_enter">Sartu konfiguratutako beste kontu baten PIN kodea. Erabili \"esportatu Jami kontua\" ezaugarria PINa eskuratzeko.</string>
   <string name="wizard_next">Hurrengoa</string>
   <string name="wizard_back">Atzera</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">Zure profila zure kontaktuekin partekatzen da soilik</string>
   <string name="open_the_gallery">Ireki galeria</string>
   <string name="take_a_photo">Atera argazkia</string>
-  <string name="profile_name_hint">Sartu zure izena (aukerazkoa)</string>
   <!--Share fragment-->
   <string name="share_message">Eskaneatu kode hau Jami erabiliz</string>
   <string name="share_message_no_account">Hautatu kontu bat partekatzeko.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Kontaktu-eskaera berria</string>
   <string name="contact_request_msg"> %1$s kontaktu eskaera dituzu</string>
   <string name="contact_request_account">%1$s(r)entzat</string>
-  <string name="no_requests">0 kontaktu-eskaera</string>
   <string name="message_contact_not_trusted_yet">%s ez dago zure kontaktuen artean oraindik.\nKontaktu eskaera hau onartu ala ukatzen duzu?</string>
   <string name="message_contact_not_trusted">%s ez dago zure kontaktuen artean oraindik.\nGehitu kontaktua?</string>
   <!--Send contact requests-->
@@ -205,7 +202,6 @@
   <string name="send_request_title">Bidali kontaktu-eskaera</string>
   <string name="send_request_msg">Kontaktu eskaera bat bidali behar duzu erabiltzaile honekin komunikatzeko. Zure kontaktuak eskaera onartu bitartean, mezuak bidali ahal dizkiozu, baina ezin izango dizu erantzun.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 kontaktu blokeatuta</string>
   <!--Smartlist-->
   <string name="no_contact_request">Ez da kontaktu eskaerarik bidali</string>
   <string name="contact_request_sent">Kontaktu eskaera bidali da</string>
@@ -257,4 +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-->
+  <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 7446f9f..e8f7cd7 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
@@ -119,6 +119,7 @@
   <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>
   <string name="invalid_username">Erabiltzaile-izen baliogabea</string>
   <string name="account_status_connecting">Konektatzen</string>
   <string name="account_status_connection_error">Konexio errorea</string>
diff --git a/ring-android/app/src/main/res/values-eu/strings_preferences.xml b/ring-android/app/src/main/res/values-eu/strings_preferences.xml
index 025e208..55abddb 100644
--- a/ring-android/app/src/main/res/values-eu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-eu/strings_preferences.xml
@@ -23,4 +23,5 @@
   <string name="pref_clearHistory_summary">Garbitu elkarrizketa guztien historiala. Ekintza hau ezin da desegin.</string>
   <string name="pref_persistNotification_title">Aritu bigarren planoan</string>
   <string name="pref_persistNotification_summary">Baimendu bigarren planoan aritzea deiak eta mezuak jasotzeko.</string>
+  <!--Plugin-->
 </resources>
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 c8c74a5..96601b6 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
@@ -105,6 +105,7 @@
   <string name="write_a_message">پیامی بنویسید</string>
   <string name="scan_qr">اسکن کد QR</string>
   <string name="ab_action_flipcamera">چرخاندن دوربین</string>
+  <string name="ab_action_hidepreview">مخفی‌کردن پیش‌نمایش</string>
   <!--Text messages-->
   <string name="send_message">ارسال پیام</string>
   <string name="message_sending">در حال ارسال پیام…</string>
@@ -169,9 +170,8 @@
   <string name="prompt_new_password_repeat">گذرواژه جدید را تکرار کنید</string>
   <string name="account_create_title">ایجاد یک حساب جمی</string>
   <string name="prompt_new_username">نام کاربری جدید را وارد کنید</string>
+  <string name="prompt_hint_username">نام کاربری</string>
   <string name="help_password_choose">برای حفاظت از حساب جمی خود، گذرواژه‌ای قوی را که به خاطر خواهید سپرد، برگزینید.</string>
-  <string name="help_password_enter">گذرواژه حساب جمی خود را وارد کنید</string>
-  <string name="help_server_enter">آدرس URL سرور مدیریت را وارد کن</string>
   <string name="help_pin_enter">پین را از حساب پیکربندی‌شده جمی دیگر وارد کنید. برای به دست آوردن یک پین، از ویژگی «برون‌برد حساب جمی» استفاده کنید.</string>
   <string name="wizard_next">بعدی</string>
   <string name="wizard_back">بازگشت</string>
@@ -181,7 +181,7 @@
   <string name="profile_message_warning">نمایه شما تنها با مخاطبانتان هم‌رسانی می‌شود</string>
   <string name="open_the_gallery">گالری را باز کنید</string>
   <string name="take_a_photo">عکسی بگیرید</string>
-  <string name="profile_name_hint">نام خود را وارد کنید (اختیاری)</string>
+  <string name="profile_name_hint">نام‌تان را بگذارید</string>
   <!--Share fragment-->
   <string name="share_message">این رمز را با جمی اسکن کنید</string>
   <string name="share_message_no_account">لطفا برای هم‌رسانی، حسابی را انتخاب کنید.</string>
@@ -197,7 +197,6 @@
   <string name="contact_request_title"> درخواست مخاطب جدید</string>
   <string name="contact_request_msg">شما‫ %1$s درخواست ارتباط دارید</string>
   <string name="contact_request_account">برای %1$s</string>
-  <string name="no_requests">0 درخواست ارتباط</string>
   <string name="message_contact_not_trusted_yet">%s هنوز در مخاطبان شما نیست.\nآیا این درخواست ارتباط را قبول یا رد می‌کنید؟</string>
   <string name="message_contact_not_trusted">%s در مخاطبان شما نیست.\nمخاطب جدیدی اضافه می‌کنید؟</string>
   <!--Send contact requests-->
@@ -205,7 +204,7 @@
   <string name="send_request_title">ارسال یک درخواست ارتباط</string>
   <string name="send_request_msg">برای رابطه با این کاربر باید یک درخواست ارتباط ارسال کنید. مادامی که مخاطبتان درخواست را نپذیرفته، می‌توانید پیام بفرستید ولی او قادر به پاسخ‌دهی نخواهد بود.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 مخاطب مسدود</string>
+  <string name="no_blocked_contact">مخاطب مسدودی وجود ندارد</string>
   <!--Smartlist-->
   <string name="no_contact_request">هیچ درخواست ارتباطی ارسال نشده</string>
   <string name="contact_request_sent">درخواست ارتباط ارسال شد</string>
@@ -250,6 +249,7 @@
   <string name="navigation_item_conversation">گفتگو‌ها</string>
   <string name="navigation_item_contact_request">درخواست‌های ارتباط</string>
   <string name="navigation_item_account">حساب</string>
+  <string name="search_results_public_directory">فهرست راهنمای عمومی</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">ارسال پیام صوتی؟</string>
   <string name="tv_send_image_dialog_message">ارسال تصویر؟</string>
@@ -258,7 +258,12 @@
   <string name="tv_audio_play">پخش</string>
   <string name="tv_audio_pause">مکث</string>
   <string name="tv_dialog_send">ارسال</string>
+  <string name="tv_audio_recording">در حال ضبط...</string>
   <string name="tv_send_text">ارسال متن</string>
   <string name="tv_send_audio">ارسال صدا</string>
   <string name="tv_send_video">ارسال محتوای رسانه‌ای</string>
+  <string name="conversation_input_speech_hint">چیزی بگویید...</string>
+  <!--WIZARD-->
+  <string name="wizard_password_info">گذرواژه کاربری</string>
+  <string name="wizard_password_skip">ساخت کاربری</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_account.xml
index 66a036f..8070ec4 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">افزودن اعتبار‌نامه‌ها</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">امنیت</string>
+  <string name="account_srtp_switch_label">رمزنگاری جریان های مدیا (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">استفاده از جابه‌جایی TLS</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">حساب SIP ثبت شد</string>
   <string name="account_sip_success_message">شما حساب SIP خود را با موفقیت ثبت کردید.</string>
   <string name="account_sip_register_anyway">به هر حال ثبت کنید</string>
-  <string name="account_link_device">اتصال از دستگاه دیگر</string>
   <string name="account_link_button">اتصال از طریق شبکه</string>
   <string name="account_link_archive_button">اتصال از طریق پشتیبان</string>
   <string name="account_link_prompt_pin">پین را وارد کنید</string>
@@ -183,7 +183,7 @@
   <string name="register_name">ثبت نام</string>
   <string name="trying_to_register_name">در حال تلاش برای ثبت نام</string>
   <string name="registered_username">نام کاربری ثبت‌شده</string>
-  <string name="register_username">ثبت نام کاربری عمومی (توصیه‌شده)</string>
+  <string name="register_username">ثبت نام‌کاربری عمومی</string>
   <string name="username_already_taken">نام کاربری قبلا گرفته شده است</string>
   <string name="invalid_username">نام کاربری نامعتبر</string>
   <string name="unknown_error">خطای نامشخص. لطفا اتصال شبکه خود را بررسی کنید!</string>
diff --git a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
index fed6cb3..96667ea 100644
--- a/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fa-rIR/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">پاک‌سازی تمام سابقه گفت‌وگوها. این کار قابل بازگشت نیست.</string>
   <string name="pref_persistNotification_title">اجرا در پس‌زمینه</string>
   <string name="pref_persistNotification_summary">اجازه اجرا در پس‌زمینه برای دریافت تماس‌ها و پیام‌ها.</string>
+  <!--Plugin-->
 </resources>
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 bf79f9d..782b186 100644
--- a/ring-android/app/src/main/res/values-fi/strings.xml
+++ b/ring-android/app/src/main/res/values-fi/strings.xml
@@ -29,8 +29,9 @@
   <!--Sections-->
   <string name="menu_item_contact_request">Yhteyspyynnöt</string>
   <string name="menu_item_accounts">Hallitse tunnuksia</string>
-  <string name="menu_item_account">Hallitse tiliä</string>
+  <string name="menu_item_account">Hallitse tunnusta</string>
   <string name="menu_item_settings">Asetukset</string>
+  <string name="menu_item_plugin_list">Lisäosien asetukset</string>
   <string name="menu_item_share">Jaa yhteystietoni</string>
   <string name="menu_item_about">Tietoa Jamista</string>
   <!--Dialing Fragment-->
@@ -93,6 +94,7 @@
   <string name="action_call_accept">Vastaanota puhelu</string>
   <string name="action_call_decline">Kieltäydy</string>
   <string name="action_call_mic_mute">Mykistä mikrofoni</string>
+  <string name="action_load_plugin">Lataa lisäosa</string>
   <string name="ab_action_speakerphone">Kaiutin päälle</string>
   <string name="ab_action_contact_add">Lisää yhteystietoihin</string>
   <string name="ab_action_contact_add_question">Lisää yhteystietoihin?</string>
@@ -133,7 +135,7 @@
   <string name="permission_dialog_write_call_log_message">Jami tarvitsee kirjoitusoikeudet soittolokiin tätä toimintoa varten.</string>
   <!--QRCode Scan-->
   <string name="scan_qr_account_message">Skannaa lisättävän tunnuksen QR-koodi.</string>
-  <string name="title_activity_qrcode">Jaa tilini</string>
+  <string name="title_activity_qrcode">Jaa tunnukseni</string>
   <string name="error_scan_no_camera_permissions">QR-skanneri tarvitsee kameran käyttöoikeuden toimiakseen.</string>
   <string name="tab_code">Minun koodini</string>
   <string name="tab_scan">Skannaa koodi</string>
@@ -168,11 +170,12 @@
   <string name="prompt_new_password">Uusi salasana</string>
   <string name="prompt_new_password_optional">Uusi salasana (vaihtoehtoinen)</string>
   <string name="prompt_new_password_repeat">Toista uusi salasana</string>
-  <string name="account_create_title">Tee Jami-tili</string>
+  <string name="account_create_title">Luo Jami-tili</string>
   <string name="prompt_new_username">Syötä uusi käyttäjänimi</string>
+  <string name="prompt_hint_username">Käyttäjänimi</string>
   <string name="help_password_choose">Valitse muistettava, vahva salasana jota käytät Jami-tilisi suojaamiseen.</string>
-  <string name="help_password_enter">Syötä pääasiallisen Jami-tilisi salasana</string>
-  <string name="help_server_enter">Kirjoita hallintapalvelimen verkko-osoite</string>
+  <string name="help_password_enter">Syötä pääasiallisen Jami-tilisi salasana.</string>
+  <string name="help_server_enter">Kirjoita hallintapalvelimen verkko-osoite.</string>
   <string name="help_pin_enter">Anna PIN-koodi toiselta määritetyltä Jami-tililtä. Käytä \"vie Jami-tili\" -ominaisuutta saadaksesi PIN-koodi.</string>
   <string name="wizard_next">Seuraava</string>
   <string name="wizard_back">Takaisin</string>
@@ -182,7 +185,7 @@
   <string name="profile_message_warning">Profiilisi jaetaan vain yhteystietojesi kanssa</string>
   <string name="open_the_gallery">Avaa valokuvat</string>
   <string name="take_a_photo">Ota valokuva</string>
-  <string name="profile_name_hint">Anna nimesi (valinnainen)</string>
+  <string name="profile_name_hint">Kirjoita nimesi</string>
   <!--Share fragment-->
   <string name="share_message">Skannaa tämä koodi Jamilla</string>
   <string name="share_message_no_account">Valitse jaettava tili.</string>
@@ -198,7 +201,7 @@
   <string name="contact_request_title">Uusi yhteyspyyntö</string>
   <string name="contact_request_msg">Sinulla on %1$s yhteyspyyntöjä</string>
   <string name="contact_request_account">%1$s:tä</string>
-  <string name="no_requests">0 yhteyspyyntöä</string>
+  <string name="no_requests">Sinulla ei ole yhteyspyyntöjä</string>
   <string name="message_contact_not_trusted_yet">%s ei ole vielä yhteystiedoissasi.\nHaluatko hyväksyä tai hylätä tämän yhteyspyynnön?</string>
   <string name="message_contact_not_trusted">%s ei ole yhteystiedoissasi.\nLisää uusi yhteyshenkilö?</string>
   <!--Send contact requests-->
@@ -206,9 +209,10 @@
   <string name="send_request_title">Lähetä yhteyspyyntö</string>
   <string name="send_request_msg">Sinun on lähetettävä yhteyspyyntö, jotta voit olla yhteydessä tähän käyttäjään. Niin kauan kuin yhteystietosi ei ole käsitellyt pyyntöä, voit lähettää viestejä, mutta hän ei voi vastata sinulle.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 estettyä yhteystietoa</string>
+  <string name="no_blocked_contact">EI estettyjä yhteystietoja</string>
   <!--Smartlist-->
   <string name="no_contact_request">Yhteydenottopyyntöä ei lähetetty</string>
+  <string name="conversation_placeholder">Sinulla ei ole vielä keskusteluja.</string>
   <string name="contact_request_sent">Yhteydenottopyyntö lähetetty</string>
   <string name="start_conversation">Aloita keskustelu</string>
   <string name="search_results">Hakutulokset</string>
@@ -265,4 +269,20 @@
   <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-->
+  <string name="wizard_status_recommended">Suositus</string>
+  <string name="wizard_status_optional">Valinnainen</string>
+  <string name="wizard_status_required">Vaaditaan</string>
+  <string name="wizard_username_info">Valitse tilillesi käyttäjänimi</string>
+  <string name="wizard_username_button">Valitse käyttäjänimi</string>
+  <string name="wizard_username_skip">Ohita käyttäjänimen valitseminen</string>
+  <string name="wizard_password_info">Tilin salasana</string>
+  <string name="wizard_password_placeholder">Valitse salasana, jolla tiliavain salataan tässä laitteessa</string>
+  <string name="wizard_password_button">Valitse salasana</string>
+  <string name="wizard_password_skip">Luo tili</string>
+  <string name="wizard_password_switch">Salaa tili salasanalla</string>
+  <string name="wizard_password_warning">Huomaa, että salasanaa ei voi palauttaa</string>
+  <string name="wizard_profile_info">Profiili jaetaan vain yhteystietojen kanssa</string>
+  <string name="wizard_profile_button">Tallenna profiili</string>
+  <string name="wizard_profile_skip">Ohita ja tee tämä myöhemmin</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings_account.xml b/ring-android/app/src/main/res/values-fi/strings_account.xml
index 4a4a0e9..38fa616 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
@@ -12,7 +12,7 @@
   <string name="prompt_hostname">Yhteysosoite</string>
   <string name="prompt_username">Käyttäjänimi</string>
   <string name="prompt_password">Salasana</string>
-  <string name="action_create">Luo tili</string>
+  <string name="action_create">Luo tunnus</string>
   <string name="action_create_short">Luo</string>
   <string name="action_register">Rekistöröi</string>
   <string name="action_settings">Asetukset</string>
@@ -21,12 +21,12 @@
   <string name="dialog_wait_create_details">Odota kunnes tunnuksesi on lisätty...</string>
   <string name="dialog_wait_update">Päivitetään tiliä</string>
   <string name="dialog_wait_update_details">Odota, kunnes uusi tilisi päivitetään...</string>
-  <string name="dialog_warn_ip2ip_account_title">Luo tyhjä SIP tunnus?</string>
-  <string name="dialog_warn_ip2ip_account_message">Olet luomassa SIP tunnusta epäkelvolla yhteysosoitteella, pystyt tekemään ja vastaanottamaan vain IP-puheluita. Voit muokata tunnustasi myöhemmin.</string>
+  <string name="dialog_warn_ip2ip_account_title">Luo tyhjä SIP-tunnus?</string>
+  <string name="dialog_warn_ip2ip_account_message">Olet luomassa SIP-tunnusta epäkelvolla yhteysosoitteella, pystyt tekemään ja vastaanottamaan vain IP-puheluita. Voit muokata tunnustasi myöhemmin.</string>
   <string name="account_type_ip2ip">IP-tunnus</string>
-  <string name="help_ring">Jamin tunnuksella tavoitat ihmiset turvalliseseti hajautetun verkon kautta.</string>
-  <string name="help_sip_title">Lisää SIP tunnuksesi</string>
-  <string name="help_sip">Määritä olemassa oleva SIP tunnus.</string>
+  <string name="help_ring">Jamin tunnuksella tavoitat ihmiset turvallisesti vertaisverkossa täysin hajautetun verkoston kautta.</string>
+  <string name="help_sip_title">Lisää SIP-tunnuksesi</string>
+  <string name="help_sip">Määritä olemassa oleva SIP-tunnus.</string>
   <string name="create_sip_account">Lisää SIP-tunnus</string>
   <!--Strings related to account deletion-->
   <string name="account_delete_dialog_title">Poistetaanko tunnus?</string>
@@ -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-tiliin linkitetyt laitteet</string>
+  <string name="normal_devices_titles">Tähän Jami-tunnukseen 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>
@@ -44,7 +44,7 @@
   <string name="account_device_revocation_error_unknown">Tuntematon virhe.</string>
   <string name="account_password_change">Vaihda salasana</string>
   <string name="account_password_set">Aseta salasana</string>
-  <string name="account_password_change_wait_message">Tilin salasanan vaihtaminen</string>
+  <string name="account_password_change_wait_message">Tunnuksen salasanan vaihtaminen</string>
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">Yleiset</string>
   <string name="account_basic_category">Yleiset asetukset</string>
@@ -103,6 +103,9 @@
   <string name="account_credentials_add">Lisää käyttöoikeudet</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Turvallisuus</string>
+  <string name="account_srtp_switch_label">Salattu mediavirta (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Ota SDES käyttöön avaimien vaihdossa</string>
+  <string name="account_srtp_rtp_fallback">Varalla RTP jos SRTP epäonnistuu</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Käytä TLS:ää</string>
@@ -129,23 +132,23 @@
   <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">Tiliä ei voitu viedä verkkoon. Tarkista yhteys.</string>
+  <string name="account_export_end_network_message">Tunnusta ei voitu viedä verkkoon. Tarkista yhteys.</string>
   <string name="account_export_end_error_title">Virhe</string>
-  <string name="account_export_end_error_message">Tiliä ei voitu viedä. Tapahtui tuntematon virhe.</string>
+  <string name="account_export_end_error_message">Tunnusta ei voitu viedä. Tapahtui tuntematon virhe.</string>
   <string name="account_enter_password">Syötä salasana</string>
   <string name="account_share_body">Ota minuun yhteyttä \'%1$s\' Jamin hajautetun viestintäalustan avulla: %2$s</string>
-  <string name="account_share_body_with_username">Ota minuun yhteyttä \'%1$s\' tai minun julkisella nimellä \'%2$s\' Jamin hajautetussa viestinässä: %3$s</string>
+  <string name="account_share_body_with_username">Ota minuun yhteyttä \'%1$s\' tai minun julkisella käyttäjänimellä \'%2$s\' Jamin hajautetulla viestintäalustalla: %3$s</string>
   <string name="account_contact_me">Ota minuun yhteyttä Jamilla !</string>
   <string name="update_account">Päivitä tili</string>
   <string name="account_migration">Jami-tilisi voidaan päivittää.\nAnna salasanasi.</string>
   <string name="ring_account">Jami-tili</string>
   <string name="ring_account_identity">Tunnistetiedot</string>
   <string name="account_migration_title_dialog">Tilin siirto</string>
-  <string name="account_migration_message_dialog">Tilisi on päivitettävä. Haluatko siirtyä hallintaikkunaan tämän toiminnon suorittamiseksi?</string>
+  <string name="account_migration_message_dialog">Tilisi on päivitettävä. Haluatko siirtyä käyttäjäasetuksiin tämän toiminnon suorittamiseksi?</string>
   <string name="account_update_needed">Päivitys tarvitaan</string>
   <string name="account_cannot_be_found_title">Tiliä ei löydy</string>
   <string name="account_cannot_be_found_message">Tiliä ei löytynyt Jami-verkosta.\nVarmista, että se on viety Ringissä aiemmin luodusta laitteesta ja että annetut tunnistetiedot ovat oikein.</string>
-  <string name="account_sip_cannot_be_registered_message">Voit jatkaa tilin luontia tai muokata tietojasi täällä. Tämä on edelleen mahdollista tilin asetuksissa myöhemmin.</string>
+  <string name="account_sip_cannot_be_registered_message">Voit jatkaa tilin luontia tai muokata tietojasi täällä. Tämä on edelleen mahdollista Tilin asetuksissa myöhemmin.</string>
   <string name="account_no_network_title">Verkkoon ei saada yhteyttä</string>
   <string name="account_no_network_message">Tiliä ei voitu lisätä, koska Jami ei voinut muodostaa yhteyttä hajautettuun verkkoon. Tarkista laitteen yhteydet.</string>
   <string name="account_device_added_title">Tili lisätty laitteelle</string>
@@ -156,17 +159,17 @@
   <string name="account_sip_success_title">Sip-tili rekisteröity</string>
   <string name="account_sip_success_message">Olet rekisteröinyt Sip-tilisi onnistuneesti.</string>
   <string name="account_sip_register_anyway">Rekisteröidy kuitenkin</string>
-  <string name="account_link_device">Yhteyden muodostaminen toisesta laitteesta</string>
+  <string name="account_link_device">Yhdistä toisesta laitteesta</string>
   <string name="account_link_button">Yhteyden muodostaminen verkosta</string>
   <string name="account_link_archive_button">Yhteyden muodostaminen varmuuskopiosta</string>
   <string name="account_link_prompt_pin">Syötä PIN-koodi</string>
-  <string name="account_new_button">Tee Jami-tili</string>
+  <string name="account_new_button">Luo Jami-tili</string>
   <string name="account_link_export_button">Linkitä toinen laite tähän tiliin</string>
   <string name="account_link_export_info">Jos haluat käyttää tätä tiliä muissa laitteissa, sinun on ensin siirrettävä se Jamiin. Tämä luo PIN-koodin, joka on syötetään uuteen laitteeseen tilin määrittämiseksi. PIN-koodi on voimassa 10 minuuttia.</string>
   <string name="account_start_export_button">Luo PIN-koodi</string>
   <string name="account_end_export_button">sulje</string>
   <string name="account_end_export_infos">PIN-koodisi on:\n\n%%\n\nProsessin viimeistelemiseksi sinun on avattava Jami uudessa laitteessa. Luo uusi tili \"linkitä tämä laite tiliin\". PIN-koodi on voimassa 10 minuuttia.</string>
-  <string name="account_link_export_info_light">Jos haluat käyttää tätä tiliä muissa laitteissa, sinun on ensin siirrettävä se Jamiin. Tämä luo PIN-koodin, joka on syötetään uuteen laitteeseen tilin määrittämiseksi. PIN-koodi on voimassa 10 minuuttia.</string>
+  <string name="account_link_export_info_light">Jos haluat käyttää tätä tunnusta muissa laitteissa, sinun on ensin siirrettävä se Jamiin. Tämä luo PIN-koodin, joka on syötetään uuteen laitteeseen tunnuksen määrittämiseksi. PIN-koodi on voimassa 10 minuuttia.</string>
   <string name="account_export_title">Laitteiden lisääminen</string>
   <string name="account_connect_server_button">Yhteyden muodostaminen hallintapalvelimeen</string>
   <string name="account_connect_button">Yhdistä</string>
@@ -181,7 +184,8 @@
   <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 (suositus)</string>
+  <string name="register_username">Rekisteröi julkinen käyttäjänimi</string>
+  <string name="register_recommended">Suositus</string>
   <string name="username_already_taken">käyttäjätunnus on varattu</string>
   <string name="invalid_username">Käyttäjätunnus ei kelpaa</string>
   <string name="unknown_error">Tuntematon virhe. Tarkista verkkoyhteytesi!</string>
@@ -194,8 +198,8 @@
   <string name="account_status_error">Virhe</string>
   <!--Create account-->
   <string name="account_creation_home">Tervetuloa Jamiin</string>
-  <string name="account_creation_profile">Tee profiilisi</string>
-  <string name="account_creation_ring">Luo Jami tunnuksesi</string>
+  <string name="account_creation_profile">Luo profiilisi</string>
+  <string name="account_creation_ring">Luo Jami-tilisi</string>
   <string name="account_link_title">Linkitä tämä laite</string>
   <string name="account_sip_cannot_be_registered">Tiliä ei voi rekisteröidä</string>
   <!--Edit profile-->
@@ -208,7 +212,7 @@
   <string name="revoke_device_wait_title">Odota hetki...</string>
   <string name="revoke_device_wait_message">Laitteen peruuttaminen</string>
   <string name="rename_device_title">Nimeä tämä laite uudelleen</string>
-  <string name="rename_device_message">Valitse uusi nimi, joka tunnistaa tämän laitteen Jami-tililläsi</string>
+  <string name="rename_device_message">Valitse uusi nimi, josta tunnistaa tämän laitteen Jami-tililläsi</string>
   <string name="rename_device_button">Nimeä laite uudelleen</string>
   <string name="account_rename_device_hint">Valitse laitteen uusi nimi</string>
   <string name="account_device_name_empty">Laitteen nimi ei voi olla tyhjä</string>
diff --git a/ring-android/app/src/main/res/values-fi/strings_content_description.xml b/ring-android/app/src/main/res/values-fi/strings_content_description.xml
index f07ac5d..dabcc7a 100644
--- a/ring-android/app/src/main/res/values-fi/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Yhteystiedon kuva</string>
   <string name="dial_numeric_pad">Numeeriset valintanäppäimet</string>
   <string name="contact_unblock">Poista esto</string>
+  <string name="video_plugins">Video lisäosat</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fi/strings_preferences.xml b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
index 9d43958..a8c773a 100644
--- a/ring-android/app/src/main/res/values-fi/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fi/strings_preferences.xml
@@ -24,4 +24,17 @@
   <string name="pref_clearHistory_summary">Tyhjennä koko keskusteluhistoria. Tätä toimintoa ei voi peruuttaa.</string>
   <string name="pref_persistNotification_title">Suorita taustalla</string>
   <string name="pref_persistNotification_summary">Salli tausta-ajo vastaanottamaan puheluita ja viestejä.</string>
+  <!--Plugin-->
+  <string name="pref_plugins_title">Lisäosat</string>
+  <string name="pref_plugins_summary">Salli lisäosat ja aseta niiden parametrit</string>
+  <string name="fab_plugins_add">Lisää uusi lisäosa</string>
+  <string name="plugin_uninstall_title">Poista lisäosa ?</string>
+  <string name="plugin_reset_preferences">Nollaa lisäosan asetukset</string>
+  <string name="plugin_reset_preferences_summary">Lisäosasi asetukset palautetaan oletukseksi</string>
+  <string name="plugin_reset_preferences_ask">Haluatko palauttaa lisäosan asetukset?</string>
+  <string name="plugin_successfully_installed">Lisäosa <b>%1$s</b> asennettu onnistuneesti</string>
+  <string name="plugin_install_failure">Lisäosan asennus epäonnistui: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">Sinulla on uudempi versio: <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Sinulla on sama versio <b>%1$s</b> asennettuna</string>
+  <string name="plugin_force_install">pakota \n asennus</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings.xml b/ring-android/app/src/main/res/values-fr-rBE/strings.xml
index 997a286..a1cf399 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
@@ -16,6 +16,8 @@
   <!--Notifications-->
   <!--Call Fragment-->
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
+  <string name="hist_contact_added">Contact ajouté</string>
+  <string name="hist_invitation_received">Invitation reçue</string>
   <!--Text messages-->
   <string name="message_failed">Échec</string>
   <!--MediaPreferenceFragment-->
@@ -28,6 +30,7 @@
   <string name="conversation_action_block_this">Bloquer le contact</string>
   <!--Contacts-->
   <string name="account_create_title">Créer un compte Jami</string>
+  <string name="wizard_next">Suivant</string>
   <string name="wizard_skip">Passer</string>
   <!--MenuHeaderView-->
   <string name="profile">Profil</string>
@@ -39,12 +42,15 @@
   <!--Send contact requests-->
   <string name="send_request_button">Envoyer</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">Aucun contact bloqué</string>
   <!--Smartlist-->
   <string name="tv_contact_row_header">Contacts</string>
   <!--File Transfer-->
   <string name="menu_message_copy">Copier</string>
   <!--Bottom Navigation-->
+  <string name="navigation_item_conversation">Conversations</string>
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
   <string name="tv_dialog_send">Envoyer</string>
+  <!--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 55f1e05..6c3bbee 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
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account edition screen-->
+  <string name="ic_blacklist_menu">Contacts bloqués</string>
   <!--Strings related to account creation-->
   <string name="action_create_short">Créer</string>
   <string name="action_register">Enregistrer</string>
@@ -29,7 +30,9 @@
   <string name="account_enter_password">Entrez votre mot de passe</string>
   <string name="account_new_button">Créer un compte Jami</string>
   <!--Name registration-->
+  <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
+  <string name="account_status_unknown">Inconnu</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
   <string name="account_creation_profile">Créez votre profil</string>
diff --git a/ring-android/app/src/main/res/values-fr-rBE/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rBE/strings_preferences.xml
index feba9db..69a6c6e 100644
--- a/ring-android/app/src/main/res/values-fr-rBE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rBE/strings_preferences.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="pref_category_contacts">Contacts</string>
   <string name="pref_category_video">Vidéo</string>
+  <!--Plugin-->
 </resources>
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 83ebbec..fcea863 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
@@ -62,6 +62,8 @@
   <string name="action_call_decline">Refuser</string>
   <string name="ab_action_speakerphone">Activer le haut-parleur</string>
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
+  <string name="hist_contact_added">Contact ajouté</string>
+  <string name="hist_invitation_received">Invitation reçue</string>
   <string name="ab_action_audio_call">Appel audio</string>
   <string name="ab_action_video_call">Appel vidéo</string>
   <string name="ab_action_change_screen_orientation">Modifier l\'orientation de l\'écran</string>
@@ -103,6 +105,7 @@
   <string name="prompt_new_password_repeat">Répéter le nouveau mot de passe</string>
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="prompt_new_username">Entrer un nouveau nom d\'utilisateur</string>
+  <string name="prompt_hint_username">Nom d\'utilisateur</string>
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Précédent</string>
   <string name="wizard_skip">Passer</string>
@@ -111,7 +114,6 @@
   <string name="profile_message_warning">Votre profil est partagé avec vos contacts uniquement</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
   <string name="take_a_photo">Prendre un photo.</string>
-  <string name="profile_name_hint">Entrer votre nom (optionnel)</string>
   <!--Share fragment-->
   <string name="share_message_no_account">S\'il vous plaît, sélectionnez un compte à partager.</string>
   <string name="share_your_account_information">Partager mes informations de contact</string>
@@ -125,12 +127,11 @@
   <string name="contact_request_title">Nouvelle demande de contact</string>
   <string name="contact_request_msg">Vous avez %1$s demande de contacts</string>
   <string name="contact_request_account">Pour %1$s</string>
-  <string name="no_requests">0 demande de contact</string>
   <!--Send contact requests-->
   <string name="send_request_button">Envoyer</string>
   <string name="send_request_title">Envoyer une demande de contact</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contact bloqué</string>
+  <string name="no_blocked_contact">Aucun contact bloqué</string>
   <!--Smartlist-->
   <string name="no_contact_request">Aucune demande de contact n\'a été envoyée</string>
   <string name="contact_request_sent">Demande de contact envoyée</string>
@@ -151,4 +152,6 @@
   <string name="tv_audio_play">Jouer</string>
   <string name="tv_audio_pause">Pause</string>
   <string name="tv_dialog_send">Envoyer</string>
+  <!--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 f57e760..5f82f14 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
@@ -140,7 +140,7 @@
   <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">Créer un nom d\'utilisateur publique (recommandé)</string>
+  <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
   <string name="username_already_taken">Nom d\'utilisateur non-disponible</string>
   <string name="invalid_username">Nom d\'utilisateur invalide</string>
   <string name="looking_for_username_availability">Vérification de la disponibilité du nom d\'utilisateur...</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
index 9f0fcd6..68511fc 100644
--- a/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
@@ -8,4 +8,5 @@
   <string name="pref_mobileData_title">Données mobiles</string>
   <string name="pref_systemContacts_title">Utiliser les contacts du système</string>
   <string name="pref_clearHistory_title">Effacer l\'historique</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings.xml b/ring-android/app/src/main/res/values-fr-rCH/strings.xml
index 997a286..a1cf399 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
@@ -16,6 +16,8 @@
   <!--Notifications-->
   <!--Call Fragment-->
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
+  <string name="hist_contact_added">Contact ajouté</string>
+  <string name="hist_invitation_received">Invitation reçue</string>
   <!--Text messages-->
   <string name="message_failed">Échec</string>
   <!--MediaPreferenceFragment-->
@@ -28,6 +30,7 @@
   <string name="conversation_action_block_this">Bloquer le contact</string>
   <!--Contacts-->
   <string name="account_create_title">Créer un compte Jami</string>
+  <string name="wizard_next">Suivant</string>
   <string name="wizard_skip">Passer</string>
   <!--MenuHeaderView-->
   <string name="profile">Profil</string>
@@ -39,12 +42,15 @@
   <!--Send contact requests-->
   <string name="send_request_button">Envoyer</string>
   <!--Blacklist-->
+  <string name="no_blocked_contact">Aucun contact bloqué</string>
   <!--Smartlist-->
   <string name="tv_contact_row_header">Contacts</string>
   <!--File Transfer-->
   <string name="menu_message_copy">Copier</string>
   <!--Bottom Navigation-->
+  <string name="navigation_item_conversation">Conversations</string>
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
   <string name="tv_dialog_send">Envoyer</string>
+  <!--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 55f1e05..6c3bbee 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
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account edition screen-->
+  <string name="ic_blacklist_menu">Contacts bloqués</string>
   <!--Strings related to account creation-->
   <string name="action_create_short">Créer</string>
   <string name="action_register">Enregistrer</string>
@@ -29,7 +30,9 @@
   <string name="account_enter_password">Entrez votre mot de passe</string>
   <string name="account_new_button">Créer un compte Jami</string>
   <!--Name registration-->
+  <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
+  <string name="account_status_unknown">Inconnu</string>
   <!--Create account-->
   <string name="account_creation_home">Bienvenu sur Jami</string>
   <string name="account_creation_profile">Créez votre profil</string>
diff --git a/ring-android/app/src/main/res/values-fr-rCH/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rCH/strings_preferences.xml
index feba9db..69a6c6e 100644
--- a/ring-android/app/src/main/res/values-fr-rCH/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rCH/strings_preferences.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="pref_category_contacts">Contacts</string>
   <string name="pref_category_video">Vidéo</string>
+  <!--Plugin-->
 </resources>
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 5321dc7..f5d4284 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
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Saisir à nouveau le mot de passe</string>
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="prompt_new_username">Saisir un nouveau nom d\'utilisateur</string>
+  <string name="prompt_hint_username">nom d\'utilisateur</string>
   <string name="help_password_choose">Choisir un mot de passe robuste dont vous vous rappellerez pour protéger votre compte Jami.</string>
-  <string name="help_password_enter">Entrez le mot de passe de votre compte Jami principal</string>
-  <string name="help_server_enter">Entrez l\'URL du serveur de gestion</string>
   <string name="help_pin_enter">Saisissez le code PIN d\'un autre compte Jami configuré. Utilisez la fonction \"exporter le compte Jami\" pour obtenir un code PIN.</string>
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Retour</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
   <string name="take_a_photo">Prendre une photo</string>
-  <string name="profile_name_hint">Entrez votre nom (optionnel)</string>
   <!--Share fragment-->
   <string name="share_message">Numériser ce code avec Jami</string>
   <string name="share_message_no_account">Sélectionnez un compte à partager.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Nouvelle demande de contact</string>
   <string name="contact_request_msg">Vous avez %1$s demandes de contact</string>
   <string name="contact_request_account">Pour %1$s</string>
-  <string name="no_requests">0 demande de contact</string>
   <string name="message_contact_not_trusted_yet">%s n\'est pas encore dans vos contacts.\nAcceptez-vous ou non cette demande de contact ?</string>
   <string name="message_contact_not_trusted">%s n\'est pas dans vos contacts.\nAjouter un nouveau contact ?</string>
   <!--Send contact requests-->
@@ -205,7 +202,7 @@
   <string name="send_request_title">Envoyer une demande de contact</string>
   <string name="send_request_msg">Vous devez envoyer une demande de contact pour communiquer avec cet utilisateur. Tant que votre contact n\'aura pas accepté la demande, vous pouvez lui envoyer des messages mais il ne pourra pas y répondre.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contact bloqué</string>
+  <string name="no_blocked_contact">Aucun contact bloqué</string>
   <!--Smartlist-->
   <string name="no_contact_request">Aucune demande de contact envoyée</string>
   <string name="contact_request_sent">Demande de contact envoyée</string>
@@ -257,4 +254,5 @@
   <string name="tv_dialog_send">Envoyer</string>
   <string name="tv_send_text">Envoyer du texte</string>
   <string name="tv_send_audio">Envoyer de l\'audio</string>
+  <!--WIZARD-->
 </resources>
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 52403be..e170dac 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
@@ -2,6 +2,7 @@
 <resources>
   <!--Strings related to account edition screen-->
   <string name="ic_delete_menu">Supprimer</string>
+  <string name="ic_blacklist_menu">Contacts bloqués</string>
   <!--Strings related to account creation-->
   <string name="prompt_hostname">nom d\'hôte</string>
   <string name="prompt_username">nom d\'utilisateur</string>
@@ -45,6 +46,7 @@
   <string name="account_link_export_button">Connecter un autre appareil à ce compte</string>
   <string name="account_connect_prompt_username">nom d\'utilisateur</string>
   <!--Name registration-->
+  <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
   <string name="account_status_unknown">Inconnu</string>
   <string name="account_status_error">Erreur</string>
diff --git a/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml b/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml
index 2456be9..59185c3 100644
--- a/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr-rFR/strings_preferences.xml
@@ -17,4 +17,5 @@
   <string name="pref_clearHistory_title">Vider l\'historique</string>
   <string name="pref_persistNotification_title">Exécuter en tâche de fond</string>
   <string name="pref_persistNotification_summary">Autorisé l\'exécution en tâche de fond pour recevoir les appels et les messages.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings.xml b/ring-android/app/src/main/res/values-fr/strings.xml
index 3c8bd3c..322b931 100644
--- a/ring-android/app/src/main/res/values-fr/strings.xml
+++ b/ring-android/app/src/main/res/values-fr/strings.xml
@@ -8,12 +8,12 @@
   <string name="copyright_section">Copyright</string>
   <string name="contribute_section">Contribuez</string>
   <string name="version_section">Version</string>
-  <string name="no_email_app_installed">Application d\'envoi de courriel non-trouvée, installez-en une pour envoyer votre rapport</string>
+  <string name="no_email_app_installed">Application d\'envoi de courriel non trouvée, installez-en une pour envoyer votre rapport</string>
   <string name="no_browser_app_installed">Aucun navigateur internet trouvé. Vous devez en installer un afin de voir cette page</string>
   <string name="email_chooser_title">Envoi du courriel en utilisant …</string>
   <string name="website_chooser_title">Voir le site web avec...</string>
   <string name="license">Ce logiciel est offert \"tel quel\", sans aucune garantie. Pour plus d\'informations,  voir <u>GNU General Public License version 3 or later</u></string>
-  <string name="description">Jami est un logiciel libre de communication universel qui respecte la vie privée et l\'intimité de ses utilisateurs.</string>
+  <string name="description">Jami est un logiciel libre de communication universel qui respecte les libertés et la vie privée de ses utilisateurs.</string>
   <string name="credits">Crédits</string>
   <string name="call_service_description">Ce service est nécessaire pour que vos appels continuent de fonctionner en arrière-plan. Il ne fonctionne que pendant les appels.</string>
   <string name="data_transfer_service_description">Ce service est nécessaire pour afficher les notifications persistantes pendant un transfert de fichier. Il ne fonctionne que pendant le transfert de fichiers.</string>
@@ -31,6 +31,7 @@
   <string name="menu_item_accounts">Gérer les comptes</string>
   <string name="menu_item_account">Gestion du compte</string>
   <string name="menu_item_settings">Paramètres</string>
+  <string name="menu_item_plugin_list">Paramètres des modules d\'extension</string>
   <string name="menu_item_share">Partager mon contact</string>
   <string name="menu_item_about">À propos de Jami</string>
   <!--Dialing Fragment-->
@@ -93,6 +94,7 @@
   <string name="action_call_accept">Répondre</string>
   <string name="action_call_decline">Décliner</string>
   <string name="action_call_mic_mute">Rendre votre microphone muet</string>
+  <string name="action_load_plugin">Charger le module d\'extension</string>
   <string name="ab_action_speakerphone">Activer le haut-parleur</string>
   <string name="ab_action_contact_add">Ajouter aux contacts</string>
   <string name="ab_action_contact_add_question">Ajouter aux contacts ?</string>
@@ -105,6 +107,7 @@
   <string name="write_a_message">Ecrire un message</string>
   <string name="scan_qr">Scanner un code QR</string>
   <string name="ab_action_flipcamera">Changer de caméra</string>
+  <string name="ab_action_hidepreview">Masquer l\'aperçu</string>
   <!--Text messages-->
   <string name="send_message">Envoyer le message</string>
   <string name="message_sending">Envoi du message</string>
@@ -169,9 +172,10 @@
   <string name="prompt_new_password_repeat">Confirmez le mot de passe</string>
   <string name="account_create_title">Créer un compte Jami</string>
   <string name="prompt_new_username">Entrez un nouveau nom d\'utilisateur</string>
+  <string name="prompt_hint_username">Nom d\'utilisateur</string>
   <string name="help_password_choose">Pour protéger votre compte Jami, choisissez un mot de passe fort dont vous vous souviendrez.</string>
   <string name="help_password_enter">Saisissez le mot de passe du compte Jami de référence </string>
-  <string name="help_server_enter">Entrer l\'URL du serveur d\'entreprise</string>
+  <string name="help_server_enter">Adresse du serveur de gestion Jami</string>
   <string name="help_pin_enter">Entrez le NIP obtenu en configurant un autre compte Jami . Utilisez la fonction \"exportez un compte sur Jami\" pour obtenir un NIP.</string>
   <string name="wizard_next">Suivant</string>
   <string name="wizard_back">Précédent</string>
@@ -181,7 +185,7 @@
   <string name="profile_message_warning">Votre profil n\'est partagé qu\'avec vos contacts</string>
   <string name="open_the_gallery">Ouvrir la galerie</string>
   <string name="take_a_photo">Prendre une photo</string>
-  <string name="profile_name_hint">Entrez votre nom (facultatif)</string>
+  <string name="profile_name_hint">Entrer votre nom</string>
   <!--Share fragment-->
   <string name="share_message">Numériser cet identifiant avec Jami</string>
   <string name="share_message_no_account">Svp, sélectionnez le compte à partager</string>
@@ -197,7 +201,7 @@
   <string name="contact_request_title">Nouvelle demande de contact  </string>
   <string name="contact_request_msg">Vous avez %1$s demande(s) d\'ajout</string>
   <string name="contact_request_account">Pour %1$s</string>
-  <string name="no_requests">Aucune demande de contact</string>
+  <string name="no_requests">Vous n\'avez pas de demande de contact</string>
   <string name="message_contact_not_trusted_yet">%sne fait pas partie actuellement de vos contacts.\n Acceptez-vous ou refusez-vous cette invitation ?</string>
   <string name="message_contact_not_trusted">%s n\'est pas l\'un de vos contacts.\n Souhaitez-vous le rajouter ?</string>
   <!--Send contact requests-->
@@ -208,6 +212,7 @@
   <string name="no_blocked_contact">Aucun contact bloqué</string>
   <!--Smartlist-->
   <string name="no_contact_request">Aucune invitation envoyée</string>
+  <string name="conversation_placeholder">Aucune conversation pour le moment</string>
   <string name="contact_request_sent">Invitation envoyée</string>
   <string name="start_conversation">Démarrer une conversation</string>
   <string name="search_results">Résultats de la recherche</string>
@@ -264,4 +269,20 @@
   <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-->
+  <string name="wizard_status_recommended">Recommandé</string>
+  <string name="wizard_status_optional">Optionnel</string>
+  <string name="wizard_status_required">Obligatoire</string>
+  <string name="wizard_username_info">Choisissez un nom d\'utilisateur pour votre compte</string>
+  <string name="wizard_username_button">Choisissez un nom d\'utilisateur</string>
+  <string name="wizard_username_skip">Passer cette étape</string>
+  <string name="wizard_password_info">Mot  de passe du compte</string>
+  <string name="wizard_password_placeholder">Choisissez un mot de passe pour encrypter la clé de votre compte sur cet appareil</string>
+  <string name="wizard_password_button">Choisir un mot de passe</string>
+  <string name="wizard_password_skip">Créer le compte</string>
+  <string name="wizard_password_switch">Encrypter mon compte avec un mot de passe</string>
+  <string name="wizard_password_warning">Notez que le mot de passe ne peut pas être récupéré</string>
+  <string name="wizard_profile_info">Votre profil n\'est partagé qu\'avec vos contacts</string>
+  <string name="wizard_profile_button">Sauvegardez votre profile</string>
+  <string name="wizard_profile_skip">Passez cette étape et faire cela ultérieurement</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_account.xml b/ring-android/app/src/main/res/values-fr/strings_account.xml
index 9c27ed7..944da14 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
@@ -107,6 +107,9 @@
   <string name="account_credentials_add">Ajouter des identifiants</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sécurité</string>
+  <string name="account_srtp_switch_label">Chiffrer les flux média (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Activer SDES pour le protocole d\'échange de clé</string>
+  <string name="account_srtp_rtp_fallback">Se rabattre sur RTP si SRTP échoue</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Utiliser le transport TLS</string>
@@ -185,7 +188,8 @@
   <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\'usager public (recommandé)</string>
+  <string name="register_username">Enregistrer un nom d\'utilisateur public</string>
+  <string name="register_recommended">Recommandé</string>
   <string name="username_already_taken">Ce nom d\'utilisateur est déjà utilisé</string>
   <string name="invalid_username">Nom d\'utilisateur incorrect</string>
   <string name="unknown_error">Erreur inconnue. Veuillez vérifier votre connexion réseau !</string>
diff --git a/ring-android/app/src/main/res/values-fr/strings_content_description.xml b/ring-android/app/src/main/res/values-fr/strings_content_description.xml
index 51231c8..57c1bbc 100644
--- a/ring-android/app/src/main/res/values-fr/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Image de Contact</string>
   <string name="dial_numeric_pad">Pavé numérique</string>
   <string name="contact_unblock">Débloquer</string>
+  <string name="video_plugins">Modules d\'extension vidéos</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-fr/strings_preferences.xml b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
index 2ed11e0..c84ef3a 100644
--- a/ring-android/app/src/main/res/values-fr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-fr/strings_preferences.xml
@@ -24,4 +24,17 @@
   <string name="pref_clearHistory_summary">Effacer tous les historiques de conversation. L\'action est irréversible.</string>
   <string name="pref_persistNotification_title">Fonctionne en arrière-plan</string>
   <string name="pref_persistNotification_summary">Permet de fonctionner en arrière-plan pour recevoir des appels ou des messages</string>
+  <!--Plugin-->
+  <string name="pref_plugins_title">Modules d\'extension</string>
+  <string name="pref_plugins_summary">Activer les modules d\'extension et les paramétrer</string>
+  <string name="fab_plugins_add">Ajouter un nouveau module d\'extension</string>
+  <string name="plugin_uninstall_title">Désinstaller le module d\'extension</string>
+  <string name="plugin_reset_preferences">Réinitialiser les paramètres du module d\'extension</string>
+  <string name="plugin_reset_preferences_summary">Les paramètres de votre module d\'extension seront réinitialisés</string>
+  <string name="plugin_reset_preferences_ask">Souhaitez-vous réinitialiser les paramètres de votre module d\'extension ?</string>
+  <string name="plugin_successfully_installed">Le module d\'extension <b>%1$s</b> a été correctement installé</string>
+  <string name="plugin_install_failure">Échec de l\'installation du module d\'extension :: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">Vous avez une version plus récente de :<b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Voua avez la même version de <b>%1$s</b> installée</string>
+  <string name="plugin_force_install">Forcer l\'installation</string>
 </resources>
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 85ee968..9172f68 100644
--- a/ring-android/app/src/main/res/values-gl/strings.xml
+++ b/ring-android/app/src/main/res/values-gl/strings.xml
@@ -105,6 +105,7 @@
   <string name="write_a_message">Escribe unha mensaxe</string>
   <string name="scan_qr">Escanear código QR</string>
   <string name="ab_action_flipcamera">Cambiar de cámara</string>
+  <string name="ab_action_hidepreview">Agochar vista previa</string>
   <!--Text messages-->
   <string name="send_message">Enviar mensaxe</string>
   <string name="message_sending">Enviando mensaxe...</string>
@@ -169,9 +170,8 @@
   <string name="prompt_new_password_repeat">Repetir o novo contrasinal</string>
   <string name="account_create_title">Crear conta Jami</string>
   <string name="prompt_new_username">Escribir novo nome de usuaria</string>
+  <string name="prompt_hint_username">Nome de usuaria</string>
   <string name="help_password_choose">Escolle un contrasinal forte e gárdao para protexer a túa conta Jami.</string>
-  <string name="help_password_enter">Escribe o contrasinal principal da túa conta Jami</string>
-  <string name="help_server_enter">Escribe URL do servidor de xestión</string>
   <string name="help_pin_enter">Escribe o PIN desde a outra conta Jami configurada. Utiliza o apartado \"Exportar conta Jami\" para obter o PIN.</string>
   <string name="wizard_next">Seguinte</string>
   <string name="wizard_back">Atrás</string>
@@ -181,7 +181,6 @@
   <string name="profile_message_warning">O teu perfil só se comparte cos teus contactos</string>
   <string name="open_the_gallery">Abrir a galería</string>
   <string name="take_a_photo">Tomar fotografía</string>
-  <string name="profile_name_hint">Escribe o teu nome (optativo)</string>
   <!--Share fragment-->
   <string name="share_message">Escanea este código con Jami</string>
   <string name="share_message_no_account">Escolle a conta a compartir.</string>
@@ -197,7 +196,6 @@
   <string name="contact_request_title">Nova solicitude de contacto</string>
   <string name="contact_request_msg">Tes %1$s solicitudes de contacto</string>
   <string name="contact_request_account">Para %1$s</string>
-  <string name="no_requests">0 solicitudes de contacto</string>
   <string name="message_contact_not_trusted_yet">%s non está nos teus contactos.\nQueres aceptar ou rexeitar esta solicitude de contacto?</string>
   <string name="message_contact_not_trusted">%s non está nos teus contactos.\nEngadir un novo contacto?</string>
   <!--Send contact requests-->
@@ -205,7 +203,6 @@
   <string name="send_request_title">Enviar solicitude de contacto</string>
   <string name="send_request_msg">Tes que enviar unha solicitude de contacto para comunicarte con esta usuaria. Mentras o contacto non acepte a solicitude poderás enviar mensaxes pero o contacto non poderá responder.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contactos bloqueados</string>
   <!--Smartlist-->
   <string name="no_contact_request">Non se enviaron solicitudes de contacto</string>
   <string name="contact_request_sent">Solicitude de contacto enviada</string>
@@ -264,4 +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-->
+  <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 d8a1bda..99fe856 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">Engadir credenciais</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguridade</string>
+  <string name="account_srtp_switch_label">Cifrar fluxos de medios(SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Utilizar transporte TLS</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">Conta SIP rexistrada.</string>
   <string name="account_sip_success_message">Rexistraches correctamente a conta SIP.</string>
   <string name="account_sip_register_anyway">Rexistrar igualmente</string>
-  <string name="account_link_device">Conectar desde outro dispositivo</string>
   <string name="account_link_button">Conectar desde a rede</string>
   <string name="account_link_archive_button">Conectar desde copia de apoio</string>
   <string name="account_link_prompt_pin">Escribe o PIN</string>
@@ -183,7 +183,7 @@
   <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  (recomendado)</string>
+  <string name="register_username">Rexistrar o nome público de usuaria</string>
   <string name="username_already_taken">Este nome de usuaria xa está collido</string>
   <string name="invalid_username">Nome de usuaria non válido</string>
   <string name="unknown_error">Erro descoñecido. Comproba a conexión a rede!</string>
diff --git a/ring-android/app/src/main/res/values-gl/strings_preferences.xml b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
index b4f7776..e0d194c 100644
--- a/ring-android/app/src/main/res/values-gl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-gl/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Eliminar todo o historial de conversas. Esto non ten volta atrás.</string>
   <string name="pref_persistNotification_title">Executar en segundo plano</string>
   <string name="pref_persistNotification_summary">Permitir a execución en segundo plano para recibir mensaxe e chamadas.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-he/strings.xml b/ring-android/app/src/main/res/values-he/strings.xml
index 1ab39d6..33d325b 100644
--- a/ring-android/app/src/main/res/values-he/strings.xml
+++ b/ring-android/app/src/main/res/values-he/strings.xml
@@ -39,6 +39,7 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">העתק מספר</string>
   <!--Contacts-->
+  <string name="prompt_hint_username">שם משתמש</string>
   <string name="wizard_next">קדימה</string>
   <!--MenuHeaderView-->
   <string name="profile">פרופיל</string>
@@ -46,6 +47,8 @@
   <string name="generic_error_migration">שגיאה</string>
   <!--Pending contact requests-->
   <string name="accept">קבל</string>
+  <string name="refuse">סרב</string>
+  <string name="block">חסום</string>
   <!--Send contact requests-->
   <string name="send_request_button">שלח</string>
   <!--Blacklist-->
@@ -60,4 +63,5 @@
   <string name="navigation_item_account">חשבון</string>
   <!--TV-->
   <string name="tv_dialog_send">שלח</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-he/strings_account.xml b/ring-android/app/src/main/res/values-he/strings_account.xml
index 0768859..fa5b043 100644
--- a/ring-android/app/src/main/res/values-he/strings_account.xml
+++ b/ring-android/app/src/main/res/values-he/strings_account.xml
@@ -48,6 +48,7 @@
   <string name="account_credentials_label">נתוני התחברות</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">אבטחה</string>
+  <string name="account_srtp_switch_label">הצפן זרמי מדיה (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">השתמש בטרנספורט TLS</string>
diff --git a/ring-android/app/src/main/res/values-he/strings_preferences.xml b/ring-android/app/src/main/res/values-he/strings_preferences.xml
index 6d09f15..d2816f4 100644
--- a/ring-android/app/src/main/res/values-he/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-he/strings_preferences.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="pref_category_contacts">אנשי קשר</string>
   <string name="pref_category_video">וידאו</string>
+  <!--Plugin-->
 </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 3868be2..ad894ed 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
@@ -44,4 +44,5 @@
   <string name="navigation_item_account">खाता</string>
   <!--TV-->
   <string name="tv_audio_play">शुरू करें</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-hi-rIN/strings_preferences.xml b/ring-android/app/src/main/res/values-hi-rIN/strings_preferences.xml
index b502e9e..42b8094 100644
--- a/ring-android/app/src/main/res/values-hi-rIN/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hi-rIN/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_video">वीडियो</string>
+  <!--Plugin-->
 </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 345156a..55490ca 100644
--- a/ring-android/app/src/main/res/values-hr/strings.xml
+++ b/ring-android/app/src/main/res/values-hr/strings.xml
@@ -134,8 +134,8 @@
   <string name="prompt_new_password_repeat">Ponovite novu lozinku</string>
   <string name="account_create_title">Napravite Jami račun</string>
   <string name="prompt_new_username">Unesite novo korisničko ime</string>
+  <string name="prompt_hint_username">Korisničko ime</string>
   <string name="help_password_choose">Odaberite jaku lozinku koje ćete se sjećati da biste zaštitili vaš Jami račun.</string>
-  <string name="help_password_enter">Unesite lozinku za vaš glavni Jami račun</string>
   <string name="wizard_next">Slijedeće</string>
   <string name="wizard_back">Natrag</string>
   <string name="wizard_skip">Preskoči</string>
@@ -160,7 +160,6 @@
   <!--Send contact requests-->
   <string name="send_request_button">Pošalji</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blokiranih kontakata</string>
   <!--Smartlist-->
   <string name="tv_contact_row_header">Kontakti</string>
   <string name="generic_error">Došlo je do nepoznate greške</string>
@@ -182,4 +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-->
+  <string name="wizard_password_skip">Napravi račun</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hr/strings_preferences.xml b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
index 20b618c..a5ec235 100644
--- a/ring-android/app/src/main/res/values-hr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hr/strings_preferences.xml
@@ -9,4 +9,5 @@
   <string name="pref_systemContacts_title">Koristi kontakte sustava</string>
   <string name="pref_systemContacts_summary">Koristi kontakte sustava za prikaz pojedinosti pozivatelja.</string>
   <string name="pref_clearHistory_title">Očisti povijest</string>
+  <!--Plugin-->
 </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 595f7e1..c534be6 100644
--- a/ring-android/app/src/main/res/values-hu/strings.xml
+++ b/ring-android/app/src/main/res/values-hu/strings.xml
@@ -31,6 +31,7 @@
   <string name="menu_item_accounts">Fiókok kezelése</string>
   <string name="menu_item_account">Fiók kezelése</string>
   <string name="menu_item_settings">Beállítások</string>
+  <string name="menu_item_plugin_list">Beépülő modulok beállításai</string>
   <string name="menu_item_share">Kapcsolati adatok megosztása</string>
   <string name="menu_item_about">A Jami névjegye</string>
   <!--Dialing Fragment-->
@@ -93,6 +94,7 @@
   <string name="action_call_accept">Hívás fogadása</string>
   <string name="action_call_decline">Elutasítás</string>
   <string name="action_call_mic_mute">Mikrofon elnémítása</string>
+  <string name="action_load_plugin">Beépülő modul betöltése</string>
   <string name="ab_action_speakerphone">Hangszóró engedélyezése</string>
   <string name="ab_action_contact_add">Hozzáadás a kapcsolatokhoz</string>
   <string name="ab_action_contact_add_question">Hozzáadja a kapcsolatokhoz?</string>
@@ -170,9 +172,10 @@
   <string name="prompt_new_password_repeat">Új jelszó még egyszer</string>
   <string name="account_create_title">Jami-fiók létrehozása</string>
   <string name="prompt_new_username">Új felhasználónév megadása</string>
+  <string name="prompt_hint_username">Felhasználónév</string>
   <string name="help_password_choose">Válasszon erős jelszót, amelyre emlékezni fog, hogy megvédje a Jami fiókját.</string>
-  <string name="help_password_enter">Adja meg a fő Jami fiókja jelszót</string>
-  <string name="help_server_enter">Adja meg a felügyeleti kiszolgáló URL-jét</string>
+  <string name="help_password_enter">Adja meg a fő Jami fiókja jelszót.</string>
+  <string name="help_server_enter">Adja meg a felügyeleti kiszolgáló URL-jét.</string>
   <string name="help_pin_enter">Adja meg egy másik beállított Jami fiók PIN-jét! Használja a „Fiók exportálása a Jami-n” működést a PIN eléréséhez!</string>
   <string name="wizard_next">Tovább</string>
   <string name="wizard_back">Vissza</string>
@@ -182,7 +185,7 @@
   <string name="profile_message_warning">A profilja csak a kapcsolataival kerül megosztásra</string>
   <string name="open_the_gallery">Galéria megnyitása</string>
   <string name="take_a_photo">Fotó készítése</string>
-  <string name="profile_name_hint">Adja meg a nevét (nem kötelező)</string>
+  <string name="profile_name_hint">Név megadása</string>
   <!--Share fragment-->
   <string name="share_message">Olvassa be a kódot a Jami programmal</string>
   <string name="share_message_no_account">Válassza ki a megosztandó fiókot.</string>
@@ -198,7 +201,7 @@
   <string name="contact_request_title">Új kapcsolatkérelem</string>
   <string name="contact_request_msg">%1$s kapcsolatkérelme van</string>
   <string name="contact_request_account">Ehhez: %1$s</string>
-  <string name="no_requests">Nincs kapcsolatkérelem</string>
+  <string name="no_requests">Nincs kapcsolatfelvételi kérés</string>
   <string name="message_contact_not_trusted_yet">%smég nincs a kapcsolatban Önnel.\nAkkor elfogadja vagy elutasítja ezt a felkérést?</string>
   <string name="message_contact_not_trusted">%snincs a kapcsolataiban.\nÚj kapcsolat hozzáadása?</string>
   <!--Send contact requests-->
@@ -206,9 +209,10 @@
   <string name="send_request_title">Kapcsolatkérelem küldése</string>
   <string name="send_request_msg">Küldenie kell egy felkérést, hogy közléshasson ezzel a felhasználóval. Mindaddig, amíg a leendő kapcsolat nem fogadta el a felkérést, üzeneteket küldhet Neki, de nem tud vissza válaszolni.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 letiltott kapcsolat</string>
+  <string name="no_blocked_contact">Nincsenek letiltott kapcsolatok</string>
   <!--Smartlist-->
   <string name="no_contact_request">Nincs elküldött kapcsolatkérelem</string>
+  <string name="conversation_placeholder">Még nincs beszélgetése</string>
   <string name="contact_request_sent">Kapcsolatkérelem elküldve</string>
   <string name="start_conversation">Beszélgetés indítása</string>
   <string name="search_results">Keresési eredmények</string>
@@ -265,4 +269,20 @@
   <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-->
+  <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>
+  <string name="wizard_username_info">Válassz egy felhasználónevet fiókja</string>
+  <string name="wizard_username_button">Felhasználónév kiválasztása</string>
+  <string name="wizard_username_skip">Felhasználónév kihagyása</string>
+  <string name="wizard_password_info">Fiók jelszava</string>
+  <string name="wizard_password_placeholder">Válasszon egy jelszót az eszköz fiókkulcsának titkosításához</string>
+  <string name="wizard_password_button">Jelszó kiválasztása</string>
+  <string name="wizard_password_skip">Fiók létrehozása</string>
+  <string name="wizard_password_switch">Fiók titkosítása jelszóval</string>
+  <string name="wizard_password_warning">Vegye figyelembe, hogy a jelszó nem lehet helyreállított</string>
+  <string name="wizard_profile_info">Profil megosztva csak a névjegyekkel</string>
+  <string name="wizard_profile_button">Profil mentése</string>
+  <string name="wizard_profile_skip">Későbbre halasztás</string>
 </resources>
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 56d1887..178385a 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
@@ -105,6 +105,9 @@
   <string name="account_credentials_add">Hitelesítő adatok hozzáadása</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Biztonság</string>
+  <string name="account_srtp_switch_label">Média-adatfolyamok titkosítása (SRTP)</string>
+  <string name="account_srtp_enable_sdes">SDES engedélyezése kulcscsere-szabályhalmazatként</string>
+  <string name="account_srtp_rtp_fallback">RTP visszatérése, ha a SRTP sikertelen</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">TLS titkosítás használata</string>
@@ -183,7 +186,8 @@
   <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 regisztrációja (ajánlott)</string>
+  <string name="register_username">Nyilvános felhasználónév bejegyeztetése</string>
+  <string name="register_recommended">Ajánlott</string>
   <string name="username_already_taken">A felhasználónév már foglalt</string>
   <string name="invalid_username">Érvénytelen felhasználónév</string>
   <string name="unknown_error">Ismeretlen hiba történt. Ellenőrizze a hálózati kapcsolatot.</string>
diff --git a/ring-android/app/src/main/res/values-hu/strings_content_description.xml b/ring-android/app/src/main/res/values-hu/strings_content_description.xml
index 6292085..3a628f5 100644
--- a/ring-android/app/src/main/res/values-hu/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Kapcsolat fényképe</string>
   <string name="dial_numeric_pad">Tárcsázó</string>
   <string name="contact_unblock">Letiltás feloldása</string>
+  <string name="video_plugins">Videó beépülő modulok</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-hu/strings_preferences.xml b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
index 95c9d51..98dcb1a 100644
--- a/ring-android/app/src/main/res/values-hu/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-hu/strings_preferences.xml
@@ -24,4 +24,17 @@
   <string name="pref_clearHistory_summary">Minden beszélgetés előzmény törlése. Ez a művelet nem vonható vissza.</string>
   <string name="pref_persistNotification_title">Háttérfolyamat engedélyezése</string>
   <string name="pref_persistNotification_summary">Háttérfolyamat engedélyezése hívások és üzenetek fogadásához.</string>
+  <!--Plugin-->
+  <string name="pref_plugins_title">Beépülő modulok</string>
+  <string name="pref_plugins_summary">Beépülő modulok engedélyezése és a paramétereik beállítása</string>
+  <string name="fab_plugins_add">Új beépülő modul hozzáadása</string>
+  <string name="plugin_uninstall_title">Beépülő modul eltávolítása?</string>
+  <string name="plugin_reset_preferences">Beépülő modul beállításainak visszaállítása</string>
+  <string name="plugin_reset_preferences_summary">Beépülő modul alapértelmezett beállításainak visszaállítása</string>
+  <string name="plugin_reset_preferences_ask">Szeretné visszaállítani a beépülő modul beállításait?</string>
+  <string name="plugin_successfully_installed">A(z) <b>%1$s</b> beépülő modul sikeresen telepítve</string>
+  <string name="plugin_install_failure">A beépülő modul telepítése nem sikerült: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">A(z) <b>%1$s</b> újabb verziója már telepítve van</string>
+  <string name="plugin_same_version_exception">A(z) <b>%1$s</b> ugyanazon verziója már telepítve van</string>
+  <string name="plugin_force_install">Telepítés\nkényszerítése</string>
 </resources>
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 7abc062..852b581 100644
--- a/ring-android/app/src/main/res/values-id/strings.xml
+++ b/ring-android/app/src/main/res/values-id/strings.xml
@@ -113,7 +113,6 @@
   <string name="profile_message_warning">Profil Anda hanya dibagikan kepada kontak Anda</string>
   <string name="open_the_gallery">Buka galeri</string>
   <string name="take_a_photo">Ambil foto</string>
-  <string name="profile_name_hint">Masukkan nama Anda (opsional)</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Silakan pilih akun untuk dibagikan.</string>
   <string name="share_your_account_information">Bagikan informasi kontak saya</string>
@@ -124,12 +123,10 @@
   <string name="refuse">Tolak</string>
   <string name="block">Blokir</string>
   <string name="contact_request_account">Untuk %1$s</string>
-  <string name="no_requests">0 permintaan kontak</string>
   <!--Send contact requests-->
   <string name="send_request_button">Kirim</string>
   <string name="send_request_title">Kirim permintaan kontak</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 kontak diblokir</string>
   <!--Smartlist-->
   <string name="tv_contact_row_header">Kontak</string>
   <!--File Transfer-->
@@ -139,4 +136,5 @@
   <!--TV-->
   <string name="tv_audio_play">Mainkan</string>
   <string name="tv_dialog_send">Kirim</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-id/strings_preferences.xml b/ring-android/app/src/main/res/values-id/strings_preferences.xml
index b4ab745..4c72c33 100644
--- a/ring-android/app/src/main/res/values-id/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-id/strings_preferences.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="pref_category_contacts">Kontak</string>
   <string name="pref_category_video">Video</string>
+  <!--Plugin-->
 </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 43d31b3..fa39f8b 100644
--- a/ring-android/app/src/main/res/values-ig/strings.xml
+++ b/ring-android/app/src/main/res/values-ig/strings.xml
@@ -37,4 +37,5 @@
   <!--Bottom Navigation-->
   <!--TV-->
   <string name="tv_dialog_send">Zie</string>
+  <!--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 dc7b85b..b3257b1 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
@@ -170,9 +170,10 @@
   <string name="prompt_new_password_repeat">Ripeti nuova password</string>
   <string name="account_create_title">Crea un account Jami</string>
   <string name="prompt_new_username">Inserisci il nuovo nome utente</string>
+  <string name="prompt_hint_username">Utente</string>
   <string name="help_password_choose">Scegliere una password facile da ricordare per proteggere il tuo account Jami.</string>
-  <string name="help_password_enter">Inserire la password dell\'account principale Jami</string>
-  <string name="help_server_enter">Immettere l\'URL del server di gestione</string>
+  <string name="help_password_enter">Inserisci la password del tuo account Jami principale.</string>
+  <string name="help_server_enter">Immettere l\'URL del server di gestione.</string>
   <string name="help_pin_enter">Jami configurato per inserire il PIN da un altro account. Utilizzare la funzione di \"esporta account Jami\" per ottenere un PIN.</string>
   <string name="wizard_next">Prossimo</string>
   <string name="wizard_back">Indietro</string>
@@ -182,7 +183,7 @@
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria immagini</string>
   <string name="take_a_photo">Scatta una foto</string>
-  <string name="profile_name_hint">Inserisci il tuo nome (facoltativo)</string>
+  <string name="profile_name_hint">Inserisci il tuo nome</string>
   <!--Share fragment-->
   <string name="share_message">Scansione questo codice con Jami</string>
   <string name="share_message_no_account">Seleziona un account per la condivisione.</string>
@@ -198,7 +199,7 @@
   <string name="contact_request_title">Nuova richiesta di contatto</string>
   <string name="contact_request_msg">Hai %1$s richieste di contatto</string>
   <string name="contact_request_account">Per %1$s</string>
-  <string name="no_requests">0 richieste di contatto</string>
+  <string name="no_requests">Non hai richieste di contatto</string>
   <string name="message_contact_not_trusted_yet">%s non è ancora nei tuoi contatti \n Accetti o rifiuti questo richiesta di contatto?</string>
   <string name="message_contact_not_trusted">%s non è nei tuoi contatti.\nAggiugere un nuovo contatto?</string>
   <!--Send contact requests-->
@@ -206,9 +207,10 @@
   <string name="send_request_title">Invia una richiesta di contatto</string>
   <string name="send_request_msg">È necessario inviare una richiesta di contatto per comunicare con questo utente. Fino a quando il vostro contatto non ha accettato la richiesta, è possibile inviare messaggi, ma non sarà in grado di rispondere.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contatti bloccati</string>
+  <string name="no_blocked_contact">Nessun contatto bloccato</string>
   <!--Smartlist-->
   <string name="no_contact_request">Nessuna richiesta di contatto inviata</string>
+  <string name="conversation_placeholder">Non hai ancora conversazioni</string>
   <string name="contact_request_sent">Richiesta di contatto inviata</string>
   <string name="start_conversation">Inizia la conversazione</string>
   <string name="search_results">Risultati della ricerca</string>
@@ -265,4 +267,20 @@
   <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-->
+  <string name="wizard_status_recommended">Consigliato</string>
+  <string name="wizard_status_optional">Opzionale</string>
+  <string name="wizard_status_required">Necessario</string>
+  <string name="wizard_username_info">Scegli un nome utente per il tuo account</string>
+  <string name="wizard_username_button">Scegli un nome utente</string>
+  <string name="wizard_username_skip">Salta la scelta del nome utente</string>
+  <string name="wizard_password_info">Password dell\'account</string>
+  <string name="wizard_password_placeholder">Scegli una password per crittografare la chiave dell\'account su questo dispositivo</string>
+  <string name="wizard_password_button">Scegli password</string>
+  <string name="wizard_password_skip">Crea account</string>
+  <string name="wizard_password_switch">Crittografa account con password</string>
+  <string name="wizard_password_warning">Si noti che la password non può essere recuperata</string>
+  <string name="wizard_profile_info">Il profilo è condiviso solo con i contatti</string>
+  <string name="wizard_profile_button">Salva il profilo</string>
+  <string name="wizard_profile_skip">Salta e fallo più tardi</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_account.xml b/ring-android/app/src/main/res/values-it-rIT/strings_account.xml
index f692680..084dbc1 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
@@ -105,6 +105,9 @@
   <string name="account_credentials_add">Aggiungi credenziali</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sicurezza</string>
+  <string name="account_srtp_switch_label">Cripta i flussi (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Abilita SDES come protocollo di scambio chiavi</string>
+  <string name="account_srtp_rtp_fallback">Fallback su RTP se SRTP fallisce</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usa trasporto TLS</string>
@@ -158,7 +161,7 @@
   <string name="account_sip_success_title">Account Sip registrato</string>
   <string name="account_sip_success_message">Hai registrato il tuo account Sip con successo.</string>
   <string name="account_sip_register_anyway">Registrati lo stesso</string>
-  <string name="account_link_device">Connetti da un altro dispositivo</string>
+  <string name="account_link_device">Connettiti da un altro dispositivo</string>
   <string name="account_link_button">Connetti dalla rete</string>
   <string name="account_link_archive_button">Connetti dal backup</string>
   <string name="account_link_prompt_pin">Inserisci il PIN</string>
@@ -183,7 +186,8 @@
   <string name="register_name">Nome registrazione</string>
   <string name="trying_to_register_name">Tentativo di registrazione del nome</string>
   <string name="registered_username">Nome utente registrato</string>
-  <string name="register_username">Registra nome utente pubblico (consigliato)</string>
+  <string name="register_username">Registra nome utente pubblico</string>
+  <string name="register_recommended">Consigliato</string>
   <string name="username_already_taken">Il nome utente è già utilizzato</string>
   <string name="invalid_username">Nome utente non valido</string>
   <string name="unknown_error">Errore sconosciuto. Controlla la tua connessione di rete!</string>
diff --git a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
index 0807e13..11df7bc 100644
--- a/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it-rIT/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Cancella tutta la cronologia delle conversazioni. Questa azione non può essere annullata.</string>
   <string name="pref_persistNotification_title">Esegui in background</string>
   <string name="pref_persistNotification_summary">Consenti l\'esecuzione in background per ricevere chiamate e messaggi.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-it/strings.xml b/ring-android/app/src/main/res/values-it/strings.xml
index 3448b19..d122ce0 100644
--- a/ring-android/app/src/main/res/values-it/strings.xml
+++ b/ring-android/app/src/main/res/values-it/strings.xml
@@ -164,9 +164,8 @@
   <string name="prompt_new_password_repeat">Ripeti la nuova password</string>
   <string name="account_create_title">Crea un account Jami</string>
   <string name="prompt_new_username">Inserisci il nuovo nome utente</string>
+  <string name="prompt_hint_username">Nome utente</string>
   <string name="help_password_choose">Scegli una password sicura che ricorderai per proteggere il tuo account Jami.</string>
-  <string name="help_password_enter">Inserisci la password principale del tuo account Jami</string>
-  <string name="help_server_enter">Inserisci l\'URL del server di gestione</string>
   <string name="help_pin_enter">Inserire il PIN da un altro account Jami configurato. Utilizzare la funzione \"Esporta account Jami\" per ottenere un PIN.</string>
   <string name="wizard_next">Seguente</string>
   <string name="wizard_back">Indietro</string>
@@ -176,7 +175,6 @@
   <string name="profile_message_warning">Il tuo profilo è condiviso solo con i tuoi contatti</string>
   <string name="open_the_gallery">Apri la galleria</string>
   <string name="take_a_photo">Scatta una foto</string>
-  <string name="profile_name_hint">Inserisci il tuo nome (opzionale)</string>
   <!--Share fragment-->
   <string name="share_message">Scansiona questo codice con Jami</string>
   <string name="share_message_no_account">Per favore seleziona un account da condividere.</string>
@@ -192,7 +190,6 @@
   <string name="contact_request_title">Nuova richiesta di contatto</string>
   <string name="contact_request_msg">Hai %1$s richieste di contatto</string>
   <string name="contact_request_account">Per %1$s</string>
-  <string name="no_requests">0 richieste di contatto</string>
   <string name="message_contact_not_trusted_yet">%s non è ancora nei tuoi contatti.\nAccetti o rifiuti questa richiesta di contatto?</string>
   <string name="message_contact_not_trusted">%s non è nei tuoi contatti.\nAggiungere un nuovo contatto?</string>
   <!--Send contact requests-->
@@ -200,7 +197,6 @@
   <string name="send_request_title">Invia una richiesta di contatto</string>
   <string name="send_request_msg">È necessario inviare una richiesta di contatto per comunicare con questo utente. Finché il tuo contatto non ha accettato la richiesta, puoi inviare messaggi ma non sarà in grado di rispondere.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contatti bloccati</string>
   <!--Smartlist-->
   <string name="no_contact_request">Nessuna richiesta di contatto inviata</string>
   <string name="contact_request_sent">Richiesta di contatto inviata</string>
@@ -247,4 +243,6 @@
   <!--TV-->
   <string name="tv_audio_play">Play</string>
   <string name="tv_dialog_send">Invia</string>
+  <!--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 c8d5c52..a50fe99 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
@@ -92,6 +92,7 @@
   <string name="account_credentials_add">Aggiungi credenziali</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sicurezza</string>
+  <string name="account_srtp_switch_label">Cifrare i flussi media (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usare il trasporto TLS</string>
diff --git a/ring-android/app/src/main/res/values-it/strings_preferences.xml b/ring-android/app/src/main/res/values-it/strings_preferences.xml
index e361fbb..48a1924 100644
--- a/ring-android/app/src/main/res/values-it/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-it/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Elimina la cronologia di tutte le conversazioni. Questa azione non può essere annullata.</string>
   <string name="pref_persistNotification_title">Esegui in background</string>
   <string name="pref_persistNotification_summary">Consenti l\'esecuzione in background per ricevere chiamate e messaggi.</string>
+  <!--Plugin-->
 </resources>
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 1c28794..7834406 100644
--- a/ring-android/app/src/main/res/values-ja/strings.xml
+++ b/ring-android/app/src/main/res/values-ja/strings.xml
@@ -104,6 +104,7 @@
   <string name="write_a_message">メッセージを入力</string>
   <string name="scan_qr">QR コードをスキャン</string>
   <string name="ab_action_flipcamera">カメラを押す</string>
+  <string name="ab_action_hidepreview">プレビューを隠す</string>
   <!--Text messages-->
   <string name="send_message">メッセージを送信</string>
   <string name="message_sending">メッセージを送信中…</string>
@@ -168,9 +169,8 @@
   <string name="prompt_new_password_repeat">新しいパスワードの確認</string>
   <string name="account_create_title">Jamiアカウントを作成</string>
   <string name="prompt_new_username">新しいユーザー名を入力してください</string>
+  <string name="prompt_hint_username">ユーザー名</string>
   <string name="help_password_choose">あなたのJamiアカウントを守るために強固なパスワードを設定してください。また、このパスワードを忘れないでください。</string>
-  <string name="help_password_enter">現在のJamiアカウントのパスワード</string>
-  <string name="help_server_enter">管理サーバーの URL を入力してください</string>
   <string name="help_pin_enter">設定済みの別のJamiアカウントからPINを入力してください。 PINを取得するには、\"Jamiのアカウントをエクスポート\" 機能を使用します。</string>
   <string name="wizard_next">次へ</string>
   <string name="wizard_back">戻る</string>
@@ -180,7 +180,7 @@
   <string name="profile_message_warning">プロフィールは連絡先以外に共有されません</string>
   <string name="open_the_gallery">ギャラリーを開く</string>
   <string name="take_a_photo">写真を撮る</string>
-  <string name="profile_name_hint">名前を入力... (任意)</string>
+  <string name="profile_name_hint">名前を入力</string>
   <!--Share fragment-->
   <string name="share_message">このコードをJamiでスキャンしてください</string>
   <string name="share_message_no_account">共有するアカウントを選択してください。</string>
@@ -196,7 +196,6 @@
   <string name="contact_request_title">新しい連絡先リクエスト</string>
   <string name="contact_request_msg">%1$s の連絡先リクエストがあります</string>
   <string name="contact_request_account">%1$s に</string>
-  <string name="no_requests">0 件の連絡先リクエスト</string>
   <string name="message_contact_not_trusted_yet">%s さんはあなたの連絡先に追加されていません。
 この連絡先のリクエストを許可しますか?</string>
   <string name="message_contact_not_trusted">%s さんはあなたの連絡先に追加されていません。
@@ -206,7 +205,7 @@
   <string name="send_request_title">連絡先リクエストを送信</string>
   <string name="send_request_msg">このユーザーと会話するには、コンタクトリクエストを送信しなければなりません。連絡先のリクエストを許可するまでは、あなたはメッセージを送れますが、相手は返事を送れません。</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 件のブロックした連絡先</string>
+  <string name="no_blocked_contact">ブロックした連絡先はありません</string>
   <!--Smartlist-->
   <string name="no_contact_request">連絡先のリクエストは送信していません</string>
   <string name="contact_request_sent">連絡先のリクエストを送信しました</string>
@@ -259,7 +258,13 @@
   <string name="tv_audio_play">再生</string>
   <string name="tv_audio_pause">一時停止</string>
   <string name="tv_dialog_send">送信</string>
+  <string name="tv_audio_recording">録音中…</string>
   <string name="tv_send_text">テキストの送信</string>
   <string name="tv_send_audio">音声の送信</string>
   <string name="tv_send_video">メディアを送信</string>
+  <!--WIZARD-->
+  <string name="wizard_status_recommended">推奨</string>
+  <string name="wizard_username_button">ユーザー名を選択</string>
+  <string name="wizard_password_info">アカウントのパスワード</string>
+  <string name="wizard_password_skip">アカウント作成</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ja/strings_account.xml b/ring-android/app/src/main/res/values-ja/strings_account.xml
index 89daca5..0aa3a4d 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">ログイン情報を追加</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">セキュリティ</string>
+  <string name="account_srtp_switch_label">メディアストリームを暗号化 (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">TLS Transportを使用</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">SIPアカウントを登録しました</string>
   <string name="account_sip_success_message">SIPアカウントを正常に登録しました。</string>
   <string name="account_sip_register_anyway">とにかく登録する</string>
-  <string name="account_link_device">別のデバイスから接続</string>
   <string name="account_link_button">ネットワークから接続</string>
   <string name="account_link_archive_button">バックアップから接続</string>
   <string name="account_link_prompt_pin">PINを入力してください</string>
@@ -183,7 +183,8 @@
   <string name="register_name">登録名</string>
   <string name="trying_to_register_name">名前を登録しようとしています</string>
   <string name="registered_username">登録ユーザー名</string>
-  <string name="register_username">公開ユーザー名を登録 (推奨)</string>
+  <string name="register_username">公開ユーザー名を登録</string>
+  <string name="register_recommended">推奨</string>
   <string name="username_already_taken">すでに取得されているユーザー名です</string>
   <string name="invalid_username">無効なユーザー名</string>
   <string name="unknown_error">原因不明のエラーが発生しました。ネットワークの接続を確認してください。</string>
diff --git a/ring-android/app/src/main/res/values-ja/strings_preferences.xml b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
index 0ee9aa8..868366a 100644
--- a/ring-android/app/src/main/res/values-ja/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ja/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">すべての会話履歴を消去します。この操作は元に戻せません。</string>
   <string name="pref_persistNotification_title">バックグラウンドで実行</string>
   <string name="pref_persistNotification_summary">通話とメッセージの受信をバックグラウンドでも許可する</string>
+  <!--Plugin-->
 </resources>
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 b3d85ae..395ef85 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
@@ -25,6 +25,7 @@
   <!--Settings-->
   <!--Conversation-->
   <!--Contacts-->
+  <string name="prompt_hint_username">사용자명</string>
   <string name="wizard_next">다음</string>
   <!--MenuHeaderView-->
   <string name="profile">프로필</string>
@@ -43,4 +44,5 @@
   <!--TV-->
   <string name="tv_audio_play">재생</string>
   <string name="tv_audio_pause">멈춤</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ko-rKR/strings_preferences.xml b/ring-android/app/src/main/res/values-ko-rKR/strings_preferences.xml
index 4b41a1b..4bec325 100644
--- a/ring-android/app/src/main/res/values-ko-rKR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ko-rKR/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_video">비디오</string>
+  <!--Plugin-->
 </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 7f00fe5..eaa7981 100644
--- a/ring-android/app/src/main/res/values-lt/strings.xml
+++ b/ring-android/app/src/main/res/values-lt/strings.xml
@@ -142,8 +142,8 @@
   <string name="prompt_new_password_repeat">Pakartokite naują slaptažodį</string>
   <string name="account_create_title">Susikurti Jami paskyrą</string>
   <string name="prompt_new_username">Įveskite naują naudotojo vardą</string>
+  <string name="prompt_hint_username">Naudotojo vardas</string>
   <string name="help_password_choose">Pasirinkite stiprų slaptažodį, kurį prisiminsite, kad apsaugotumėte savo Jami paskyrą.</string>
-  <string name="help_password_enter">Įveskite savo pagrindinės Jami paskyros slaptažodį</string>
   <string name="help_pin_enter">Įveskite PIN iš kitos sukonfigūruotos Jami paskyros. Norėdami gauti PIN, naudokite ypatybę \"eksportuoti Jami paskyrą\".</string>
   <string name="wizard_next">Kitas</string>
   <string name="wizard_back">Atgal</string>
@@ -153,7 +153,6 @@
   <string name="profile_message_warning">Jūsų profilis yra bendrinamas tik su jūsų adresatais</string>
   <string name="open_the_gallery">Atverti galeriją</string>
   <string name="take_a_photo">Padaryti nuotrauką</string>
-  <string name="profile_name_hint">Įveskite savo vardą (nebūtina)</string>
   <!--Share fragment-->
   <string name="share_message">Nuskenuokite šį kodą, naudodami Jami</string>
   <string name="share_message_no_account">Pasirinkite norimą bendrinti paskyrą.</string>
@@ -169,7 +168,6 @@
   <string name="contact_request_title">Nauja adresato užklausa</string>
   <string name="contact_request_msg">Jūs turite %1$s adresatų užklausų</string>
   <string name="contact_request_account">Skirta %1$s</string>
-  <string name="no_requests">0 adresatų užklausų</string>
   <string name="message_contact_not_trusted_yet">%s kol kas nėra jūsų adresatų sąraše.\nJūs priimate ar atmetate šią adresato užklausą?</string>
   <string name="message_contact_not_trusted">%s nėra jūsų adresatų sąraše.\nPridėti naują adresatą?</string>
   <!--Send contact requests-->
@@ -177,7 +175,7 @@
   <string name="send_request_title">Siųsti adresato užklausą</string>
   <string name="send_request_msg">Norėdami bendrauti su šiuo naudotoju, privalote išsiųsti adresato užklausą. Kol adresatas nepriims užklausos, jūs galite siųsti žinutes, tačiau adresatas negalės atsakyti.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 užblokuotų adresatų</string>
+  <string name="no_blocked_contact">Užblokuotų adresatų nėra</string>
   <!--Smartlist-->
   <string name="no_contact_request">Jokia adresato užklausa neišsiųsta</string>
   <string name="contact_request_sent">Adresato užklausa išsiųsta</string>
@@ -224,4 +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-->
+  <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 2a954ac..014c4d8 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
@@ -40,7 +40,7 @@
   <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>
-  <string name="account_device_revocation_error_title">Nepavyksta panaikinti įrenginio</string>
+  <string name="account_device_revocation_error_title">Neįmanoma atšaukti įrenginio</string>
   <string name="account_device_revocation_wrong_password">Neteisingas slaptažodis.</string>
   <string name="account_device_revocation_unknown_device">Nežinomas įrenginys.</string>
   <string name="account_device_revocation_error_unknown">Nežinoma klaida.</string>
@@ -51,7 +51,7 @@
   <string name="account_preferences_basic_tab">Bendra</string>
   <string name="account_basic_category">Pagrindiniai nustatymai</string>
   <string name="account_alias_label">Paskyros pavadinimas</string>
-  <string name="account_hostname_label">Kompiuterio vardas</string>
+  <string name="account_hostname_label">Pagrindinio kompiuterio vardas</string>
   <string name="account_bootstrap_label">Pradinė įkeltis</string>
   <string name="account_username_label">Naudotojo vardas</string>
   <string name="account_password_label">Slaptažodis</string>
@@ -67,11 +67,14 @@
   <string name="account_ringtone_enabled_label">Aktyvuoti skambučių melodijas</string>
   <string name="account_ringtone_path_label">Skambučio melodijos kelias</string>
   <string name="account_ringtone_custom_label">Naudoti tinkintą skambučio melodiją</string>
+  <string name="account_ringtone_title">Pasirinkite skambėjimo toną</string>
+  <string name="account_ringtone_summary">Pasirinkite skambėjimo toną arba patys pasirinkite savo skambėjimo toną</string>
   <!--Video Details-->
   <string name="account_video_label">Vaizdas</string>
   <string name="account_video_enable">Įjungti vaizdą</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Išplėstiniai</string>
+  <string name="account_dht_public_in_calls_label">Leisti įeinančius skambučius iš nežinomų kontaktų</string>
   <string name="account_registration_exp_label">Registracijos galiojimo laikas</string>
   <string name="account_local_interface_label">Vietinė sąsaja</string>
   <string name="account_local_port_label">Vietinis prievadas</string>
@@ -92,12 +95,19 @@
   <string name="account_proxy_label">DHT įgaliotasis serveris</string>
   <string name="account_proxy_enable_label">Naudoti DHT įgaliotąjį serverį</string>
   <string name="account_proxy_server_label">DHT įgaliotojo serverio adresas</string>
+  <string name="account_proxy_server_list_label">DHT tarpinio serverio sąrašo URL</string>
+  <string name="account_peer_discovery_label">Vietinis kolegų atradimas</string>
+  <string name="account_peer_discovery_enable_label">Įgalinti vietinį peer atradimą</string>
+  <string name="account_peer_discovery_enable_summary">Prisijunkite prie kitų DHT mazgų, reklamuojančių mūsų vietiniame tinkle</string>
   <!--Security Details-->
   <string name="account_credentials_label">Prisijungimo duomenys</string>
   <string name="account_credentials_edit">Taisyti prisijungimo duomenis</string>
   <string name="account_credentials_add">Pridėti prisijungimo duomenis</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Saugumas</string>
+  <string name="account_srtp_switch_label">Šifruoti medija srautus (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Įgalinti SDES kaip raktų mainų protokolą</string>
+  <string name="account_srtp_rtp_fallback">Grįžimas į RTP, jei SRTP nepavyksta naudoti</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Naudoti TLS perdavimą</string>
@@ -137,6 +147,7 @@
   <string name="account_migration_message_dialog">Jūsų paskyros turi būti atnaujintos. Ar norite pereiti į paskyros tvarkymo ekraną, kad atliktumėte šį veiksmą?</string>
   <string name="account_update_needed">Reikalingas atnaujinimas</string>
   <string name="account_cannot_be_found_title">Nepavyksta rasti paskyros</string>
+  <string name="account_cannot_be_found_message">Paskyros nepavyko rasti „Jami“ tinkle. Įsitikinkite, kad ji buvo eksportuota į „Jami“ iš esamo įrenginio ir ar pateikiami kredencialai yra teisingi.</string>
   <string name="account_sip_cannot_be_registered_message">Galite tęsti paskyros kūrimo procesą arba taisyti savo informaciją čia. Vėliau taisymas taip pat yra įmanomas paskyros nustatymuose.</string>
   <string name="account_no_network_title">Nepavyksta prisijungti prie tinklo</string>
   <string name="account_no_network_message">Nepavyko pridėti paskyros, nes Jami nepavyko prisijungti prie paskirstytojo tinklo. Patikrinkite savo įrenginio ryšį.</string>
@@ -144,19 +155,27 @@
   <string name="account_device_added_message">Jūs sėkmingai nusistatėte savo Jami paskyrą šiame įrenginyje.</string>
   <string name="account_device_updated_title">Paskyros įrenginys atnaujintas</string>
   <string name="account_device_updated_message">Jūs sėkmingai atnaujinote savo Jami paskyrą.</string>
+  <string name="account_cannot_be_updated_message">Paskyros įrenginio nepavyko atnaujinti. Patikrinkite savo slaptažodį.</string>
   <string name="account_sip_success_title">Sip paskyra užregistruota</string>
   <string name="account_sip_success_message">Jūs sėkmingai užregistravote savo Sip paskyrą.</string>
   <string name="account_sip_register_anyway">Vis tiek registruoti</string>
+  <string name="account_link_device">Prisijungta iš kito įrenginio</string>
   <string name="account_link_button">Prijungti iš tinklo</string>
   <string name="account_link_archive_button">Prijungti iš atsarginės kopijos</string>
   <string name="account_link_prompt_pin">Įveskite PIN</string>
   <string name="account_new_button">Susikurti Jami paskyrą</string>
   <string name="account_link_export_button">Susieti kitą įrenginį su šia paskyra</string>
+  <string name="account_link_export_info">Jei norite naudoti šią paskyrą kituose įrenginiuose, pirmiausia turite ją atskleisti „Jami“. Tai sugeneruos PIN kodą, kurį turite įvesti naujame įrenginyje, kad nustatytumėte paskyrą. PIN kodas galioja 10 minučių.</string>
   <string name="account_start_export_button">Generuoti PIN</string>
   <string name="account_end_export_button">užverti</string>
   <string name="account_end_export_infos">Jūsų PIN yra:\n\n%%\n\nNorėdami užbaigti procesą, turite atverti Jami naujame įrenginyje. Susikurkite paskyrą, naudodami \"Susieti šį įrenginį su paskyra\". Jūsų PIN galioja 10 minučių.</string>
+  <string name="account_link_export_info_light">Jei norite naudoti šią paskyrą kituose įrenginiuose, pirmiausia turite ją atskleisti „Jami“. Tai sugeneruos PIN kodą, kurį turite įvesti naujame įrenginyje, kad nustatytumėte paskyrą. PIN kodas galioja 10 minučių.</string>
   <string name="account_export_title">Pridėti įrenginius</string>
+  <string name="account_connect_server_button">Prisijunkite prie valdymo serverio</string>
   <string name="account_connect_button">Prisijungti</string>
+  <string name="prompt_server">„Jami“ valdymo serverio URL</string>
+  <string name="help_credentials_enter">Įveskite organizacijos kredencialus</string>
+  <string name="help_connect_password_enter">Įveskite organizacijos slaptažodį</string>
   <string name="account_connect_prompt_username">Naudotojo vardas</string>
   <!--Name registration-->
   <string name="error_username_empty">Įveskite naudotojo vardą</string>
@@ -165,7 +184,8 @@
   <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ą (rekomenduojama)</string>
+  <string name="register_username">Registruoti viešąjį naudotojo vardą</string>
+  <string name="register_recommended">Rekomenduojamas</string>
   <string name="username_already_taken">Naudotojo vardas jau užimtas</string>
   <string name="invalid_username">Neteisingas naudotojo vardas</string>
   <string name="unknown_error">Nežinoma klaida. Patikrinkite savo tinklo ryšį!</string>
diff --git a/ring-android/app/src/main/res/values-lt/strings_call.xml b/ring-android/app/src/main/res/values-lt/strings_call.xml
index 7e74801..aa44b79 100644
--- a/ring-android/app/src/main/res/values-lt/strings_call.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_call.xml
@@ -34,6 +34,7 @@
     <string name="call_human_state_busy">Užimta</string>
     <string name="call_human_state_failure">Nepavyko</string>
     <string name="call_human_state_hold">Užlaikyta</string>
+    <string name="call_human_state_unhold">Nesulaikyta</string>
     <string name="call_human_state_over">Baigta</string>
     <!-- Conferences -->
 </resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-lt/strings_preferences.xml b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
index c8afac6..128c2de 100644
--- a/ring-android/app/src/main/res/values-lt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-lt/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Išvalyti visą pokalbių istoriją. Šio veiksmo negalima bus atšaukti.</string>
   <string name="pref_persistNotification_title">Paleisti fone</string>
   <string name="pref_persistNotification_summary">Leisti veikti fone, kad būtų priimami skambučiai ir žinutės.</string>
+  <!--Plugin-->
 </resources>
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 e78adfa..e2b55b4 100644
--- a/ring-android/app/src/main/res/values-mr/strings.xml
+++ b/ring-android/app/src/main/res/values-mr/strings.xml
@@ -38,4 +38,5 @@
   <!--Bottom Navigation-->
   <!--TV-->
   <string name="tv_audio_play">प्ले करा</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-mr/strings_preferences.xml b/ring-android/app/src/main/res/values-mr/strings_preferences.xml
index 63330ea..605151b 100644
--- a/ring-android/app/src/main/res/values-mr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-mr/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_video">व्हिडिओ</string>
+  <!--Plugin-->
 </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 5f6c4ca..255d2dd 100644
--- a/ring-android/app/src/main/res/values-ms/strings.xml
+++ b/ring-android/app/src/main/res/values-ms/strings.xml
@@ -84,6 +84,7 @@
   <string name="prompt_new_password">Kata laluan baharu</string>
   <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-->
   <string name="open_the_gallery">Buka galeri</string>
   <string name="take_a_photo">Ambil gambar</string>
@@ -102,4 +103,6 @@
   <string name="navigation_item_account">Akaun</string>
   <!--TV-->
   <string name="tv_audio_play">Main</string>
+  <!--WIZARD-->
+  <string name="wizard_password_skip">Cipta akaun</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ms/strings_preferences.xml b/ring-android/app/src/main/res/values-ms/strings_preferences.xml
index b693dc8..af620e2 100644
--- a/ring-android/app/src/main/res/values-ms/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ms/strings_preferences.xml
@@ -9,4 +9,5 @@
   <string name="pref_systemContacts_title">Gunakan buku kenalan sistem</string>
   <string name="pref_systemContacts_summary">Gunakan buku kenalan sistem untuk memaparkan maklumat pemanggil</string>
   <string name="pref_clearHistory_title">Padamkan sejarah</string>
+  <!--Plugin-->
 </resources>
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 7bccf8a..f35e015 100644
--- a/ring-android/app/src/main/res/values-nb/strings.xml
+++ b/ring-android/app/src/main/res/values-nb/strings.xml
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Gjenta nytt passord</string>
   <string name="account_create_title">Opprett en Jami-konto</string>
   <string name="prompt_new_username">Skriv inn nytt brukernavn</string>
+  <string name="prompt_hint_username">Brukernavn</string>
   <string name="help_password_choose">Velg et sterkt passord som du husker, for å beskytte Jami-kontoen din.</string>
-  <string name="help_password_enter">Skriv inn hovedpassord for Jami-kontoen din</string>
-  <string name="help_server_enter">Angi URL til administrasjonsserveren</string>
   <string name="help_pin_enter">Skriv inn PIN fra en annen ferdig oppsatt Jami-konto.  Bruk «Eksporter Jami-konto»-valget for å få tak i en PIN.</string>
   <string name="wizard_next">Neste</string>
   <string name="wizard_back">Tilbake</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">Din profil deles bare med dine kontakter</string>
   <string name="open_the_gallery">Åpne galleriet</string>
   <string name="take_a_photo">Ta et bilde</string>
-  <string name="profile_name_hint">Skriv inn ditt navn (valgfritt)</string>
   <!--Share fragment-->
   <string name="share_message">Søk etter denne koden med Jami</string>
   <string name="share_message_no_account">Velg en konto å dele.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Ny kontaktforespørsel</string>
   <string name="contact_request_msg">Du har %1$s kontaktforspørsler</string>
   <string name="contact_request_account">For %1$s</string>
-  <string name="no_requests">0 kontaktforespørsler</string>
   <string name="message_contact_not_trusted_yet">%s er ikke i din kontaktliste enda.\nØnsker du å godta eller avslå denne kontaktforespørselen?</string>
   <string name="message_contact_not_trusted">%s er ikke blant dine kontakter.\nLegg til ny kontakt?</string>
   <!--Send contact requests-->
@@ -205,7 +202,6 @@
   <string name="send_request_title">Send en kontaktforespørsel</string>
   <string name="send_request_msg">Du må sende en kontaktforespørsel for å kommunisere med denne brukeren. Så lenge din kontakt ikke har godtatt forespørselen, kan du sende meldinger som din kontakt ikke kan lese.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blokkerte kontakter</string>
   <!--Smartlist-->
   <string name="no_contact_request">Ingen kontaktforespørsel sendt</string>
   <string name="contact_request_sent">Kontaktforespørsel sendt</string>
@@ -261,4 +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-->
+  <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 38a06d5..a8975c4 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
@@ -88,6 +88,7 @@
   <string name="account_credentials_add">Legg til identitetsdetaljer</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Sikkerhet</string>
+  <string name="account_srtp_switch_label">Krypter mediastrømmer (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Bruk TLS-transport</string>
@@ -144,7 +145,7 @@
   <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 (anbefales)</string>
+  <string name="register_username">Registrer offentlig brukernavn</string>
   <string name="username_already_taken">Brukernavnet er allerede i bruk</string>
   <string name="invalid_username">Ugyldig brukernavn</string>
   <string name="looking_for_username_availability">Sjekker hvorvidt brukernavnet er tilgjengelig…</string>
diff --git a/ring-android/app/src/main/res/values-nb/strings_preferences.xml b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
index d64f60a..bd87bac 100644
--- a/ring-android/app/src/main/res/values-nb/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nb/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Tøm samtalehistorikken. Denne handlingen kan ikke angres.</string>
   <string name="pref_persistNotification_title">Kjør i bakgrunnen</string>
   <string name="pref_persistNotification_summary">Tillater kjøring i bakgrunnen for å motta samtaler og meldinger.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings.xml b/ring-android/app/src/main/res/values-nl-rBE/strings.xml
index 343b698..9530d22 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
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Herhaal nieuw paswoord</string>
   <string name="account_create_title">Een Jami-account aanmaken</string>
   <string name="prompt_new_username">Geef nieuwe gebruikersnaam in</string>
+  <string name="prompt_hint_username">Gebruikersnaam</string>
   <string name="help_password_choose">Kies een sterk paswoord om uw Jami-account te beschermen.</string>
-  <string name="help_password_enter">Geef het hoofdpaswoord van uw Jami-account in</string>
-  <string name="help_server_enter">Geef URL van beheerserver in</string>
   <string name="help_pin_enter">Geef de pincode in vanuit uw Jami-account die al is geconfigureerd op een ander apparaat. Gebruik de functie ‘Jami-account exporteren’ om een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">Uw profiel wordt enkel gedeeld met uw contacten</string>
   <string name="open_the_gallery">Galerij openen</string>
   <string name="take_a_photo">Foto nemen</string>
-  <string name="profile_name_hint">Geef uw naam in (optioneel)</string>
   <!--Share fragment-->
   <string name="share_message">Scan deze code met Jami</string>
   <string name="share_message_no_account">Selecteer een account om te delen.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Nieuw contactverzoek</string>
   <string name="contact_request_msg">U heeft %1$s contactverzoeken</string>
   <string name="contact_request_account">Voor %1$s</string>
-  <string name="no_requests">0 contactverzoeken</string>
   <string name="message_contact_not_trusted_yet">%s staat nog niet in uw contacten.\nWilt u dit contactverzoek aanvaarden of weigeren?</string>
   <string name="message_contact_not_trusted">%s staat niet in uw contacten.\nNieuw contact toevoegen?</string>
   <!--Send contact requests-->
@@ -205,7 +202,7 @@
   <string name="send_request_title">Contactverzoek versturen</string>
   <string name="send_request_msg">U moet een contactverzoek versturen om met deze gebruiker te communiceren. U kunt berichten versturen, maar zolang de ander het verzoek niet aanvaardt zal hij/zij deze niet kunnen beantwoorden.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 geblokkeerde contacten</string>
+  <string name="no_blocked_contact">Geen geblokkeerde contacten</string>
   <!--Smartlist-->
   <string name="no_contact_request">Geen contactverzoek verstuurd</string>
   <string name="contact_request_sent">Contactverzoek verstuurd</string>
@@ -261,4 +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-->
+  <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 21107c3..ed0c804 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
@@ -95,6 +95,7 @@
   <string name="account_credentials_add">Legitimatie toevoegen</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Beveiliging</string>
+  <string name="account_srtp_switch_label">Mediastreams versleutelen (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">TLS-transport gebruiken</string>
@@ -148,7 +149,6 @@
   <string name="account_sip_success_title">SIP-account geregistreerd</string>
   <string name="account_sip_success_message">Uw SIP-account is met succes geregistreerd.</string>
   <string name="account_sip_register_anyway">Toch registreren</string>
-  <string name="account_link_device">Verbinden vanaf ander apparaat</string>
   <string name="account_link_button">Verbinden uit netwerk</string>
   <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Geef pincode in</string>
@@ -173,7 +173,7 @@
   <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 (aanbevolen)</string>
+  <string name="register_username">Registreer een openbare gebruikersnaam</string>
   <string name="username_already_taken">Gebruikersnaam reeds in gebruik</string>
   <string name="invalid_username">Ongeldige gebruikersnaam</string>
   <string name="unknown_error">Onbekende fout. Controleer uw netwerkverbinding!</string>
diff --git a/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml b/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
index 6afeafe..bc8cfb0 100644
--- a/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl-rBE/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Wis de geschiedenis van alle gesprekken. Deze handeling kan niet ongedaan gemaakt worden.</string>
   <string name="pref_persistNotification_title">Uitvoeren in achtergrond</string>
   <string name="pref_persistNotification_summary">Maakt het mogelijk om in de achtergrond oproepen en berichten te ontvangen.</string>
+  <!--Plugin-->
 </resources>
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 83f9746..8119d1c 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
@@ -44,6 +44,7 @@
   <string name="conversation_action_copy_peer_number">Kopieër nummer</string>
   <string name="conversation_action_select_peer_number">Selecteer een nummer</string>
   <!--Contacts-->
+  <string name="prompt_hint_username">Gebruikersnaam</string>
   <!--MenuHeaderView-->
   <!--Share fragment-->
   <!--Pending contact requests-->
@@ -55,4 +56,5 @@
   <!--Bottom Navigation-->
   <!--TV-->
   <string name="tv_audio_play">Spelen</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-nl-rNL/strings_preferences.xml b/ring-android/app/src/main/res/values-nl-rNL/strings_preferences.xml
index 3cb4f0d..ecd3798 100644
--- a/ring-android/app/src/main/res/values-nl-rNL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl-rNL/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_video">Beeld</string>
+  <!--Plugin-->
 </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 c91ac00..7c48309 100644
--- a/ring-android/app/src/main/res/values-nl/strings.xml
+++ b/ring-android/app/src/main/res/values-nl/strings.xml
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Herhaal nieuwe wachtwoord</string>
   <string name="account_create_title">Een Jami-account aanmaken</string>
   <string name="prompt_new_username">Voer nieuwe gebruikersnaam in</string>
+  <string name="prompt_hint_username">Gebruikersnaam</string>
   <string name="help_password_choose">Kies een sterk wachtwoord om uw Jami-account te beschermen.</string>
-  <string name="help_password_enter">Voer het hoofdwachtwoord van uw Jami-account in</string>
-  <string name="help_server_enter">Voer URL van beheerserver in</string>
   <string name="help_pin_enter">Voer de pincode in vanuit uw Jami-account dat al is geconfigureerd op een ander apparaat. Gebruik de functie ‘Jami-account exporteren’ om een pincode te verkrijgen.</string>
   <string name="wizard_next">Volgende</string>
   <string name="wizard_back">Terug</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">Uw profiel wordt enkel gedeeld met uw contacten</string>
   <string name="open_the_gallery">Galerij openen</string>
   <string name="take_a_photo">Foto nemen</string>
-  <string name="profile_name_hint">Voer uw naam in (optioneel)</string>
   <!--Share fragment-->
   <string name="share_message">Scan deze code met Jami</string>
   <string name="share_message_no_account">Selecteer een account om te delen.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Nieuw contactverzoek</string>
   <string name="contact_request_msg">U heeft %1$s contactverzoeken</string>
   <string name="contact_request_account">Voor %1$s</string>
-  <string name="no_requests">0 contactverzoeken</string>
   <string name="message_contact_not_trusted_yet">%s staat nog niet in uw contacten.\nWilt u dit contactverzoek accepteren of weigeren?</string>
   <string name="message_contact_not_trusted">%s staat niet in uw contacten.\nNieuw contact toevoegen?</string>
   <!--Send contact requests-->
@@ -205,7 +202,7 @@
   <string name="send_request_title">Contactverzoek versturen</string>
   <string name="send_request_msg">U dient een contactverzoek te versturen om met deze gebruiker te communiceren. U kunt berichten versturen, maar zolang de ander het verzoek niet accepteert zal hij/zij deze niet kunnen beantwoorden.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 geblokkeerde contacten</string>
+  <string name="no_blocked_contact">Geen geblokkeerde contacten</string>
   <!--Smartlist-->
   <string name="no_contact_request">Geen contactverzoek verstuurd</string>
   <string name="contact_request_sent">Contactverzoek verstuurd</string>
@@ -260,4 +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-->
+  <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 c6e9bd8..7d2a29e 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
@@ -95,6 +95,7 @@
   <string name="account_credentials_add">Legitimatie toevoegen</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Beveiliging</string>
+  <string name="account_srtp_switch_label">Mediastreams versleutelen (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">TLS-transport gebruiken</string>
@@ -148,7 +149,6 @@
   <string name="account_sip_success_title">SIP-account geregistreerd</string>
   <string name="account_sip_success_message">Uw SIP-account is met succes geregistreerd.</string>
   <string name="account_sip_register_anyway">Toch registreren</string>
-  <string name="account_link_device">Verbinden vanaf ander apparaat</string>
   <string name="account_link_button">Verbinden uit netwerk</string>
   <string name="account_link_archive_button">Verbinden uit back-up</string>
   <string name="account_link_prompt_pin">Voer pincode in</string>
@@ -173,7 +173,7 @@
   <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 (aanbevolen)</string>
+  <string name="register_username">Registreer een openbare gebruikersnaam</string>
   <string name="username_already_taken">Gebruikersnaam reeds in gebruik</string>
   <string name="invalid_username">Ongeldige gebruikersnaam</string>
   <string name="unknown_error">Onbekende fout. Controleer uw netwerkverbinding!</string>
diff --git a/ring-android/app/src/main/res/values-nl/strings_preferences.xml b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
index 6afeafe..bc8cfb0 100644
--- a/ring-android/app/src/main/res/values-nl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-nl/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Wis de geschiedenis van alle gesprekken. Deze handeling kan niet ongedaan gemaakt worden.</string>
   <string name="pref_persistNotification_title">Uitvoeren in achtergrond</string>
   <string name="pref_persistNotification_summary">Maakt het mogelijk om in de achtergrond oproepen en berichten te ontvangen.</string>
+  <!--Plugin-->
 </resources>
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 830d53b..d2fdd75 100644
--- a/ring-android/app/src/main/res/values-oc/strings.xml
+++ b/ring-android/app/src/main/res/values-oc/strings.xml
@@ -1,12 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--About-->
+  <string name="description">Jami es un logicial liure per comunicacions universalas que respèctan la libertat e la vida privada de sos utilizaires.</string>
+  <string name="credits">Crèdit</string>
   <!--About dialog-->
   <!--RingActivity-->
+  <string name="error_no_network">Cap de connectivitat ret</string>
   <!--AB menus-->
   <!--Sections-->
   <string name="menu_item_contact_request">Demanda de contacte</string>
   <string name="menu_item_settings">Paramètres</string>
+  <string name="menu_item_about">A prepaus de Jami</string>
   <!--Dialing Fragment-->
   <!--History Fragment-->
   <!--DetailsHistory Fragment-->
@@ -16,9 +20,13 @@
   <!--TransferDFragment-->
   <!--Notifications-->
   <!--Call Fragment-->
+  <string name="action_call_decline">Regetar</string>
+  <string name="hist_contact_added">Contacte ajustat</string>
+  <string name="hist_invitation_received">Invitacion recebuda</string>
   <!--Text messages-->
   <!--MediaPreferenceFragment-->
   <!--Ringtone activity-->
+  <string name="ringtone_error_title">Error</string>
   <!--Read contacts permission-->
   <!--Write call log permission-->
   <!--QRCode Scan-->
@@ -27,23 +35,32 @@
   <string name="conversation_action_history_clear">Escafar l’istoric</string>
   <string name="conversation_action_block_this">Blocar contacte</string>
   <!--Contacts-->
+  <string name="prompt_new_password">Senhal novèl</string>
+  <string name="account_create_title">Crear un compte Jami</string>
+  <string name="prompt_hint_username">Nom d’utilizaire</string>
   <string name="wizard_next">Seguent</string>
+  <string name="wizard_back">Tornar</string>
   <string name="wizard_skip">Saultar</string>
   <!--MenuHeaderView-->
   <string name="profile">Perfil</string>
   <!--Share fragment-->
+  <string name="generic_error_migration">Error</string>
   <!--Pending contact requests-->
   <string name="accept">Acceptar</string>
   <string name="refuse">Refusar</string>
+  <string name="block">Blocar</string>
   <!--Send contact requests-->
   <string name="send_request_button">Enviar</string>
   <!--Blacklist-->
   <!--Smartlist-->
   <!--File Transfer-->
+  <string name="menu_message_copy">Copiar</string>
+  <string name="menu_delete">Suprimir</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Discutidas</string>
   <string name="navigation_item_contact_request">Demanda de contacte</string>
   <string name="navigation_item_account">Compte</string>
   <!--TV-->
   <string name="tv_dialog_send">Enviar</string>
+  <!--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 390ed3c..584684d 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
@@ -1,27 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Suprimir</string>
+  <string name="ic_advanced_menu">Paramètres avançats</string>
+  <string name="ic_blacklist_menu">Contactes blocats</string>
   <!--Strings related to account creation-->
+  <string name="prompt_username">Nom d’utilizaire</string>
   <string name="prompt_password">Senha</string>
+  <string name="action_create_short">Crear</string>
   <string name="action_settings">Paramètres</string>
   <!--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>
   <string name="account_password_label">Senha</string>
+  <string name="account_proxy_field">Servidor mandatari</string>
   <!--Audio Details-->
+  <string name="account_audio_label">Àudio</string>
   <string name="account_preferences_media_tab">Mèdia</string>
   <!--Video Details-->
+  <string name="account_video_label">Vidèo</string>
   <!--Advanced Details-->
+  <string name="account_turn_enable_label">Utilizar TURN</string>
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Seguretat</string>
   <!--SIP-->
   <!--TLS Details-->
   <!--restore/backup-->
+  <string name="account_export_end_network_title">Error ret</string>
+  <string name="account_export_end_error_title">Error</string>
+  <string name="account_cannot_be_found_title">Impossible de trobar aqueste compte</string>
+  <string name="account_no_network_title">Connexion impossibla a la ret</string>
+  <string name="account_new_button">Crear un compte Jami</string>
+  <string name="account_connect_prompt_username">Nom d’utilizaire</string>
   <!--Name registration-->
+  <string name="username_already_taken">Nom d’utilizaire ja pres</string>
+  <string name="invalid_username">Nom d’utilizaire invalid</string>
+  <string name="account_status_connecting">Connexion</string>
   <string name="account_status_online">En linha</string>
+  <string name="account_status_unknown">Desconegut</string>
   <string name="account_status_offline">Fòra linha</string>
+  <string name="account_status_error">Error</string>
   <!--Create account-->
   <!--Edit profile-->
   <!--Devices-->
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
new file mode 100644
index 0000000..d360199
--- /dev/null
+++ b/ring-android/app/src/main/res/values-oc/strings_call.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+    <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-oc/strings_preferences.xml b/ring-android/app/src/main/res/values-oc/strings_preferences.xml
index 19a6ec4..aa7c8e0 100644
--- a/ring-android/app/src/main/res/values-oc/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-oc/strings_preferences.xml
@@ -1,5 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="pref_category_video">Vidèo</string>
   <string name="pref_category_system">Sistèma</string>
   <string name="pref_clearHistory_title">Escafar l’istoric</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-pa/strings.xml b/ring-android/app/src/main/res/values-pa/strings.xml
index 2c4bdeb..5624cba 100644
--- a/ring-android/app/src/main/res/values-pa/strings.xml
+++ b/ring-android/app/src/main/res/values-pa/strings.xml
@@ -146,8 +146,8 @@
   <string name="prompt_new_password_repeat">ਨਵਾਂ ਪਾਸਵਰਡ ਦੁਹਰਾਓ</string>
   <string name="account_create_title">Jami ਖਾਤਾ ਬਣਾਓ</string>
   <string name="prompt_new_username">ਨਵਾਂ ਵਰਤੋਂਕਾਰ ਨਾਮ ਦਾਖਲ ਕਰੋ</string>
+  <string name="prompt_hint_username">ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <string name="help_password_choose">ਆਪਣੇ Jami ਖਾਤੇ ਨੂੰ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਲਈ ਅਜਿਹਾ ਮਜ਼ਬੂਤ ਪਾਸਵਰਡ ਚੁਣੋ ਜੋ ਤੁਹਾਨੂੰ ਯਾਦ ਰਹੇ।</string>
-  <string name="help_password_enter">ਆਪਣਾ ਮੁੱਖ Jami ਖਾਤਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰੋ</string>
   <string name="help_pin_enter">ਕਿਸੇ ਹੋਰ ਸੰਰੂਪਣ ਕੀਤੇ Jami ਖਾਤੇ ਤੋਂ ਪਿੰਨ ਦਾਖਲ ਕਰੋ। ਪਿੰਨ ਹਾਸਲ ਕਰਨ ਲਈ \"Jami ਖਾਤਾ ਨਿਰਯਾਤ ਕਰੋ\" ਵਿਸ਼ੇਸ਼ਤਾ ਵਰਤੋ।</string>
   <string name="wizard_next">ਅੱਗੇ</string>
   <string name="wizard_back">ਪਿੱਛੇ</string>
@@ -156,7 +156,6 @@
   <string name="profile_message_warning">ਤੁਹਾਡਾ ਪ੍ਰੋਫਾਈਲ ਸਿਰਫ਼ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਨਾਲ ਸਾਂਝਾ ਕੀਤਾ ਜਾਂਦਾ ਹੈ</string>
   <string name="open_the_gallery">ਗੈਲਰੀ ਖੋਲ੍ਹੋ</string>
   <string name="take_a_photo">ਫ਼ੋਟੋ ਖਿੱਚੋ</string>
-  <string name="profile_name_hint">ਆਪਣਾ ਨਾਮ ਦਾਖਲ ਕਰੋ (ਵਿਕਲਪਿਕ)</string>
   <!--Share fragment-->
   <string name="share_message">Jami ਨਾਲ ਇਹ ਕੋਡ ਸਕੈਨ ਕਰੋ</string>
   <string name="share_message_no_account">ਕਿਰਪਾ ਕਰਕੇ ਸਾਂਝਾ ਕਰਨ ਲਈ ਕੋਈ ਖਾਤਾ ਚੁਣੋ।</string>
@@ -171,7 +170,6 @@
   <string name="contact_request_title">ਨਵੀਂ ਸੰਪਰਕ ਬੇਨਤੀ</string>
   <string name="contact_request_msg">ਤੁਹਾਡੇ ਕੋਲ %1$s ਸੰਪਰਕ ਬੇਨਤੀਆਂ ਹਨ</string>
   <string name="contact_request_account">%1$s ਲਈ</string>
-  <string name="no_requests">0 ਸੰਪਰਕ ਬੇਨਤੀ</string>
   <string name="message_contact_not_trusted_yet">%s ਫਿਲਹਾਲ ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਨਹੀਂ ਹਨ।\nਕੀ ਤੁਸੀਂ ਇਹ ਸੰਪਰਕ ਬੇਨਤੀ ਮਨਜ਼ੂਰ ਜਾਂ ਨਾ-ਮਨਜ਼ੂਰ ਕਰਨੀ ਹੈ?</string>
   <string name="message_contact_not_trusted">%s ਤੁਹਾਡੇ ਸੰਪਰਕਾਂ ਵਿੱਚ ਨਹੀਂ ਹਨ।\nਨਵਾਂ ਸੰਪਰਕ ਸ਼ਾਮਲ ਕਰੀਏ?</string>
   <!--Send contact requests-->
@@ -179,7 +177,6 @@
   <string name="send_request_title">ਸੰਪਰਕ ਬੇਨਤੀ ਭੇਜੋ</string>
   <string name="send_request_msg">ਇਸ ਵਰਤੋਂਕਾਰ ਨਾਲ ਸੰਚਾਰ ਕਰਨ ਲਈ ਤੁਹਾਡਾ ਸੰਪਰਕ ਬੇਨਤੀ ਭੇਜਣਾ ਲਾਜ਼ਮੀ ਹੈ। ਤੁਹਾਡੇ ਸੰਪਰਕ ਵੱਲੋਂ ਬੇਨਤੀ ਮਨਜ਼ੂਰ ਨਾ ਕੀਤੇ ਜਾਣ ਤੱਕ, ਤੁਸੀਂ ਸੁਨੇਹੇ ਭੇਜ ਸਕਦੇ ਹੋ ਪਰ ਉਹ ਜਵਾਬ ਨਹੀਂ ਦੇ ਸਕਣਗੇ।</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">ਬਲਾਕ ਕੀਤਾ 0 ਸੰਪਰਕ</string>
   <!--Smartlist-->
   <string name="no_contact_request">ਕੋਈ ਵੀ ਸੰਪਰਕ ਬੇਨਤੀ ਨਹੀਂ ਭੇਜੀ ਗਈ</string>
   <string name="contact_request_sent">ਸੰਪਰਕ ਬੇਨਤੀ ਭੇਜੀ ਗਈ</string>
@@ -219,4 +216,6 @@
   <!--TV-->
   <string name="tv_audio_play">ਚਲਾਓ</string>
   <string name="tv_dialog_send">ਭੇਜੋ</string>
+  <!--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 66479ca..dfc0ac0 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
@@ -164,7 +164,6 @@
   <string name="register_name">ਨਾਂ ਦਾ ਪੰਜੀਕਰਨ ਕਰੋ</string>
   <string name="trying_to_register_name">ਨਾਂ ਦੇ ਪੰਜੀਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
   <string name="registered_username">ਪੰਜੀਕਿਰਤ ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
-  <string name="register_username">ਜਨਤਕ ਵਰਤੋਂਕਾਰ ਨਾਂ ਦਾ ਪੰਜੀਕਰਨ ਕਰੋ (ਸਿਫ਼ਾਰਸ਼ੀ)</string>
   <string name="username_already_taken">ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲਿਆ ਗਿਆ</string>
   <string name="invalid_username">ਅਵੈਧ ਵਰਤੋਂਕਾਰ ਨਾਂ</string>
   <string name="looking_for_username_availability">ਵਰਤੋਂਕਾਰ ਨਾਂ ਦੀ ਉਪਲਬਧਤਾ ਲੱਭੀ ਜਾ ਰਹੀ ਹੈ…</string>
diff --git a/ring-android/app/src/main/res/values-pa/strings_preferences.xml b/ring-android/app/src/main/res/values-pa/strings_preferences.xml
index 5bf75ac..b249b32 100644
--- a/ring-android/app/src/main/res/values-pa/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pa/strings_preferences.xml
@@ -21,4 +21,5 @@
   <string name="pref_clearHistory_title">ਇਤਿਹਾਸ ਮਿਟਾਓ</string>
   <string name="pref_persistNotification_title">ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਓ</string>
   <string name="pref_persistNotification_summary">ਕਾਲਾਂ ਅਤੇ ਸੁਨੇਹੇ ਲੈਣ ਲਈ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦਿਓ।</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings.xml b/ring-android/app/src/main/res/values-pl-rPL/strings.xml
index 72f06fc..e99535a 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
@@ -143,8 +143,8 @@
   <string name="prompt_new_password_repeat">Powtórz nowe hasło</string>
   <string name="account_create_title">Utwórz konto Jami</string>
   <string name="prompt_new_username">Wprowadź nową nazwę użytkownika</string>
+  <string name="prompt_hint_username">Nazwa użytkownika</string>
   <string name="help_password_choose">Wybierz silne hasło, które zapamiętasz, by chronić swoje konto Jami.</string>
-  <string name="help_password_enter">Wprowadź hasło do głównego konta Jami</string>
   <string name="wizard_next">Następne</string>
   <string name="wizard_back">Wstecz</string>
   <string name="wizard_skip">Pomiń</string>
@@ -153,7 +153,6 @@
   <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
   <string name="open_the_gallery">Otwórz galerię</string>
   <string name="take_a_photo">Zrób zdjęcie</string>
-  <string name="profile_name_hint">Podaj swoje imię (opcjonalnie)</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Wybierz, proszę, konto które chcesz udostępnić.</string>
   <string name="share_your_account_information">Udostępnij informacje o moim kontakcie</string>
@@ -167,7 +166,6 @@
   <string name="contact_request_title">Nowe zaproszenie</string>
   <string name="contact_request_msg">Masz %1$s zaproszeń do dodania kontaktu</string>
   <string name="contact_request_account">Dla %1$s</string>
-  <string name="no_requests">Brak zaproszeń</string>
   <string name="message_contact_not_trusted_yet">%s nie jest jeszcze w kontaktach. Chcesz zaakceptować, czy odrzucić prośbę zaproszenia?</string>
   <string name="message_contact_not_trusted">%s nie jest jeszcze w kontaktach.\nDodać do kontaktów?</string>
   <!--Send contact requests-->
@@ -175,7 +173,6 @@
   <string name="send_request_title">Wyślij zaproszenie</string>
   <string name="send_request_msg">Musisz wysłać zaproszenie do kontaktów, by móc komunikować się z tym użytkownikiem. Dopóki użytkownik nie zaakceptuje zaproszenia, możesz wysyłać wiadomości, ale użytkownik nie będzie mógł odpowiadać.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 zablokowanych kontaktów</string>
   <!--Smartlist-->
   <string name="no_contact_request">Brak wysłanych zaproszeń</string>
   <string name="contact_request_sent">Wysłano zaproszenie</string>
@@ -212,4 +209,6 @@
   <!--TV-->
   <string name="tv_audio_play">Graj</string>
   <string name="tv_dialog_send">Wyślij</string>
+  <!--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 ded6e43..8d8f910 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
@@ -90,6 +90,7 @@
   <string name="account_credentials_add">Dodaj detale</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Zabezpieczenia</string>
+  <string name="account_srtp_switch_label">Szyfrowanie strumieni multimedialnych (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Korzystaj z transportu TLS</string>
@@ -149,7 +150,7 @@
   <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 publiczny login (zalecane)</string>
+  <string name="register_username">Zarejestruj publiczną nazwę użytkownika</string>
   <string name="username_already_taken">Nazwa użytkownika zajęta</string>
   <string name="invalid_username">Nieprawidłowa nazwa użytkownika</string>
   <string name="looking_for_username_availability">Sprawdzanie dostępności nazwy użytkownika...</string>
diff --git a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
index 18a868e..5ca6627 100644
--- a/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pl-rPL/strings_preferences.xml
@@ -12,4 +12,5 @@
   <string name="pref_systemContacts_title">Użyj kontakty z systemu</string>
   <string name="pref_systemContacts_summary">Użyj kontakty z systemu aby pokazać detale tego który dzwoni</string>
   <string name="pref_clearHistory_title">Wyczyść historię</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-pl/strings.xml b/ring-android/app/src/main/res/values-pl/strings.xml
index 99686da..c9fac60 100644
--- a/ring-android/app/src/main/res/values-pl/strings.xml
+++ b/ring-android/app/src/main/res/values-pl/strings.xml
@@ -152,8 +152,8 @@
   <string name="prompt_new_password_repeat">Powtórz nowe hasło</string>
   <string name="account_create_title">Stwórz konto Jami</string>
   <string name="prompt_new_username">Wprowadź nową nazwę użytkownika</string>
+  <string name="prompt_hint_username">Nazwa użytkownika</string>
   <string name="help_password_choose">Wybierz silne hasło, które zapamiętasz, by chronić swoje konto Jami.</string>
-  <string name="help_password_enter">Wprowadź hasło do głównego konta Jami</string>
   <string name="help_pin_enter">Wprowadź PIN z innego konta Jami. Użyj funkcji \"wyeksportuj konto Jami\" aby uzyskać PIN.</string>
   <string name="wizard_next">Następne</string>
   <string name="wizard_back">Wstecz</string>
@@ -163,7 +163,6 @@
   <string name="profile_message_warning">Twój profil jest udostępniany tylko twoim kontaktom</string>
   <string name="open_the_gallery">Otwórz galerię</string>
   <string name="take_a_photo">Zrób zdjęcie</string>
-  <string name="profile_name_hint">Podaj swoje imię (opcjonalnie)</string>
   <!--Share fragment-->
   <string name="share_message">Zeskanuj ten kod używając Jami</string>
   <string name="share_message_no_account">Wybierz, proszę, konto które chcesz udostępnić.</string>
@@ -178,7 +177,6 @@
   <string name="contact_request_title">Nowe zaproszenie</string>
   <string name="contact_request_msg">Masz %1$s zaproszeń do dodania kontaktu</string>
   <string name="contact_request_account">Dla %1$s</string>
-  <string name="no_requests">Brak zaproszeń</string>
   <string name="message_contact_not_trusted_yet">%s nie jest jeszcze w kontaktach. Chcesz zaakceptować, czy odrzucić prośbę zaproszenia?</string>
   <string name="message_contact_not_trusted">%s nie jest jeszcze w kontaktach.\nDodać do kontaktów?</string>
   <!--Send contact requests-->
@@ -186,7 +184,7 @@
   <string name="send_request_title">Wyślij zaproszenie</string>
   <string name="send_request_msg">Musisz wysłać zaproszenie do kontaktów, by móc komunikować się z tym użytkownikiem. Dopóki użytkownik nie zaakceptuje zaproszenia, możesz wysyłać wiadomości, ale użytkownik nie będzie mógł odpowiadać.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 zablokowanych kontaktów</string>
+  <string name="no_blocked_contact">Brak zablokowanych kontaktów</string>
   <!--Smartlist-->
   <string name="no_contact_request">Brak wysłanych zaproszeń</string>
   <string name="contact_request_sent">Wysłano zaproszenie</string>
@@ -232,4 +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-->
+  <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 0c7a5bf..ce838af 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
@@ -93,6 +93,7 @@
   <string name="account_credentials_add">Dodaj detale</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Zabezpieczenia</string>
+  <string name="account_srtp_switch_label">Szyfrowanie strumieni multimedialnych (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Korzystaj z transportu TLS</string>
@@ -165,7 +166,7 @@
   <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 publiczny login (zalecane)</string>
+  <string name="register_username">Zarejestruj publiczną nazwę użytkownika</string>
   <string name="username_already_taken">Nazwa użytkownika zajęta</string>
   <string name="invalid_username">Nieprawidłowa nazwa użytkownika</string>
   <string name="unknown_error">Nieznany błąd. Proszę sprawdź swoje połączenie sieciowe!</string>
diff --git a/ring-android/app/src/main/res/values-pl/strings_preferences.xml b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
index 596d191..7ec577f 100644
--- a/ring-android/app/src/main/res/values-pl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pl/strings_preferences.xml
@@ -21,4 +21,5 @@
   <string name="pref_clearHistory_title">Wyczyść historię</string>
   <string name="pref_persistNotification_title">Zezwalaj na pracę w tle</string>
   <string name="pref_persistNotification_summary">Zezwalaj na pracę w tle, aby odbierać rozmowy i wiadomości</string>
+  <!--Plugin-->
 </resources>
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 a11c6ce..eed2691 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
@@ -170,9 +170,8 @@
   <string name="prompt_new_password_repeat">Repita a nova senha</string>
   <string name="account_create_title">Criar uma conta no Jami</string>
   <string name="prompt_new_username">Entre novo nome de usuário</string>
+  <string name="prompt_hint_username">Nome de usuário</string>
   <string name="help_password_choose">Escolha uma senha difícil que você poderá lembrar para proteger a sua conta Jami. </string>
-  <string name="help_password_enter">Entre com a senha da sua conta Jami principal</string>
-  <string name="help_server_enter">Inserir URL do servidor de gerenciamento</string>
   <string name="help_pin_enter">Entre com o PIN de uma outra conta Jami já configurada. Utilize a opção \"exportar conta do Jami\" para obter um novo PIN.</string>
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
@@ -182,7 +181,6 @@
   <string name="profile_message_warning">Seu perfil é compartilhado apenas com seus contatos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
-  <string name="profile_name_hint">Insira o seu nome (opcional)</string>
   <!--Share fragment-->
   <string name="share_message">Digitalize este código com Jami</string>
   <string name="share_message_no_account">Por favor selecione uma conta para compartilhar.</string>
@@ -198,7 +196,6 @@
   <string name="contact_request_title">Nova requisição de contato</string>
   <string name="contact_request_msg">Você tem %1$s requisição de contato</string>
   <string name="contact_request_account">Para %1$s</string>
-  <string name="no_requests">0 solicitações de contato</string>
   <string name="message_contact_not_trusted_yet">%s não está em seus contatos ainda.\nVocê aceita ou recusa esta solicitação de contato?</string>
   <string name="message_contact_not_trusted">%s não está em seus contatos.\nDeseja adicionar novo contato?</string>
   <!--Send contact requests-->
@@ -206,7 +203,7 @@
   <string name="send_request_title">Enviar uma solicitação de contato</string>
   <string name="send_request_msg">Você deve enviar uma solicitação de contato para se comunicar com esse usuário. Enquanto seu contato não aceitar a solicitação, você pode enviar mensagens, mas ele não poderá respondê-las.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contatos bloqueados</string>
+  <string name="no_blocked_contact">Nenhum contato bloqueado</string>
   <!--Smartlist-->
   <string name="no_contact_request">Nenhuma solicitação de contato enviada</string>
   <string name="contact_request_sent">Solicitação de contato enviada</string>
@@ -265,4 +262,6 @@
   <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-->
+  <string name="wizard_password_skip">Criar conta</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_account.xml
index bd56e13..dfb2b6a 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">Adicionar credenciais</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Segurança</string>
+  <string name="account_srtp_switch_label">Encriptar fluxo de mídia (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Use transporte TLS</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">Conta SIP registrada</string>
   <string name="account_sip_success_message">Você registrou sua conta SIP com sucesso.</string>
   <string name="account_sip_register_anyway">Registrar mesmo assim</string>
-  <string name="account_link_device">Conecte-se de outro dispositivo</string>
   <string name="account_link_button">Conecte-se de outra rede</string>
   <string name="account_link_archive_button">Conectar-se a partir do backup</string>
   <string name="account_link_prompt_pin">Entre o PIN</string>
@@ -183,7 +183,7 @@
   <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 (recomendado)</string>
+  <string name="register_username">Registrar nome de usuário público</string>
   <string name="username_already_taken">Nome de usuário já em uso</string>
   <string name="invalid_username">Nome de usuário inválido</string>
   <string name="unknown_error">Erro desconhecido. Por favor, verifique sua conexão de rede!</string>
diff --git a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
index c89b74b..18b3038 100644
--- a/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rBR/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Limpar todo o histórico de conversas. Esta ação não pode ser desfeita.</string>
   <string name="pref_persistNotification_title">Executar em segundo-plano</string>
   <string name="pref_persistNotification_summary">Permitir execução em segundo-plano para receber chamadas e mensagens.</string>
+  <!--Plugin-->
 </resources>
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 e9aab32..1846190 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
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Repita a nova palavra-chave</string>
   <string name="account_create_title">Criar uma conta Jami</string>
   <string name="prompt_new_username">Introduza o seu nome de utilizador</string>
+  <string name="prompt_hint_username">Nome de utilizador</string>
   <string name="help_password_choose">Escolha uma palavra-chave forte que se lembre para proteger a sua conta Jami.</string>
-  <string name="help_password_enter">Introduza a palavra-chave da sua conta principal Jami</string>
-  <string name="help_server_enter">Introduza o URL do servidor de gestão</string>
   <string name="help_pin_enter">Introduza o seu PIN de uma outra conta Jami já configurada. Utilize a opção \"Exportar conta no Jami\" para obter um PIN.</string>
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">O seu perfil é partilhado apenas com seus contactos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
-  <string name="profile_name_hint">Introduza o seu nome (opcional)</string>
   <!--Share fragment-->
   <string name="share_message">Digitalizar este código com o Jami</string>
   <string name="share_message_no_account">Por favor selecione uma conta para partilhar.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Novo pedido de contacto</string>
   <string name="contact_request_msg">Tem %1$s pedidos de contacto</string>
   <string name="contact_request_account">Para %1$s</string>
-  <string name="no_requests">0 solicitações de contacto</string>
   <string name="message_contact_not_trusted_yet">%s ainda não está nos seus contactos.\nAceita ou recusa este pedido de contacto?</string>
   <string name="message_contact_not_trusted">%s não está nos seus contactos.\nAdicionar o novo contacto?</string>
   <!--Send contact requests-->
@@ -205,7 +202,7 @@
   <string name="send_request_title">Enviar uma solicitação de contacto</string>
   <string name="send_request_msg">Deve enviar um pedido de contacto para se comunicar com este utilizador. Enquanto o seu contacto não aceitar o pedido, pode enviar mensagens, mas ele não poderá respondê-las.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contactos bloqueados</string>
+  <string name="no_blocked_contact">Sem contactos bloqueados</string>
   <!--Smartlist-->
   <string name="no_contact_request">Nenhuma solicitação de contacto enviada</string>
   <string name="contact_request_sent">A solicitação de contacto foi enviada</string>
@@ -261,4 +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-->
+  <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 ac1027d..a7196db 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">Adicionar credenciais</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Segurança</string>
+  <string name="account_srtp_switch_label">Encriptar fluxo de média (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usar Transporte TLS</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">Conta SIP registada</string>
   <string name="account_sip_success_message">Registou a sua conta SIP com sucesso.</string>
   <string name="account_sip_register_anyway">Registar mesmo assim</string>
-  <string name="account_link_device">Ligar através de outro dispositivo</string>
   <string name="account_link_button">Conectar da rede</string>
   <string name="account_link_archive_button">Conectar da cópia de segurança</string>
   <string name="account_link_prompt_pin">Introduza o PIN</string>
@@ -183,7 +183,7 @@
   <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 (recomendado)</string>
+  <string name="register_username">Registar nome de utilizador público</string>
   <string name="username_already_taken">O nome de utilizador já está registado</string>
   <string name="invalid_username">O nome de utilizador não é válido</string>
   <string name="unknown_error">Erro desconhecido. Por favor verifique a sua ligação à rede!</string>
diff --git a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
index 05d51cd..a2c61d4 100644
--- a/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt-rPT/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Apagar o histórico de todas as conversas. Esta ação não pode ser revertida.</string>
   <string name="pref_persistNotification_title">Executar em segundo plano</string>
   <string name="pref_persistNotification_summary">Permite ser executado em segundo plano para receber chamadas e mensagens</string>
+  <!--Plugin-->
 </resources>
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 be598b4..42af0f2 100644
--- a/ring-android/app/src/main/res/values-pt/strings.xml
+++ b/ring-android/app/src/main/res/values-pt/strings.xml
@@ -150,8 +150,8 @@
   <string name="prompt_new_password_repeat">Repita a nova palavra-chave</string>
   <string name="account_create_title">Criar uma conta Jami</string>
   <string name="prompt_new_username">Introduza o seu nome de utilizador</string>
+  <string name="prompt_hint_username">Nome de utilizador</string>
   <string name="help_password_choose">Escolha uma palavra-chave forte que se lembre para proteger a sua conta Jami.</string>
-  <string name="help_password_enter">Introduza a palavra-chave da sua conta principal Jami</string>
   <string name="help_pin_enter">Introduza o seu PIN de uma outra conta Jami já configurada. Utilize a opção \"Exportar conta no Jami\" para obter um PIN.</string>
   <string name="wizard_next">Próximo</string>
   <string name="wizard_back">Voltar</string>
@@ -161,7 +161,6 @@
   <string name="profile_message_warning">O seu perfil é partilhado apenas com seus contactos</string>
   <string name="open_the_gallery">Abrir a galeria</string>
   <string name="take_a_photo">Tirar uma foto</string>
-  <string name="profile_name_hint">Introduza o seu nome (opcional)</string>
   <!--Share fragment-->
   <string name="share_message">Digitalizar este código com o Jami</string>
   <string name="share_message_no_account">Por favor selecione uma conta para partilhar.</string>
@@ -176,7 +175,6 @@
   <string name="contact_request_title">Novo pedido de contacto</string>
   <string name="contact_request_msg">Tem %1$s pedidos de contacto</string>
   <string name="contact_request_account">Para %1$s</string>
-  <string name="no_requests">0 solicitações de contacto</string>
   <string name="message_contact_not_trusted_yet">%s ainda não está nos seus contactos.\nAceita ou recusa este pedido de contacto?</string>
   <string name="message_contact_not_trusted">%s não está nos seus contactos.\nAdicionar o novo contacto?</string>
   <!--Send contact requests-->
@@ -184,7 +182,7 @@
   <string name="send_request_title">Enviar uma solicitação de contacto</string>
   <string name="send_request_msg">Deve enviar um pedido de contacto para se comunicar com este utilizador. Enquanto o seu contacto não aceitar o pedido, pode enviar mensagens, mas ele não poderá respondê-las.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 contactos bloqueados</string>
+  <string name="no_blocked_contact">Sem contactos bloqueados</string>
   <!--Smartlist-->
   <string name="no_contact_request">Nenhuma solicitação de contacto enviada</string>
   <string name="contact_request_sent">A solicitação de contacto foi enviada</string>
@@ -227,4 +225,6 @@
   <string name="tv_audio_play">Reproduzir</string>
   <string name="tv_audio_pause">Pausa</string>
   <string name="tv_dialog_send">Enviar</string>
+  <!--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 e19a28b..791dfb2 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
@@ -93,6 +93,7 @@
   <string name="account_credentials_add">Adicionar credenciais</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Segurança</string>
+  <string name="account_srtp_switch_label">Encriptar fluxo de média (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Usar Transporte TLS</string>
@@ -165,7 +166,7 @@
   <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 (recomendado)</string>
+  <string name="register_username">Registar nome de utilizador público</string>
   <string name="username_already_taken">O nome de utilizador já está registado</string>
   <string name="invalid_username">O nome de utilizador não é válido</string>
   <string name="unknown_error">Erro desconhecido. Por favor verifique a sua ligação à rede!</string>
diff --git a/ring-android/app/src/main/res/values-pt/strings_preferences.xml b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
index f14ba64..2ff926b 100644
--- a/ring-android/app/src/main/res/values-pt/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-pt/strings_preferences.xml
@@ -21,4 +21,5 @@
   <string name="pref_clearHistory_title">Limpar histórico</string>
   <string name="pref_persistNotification_title">Executar em segundo plano</string>
   <string name="pref_persistNotification_summary">Permite ser executado em segundo plano para receber chamadas e mensagens</string>
+  <!--Plugin-->
 </resources>
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
new file mode 100644
index 0000000..4b5ea90
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings.xml
@@ -0,0 +1,289 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--About-->
+  <string name="feedback_section">Părere</string>
+  <string name="report"><u>Trimite-ne un mesaj</u></string>
+  <string name="section_license">Licență</string>
+  <string name="sponsor_section">Jami este un program liber, creat și susținut de</string>
+  <string name="copyright_section">Drepturi de autor</string>
+  <string name="contribute_section">Contribuie</string>
+  <string name="version_section">Versiune</string>
+  <string name="no_email_app_installed">Nu a fost găsită o aplicație de poștă electronică. Instalează una pentru a ne putea trimite un raport.</string>
+  <string name="no_browser_app_installed">Nu a fost găsită o aplicație navigator web. Instalează una pentru a vedea această pagină.</string>
+  <string name="email_chooser_title">Trimite mesaj folosind...</string>
+  <string name="website_chooser_title">Vezi adresa de internet folosind...</string>
+  <string name="license">Acest program este furnizat \"așa cum este\", fără nicio garanție. Pentru detalii, vezi <u>GNU General Public License versiunea 3 sau următoarele</u></string>
+  <string name="description">Jami este un program liber pentru comunicare universală care respectă libertățile și intimitatea utilizatorilor săi.</string>
+  <string name="credits">Merite</string>
+  <string name="call_service_description">Acest serviciu este necesar pentru a vă menține apelurile în prim plan. Funcționează numai în timpul apelurilor.</string>
+  <string name="data_transfer_service_description">Acest serviciu este necesar pentru a afișa notificări persistente în timpul transferurilor de fișiere. Funcționează numai în timpul transferurilor de fișiere.</string>
+  <!--About dialog-->
+  <string name="developed_by">Creat de</string>
+  <string name="designed_by">Proiectat de</string>
+  <string name="ringtones_by">Sonerii de</string>
+  <!--RingActivity-->
+  <string name="error_no_network">Nicio legătură la rețea</string>
+  <string name="error_mobile_network_available_but_disabled">Te rugăm să permiți accesul la rețeaua de telefonie în Reglări.</string>
+  <!--AB menus-->
+  <string name="ab_action_chat">Mesaje text</string>
+  <!--Sections-->
+  <string name="menu_item_contact_request">Cereri de contact</string>
+  <string name="menu_item_accounts">Gestionează conturile</string>
+  <string name="menu_item_account">Gestionează cont</string>
+  <string name="menu_item_settings">Reglări</string>
+  <string name="menu_item_plugin_list">Reglări Extensii</string>
+  <string name="menu_item_share">Distribuie datele mele de contact</string>
+  <string name="menu_item_about">Despre Jami</string>
+  <!--Dialing Fragment-->
+  <string name="dial_number">Formează un număr</string>
+  <!--History Fragment-->
+  <!--DetailsHistory Fragment-->
+  <!--Home Fragment-->
+  <plurals name="home_conferences_title">
+    <item quantity="one">%d Conversation</item>
+    <item quantity="few">%d Conversații</item>
+    <item quantity="other">%d Conversații</item>
+  </plurals>
+  <!--ContactList Fragment-->
+  <string name="searchbar_hint">Caută nume sau număr de telefon...</string>
+  <string name="choose_number">Alege un număr</string>
+  <!--FileExplorerDFragement-->
+  <!--TransferDFragment-->
+  <!--Notifications-->
+  <string name="notif_missed_incoming_call">Apel pierdut</string>
+  <string name="notif_missed_outgoing_call">Apelul efectuat a fost pierdut</string>
+  <string name="notif_incoming_call_title">Apel primit de la %1$s</string>
+  <string name="notif_incoming_call">Apel primit</string>
+  <string name="notif_outgoing_call_title">Apel efectuat către %1$s</string>
+  <string name="notif_outgoing_call">Apel efectuat</string>
+  <string name="notif_current_call_title">Apel în curs cu %1$s</string>
+  <string name="notif_current_call">Apel în curs</string>
+  <string name="notif_channel_call_in_progress">Apelare în curs</string>
+  <string name="notif_channel_calls">Apeluri</string>
+  <string name="notif_channel_missed_calls">Apeluri pierdute</string>
+  <string name="notif_channel_incoming_calls">Apeluri primite</string>
+  <string name="notif_channel_messages">Mesaje</string>
+  <string name="notif_channel_requests">Cereri</string>
+  <string name="notif_channel_file_transfer">Transfer de fișier</string>
+  <string name="notif_channel_sync">Sincronizarea datelor</string>
+  <string name="notif_channel_background_service">Serviciu în fundal</string>
+  <string name="notif_channel_background_service_descr">Permite primirea de apeluri și mesaje oricând.</string>
+  <string name="notif_group_calls">Apeluri</string>
+  <string name="notif_background_service">Jami funcționează acum în fundal</string>
+  <string name="notif_mark_as_read">Bifează ca citit</string>
+  <string name="notif_dismiss">Ignoră</string>
+  <string name="notif_reply">Răspunde</string>
+  <string name="notif_incoming_file_transfer_title">Fișier primit de la %1$s</string>
+  <string name="notif_outgoing_file_transfer_title">Se trimite fișierul către %1$s</string>
+  <string name="notif_incoming_picture">Fotografie de la %1$s</string>
+  <string name="notif_sync_title">Sincronizarea datelor...</string>
+  <string name="notif_location_title">Distribuirea poziției către %1$s</string>
+  <string name="location_share_contact">%1$s împărtășește poziția cu tine</string>
+  <string name="notif_location_multi_title">Distribuirea poziției către %1$d contacte</string>
+  <string name="notif_location_remaining">%1$d minute rămase</string>
+  <string name="notif_location_action_stop">Întrerupe distribuirea poziției</string>
+  <string name="location_share_action_start">Pornește distribuirea</string>
+  <string name="location_share_action_stop">Oprește distribuirea</string>
+  <!--Call Fragment-->
+  <string name="you_txt_prefix">Tu:</string>
+  <string name="action_call_hangup">Închide</string>
+  <string name="ongoing_call">Apel în curs</string>
+  <string name="hist_in_call">Apel primit de la %1$s</string>
+  <string name="hist_out_call">Apel efectuat de %1$s</string>
+  <string name="start_error_title">Jami nu se deschide !</string>
+  <string name="start_error_mic_required">Jami trebuie să folosească microfonul ca să funcționeze.</string>
+  <string name="action_call_accept">Răspunde</string>
+  <string name="action_call_decline">Refuză</string>
+  <string name="action_call_mic_mute">Oprește microfonul</string>
+  <string name="action_load_plugin">Încarcă Extensia</string>
+  <string name="ab_action_speakerphone">Activează sonorul</string>
+  <string name="ab_action_contact_add">Adaugă la contacte</string>
+  <string name="ab_action_contact_add_question">Adaugi la contacte?</string>
+  <string name="hist_contact_added">Contact adăugat</string>
+  <string name="hist_invitation_received">Invitație primită</string>
+  <string name="ab_action_audio_call">Apel audio</string>
+  <string name="ab_action_video_call">Apel video</string>
+  <string name="ab_action_change_screen_orientation">Rotește ecranul</string>
+  <string name="share_via">Distribuie prin</string>
+  <string name="write_a_message">Scrie un mesaj</string>
+  <string name="scan_qr">Scanează Codul QR</string>
+  <string name="ab_action_flipcamera">Schimbă videocamera</string>
+  <string name="ab_action_hidepreview">Ascunde previzualizarea</string>
+  <!--Text messages-->
+  <string name="send_message">Trimite mesajul</string>
+  <string name="message_sending">Se trimite mesajul...</string>
+  <string name="message_failed">Eșec</string>
+  <string name="time_just_now">Chiar acum</string>
+  <string name="send_file">Trimite fișier</string>
+  <string name="hist_file_sent">Fișier trimis</string>
+  <string name="hist_file_received">Fișier primit</string>
+  <string name="conversation_send_audio">Înregistrează mesaj vocal</string>
+  <string name="conversation_send_video">Înregistrează mesaj video</string>
+  <string name="conversation_share_location">Distribuie poziția ta</string>
+  <!--MediaPreferenceFragment-->
+  <string name="permission_dialog_camera_title">Permisiune pentru videocameră</string>
+  <string name="permission_dialog_camera_message">Conversațiile video au nevoie de acces la videocameră pentru a funcționa. Dacă vrei, activeaz-o.</string>
+  <!--Ringtone activity-->
+  <string name="ringtone_error_title">Eroare</string>
+  <string name="ringtone_error_format_not_supported">Acest format nu este suportat.</string>
+  <string name="ringtone_error_size_too_big">Fișierul este prea mare. Dimensiunea maximă este de %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Alege o sonerie personalizată</string>
+  <string name="ringtone_custom_label">Personalizat</string>
+  <string name="ringtone_jami_tones">Tonuri Jami</string>
+  <!--Read contacts permission-->
+  <string name="permission_dialog_read_contacts_message">Jami are nevoie de permisiunea \"Citește contacte\" pentru a activa această caracteristică. Permite.</string>
+  <!--Write call log permission-->
+  <string name="permission_dialog_write_call_log_message">Jami are nevoie de permisiunea \"Scrie în registrul de apeluri\" pentru a activa această caracteristică. Permite.</string>
+  <!--QRCode Scan-->
+  <string name="scan_qr_account_message">Scanează Codul QR al contului pe care vrei să-l adaugi.</string>
+  <string name="title_activity_qrcode">Distribuie contul meu</string>
+  <string name="error_scan_no_camera_permissions">Scanerul QR are nevoie de acces la videocameră pentru a funcționa.</string>
+  <string name="tab_code">Codul meu</string>
+  <string name="tab_scan">Scanează codul</string>
+  <!--Settings-->
+  <string name="clear_history_dialog_title">Ștergi cronologia?</string>
+  <string name="clear_history_dialog_message">Această acțiune este ireversibilă.</string>
+  <string name="clear_history_completed">Cronologia a fost ștearsă.</string>
+  <!--Conversation-->
+  <string name="conversation_details">Detaliile contactului</string>
+  <string name="conversation_action_delete_this">Șterge această conversație</string>
+  <string name="conversation_action_delete_this_title">Ștergi această conversație?</string>
+  <string name="conversation_action_delete_this_message">Această acțiune este ireversibilă.</string>
+  <string name="conversation_action_history_clear">Șterge cronologia</string>
+  <string name="conversation_action_history_clear_title">Ștergi cronologia conversațiilor?</string>
+  <string name="conversation_action_history_clear_message">Această acțiune va șterge definitiv cronologia conversațiilor.</string>
+  <string name="conversation_action_remove_this">Șterge contactul</string>
+  <string name="conversation_action_remove_this_title">Ștergi acest contact?</string>
+  <string name="conversation_action_remove_this_message">Această acțiune va șterge contactul și va elimina definitiv cronologia conversațiilor.</string>
+  <string name="conversation_action_copy_peer_number">Copiază numărul</string>
+  <string name="conversation_action_copied_peer_number_clipboard">%1$s copiat în notițe</string>
+  <string name="conversation_action_select_peer_number">Alege un număr</string>
+  <string name="conversation_action_block_this">Blochează contactul</string>
+  <string name="conversation_action_go_to_call">Întoarce-te la apelul în curs</string>
+  <string name="conversation_open_file_error">Nu există o aplicație instalată capabilă să deschidă acest tip de fișier.</string>
+  <string name="clip_contact_uri">Adresă de contact</string>
+  <string name="block_contact_dialog_title">Blochezi %1$s?</string>
+  <string name="block_contact_dialog_message">%1$s nu te va putea contacta până cînd nu îl deblochezi.</string>
+  <string name="block_contact_completed">%1$s a fost blocat.</string>
+  <string name="conversation_contact_is_typing">Contactul tău scrie...</string>
+  <!--Contacts-->
+  <string name="add_call_contact_number_to_contacts">Adaugi %1$s?</string>
+  <string name="prompt_new_password">Parolă nouă</string>
+  <string name="prompt_new_password_optional">Parolă nouă (facultativ)</string>
+  <string name="prompt_new_password_repeat">Repetă parola nouă</string>
+  <string name="account_create_title">Creează un cont Jami</string>
+  <string name="prompt_new_username">Introdu un nou nume de utilizator</string>
+  <string name="prompt_hint_username">Nume de Utilizator</string>
+  <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="wizard_next">Înainte</string>
+  <string name="wizard_back">Înapoi</string>
+  <string name="wizard_skip">Omite</string>
+  <!--MenuHeaderView-->
+  <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>
+  <string name="take_a_photo">Fă o poză</string>
+  <string name="profile_name_hint">Introdu numele tău</string>
+  <!--Share fragment-->
+  <string name="share_message">Scanează acest cod cu Jami</string>
+  <string name="share_message_no_account">Selecționează un cont pentru distribuire.</string>
+  <string name="share_your_account_information">Distribuie detaliile mele de contact</string>
+  <string name="share_label">Distribuie</string>
+  <string name="generic_error_migration">Eroare</string>
+  <string name="generic_error_migration_message">A apărut o eroare în timpul transferului</string>
+  <string name="title_share_with">Distribuie-i lui...</string>
+  <!--Pending contact requests-->
+  <string name="accept">Acceptă</string>
+  <string name="refuse">Refuză</string>
+  <string name="block">Blochează</string>
+  <string name="contact_request_title">O nouă cerere de contact</string>
+  <string name="contact_request_msg">Ai %1$s cereri de contact</string>
+  <string name="contact_request_account">Pentru %1$s</string>
+  <string name="no_requests">Nu ai cereri de contact</string>
+  <string name="message_contact_not_trusted_yet">%s nu este încă în contactele tale.\nAccepți sau refuzi această cerere de contact?</string>
+  <string name="message_contact_not_trusted">%s nu este în contactele tale.\nAdaugi un contact nou?</string>
+  <!--Send contact requests-->
+  <string name="send_request_button">Trimite</string>
+  <string name="send_request_title">Trimite o cerere de contact</string>
+  <string name="send_request_msg">Trebuie să trimiți o cerere de contact pentru a comunica cu acest utilizator. Atîta timp cît contactul tău nu a acceptat cererea, poți trimite mesaje, dar acesta nu va putea răspunde.</string>
+  <!--Blacklist-->
+  <string name="no_blocked_contact">Niciun contact blocat</string>
+  <!--Smartlist-->
+  <string name="no_contact_request">Nicio cerere de contact nu a fost trimisă</string>
+  <string name="conversation_placeholder">Încă nu ai conversații</string>
+  <string name="contact_request_sent">Cererea de contact a fost trimisă</string>
+  <string name="start_conversation">Începe o conversație</string>
+  <string name="search_results">Rezultatele căutării</string>
+  <string name="tv_contact_row_header">Contacte</string>
+  <string name="gallery_error_title">Aplicația Galerie nu a fost găsită</string>
+  <string name="gallery_error_message">Nu a fost găsită nicio aplicație pe dispozitiv pentru a deschide galeria</string>
+  <string name="generic_error">A apărut o eroare necunoscută</string>
+  <!--File Transfer-->
+  <string name="invalid_file">Fișier greșit</string>
+  <string name="not_able_to_write_file">Fișierul nu poate fi scris</string>
+  <string name="file_transfer_status_created">Inițializarea transferului</string>
+  <string name="file_transfer_status_unsupported">Neacceptat</string>
+  <string name="file_transfer_status_wait_peer_acceptance">Așteaptă autorizarea destinatarului</string>
+  <string name="file_transfer_status_wait_host_acceptance">Așteaptă autorizarea dispozitivului</string>
+  <string name="file_transfer_status_ongoing">în curs</string>
+  <string name="file_transfer_status_finished">terminat</string>
+  <string name="file_transfer_status_closed_by_host">închisă de dispozitiv</string>
+  <string name="file_transfer_status_closed_by_peer">închisă de interlocutor</string>
+  <string name="file_transfer_status_invalid_pathname">parcurs greșit</string>
+  <string name="file_transfer_status_unjoinable_peer">destinatar inaccesibil</string>
+  <string name="file_transfer_status_cancelled">anulat</string>
+  <string name="file_transfer_status_error">nereușit din cauza unei erori</string>
+  <string name="file_transfer_status_timed_out">pauză</string>
+  <string name="file_saved_in">Fișier salvat în %s</string>
+  <string name="file_saved_successfully">Fișier salvat cu succes</string>
+  <string name="no_space_left_on_device">Spațiu de stocare insuficient</string>
+  <string name="title_media_viewer">Vizualizator Media</string>
+  <string name="menu_file_open">Deschide fișierul</string>
+  <string name="menu_file_download">Descarcă fișierul</string>
+  <string name="menu_file_save">Salvează fișierul</string>
+  <string name="menu_file_delete">Șterge fișierul</string>
+  <string name="menu_file_share">Distribuie fișierul</string>
+  <string name="menu_message_copy">Copiază</string>
+  <string name="menu_message_delete">Șterge mesajul</string>
+  <string name="menu_message_cancel">Anulează mesajul</string>
+  <string name="menu_delete">Șterge</string>
+  <string name="pref_darkTheme_title">Temă neagră</string>
+  <string name="pref_darkTheme_summary">Activează mereu tema neagră în loc să folosești tema sistemului</string>
+  <!--Bottom Navigation-->
+  <string name="navigation_item_conversation">Conversații</string>
+  <string name="navigation_item_contact_request">Cereri de contact</string>
+  <string name="navigation_item_account">Cont</string>
+  <string name="search_results_public_directory">Listă publică</string>
+  <!--TV-->
+  <string name="tv_send_audio_dialog_message">Trimiți mesajul audio?</string>
+  <string name="tv_send_image_dialog_message">Trimiți poza?</string>
+  <string name="tv_send_video_dialog_message">Trimiți un video?</string>
+  <string name="tv_media_preview">Previzualizare</string>
+  <string name="tv_audio_play">Start</string>
+  <string name="tv_audio_pause">Pauză</string>
+  <string name="tv_dialog_send">Trimite</string>
+  <string name="tv_audio_recording">Se înregistrează...</string>
+  <string name="tv_send_text">Trimite Text</string>
+  <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-->
+  <string name="wizard_status_recommended">Recomandat</string>
+  <string name="wizard_status_optional">Facultativ</string>
+  <string name="wizard_status_required">Obligatoriu</string>
+  <string name="wizard_username_info">Alege un nume de utilizator pentru contul tău</string>
+  <string name="wizard_username_button">Alege Nume 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_button">Alege parola</string>
+  <string name="wizard_password_skip">Creează cont</string>
+  <string name="wizard_password_switch">Cifrează contul cu parolă</string>
+  <string name="wizard_password_warning">Reține că parola nu poate fi recuperată</string>
+  <string name="wizard_profile_info">Profilul este distribuit doar contactelor</string>
+  <string name="wizard_profile_button">Salvează Profilul</string>
+  <string name="wizard_profile_skip">Saltă și fă asta mai tîrziu</string>
+</resources>
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
new file mode 100644
index 0000000..eb70715
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_account.xml
@@ -0,0 +1,223 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings related to account edition screen-->
+  <string name="ic_delete_menu">Șterge</string>
+  <string name="ic_advanced_menu">Reglări avansate</string>
+  <string name="ic_blacklist_menu">Contacte blocate</string>
+  <!--Strings related to account creation-->
+  <string name="add_ring_account_title">Adaugă cont Jami</string>
+  <string name="add_sip_account_title">Adaugă cont SIP</string>
+  <string name="ring_account_default_name">Cont Jami %1$s</string>
+  <string name="prompt_alias">Alias</string>
+  <string name="prompt_hostname">Nume de gazdă</string>
+  <string name="prompt_username">Nume de Utilizator</string>
+  <string name="prompt_password">Parolă</string>
+  <string name="action_create">Creează cont</string>
+  <string name="action_create_short">Creează</string>
+  <string name="action_register">Înscrie-te</string>
+  <string name="action_settings">Reglări</string>
+  <string name="error_field_required">Aceste date sînt obligatorii</string>
+  <string name="dialog_wait_create">Se adaugă contul</string>
+  <string name="dialog_wait_create_details">Așteaptă în timp ce noul tău cont este adăugat...</string>
+  <string name="dialog_wait_update">Se actualizează contul</string>
+  <string name="dialog_wait_update_details">Așteaptă în timp ce noul tău cont este actualizat...</string>
+  <string name="dialog_warn_ip2ip_account_title">Creezi un cont SIP gol ?</string>
+  <string name="dialog_warn_ip2ip_account_message">Ești pe cale să creezi un cont SIP fără nume de gazdă valabil.
+        Vei putea face și primi doar apeluri IP directe.
+        Îți vei putea modifica contul mai tîrziu</string>
+  <string name="account_type_ip2ip">Cont IP</string>
+  <string name="help_ring">Un cont Jami îți permite să comunici cu alții în siguranță, în peer to peer, printr-o rețea complet distribuită.</string>
+  <string name="help_sip_title">Adaugă contul tău SIP</string>
+  <string name="help_sip">Configurează un cont SIP existent.</string>
+  <string name="create_sip_account">Adaugă cont SIP</string>
+  <!--Strings related to account deletion-->
+  <string name="account_delete_dialog_title">Ștergi contul ?</string>
+  <string name="account_delete_dialog_message">Această acțiune este ireversibilă.</string>
+  <!--AccountManagementFragment-->
+  <string name="empty_account_list">Nu este înregistrat niciun cont</string>
+  <string name="normal_accounts_titles">Conturi</string>
+  <string name="normal_devices_titles">Dispozitivele cunoscute asociate acestui cont Jami</string>
+  <string name="account_device_revoke">Deconectează dispozitivul</string>
+  <string name="account_device_revocation_success_title">Succes</string>
+  <string name="account_device_revocation_success">Dispozitivul este acum deconectat!</string>
+  <string name="account_device_revocation_error_title">Dispozitivul nu poate fi deconectat</string>
+  <string name="account_device_revocation_wrong_password">Parolă greșită.</string>
+  <string name="account_device_revocation_unknown_device">Dispozitiv necunoscut.</string>
+  <string name="account_device_revocation_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_wait_message">Se schimbă parola contului </string>
+  <!--Basic Details-->
+  <string name="account_preferences_basic_tab">Generale</string>
+  <string name="account_basic_category">Reglări simple</string>
+  <string name="account_alias_label">Numele contului</string>
+  <string name="account_hostname_label">Nume de gazdă</string>
+  <string name="account_bootstrap_label">Pornire</string>
+  <string name="account_username_label">Nume de Utilizator</string>
+  <string name="account_password_label">Parolă</string>
+  <string name="account_optionnal_category">Reglări Facultative</string>
+  <string name="account_useragent_label">User Agent</string>
+  <string name="account_autoanswer_label">Răspuns Automat</string>
+  <string name="account_upnp_label">Activează UPnP</string>
+  <string name="account_proxy_field">Proxy</string>
+  <!--Audio Details-->
+  <string name="account_audio_label">Audio</string>
+  <string name="account_preferences_media_tab">Media</string>
+  <string name="account_ringtone_label">Sonerii</string>
+  <string name="account_ringtone_enabled_label">Activează Sonerii</string>
+  <string name="account_ringtone_path_label">Parcursul soneriei</string>
+  <string name="account_ringtone_custom_label">Folosește sonerie personalizată</string>
+  <string name="account_ringtone_title">Alege o sonerie</string>
+  <string name="account_ringtone_summary">Selecționează o sonerie sau alege una personală</string>
+  <!--Video Details-->
+  <string name="account_video_label">Video</string>
+  <string name="account_video_enable">Activează Video</string>
+  <!--Advanced Details-->
+  <string name="account_preferences_advanced_tab">Avansate</string>
+  <string name="account_dht_public_in_calls_label">Permite apelurile primite de la contacte necunoscute</string>
+  <string name="account_registration_exp_label">Înregistrarea a expirat</string>
+  <string name="account_local_interface_label">Interfață locală</string>
+  <string name="account_local_port_label">Port local</string>
+  <string name="account_stun_enable_label">Folosește STUN</string>
+  <string name="account_stun_server_label">Server Stun</string>
+  <string name="account_accept_files">Acceptă automat fișierele primite</string>
+  <string name="account_accept_files_max_size">Dimensiunea maximă a fișierului acceptat automat</string>
+  <string name="account_accept_files_never">Nu accepta niciodată automat</string>
+  <string name="account_accept_files_always">Acceptă mereu automat</string>
+  <string name="size_mb">%1$d MB</string>
+  <string name="account_turn_enable_label">Folosește TURN</string>
+  <string name="account_turn_server_label">Server TURN</string>
+  <string name="account_turn_username_label">Nume de utilizator TURN</string>
+  <string name="account_turn_password_label">Parolă TURN</string>
+  <string name="account_published_same_as_local_label">Adresa publică la fel ca cea locală</string>
+  <string name="account_published_port_label">Port Public</string>
+  <string name="account_published_address_label">Adresa Publică</string>
+  <string name="account_proxy_label">DHT proxy</string>
+  <string name="account_proxy_enable_label">Folosește DHT proxy</string>
+  <string name="account_proxy_server_label">Adresa proxy DHT</string>
+  <string name="account_proxy_server_list_label">Adresa URL a listei de proxy DHT</string>
+  <string name="account_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>
+  <!--Security Details-->
+  <string name="account_credentials_label">Date de autentificare</string>
+  <string name="account_credentials_edit">Modifică datele de autentificare</string>
+  <string name="account_credentials_add">Adaugă date de autentificare</string>
+  <!--SRTP Details-->
+  <string name="account_preferences_security_tab">Protecție</string>
+  <string name="account_srtp_switch_label">Cifrează fluxurile media (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Activează SDES ca protocol pentru schimbul de chei</string>
+  <string name="account_srtp_rtp_fallback">Folosește RTP dacă SRTP eșuează</string>
+  <!--SIP-->
+  <!--TLS Details-->
+  <string name="account_tls_transport_switch_label">Folosește transportul TLS</string>
+  <string name="account_tls_port_label">Port de recepție TLS</string>
+  <string name="account_tls_certificate_list_label">Autoritate de certificare</string>
+  <string name="account_tls_certificate_file_label">Certificat</string>
+  <string name="account_tls_private_key_file_label">Cheie privată</string>
+  <string name="account_tls_password_label">Parola cheii private</string>
+  <string name="account_tls_method_label">Metoda TLS</string>
+  <string name="account_tls_ciphers_label">Cifrare TLS</string>
+  <string name="account_tls_server_name_label">Numele serverului</string>
+  <string name="account_tls_verify_server_label">Verifică Server</string>
+  <string name="account_tls_verify_client_label">Verifică Client</string>
+  <string name="account_tls_negotiation_timeout_sec">Timp de negociere (sec)</string>
+  <string name="account_rtp_max_port">Maxim</string>
+  <string name="account_rtp_min_port">Minim</string>
+  <string name="account_rtp_port_range">Interval Audio RTP Port</string>
+  <!--restore/backup-->
+  <string name="account_new_device_password">Introdu parola principală pentru a debloca contul</string>
+  <string name="error_password_char_count">6 caractere minim</string>
+  <string name="error_passwords_not_equals">Parolele nu se potrivesc</string>
+  <string name="export_account_wait_title">Te rog 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>
+  <string name="account_export_end_error_title">Eroare</string>
+  <string name="account_export_end_error_message">Contul nu poate fi exportat. A apărut o eroare necunoscută.</string>
+  <string name="account_enter_password">Introdu parola</string>
+  <string name="account_share_body">Contactează-mă folosind \'%1$s\' pe platforma de comunicare distribuită Jami: %2$s</string>
+  <string name="account_share_body_with_username">Contactează-mă folosind \'%1$s\' sau numele meu public de utilizator  \'%2$s\' pe platforma de comunicare distribuită Jami: %3$s </string>
+  <string name="account_contact_me">Contactează-mă pe Jami !</string>
+  <string name="update_account">Actualizează contul</string>
+  <string name="account_migration">Contul tău Jami poate fi actualizat.\nIntrodu parola ta.</string>
+  <string name="ring_account">Cont Jami</string>
+  <string name="ring_account_identity">Identitate</string>
+  <string name="account_migration_title_dialog">Transferul contului</string>
+  <string name="account_migration_message_dialog">Conturile tale trebuie actualizate. Vrei să te duci la \"Gestionează cont\" pentru a face acest lucru ?</string>
+  <string name="account_update_needed">Actualizare necesară</string>
+  <string name="account_cannot_be_found_title">Nu pot găsi contul</string>
+  <string name="account_cannot_be_found_message">Contul nu poate fi găsit în rețeaua Jami.\nAsigură-te că a fost exportat pe Jami de pe un dispozitiv existent și datele de autentificare sînt corecte.</string>
+  <string name="account_sip_cannot_be_registered_message">Poți continua cu procesul de creare a contului sau poți modifica informațiile tale aici. Modificarea e posibilă ulterior în reglările contului.</string>
+  <string name="account_no_network_title">Nu mă pot conecta la rețea</string>
+  <string name="account_no_network_message">Contul nu poate fi adăugat deoarece Jami nu se poate conecta la rețea. Verifică conectarea la rețea.</string>
+  <string name="account_device_added_title">Dispozitiv adăugat</string>
+  <string name="account_device_added_message">Ai configurat cu succes contul Jami pe acest dispozitiv.</string>
+  <string name="account_device_updated_title">Dispozitiv actualizat</string>
+  <string name="account_device_updated_message">Ai actualizat cu succes contul tău Jami.</string>
+  <string name="account_cannot_be_updated_message">Dispozitivul conectat nu poate fi actualizat. Verifică parola.</string>
+  <string name="account_sip_success_title">Cont SIP înregistrat</string>
+  <string name="account_sip_success_message">Ai înregistrat cu succes contul tău SIP.</string>
+  <string name="account_sip_register_anyway">Înscrie-te oricum</string>
+  <string name="account_link_device">Conectează-te de la alt dispozitiv</string>
+  <string name="account_link_button">Conectează-te dintr-o rețea</string>
+  <string name="account_link_archive_button">Conectează-te de la o copie de rezervă</string>
+  <string name="account_link_prompt_pin">Introdu codul PIN</string>
+  <string name="account_new_button">Creează un cont Jami</string>
+  <string name="account_link_export_button">Asociază alt dispozitiv acestui cont</string>
+  <string name="account_link_export_info">Pentru a utiliza acest cont pe alte dispozitive, trebuie să îl expui mai întîi pe Jami. Asta va genera un cod PIN pe care trebuie să-l introduci pe noul dispozitiv pentru a configura contul. Acest PIN este valabil 10 minute.</string>
+  <string name="account_start_export_button">Generează PIN</string>
+  <string name="account_end_export_button">închide</string>
+  <string name="account_end_export_infos">PIN-ul tău este:\n\n%%\n\nPentru a completa procesul, trebuie să deschizi Jami pe noul dispozitiv. Creează un cont nou cu \"Asociază acest dispozitiv unui cont\". Codul tău PIN este valabil 10 minute.</string>
+  <string name="account_link_export_info_light">Pentru a utiliza acest cont pe alte dispozitive, trebuie să îl expui mai întîi pe Jami. Asta va genera un cod PIN pe care trebuie să-l introduci pe noul dispozitiv pentru a configura contul. Acest PIN este valabil 10 minute.</string>
+  <string name="account_export_title">Adaugă dispozitive</string>
+  <string name="account_connect_server_button">Conectează-te la serverul de administrare</string>
+  <string name="account_connect_button">Conectează</string>
+  <string name="prompt_server">URL-ul serverului de administrare Jami</string>
+  <string name="help_credentials_enter">Introdu datele de autentificare ale organizației tale</string>
+  <string name="help_connect_password_enter">Introdu parola organizației tale</string>
+  <string name="account_connect_prompt_username">Nume de Utilizator</string>
+  <!--Name registration-->
+  <string name="error_username_empty">Introdu un nume de utilizator</string>
+  <string name="no_registered_name_for_account">Nu a fost găsit niciun nume înregistrat pentru acest cont</string>
+  <string name="username_available">Nume de utilizator disponibil !</string>
+  <string name="register_name">Înregistrează numele</string>
+  <string name="trying_to_register_name">Se înregistrează numele</string>
+  <string name="registered_username">Nume de utilizator înregistrat</string>
+  <string name="register_username">Înregistrează numele de utilizator public</string>
+  <string name="register_recommended">Recomandat</string>
+  <string name="username_already_taken">Nume de utilizator deja ales</string>
+  <string name="invalid_username">Numele de utilizator este greșit</string>
+  <string name="unknown_error">Eroare necunoscută. Verifică conectarea la rețea!</string>
+  <string name="looking_for_username_availability">Caut disponibilitatea numelui de utilizator...</string>
+  <string name="account_status_connecting">Se conectează</string>
+  <string name="account_status_connection_error">Eroare de conectare</string>
+  <string name="account_status_online">Conectat</string>
+  <string name="account_status_unknown">Necunoscut</string>
+  <string name="account_status_offline">Deconectat</string>
+  <string name="account_status_error">Eroare</string>
+  <!--Create account-->
+  <string name="account_creation_home">Bine ai venit pe Jami</string>
+  <string name="account_creation_profile">Creează profilul tău</string>
+  <string name="account_creation_ring">Creează contul tău Jami</string>
+  <string name="account_link_title">Asociază acest dispozitiv</string>
+  <string name="account_sip_cannot_be_registered">Nu pot înregistra contul</string>
+  <!--Edit profile-->
+  <string name="account_edit_profile">Modifică profilul tău</string>
+  <!--Devices-->
+  <string name="account_revoke_device_hint">Introdu parola pentru confirmare</string>
+  <string name="enter_password">Introdu parola</string>
+  <string name="revoke_device_title">Deconectează dispozitivul</string>
+  <string name="revoke_device_message">Sigur vrei să deconectezi %1$s ?</string>
+  <string name="revoke_device_wait_title">Te rog așteaptă...</string>
+  <string name="revoke_device_wait_message">Se deconectează dispozitivul</string>
+  <string name="rename_device_title">Redenumește acest dispozitiv</string>
+  <string name="rename_device_message">Alege un nume nou pentru a identifica acest dispozitiv în contul tău Jami</string>
+  <string name="rename_device_button">Redenumește dispozitivul</string>
+  <string name="account_rename_device_hint">Alege un nume nou pentru dispozitiv</string>
+  <string name="account_device_name_empty">Numele dispozitivului nu poate fi gol</string>
+  <string name="account_device_this_indicator">acest dispozitiv</string>
+  <string name="account_disabled_indicator">dezactivat</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml
new file mode 100644
index 0000000..488ce06
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_call.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+Copyright (C) 2004-2016 Savoir-faire Linux Inc.
+
+Author: Alexandre Lision <alexandre.lision@savoirfairelinux.com>
+Author: Adrien Béraud <adrien.beraud@savoirfairelinux.com>
+Author: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+-->
+<resources>
+    <!-- Call error -->
+    <string name="call_error_no_microphone">Apel anulat. Nu a fost găsit niciun microfon.</string>
+    <string name="call_error_no_camera_no_microphone">Apel anulat. Nu a fost găsită nicio  videocameră sau microfon.</string>
+
+    <!-- SipCalls -->
+    <string name="call_human_state_searching">Căutare</string>
+    <string name="call_human_state_incoming">Sosește</string>
+    <string name="call_human_state_connecting">Se conectează</string>
+    <string name="call_human_state_ringing">Sună</string>
+    <string name="call_human_state_current">Convorbire</string>
+    <string name="call_human_state_hungup">Terminat</string>
+    <string name="call_human_state_busy">Ocupat</string>
+    <string name="call_human_state_failure">Eșec</string>
+    <string name="call_human_state_hold">Așteptare</string>
+    <string name="call_human_state_unhold">Reia apelul</string>
+    <string name="call_human_state_over">Terminat</string>
+    <!-- Conferences -->
+</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_content_description.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_content_description.xml
new file mode 100644
index 0000000..dc50583
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_content_description.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--Strings for xml content description of images-->
+  <string name="contact_quick_call_description">Apel rapid</string>
+  <string name="contact_picture_description">Poza contactului</string>
+  <string name="dial_numeric_pad">Tastatură numerică</string>
+  <string name="contact_unblock">Deblochează</string>
+  <string name="video_plugins">Extensii Video</string>
+</resources>
diff --git a/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
new file mode 100644
index 0000000..d0871dc
--- /dev/null
+++ b/ring-android/app/src/main/res/values-ro-rRO/strings_preferences.xml
@@ -0,0 +1,40 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="pref_category_network">Rețea</string>
+  <string name="pref_category_contacts">Contacte</string>
+  <string name="pref_category_video">Video</string>
+  <string name="pref_category_system">Sistem</string>
+  <string name="pref_category_privacy">Confidențialitate</string>
+  <string name="pref_mobileData_title">Date mobile</string>
+  <string name="pref_mobileData_summary">Permite Jami pe rețelele 3G/LTE în plus față de Wi-Fi</string>
+  <string name="pref_pushNotifications_title">Notificări Push</string>
+  <string name="pref_pushNotifications_summary">Utilizează serverele Google pentru a permite primirea de apeluri/mesaje în fundal</string>
+  <string name="pref_video_advanced_title">Reglări video avansate</string>
+  <string name="pref_video_advanced_summary">Schimbă video bitrate, rezoluția și accesul la caracteristicile experimentale</string>
+  <string name="pref_hd_summary">Activează trimiterea de video HD</string>
+  <string name="pref_hwEncode_title">Activează codarea accelerată</string>
+  <string name="pref_hwEncode_summary">Caracteristici experimentale</string>
+  <string name="pref_systemContacts_title">Folosește contactele din agendă</string>
+  <string name="pref_systemContacts_summary">Folosește contactele din agendă pentru a afișa detaliile apelantului.</string>
+  <string name="pref_systemDialer_title">Efectuează apelurile de sistem folosind Jami</string>
+  <string name="pref_systemDialer_summary">Efectuează apelurile de sistem folosind Jami cînd este posibil.</string>
+  <string name="pref_startOnBoot_title">Pornește Jami la pornirea sistemului</string>
+  <string name="pref_startOnBoot_summary">Pornește Jami în fundal la pornirea aparatului.</string>
+  <string name="pref_clearHistory_title">Șterge cronologia</string>
+  <string name="pref_clearHistory_summary">Șterge toată cronologia conversațiilor. Această acțiune este ireversibilă.</string>
+  <string name="pref_persistNotification_title">Folosește în fundal</string>
+  <string name="pref_persistNotification_summary">Permite funcționarea în fundal pentru a primi apeluri și mesaje.</string>
+  <!--Plugin-->
+  <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_reset_preferences">Restabilește reglările inițiale ale extensiei</string>
+  <string name="plugin_reset_preferences_summary">Reglările extensiei tale vor fi opțiunea standard</string>
+  <string name="plugin_reset_preferences_ask">Chiar vrei să restabilești reglările inițiale ale extensiei ?</string>
+  <string name="plugin_successfully_installed">Extensia <b>%1$s</b> instalată cu succes</string>
+  <string name="plugin_install_failure">Nu a reușit instalarea extensiei: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">Ai o versiune mai recentă de: <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Ai aceeași versiune de <b>%1$s</b> instalată</string>
+  <string name="plugin_force_install">forțează \n instalarea</string>
+</resources>
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 39010f7..99f04a8 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
@@ -171,9 +171,8 @@
   <string name="prompt_new_password_repeat">Повторите новый пароль</string>
   <string name="account_create_title">Создать учётную запись Jami</string>
   <string name="prompt_new_username">Введите новое имя пользователя</string>
+  <string name="prompt_hint_username">Имя пользователя</string>
   <string name="help_password_choose">Выберите надежный пароль, который вы запомните, чтобы защитить свою учетную запись Jami.</string>
-  <string name="help_password_enter">Введите ваш основной пароль учётной записи Jami </string>
-  <string name="help_server_enter">Введите URL-адрес управляющего сервера</string>
   <string name="help_pin_enter">Введите PIN-код из другой учетной записи Jami. Используйте функцию \"экспорт учетной записи Jami\" для получения PIN-кода.</string>
   <string name="wizard_next">Далее</string>
   <string name="wizard_back">Назад</string>
@@ -183,7 +182,6 @@
   <string name="profile_message_warning">Ваш профиль доступен только для ваших контактов</string>
   <string name="open_the_gallery">Открыть галерею</string>
   <string name="take_a_photo">Сфотографировать</string>
-  <string name="profile_name_hint">Введите ваше имя (необязательно) </string>
   <!--Share fragment-->
   <string name="share_message">Отсканируйте код с помощью Jami</string>
   <string name="share_message_no_account">Выберите контакт, чтобы поделиться</string>
@@ -199,7 +197,6 @@
   <string name="contact_request_title">Запрос на добавление в контакты</string>
   <string name="contact_request_msg">У вас %1$sзапросов на добавление в контакты</string>
   <string name="contact_request_account">Для %1$s</string>
-  <string name="no_requests">0 запросов на добавление в контакты</string>
   <string name="message_contact_not_trusted_yet">%sеще нет в ваших контактах.\nВы хотите принять или отклонить запрос?</string>
   <string name="message_contact_not_trusted">%sеще нет в ваших контактах.\nДобавить его в контакты?</string>
   <!--Send contact requests-->
@@ -207,7 +204,6 @@
   <string name="send_request_title">Отправить запрос на добавление в контакты</string>
   <string name="send_request_msg">Для связи с этим пользователем необходимо отправить запрос на добавление в контакты. Пока ваш контакт не принял запрос, вы можете отправлять сообщения, но он не может отвечать.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 заблокированных контактов</string>
   <!--Smartlist-->
   <string name="no_contact_request">Нет запросов на добавление в контакты</string>
   <string name="contact_request_sent">Запрос на добавление в контакты отправлен</string>
@@ -266,4 +262,6 @@
   <string name="tv_send_audio">Отправить Запись</string>
   <string name="tv_send_video">Отправить Медиа</string>
   <string name="conversation_input_speech_hint">Скажите что-нибудь...</string>
+  <!--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 cf96bf8..8075a39 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
@@ -10,7 +10,7 @@
   <string name="ring_account_default_name">Jami аккаунт %1$s</string>
   <string name="prompt_alias">Псевдоним</string>
   <string name="prompt_hostname">Узел</string>
-  <string name="prompt_username">Пользователь</string>
+  <string name="prompt_username">Имя пользователя</string>
   <string name="prompt_password">Пароль</string>
   <string name="action_create">Создать аккаунт</string>
   <string name="action_create_short">Создать</string>
@@ -34,7 +34,7 @@
   <string name="account_delete_dialog_title">Удалить аккаунт?</string>
   <string name="account_delete_dialog_message">Это действие не может быть отменено</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">Аккаунт не зарегистрирован</string>
+  <string name="empty_account_list">Нет зарегистрированного аккаунта</string>
   <string name="normal_accounts_titles">Учетные записи</string>
   <string name="normal_devices_titles">Устройства, привязанные к этому аккаунту Jami</string>
   <string name="account_device_revoke">Отозвать устройство</string>
@@ -95,6 +95,7 @@
   <string name="account_credentials_add">Добавить учетные данные</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Безопасность</string>
+  <string name="account_srtp_switch_label">Шифровать медиа потоки (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Использовать TLS</string>
@@ -148,7 +149,6 @@
   <string name="account_sip_success_title">Sip аккаунт зарегистрирован</string>
   <string name="account_sip_success_message">Вы успешно зарегистрировали свой Sip аккаунт.</string>
   <string name="account_sip_register_anyway">Зарегистрироваться несмотря ни на что</string>
-  <string name="account_link_device">Подключиться через другое устройство</string>
   <string name="account_link_button">Подключиться из сети</string>
   <string name="account_link_archive_button">Подключиться через резервную копию</string>
   <string name="account_link_prompt_pin">Введите PIN</string>
@@ -173,7 +173,7 @@
   <string name="register_name">Зарегистрировать имя пользователя</string>
   <string name="trying_to_register_name">Попробовать зарегистрировать имя</string>
   <string name="registered_username">Зарегистрированное имя пользователя</string>
-  <string name="register_username">Зарегистрировать общедоступное имя (рекомендуется)</string>
+  <string name="register_username">Зарегистрировать общедоступное имя пользователя</string>
   <string name="username_already_taken">Имя пользователя уже занято</string>
   <string name="invalid_username">Недопустимое имя пользователя</string>
   <string name="unknown_error">Неизвестная ошибка. Пожалуйста, проверьте ваше интернет соединение</string>
diff --git a/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml b/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml
index fd74164..7a83596 100644
--- a/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ru-rRU/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Очистить всю историю переписки. Это действие нельзя будет отменить.</string>
   <string name="pref_persistNotification_title">Запустить в фоновом режиме</string>
   <string name="pref_persistNotification_summary">Разрешить работать в фоновом режиме для приема звонков и сообщений.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings.xml b/ring-android/app/src/main/res/values-ru/strings.xml
index 6565fd6..e86dc88 100644
--- a/ring-android/app/src/main/res/values-ru/strings.xml
+++ b/ring-android/app/src/main/res/values-ru/strings.xml
@@ -107,6 +107,7 @@
   <string name="write_a_message">Написать сообщение</string>
   <string name="scan_qr">Сканировать QR код</string>
   <string name="ab_action_flipcamera">Переключить камеру</string>
+  <string name="ab_action_hidepreview">Скрыть предпросмотр</string>
   <!--Text messages-->
   <string name="send_message">Отправить сообщение</string>
   <string name="message_sending">Отправка сообщения...</string>
@@ -171,9 +172,8 @@
   <string name="prompt_new_password_repeat">Повторите новый пароль</string>
   <string name="account_create_title">Создать учётную запись Jami</string>
   <string name="prompt_new_username">Введите новое имя пользователя</string>
+  <string name="prompt_hint_username">Имя пользователя</string>
   <string name="help_password_choose">Выберите надёжный и запоминающийся пароль для защиты вашей учетной записи Jami.</string>
-  <string name="help_password_enter">Введите пароль от вашего основного аккаунта Jami</string>
-  <string name="help_server_enter">Введите URL управляющего сервера</string>
   <string name="help_pin_enter">Введите PIN другого аккаунта Jami. Используйте функцию «экспортировать аккаунт в Jami» для получения PIN.</string>
   <string name="wizard_next">Далее</string>
   <string name="wizard_back">Назад</string>
@@ -183,7 +183,6 @@
   <string name="profile_message_warning">Ваш профиль доступен только вашим контактам</string>
   <string name="open_the_gallery">Открыть галерею</string>
   <string name="take_a_photo">Сфотографировать</string>
-  <string name="profile_name_hint">Введите ваше имя (опционально)</string>
   <!--Share fragment-->
   <string name="share_message">Отсканируйте этот код Jami</string>
   <string name="share_message_no_account">Выберите аккаунт, которым хотите поделиться.</string>
@@ -199,7 +198,6 @@
   <string name="contact_request_title">Новый запрос на добавление в контакты</string>
   <string name="contact_request_msg">%1$s запросов на добавление в контакты</string>
   <string name="contact_request_account">Для %1$s</string>
-  <string name="no_requests">0 запросов на добавление в контакты</string>
   <string name="message_contact_not_trusted_yet">%s еще не в вашем списке контактов. Вы хотите принять или отклонить этот запрос?</string>
   <string name="message_contact_not_trusted">%s отсутствует в ваших контактах.\nДобавить новый контакт?</string>
   <!--Send contact requests-->
@@ -207,7 +205,7 @@
   <string name="send_request_title">Отправить запрос на добавление в контакты</string>
   <string name="send_request_msg">Вы должны отправить запрос для связи с этим пользователем. До тех пор, пока пользователь не примет запрос, вы можете отправлять сообщения, но он не сможет отвечать.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 заблокированных контактов</string>
+  <string name="no_blocked_contact">Нет заблокированных контактов</string>
   <!--Smartlist-->
   <string name="no_contact_request">Нет отправленных запросов на добавление в контакты</string>
   <string name="contact_request_sent">Запрос на добавление в контакты отправлен</string>
@@ -266,4 +264,6 @@
   <string name="tv_send_audio">Отправить аудио</string>
   <string name="tv_send_video">Отправить медиа</string>
   <string name="conversation_input_speech_hint">Скажите что-нибудь...</string>
+  <!--WIZARD-->
+  <string name="wizard_password_skip">Создать аккаунт</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-ru/strings_account.xml b/ring-android/app/src/main/res/values-ru/strings_account.xml
index 3ff0929..f2db78b 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">Добавить идентификационные данные</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Безопасность</string>
+  <string name="account_srtp_switch_label">Шифровать медиа потоки (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Использовать TLS</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">SIP-аккаунт зарегистрирован</string>
   <string name="account_sip_success_message">Вы успешно зарегистрировали свой SIP-аккаунт.</string>
   <string name="account_sip_register_anyway">Все равно зарегистрироваться</string>
-  <string name="account_link_device">Подключиться с другого устройства</string>
   <string name="account_link_button">Подключение из сети</string>
   <string name="account_link_archive_button">Подключиться из резервной копии</string>
   <string name="account_link_prompt_pin">Введите PIN</string>
@@ -183,7 +183,7 @@
   <string name="register_name">Зарегистрировать имя</string>
   <string name="trying_to_register_name">Попытка зарегистрировать имя</string>
   <string name="registered_username">Зарегистрированное имя пользователя</string>
-  <string name="register_username">Зарегистрировать публичное имя пользователя (рекомендуется)</string>
+  <string name="register_username">Зарегистрировать публичное имя</string>
   <string name="username_already_taken">Имя пользователя уже занято</string>
   <string name="invalid_username">Недопустимое имя пользователя</string>
   <string name="unknown_error">Неизвестная ошибка. Пожалуйста, проверьте сетевое соединение.</string>
diff --git a/ring-android/app/src/main/res/values-ru/strings_preferences.xml b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
index 60d6b9b..65b100b 100644
--- a/ring-android/app/src/main/res/values-ru/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ru/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Очистить всю историю разговоров. Это действие нельзя отменить.</string>
   <string name="pref_persistNotification_title">Работа в фоновом режиме</string>
   <string name="pref_persistNotification_summary">Разрешить работу в фоновом режиме для принятия звонков и сообщений.</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings.xml b/ring-android/app/src/main/res/values-sk-rSK/strings.xml
index 9fb345a..2fb5aa4 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
@@ -15,9 +15,12 @@
   <string name="license">Tento softvér je distribuovaný \"tak, ako je\", bez záruky akéhokoľvek druhu. Pre viac informácií pozrite <u>GNU General Public Licence verzie 3 alebo neskoršej</u></string>
   <string name="description">Jami je slobodný softvér na univerzálnu komunikáciu, ktorý rešpektuje slobody a súkromie používateľov.</string>
   <string name="credits">Autori</string>
+  <string name="call_service_description">Táto služba je potrebná na to, aby boli vaše hovory v popredí. Beží iba počas hovorov.</string>
+  <string name="data_transfer_service_description">Táto služba je potrebná na zobrazenie upozornení počas prenosu súborov. Beží iba počas prenosu súborov. </string>
   <!--About dialog-->
   <string name="developed_by">Vývoj</string>
   <string name="designed_by">Dizajn</string>
+  <string name="ringtones_by">Vyzváňacie tóny podľa</string>
   <!--RingActivity-->
   <string name="error_no_network">Žiadne sieťové pripojenie</string>
   <string name="error_mobile_network_available_but_disabled">Povoľte, prosím, prístup k mobilnej sieti v nastaveniach.</string>
@@ -25,10 +28,10 @@
   <string name="ab_action_chat">Textová správa</string>
   <!--Sections-->
   <string name="menu_item_contact_request">Žiadosti o kontakt</string>
-  <string name="menu_item_accounts">Nastavenia účtov</string>
-  <string name="menu_item_account">Nastavenia úctu</string>
+  <string name="menu_item_accounts">Spravovať účty</string>
+  <string name="menu_item_account">Spravovať účet</string>
   <string name="menu_item_settings">Nastavenia</string>
-  <string name="menu_item_share">Zdieľať kontakty</string>
+  <string name="menu_item_share">Zdieľať môj kontakt</string>
   <string name="menu_item_about">O programe Jami</string>
   <!--Dialing Fragment-->
   <string name="dial_number">Zavolať na číslo</string>
@@ -42,22 +45,27 @@
     <item quantity="other">%d Konverzácií</item>
   </plurals>
   <!--ContactList Fragment-->
+  <string name="searchbar_hint">Vyhľadať meno alebo telefónne číslo...</string>
   <string name="choose_number">Vyberte číslo</string>
   <!--FileExplorerDFragement-->
   <!--TransferDFragment-->
   <!--Notifications-->
-  <string name="notif_missed_incoming_call">Zmeškaný príchodzí hovor</string>
-  <string name="notif_missed_outgoing_call">Zmeškaný odchádzajúci hovory</string>
+  <string name="notif_missed_incoming_call">Zmeškaný prichádzajúci hovor</string>
+  <string name="notif_missed_outgoing_call">Zmeškaný odchádzajúci hovor</string>
   <string name="notif_incoming_call_title">Prichádzajúci hovor od %1$s</string>
   <string name="notif_incoming_call">Prichádzajúci hovor</string>
-  <string name="notif_outgoing_call_title">Odchádzajúci hovor %1$s</string>
+  <string name="notif_outgoing_call_title">Odchádzajúci hovor s %1$s</string>
   <string name="notif_outgoing_call">Odchádzajúci hovor</string>
+  <string name="notif_current_call_title">Prebiehajúci hovor s %1$s</string>
   <string name="notif_current_call">Prebiehajúci hovor</string>
+  <string name="notif_channel_call_in_progress">Prebieha hovor</string>
   <string name="notif_channel_calls">Hovory</string>
   <string name="notif_channel_missed_calls">Zmeškané hovory</string>
+  <string name="notif_channel_incoming_calls">Prichádzajúce hovory</string>
   <string name="notif_channel_messages">Správy</string>
   <string name="notif_channel_requests">Žiadosti</string>
   <string name="notif_channel_file_transfer">Prenos súborov</string>
+  <string name="notif_channel_sync">Synchronizácia dát</string>
   <string name="notif_channel_background_service">Služba na pozadí</string>
   <string name="notif_channel_background_service_descr">Povoliť neustále prijímanie a odosielanie správ.</string>
   <string name="notif_group_calls">Hovory</string>
@@ -66,8 +74,16 @@
   <string name="notif_dismiss">Odmietnuť</string>
   <string name="notif_reply">Odpovedať</string>
   <string name="notif_incoming_file_transfer_title">Prichádzajúci súbor od %1$s</string>
-  <string name="notif_outgoing_file_transfer_title">Posielanie súboru na %1$s</string>
+  <string name="notif_outgoing_file_transfer_title">Posielanie súboru  %1$s</string>
   <string name="notif_incoming_picture">Obrázok od %1$s</string>
+  <string name="notif_sync_title">Synchronizovanie dát...</string>
+  <string name="notif_location_title">Zdieľanie polohy s %1$s</string>
+  <string name="location_share_contact">%1$s s vami zdieľa polohu</string>
+  <string name="notif_location_multi_title">Zdieľanie polohy s %1$d kontaktami</string>
+  <string name="notif_location_remaining">Zostáva %1$d minút</string>
+  <string name="notif_location_action_stop">Ukončiť zdieľanie polohy</string>
+  <string name="location_share_action_start">Začať zdieľanie</string>
+  <string name="location_share_action_stop">Ukončiť zdieľanie</string>
   <!--Call Fragment-->
   <string name="you_txt_prefix">Vy:</string>
   <string name="action_call_hangup">Zložiť</string>
@@ -81,7 +97,7 @@
   <string name="action_call_mic_mute">Stlmiť mikrofón</string>
   <string name="ab_action_speakerphone">Zapnúť reproduktor</string>
   <string name="ab_action_contact_add">Pridať kontakt</string>
-  <string name="ab_action_contact_add_question">Pridať kontakt?</string>
+  <string name="ab_action_contact_add_question">Pridať do kontaktov?</string>
   <string name="hist_contact_added">Kontakt pridaný</string>
   <string name="hist_invitation_received">Bola prijatá pozvánka</string>
   <string name="ab_action_audio_call">Audio hovor</string>
@@ -91,6 +107,7 @@
   <string name="write_a_message">Napísať správu</string>
   <string name="scan_qr">Nasnímať QR kód</string>
   <string name="ab_action_flipcamera">Otočiť kameru</string>
+  <string name="ab_action_hidepreview">Skryť náhľad</string>
   <!--Text messages-->
   <string name="send_message">Poslať správu</string>
   <string name="message_sending">Posielanie správy...</string>
@@ -99,6 +116,9 @@
   <string name="send_file">Poslať súbor</string>
   <string name="hist_file_sent">Súbor poslaný</string>
   <string name="hist_file_received">Súbor prijatý</string>
+  <string name="conversation_send_audio">Zaznamenať zvukový klip</string>
+  <string name="conversation_send_video">Zaznamenať video klip</string>
+  <string name="conversation_share_location">Zdieľať polohu</string>
   <!--MediaPreferenceFragment-->
   <string name="permission_dialog_camera_title">Povolenie kamery</string>
   <string name="permission_dialog_camera_message">Video konverzácie vyžadujú povolenie používať kameru. Zvážte jeho udelenie.</string>
@@ -106,7 +126,9 @@
   <string name="ringtone_error_title">Chyba</string>
   <string name="ringtone_error_format_not_supported">Tento formát nie je podporovaný.</string>
   <string name="ringtone_error_size_too_big">Tento súbor je priveľký. Maximálna veľkosť je %1$dkB.</string>
+  <string name="ringtone_custom_prompt">Nastaviť vlastný vyzváňací tón</string>
   <string name="ringtone_custom_label">Vlastný</string>
+  <string name="ringtone_jami_tones">Jami Zvuky</string>
   <!--Read contacts permission-->
   <string name="permission_dialog_read_contacts_message">Jami potrebuje povolenie čítať kontakty na zapnutie tejto funkcie. Zvážte jeho udelenie.</string>
   <!--Write call log permission-->
@@ -119,19 +141,19 @@
   <string name="tab_scan">Nasnímať Kód</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">Vymazať históriu?</string>
-  <string name="clear_history_dialog_message">Túto akciu nie je možné zvrátiť.</string>
+  <string name="clear_history_dialog_message">Túto operáciu nie je možné vrátiť.</string>
   <string name="clear_history_completed">História bola vymazaná.</string>
   <!--Conversation-->
   <string name="conversation_details">Informácie o kontakte</string>
   <string name="conversation_action_delete_this">Vymazať túto konverzáciu</string>
   <string name="conversation_action_delete_this_title">Vymazať túto konverzáciu?</string>
-  <string name="conversation_action_delete_this_message">Túto akciu nie je možné zvrátiť.</string>
+  <string name="conversation_action_delete_this_message">Túto operáciu nie je možné vrátiť.</string>
   <string name="conversation_action_history_clear">Vymazať históriu</string>
-  <string name="conversation_action_history_clear_title">Vymazať konverzačnú históriu?</string>
-  <string name="conversation_action_history_clear_message">Toto určite vymaže konverzačnú históriu.</string>
+  <string name="conversation_action_history_clear_title">Vymazať históriu konverzácie?</string>
+  <string name="conversation_action_history_clear_message">História konverzácie bude natrvalo vymazaná. </string>
   <string name="conversation_action_remove_this">Odstrániť kontakt</string>
   <string name="conversation_action_remove_this_title">Odstrániť tento kontakt?</string>
-  <string name="conversation_action_remove_this_message">Toto vymaže kontakt a spolu s ním aj konverzačnú históriu.</string>
+  <string name="conversation_action_remove_this_message">Kontakt i história konverzácie bude natrvalo vymazaná. </string>
   <string name="conversation_action_copy_peer_number">Skopírovať číslo</string>
   <string name="conversation_action_copied_peer_number_clipboard">%1$s skopírované do schránky</string>
   <string name="conversation_action_select_peer_number">Zvoliť číslo</string>
@@ -142,6 +164,7 @@
   <string name="block_contact_dialog_title">Zablokovať %1$s?</string>
   <string name="block_contact_dialog_message">%1$s nebude mať možnosť kontaktovať vás až do odblokovania.</string>
   <string name="block_contact_completed">Kontakt %1$s bol zablokovaný.</string>
+  <string name="conversation_contact_is_typing">Kontakt píše...</string>
   <!--Contacts-->
   <string name="add_call_contact_number_to_contacts">Pridať %1$s?</string>
   <string name="prompt_new_password">Nové heslo</string>
@@ -149,8 +172,8 @@
   <string name="prompt_new_password_repeat">Zopakujte nové heslo</string>
   <string name="account_create_title">Vytvoriť Jami účet</string>
   <string name="prompt_new_username">Zadajte nové používateľské meno</string>
+  <string name="prompt_hint_username">Používateľské meno</string>
   <string name="help_password_choose">Zvoľte si silné heslo, ktoré si zapamätáte, na ochranu vášho účtu.</string>
-  <string name="help_password_enter">Zadajte heslo k vášmu hlavnému Jami účtu</string>
   <string name="help_pin_enter">Zadajte PIN kód z druhého nakonfigurovaného Jami účtu. Použite funkciu \"export Jami účtu\" na získanie PIN kódu.</string>
   <string name="wizard_next">Ďalej</string>
   <string name="wizard_back">Späť</string>
@@ -159,8 +182,7 @@
   <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>
-  <string name="take_a_photo">Urobiť fotografiu</string>
-  <string name="profile_name_hint">Zadajte svoje meno (voliteľné)</string>
+  <string name="take_a_photo">Zhotoviť fotografiu</string>
   <!--Share fragment-->
   <string name="share_message">Nasnímajte tento kód aplikáciou Jami</string>
   <string name="share_message_no_account">Vyberte účet, ktorý chcete zdieľať.</string>
@@ -168,6 +190,7 @@
   <string name="share_label">Zdieľať</string>
   <string name="generic_error_migration">Chyba</string>
   <string name="generic_error_migration_message">Počas migrácie sa vyskytla chyba</string>
+  <string name="title_share_with">Zdieľať s...</string>
   <!--Pending contact requests-->
   <string name="accept">Prijať</string>
   <string name="refuse">Odmietnuť</string>
@@ -175,18 +198,18 @@
   <string name="contact_request_title">Nová žiadosť o kontakt</string>
   <string name="contact_request_msg">Počet nových žiadostí o kontakt: %1$s</string>
   <string name="contact_request_account">Pre %1$s</string>
-  <string name="no_requests">0 žiadostí o kontakt</string>
-  <string name="message_contact_not_trusted_yet">%s zatiaľ nie je vo vašich kontaktoch.\nChcete prijať či odmietnuť jeho žiadosť o kontakt?</string>
+  <string name="message_contact_not_trusted_yet">%s zatiaľ nie je vo vašich kontaktoch.\nChcete prijať alebo odmietnuť jeho žiadosť o kontakt?</string>
   <string name="message_contact_not_trusted">%s zatiaľ nie je vo vašich kontaktoch.\nPridať nový kontakt?</string>
   <!--Send contact requests-->
   <string name="send_request_button">Poslať</string>
   <string name="send_request_title">Poslať žiadosť o kontakt</string>
   <string name="send_request_msg">Musíte poslať žiadosť o kontakt, aby ste mohli komunikovať s týmto používateľom. Budete mu môcť posielať správy, pokým táto žiadosť nebude akceptovaná, ale on nebude môcť odpovedať.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blokovaných kontaktov</string>
+  <string name="no_blocked_contact">Žiadne blokované kontakty</string>
   <!--Smartlist-->
   <string name="no_contact_request">Žiadna poslaná žiadosť o kontakt</string>
   <string name="contact_request_sent">Žiadosť o kontakt poslaná</string>
+  <string name="start_conversation">Začať konverzáciu</string>
   <string name="search_results">Výsledky vyhľadávania</string>
   <string name="tv_contact_row_header">Kontakty</string>
   <string name="gallery_error_title">Aplikácia Galéria nebola nájdená</string>
@@ -205,22 +228,42 @@
   <string name="file_transfer_status_closed_by_peer">ukončený peerom</string>
   <string name="file_transfer_status_invalid_pathname">neplatná adresa súboru</string>
   <string name="file_transfer_status_unjoinable_peer">nepripojiteľný peer</string>
+  <string name="file_transfer_status_cancelled">zrušené</string>
+  <string name="file_transfer_status_error">zlyhalo kvôli chybe</string>
+  <string name="file_transfer_status_timed_out">vypršal čas</string>
   <string name="file_saved_in">Súbor uložený v %s</string>
+  <string name="file_saved_successfully">Súbor úspešne uložený</string>
   <string name="no_space_left_on_device">Žiadne dostupné miesto na disku</string>
   <string name="title_media_viewer">Zobrazovač médií</string>
   <string name="menu_file_open">Otvoriť súbor</string>
   <string name="menu_file_download">Stiahnuť súbor</string>
-  <string name="menu_file_delete">Zmazať súbor</string>
+  <string name="menu_file_save">Uložiť súbor</string>
+  <string name="menu_file_delete">Vymazať súbor</string>
   <string name="menu_file_share">Zdieľať súbor</string>
   <string name="menu_message_copy">Kopírovať</string>
-  <string name="menu_message_delete">Zmazať správu</string>
+  <string name="menu_message_delete">Vymazať správu</string>
   <string name="menu_message_cancel">Zrušiť správu</string>
-  <string name="menu_delete">Zmazať</string>
+  <string name="menu_delete">Vymazať</string>
+  <string name="pref_darkTheme_title">Tmavá téma</string>
+  <string name="pref_darkTheme_summary">Vždy použiť tmavú tému namiesto systémovej</string>
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">Konverzácie</string>
   <string name="navigation_item_contact_request">Žiadosti o kontakt</string>
   <string name="navigation_item_account">Účet</string>
+  <string name="search_results_public_directory">Verejný adresár</string>
   <!--TV-->
-  <string name="tv_audio_play">Spusť</string>
+  <string name="tv_send_audio_dialog_message">Poslať zvukovú správu?</string>
+  <string name="tv_send_image_dialog_message">Poslať obrázok?</string>
+  <string name="tv_send_video_dialog_message">Poslať video?</string>
+  <string name="tv_media_preview">Náhľad</string>
+  <string name="tv_audio_play">Spustiť</string>
+  <string name="tv_audio_pause">Pozastaviť</string>
   <string name="tv_dialog_send">Poslať</string>
+  <string name="tv_audio_recording">Nahrávanie...</string>
+  <string name="tv_send_text">Poslať Text</string>
+  <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-->
+  <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 c8e9656..934f0a5 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
@@ -23,7 +23,7 @@
   <string name="dialog_wait_update_details">Čakajte, prosím, kým sa váš účet aktualizuje...</string>
   <string name="dialog_warn_ip2ip_account_title">Vytvoriť prázdny SIP účet?</string>
   <string name="dialog_warn_ip2ip_account_message">Chystáte sa vytvoriť účet bez správneho mena hostiteľa.
-        Budete môcť vykonať výhradne priame IP hovory.
+        Budete môcť vykonávať iba priame IP hovory.
         Neskôr môžete upraviť tento účet.</string>
   <string name="account_type_ip2ip">IP účet</string>
   <string name="help_ring">Jami účet vám umožňuje kontaktovať ľudí pomocou P2P pripojenia na plne distribuovanej sieti.</string>
@@ -31,12 +31,12 @@
   <string name="help_sip">Konfigurovať existujúci SIP účet</string>
   <string name="create_sip_account">Pridať SIP účet</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">Zmazať účet?</string>
-  <string name="account_delete_dialog_message">Túto akciu nie je možné zvrátiť.</string>
+  <string name="account_delete_dialog_title">Vymazať účet?</string>
+  <string name="account_delete_dialog_message">Túto operáciu nie je možné vrátiť.</string>
   <!--AccountManagementFragment-->
-  <string name="empty_account_list">Žiaden registrovaný účet</string>
+  <string name="empty_account_list">Žiadny registrovaný účet</string>
   <string name="normal_accounts_titles">Účty</string>
-  <string name="normal_devices_titles">Známe zariadenia prepojené s týmto Jami účtom</string>
+  <string name="normal_devices_titles">Zariadenia prepojené s týmto Jami účtom</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>
@@ -58,7 +58,7 @@
   <string name="account_optionnal_category">Voliteľné nastavenia</string>
   <string name="account_useragent_label">Používateľský agent</string>
   <string name="account_autoanswer_label">Automaticky zdvihnúť</string>
-  <string name="account_upnp_label">Zapnúť UPnP</string>
+  <string name="account_upnp_label">Povoliť UPnP</string>
   <string name="account_proxy_field">Proxy</string>
   <!--Audio Details-->
   <string name="account_audio_label">Zvuk</string>
@@ -67,16 +67,24 @@
   <string name="account_ringtone_enabled_label">Aktivovať vyzváňacie tóny</string>
   <string name="account_ringtone_path_label">Cesta k vyzváňacím tónom</string>
   <string name="account_ringtone_custom_label">Použiť vlastný vyzváňací tón</string>
+  <string name="account_ringtone_title">Vybrať vyzváňací tón</string>
+  <string name="account_ringtone_summary">Zvoľte vyzváňací tón alebo vyberte vlastný</string>
   <!--Video Details-->
   <string name="account_video_label">Video</string>
-  <string name="account_video_enable">Zapnúť video</string>
+  <string name="account_video_enable">Povoliť video</string>
   <!--Advanced Details-->
   <string name="account_preferences_advanced_tab">Pokročilé</string>
+  <string name="account_dht_public_in_calls_label">Povoliť prichádzajúce hovory od neznámych kontaktov</string>
   <string name="account_registration_exp_label">Expirácia registrácie</string>
   <string name="account_local_interface_label">Lokálne rozhranie</string>
   <string name="account_local_port_label">Miestny port</string>
   <string name="account_stun_enable_label">Použiť STUN</string>
   <string name="account_stun_server_label">STUN server</string>
+  <string name="account_accept_files">Automaticky prijať prichádzajúce súbory</string>
+  <string name="account_accept_files_max_size">Maximálna veľkosť súboru pre automatické prijatie</string>
+  <string name="account_accept_files_never">Nikdy automaticky neprijať</string>
+  <string name="account_accept_files_always">Vždy automaticky prijať</string>
+  <string name="size_mb">%1$d MB</string>
   <string name="account_turn_enable_label">Použiť TURN</string>
   <string name="account_turn_server_label">TURN server</string>
   <string name="account_turn_username_label">TURN používateľské meno</string>
@@ -87,12 +95,17 @@
   <string name="account_proxy_label">DHT proxy</string>
   <string name="account_proxy_enable_label">Použiť DHT proxy</string>
   <string name="account_proxy_server_label">DHT proxy adresa</string>
+  <string name="account_proxy_server_list_label">DHT proxy list URL</string>
+  <string name="account_peer_discovery_label">Lokálne vyhľadávanie peerov</string>
+  <string name="account_peer_discovery_enable_label">Povoliť lokálne vyhľadávanie peerov</string>
+  <string name="account_peer_discovery_enable_summary">Pripojiť k iným DHT uzlom na rovnakej lokálnej sieti</string>
   <!--Security Details-->
   <string name="account_credentials_label">Prihlasovacie údaje</string>
   <string name="account_credentials_edit">Upraviť prihlasovacie údaje</string>
   <string name="account_credentials_add">Pridať prihlasovacie údaje</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Bezpečnosť</string>
+  <string name="account_srtp_switch_label">Zašifrovať mediálne streamy (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Používať TLS prenos</string>
@@ -112,7 +125,7 @@
   <string name="account_rtp_port_range">Rozsah audio RTP portov</string>
   <!--restore/backup-->
   <string name="account_new_device_password">Zadajte hlavné heslo na odomknutie účtu</string>
-  <string name="error_password_char_count">Minímálne 6 znakov</string>
+  <string name="error_password_char_count">Minimálne 6 znakov</string>
   <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>
@@ -134,9 +147,9 @@
   <string name="account_migration_message_dialog">Váš účet musí byť aktualizovaný. Chcete prejsť na obrazovku Nastavenia účtu a vykonať túto akciu?</string>
   <string name="account_update_needed">Vyžaduje sa aktualizácia</string>
   <string name="account_cannot_be_found_title">Nemôžeme nájsť účet</string>
-  <string name="account_cannot_be_found_message">Účet nebol v sieti Jami nájdený.\nUistite sa, že bol správne exportovaný z existujúceho zariadenia, a že ste zadali správne údaje.</string>
+  <string name="account_cannot_be_found_message">Účet nebol v sieti Jami nájdený.\nUistite sa, že bol správne exportovaný z existujúceho zariadenia a že ste zadali správne údaje.</string>
   <string name="account_sip_cannot_be_registered_message">Môžete pokračovať vo vytváraní alebo upraviť vaše údaje. Úprava bude tiež možná neskôr v nastaveniach.</string>
-  <string name="account_no_network_title">Nedá sa pripojiť ku sieti</string>
+  <string name="account_no_network_title">Nedá sa pripojiť k sieti</string>
   <string name="account_no_network_message">Účet sa nedal pridať, pretože Jami sa nedokázal pripojiť k distribuovanej sieti. Skontrolujte pripojenie vášho zariadenia.</string>
   <string name="account_device_added_title">Zariadenie pridané k účtu</string>
   <string name="account_device_added_message">Úspešne ste nastavili váš Jami účet na tomto zariadení.</string>
@@ -157,16 +170,23 @@
   <string name="account_end_export_infos">Váš PIN je:\n\n%%\n\nNa dokončenie procesu je potrebné otvoriť aplikáciu Jami na novom zariadení. Vytvorte nový účet pomocou \"Prepojiť toto zariadenie s iným účtom\". Váš PIN bude funkčný 10 minút.</string>
   <string name="account_link_export_info_light">Aby ste mohli tento účet používať na viacerých zariadeniach, musíte ho najprv sprístupniť na Jami. Vygeneruje sa PIN kód, ktorý je potrebný zadať na novom zariadení. Tento kód bude funkčný 10 minút.</string>
   <string name="account_export_title">Pridať zariadenia</string>
+  <string name="account_connect_server_button">Pripojiť k spravujúcemu serveru</string>
+  <string name="account_connect_button">Pripojiť</string>
+  <string name="prompt_server">URL Jami spravujúceho serveru</string>
+  <string name="help_credentials_enter">Zadajte údaje vašej organizácie</string>
+  <string name="help_connect_password_enter">Zadajte heslo vašej organizácie</string>
   <string name="account_connect_prompt_username">Používateľské meno</string>
   <!--Name registration-->
   <string name="error_username_empty">Zadajte používateľské meno</string>
   <string name="no_registered_name_for_account">Pre tento účet nebolo nájdené zaregistrované meno</string>
+  <string name="username_available">Používateľské meno dostupné!</string>
   <string name="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 (odporúčané)</string>
-  <string name="username_already_taken">Používateľské meno už je zabrané</string>
+  <string name="register_username">Registrovať verejné používateľské meno</string>
+  <string name="username_already_taken">Používateľské meno je už použité</string>
   <string name="invalid_username">Neplatné používateľské meno</string>
+  <string name="unknown_error">Neznáma chyba. Skontrolujte prosím vaše sieťové pripojenie. </string>
   <string name="looking_for_username_availability">Kontrolujeme dostupnosť používateľského mena...</string>
   <string name="account_status_connecting">Pripájanie</string>
   <string name="account_status_connection_error">Chyba pripojenia</string>
diff --git a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
index fe34a49..6f6a0df 100644
--- a/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sk-rSK/strings_preferences.xml
@@ -9,6 +9,8 @@
   <string name="pref_mobileData_summary">Povoliť Jami používať okrem Wi-Fi aj 3G/LTE</string>
   <string name="pref_pushNotifications_title">Notifikácie</string>
   <string name="pref_pushNotifications_summary">Použiť servery Google na prijímanie hovorov/správ na pozadí</string>
+  <string name="pref_video_advanced_title">Pokročilé nastavenia videa</string>
+  <string name="pref_video_advanced_summary">Zmeniť dátový tok videa, rozlíšenie a prístup k experimentálnym funkciám</string>
   <string name="pref_hd_summary">Povoliť posielanie HD videa</string>
   <string name="pref_hwEncode_title">Povoliť akcelerované kódovanie</string>
   <string name="pref_hwEncode_summary">Experimentálna funkcia</string>
@@ -19,6 +21,8 @@
   <string name="pref_startOnBoot_title">Spustiť Jami pri zapnutí zariadenia</string>
   <string name="pref_startOnBoot_summary">Spustiť Jami na pozadí pri štarte systému.</string>
   <string name="pref_clearHistory_title">Vymazať históriu</string>
+  <string name="pref_clearHistory_summary">Vymazať históriu konverzácie. Táto operácia nemôže byť vrátená. </string>
   <string name="pref_persistNotification_title">Spustiť na pozadí</string>
   <string name="pref_persistNotification_summary">Povoliť spustenie na pozadí na prijímanie hovorov a spáv.</string>
+  <!--Plugin-->
 </resources>
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 619163e..b2af08f 100644
--- a/ring-android/app/src/main/res/values-sl/strings.xml
+++ b/ring-android/app/src/main/res/values-sl/strings.xml
@@ -95,6 +95,7 @@
   <string name="prompt_new_password">Novo geslo</string>
   <string name="prompt_new_password_repeat">Ponovi novo geslo</string>
   <string name="prompt_new_username">Vpiši novo uporabniško ime</string>
+  <string name="prompt_hint_username">Uporabnik</string>
   <string name="wizard_next">Naprej</string>
   <string name="wizard_back">Nazaj</string>
   <!--MenuHeaderView-->
@@ -102,7 +103,6 @@
   <string name="profile_message_warning">Tvoj profil je deljen samo s tvojimi stiki</string>
   <string name="open_the_gallery">Odpri galerijo</string>
   <string name="take_a_photo">Slikaj</string>
-  <string name="profile_name_hint">Vpiši svoje ime (opcijsko)</string>
   <!--Share fragment-->
   <string name="share_message_no_account">Izberi račun, ki ga želiš deliti.</string>
   <string name="share_your_account_information">Deli informacije mojega stika</string>
@@ -116,12 +116,10 @@
   <string name="contact_request_title">Zahteva za nov stik</string>
   <string name="contact_request_msg">Imaš%1$s zahtev za stik</string>
   <string name="contact_request_account">Za %1$s</string>
-  <string name="no_requests">0 zahtek za stik</string>
   <!--Send contact requests-->
   <string name="send_request_button">Pošlji</string>
   <string name="send_request_title">Pošlji zahtevo za stik</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blokiranih stikov</string>
   <!--Smartlist-->
   <string name="no_contact_request">Ni bilo poslanih zahtev za stik</string>
   <string name="contact_request_sent">Zahteva za stik poslana</string>
@@ -138,4 +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-->
+  <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 45d37bf..fa7a542 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
@@ -119,6 +119,7 @@
   <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>
   <string name="username_already_taken">Uporabniško ime je že oddano</string>
   <string name="invalid_username">Neveljavno uporabniško ime</string>
   <string name="looking_for_username_availability">Preverjam ali je uporabniško ime na voljo...</string>
diff --git a/ring-android/app/src/main/res/values-sl/strings_preferences.xml b/ring-android/app/src/main/res/values-sl/strings_preferences.xml
index 4f97760..b7462f5 100644
--- a/ring-android/app/src/main/res/values-sl/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sl/strings_preferences.xml
@@ -9,4 +9,5 @@
   <string name="pref_systemContacts_title">Uporabi sistemske stike</string>
   <string name="pref_systemContacts_summary">Uporabi sistemske stike za prikaz podatkov klicatelja.</string>
   <string name="pref_clearHistory_title">Pobriši zgodovino</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings.xml b/ring-android/app/src/main/res/values-sq-rAL/strings.xml
index 9d14537..43e788c 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
@@ -31,6 +31,7 @@
   <string name="menu_item_accounts">Administroni llogari</string>
   <string name="menu_item_account">Administroni llogari</string>
   <string name="menu_item_settings">Rregullime</string>
+  <string name="menu_item_plugin_list">Rregullime Shtojcash</string>
   <string name="menu_item_share">Ndaji kontaktet e mia me të tjerët</string>
   <string name="menu_item_about">Mbi Jami-n</string>
   <!--Dialing Fragment-->
@@ -93,6 +94,7 @@
   <string name="action_call_accept">Pranoje thirrjen</string>
   <string name="action_call_decline">Hidhe tej</string>
   <string name="action_call_mic_mute">Heshtoje mikrofonin</string>
+  <string name="action_load_plugin">Ngarkoje Shtojcën</string>
   <string name="ab_action_speakerphone">Aktivizoni altoparlantin</string>
   <string name="ab_action_contact_add">Shtoje te kontaktet</string>
   <string name="ab_action_contact_add_question">Të shtohet te kontaktet?</string>
@@ -170,9 +172,10 @@
   <string name="prompt_new_password_repeat">Përsëriteni fjalëkalimin e ri</string>
   <string name="account_create_title">Krijoni një llogari Jami</string>
   <string name="prompt_new_username">Jepni emër përdoruesi të ri</string>
+  <string name="prompt_hint_username">Emër përdoruesi</string>
   <string name="help_password_choose">Për të mbrojtur llogarinë tuaj Jami, zgjidhni fjalëkalim të fuqishëm që do ta mbani mend.</string>
-  <string name="help_password_enter">Jepni fjalëkalimin e llogarisë suaj kryesore Jami</string>
-  <string name="help_server_enter">Jepni URL-në e shërbyesit të administrimeve</string>
+  <string name="help_password_enter">Jepni fjalëkalimin e llogarisë tuaj kryesore Jami.</string>
+  <string name="help_server_enter">Jepni URL-në e shërbyesit të administrimeve.</string>
   <string name="help_pin_enter">Jepni PIN-in prej një llogarie tjetër Jami të formësuar. Përdorni veçorinë \"eksportoje llogarinë në Jami\" që të merrni një PIN.</string>
   <string name="wizard_next">Pasuesi</string>
   <string name="wizard_back">Mbrapsht</string>
@@ -182,7 +185,7 @@
   <string name="profile_message_warning">Profili juaj ndahet vetëm me kontaktet tuaja</string>
   <string name="open_the_gallery">Hape galerinë</string>
   <string name="take_a_photo">Bëni një foto</string>
-  <string name="profile_name_hint">Jepni emrin tuaj (opsionale)</string>
+  <string name="profile_name_hint">Jepni emrin tuaj</string>
   <!--Share fragment-->
   <string name="share_message">Skanojeni këtë kod me Jami-n</string>
   <string name="share_message_no_account">Ju lutemi, përzgjidhni një llogari për ndarje me të.</string>
@@ -198,7 +201,7 @@
   <string name="contact_request_title">Kërkesë kontakti të ri</string>
   <string name="contact_request_msg">Keni %1$s kërkesa kontakti</string>
   <string name="contact_request_account">Për %1$s</string>
-  <string name="no_requests">0 kërkesa kontakti</string>
+  <string name="no_requests">S’keni kërkesa për kontakt</string>
   <string name="message_contact_not_trusted_yet">%s s\’gjendet ende te kontaktet tuaj.\nE pranoni apo e hidhni tej këtë kërkesë kontakti?</string>
   <string name="message_contact_not_trusted">%s s\’gjendet në kontaktet tuaja.\nTë shtohet një kontakt i ri?</string>
   <!--Send contact requests-->
@@ -206,9 +209,10 @@
   <string name="send_request_title">Dërgoni një kërkesë kontakti</string>
   <string name="send_request_msg">Duhet të dërgoni një kërkesë kontakti që të komunikoni me këtë përdorues. Për sa kohë që kontakti juaj s\’e ka pranuar kërkesën, mund t\’i dërgoni mesazhe, por ai s\’do të jetë në gjendje t\’ju përgjigjet.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 kontakte të bllokuar</string>
+  <string name="no_blocked_contact">S’ka kontakte të bllokuar</string>
   <!--Smartlist-->
   <string name="no_contact_request">S\’është dërguar ndonjë kërkesë kontakti</string>
+  <string name="conversation_placeholder">Ende s’keni biseda</string>
   <string name="contact_request_sent">Kërkesa e kontaktit u dërgua</string>
   <string name="start_conversation">Nisni bisedë</string>
   <string name="search_results">Përfundime Kërkimi</string>
@@ -265,4 +269,20 @@
   <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-->
+  <string name="wizard_status_recommended">E rekomanduar</string>
+  <string name="wizard_status_optional">Opsionale</string>
+  <string name="wizard_status_required">E domosdoshme</string>
+  <string name="wizard_username_info">Zgjidhni një emër përdoruesi për llogarinë tuaj</string>
+  <string name="wizard_username_button">Zgjidhni Emër Përdoruesi</string>
+  <string name="wizard_username_skip">Anashkaloje zgjedhjen e emrit të përdoruesit</string>
+  <string name="wizard_password_info">Fjalëkalim llogarie</string>
+  <string name="wizard_password_placeholder">Zgjidhni një fjalëkalim për fshehtëzimin e kyçit të llogarisë në këtë pajisje</string>
+  <string name="wizard_password_button">Zgjidhni fjalëkalim</string>
+  <string name="wizard_password_skip">Krijoni llogari</string>
+  <string name="wizard_password_switch">Fshehtëzoje llogarinë me fjalëkalim</string>
+  <string name="wizard_password_warning">Mbani parasysh se fjalëkalimi s’mund të rimerret</string>
+  <string name="wizard_profile_info">Profili ndahet vetëm me kontaktet</string>
+  <string name="wizard_profile_button">Ruaje Profilin</string>
+  <string name="wizard_profile_skip">Anashakalojeni dhe bëjeni këtë më vonë</string>
 </resources>
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 34587c2..14d3f36 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
@@ -95,6 +95,7 @@
   <string name="account_proxy_label">Ndërmjetës DHT</string>
   <string name="account_proxy_enable_label">Përdor ndërmjetës DHT</string>
   <string name="account_proxy_server_label">Adresë ndërmjetësi DHT</string>
+  <string name="account_proxy_server_list_label">URL liste ndërmjetësish DHT</string>
   <string name="account_peer_discovery_label">Pikasje ortakësh vendorë</string>
   <string name="account_peer_discovery_enable_label">Aktivizo pikasje ortakësh vendorë</string>
   <string name="account_peer_discovery_enable_summary">Lidhu me nyje të tjera DHT që reklamohen në rrjetin tonë vendor</string>
@@ -104,6 +105,9 @@
   <string name="account_credentials_add">Shtoni kredenciale</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Siguri</string>
+  <string name="account_srtp_switch_label">Fshehtëzo rrjedha media (SRTP)</string>
+  <string name="account_srtp_enable_sdes">Aktivizon SDES si protokoll shkëmbimi kyçesh</string>
+  <string name="account_srtp_rtp_fallback">Nëse SRTP dështon, përdor RTP</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Përdor Bartje TLS</string>
@@ -157,7 +161,7 @@
   <string name="account_sip_success_title">Llogaria SIP u regjistrua</string>
   <string name="account_sip_success_message">E regjistruat me sukses llogarinë tuaj SIP.</string>
   <string name="account_sip_register_anyway">Regjistroje sido qoftë</string>
-  <string name="account_link_device">Lidhuni prej pajisje tjetër</string>
+  <string name="account_link_device">Lidhuni prej një pajisje tjetër</string>
   <string name="account_link_button">Lidhu prej rrjeti</string>
   <string name="account_link_archive_button">Lidhje prej kopjeruajtjeje</string>
   <string name="account_link_prompt_pin">Jepni PIN-in</string>
@@ -182,7 +186,8 @@
   <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 (e këshilluar)</string>
+  <string name="register_username">Regjistroni emër publik përdoruesi</string>
+  <string name="register_recommended">E rekomanduar</string>
   <string name="username_already_taken">Emër përdoruesi tashmë i zënë</string>
   <string name="invalid_username">Emër përdoruesi i pavlefshëm</string>
   <string name="unknown_error">Gabim i panjohur. Ju lutemi, kontrolloni lidhjen në rrjet!</string>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml
index c5a2b01..981293d 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">Foto Kontakti</string>
   <string name="dial_numeric_pad">Numërator me shifra</string>
   <string name="contact_unblock">Zhbllokoje</string>
+  <string name="video_plugins">Shtojca Videosh</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
index b1bb488..629f950 100644
--- a/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sq-rAL/strings_preferences.xml
@@ -24,4 +24,17 @@
   <string name="pref_clearHistory_summary">Spastroni krejt historikun e bisedave, Ky veprim nuk mund të zhbëhet.</string>
   <string name="pref_persistNotification_title">Xhiro në prapaskenë</string>
   <string name="pref_persistNotification_summary">Lejoni xhirimin në prapaskenë që të merrni thirrje dhe mesazhe.</string>
+  <!--Plugin-->
+  <string name="pref_plugins_title">Shtojca</string>
+  <string name="pref_plugins_summary">Aktivizoni shtojcat dhe caktoni parametrat e tyre </string>
+  <string name="fab_plugins_add">Shtoni shtojcë të re</string>
+  <string name="plugin_uninstall_title">Të çinstalohet Shtojca?</string>
+  <string name="plugin_reset_preferences">Rikthe te parazgjedhjet parapëlqimet për shtojca</string>
+  <string name="plugin_reset_preferences_summary">Rregullimet e shtojcës tuaj do të kthehen te parazgjedhjet</string>
+  <string name="plugin_reset_preferences_ask">Doni të rikthehen te parazgjedhjet rregullimet e shtojcave?</string>
+  <string name="plugin_successfully_installed">Shtojca <b>%1$s</b> u instalua me sukses</string>
+  <string name="plugin_install_failure">S’u arrit të instalohej shtojcë: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">Keni një version më të freskët të: <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">Keni të instaluar të njëjtin version të <b>%1$s</b></string>
+  <string name="plugin_force_install">detyro \n instalim</string>
 </resources>
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 c762bd8..c195402 100644
--- a/ring-android/app/src/main/res/values-sr/strings.xml
+++ b/ring-android/app/src/main/res/values-sr/strings.xml
@@ -48,4 +48,5 @@
   <!--File Transfer-->
   <!--Bottom Navigation-->
   <!--TV-->
+  <!--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 8bc6925..6d114ae 100644
--- a/ring-android/app/src/main/res/values-sv/strings.xml
+++ b/ring-android/app/src/main/res/values-sv/strings.xml
@@ -151,8 +151,8 @@
   <string name="prompt_new_password_repeat">Upprepa nytt lösenord</string>
   <string name="account_create_title">Skapa ett Jami-konto</string>
   <string name="prompt_new_username">Ange nytt användarnamn</string>
+  <string name="prompt_hint_username">Användarnamn</string>
   <string name="help_password_choose">Välj ett starkt lösenord som du kommer ihåg, för att skydda ditt Jami-konto.</string>
-  <string name="help_password_enter">Ange lösenordet för ditt Jami-konto</string>
   <string name="help_pin_enter">Ange PIN-koden från ett annat konfigurerat Jami-konto. Använd \"Exportera Jami-konto\", för att få din PIN-kod.</string>
   <string name="wizard_next">Nästa</string>
   <string name="wizard_back">Tillbaka</string>
@@ -162,7 +162,6 @@
   <string name="profile_message_warning">Din profil delas endast med dina kontakter</string>
   <string name="open_the_gallery">Öppna galleriet</string>
   <string name="take_a_photo">Ta ett foto</string>
-  <string name="profile_name_hint">Ange ditt namn (frivilligt)</string>
   <!--Share fragment-->
   <string name="share_message">Skanna den här koden med Jami</string>
   <string name="share_message_no_account">Välj ett konto att dela.</string>
@@ -177,7 +176,6 @@
   <string name="contact_request_title">Ny kontaktförfrågan</string>
   <string name="contact_request_msg">Du har %1$s kontaktförfrågningar</string>
   <string name="contact_request_account">För %1$s</string>
-  <string name="no_requests">0 kontaktförfrågningar</string>
   <string name="message_contact_not_trusted_yet">%s finns ännu inte i din kontaktlista.\nAccepterar eller avslår du denna kontaktförfrågan?</string>
   <string name="message_contact_not_trusted">%s finns inte i dina kontakter.\nVill du lägga till ny kontakt?</string>
   <!--Send contact requests-->
@@ -185,7 +183,7 @@
   <string name="send_request_title">Skicka en kontaktförfrågan</string>
   <string name="send_request_msg">Du måste skicka en kontaktförfrågan för att kommunicera med den här användaren. Så länge som kontakten inte har accepterat din förfrågan, kan du skicka meddelanden men han/hon kan inte svara.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 blockerade kontakter</string>
+  <string name="no_blocked_contact">Inga blockerade kontakter</string>
   <!--Smartlist-->
   <string name="no_contact_request">Ingen kontaktförfrågan skickad</string>
   <string name="contact_request_sent">Kontaktförfrågan skickad</string>
@@ -228,4 +226,6 @@
   <string name="tv_audio_play">Spela</string>
   <string name="tv_audio_pause">Paus</string>
   <string name="tv_dialog_send">Skicka</string>
+  <!--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 a2cb331..77a2848 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
@@ -93,6 +93,7 @@
   <string name="account_credentials_add">Lägg till inloggningsuppgifter</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Säkerhet</string>
+  <string name="account_srtp_switch_label">Kryptera mediaströmmar (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Använd TLS-transport</string>
@@ -165,7 +166,7 @@
   <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 (rekommenderas)</string>
+  <string name="register_username">Registrera offentligt användarnamn</string>
   <string name="username_already_taken">Användarnamnet finns redan</string>
   <string name="invalid_username">Ogiltigt användarnamn</string>
   <string name="unknown_error">Okänt fel! Kontrollera din nätverksanslutning.</string>
diff --git a/ring-android/app/src/main/res/values-sv/strings_preferences.xml b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
index 78da727..dbeebd2 100644
--- a/ring-android/app/src/main/res/values-sv/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-sv/strings_preferences.xml
@@ -21,4 +21,5 @@
   <string name="pref_clearHistory_title">Rensa historik</string>
   <string name="pref_persistNotification_title">Kör i bakgrunden</string>
   <string name="pref_persistNotification_summary">Tillåt bakgrundskörning för inkommande samtal och meddelanden.</string>
+  <!--Plugin-->
 </resources>
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 0a44848..bcd21a2 100644
--- a/ring-android/app/src/main/res/values-ta/strings.xml
+++ b/ring-android/app/src/main/res/values-ta/strings.xml
@@ -37,4 +37,5 @@
   <!--File Transfer-->
   <!--Bottom Navigation-->
   <!--TV-->
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-ta/strings_preferences.xml b/ring-android/app/src/main/res/values-ta/strings_preferences.xml
index 47e0d87..2a1c99e 100644
--- a/ring-android/app/src/main/res/values-ta/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-ta/strings_preferences.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="pref_category_video">காணொளி</string>
+  <!--Plugin-->
 </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 8477c70..37c6679 100644
--- a/ring-android/app/src/main/res/values-tr/strings.xml
+++ b/ring-android/app/src/main/res/values-tr/strings.xml
@@ -169,9 +169,8 @@
   <string name="prompt_new_password_repeat">Yeni parola tekrar</string>
   <string name="account_create_title">Bir Jami hesabı oluştur</string>
   <string name="prompt_new_username">Yeni kullanıcı adı gir</string>
+  <string name="prompt_hint_username">Kullanıcı adı</string>
   <string name="help_password_choose">Jami hesabınızı korumak için anımsayacağınız güçlü bir şifre seçin.</string>
-  <string name="help_password_enter">Jami ana hesap parolanızı girin</string>
-  <string name="help_server_enter">Yönetim sunucusunun URL adresini gir</string>
   <string name="help_pin_enter">Başka yapılandırılmış Jami hesabından PIN\'i girin. PIN edinmek için \"Jami\'de hesabı dışa aktarma\" özelliğini kullanın.</string>
   <string name="wizard_next">İleri</string>
   <string name="wizard_back">Geri</string>
@@ -181,7 +180,6 @@
   <string name="profile_message_warning">Profiliniz sadece kayıtlı kişilerinizle paylaşılıyor</string>
   <string name="open_the_gallery">Galeriyi aç</string>
   <string name="take_a_photo">Fotoğraf çek</string>
-  <string name="profile_name_hint">Adınızı girin (isteğe bağlı)</string>
   <!--Share fragment-->
   <string name="share_message">Bu kodu Jami ile tarayın</string>
   <string name="share_message_no_account">Lütfen paylaşmak için bir hesap seçin.</string>
@@ -197,7 +195,6 @@
   <string name="contact_request_title">Yeni letişim isteği</string>
   <string name="contact_request_msg">%1$s iletişim isteğiniz var</string>
   <string name="contact_request_account">%1$s için</string>
-  <string name="no_requests">0 iletişim isteği</string>
   <string name="message_contact_not_trusted_yet">%s henüz bağlantınız değil.\nBu bağlantı isteğini kabul etmek ister misiniz? </string>
   <string name="message_contact_not_trusted">%s kişilerinizde yok.\n yeni bir kişi eklensin mi?</string>
   <!--Send contact requests-->
@@ -205,7 +202,7 @@
   <string name="send_request_title">Bir ileteşem isteği gönder</string>
   <string name="send_request_msg">Bu kullanıcıyla iletişime geçmek için iletişim isteği göndermelisiniz. Kişiniz bu isteği kabul etmediği sürece, siz ona ileti gönderebilirsiniz fakat o bunları yanıtlayamaz.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 engellenmiş kişi</string>
+  <string name="no_blocked_contact">Engellenmiş kişi yok</string>
   <!--Smartlist-->
   <string name="no_contact_request">Gönderilmiş bir iletişim isteği yok</string>
   <string name="contact_request_sent">İletişim isteği gönderildi</string>
@@ -264,4 +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-->
+  <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 33eb902..0ffa6ba 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
@@ -105,6 +105,7 @@
   <string name="account_credentials_add">Kimlik bilgisi ekle</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Güvenlik</string>
+  <string name="account_srtp_switch_label">Ortam akışlarını şifrele (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">TLS Taşıyıcı kullan</string>
@@ -158,7 +159,6 @@
   <string name="account_sip_success_title">Sip hesabı kayıtlı</string>
   <string name="account_sip_success_message">Sip hesabınızı başarıyla kaydettiniz.</string>
   <string name="account_sip_register_anyway">Her koşulda kaydol</string>
-  <string name="account_link_device">Başka bir cihazdan bağlanın</string>
   <string name="account_link_button">Ağdan bağlanın</string>
   <string name="account_link_archive_button">Yedeklemeden bağlan</string>
   <string name="account_link_prompt_pin">PIN\'i gir</string>
@@ -183,7 +183,7 @@
   <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 (önerilir)</string>
+  <string name="register_username">Halka açık kullanıcı adı kaydet</string>
   <string name="username_already_taken">Kullanıcı adı önceden alınmış</string>
   <string name="invalid_username">Geçersiz kullanıcı adı</string>
   <string name="unknown_error">Bilinmeyen hata. Lütfen ağ bağlantınızı kontrol edin!</string>
diff --git a/ring-android/app/src/main/res/values-tr/strings_preferences.xml b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
index 746d4b9..1852f1f 100644
--- a/ring-android/app/src/main/res/values-tr/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-tr/strings_preferences.xml
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">Tüm konuşma geçmişini temizle. Bu işlem geri alınamaz.</string>
   <string name="pref_persistNotification_title">Arkaplanda çalıştır</string>
   <string name="pref_persistNotification_summary">Arka planda çalışan çağrı  ve iletileri almak için izin ver</string>
+  <!--Plugin-->
 </resources>
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 c7a8030..759fca6 100644
--- a/ring-android/app/src/main/res/values-uk/strings.xml
+++ b/ring-android/app/src/main/res/values-uk/strings.xml
@@ -148,8 +148,8 @@
   <string name="prompt_new_password_repeat">Новий пароль ще раз</string>
   <string name="account_create_title">Створити обліковий запис Джамі</string>
   <string name="prompt_new_username">Вкажіть нове ім\'я користувача</string>
+  <string name="prompt_hint_username">Ім’я</string>
   <string name="help_password_choose">Оберіть сильний пароль, який ви запам\'ятаєте, щоб захистити ваш обліковий запис Джамі.</string>
-  <string name="help_password_enter">Введіть основний пароль від вашого облікового запису Джамі</string>
   <string name="help_pin_enter">Введіть PIN-код з іншого налаштованого облікового запису Джамі. Скористайтеся можливістю «Вивантажити обліковий запис Джамі», щоб отримати PIN-код.</string>
   <string name="wizard_next">Далі</string>
   <string name="wizard_back">Назад</string>
@@ -159,7 +159,6 @@
   <string name="profile_message_warning">Ваш профіль бачитимуть лише ваші контакти</string>
   <string name="open_the_gallery">Відкрити галерею</string>
   <string name="take_a_photo">Зробити фото</string>
-  <string name="profile_name_hint">Вкажіть ваше ім\'я (не обов\'язково)</string>
   <!--Share fragment-->
   <string name="share_message">Зіскануйте цей код у Джамі</string>
   <string name="share_message_no_account">Будь ласка, оберіть обліковий запис, щоб поділитися.</string>
@@ -174,7 +173,6 @@
   <string name="contact_request_title">Новий запит контакту</string>
   <string name="contact_request_msg">У вас є %1$s запитів контактів</string>
   <string name="contact_request_account">Для %1$s</string>
-  <string name="no_requests">0 запитів контактів</string>
   <string name="message_contact_not_trusted_yet">%s ще не серед ваших контактів.\nВи приймаєте чи відхиляєте цей запит контакту?</string>
   <string name="message_contact_not_trusted">%s немає серед ваших контактів.\nДодати новий контакт?</string>
   <!--Send contact requests-->
@@ -182,7 +180,6 @@
   <string name="send_request_title">Відправити запит контакту</string>
   <string name="send_request_msg">Ви повинні відправити запит контакту, щоб спілкуватися з іншим користувачем. Поки контакт не прийме запит, ви можете надсилати повідомлення, але він не зможе відповісти.</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 заблокованих контактів</string>
   <!--Smartlist-->
   <string name="no_contact_request">Не було відправлено жодних запитів контакту</string>
   <string name="contact_request_sent">Запит контакту надіслано</string>
@@ -202,4 +199,6 @@
   <string name="tv_audio_play">Програти</string>
   <string name="tv_audio_pause">Пауза</string>
   <string name="tv_dialog_send">Відправити</string>
+  <!--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 e282896..634b7fb 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
@@ -87,6 +87,7 @@
   <string name="account_credentials_add">Додати облікові дані</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">Безпека</string>
+  <string name="account_srtp_switch_label">Кодування потоку (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">Використовувати TLS</string>
@@ -154,7 +155,7 @@
   <string name="register_name">Зареєструвати ім\'я</string>
   <string name="trying_to_register_name">Спроба реєстрації імені</string>
   <string name="registered_username">Зареєстроване ім\'я користувача</string>
-  <string name="register_username">Зареєструвати публічне ім\'я користувача (рекомендовано)</string>
+  <string name="register_username">Зареєструвати публічне ум\'я користувача</string>
   <string name="username_already_taken">Ім\'я користувача вже зайнято</string>
   <string name="invalid_username">Недопустиме ім\'я користувача</string>
   <string name="looking_for_username_availability">Перевіряю доступність імені користувача…</string>
diff --git a/ring-android/app/src/main/res/values-uk/strings_preferences.xml b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
index 9c20887..c439afd 100644
--- a/ring-android/app/src/main/res/values-uk/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-uk/strings_preferences.xml
@@ -14,4 +14,5 @@
   <string name="pref_startOnBoot_title">Запускати Джамі після включення пристрою</string>
   <string name="pref_startOnBoot_summary">Дозволити Джамі працювати на задньому плані, коли вмикається пристрій.</string>
   <string name="pref_clearHistory_title">Видалити історію</string>
+  <!--Plugin-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings.xml b/ring-android/app/src/main/res/values-zh-rCN/strings.xml
index 40e2ef3..601dbf2 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
@@ -28,7 +28,7 @@
   <string name="ab_action_chat">文字消息</string>
   <!--Sections-->
   <string name="menu_item_contact_request">联系人请求</string>
-  <string name="menu_item_accounts">管理帐户</string>
+  <string name="menu_item_accounts">管理账户</string>
   <string name="menu_item_account">管理账户</string>
   <string name="menu_item_settings">设置</string>
   <string name="menu_item_share">共享我的通讯录</string>
@@ -104,6 +104,7 @@
   <string name="write_a_message">写消息</string>
   <string name="scan_qr">扫描二维码</string>
   <string name="ab_action_flipcamera">翻转摄像头</string>
+  <string name="ab_action_hidepreview">隐藏预览</string>
   <!--Text messages-->
   <string name="send_message">发消息</string>
   <string name="message_sending">正在发送消息…</string>
@@ -130,10 +131,10 @@
   <!--Write call log permission-->
   <string name="permission_dialog_write_call_log_message">Jami需要“写入通话记录”权限才能启用此功能,请批准。</string>
   <!--QRCode Scan-->
-  <string name="scan_qr_account_message">扫描您想添加帐户的二维码。</string>
+  <string name="scan_qr_account_message">扫描您想添加账户的二维码。</string>
   <string name="title_activity_qrcode">分享我的账户</string>
   <string name="error_scan_no_camera_permissions">二维码扫描器需要摄像头使用权限来工作</string>
-  <string name="tab_code">我的代码</string>
+  <string name="tab_code">我的二维码</string>
   <string name="tab_scan">扫描二维码</string>
   <!--Settings-->
   <string name="clear_history_dialog_title">清除历史记录?</string>
@@ -168,26 +169,27 @@
   <string name="prompt_new_password_repeat">确认新密码</string>
   <string name="account_create_title">创建一个 Jami 账户</string>
   <string name="prompt_new_username">输入新用户名</string>
-  <string name="help_password_choose">为了保护您的 Jami 帐户,请使用一个强密码并牢记。</string>
-  <string name="help_password_enter">输入您的 Jami 主帐户密码</string>
-  <string name="help_server_enter">输入管理服务器的URL</string>
-  <string name="help_pin_enter">从其他已配置的 Jami 帐户输入 PIN 码。使用“导出 Jami 帐户”功能获取 PIN 码。</string>
+  <string name="prompt_hint_username">用户名</string>
+  <string name="help_password_choose">为了保护您的 Jami 账户,请使用一个强密码并牢记。</string>
+  <string name="help_password_enter">输入您的 Jami 主账户密码。</string>
+  <string name="help_server_enter">输入管理服务器的 URL。</string>
+  <string name="help_pin_enter">从其他已配置的 Jami 账户输入 PIN 码。使用“导出 Jami 账户”功能获取 PIN 码。</string>
   <string name="wizard_next">下一步</string>
   <string name="wizard_back">上一步</string>
   <string name="wizard_skip">跳过</string>
   <!--MenuHeaderView-->
-  <string name="profile">帐户资料</string>
-  <string name="profile_message_warning">您的帐户资料仅与您的通讯录共享</string>
+  <string name="profile">账户资料</string>
+  <string name="profile_message_warning">您的账户资料仅与您的通讯录共享</string>
   <string name="open_the_gallery">打开照片库</string>
   <string name="take_a_photo">拍照</string>
-  <string name="profile_name_hint">输入您的名字(可选)</string>
+  <string name="profile_name_hint">输入您的名字</string>
   <!--Share fragment-->
   <string name="share_message">用 Jami 扫描此码</string>
-  <string name="share_message_no_account">请选择要共享的帐户。</string>
+  <string name="share_message_no_account">请选择要共享的账户。</string>
   <string name="share_your_account_information">共享我的通讯信息</string>
   <string name="share_label">共享</string>
   <string name="generic_error_migration">错误</string>
-  <string name="generic_error_migration_message">帐户迁移时发生错误</string>
+  <string name="generic_error_migration_message">账户迁移时发生错误</string>
   <string name="title_share_with">分享给...</string>
   <!--Pending contact requests-->
   <string name="accept">接听</string>
@@ -196,7 +198,7 @@
   <string name="contact_request_title">新联系人请求</string>
   <string name="contact_request_msg">您有%1$s个联系人请求</string>
   <string name="contact_request_account">为了 %1$s</string>
-  <string name="no_requests">0个联系人请求</string>
+  <string name="no_requests">您没有联系人请求</string>
   <string name="message_contact_not_trusted_yet">%s还不是你的联系人。\n你接受还是拒绝此联系人请求?</string>
   <string name="message_contact_not_trusted">%s不在您的联系人中。\n添加联系人?</string>
   <!--Send contact requests-->
@@ -204,9 +206,10 @@
   <string name="send_request_title">发送联系人请求</string>
   <string name="send_request_msg">您必须发送联系人请求才能与此用户通信。如果您的联系人未接受该请求,您依然可以发送消息,但他将无法回复。</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 个屏蔽的联系人</string>
+  <string name="no_blocked_contact">没有被屏蔽的联系人</string>
   <!--Smartlist-->
   <string name="no_contact_request">联系人请求未发送</string>
+  <string name="conversation_placeholder">您当前没有会话</string>
   <string name="contact_request_sent">联系人请求已发送</string>
   <string name="start_conversation">开始对话</string>
   <string name="search_results">搜索结果</string>
@@ -248,7 +251,7 @@
   <!--Bottom Navigation-->
   <string name="navigation_item_conversation">会话</string>
   <string name="navigation_item_contact_request">联系人请求</string>
-  <string name="navigation_item_account">帐户</string>
+  <string name="navigation_item_account">账户</string>
   <string name="search_results_public_directory">公共目录</string>
   <!--TV-->
   <string name="tv_send_audio_dialog_message">发送音频消息?</string>
@@ -263,4 +266,20 @@
   <string name="tv_send_audio">发送音频</string>
   <string name="tv_send_video">发送媒体文件</string>
   <string name="conversation_input_speech_hint">说点什么…</string>
+  <!--WIZARD-->
+  <string name="wizard_status_recommended">推荐</string>
+  <string name="wizard_status_optional">选填</string>
+  <string name="wizard_status_required">必填</string>
+  <string name="wizard_username_info">为您的账户创建一个用户名</string>
+  <string name="wizard_username_button">设置用户名</string>
+  <string name="wizard_username_skip">跳过用户名设置</string>
+  <string name="wizard_password_info">账户密码</string>
+  <string name="wizard_password_placeholder">创建密码来加密此设备上的账户密钥</string>
+  <string name="wizard_password_button">输入密码</string>
+  <string name="wizard_password_skip">创建账户</string>
+  <string name="wizard_password_switch">用密码加密账户</string>
+  <string name="wizard_password_warning">注意密码不能恢复</string>
+  <string name="wizard_profile_info">资料仅会与联系人分享</string>
+  <string name="wizard_profile_button">保存资料</string>
+  <string name="wizard_profile_skip">跳过此步骤稍后进行</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml b/ring-android/app/src/main/res/values-zh-rCN/strings_account.xml
index 11a857b..24a6e53 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
@@ -5,37 +5,37 @@
   <string name="ic_advanced_menu">高级设置</string>
   <string name="ic_blacklist_menu">已屏蔽的联系人</string>
   <!--Strings related to account creation-->
-  <string name="add_ring_account_title">添加Jami账户</string>
-  <string name="add_sip_account_title">添加SIP帐户</string>
+  <string name="add_ring_account_title">添加 Jami 账户</string>
+  <string name="add_sip_account_title">添加 SIP 账户</string>
   <string name="ring_account_default_name">Jami 用户%1$s</string>
   <string name="prompt_alias">别名</string>
   <string name="prompt_hostname">主机名</string>
   <string name="prompt_username">用户名</string>
   <string name="prompt_password">密码</string>
-  <string name="action_create">创建帐户</string>
+  <string name="action_create">创建账户</string>
   <string name="action_create_short">创建</string>
   <string name="action_register">注册</string>
   <string name="action_settings">设置</string>
   <string name="error_field_required">该字段必填</string>
-  <string name="dialog_wait_create">添加帐户</string>
-  <string name="dialog_wait_create_details">正在创建您的帐户,请稍等…</string>
-  <string name="dialog_wait_update">更新帐户</string>
-  <string name="dialog_wait_update_details">正在更新您的帐户,请稍等…</string>
-  <string name="dialog_warn_ip2ip_account_title">要创建空的 SIP 帐户吗?</string>
-  <string name="dialog_warn_ip2ip_account_message">您正在创建一个主机名非法的SIP帐户。
-该帐户拨出或接听通话将只能直接通过IP地址。
-您可以稍后编辑该帐户。</string>
-  <string name="account_type_ip2ip">IP帐户</string>
-  <string name="help_ring">Jami帐户允许您通过完全的分布式网络以点对点的方式安全地与其他人员联系。</string>
-  <string name="help_sip_title">添加您的 SIP 帐户</string>
-  <string name="help_sip">配置已有的 SIP 帐户。</string>
-  <string name="create_sip_account">添加 SIP 帐户</string>
+  <string name="dialog_wait_create">添加账户</string>
+  <string name="dialog_wait_create_details">正在创建您的账户,请稍等…</string>
+  <string name="dialog_wait_update">更新账户</string>
+  <string name="dialog_wait_update_details">正在更新您的账户,请稍等…</string>
+  <string name="dialog_warn_ip2ip_account_title">要创建空的 SIP 账户吗?</string>
+  <string name="dialog_warn_ip2ip_account_message">您正在创建一个带有无效主机名的 SIP 账户。
+        这样的话,您只能拨打和接听 ip 通话。
+        您可以稍后编辑该账户。</string>
+  <string name="account_type_ip2ip">IP 账户</string>
+  <string name="help_ring">Jami 账户允许您通过完全的分布式网络以点对点的方式安全地与其他人员联系。</string>
+  <string name="help_sip_title">添加您的 SIP 账户</string>
+  <string name="help_sip">配置已有的 SIP 账户。</string>
+  <string name="create_sip_account">添加 SIP 账户</string>
   <!--Strings related to account deletion-->
-  <string name="account_delete_dialog_title">删除帐户吗?</string>
+  <string name="account_delete_dialog_title">删除账户吗?</string>
   <string name="account_delete_dialog_message">该操作不可撤销。</string>
   <!--AccountManagementFragment-->
   <string name="empty_account_list">没有已注册账户</string>
-  <string name="normal_accounts_titles">帐户</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>
@@ -50,7 +50,7 @@
   <!--Basic Details-->
   <string name="account_preferences_basic_tab">通用</string>
   <string name="account_basic_category">基本设置</string>
-  <string name="account_alias_label">帐户名称</string>
+  <string name="account_alias_label">账户名称</string>
   <string name="account_hostname_label">主机名</string>
   <string name="account_bootstrap_label">初始服务器</string>
   <string name="account_username_label">用户名</string>
@@ -92,19 +92,22 @@
   <string name="account_published_same_as_local_label">公开参数与本地相同</string>
   <string name="account_published_port_label">公开端口</string>
   <string name="account_published_address_label">公开地址</string>
-  <string name="account_proxy_label">DHT代理</string>
+  <string name="account_proxy_label">DHT 代理</string>
   <string name="account_proxy_enable_label">使用DHT代理</string>
   <string name="account_proxy_server_label">DHT代理地址</string>
   <string name="account_proxy_server_list_label">DHT代理列表URL </string>
   <string name="account_peer_discovery_label">本地对等方发现</string>
   <string name="account_peer_discovery_enable_label">启用本地对等方发现</string>
-  <string name="account_peer_discovery_enable_summary">连接至在本地网络宣告的DHT节点</string>
+  <string name="account_peer_discovery_enable_summary">连接至在本地网络宣告的 DHT 节点</string>
   <!--Security Details-->
   <string name="account_credentials_label">认证信息</string>
   <string name="account_credentials_edit">编辑认证信息</string>
   <string name="account_credentials_add">添加认证信息</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">安全</string>
+  <string name="account_srtp_switch_label">加密流媒体 (SRTP)</string>
+  <string name="account_srtp_enable_sdes">启用 SDES 作为密钥交换协议</string>
+  <string name="account_srtp_rtp_fallback">如果 SRTP 失败,使用 RTP</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">使用 TLS 通讯</string>
@@ -123,52 +126,52 @@
   <string name="account_rtp_min_port">最小</string>
   <string name="account_rtp_port_range">音频 RTP 端口范围</string>
   <!--restore/backup-->
-  <string name="account_new_device_password">输入主密码以解锁帐户</string>
+  <string name="account_new_device_password">输入主密码以解锁账户</string>
   <string name="error_password_char_count">最少6字符</string>
   <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_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>
+  <string name="account_export_end_network_message">无法进行账户在线导出。请检查您的网络连接。</string>
   <string name="account_export_end_error_title">错误</string>
-  <string name="account_export_end_error_message">无法导出帐户,发生未知错误。</string>
+  <string name="account_export_end_error_message">无法导出账户,发生未知错误。</string>
   <string name="account_enter_password">输入密码</string>
   <string name="account_share_body">用“%1$s”在Jami分布式通信平台上与我联系:%2$s</string>
   <string name="account_share_body_with_username">使用“%1$s”或我的公共用户名“%2$s”在Ring分布式通讯平台上联系我:%3$s</string>
   <string name="account_contact_me">在 Jami 上联系我!</string>
-  <string name="update_account">更新帐户</string>
-  <string name="account_migration">您的 Jami 帐户可以被更新。\n请输入您的密码。</string>
+  <string name="update_account">更新账户</string>
+  <string name="account_migration">您的 Jami 账户可以被更新。\n请输入您的密码。</string>
   <string name="ring_account">Jami 账户</string>
   <string name="ring_account_identity">身份</string>
-  <string name="account_migration_title_dialog">帐户迁移</string>
-  <string name="account_migration_message_dialog">您的帐户需要被更新。您想前往帐户管理界面进行该操作吗?</string>
+  <string name="account_migration_title_dialog">账户迁移</string>
+  <string name="account_migration_message_dialog">您的账户需要被更新。您想前往账户管理界面进行该操作吗?</string>
   <string name="account_update_needed">需要更新</string>
-  <string name="account_cannot_be_found_title">无法找到帐户</string>
-  <string name="account_cannot_be_found_message">在 Jami 网络上找不到帐户。\n请确保它是从现有设备上的 Jami 导出的,并且提供的凭据是正确的。</string>
-  <string name="account_sip_cannot_be_registered_message">您可以前往下一步或在这里编辑您的信息。帐户创建后,您仍可在帐户设置中进行编辑。</string>
+  <string name="account_cannot_be_found_title">无法找到账户</string>
+  <string name="account_cannot_be_found_message">在 Jami 网络上找不到账户。\n请确保它是从现有设备上的 Jami 导出的,并且提供的凭据是正确的。</string>
+  <string name="account_sip_cannot_be_registered_message">您可以前往下一步或在这里编辑您的信息。账户创建后,您仍可在账户设置中进行编辑。</string>
   <string name="account_no_network_title">无法连接至网络</string>
-  <string name="account_no_network_message">无法添加帐户,因为 Jami 无法连接到分布式网络。检查您设备的连接。</string>
-  <string name="account_device_added_title">帐户设备已添加</string>
-  <string name="account_device_added_message">你已在此设备上成功设置了 Jami 帐户。</string>
-  <string name="account_device_updated_title">帐户设备已更新</string>
-  <string name="account_device_updated_message">你的Jami帐户已成功更新。</string>
-  <string name="account_cannot_be_updated_message">无法更新帐户设备。请检查您的密码。</string>
-  <string name="account_sip_success_title">SIP帐户已注册</string>
-  <string name="account_sip_success_message">您已成功注册了您的SIP帐户。</string>
+  <string name="account_no_network_message">无法添加账户,因为 Jami 无法连接到分布式网络。检查您设备的连接。</string>
+  <string name="account_device_added_title">账户设备已添加</string>
+  <string name="account_device_added_message">你已在此设备上成功设置了 Jami 账户。</string>
+  <string name="account_device_updated_title">账户设备已更新</string>
+  <string name="account_device_updated_message">你的Jami账户已成功更新。</string>
+  <string name="account_cannot_be_updated_message">无法更新账户设备。请检查您的密码。</string>
+  <string name="account_sip_success_title">SIP账户已注册</string>
+  <string name="account_sip_success_message">您已成功注册了您的SIP账户。</string>
   <string name="account_sip_register_anyway">仍然注册</string>
-  <string name="account_link_device">从其他设备关联</string>
+  <string name="account_link_device">从另一台设备连接</string>
   <string name="account_link_button">从网络关联</string>
   <string name="account_link_archive_button">从备份文件关联</string>
   <string name="account_link_prompt_pin">输入 PIN 码</string>
   <string name="account_new_button">创建一个 Jami 账户</string>
-  <string name="account_link_export_button">将另一设备与该帐户进行连接</string>
-  <string name="account_link_export_info">要在其他设备上使用此帐户,您必须先在 Jami 上公开它。这将生成一个 PIN 码,您必须在新设备上输入该 PIN 码才能设置此帐户。PIN 码有效期为 10 分钟。</string>
+  <string name="account_link_export_button">将另一设备与该账户进行连接</string>
+  <string name="account_link_export_info">要在其他设备上使用此账户,您必须先在 Jami 上公开它。这将生成一个 PIN 码,您必须在新设备上输入该 PIN 码才能设置此账户。PIN 码有效期为 10 分钟。</string>
   <string name="account_start_export_button">生成 PIN 码</string>
   <string name="account_end_export_button">关闭</string>
-  <string name="account_end_export_infos">您的PIN码是:\n\n%%\n\n要完成此过程,您需要在新设备上打开 Jami。 使用“将此设备链接到帐户”创建一个新帐户。你的 PIN 码有效期为 10 分钟。</string>
-  <string name="account_link_export_info_light">要在其他设备上使用此帐户,您必须先在Jami上公开它。这将生成一个PIN码,您必须在新设备上输入该PIN码才能设置帐户。PIN有效期为10分钟。</string>
+  <string name="account_end_export_infos">您的 PIN 码是:\n\n%%\n\n要完成此过程,您需要在新设备上打开 Jami。 使用“将此设备链接到账户”创建一个新账户。你的 PIN 码有效期为 10 分钟。</string>
+  <string name="account_link_export_info_light">要在其他设备上使用此账户,您必须先在 Jami 上公开它。这将生成一个 PIN 码,您必须在新设备上输入该 PIN 码才能设置账户。PIN 有效期为 10 分钟。</string>
   <string name="account_export_title">添加设备</string>
   <string name="account_connect_server_button">连接到管理服务器</string>
   <string name="account_connect_button">连接</string>
@@ -178,12 +181,13 @@
   <string name="account_connect_prompt_username">用户名</string>
   <!--Name registration-->
   <string name="error_username_empty">输入用户名</string>
-  <string name="no_registered_name_for_account">该帐户尚未注册用户名</string>
-  <string name="username_available">用户名不可用!</string>
+  <string name="no_registered_name_for_account">该账户尚未注册用户名</string>
+  <string name="username_available">用户名可用!</string>
   <string name="register_name">注册名称</string>
   <string name="trying_to_register_name">正在尝试注册用户名</string>
   <string name="registered_username">已注册的用户名</string>
-  <string name="register_username">注册公开用户名(推荐)</string>
+  <string name="register_username">注册公共用户名</string>
+  <string name="register_recommended">推荐</string>
   <string name="username_already_taken">用户名已被占用</string>
   <string name="invalid_username">非法用户名</string>
   <string name="unknown_error">未知错误。请检查你的网络连接。</string>
@@ -196,12 +200,12 @@
   <string name="account_status_error">错误</string>
   <!--Create account-->
   <string name="account_creation_home">欢迎来到Jami</string>
-  <string name="account_creation_profile">创建您的帐户资料</string>
+  <string name="account_creation_profile">创建您的账户资料</string>
   <string name="account_creation_ring">创建你的Jami帐号</string>
   <string name="account_link_title">连接此设备</string>
-  <string name="account_sip_cannot_be_registered">无法注册帐户</string>
+  <string name="account_sip_cannot_be_registered">无法注册账户</string>
   <!--Edit profile-->
-  <string name="account_edit_profile">修改您的帐户资料</string>
+  <string name="account_edit_profile">修改您的账户资料</string>
   <!--Devices-->
   <string name="account_revoke_device_hint">输入密码以确认</string>
   <string name="enter_password">输入密码</string>
@@ -210,7 +214,7 @@
   <string name="revoke_device_wait_title">请稍等…</string>
   <string name="revoke_device_wait_message">正在吊销设备</string>
   <string name="rename_device_title">重命名该设备</string>
-  <string name="rename_device_message">选择一个新名称以在您的Jami帐户中标识此设备</string>
+  <string name="rename_device_message">选择一个新名称以在您的Jami账户中标识此设备</string>
   <string name="rename_device_button">重命名设备</string>
   <string name="account_rename_device_hint">输入新的设备名</string>
   <string name="account_device_name_empty">设备名不可为空</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 9dabecf..e2c5fc5 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
@@ -24,4 +24,5 @@
   <string name="pref_clearHistory_summary">清除所有会话历史记录。该操作无法撤销。</string>
   <string name="pref_persistNotification_title">后台运行</string>
   <string name="pref_persistNotification_summary">允许在后台运行以接收电话和消息。</string>
+  <!--Plugin-->
 </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 66b18a9..bb8c0fd 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
@@ -31,6 +31,7 @@
   <string name="menu_item_accounts">管理帳號</string>
   <string name="menu_item_account">管理帳號</string>
   <string name="menu_item_settings">設定</string>
+  <string name="menu_item_plugin_list">外掛程式設定</string>
   <string name="menu_item_share">分享我的聯絡人</string>
   <string name="menu_item_about">關於 Jami</string>
   <!--Dialing Fragment-->
@@ -92,6 +93,7 @@
   <string name="action_call_accept">打電話</string>
   <string name="action_call_decline">拒絕</string>
   <string name="action_call_mic_mute">麥克風靜音</string>
+  <string name="action_load_plugin">載入外掛程式</string>
   <string name="ab_action_speakerphone">啟用喇叭</string>
   <string name="ab_action_contact_add">加到聯絡人</string>
   <string name="ab_action_contact_add_question">新增到聯絡人?</string>
@@ -104,6 +106,7 @@
   <string name="write_a_message">寫訊息</string>
   <string name="scan_qr">掃描 QR Code</string>
   <string name="ab_action_flipcamera">翻轉攝影機</string>
+  <string name="ab_action_hidepreview">隱藏預覽</string>
   <!--Text messages-->
   <string name="send_message">傳送訊息</string>
   <string name="message_sending">正在傳送訊息...</string>
@@ -168,9 +171,10 @@
   <string name="prompt_new_password_repeat">重新輸入新密碼</string>
   <string name="account_create_title">建立 Jami 帳號</string>
   <string name="prompt_new_username">輸入新使用者名稱</string>
+  <string name="prompt_hint_username">使用者名稱</string>
   <string name="help_password_choose">選擇您可以記住用來保護您的 Jami 帳號的強式密碼。</string>
-  <string name="help_password_enter">輸入您的主要 Jami 帳號密碼</string>
-  <string name="help_server_enter">輸入管理伺服器的 URL</string>
+  <string name="help_password_enter">輸入您的主要 Jami 帳號密碼。</string>
+  <string name="help_server_enter">輸入管理伺服器的 URL。</string>
   <string name="help_pin_enter">輸入從其他已設定 Jami 帳號的 PIN 碼。使用「在 Jami 上匯出帳號」功能來取得 PIN 碼。</string>
   <string name="wizard_next">下一個</string>
   <string name="wizard_back">前一個</string>
@@ -180,7 +184,7 @@
   <string name="profile_message_warning">您的介紹僅與您的聯絡人分享</string>
   <string name="open_the_gallery">開啟相簿</string>
   <string name="take_a_photo">照相</string>
-  <string name="profile_name_hint">輸入您的名稱(選擇性)</string>
+  <string name="profile_name_hint">輸入您的名字</string>
   <!--Share fragment-->
   <string name="share_message">使用 Jami 掃描此條碼</string>
   <string name="share_message_no_account">請選取要分享的帳號。</string>
@@ -196,7 +200,7 @@
   <string name="contact_request_title">新聯絡人請求</string>
   <string name="contact_request_msg">您有 %1$s 個聯絡人請求</string>
   <string name="contact_request_account">給 %1$s</string>
-  <string name="no_requests">0 個聯絡人請求</string>
+  <string name="no_requests">您沒有聯絡人請求</string>
   <string name="message_contact_not_trusted_yet">%s 不在您的聯絡人清單裡。\n您要接受或是回絕此聯絡人請求?</string>
   <string name="message_contact_not_trusted">%s 不是您的聯絡人。\n新增新聯絡人嗎?</string>
   <!--Send contact requests-->
@@ -204,9 +208,10 @@
   <string name="send_request_title">傳送聯絡人請求</string>
   <string name="send_request_msg">您必須傳送聯絡人請求給您要通訊的使用者。只要您的聯絡人沒有接受此請求,您可以傳送訊息,但他無法回應。</string>
   <!--Blacklist-->
-  <string name="no_blocked_contact">0 個已阻擋的聯絡人</string>
+  <string name="no_blocked_contact">沒有已封鎖的聯絡人</string>
   <!--Smartlist-->
   <string name="no_contact_request">未有送出的聯絡人請求</string>
+  <string name="conversation_placeholder">您尚未有對話</string>
   <string name="contact_request_sent">聯絡人請求已傳送</string>
   <string name="start_conversation">開啟對話</string>
   <string name="search_results">搜尋結果</string>
@@ -263,4 +268,20 @@
   <string name="tv_send_audio">傳送音訊</string>
   <string name="tv_send_video">傳送媒體</string>
   <string name="conversation_input_speech_hint">說點東西……</string>
+  <!--WIZARD-->
+  <string name="wizard_status_recommended">建議</string>
+  <string name="wizard_status_optional">選擇性</string>
+  <string name="wizard_status_required">必填</string>
+  <string name="wizard_username_info">為您的帳號選擇一個使用者名稱</string>
+  <string name="wizard_username_button">選擇使用者名稱</string>
+  <string name="wizard_username_skip">略過選擇使用者名稱</string>
+  <string name="wizard_password_info">帳號密碼</string>
+  <string name="wizard_password_placeholder">選擇密碼以加密此裝置上的帳號金鑰</string>
+  <string name="wizard_password_button">選擇密碼</string>
+  <string name="wizard_password_skip">建立帳號</string>
+  <string name="wizard_password_switch">以密碼加密帳號</string>
+  <string name="wizard_password_warning">注意,這個密碼不能被復原</string>
+  <string name="wizard_profile_info">個人檔案僅與聯絡人分享</string>
+  <string name="wizard_profile_button">儲存個人檔案</string>
+  <string name="wizard_profile_skip">略過並在稍後執行此動作</string>
 </resources>
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 e8a0f04..5638397 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
@@ -105,6 +105,9 @@
   <string name="account_credentials_add">新增憑證</string>
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">安全性</string>
+  <string name="account_srtp_switch_label">加密媒體串流 (SRTP)</string>
+  <string name="account_srtp_enable_sdes">啟用 SDES 作為金鑰交換協定</string>
+  <string name="account_srtp_rtp_fallback">如果 SRTP 失敗則汰退至 RTP</string>
   <!--SIP-->
   <!--TLS Details-->
   <string name="account_tls_transport_switch_label">使用 TLS 傳輸</string>
@@ -183,7 +186,8 @@
   <string name="register_name">註冊名稱</string>
   <string name="trying_to_register_name">正在嘗試註冊名稱</string>
   <string name="registered_username">已註冊的使用者名稱</string>
-  <string name="register_username">註冊公開的使用者名稱(建議)</string>
+  <string name="register_username">註冊公開使用者名稱</string>
+  <string name="register_recommended">建議</string>
   <string name="username_already_taken">已取得的使用者名稱</string>
   <string name="invalid_username">無效的使用者名稱</string>
   <string name="unknown_error">未知的錯誤。請檢查您的網路連線!</string>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_content_description.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_content_description.xml
index a6279a4..935f752 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_content_description.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_content_description.xml
@@ -5,4 +5,5 @@
   <string name="contact_picture_description">聯絡人的照片</string>
   <string name="dial_numeric_pad">電話按鍵鍵盤</string>
   <string name="contact_unblock">取消封鎖</string>
+  <string name="video_plugins">視訊外掛程式</string>
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
index dcbc189..da6d3de 100644
--- a/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
@@ -24,4 +24,17 @@
   <string name="pref_clearHistory_summary">清除所有對話歷史。此動作無法復原。</string>
   <string name="pref_persistNotification_title">在背景執行</string>
   <string name="pref_persistNotification_summary">允許在背景中執行以接收通話與訊息。</string>
+  <!--Plugin-->
+  <string name="pref_plugins_title">外掛程式</string>
+  <string name="pref_plugins_summary">啟用外掛程式並設定其參數</string>
+  <string name="fab_plugins_add">加入新的外掛程式</string>
+  <string name="plugin_uninstall_title">解除安裝外掛程式?</string>
+  <string name="plugin_reset_preferences">重設外掛程式偏好設定</string>
+  <string name="plugin_reset_preferences_summary">您的外掛程式設定將會變成預設值</string>
+  <string name="plugin_reset_preferences_ask">您想要重設外掛程式設定嗎?</string>
+  <string name="plugin_successfully_installed">外掛程式 <b>%1$s</b> 已成功安裝</string>
+  <string name="plugin_install_failure">安裝外掛程式失敗: <b>%1$s</b></string>
+  <string name="plugin_recent_version_exception">您有更新的版本可供安裝: <b>%1$s</b></string>
+  <string name="plugin_same_version_exception">您已安裝了相同的版本 <b>%1$s</b></string>
+  <string name="plugin_force_install">強制 \n 安裝</string>
 </resources>
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 5321770..9012796 100644
--- a/ring-android/app/src/main/res/values-zh/strings.xml
+++ b/ring-android/app/src/main/res/values-zh/strings.xml
@@ -27,6 +27,7 @@
   <!--Conversation-->
   <string name="conversation_action_copy_peer_number">複製號碼</string>
   <!--Contacts-->
+  <string name="prompt_hint_username">使用者名</string>
   <string name="wizard_next">下一步</string>
   <!--MenuHeaderView-->
   <string name="profile">個人檔案</string>
@@ -50,4 +51,5 @@
   <string name="tv_audio_play">播放</string>
   <string name="tv_audio_pause">暫停</string>
   <string name="tv_dialog_send">發送</string>
+  <!--WIZARD-->
 </resources>
diff --git a/ring-android/app/src/main/res/values-zh/strings_account.xml b/ring-android/app/src/main/res/values-zh/strings_account.xml
index 6c71f4d..039c361 100644
--- a/ring-android/app/src/main/res/values-zh/strings_account.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_account.xml
@@ -33,6 +33,7 @@
   <!--Security Details-->
   <!--SRTP Details-->
   <string name="account_preferences_security_tab">安全</string>
+  <string name="account_srtp_switch_label">對影音串流加密 (SRTP)</string>
   <!--SIP-->
   <!--TLS Details-->
   <!--restore/backup-->
diff --git a/ring-android/app/src/main/res/values-zh/strings_preferences.xml b/ring-android/app/src/main/res/values-zh/strings_preferences.xml
index 677722e..2e81935 100644
--- a/ring-android/app/src/main/res/values-zh/strings_preferences.xml
+++ b/ring-android/app/src/main/res/values-zh/strings_preferences.xml
@@ -2,4 +2,5 @@
 <resources>
   <string name="pref_category_contacts">聯絡人</string>
   <string name="pref_category_video">影像</string>
+  <!--Plugin-->
 </resources>