diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index cefcdf062..25be4d61c 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -256,7 +256,6 @@
   <string name="disable_all_accounts">تعطيل كل الحسابات</string>
   <string name="perform_action_with">تنفيذ الإجراء مع</string>
   <string name="no_affiliation">زائر</string>
-  <string name="no_role">لا دور</string>
   <string name="outcast">مفصول</string>
   <string name="member">عضو</string>
   <string name="advanced_mode">الوضع المتقدم</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 425c989ff..819250ba8 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Временно деактивиране</string>
   <string name="mgmt_account_publish_avatar">Публикуване на аватар</string>
   <string name="mgmt_account_publish_pgp">Публикуване на публичния OpenPGP ключ</string>
+  <string name="openpgp_has_been_published">Публичният OpenPGP ключ беше публикуван.</string>
+  <string name="republish_pgp_keys">Запомнете, че трябва да публикувате повторно своите публични OpenPGP ключове!</string>
   <string name="mgmt_account_enable">Активиране на профила</string>
   <string name="mgmt_account_are_you_sure">Сигурни ли сте?</string>
   <string name="mgmt_account_delete_confirm_text">Ако изтриете профила, цялата история на разговорите Ви ще бъде изтрита.</string>
@@ -413,7 +415,6 @@
   <string name="disable_all_accounts">Деактивиране на всички профили</string>
   <string name="perform_action_with">Изпълнение на действието с</string>
   <string name="no_affiliation">Няма принадлежност</string>
-  <string name="no_role">Няма роля</string>
   <string name="outcast">Отхвърлен</string>
   <string name="member">Член</string>
   <string name="advanced_mode">Разширен режим</string>
@@ -507,6 +508,7 @@
   <string name="pref_use_white_background">Използване на бял фон</string>
   <string name="pref_use_white_background_summary">Показване на получените съобщения с черен текст на бял фон</string>
   <string name="account_status_tor_unavailable">Мрежата на Тор е недостъпна</string>
+  <string name="account_status_bind_failure">Грешка при свързване</string>
   <string name="server_info_broken">Повредено</string>
   <string name="pref_presence_settings">Присъствие</string>
   <string name="pref_away_when_screen_off">Отсъстващ, когато екранът е изключен</string>
@@ -525,9 +527,8 @@
   <string name="server_side_mam_prefs">Настройки за архивирането на сървъра</string>
   <string name="fetching_mam_prefs">Получаване на настройките за архивирането. Моля, изчакайте…</string>
   <string name="unable_to_fetch_mam_prefs">Неуспешно получаване на настройките за архивирането</string>
-  <string name="captcha_ocr">Текст за проверка</string>
   <string name="captcha_required">Проверката е задължителна</string>
-  <string name="captcha_hint">въведете текста от изображението</string>
+  <string name="captcha_hint">Въведете текста от горното изображение</string>
   <string name="certificate_chain_is_not_trusted">Сертификатът не е потвърден</string>
   <string name="jid_does_not_match_certificate">Jabber идентификатора не съответства на сертификата</string>
   <string name="action_renew_certificate">Подновяване на сертификата</string>
@@ -603,4 +604,5 @@
   <string name="presence_xa">Недостъпен</string>
   <string name="presence_dnd">Зает</string>
   <string name="secure_password_generated">Беше създадена сигурна парола</string>
+  <string name="device_does_not_support_battery_op">Устройството Ви не поддържа изключването на оптимизациите за използването на батерията</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 2a9aa8c55..37a3e0676 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -346,7 +346,6 @@
   <string name="disable_all_accounts">Deshabilitar tots els comptes</string>
   <string name="perform_action_with">Realitzar l\'acció amb ...</string>
   <string name="no_affiliation">Cap afiliació</string>
-  <string name="no_role">Sense regles</string>
   <string name="outcast">Outcast</string>
   <string name="member">Membre</string>
   <string name="advanced_mode">Mode avançat</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 77ad7733a..07cbde0d7 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Dočasně vypnout</string>
   <string name="mgmt_account_publish_avatar">Zveřejnit avatar</string>
   <string name="mgmt_account_publish_pgp">Zveřejnit OpenPGP klíč</string>
+  <string name="openpgp_has_been_published">Veřejný OpenPGP klíč byl zveřejněn.</string>
+  <string name="republish_pgp_keys">Nezapomeňte znovuzveřejnit své veřejné OpenPGP klíče!</string>
   <string name="mgmt_account_enable">Povolit účet</string>
   <string name="mgmt_account_are_you_sure">Jste si jisti?</string>
   <string name="mgmt_account_delete_confirm_text">Pokud smažete svůj účet celá historie konverzací bude ztracena</string>
@@ -413,7 +415,7 @@
   <string name="disable_all_accounts">Vypnout všechny účty</string>
   <string name="perform_action_with">Provést akci s</string>
   <string name="no_affiliation">Nepřidružený</string>
-  <string name="no_role">Bez role</string>
+  <string name="no_role">Offline</string>
   <string name="outcast">Vyloučený</string>
   <string name="member">Člen</string>
   <string name="advanced_mode">Pokročilý mód</string>
@@ -509,6 +511,8 @@
   <string name="pref_use_white_background">Použít bílé pozadí</string>
   <string name="pref_use_white_background_summary">Zobrazovat přijaté zprávy jako černý text na bílém pozadí</string>
   <string name="account_status_tor_unavailable">Tor síť není dostupná</string>
+  <string name="account_status_bind_failure">Bind chyba</string>
+  <string name="account_status_host_unknown">Host neznámý</string>
   <string name="server_info_broken">Rozbité</string>
   <string name="pref_presence_settings">Stav</string>
   <string name="pref_away_when_screen_off">Pryč při vypnuté obrazovce</string>
@@ -527,9 +531,8 @@
   <string name="server_side_mam_prefs">Nastavení archivace na serveru</string>
   <string name="fetching_mam_prefs">Získávání nastavení archivace. Chvíli strpení...</string>
   <string name="unable_to_fetch_mam_prefs">Nelze získat nastavení archivace</string>
-  <string name="captcha_ocr">Captcha text</string>
   <string name="captcha_required">Captcha vyžadována</string>
-  <string name="captcha_hint">opište text z obrázku</string>
+  <string name="captcha_hint">Zadejte text z obrázku výše</string>
   <string name="certificate_chain_is_not_trusted">Řetězec certifikátů není důvěryhodný</string>
   <string name="jid_does_not_match_certificate">Jabber ID neodpovídá certifikátu</string>
   <string name="action_renew_certificate">Obnovit certifikát</string>
@@ -589,4 +592,23 @@
   <string name="security_error_invalid_file_access">Chyba zabezpečení: Neplatný přístup k souboru</string>
   <string name="no_application_to_share_uri">Nebyla nalezena aplikace pro sdílení URI</string>
   <string name="share_uri_with">Sdílet URI s...</string>
+  <string name="welcome_text">XMPP je protokol nezávislý na poskytovateli. Tohoto klienta můžete použít s jakýmkoliv XMPP serverem dle svého výběru.\nPro lepší uživatelskou přívětivost jsme připravili možnost vytvořit účet u conversations.im; speciálné připraveného poskytovatele pro použití s aplikací Conversations.</string>
+  <string name="magic_create_text">Provedeme vás procesem založení uživatelského účtu u conversations.im.\nVybráním conversations.im za svého poskytovatele budete moci komunikovat s uživateli u jiných poskytovatelů poté co jim sdělíte své Jabber ID.</string>
+  <string name="your_full_jid_will_be">Vaše celé Jabber ID bude: %s</string>
+  <string name="create_account">Vytvořit účet</string>
+  <string name="use_own_provider">Použít vlastního provozovatele</string>
+  <string name="pick_your_username">Zadejte své uživatelské jméno</string>
+  <string name="pref_manually_change_presence">Ručně změnit dostupnost</string>
+  <string name="pref_manually_change_presence_summary">Dotykem na avatar změnit svou dostupnost</string>
+  <string name="change_presence">Změnit dostupnost</string>
+  <string name="status_message">Stavová zpráva</string>
+  <string name="all_accounts_on_this_device">Nastavit pro všechny účty na tomto přístroji</string>
+  <string name="presence_chat">Volný pro chat</string>
+  <string name="presence_online">Online</string>
+  <string name="presence_away">Pryč</string>
+  <string name="presence_xa">Nedostupný</string>
+  <string name="presence_dnd">Zaneprázdněný</string>
+  <string name="secure_password_generated">Bylo vygenerováno bezpečné heslo</string>
+  <string name="device_does_not_support_battery_op">Tento přístroj nepodporuje vypnutí možnosti optimalizace využití baterie</string>
+  <string name="show_password">Zobrazit heslo</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 75232530b..278c9f651 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Vorübergehend abschalten</string>
   <string name="mgmt_account_publish_avatar">Avatar veröffentlichen</string>
   <string name="mgmt_account_publish_pgp">Öffentlichen OpenPGP-Schlüssel veröffentlichen</string>
+  <string name="openpgp_has_been_published">Öffentlicher OpenPGP Schlüssel wurde veröffentlicht.</string>
+  <string name="republish_pgp_keys">Deine öffentliche OpenPGP Schlüssel müssen veröffentlicht werden!</string>
   <string name="mgmt_account_enable">Konto aktivieren </string>
   <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string>
   <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löschst, gehen alle Gesprächsverläufe verloren</string>
@@ -413,7 +415,7 @@
   <string name="disable_all_accounts">Alle Konten abschalten</string>
   <string name="perform_action_with">Aktion durchführen mit</string>
   <string name="no_affiliation">Keine Zugehörigkeit</string>
-  <string name="no_role">Keine Rolle</string>
+  <string name="no_role">Offline</string>
   <string name="outcast">Ausgeschlossen</string>
   <string name="member">Mitglied</string>
   <string name="advanced_mode">Erweiterter Modus</string>
@@ -507,6 +509,8 @@
   <string name="pref_use_white_background">Weißen Hintergrund benutzen</string>
   <string name="pref_use_white_background_summary">Empfangene Nachrichten als schwarzen Text auf weißem Hintergrund anzeigen</string>
   <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string>
+  <string name="account_status_bind_failure">Bindungsfehler</string>
+  <string name="account_status_host_unknown">Host unbekannt</string>
   <string name="server_info_broken">Fehlerhaft</string>
   <string name="pref_presence_settings">Status</string>
   <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
@@ -525,9 +529,8 @@
   <string name="server_side_mam_prefs">Archivierungseinstellungen des Servers</string>
   <string name="fetching_mam_prefs">Archivierungseinstellungen werden abgerufen. Bitte warten …</string>
   <string name="unable_to_fetch_mam_prefs">Archivierungseinstellungen konnten nicht abgerufen werden</string>
-  <string name="captcha_ocr">Captcha Text</string>
   <string name="captcha_required">Captcha erforderlich</string>
-  <string name="captcha_hint">Text aus Captcha eintragen</string>
+  <string name="captcha_hint">Gib den Text vom obigen Bild ein</string>
   <string name="certificate_chain_is_not_trusted">Zertifikat wird nicht vertraut</string>
   <string name="jid_does_not_match_certificate">Jabber-ID stimmt nicht dem Zertifikat überein</string>
   <string name="action_renew_certificate">Zertifikat erneuern</string>
@@ -603,4 +606,6 @@
   <string name="presence_xa">Nicht verfügbar</string>
   <string name="presence_dnd">Beschäftigt</string>
   <string name="secure_password_generated">Ein sicheres Passwort wurde erstellt</string>
+  <string name="device_does_not_support_battery_op">Dein Gerät unterstützt keine Batterieoptimierungen</string>
+  <string name="show_password">Passwort anzeigen</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 6a3bec969..da1872d1a 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -346,7 +346,6 @@
   <string name="disable_all_accounts">Απενεργοποίηση όλων των λογαριασμών</string>
   <string name="perform_action_with">Εκτέλεση ενέργειας με</string>
   <string name="no_affiliation">Χωρίς δεσμό</string>
-  <string name="no_role">Χωρίς ρόλο</string>
   <string name="outcast">Απόκληρος</string>
   <string name="member">Μέλος</string>
   <string name="advanced_mode">Κατάσταση για προχωρημένους</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 5174f22ff..50c39fa39 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
   <string name="mgmt_account_publish_avatar">Imagen de perfil</string>
   <string name="mgmt_account_publish_pgp">Publicar clave pública OpenPGP</string>
+  <string name="openpgp_has_been_published">Clave pública OpenPGP ha sido publicada.</string>
+  <string name="republish_pgp_keys">¡Recuerda republicar tus claves públicas OpenPGP!</string>
   <string name="mgmt_account_enable">Habilitar</string>
   <string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
   <string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
@@ -413,7 +415,7 @@
   <string name="disable_all_accounts">Deshabilitar todas las cuentas</string>
   <string name="perform_action_with">Realizar acción con</string>
   <string name="no_affiliation">Sin afiliación</string>
-  <string name="no_role">Sin rol</string>
+  <string name="no_role">Desconectado</string>
   <string name="outcast">Rechazado</string>
   <string name="member">Miembro</string>
   <string name="advanced_mode">Modo avanzado</string>
@@ -507,6 +509,8 @@
   <string name="pref_use_white_background">Usar fondo blanco</string>
   <string name="pref_use_white_background_summary">Mostrar mensajes recibidos en texto negro con fondo blanco</string>
   <string name="account_status_tor_unavailable">Red Tor no disponible.</string>
+  <string name="account_status_bind_failure">Fallo de enlace</string>
+  <string name="account_status_host_unknown">Servidor desconocido</string>
   <string name="server_info_broken">Error</string>
   <string name="pref_presence_settings">Presencia</string>
   <string name="pref_away_when_screen_off">Ausente con pantalla apagada</string>
@@ -525,9 +529,8 @@
   <string name="server_side_mam_prefs">Preferencias de archivado en servidor</string>
   <string name="fetching_mam_prefs">Buscando preferencias de archivado. Por favor, espera...</string>
   <string name="unable_to_fetch_mam_prefs">No se ha podido conseguir las preferencias de archivado</string>
-  <string name="captcha_ocr">Texto captcha</string>
   <string name="captcha_required">Captcha requerido</string>
-  <string name="captcha_hint">Introduce el texto de la imagen</string>
+  <string name="captcha_hint">Introduce el texto de la imagen de arriba</string>
   <string name="certificate_chain_is_not_trusted">La cadena de certificados no es de confianza</string>
   <string name="jid_does_not_match_certificate">El identificador Jabber no coincide con el del certificado</string>
   <string name="action_renew_certificate">Renovar certificado</string>
@@ -590,7 +593,7 @@
   <string name="magic_create_text">Te guiaremos durante el proceso de creación de la cuenta en conversations.im.\nCuando selecciones conversations.im como proveedor, podrás comunicarte con usuarios de otros servidores mediante tu identificador Jabber.</string>
   <string name="your_full_jid_will_be">Tu identificador Jabber será: %s</string>
   <string name="create_account">Crear cuenta</string>
-  <string name="use_own_provider">Usar mi propio proveedor</string>
+  <string name="use_own_provider">Usar otro proveedor de mi elección</string>
   <string name="pick_your_username">Selecciona tu nombre de usuario</string>
   <string name="pref_manually_change_presence">Cambiar manualmente tu estado</string>
   <string name="pref_manually_change_presence_summary">Toca tu imagen para cambiar tu estado</string>
@@ -603,4 +606,6 @@
   <string name="presence_xa">No disponible</string>
   <string name="presence_dnd">Ocupado</string>
   <string name="secure_password_generated">Se ha generado una contraseña segura</string>
+  <string name="device_does_not_support_battery_op">Tu dispositivo no soporta la opción de optimización de batería</string>
+  <string name="show_password">Mostrar contraseña</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 5fbbd9c15..447d01086 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Aldi baterako ezgaitu</string>
   <string name="mgmt_account_publish_avatar">Profileko argazkia argitaratu</string>
   <string name="mgmt_account_publish_pgp">OpenPGP gako publikoa argitaratu</string>
+  <string name="openpgp_has_been_published">OpenPGP gako publikoa argitaratu da.</string>
+  <string name="republish_pgp_keys">Gogoratu ezazu zure OpenPGP gako publikoak birrargitaratzeaz!</string>
   <string name="mgmt_account_enable">Kontua gaitu</string>
   <string name="mgmt_account_are_you_sure">Ziur al zaude?</string>
   <string name="mgmt_account_delete_confirm_text">Zure kontua ezabatzen baduzu zure elkarrizketa historia guztia galduko da</string>
@@ -173,9 +175,9 @@
   <string name="account_settings_jabber_id">Jabber IDa</string>
   <string name="account_settings_password">Pasahitza</string>
   <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
-  <string name="account_settings_confirm_password">Pasahitza egiaztatu</string>
+  <string name="account_settings_confirm_password">Pasahitza berretsi</string>
   <string name="password">Pasahitza</string>
-  <string name="confirm_password">Pasahitza egiaztatu</string>
+  <string name="confirm_password">Pasahitza berretsi</string>
   <string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
   <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
   <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
@@ -413,7 +415,6 @@
   <string name="disable_all_accounts">Kontu guztiak ezgaitu</string>
   <string name="perform_action_with">Ekintza honekin egin</string>
   <string name="no_affiliation">Afiliaziorik ez</string>
-  <string name="no_role">Rolik ez</string>
   <string name="outcast">Baztertutakoa</string>
   <string name="member">Kidea</string>
   <string name="advanced_mode">Modu aurreratua</string>
@@ -507,6 +508,7 @@
   <string name="pref_use_white_background">Atzeko-planoan kolore zuria erabili</string>
   <string name="pref_use_white_background_summary">Jasotako mezuak testu beltza atzeko-plano zuri baten gainean bezala erakutsi</string>
   <string name="account_status_tor_unavailable">Tor sarea ez dago eskuragarri</string>
+  <string name="account_status_bind_failure">Estekatzeak hust egin du</string>
   <string name="server_info_broken">Hondatuta</string>
   <string name="pref_presence_settings">Presentzia</string>
   <string name="pref_away_when_screen_off">Urrun pantaila itzalita dagoenean</string>
@@ -525,9 +527,8 @@
   <string name="server_side_mam_prefs">Zerbitzariaren aldeko artxibatze hobespenak</string>
   <string name="fetching_mam_prefs">Artxibatze hobespenak eskuratzen. Mesedez itxaron...</string>
   <string name="unable_to_fetch_mam_prefs">Ezin izan dira artxibatze hobespenak eskuratu</string>
-  <string name="captcha_ocr">Captcharen testua</string>
   <string name="captcha_required">Captcha beharrezkoa da</string>
-  <string name="captcha_hint">Sartu irudiaren testua</string>
+  <string name="captcha_hint">Sar ezazu goiko irudiko testua</string>
   <string name="certificate_chain_is_not_trusted">Ziurtagiriaren katea ez da fidagarria</string>
   <string name="jid_does_not_match_certificate">Jabber IDa ez du ziurtagiriarekin bat egiten</string>
   <string name="action_renew_certificate">Ziurtagiria berriztu</string>
@@ -586,4 +587,19 @@
   <string name="security_error_invalid_file_access">Segurtasun akatsa: fitxategi sarrera baliogabea</string>
   <string name="no_application_to_share_uri">Ez da aplikaziorik aurkitu URIa partekatzeko</string>
   <string name="share_uri_with">URIa honekin partekatu...</string>
+  <string name="create_account">Kontua sortu</string>
+  <string name="use_own_provider">Nire hornitzale propioa erabili</string>
+  <string name="pick_your_username">Aukeratu zure erabiltzaile izena</string>
+  <string name="pref_manually_change_presence">Presentzia eskuz aldatu</string>
+  <string name="pref_manually_change_presence_summary">Ukitu zure profileko argazkia zure presentzia aldatzeko</string>
+  <string name="change_presence">Presentzia aldatu</string>
+  <string name="status_message">Egoera mezua</string>
+  <string name="all_accounts_on_this_device">Gailu honetako kontu guztietarako ezarri</string>
+  <string name="presence_chat">Hitzegiteko aske</string>
+  <string name="presence_online">Konektatuta</string>
+  <string name="presence_away">Kanpoan</string>
+  <string name="presence_xa">Ez eskuragarri</string>
+  <string name="presence_dnd">Lanpetuta</string>
+  <string name="secure_password_generated">Pasahitz seguru bat sortu da</string>
+  <string name="device_does_not_support_battery_op">Zure gailuak ez du bateria optimizatzeko aukerarik ematen</string>
 </resources>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index c757504ac..466703926 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -1,2 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources/>
+<resources>
+  <string name="action_settings">تنظیمات</string>
+  <string name="action_add">مکالمه جدید</string>
+  <string name="action_accounts">مدیریت حساب های کاربری</string>
+  <string name="action_end_conversation">اتمام مکالمه</string>
+  <string name="action_contact_details">جزییات مخاطب</string>
+  <string name="action_muc_details">جزییات کنفرانس</string>
+  <string name="action_secure">مکالمه امن</string>
+  <string name="action_add_account">اضافه کردن حساب کاربری</string>
+  <string name="action_edit_contact">تغییر نام</string>
+  <string name="action_add_phone_book">اضافه کردن به لیست ادرس ها</string>
+  <string name="action_delete_contact">حذف از لیست نام ها</string>
+  <string name="action_block_contact">بلاک مخاطب</string>
+  <string name="action_unblock_contact">غیر بلاک کردن مخاطب</string>
+  <string name="action_block_domain">بلاک کردن محدوده</string>
+</resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 8b48f3431..8cfc8d21f 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Désactiver temporairement</string>
   <string name="mgmt_account_publish_avatar">Publier un avatar</string>
   <string name="mgmt_account_publish_pgp">Publier la clef publique OpenPGP</string>
+  <string name="openpgp_has_been_published">La clef public OpenPGP a été publiée</string>
+  <string name="republish_pgp_keys">N\'oubliez pas de republier votre clef public OpenPGP !</string>
   <string name="mgmt_account_enable">Activer</string>
   <string name="mgmt_account_are_you_sure">Êtes-vous sûr ?</string>
   <string name="mgmt_account_delete_confirm_text">Si vous supprimez votre compte, votre historique de conversations sera perdu !</string>
@@ -413,7 +415,6 @@
   <string name="disable_all_accounts">Désactiver tous les comptes</string>
   <string name="perform_action_with">Faire une action avec</string>
   <string name="no_affiliation">Aucune affiliation</string>
-  <string name="no_role">Aucun rôle</string>
   <string name="outcast">Banni</string>
   <string name="member">Membre</string>
   <string name="advanced_mode">Mode expert</string>
@@ -507,6 +508,7 @@
   <string name="pref_use_white_background">Utiliser un fond blanc</string>
   <string name="pref_use_white_background_summary">Afficher les messages reçus en texte noir sur fond blanc.</string>
   <string name="account_status_tor_unavailable">Réseau Tor inaccessible</string>
+  <string name="account_status_bind_failure">La liaison a échoué</string>
   <string name="server_info_broken">Détraqué</string>
   <string name="pref_presence_settings">Présence</string>
   <string name="pref_away_when_screen_off">Absent quand l\'écran est éteint</string>
@@ -518,16 +520,15 @@
   <string name="pref_show_connection_options">Paramètres de connexion avancés</string>
   <string name="pref_show_connection_options_summary">Montrer le nom d\'hôte et le port lors du paramétrage d\'un compte</string>
   <string name="hostname_example">xmpp.example.com</string>
-  <string name="action_add_account_with_certificate">Ajouter un compte avec un certificat</string>
+  <string name="action_add_account_with_certificate">Compte avec certificat</string>
   <string name="unable_to_parse_certificate">Impossible d\'analyser le certificat</string>
   <string name="authenticate_with_certificate">Laisser vide pour s\'identifier avec un certificat</string>
   <string name="mam_prefs">Paramètres d\'archivage</string>
   <string name="server_side_mam_prefs">Paramètres d\'archivage du serveur</string>
   <string name="fetching_mam_prefs">Récupération des paramètres d\'archivage en cours...</string>
   <string name="unable_to_fetch_mam_prefs">Impossible de récupérer les paramètres d\'archivage</string>
-  <string name="captcha_ocr">Texte du captcha</string>
   <string name="captcha_required">Captcha obligatoire</string>
-  <string name="captcha_hint">Saisissez le texte dans l\'image</string>
+  <string name="captcha_hint">Entrez le texte de l\'image ci-dessus</string>
   <string name="certificate_chain_is_not_trusted">La chaîne de certificats n\'est pas digne de confiance</string>
   <string name="jid_does_not_match_certificate">L\'identifiant ne correspond pas au certificat</string>
   <string name="action_renew_certificate">Renouveler le certificat</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index ab149bf00..8a76210dc 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -359,7 +359,6 @@
   <string name="disable_all_accounts">Menonaktifkan semua account</string>
   <string name="perform_action_with">Lakukan aksi dengan</string>
   <string name="no_affiliation">Tidak ada afiliasi</string>
-  <string name="no_role">Tidak ada peran</string>
   <string name="outcast">Orang buangan</string>
   <string name="member">Member</string>
   <string name="advanced_mode">Mode lanjut</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 8f00ad6af..38ecd281b 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -401,7 +401,6 @@
   <string name="disable_all_accounts">Disabilita tutti gli utenti</string>
   <string name="perform_action_with">Perform action with</string>
   <string name="no_affiliation">No affiliazione</string>
-  <string name="no_role">Nessun ruolo</string>
   <string name="outcast">Emarginato</string>
   <string name="member">Membro</string>
   <string name="advanced_mode">Modalità avanzata</string>
@@ -513,9 +512,7 @@
   <string name="server_side_mam_prefs">Preferenze di archiviazione lato server</string>
   <string name="fetching_mam_prefs">Raccolta preferenze di archiviazione. Attendere prego...</string>
   <string name="unable_to_fetch_mam_prefs">Impossibile raccogliere le preferenze di archiviazione</string>
-  <string name="captcha_ocr">Testo captcha</string>
   <string name="captcha_required">Captcha richiest</string>
-  <string name="captcha_hint">inserire il testo dall\'immagine</string>
   <string name="certificate_chain_is_not_trusted">Catena di certificati non affidabile</string>
   <string name="jid_does_not_match_certificate">L\'ID Jabber non corrisponde al certificato</string>
   <string name="action_renew_certificate">Rinnova certificato</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 7d22efb8b..b4b6f6c52 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -376,7 +376,6 @@
   <string name="disable_all_accounts">נטרל את כל החשבונות</string>
   <string name="perform_action_with">בצע פעולה באמצעות</string>
   <string name="no_affiliation">אין שיוך</string>
-  <string name="no_role">אין תפקיד</string>
   <string name="member">חבר בקבוצה</string>
   <string name="advanced_mode">מצב מתקדם</string>
   <string name="grant_membership">הענק חברות בקבוצה</string>
@@ -472,9 +471,7 @@
   <string name="action_add_account_with_certificate">הוסף חשבון עם תעודה</string>
   <string name="unable_to_parse_certificate">תקלה בפענוח תעודה</string>
   <string name="authenticate_with_certificate">השאר ריק כדי להזדהות בלי תעודה</string>
-  <string name="captcha_ocr">טקסט Captcha</string>
   <string name="captcha_required">דרוש טקסט Captcha</string>
-  <string name="captcha_hint">אנא הזן את הטקסט מתוך התמונה</string>
   <string name="certificate_chain_is_not_trusted">שרשרת תעודה אינה מהימנה</string>
   <string name="jid_does_not_match_certificate">אין התאמה בין מזהה Jabber לבין תעודה</string>
   <string name="action_renew_certificate">חידוש תעודה</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index c350470fb..73400f89a 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">一時的に無効にする</string>
   <string name="mgmt_account_publish_avatar">アバターを公開</string>
   <string name="mgmt_account_publish_pgp">OpenPGP 公開鍵を公開</string>
+  <string name="openpgp_has_been_published">OpenPGP 公開鍵を公開しました。</string>
+  <string name="republish_pgp_keys">OpenPGP 公開鍵を再公開するのをお忘れなく!</string>
   <string name="mgmt_account_enable">アカウントを有効にする</string>
   <string name="mgmt_account_are_you_sure">よろしいですか?</string>
   <string name="mgmt_account_delete_confirm_text">アカウントを削除するとあなたの会話履歴がすべて失われます</string>
@@ -413,7 +415,7 @@
   <string name="disable_all_accounts">すべてのアカウントを無効にする</string>
   <string name="perform_action_with">アクションを実行...</string>
   <string name="no_affiliation">所属なし</string>
-  <string name="no_role">役割なし</string>
+  <string name="no_role">オフライン</string>
   <string name="outcast">追放</string>
   <string name="member">メンバー</string>
   <string name="advanced_mode">詳細モード</string>
@@ -505,6 +507,8 @@
   <string name="pref_use_white_background">白い背景を使用する</string>
   <string name="pref_use_white_background_summary">白地に黒の文字で、受け取ったメッセージを表示します</string>
   <string name="account_status_tor_unavailable">Tor ネットワークが利用できません</string>
+  <string name="account_status_bind_failure">バインド失敗</string>
+  <string name="account_status_host_unknown">ホストが不明</string>
   <string name="server_info_broken">壊れています</string>
   <string name="pref_presence_settings">参加</string>
   <string name="pref_away_when_screen_off">画面がオフのときは離席</string>
@@ -523,9 +527,8 @@
   <string name="server_side_mam_prefs">サーバーサイドのアーカイブの設定</string>
   <string name="fetching_mam_prefs">アーカイブの設定を取得しています。しばらくお待ちください…</string>
   <string name="unable_to_fetch_mam_prefs">アーカイブの設定を取得できません</string>
-  <string name="captcha_ocr">キャプチャ テキスト</string>
   <string name="captcha_required">キャプチャが必要です</string>
-  <string name="captcha_hint">画像からテキストを入力してください</string>
+  <string name="captcha_hint">上の画像からテキストを入力してください</string>
   <string name="certificate_chain_is_not_trusted">証明書チェーンは信頼済ではありません</string>
   <string name="jid_does_not_match_certificate">Jabber ID が証明書と一致しません</string>
   <string name="action_renew_certificate">証明書を更新</string>
@@ -600,4 +603,6 @@
   <string name="presence_xa">利用不可</string>
   <string name="presence_dnd">取込中</string>
   <string name="secure_password_generated">安全なパスワードが生成されました</string>
+  <string name="device_does_not_support_battery_op">お使いのデバイスはバッテリー最適化の停止をサポートしていません</string>
+  <string name="show_password">パスワードを表示</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index b4e0311bc..5025fcda3 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -388,7 +388,6 @@
   <string name="disable_all_accounts">모든 계정 해제 </string>
   <string name="perform_action_with">다음으로 동작을 수행 </string>
   <string name="no_affiliation">관련 없음 </string>
-  <string name="no_role">역할 없음 </string>
   <string name="outcast">추방됨 </string>
   <string name="member">멤버 </string>
   <string name="advanced_mode">고급 모드 </string>
@@ -484,9 +483,7 @@
   <string name="pref_xa_on_silent_mode_summary">기기가 음소거 모드일때는 사용할 수 없음으로 상태를 표시함</string>
   <string name="action_add_account_with_certificate">인증서가 있는 계정 추가</string>
   <string name="unable_to_parse_certificate">인증서를 분석할 수 없음</string>
-  <string name="captcha_ocr">Captcha 텍스트</string>
   <string name="captcha_required">Captcha가 필요함</string>
-  <string name="captcha_hint">이미지로부터 텍스트 입력</string>
   <string name="certificate_chain_is_not_trusted">인증서 체인을 신뢰할 수 없습니다</string>
   <string name="jid_does_not_match_certificate">Jabber ID가 인증서와 일치하지 않습니다</string>
   <string name="action_renew_certificate">인증서 갱신</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index d12975bdf..2753d0ce1 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -388,7 +388,6 @@
   <string name="disable_all_accounts">Koble fra alle kontoer</string>
   <string name="perform_action_with">Utfør handling med</string>
   <string name="no_affiliation">Ingen tilknytning</string>
-  <string name="no_role">Ingen rolle</string>
   <string name="outcast">Fredløs</string>
   <string name="member">Medlem</string>
   <string name="advanced_mode">Avansert modus</string>
@@ -487,9 +486,7 @@
   <string name="action_add_account_with_certificate">Legg til konto med sertifikat</string>
   <string name="unable_to_parse_certificate">Kunne ikke behandle sertifikat</string>
   <string name="authenticate_with_certificate">La stå tom for bekreftelse med sertifikat</string>
-  <string name="captcha_ocr">CAPTCHA-tekst</string>
   <string name="captcha_required">CAPTCHA-påkrevd</string>
-  <string name="captcha_hint">skriv inn teksten på bildet</string>
   <string name="certificate_chain_is_not_trusted">Sertifikat-kjeden er ikke betrodd</string>
   <string name="jid_does_not_match_certificate">Jabber-ID-en samsvarer ikke med sertifikatet</string>
   <string name="action_renew_certificate">Forny sertifikat</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 71d47d1b4..8c0b2effb 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Tijdelijk uitschakelen</string>
   <string name="mgmt_account_publish_avatar">Avatar publiceren</string>
   <string name="mgmt_account_publish_pgp">Publiceer OpenPGP publieke sleutel</string>
+  <string name="openpgp_has_been_published">Publieke OpenPGP-sleutel is gepubliceerd.</string>
+  <string name="republish_pgp_keys">Vergeet niet je publieke OpenPGP-sleutels opnieuw te publiceren!</string>
   <string name="mgmt_account_enable">Account inschakelen</string>
   <string name="mgmt_account_are_you_sure">Ben je zeker?</string>
   <string name="mgmt_account_delete_confirm_text">Als je je account verwijdert wordt je volledige gespreksgeschiedenis gewist</string>
@@ -413,7 +415,6 @@
   <string name="disable_all_accounts">Alle accounts uitschakelen</string>
   <string name="perform_action_with">Actie uitvoeren met</string>
   <string name="no_affiliation">Geen aansluiting</string>
-  <string name="no_role">Geen rol</string>
   <string name="outcast">Verstoteling</string>
   <string name="member">Lid</string>
   <string name="advanced_mode">Geavanceerde modus</string>
@@ -507,6 +508,7 @@
   <string name="pref_use_white_background">Gebruik witte achtergrond</string>
   <string name="pref_use_white_background_summary">Toon ontvangen berichten als zwarte tekst op een witte achtergrond</string>
   <string name="account_status_tor_unavailable">Tor-netwerk niet beschikbaar</string>
+  <string name="account_status_bind_failure">Bindingsfout</string>
   <string name="server_info_broken">Gebroken</string>
   <string name="pref_presence_settings">Aanwezigheid</string>
   <string name="pref_away_when_screen_off">Even weg wanneer scherm uit staat</string>
@@ -525,9 +527,8 @@
   <string name="server_side_mam_prefs">Voorkeuren voor archief aan serverzijde</string>
   <string name="fetching_mam_prefs">Ophalen van archiefvoorkeuren. Even geduld…</string>
   <string name="unable_to_fetch_mam_prefs">Kon archiefvoorkeuren niet ophalen</string>
-  <string name="captcha_ocr">Captcha-tekst</string>
   <string name="captcha_required">Captcha vereist</string>
-  <string name="captcha_hint">voer de tekst van de afbeelding in</string>
+  <string name="captcha_hint">Voer de tekst van de afbeelding hierboven in</string>
   <string name="certificate_chain_is_not_trusted">Certificaatsketen is niet vertrouwd</string>
   <string name="jid_does_not_match_certificate">Jabber-ID komt niet overeen met certificaat</string>
   <string name="action_renew_certificate">Certificaat vernieuwen</string>
@@ -603,4 +604,5 @@
   <string name="presence_xa">Niet beschikbaar</string>
   <string name="presence_dnd">Bezig</string>
   <string name="secure_password_generated">Een veilig wachtwoord is aangemaakt</string>
+  <string name="device_does_not_support_battery_op">Je apparaat ondersteunt het uitschakelen van batterij-optimalisatie niet</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 658f17110..22114b9db 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -401,7 +401,6 @@
   <string name="disable_all_accounts">Wyłącz wszystkie konta</string>
   <string name="perform_action_with">Użyj</string>
   <string name="no_affiliation">Brak stanowiska</string>
-  <string name="no_role">Brak funkcji</string>
   <string name="outcast">Wykluczony</string>
   <string name="member">Członek</string>
   <string name="advanced_mode">Tryb zaawansowany</string>
@@ -512,9 +511,7 @@
   <string name="server_side_mam_prefs">Preferencje archiwizacji po stronie serwera</string>
   <string name="fetching_mam_prefs">Pobieranie preferencji archiwizacji. Proszę czekać...</string>
   <string name="unable_to_fetch_mam_prefs">Nie można pobrać preferencji archiwizacji</string>
-  <string name="captcha_ocr">Captcha</string>
   <string name="captcha_required">Captcha wymagana</string>
-  <string name="captcha_hint">przepisz tekst z obrazka</string>
   <string name="certificate_chain_is_not_trusted">Łańcuch certyfikatu nie jest zaufany</string>
   <string name="jid_does_not_match_certificate">Jabber ID nie odpowiada certyfikatowi</string>
   <string name="action_renew_certificate">Odnów certyfikat</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 374856ab3..917516934 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Desabilitar temporariamente</string>
   <string name="mgmt_account_publish_avatar">Publicar o avatar</string>
   <string name="mgmt_account_publish_pgp">Publicar a chave pública OpenPGP</string>
+  <string name="openpgp_has_been_published">A chave pública do OpenPGP foi publicada. </string>
+  <string name="republish_pgp_keys">Lembre-se de republicar suas chaves públicas OpenPGP!</string>
   <string name="mgmt_account_enable">Habilitar a conta</string>
   <string name="mgmt_account_are_you_sure">Tem certeza?</string>
   <string name="mgmt_account_delete_confirm_text">Se você excluir a sua conta todo o seu histórico de conversas será perdido</string>
@@ -413,7 +415,6 @@
   <string name="disable_all_accounts">Desabilitar todas as contas</string>
   <string name="perform_action_with">Realizar a ação com</string>
   <string name="no_affiliation">Sem afiliação</string>
-  <string name="no_role">Sem papel</string>
   <string name="outcast">Banido</string>
   <string name="member">Membro</string>
   <string name="advanced_mode">Modo avançado</string>
@@ -507,6 +508,7 @@
   <string name="pref_use_white_background">Usar fundo branco</string>
   <string name="pref_use_white_background_summary">Exibe a mensagens recebidas como texto preto em um fundo branco.</string>
   <string name="account_status_tor_unavailable">Rede Tor não disponível</string>
+  <string name="account_status_bind_failure">Falha na associação</string>
   <string name="server_info_broken">Quebrado</string>
   <string name="pref_presence_settings">Presença</string>
   <string name="pref_away_when_screen_off">Afastado quando a tela estiver desligada</string>
@@ -525,9 +527,8 @@
   <string name="server_side_mam_prefs">Preferências de arquivamento no servidor</string>
   <string name="fetching_mam_prefs">Obtendo as preferências de arquivamento. Por favor aguarde...</string>
   <string name="unable_to_fetch_mam_prefs">Não foi possível obter as preferências de arquivamento</string>
-  <string name="captcha_ocr">Texto captcha</string>
   <string name="captcha_required">Captcha obrigatório</string>
-  <string name="captcha_hint">digite o texto da imagem</string>
+  <string name="captcha_hint">Digite o texto da imagem acima</string>
   <string name="certificate_chain_is_not_trusted">A cadeia de certificação não é confiável</string>
   <string name="jid_does_not_match_certificate">O ID Jaber não corresponde ao certificado</string>
   <string name="action_renew_certificate">Renovar o certificado</string>
@@ -586,4 +587,22 @@
   <string name="security_error_invalid_file_access">Erro de segurança: Acesso inválido ao arquivo</string>
   <string name="no_application_to_share_uri">Não foi encontrada nenhuma aplicação para compartilhar a URI</string>
   <string name="share_uri_with">Compartilhar a URI com...</string>
+  <string name="welcome_text">O XMPP é um protocolo independente de provedor. Você pode usar esse cliente com qualquer servidor que você escolher.\nEntretanto, para sua conveniência, nós simplificamos o processo de criação de uma conta em conversations.im, um provedor especialmente configurado para usar com o Conversations.</string>
+  <string name="magic_create_text">Nós guiaremos você ao longo do processo de criar uma conta em conversations.im.\nAo usar esse provedor você também poderá se comunicar com usuários de outros provedores. Basta fornecê-los a sua identificação Jabber completa.</string>
+  <string name="your_full_jid_will_be">Sua ID Jabber será: %s</string>
+  <string name="create_account">Criar conta</string>
+  <string name="use_own_provider">Usar meu próprio provedor</string>
+  <string name="pick_your_username">Selecione seu nome de usuário</string>
+  <string name="pref_manually_change_presence">Alterar a presença manualmente</string>
+  <string name="pref_manually_change_presence_summary">Toque o seu avatar para alterar a sua presença</string>
+  <string name="change_presence">Alterar a presença</string>
+  <string name="status_message">Mensagem de status</string>
+  <string name="all_accounts_on_this_device">Definir para todas as contas deste dispositivo</string>
+  <string name="presence_chat">Livre para conversar</string>
+  <string name="presence_online">Conectado</string>
+  <string name="presence_away">Afastado</string>
+  <string name="presence_xa">Indisponível</string>
+  <string name="presence_dnd">Ocupado</string>
+  <string name="secure_password_generated">Foi gerada uma senha segura</string>
+  <string name="device_does_not_support_battery_op">Seu dispositivo não suporta a desativação da otimização de bateria</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 5479255a0..86107fcea 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -413,7 +413,6 @@
   <string name="disable_all_accounts">Desativar todas as contas</string>
   <string name="perform_action_with">Realizar a ação com</string>
   <string name="no_affiliation">Sem afiliação</string>
-  <string name="no_role">Sem papel</string>
   <string name="outcast">Banido</string>
   <string name="member">Membro</string>
   <string name="advanced_mode">Modo avançado</string>
@@ -525,9 +524,7 @@
   <string name="server_side_mam_prefs">Preferências de arquivamento do servidor</string>
   <string name="fetching_mam_prefs">Obtendo as preferências de arquivamento. Por favor espere...</string>
   <string name="unable_to_fetch_mam_prefs">Não foi possível obter as preferências de arquivamento</string>
-  <string name="captcha_ocr">Texto Captcha</string>
   <string name="captcha_required">Captcha obrigatório</string>
-  <string name="captcha_hint">insira o texto da imagem</string>
   <string name="certificate_chain_is_not_trusted">A cadeia de certificados não é confiável</string>
   <string name="jid_does_not_match_certificate">O ID Jabber não coincide com o certificado</string>
   <string name="action_renew_certificate">Renovar certificado</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 7ee2f0b9c..448fc13ed 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Dezactivare temporara</string>
   <string name="mgmt_account_publish_avatar">Publica avatar</string>
   <string name="mgmt_account_publish_pgp">Publica cheia publica OpenPGP</string>
+  <string name="openpgp_has_been_published">Cheia publica OpenPGP a fost publicata.</string>
+  <string name="republish_pgp_keys">Amintiti-va sa va republicati cheile publice OpenPGP!</string>
   <string name="mgmt_account_enable">Activeaza cont</string>
   <string name="mgmt_account_are_you_sure">Esti sigur?</string>
   <string name="mgmt_account_delete_confirm_text">Daca iti stergi contul intregul istoric de conversatii va fi pierdut</string>
@@ -413,7 +415,6 @@
   <string name="disable_all_accounts">Dezactiveaza toate conturile</string>
   <string name="perform_action_with">Efectuaza actiune cu</string>
   <string name="no_affiliation">Fara afiliere</string>
-  <string name="no_role">Fara rol</string>
   <string name="outcast">proscris</string>
   <string name="member">Membru</string>
   <string name="advanced_mode">Mod avansat</string>
@@ -509,6 +510,7 @@
   <string name="pref_use_white_background">Foloseste un fundal alb</string>
   <string name="pref_use_white_background_summary">Arata mesajele primite cu negru pe fond alb</string>
   <string name="account_status_tor_unavailable">Reteaua Tor nu este disponibila</string>
+  <string name="account_status_bind_failure">Eroare de conexiune</string>
   <string name="server_info_broken">Deteriorat</string>
   <string name="pref_presence_settings">Setari de prezenta</string>
   <string name="pref_away_when_screen_off">Plecat cand ecranul este oprit</string>
@@ -527,9 +529,8 @@
   <string name="server_side_mam_prefs">Preferinte arhivare pe server</string>
   <string name="fetching_mam_prefs">Descarc preferinte arhivare. Va rugam asteptati...</string>
   <string name="unable_to_fetch_mam_prefs">Nu s-au putut descarca preferintele de arhivare</string>
-  <string name="captcha_ocr">Text captcha de verificare</string>
   <string name="captcha_required">Text captcha de verificare necesar</string>
-  <string name="captcha_hint">introdu textul din imagine</string>
+  <string name="captcha_hint">Introduceti textul din imaginea de mai sus</string>
   <string name="certificate_chain_is_not_trusted">Seria de certificate nu este de incredere</string>
   <string name="jid_does_not_match_certificate">ID-ul Jabber nu corespunde cu certificatul</string>
   <string name="action_renew_certificate">Innoieste certificatul</string>
@@ -607,4 +608,5 @@ Emitent</string>
   <string name="presence_xa">Indisponibil</string>
   <string name="presence_dnd">Ocupat</string>
   <string name="secure_password_generated">O parola sigura a fost generata</string>
+  <string name="device_does_not_support_battery_op">Dispozitivul dumneavoastra nu suporta dezactivarea optimizarii de baterie pentru aceasta aplicatie</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index c206717c5..ffe47976e 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -397,7 +397,6 @@
   <string name="disable_all_accounts">Отключить все учётные записи</string>
   <string name="perform_action_with">Взаимодействовать с</string>
   <string name="no_affiliation">Не является участником</string>
-  <string name="no_role">Нет роли</string>
   <string name="outcast">Заблокированный пользователь</string>
   <string name="member">Участник</string>
   <string name="advanced_mode">Расширенный режим</string>
@@ -508,9 +507,7 @@
   <string name="unable_to_parse_certificate">Невозможно разобрать сертификат</string>
   <string name="authenticate_with_certificate">Оставить пустым для входа с сертификатом</string>
   <string name="mam_prefs">Настройки архивирования</string>
-  <string name="captcha_ocr">Проверочный текст</string>
   <string name="captcha_required">Необходима проверка</string>
-  <string name="captcha_hint">введите текст с картинки</string>
   <string name="certificate_chain_is_not_trusted">Цепочка сертификата не доверена</string>
   <string name="jid_does_not_match_certificate">Jabber ID не соответствует сертификату</string>
   <string name="action_renew_certificate">Обновить сертификат</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index aaa39dd44..f2c3f1ca4 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -364,7 +364,6 @@
   <string name="disable_all_accounts">Vypnúť všetky účty</string>
   <string name="perform_action_with">Uskutočniť akciu s</string>
   <string name="no_affiliation">Nepridružený</string>
-  <string name="no_role">Bez úlohy</string>
   <string name="outcast">Vylúčený</string>
   <string name="member">Člen</string>
   <string name="advanced_mode">Rozšírený režim</string>
@@ -451,8 +450,6 @@
   <string name="pref_xa_on_silent_mode">Nedostupný v tichom režime</string>
   <string name="action_add_account_with_certificate">Pridať účet s certifikátom</string>
   <string name="unable_to_parse_certificate">Neschopný analyzovať certifikát</string>
-  <string name="captcha_ocr">Text CAPTCHA</string>
   <string name="captcha_required">Potrebný CAPTCHA</string>
-  <string name="captcha_hint">vložiť text z obrázku</string>
   <string name="action_renew_certificate">Obnoviť certifikát</string>
 </resources>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 41a46487f..b82100831 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Привремено искључи</string>
   <string name="mgmt_account_publish_avatar">Објави аватар</string>
   <string name="mgmt_account_publish_pgp">Објави ОпенПГП јавни кључ</string>
+  <string name="openpgp_has_been_published">ОпенПГП јавни кључ је објављен.</string>
+  <string name="republish_pgp_keys">Не заборавите да поново објавите ваше ОпенПГП јавне кључеве!</string>
   <string name="mgmt_account_enable">Укључи налог</string>
   <string name="mgmt_account_are_you_sure">Да ли сте сигурни?</string>
   <string name="mgmt_account_delete_confirm_text">Ако обришете ваш налог изгубићете сав историјат преписке</string>
@@ -413,7 +415,7 @@
   <string name="disable_all_accounts">Искључи све налоге</string>
   <string name="perform_action_with">Изврши радњу са</string>
   <string name="no_affiliation">Без припадности</string>
-  <string name="no_role">Без улоге</string>
+  <string name="no_role">Ван везе</string>
   <string name="outcast">Изгнаник</string>
   <string name="member">Члан</string>
   <string name="advanced_mode">Напредни режим</string>
@@ -509,6 +511,8 @@
   <string name="pref_use_white_background">Користи белу позадину</string>
   <string name="pref_use_white_background_summary">Приказ примљених порука црним текстом на белој позадини</string>
   <string name="account_status_tor_unavailable">Тор мрежа недоступна</string>
+  <string name="account_status_bind_failure">Неуспех свезивања</string>
+  <string name="account_status_host_unknown">Непознат домаћин</string>
   <string name="server_info_broken">Оштећен</string>
   <string name="pref_presence_settings">Присутност</string>
   <string name="pref_away_when_screen_off">Одсутан кад је екран искључен</string>
@@ -527,9 +531,8 @@
   <string name="server_side_mam_prefs">Серверске поставке архивисања</string>
   <string name="fetching_mam_prefs">Добављам поставке архивисања, сачекајте…</string>
   <string name="unable_to_fetch_mam_prefs">Не могох да добавим поставке архивисања</string>
-  <string name="captcha_ocr">Текст стопке</string>
   <string name="captcha_required">Потребна стопка</string>
-  <string name="captcha_hint">унесите текст са слике</string>
+  <string name="captcha_hint">Унесите текст са слике изнад</string>
   <string name="certificate_chain_is_not_trusted">Ланац сертификата није поуздан</string>
   <string name="jid_does_not_match_certificate">Џабер ИД не одговара сертификату</string>
   <string name="action_renew_certificate">Обнови сертификат</string>
@@ -589,6 +592,7 @@
   <string name="security_error_invalid_file_access">Безбедносна грешка: неисправан приступ фајлу</string>
   <string name="no_application_to_share_uri">Нема апликације за дељење веза</string>
   <string name="share_uri_with">Подели везу помоћу…</string>
+  <string name="magic_create_text">Водићемо вас кроз процес прављења налога на conversations.im.\nАко изаберете conversations.im за даваоца услуге моћи ћете да комуницирате са другим корисницима ако им дате ваш Џабер ИД.</string>
   <string name="your_full_jid_will_be">Ваш пуни Џабер ИД ће бити: %s</string>
   <string name="create_account">Направи налог</string>
   <string name="use_own_provider">Користићу сопствени провајдер</string>
@@ -604,4 +608,6 @@
   <string name="presence_xa">Недоступан</string>
   <string name="presence_dnd">Заузет</string>
   <string name="secure_password_generated">Безбедна лозинка је направљена</string>
+  <string name="device_does_not_support_battery_op">Ваш уређај не подржава искључивање оптимизације батерије</string>
+  <string name="show_password">Прикажи лозинку</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index fd6a9a9ba..ab19da923 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -166,6 +166,8 @@
   <string name="mgmt_account_disable">Inaktivera tillfälligt</string>
   <string name="mgmt_account_publish_avatar">Publicera avatarbild</string>
   <string name="mgmt_account_publish_pgp">Publicera OpenPGP publik nyckel</string>
+  <string name="openpgp_has_been_published">OpenPGP-nyckel har publicerats.</string>
+  <string name="republish_pgp_keys">Kom ihåg att återpublicera dina publika OpenPGP nycklar.</string>
   <string name="mgmt_account_enable">Aktivera</string>
   <string name="mgmt_account_are_you_sure">Är du säker?</string>
   <string name="mgmt_account_delete_confirm_text">Om du tar bort kontot kommer all konversationshistorik att försvinna</string>
@@ -413,7 +415,6 @@
   <string name="disable_all_accounts">Deaktivera alla konton</string>
   <string name="perform_action_with">Utför åtgärden med</string>
   <string name="no_affiliation">Ingen anknytning</string>
-  <string name="no_role">Ingen roll</string>
   <string name="outcast">Utstött</string>
   <string name="member">Medlem</string>
   <string name="advanced_mode">Avancerat läge</string>
@@ -507,6 +508,7 @@
   <string name="pref_use_white_background">Använd vit bakgrund</string>
   <string name="pref_use_white_background_summary">Visa mottagna meddelanden som svart text på vit bakgrund</string>
   <string name="account_status_tor_unavailable">Tor-nätverk ej tillgängligt</string>
+  <string name="account_status_bind_failure">Bind-fel</string>
   <string name="server_info_broken">Sönder</string>
   <string name="pref_presence_settings">Tillgänglighet</string>
   <string name="pref_away_when_screen_off">Status borta när skärmen är av</string>
@@ -525,9 +527,8 @@
   <string name="server_side_mam_prefs">Arkiveringsinställningar på servern</string>
   <string name="fetching_mam_prefs">Hämtar arkiveringsinställningar, vänta...</string>
   <string name="unable_to_fetch_mam_prefs">Kan ej hämta arkiveringsinställningar</string>
-  <string name="captcha_ocr">CAPTCHA-text</string>
   <string name="captcha_required">CAPTCHA krävs</string>
-  <string name="captcha_hint">skriv in texten från bilden</string>
+  <string name="captcha_hint">Skriv i texten från bilden ovan</string>
   <string name="certificate_chain_is_not_trusted">Certifikatskedjan är inte betrodd</string>
   <string name="jid_does_not_match_certificate">Jabber-ID matchar inte certifikat</string>
   <string name="action_renew_certificate">Förnya certifikat</string>
@@ -603,4 +604,5 @@
   <string name="presence_xa">Ej tillgänglig</string>
   <string name="presence_dnd">Upptagen</string>
   <string name="secure_password_generated">Ett säkert lösenord har genererats</string>
+  <string name="device_does_not_support_battery_op">Din enhet stödjer inte deaktivering av batterioptimeringar</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index c2f1da732..848934ee2 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -412,7 +412,6 @@
   <string name="disable_all_accounts">Bütün hesapları devre dışı bırak</string>
   <string name="perform_action_with">Kullanarak tamamla</string>
   <string name="no_affiliation">Ortaklık yok</string>
-  <string name="no_role">Rol yok</string>
   <string name="outcast">Bağlantısız</string>
   <string name="member">Üye</string>
   <string name="advanced_mode">Gelişmiş kip</string>
@@ -522,9 +521,7 @@
   <string name="server_side_mam_prefs">Sunucu tarafı arşivleme tercihleri</string>
   <string name="fetching_mam_prefs">Arşivleme tercihleri alınıyor. Lütfen bekleyin...</string>
   <string name="unable_to_fetch_mam_prefs">Arşivleme tercihleri alınamadı</string>
-  <string name="captcha_ocr">Captcha metni</string>
   <string name="captcha_required">Captcha gerekli</string>
-  <string name="captcha_hint">resimdeki metni girin</string>
   <string name="certificate_chain_is_not_trusted">Sertifika zinciri güvenilir değil</string>
   <string name="jid_does_not_match_certificate">Jabber ID sertifikayla eşleşmiyor</string>
   <string name="action_renew_certificate">Sertifikayı yenile</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 2887af13d..eb1d91ea7 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -388,7 +388,6 @@
   <string name="disable_all_accounts">Tắt toàn bộ tài khoản</string>
   <string name="perform_action_with">Thực hiện thao tác với</string>
   <string name="no_affiliation">Không có quan hệ gì</string>
-  <string name="no_role">Không có phận sự gì</string>
   <string name="outcast">Kẻ bị ruồng bỏ</string>
   <string name="member">Thành viên</string>
   <string name="advanced_mode">Chế độ nâng cao</string>
@@ -485,9 +484,7 @@
   <string name="action_add_account_with_certificate">Thêm tài khoản với chứng nhận</string>
   <string name="unable_to_parse_certificate">Không thể phân tích chứng nhận</string>
   <string name="authenticate_with_certificate">Bỏ trống để xác minh với chứng nhận</string>
-  <string name="captcha_ocr">Các ký tự xác minh</string>
   <string name="captcha_required">Yêu cầu hình xác minh</string>
-  <string name="captcha_hint">nhập văn bản từ hình</string>
   <string name="certificate_chain_is_not_trusted">Chuỗi chứng nhận không được tin tưởng</string>
   <string name="jid_does_not_match_certificate">ID Jabber không khớp với chứng nhận</string>
   <string name="action_renew_certificate">Gia hạn chứng nhận</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 6046ba1ca..afc03e222 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -413,7 +413,6 @@
   <string name="disable_all_accounts">禁用所有账户</string>
   <string name="perform_action_with">选择一个操作</string>
   <string name="no_affiliation">没有从属关系</string>
-  <string name="no_role">没有角色</string>
   <string name="outcast">抛弃</string>
   <string name="member">成员</string>
   <string name="advanced_mode">高级模式</string>
@@ -523,9 +522,7 @@
   <string name="server_side_mam_prefs">服务端压缩设置</string>
   <string name="fetching_mam_prefs">正在获取压缩设置。请稍后...</string>
   <string name="unable_to_fetch_mam_prefs">获取压缩设置失败</string>
-  <string name="captcha_ocr">验证码</string>
   <string name="captcha_required">需要验证码</string>
-  <string name="captcha_hint">输入图片中的文字</string>
   <string name="certificate_chain_is_not_trusted">证书链不受信任</string>
   <string name="jid_does_not_match_certificate">Jabber ID 与证书不匹配</string>
   <string name="action_renew_certificate">更新证书</string>