diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 890068199..b213dab5b 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -147,7 +147,6 @@
   <string name="account_status_regis_conflict">اسم المستخدم مستخدم من قبل</string>
   <string name="account_status_regis_success">تم تسجيل حسابك بنجاح</string>
   <string name="account_status_regis_not_sup">تسجيل الحسابات غير متاح على هذا السرفر</string>
-  <string name="account_status_security_error">خطأ أمني</string>
   <string name="account_status_policy_violation">خرق للقواعد</string>
   <string name="account_status_incompatible_server">لا يتوافق مع السيرفر</string>
   <string name="encryption_choice_unencrypted">غير مشفر</string>
@@ -163,7 +162,6 @@
   <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>
   <string name="attach_record_voice">تسجيل صوت</string>
   <string name="account_settings_jabber_id">حساب جابر</string>
   <string name="account_settings_password">كلمة السر</string>
@@ -289,7 +287,6 @@
   <string name="using_account">أنت تستعمل حساب %s</string>
   <string name="not_connected_try_again">انقطع الإتصال .. حاول مرة أخرى</string>
   <string name="message_options">خيارات الرساله</string>
-  <string name="copy_text">نسخ النص</string>
   <string name="select_text">حدد النص</string>
   <string name="quote">إقتبس</string>
   <string name="copy_original_url">أنسخ الرابط الأصلي</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 9938b88f2..bb1abc427 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Приключване на този разговор след това</string>
   <string name="choose_presence">Изберете устройство</string>
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
+  <string name="send_message">Изпращане на съобщение</string>
   <string name="send_message_to_x">Изпращане на съобщение до %s</string>
   <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
   <string name="send_omemo_message">Изпр. на съобщение, шифр. чрез OMEMO</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Потребителското име е заето</string>
   <string name="account_status_regis_success">Регистрацията е завършена</string>
   <string name="account_status_regis_not_sup">Сървърът не поддържа регистриране</string>
-  <string name="account_status_security_error">Грешка в сигурността</string>
+  <string name="account_status_tls_error">Грешка в TLS</string>
   <string name="account_status_policy_violation">Нарушение на политиката</string>
   <string name="account_status_incompatible_server">Несъвместим сървър</string>
   <string name="account_status_stream_error">Поточна грешка</string>
@@ -169,11 +170,13 @@
   <string name="mgmt_account_disable">Временно деактивиране</string>
   <string name="mgmt_account_publish_avatar">Публикуване на аватар</string>
   <string name="mgmt_account_publish_pgp">Публикуване на публичния OpenPGP ключ</string>
+  <string name="unpublish_pgp">Премахване на публичния OpenPGP ключ</string>
+  <string name="unpublish_pgp_message">Наистина ли искате да премахнете своя публичен OpenPGP ключ от известяването си за присъствие?\nКонтактите Ви вече няма да могат да Ви изпращат съобщение, шифровани чрез 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>
+  <string name="mgmt_account_delete_confirm_text">Ако изтриете профила си, ще загубите цялата история на разговорите си</string>
   <string name="attach_record_voice">Запис на глас</string>
   <string name="account_settings_jabber_id">Jabber идентификатор</string>
   <string name="block_jabber_id">Блокиране на Jabber идентификатор</string>
@@ -331,7 +334,6 @@
   <string name="check_x_filesize">Проверете размера на %s</string>
   <string name="check_x_filesize_on_host">Проверете размера на %1$s на %2$s</string>
   <string name="message_options">Настройки за съобщенята</string>
-  <string name="copy_text">Копиране на текста</string>
   <string name="select_text">Избиране на текста</string>
   <string name="quote">Цитат</string>
   <string name="copy_original_url">Копиране на оригиналния адрес</string>
@@ -711,4 +713,7 @@
   <string name="block_stranger">Блокиране на непознатия</string>
   <string name="block_entire_domain">Блокиране на целия домейн</string>
   <string name="online_right_now">на линия в момента</string>
+  <string name="retry_decryption">Повторен опит за дешифроване</string>
+  <string name="session_failure">Грешка в сесията</string>
+  <string name="downgrade_attack">Понижаваща сигурността атака</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 6f5791aab..3f097e183 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -129,7 +129,6 @@
   <string name="account_status_regis_conflict">El seu nom d\'usuari ja està en ús</string>
   <string name="account_status_regis_success">Registre completat</string>
   <string name="account_status_regis_not_sup">El servidor no admet el registre</string>
-  <string name="account_status_security_error">Error de seguretat</string>
   <string name="account_status_incompatible_server">Servidor incompatible</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -140,7 +139,6 @@
   <string name="mgmt_account_publish_pgp">Publicar clau OpenPGP pública</string>
   <string name="mgmt_account_enable">Habilitar compte</string>
   <string name="mgmt_account_are_you_sure">Estàs segur?</string>
-  <string name="mgmt_account_delete_confirm_text">Si vosté elimina el  seu compte tot el seu historial de les conversacions és perdràn</string>
   <string name="attach_record_voice">Registre de veu</string>
   <string name="account_settings_jabber_id">Identificació de Jabber</string>
   <string name="account_settings_password">Contrasenya</string>
@@ -264,7 +262,6 @@
   <string name="using_account">Utlitzant el compte %s</string>
   <string name="not_connected_try_again">No estàs connectat. Intenta-ho més tard</string>
   <string name="message_options">Opcions del missatge</string>
-  <string name="copy_text">Copiar el text</string>
   <string name="copy_original_url">Copiar la URL original</string>
   <string name="send_again">Envia una altra vegada</string>
   <string name="message_text">Missatge de text</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 6db5af337..11efb87be 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -154,7 +154,6 @@
   <string name="account_status_regis_conflict">Uživatelské jméno se již používá</string>
   <string name="account_status_regis_success">Registrace dokončena</string>
   <string name="account_status_regis_not_sup">Server nepodporuje registrace</string>
-  <string name="account_status_security_error">Bezpečnostní chyba</string>
   <string name="account_status_policy_violation">Porušení podmínek</string>
   <string name="account_status_incompatible_server">Nekompatibilní server</string>
   <string name="account_status_stream_error">Chyba přenosu</string>
@@ -171,7 +170,6 @@
   <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>
   <string name="attach_record_voice">Nahrát hlas</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Heslo</string>
@@ -328,7 +326,6 @@
   <string name="check_x_filesize">Ověřit %s velikost</string>
   <string name="check_x_filesize_on_host">Kontrola %1$s velikosti na %2$s</string>
   <string name="message_options">Možnosti zpráv</string>
-  <string name="copy_text">Zkopírovat text</string>
   <string name="select_text">Vybrat text</string>
   <string name="copy_original_url">Kopírovat originální URL</string>
   <string name="send_again">Poslat znovu</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6b9cdbf95..29f9df61c 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
   <string name="choose_presence">Gerät auswählen</string>
   <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
+  <string name="send_message">Nachricht senden</string>
   <string name="send_message_to_x">Sende Nachricht an %s</string>
   <string name="send_otr_message">OTR-verschlüsselt schreiben…</string>
   <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Benutzername wird bereits verwendet</string>
   <string name="account_status_regis_success">Registrierung abgeschlossen</string>
   <string name="account_status_regis_not_sup">Der Server unterstützt keine Registrierung</string>
-  <string name="account_status_security_error">Sicherheitsfehler</string>
+  <string name="account_status_tls_error">TLS Fehler</string>
   <string name="account_status_policy_violation">Verstoß gegen die Richtlinien</string>
   <string name="account_status_incompatible_server">Inkompatibler Server</string>
   <string name="account_status_stream_error">Datenstromfehler</string>
@@ -169,6 +170,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="unpublish_pgp">Öffentlichen OpenPGP-Schlüssel verwerfen</string>
+  <string name="unpublish_pgp_message">Bist du sicher, dass du deinen öffentlichen OpenPGP-Schlüssel aus deiner Anwesenheitsmitteilung entfernen möchtest?\nDeine Kontakte können dir dann keine OpenPGP-verschlüsselten Nachrichten senden.</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>
@@ -331,7 +334,6 @@
   <string name="check_x_filesize">%s-Größe prüfen</string>
   <string name="check_x_filesize_on_host">%1$s-Größe auf %2$s prüfen</string>
   <string name="message_options">Nachrichtenoptionen</string>
-  <string name="copy_text">Text kopieren</string>
   <string name="select_text">Text markieren</string>
   <string name="quote">Zitat</string>
   <string name="copy_original_url">Original-URL kopieren</string>
@@ -711,4 +713,7 @@
   <string name="block_stranger">Unbekannten sperren</string>
   <string name="block_entire_domain">Gesamte Domain sperren</string>
   <string name="online_right_now">aktuell online</string>
+  <string name="retry_decryption">Entschlüsseln wiederholen</string>
+  <string name="session_failure">Sitzungsfehler</string>
+  <string name="downgrade_attack">Downgrade Angriff</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 7f4193326..597e28d47 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -129,7 +129,6 @@
   <string name="account_status_regis_conflict">Το όνομα χρησιμοποιείται ήδη</string>
   <string name="account_status_regis_success">Ολοκλήρωση εγγραφής</string>
   <string name="account_status_regis_not_sup">Ο διακομιστής δεν υποστηρίζει εγγραφή</string>
-  <string name="account_status_security_error">Σφάλμα ασφάλειας</string>
   <string name="account_status_incompatible_server">Μη συμβατός διακομιστής</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -140,7 +139,6 @@
   <string name="mgmt_account_publish_pgp">Δημοσίευση του δημόσιου κλειδιού OpenPGP</string>
   <string name="mgmt_account_enable">Ενεργοποίηση λογαριασμού</string>
   <string name="mgmt_account_are_you_sure">Είστε βέβαιοι;</string>
-  <string name="mgmt_account_delete_confirm_text">Αν διαγράψετε τον λογαριασμό σας, θα χαθεί όλο το ιστορικό συζητήσεών σας</string>
   <string name="attach_record_voice">Εγγραφή φωνής</string>
   <string name="account_settings_jabber_id">ταυτότητα Jabber</string>
   <string name="account_settings_password">Συνθηματικό</string>
@@ -264,7 +262,6 @@
   <string name="using_account">χρήση λογαριασμού %s</string>
   <string name="not_connected_try_again">Δεν είστε συνδεμένοι. Δοκιμάστε ξανά αργότερα</string>
   <string name="message_options">Επιλογές μηνυμάτων</string>
-  <string name="copy_text">Αντιγραφή κειμένου</string>
   <string name="copy_original_url">Αντιγραφή αρχικής διεύθυνσης URL</string>
   <string name="send_again">Αποστολή ξανά</string>
   <string name="message_text">Κείμενο μηνύματος</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 679ff6ed5..fd6095f4f 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Además, terminar esta conversación</string>
   <string name="choose_presence">Seleccionar dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
+  <string name="send_message">Enviar mensaje</string>
   <string name="send_message_to_x">Enviar mensaje a %s</string>
   <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
   <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">El identificador ya está en uso</string>
   <string name="account_status_regis_success">Registro completado</string>
   <string name="account_status_regis_not_sup">El servidor no soporta registros</string>
-  <string name="account_status_security_error">Error de seguridad</string>
+  <string name="account_status_tls_error">TLS error</string>
   <string name="account_status_policy_violation">Policy violation</string>
   <string name="account_status_incompatible_server">Servidor incompatible</string>
   <string name="account_status_stream_error">Stream error</string>
@@ -169,11 +170,13 @@
   <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="unpublish_pgp">Eliminar la clave pública OpenPGP</string>
+  <string name="unpublish_pgp_message">¿Estás seguro de que quieres eliminar tu clave pública OpenPGP de tu anuncio de presencia?\nTus contactos no podrán enviarte mensajes cifrados con 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>
+  <string name="mgmt_account_delete_confirm_text">Si borras tu cuenta, tu historial de conversaciones también se perderá</string>
   <string name="attach_record_voice">Grabar audio</string>
   <string name="account_settings_jabber_id">Identificador Jabber</string>
   <string name="block_jabber_id">Bloquear Identificador Jabber</string>
@@ -331,7 +334,6 @@
   <string name="check_x_filesize">Comprobar tamaño de %s</string>
   <string name="check_x_filesize_on_host">Comprobar tamaño de %1$s en %2$s</string>
   <string name="message_options">Opciones de mensaje</string>
-  <string name="copy_text">Copiar texto</string>
   <string name="select_text">Seleccionar texto</string>
   <string name="quote">Citar</string>
   <string name="copy_original_url">Copiar URL original</string>
@@ -711,4 +713,7 @@
   <string name="block_stranger">Bloquear desconocido</string>
   <string name="block_entire_domain">Bloquear el dominio completo</string>
   <string name="online_right_now">Conectado ahora mismo</string>
+  <string name="retry_decryption">Reintentar descifrado</string>
+  <string name="session_failure">Fallo de sesión</string>
+  <string name="downgrade_attack">Downgrade attack</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 558b44fd7..7c50db655 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict">Erabiltzaile izena dagoeneko erabilita</string>
   <string name="account_status_regis_success">Erregistroa burutu da</string>
   <string name="account_status_regis_not_sup">Zerbitzariak ez du erregistratzea onartzen</string>
-  <string name="account_status_security_error">Segurtasun akatsa</string>
   <string name="account_status_policy_violation">Politikaren urraketa</string>
   <string name="account_status_incompatible_server">Zerbitzari ez bateragarria</string>
   <string name="account_status_stream_error">Akatsa korrontean</string>
@@ -173,7 +172,6 @@
   <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>
   <string name="attach_record_voice">Ahotsa grabatu</string>
   <string name="account_settings_jabber_id">Jabber IDa</string>
   <string name="block_jabber_id">Jabber IDa blokeatu</string>
@@ -331,7 +329,6 @@
   <string name="check_x_filesize">Egiaztatu %sren neurria</string>
   <string name="check_x_filesize_on_host">Egiaztatu %1$sren neurria %2$s ostalarian</string>
   <string name="message_options">Mezuaren aukerak</string>
-  <string name="copy_text">Testua kopiatu</string>
   <string name="select_text">Testua hautatu</string>
   <string name="quote">Aipatu</string>
   <string name="copy_original_url">Jatorrizko URLa kopiatu</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index b3f044792..921522bb2 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
   <string name="account_status_regis_success">Enregistrement réussi</string>
   <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
-  <string name="account_status_security_error">Erreur de sécurité</string>
   <string name="account_status_policy_violation">Violation de politique</string>
   <string name="account_status_incompatible_server">Serveur incompatible</string>
   <string name="account_status_stream_error">Erreur de flux</string>
@@ -173,7 +172,6 @@
   <string name="republish_pgp_keys">N\'oubliez pas de republier votre clef publique 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>
   <string name="attach_record_voice">Enregistrer un son</string>
   <string name="account_settings_jabber_id">Identifiant</string>
   <string name="block_jabber_id">Bloquer l\'ID Jabber</string>
@@ -331,7 +329,6 @@
   <string name="check_x_filesize">Vérification de la taille de %s</string>
   <string name="check_x_filesize_on_host">Vérification de la taille de %1$s sur %2$s</string>
   <string name="message_options">Options du message</string>
-  <string name="copy_text">Copier le texte</string>
   <string name="select_text">Sélectionnez le texte</string>
   <string name="quote">Citation</string>
   <string name="copy_original_url">Copier l\'URL</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 3dd6a65ae..2508b252e 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">A beszélgetést is fejezze be</string>
   <string name="choose_presence">Eszköz kiválasztása</string>
   <string name="send_unencrypted_message">Titkosítatlan üzenetküldés</string>
+  <string name="send_message">Üzenet küldése</string>
   <string name="send_message_to_x">Üzenet elküldése %s számára</string>
   <string name="send_otr_message">OTR titkosított üzenet küldése</string>
   <string name="send_omemo_message">OMEMO titkosított üzenetet küldése</string>
@@ -154,7 +155,7 @@
   <string name="account_status_regis_conflict">Ez a felhasználónév már foglalt</string>
   <string name="account_status_regis_success">Sikeres regisztráció</string>
   <string name="account_status_regis_not_sup">A szerver nem támogatja a regisztrációt</string>
-  <string name="account_status_security_error">Biztonsági hiba</string>
+  <string name="account_status_tls_error">TLS hiba</string>
   <string name="account_status_policy_violation">Irányelv megsértése</string>
   <string name="account_status_incompatible_server">Nem kompatibilis szerver</string>
   <string name="account_status_stream_error">Adatfolyam hiba</string>
@@ -171,7 +172,6 @@
   <string name="republish_pgp_keys">Ne felejtsd el újra publikálni az OpenPGP kulcsaidat!</string>
   <string name="mgmt_account_enable">Fiók bekapcsolása</string>
   <string name="mgmt_account_are_you_sure">Biztos vagy ebben?</string>
-  <string name="mgmt_account_delete_confirm_text">Ha törlöd a fiókodat, a korábbi beszélgetéseid mind elvesznek</string>
   <string name="attach_record_voice">Hang felvétele</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Jabber ID blokkolása</string>
@@ -326,8 +326,9 @@
   <string name="using_account">használt fiók: %s</string>
   <string name="checking_x">Ellenőrzés alatt %s a HTTP gazdán</string>
   <string name="not_connected_try_again">Nem kapcsolódik. Próbálja újra később</string>
+  <string name="check_x_filesize">Ellenőrizze %s méretét</string>
+  <string name="check_x_filesize_on_host">Ellenőrizze %1$s méretét a %2$s oldalon</string>
   <string name="message_options">Műveletek üzenetekkel</string>
-  <string name="copy_text">Szöveg másolása</string>
   <string name="select_text">Szöveg kijelölése</string>
   <string name="quote">Idéz</string>
   <string name="copy_original_url">Eredeti URL másolása</string>
@@ -344,6 +345,16 @@
   <string name="verify_otr">OTR ellenőrzése</string>
   <string name="remote_fingerprint">Távoli Ujlenyomat</string>
   <string name="scan">beolvas</string>
+  <string name="shared_secret_hint">Tipp vagy kérdés</string>
+  <string name="shared_secret_secret">Megosztott titok</string>
+  <string name="confirm">Jóváhagy</string>
+  <string name="in_progress">Folyamatban</string>
+  <string name="respond">Válaszol</string>
+  <string name="failed">Sikertelen</string>
+  <string name="secrets_do_not_match">A titkok nem egyeznek</string>
+  <string name="try_again">megpróbálja újra</string>
+  <string name="finish">Befejez</string>
+  <string name="verified">Hitelesített!</string>
   <string name="smp_requested">Az ismerős SMP ellenőrzést kért</string>
   <string name="conversations_foreground_service">Beszélgetések</string>
   <string name="pref_keep_foreground_service">Előtérben futtassa a programot</string>
@@ -670,4 +681,9 @@
   <string name="pref_notifications_from_strangers">Értesítések idegenektől</string>
   <string name="pref_notifications_from_strangers_summary">Értesítsen az idegenektől kapott üzenetekről.</string>
   <string name="received_message_from_stranger">Üzenete érkezett egy idegentől</string>
+  <string name="block_stranger">Idegen blokkolása</string>
+  <string name="block_entire_domain">Egész domain blokkolása</string>
+  <string name="online_right_now">online most</string>
+  <string name="retry_decryption">Próbálja újra a dekódolást</string>
+  <string name="session_failure">Munkamenet hiba</string>
 </resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 78c17a2ad..4da82531a 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -145,7 +145,6 @@
   <string name="account_status_regis_conflict">Username telah digunakan</string>
   <string name="account_status_regis_success">Registrasi berhasil</string>
   <string name="account_status_regis_not_sup">Server tidak mendukung pendaftaran akun.</string>
-  <string name="account_status_security_error">Kesalahan keamanan</string>
   <string name="account_status_incompatible_server">Server tidak cocok</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -157,7 +156,6 @@
   <string name="mgmt_account_publish_pgp">Publikasikan kunci OpenPGP</string>
   <string name="mgmt_account_enable">Aktifkan Akun</string>
   <string name="mgmt_account_are_you_sure">Apakah Anda yakin.?</string>
-  <string name="mgmt_account_delete_confirm_text">Jika Anda menghapus akun, semua data percakapan Anda di Conversation akan hilang.</string>
   <string name="attach_record_voice">Rekam suara</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Password</string>
@@ -288,7 +286,6 @@
   <string name="not_connected_try_again">Anda tidak terhubung. Coba lagi nanti</string>
   <string name="check_x_filesize">Cek %s ukuran</string>
   <string name="message_options">Opsi pesan</string>
-  <string name="copy_text">Salin teks</string>
   <string name="copy_original_url">Salin URL asli</string>
   <string name="send_again">Kirim lagi</string>
   <string name="file_url">URL Berkas</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 95aa2cd36..e88a3712c 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Termina questa conversazione successivamente</string>
   <string name="choose_presence">Scegli un dispositivo</string>
   <string name="send_unencrypted_message">Invia messaggio non cifrato</string>
+  <string name="send_message">Invia messaggio</string>
   <string name="send_message_to_x">Invia messaggio a %s</string>
   <string name="send_otr_message">Messaggio OTR</string>
   <string name="send_omemo_message">Invia messaggio cifrato OMEMO</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Nome utente già in uso</string>
   <string name="account_status_regis_success">Registrazione completata</string>
   <string name="account_status_regis_not_sup">Il Server non supporta la registrazione</string>
-  <string name="account_status_security_error">Errore di sicurezza</string>
+  <string name="account_status_tls_error">errore TLS</string>
   <string name="account_status_policy_violation">Violazione della policy</string>
   <string name="account_status_incompatible_server">Server non compatibile</string>
   <string name="account_status_stream_error">Errore di stream</string>
@@ -169,11 +170,13 @@
   <string name="mgmt_account_disable">Disabilita temporaneamente</string>
   <string name="mgmt_account_publish_avatar">Pubblica avatar</string>
   <string name="mgmt_account_publish_pgp">Pubblica chiave pubblica OpenPGP</string>
+  <string name="unpublish_pgp">Rimuovi chiave pubblica OpenPGP</string>
+  <string name="unpublish_pgp_message">Sei sicuro di volere rimuovere la tua chiave pubblica OpenPGP dalla dichiarazione di presenza?\nI tuoi contatti non potranno più inviarti messaggi cifrati con OpenPGP.</string>
   <string name="openpgp_has_been_published">La chiave pubblica OpenPGP è stata pubblicata.</string>
   <string name="republish_pgp_keys">Ricorda di ripubblicare le tue chiavi pubbliche OpenPGP!</string>
   <string name="mgmt_account_enable">Abilita utente</string>
   <string name="mgmt_account_are_you_sure">Sei sicuro?</string>
-  <string name="mgmt_account_delete_confirm_text">Se cancelli il tuo utente la cronologia delle tue conversazioni verrà persa</string>
+  <string name="mgmt_account_delete_confirm_text">Se elimini il tuo account perderai tutta la cronologia delle conversazioni</string>
   <string name="attach_record_voice">Registra la voce</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="block_jabber_id">Blocca ID Jabber</string>
@@ -331,7 +334,6 @@
   <string name="check_x_filesize">Controllo dimensione %s</string>
   <string name="check_x_filesize_on_host">Controlla %1$s dimensione su %2$s</string>
   <string name="message_options">Opzioni del messaggio</string>
-  <string name="copy_text">Copia testo</string>
   <string name="select_text">Seleziona testo</string>
   <string name="quote">Quota</string>
   <string name="copy_original_url">Copia URL originale</string>
@@ -711,4 +713,7 @@
   <string name="block_stranger">Blocca sconosciuto</string>
   <string name="block_entire_domain">Blocca intero dominio</string>
   <string name="online_right_now">in linea adesso</string>
+  <string name="retry_decryption">Ritenta decifrazione</string>
+  <string name="session_failure">Sessione fallita</string>
+  <string name="downgrade_attack">Attacco downgrade</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 82e1ff39a..b0c4465e8 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -135,7 +135,6 @@
   <string name="account_status_regis_conflict">שם משתמש כבר בשימוש</string>
   <string name="account_status_regis_success">הרשמה הושלמה</string>
   <string name="account_status_regis_not_sup">השרת לא תומך בהרשמת משתמשים חדשים</string>
-  <string name="account_status_security_error">שגיאת אבטחה</string>
   <string name="account_status_incompatible_server">שרת לא מתאים</string>
   <string name="encryption_choice_unencrypted">לא מוצפן</string>
   <string name="encryption_choice_otr">OTR</string>
@@ -148,7 +147,6 @@
   <string name="mgmt_account_publish_pgp">פרסם מפתח ציבורי של OpenPGP</string>
   <string name="mgmt_account_enable">הפעל חשבון</string>
   <string name="mgmt_account_are_you_sure">האם אתה בטוח?</string>
-  <string name="mgmt_account_delete_confirm_text">אם אתה מוחק את חשבונך כל היסטוריית הדיון שלך תאבד</string>
   <string name="attach_record_voice">הקלט קול</string>
   <string name="account_settings_jabber_id">מזהה Jabber</string>
   <string name="account_settings_password">סיסמה</string>
@@ -281,7 +279,6 @@
   <string name="not_connected_try_again">אינך מחובר. נסה שוב אחר כך</string>
   <string name="check_x_filesize">בדוק גודל %s</string>
   <string name="message_options">הגדרות הודעה</string>
-  <string name="copy_text">העתק טקסט</string>
   <string name="copy_original_url">העתק קישור</string>
   <string name="send_again">שלח שוב</string>
   <string name="file_url">קישור קובץ</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index f3808bc31..c11411808 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">その後、この会話を終了</string>
   <string name="choose_presence">デバイスを選択</string>
   <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
+  <string name="send_message">メッセージを送信</string>
   <string name="send_message_to_x">メッセージを %s に送信</string>
   <string name="send_otr_message">OTR 暗号化メッセージを送信</string>
   <string name="send_omemo_message">OMEMO 暗号化メッセージを送信</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">ユーザー名はすでに使用されています</string>
   <string name="account_status_regis_success">登録が完了しました</string>
   <string name="account_status_regis_not_sup">サーバーが登録をサポートしていません</string>
-  <string name="account_status_security_error">セキュリティ エラー</string>
+  <string name="account_status_tls_error">TLS エラー</string>
   <string name="account_status_policy_violation">ポリシー違反</string>
   <string name="account_status_incompatible_server">互換性のないサーバー</string>
   <string name="account_status_stream_error">ストリーム エラー</string>
@@ -169,11 +170,12 @@
   <string name="mgmt_account_disable">一時的に無効にする</string>
   <string name="mgmt_account_publish_avatar">アバターを公開</string>
   <string name="mgmt_account_publish_pgp">OpenPGP 公開鍵を公開</string>
+  <string name="unpublish_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>
+  <string name="mgmt_account_delete_confirm_text">アカウントを削除すると、会話履歴すべてが失われます</string>
   <string name="attach_record_voice">音声を録音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Jabber ID をブロック</string>
@@ -331,7 +333,6 @@
   <string name="check_x_filesize">%s サイズを確認</string>
   <string name="check_x_filesize_on_host">%2$s で %1$s のサイズを確認</string>
   <string name="message_options">メッセージオプション</string>
-  <string name="copy_text">テキストをコピー</string>
   <string name="select_text">テキストを選択</string>
   <string name="quote">引用</string>
   <string name="copy_original_url">元の URL をコピー</string>
@@ -708,4 +709,7 @@
   <string name="block_stranger">見知らぬ人をブロック</string>
   <string name="block_entire_domain">ドメイン全体をブロック</string>
   <string name="online_right_now">今すぐオンライン</string>
+  <string name="retry_decryption">復号化を再試行</string>
+  <string name="session_failure">セッション失敗</string>
+  <string name="downgrade_attack">ダウングレード攻撃</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 260d5fb72..cd3b8d55e 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -155,7 +155,6 @@
   <string name="account_status_regis_conflict">사용자 이름이 이미 사용중입니다 </string>
   <string name="account_status_regis_success">등록 성공 </string>
   <string name="account_status_regis_not_sup">서버가 등록을 지원하지 않습니다</string>
-  <string name="account_status_security_error">보안 오류 </string>
   <string name="account_status_policy_violation">정책 위반</string>
   <string name="account_status_incompatible_server">호환되지 않는 서버 </string>
   <string name="account_status_stream_error">스트림 오류</string>
@@ -172,9 +171,9 @@
   <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>
   <string name="attach_record_voice">녹음 </string>
   <string name="account_settings_jabber_id">Jabber ID</string>
+  <string name="block_jabber_id">Jabber ID 차단</string>
   <string name="account_settings_password">비밀번호 </string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="account_settings_confirm_password">암호 확인 </string>
@@ -329,8 +328,8 @@
   <string name="check_x_filesize">%s 크기 확인</string>
   <string name="check_x_filesize_on_host">%2$s의 %1$s 크기 확인</string>
   <string name="message_options">메세지 설정 </string>
-  <string name="copy_text">텍스트 복사 </string>
   <string name="select_text">텍스트를 선택</string>
+  <string name="quote">인용</string>
   <string name="copy_original_url">원본 URL 복사 </string>
   <string name="send_again">다시 보내기 </string>
   <string name="file_url">파일 URL</string>
@@ -468,6 +467,8 @@
   <string name="disable_account">계정 해제 </string>
   <string name="contact_is_typing">%s 이(가) 입력중입니다...</string>
   <string name="contact_has_stopped_typing">%s 이(가) 입력을 중단했습니다 </string>
+  <string name="contacts_are_typing">%s 이(가) 입력중입니다...</string>
+  <string name="contacts_have_stopped_typing">%s 이(가) 입력을 중단했습니다 </string>
   <string name="pref_chat_states">입력 알림 </string>
   <string name="pref_chat_states_summary">메세지를 쓸 때 친구들이 알게 합니다</string>
   <string name="send_location">위치 전송 </string>
@@ -526,6 +527,7 @@
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">인증서가 있는 계정 추가</string>
   <string name="unable_to_parse_certificate">인증서를 분석할 수 없음</string>
+  <string name="authenticate_with_certificate">공란으로 두면 인증서로 인증합니다</string>
   <string name="mam_prefs">보관 설정</string>
   <string name="server_side_mam_prefs">서버 사이드의 보관 설정</string>
   <string name="fetching_mam_prefs">보관 설정을 얻고 있습니다. 잠시 기다려주십시오 ...</string>
@@ -643,6 +645,13 @@
   <string name="no_permission_to_access_x">%s에 접근할 권한이 없음</string>
   <string name="remote_server_not_found">원격 서버 찾을 수 없음</string>
   <string name="unable_to_update_account">계정을 업데이트 할수없음</string>
+  <string name="missing_presence_subscription_with_x">%s의 참가 구독을 찾을 수 없습니다.</string>
+  <string name="missing_keys_from_x">%s에서 OMEMO 키를 찾을 수 없습니다.</string>
+  <string name="missing_omemo_keys">OMEMO 키가 없습니다</string>
+  <string name="wrong_conference_configuration">공개적이며 익명이 아닌 회의 입니다.</string>
+  <string name="this_conference_has_no_members">회의에 아무도 없습니다.</string>
+  <string name="report_jid_as_spammer">이 JID를 원치 않는 메시지 전송으로 보고합니다.</string>
+  <string name="pref_delete_omemo_identities">OMEMO ID를 삭제</string>
   <string name="pref_delete_omemo_identities_summary">OMEMO 키를 다시 생성합니다. 모든 연락처를 다시 확인해야합니다. 최후의 수단으로만 사용하십시오.</string>
   <string name="error_publish_avatar_offline">아바타를 게시하려면 연결된 상태여야 합니다.</string>
   <string name="show_error_message">에러 메세지 보이기</string>
@@ -659,4 +668,12 @@
   <string name="pref_blind_trust_before_verification_summary">이전에 확인되지 않은 연락처의 새로운 장치를 자동으로 신뢰하고, 신속히 연락처가 새로운 장치를 추가 할 때마다 수동으로 확인하도록 요청합니다.</string>
   <string name="not_trusted">신뢰되지 않음</string>
   <string name="invalid_barcode">잘못된 2D 바코드</string>
+  <string name="pref_clean_cache_summary">캐시 폴더를 삭제합니다 (카메라에서 사용)</string>
+  <string name="pref_clean_private_storage_summary">파일이 저장되어있는 개인 스토리지를 정리합니다 (서버에서 다시 다운로드 할 수 있습니다)</string>
+  <string name="i_followed_this_link_from_a_trusted_source">신뢰할 수 있는 소스에서 해당 링크를 따라갑니다</string>
+  <string name="verifying_omemo_keys_trusted_source">링크를 클릭 한 후 %1$s의 OMEMO 키를 확인하려고 합니다. 이것은 %2$s이 링크를 공개한 신뢰할 수 있는 소스에서 따라가고 있을 때만 안전합니다.</string>
+  <string name="verify_omemo_keys">OMEMO 키를 검증</string>
+  <string name="distrust_omemo_key_text">이 장치의 자격 증명을 삭제 하시겠습니까?\n장치와 해당 장치에서 메시지는 신뢰할 수없는 것으로 표시됩니다.</string>
+  <string name="pref_automatically_delete_messages_description">설정된 기간보다 오래된 메시지를 장치에서 자동으로 삭제합니다.</string>
+  <string name="pref_notifications_from_strangers_summary">모르는 사람으로부터 받은 메시지를 알립니다.</string>
 </resources>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index cf7a5b224..ce230bc0e 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Avslutt denne samtalen etterpå</string>
   <string name="choose_presence">Velg enhet</string>
   <string name="send_unencrypted_message">Send ukryptert melding</string>
+  <string name="send_message">Send melding</string>
   <string name="send_message_to_x">Send melding til %s</string>
   <string name="send_otr_message">Send OTR-kryptert melding</string>
   <string name="send_omemo_message">Send OMEMO-kryptert melding</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Brukernavn allerede i bruk</string>
   <string name="account_status_regis_success">Registrering fullført</string>
   <string name="account_status_regis_not_sup">Tjeneren støtter ikke registrering</string>
-  <string name="account_status_security_error">Sikkerhetsfeil</string>
+  <string name="account_status_tls_error">TLS-feil</string>
   <string name="account_status_policy_violation">Praksisbrudd</string>
   <string name="account_status_incompatible_server">Ukompatibel tjener</string>
   <string name="account_status_stream_error">Strømmingsfeil</string>
@@ -169,13 +170,16 @@
   <string name="mgmt_account_disable">Skru av midlertidig</string>
   <string name="mgmt_account_publish_avatar">Publiser avatar</string>
   <string name="mgmt_account_publish_pgp">Publiser OpenPGP offentlig nøkkel</string>
+  <string name="unpublish_pgp">Fjern offentlig OpenPGP-nøkkel</string>
+  <string name="unpublish_pgp_message">Er du sikker på at du vil fjerne din offentlige OpenPGP-nøkkel fra din tilstedeværelseskunngjøring?\nDine kontakter vil ikke lenger kunne sende deg OpenPGP-krypterte meldinger.</string>
   <string name="openpgp_has_been_published">Offentlig OpenPGP-nøkkel har blitt offentliggjort.</string>
   <string name="republish_pgp_keys">Husk å offentliggjøre dine offentlige OpenPGP nøkler igjen!</string>
   <string name="mgmt_account_enable">Skru på konto</string>
   <string name="mgmt_account_are_you_sure">Bekreft.</string>
-  <string name="mgmt_account_delete_confirm_text">Hvis du sletter din konto vil hele din konversasjonshistorikk gå tapt</string>
+  <string name="mgmt_account_delete_confirm_text">Hvis du sletter kontoen din, vil hele samtalehistorikken gå tapt.</string>
   <string name="attach_record_voice">Ta opp stemme</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
+  <string name="block_jabber_id">Blokker XMPP-ID</string>
   <string name="account_settings_password">Passord</string>
   <string name="account_settings_example_jabber_id">brukernavn@eksempel.no</string>
   <string name="account_settings_confirm_password">Bekreft passord</string>
@@ -330,7 +334,6 @@
   <string name="check_x_filesize">Sjekk %s størrelse</string>
   <string name="check_x_filesize_on_host">Sjekk %1$s størrelse på %2$s</string>
   <string name="message_options">Meldingsvalg</string>
-  <string name="copy_text">Kopier tekst</string>
   <string name="select_text">Velg tekst</string>
   <string name="quote">Sitat</string>
   <string name="copy_original_url">Kopier orginal nettadresse</string>
@@ -470,6 +473,8 @@
   <string name="disable_account">Deaktiver konto</string>
   <string name="contact_is_typing">%s skriver…</string>
   <string name="contact_has_stopped_typing">%s har sluttet å skrive</string>
+  <string name="contacts_are_typing">%s skriver…</string>
+  <string name="contacts_have_stopped_typing">%s har sluttet å skrive</string>
   <string name="pref_chat_states">Varsler for skriving</string>
   <string name="pref_chat_states_summary">Lar dine kontakter få nyss om at du skriver til dem</string>
   <string name="send_location">Send plasseringsdata</string>
@@ -700,4 +705,15 @@
   <string name="encrypting_message">Krypterer melding</string>
   <string name="not_fetching_history_retention_period">Henter ikke inn meldinger på grunn av lokal oppbevaringsperiode.</string>
   <string name="transcoding_video_progress">Komprimerer video (%s%% fullført)</string>
+  <string name="corresponding_conversations_closed">Samsvarende samtaler lukket.</string>
+  <string name="contact_blocked_past_tense">Kontakt blokkert.</string>
+  <string name="pref_notifications_from_strangers">Varslinger fra fremmede</string>
+  <string name="pref_notifications_from_strangers_summary">Vis varsel for meldinger mottatt fra fremmede.</string>
+  <string name="received_message_from_stranger">Mottok melding fra fremmed</string>
+  <string name="block_stranger">Blokker fremmed</string>
+  <string name="block_entire_domain">Blokker hele domenet</string>
+  <string name="online_right_now">pålogget akkurat nå</string>
+  <string name="retry_decryption">Prøv å dekryptere igjen</string>
+  <string name="session_failure">Økt-feil</string>
+  <string name="downgrade_attack">Nedgrader angrep</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index d3ba8297d..952d6f612 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Dit gesprek na afloop beëindigen</string>
   <string name="choose_presence">Apparaat kiezen</string>
   <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
+  <string name="send_message">Verstuur bericht</string>
   <string name="send_message_to_x">Bericht sturen naar %s</string>
   <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
   <string name="send_omemo_message">Verstuur OMEMO-versleuteld bericht</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Gebruikersnaam is al in gebruik</string>
   <string name="account_status_regis_success">Registratie voltooid</string>
   <string name="account_status_regis_not_sup">Server ondersteunt geen registratie</string>
-  <string name="account_status_security_error">Fout bij beveiliging</string>
+  <string name="account_status_tls_error">TLS-fout</string>
   <string name="account_status_policy_violation">Beleidsschending</string>
   <string name="account_status_incompatible_server">Incompatibele server</string>
   <string name="account_status_stream_error">Fout bij stream</string>
@@ -169,6 +170,8 @@
   <string name="mgmt_account_disable">Tijdelijk uitschakelen</string>
   <string name="mgmt_account_publish_avatar">Avatar publiceren</string>
   <string name="mgmt_account_publish_pgp">OpenPGP-publieke sleutel publiceren</string>
+  <string name="unpublish_pgp">OpenPGP-publieke sleutel verwijderen</string>
+  <string name="unpublish_pgp_message">Weet je zeker dat je je OpenPGP-publieke sleutel uit je aanwezigheidsaankondiging wil verwijderen?\nJe contacten zullen je geen OpenPGP-versleutelde berichten meer kunnen sturen.</string>
   <string name="openpgp_has_been_published">OpenPGP-publieke sleutel is gepubliceerd.</string>
   <string name="republish_pgp_keys">Vergeet niet je OpenPGP-publieke sleutels opnieuw te publiceren!</string>
   <string name="mgmt_account_enable">Account inschakelen</string>
@@ -331,7 +334,6 @@
   <string name="check_x_filesize">Bestandsgrootte van %s controleren</string>
   <string name="check_x_filesize_on_host">Bestandsgrootte van %1$s op %2$s controleren</string>
   <string name="message_options">Berichtopties</string>
-  <string name="copy_text">Tekst kopiëren</string>
   <string name="select_text">Tekst selecteren</string>
   <string name="quote">Citeren</string>
   <string name="copy_original_url">Oorspronkelijke URL kopiëren</string>
@@ -711,4 +713,7 @@
   <string name="block_stranger">Vreemde blokkeren</string>
   <string name="block_entire_domain">Volledig domein blokkeren</string>
   <string name="online_right_now">nu online</string>
+  <string name="retry_decryption">Ontsleutelen opnieuw proberen</string>
+  <string name="session_failure">Sessiefout</string>
+  <string name="downgrade_attack">Downgrade-aanval</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 927f838ed..cf6eeba58 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict">Nazwa jest już w użyciu</string>
   <string name="account_status_regis_success">Zarejestrowano pomyślnie</string>
   <string name="account_status_regis_not_sup">Serwer nie umożliwia rejestracji</string>
-  <string name="account_status_security_error">Błąd zabezpieczeń</string>
   <string name="account_status_policy_violation">Naruszenie zasad</string>
   <string name="account_status_incompatible_server">Serwer niekompatybilny</string>
   <string name="account_status_stream_error">Błąd strumienia</string>
@@ -173,7 +172,6 @@
   <string name="republish_pgp_keys">Pamiętaj, by ponownie opublikować swoje klucze publiczne OpenPGP!</string>
   <string name="mgmt_account_enable">Włącz konto</string>
   <string name="mgmt_account_are_you_sure">Czy na pewno?</string>
-  <string name="mgmt_account_delete_confirm_text">Wraz z kontem zostanie nieodwracalnie usunięta powiązana historia konwersacji.</string>
   <string name="attach_record_voice">Nagraj głos</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Hasło</string>
@@ -330,7 +328,6 @@
   <string name="check_x_filesize">Sprawdź rozmiar %s</string>
   <string name="check_x_filesize_on_host">Sprawdź wielkość %1$s na %2$s</string>
   <string name="message_options">Opcje wiadomości</string>
-  <string name="copy_text">Skopiuj tekst</string>
   <string name="select_text">Zaznacz tekst</string>
   <string name="copy_original_url">Skopiuj oryginalny URL</string>
   <string name="send_again">Wyślij ponownie</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 1d325d9fb..f0badb0d4 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Encerrar essa conversa em seguida</string>
   <string name="choose_presence">Selecione o dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensagem não criptografada</string>
+  <string name="send_message">Enviar mensagem</string>
   <string name="send_message_to_x">Enviar mensagem para %s</string>
   <string name="send_otr_message">Enviar mensagem criptografada via OTR</string>
   <string name="send_omemo_message">Enviar mensagem criptografada via OMEMO</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Esse nome de usuário já está em uso</string>
   <string name="account_status_regis_success">Registro efetuado com sucesso</string>
   <string name="account_status_regis_not_sup">O servidor não aceita o registro</string>
-  <string name="account_status_security_error">Erro de segurança</string>
+  <string name="account_status_tls_error">Erro de TLS</string>
   <string name="account_status_policy_violation">Violação de política</string>
   <string name="account_status_incompatible_server">Servidor incompatível</string>
   <string name="account_status_stream_error">Erro de fluxo</string>
@@ -169,11 +170,13 @@
   <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="unpublish_pgp">Remover a chave pública OpenPGP</string>
+  <string name="unpublish_pgp_message">Tem certeza que deseja remover sua chave pública OpenPGP do seu anúncio de presença?\nSeus contatos não poderão mais enviar mensagens criptografadas com o OpenPGP para você.</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>
+  <string name="mgmt_account_delete_confirm_text">Se você excluir esta conta, todo o seu histórico de conversas será perdido</string>
   <string name="attach_record_voice">Gravar voz</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="block_jabber_id">Bloquear ID do Jabber</string>
@@ -331,7 +334,6 @@
   <string name="check_x_filesize">Verificar o tamanho de %s</string>
   <string name="check_x_filesize_on_host">Verifique o tamanho de %1$s em %2$s</string>
   <string name="message_options">Opções da mensagem</string>
-  <string name="copy_text">Copiar o texto</string>
   <string name="select_text">Selecionar o texto</string>
   <string name="quote">Citar</string>
   <string name="copy_original_url">Copiar a URL original</string>
@@ -708,4 +710,8 @@
   <string name="pref_notifications_from_strangers">Notificações de desconhecidos</string>
   <string name="pref_notifications_from_strangers_summary">Notificar ao receber mensagens de desconhecidos.</string>
   <string name="received_message_from_stranger">Foi recebida uma mensagem de um desconhecido</string>
+  <string name="block_entire_domain">Bloquear o domínio inteiro</string>
+  <string name="online_right_now">conectado(a) agora</string>
+  <string name="retry_decryption">Tentar novamente a descriptografia</string>
+  <string name="session_failure">Falha na sessão</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 726cf555a..4146b50fc 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -152,7 +152,6 @@
   <string name="account_status_regis_conflict">O nome de utilizador já está em uso</string>
   <string name="account_status_regis_success">Registo efetuado com sucesso</string>
   <string name="account_status_regis_not_sup">O servidor não aceita o registo</string>
-  <string name="account_status_security_error">Erro de segurança</string>
   <string name="account_status_incompatible_server">Servidor incompatível</string>
   <string name="encryption_choice_unencrypted">Não cifrado</string>
   <string name="encryption_choice_otr">OTR</string>
@@ -165,7 +164,6 @@
   <string name="mgmt_account_publish_pgp">Publicar chave pública OpenPGP</string>
   <string name="mgmt_account_enable">Ativar conta</string>
   <string name="mgmt_account_are_you_sure">Tem a certeza?</string>
-  <string name="mgmt_account_delete_confirm_text">Se apagar a sua conta o histórico completo das suas conversas será perdido</string>
   <string name="attach_record_voice">Gravar voz</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="account_settings_password">Palavra-passe</string>
@@ -317,7 +315,6 @@
   <string name="check_x_filesize">Verifique o tamanho de %s</string>
   <string name="check_x_filesize_on_host">Verifique o tamanho de %1$s em %2$s</string>
   <string name="message_options">Opções de mensagem</string>
-  <string name="copy_text">Copiar texto</string>
   <string name="select_text">Selecionar texto</string>
   <string name="copy_original_url">Copiar o URL original</string>
   <string name="send_again">Enviar novamente</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index c37c7c0f5..90146b359 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">După, încheie conversația</string>
   <string name="choose_presence">Alege dispozitiv</string>
   <string name="send_unencrypted_message">Trimite mesaje necriptate</string>
+  <string name="send_message">Trimite mesaj</string>
   <string name="send_message_to_x">Trimite mesaj către %s</string>
   <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
   <string name="send_omemo_message">Trimite mesaj criptat cu OMEMO</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Nume de utilizator deja alocat</string>
   <string name="account_status_regis_success">Înregistrare completă</string>
   <string name="account_status_regis_not_sup">Acest server nu permite înregistrarea</string>
-  <string name="account_status_security_error">Eroare de securitate</string>
+  <string name="account_status_tls_error">Eroare TLS</string>
   <string name="account_status_policy_violation">Incălcare condiții serviciu</string>
   <string name="account_status_incompatible_server">Server incompatibil</string>
   <string name="account_status_stream_error">Eroare de date</string>
@@ -169,6 +170,8 @@
   <string name="mgmt_account_disable">Dezactivare temporară</string>
   <string name="mgmt_account_publish_avatar">Publică avatar</string>
   <string name="mgmt_account_publish_pgp">Publică cheia publică OpenPGP</string>
+  <string name="unpublish_pgp">Șterge cheia publică OpenPGP</string>
+  <string name="unpublish_pgp_message">Sigur doriți să vă ștergeți cheia publică OpenPGP din mesajele de prezență?\nContactele dumneavoastră nu vor mai putea să vă trimită mesaje criptate cu OpenPGP.</string>
   <string name="openpgp_has_been_published">Cheia publică OpenPGP a fost publicată.</string>
   <string name="republish_pgp_keys">Amintiți-vă să vă republicați cheile publice OpenPGP!</string>
   <string name="mgmt_account_enable">Activează cont</string>
@@ -331,14 +334,13 @@
   <string name="check_x_filesize">Verifica marimea %s</string>
   <string name="check_x_filesize_on_host">Verifica marimea %1$s pe %2$s</string>
   <string name="message_options">Optiuni mesaje</string>
-  <string name="copy_text">Copiaza text</string>
   <string name="select_text">Selecteaza text</string>
   <string name="quote">Citeaza</string>
-  <string name="copy_original_url">Copiaza URL original</string>
+  <string name="copy_original_url">Copiază adresa originală</string>
   <string name="send_again">Trimite din nou</string>
-  <string name="file_url">URL fisier</string>
+  <string name="file_url">Adresă fișier</string>
   <string name="message_text">Mesaj text</string>
-  <string name="url_copied_to_clipboard">URL copiat in memorie</string>
+  <string name="url_copied_to_clipboard">Adresă copiată în memorie</string>
   <string name="message_copied_to_clipboard">Mesaj copiat in memorie</string>
   <string name="image_transmission_failed">Transmisia imaginii a esuat</string>
   <string name="scan_qr_code">Scaneaza cod de bare 2D</string>
@@ -601,7 +603,7 @@ Emitent</string>
   <string name="this_account_is_disabled">Ai dezactivat acest cont</string>
   <string name="security_error_invalid_file_access">Eroare de securitate.: Acces fisier invalid</string>
   <string name="no_application_to_share_uri">Nu s-a gasit nici o aplicatie care sa partajeze URI</string>
-  <string name="share_uri_with">Partajeaza URI cu...</string>
+  <string name="share_uri_with">Partajează adresa cu...</string>
   <string name="welcome_text">XMPP este un protocol independent ce nu depinde de un anume furnizor. Aveți posibilitatea sa utilizati acest client cu orice server XMPP doriti.\nTotusi pentru confortul dumneavoastra am facilitat crearea unui cont pe conversations.im¹; un furnizor potrivit pentru utilizarea cu aplicatia Conversations.</string>
   <string name="magic_create_text">Va vom ghida prin procesul de creare al unui cont pe conversations.im.¹\nCand alegeti conversations.im ca furnizor veti putea comunica cu utilizatorii altor furnizori oferindu-le ID-ul dumneavoastra Jabber.</string>
   <string name="your_full_jid_will_be">ID-ul Jabber va fi: %s</string>
@@ -715,4 +717,7 @@ Emitent</string>
   <string name="block_stranger">Blocare străin</string>
   <string name="block_entire_domain">Blocare tot domeniu</string>
   <string name="online_right_now">online acum</string>
+  <string name="retry_decryption">Reîncearcă decriptarea</string>
+  <string name="session_failure">Sesiune eșuată</string>
+  <string name="downgrade_attack">Atac retrogradat</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 88e60be87..2ca6e3b21 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict">Имя пользователя уже используется</string>
   <string name="account_status_regis_success">Регистрация завершена</string>
   <string name="account_status_regis_not_sup">Сервер не поддерживает регистрацию</string>
-  <string name="account_status_security_error">Ошибка безопасности</string>
   <string name="account_status_policy_violation">Нарушение правил</string>
   <string name="account_status_incompatible_server">Несовместимый сервер</string>
   <string name="account_status_stream_error">Ошибка потока</string>
@@ -173,7 +172,6 @@
   <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>
   <string name="attach_record_voice">Запись голоса</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Пароль</string>
@@ -330,7 +328,6 @@
   <string name="check_x_filesize">Проверить размер %s</string>
   <string name="check_x_filesize_on_host">Проверить размер %1$s на %2$s</string>
   <string name="message_options">Опции сообщения</string>
-  <string name="copy_text">Копировать текст</string>
   <string name="select_text">Выбрать текст</string>
   <string name="copy_original_url">Копировать адрес ссылки</string>
   <string name="send_again">Отправить ещё раз</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index a57d3b9d5..dd470835b 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -132,7 +132,6 @@
   <string name="account_status_regis_conflict">Užívateľské meno už existuje</string>
   <string name="account_status_regis_success">Registrácia ukončená</string>
   <string name="account_status_regis_not_sup">Server nepodporuje registráciu</string>
-  <string name="account_status_security_error">Bezpečnostná chyba</string>
   <string name="account_status_incompatible_server">Nekompatibilný server</string>
   <string name="encryption_choice_unencrypted">Nezašifrovaný</string>
   <string name="encryption_choice_otr">OTR</string>
@@ -145,7 +144,6 @@
   <string name="mgmt_account_publish_pgp">Zverejniť OpenPGP kľúč</string>
   <string name="mgmt_account_enable">Povoliť účet</string>
   <string name="mgmt_account_are_you_sure">Ste si istý?</string>
-  <string name="mgmt_account_delete_confirm_text">Ak vymažete svoj účet, stratí sa celá história konverzácií</string>
   <string name="attach_record_voice">Nahrať hlas</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Heslo</string>
@@ -279,7 +277,6 @@
   <string name="not_connected_try_again">Nie ste pripojený. Skúste to neskôr</string>
   <string name="check_x_filesize">Overiť %s veľkosť</string>
   <string name="message_options">Možnosti správy</string>
-  <string name="copy_text">Skopírovať text</string>
   <string name="copy_original_url">Skopírovať originálny URL</string>
   <string name="send_again">Poslať znova</string>
   <string name="file_url">URL súbor</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 3a8696c8d..d532eb556 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">Окончај ову преписку након тога</string>
   <string name="choose_presence">Изаберите уређај</string>
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
+  <string name="send_message">Пошаљи поруку</string>
   <string name="send_message_to_x">Пошаљи поруку за %s</string>
   <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
   <string name="send_omemo_message">Пошаљи ОМЕМО шифровану поруку</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict">Корисничко име је већ у употреби</string>
   <string name="account_status_regis_success">Регистрација завршена</string>
   <string name="account_status_regis_not_sup">Сервер не подржава регистрацију</string>
-  <string name="account_status_security_error">Безбедносна грешка</string>
+  <string name="account_status_tls_error">ТЛС грешка</string>
   <string name="account_status_policy_violation">Нарушавање полисе</string>
   <string name="account_status_incompatible_server">Некомпатибилан сервер</string>
   <string name="account_status_stream_error">Грешка тока</string>
@@ -173,7 +174,6 @@
   <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>
   <string name="attach_record_voice">Сними глас</string>
   <string name="account_settings_jabber_id">Џабер ИД</string>
   <string name="block_jabber_id">Блокирај Џабер ИД</string>
@@ -331,7 +331,6 @@
   <string name="check_x_filesize">Провери величину %s</string>
   <string name="check_x_filesize_on_host">Провери величину %1$s na %2$s</string>
   <string name="message_options">Опције поруке</string>
-  <string name="copy_text">Копирај текст</string>
   <string name="select_text">Изабери текст</string>
   <string name="quote">Цитирај</string>
   <string name="copy_original_url">Копирај изворни УРЛ</string>
@@ -705,4 +704,8 @@
   <string name="pref_notifications_from_strangers">Обавештења од непознатих</string>
   <string name="pref_notifications_from_strangers_summary">Обавештења за поруке од непознатих.</string>
   <string name="received_message_from_stranger">Примљена порука од незнанца</string>
+  <string name="block_stranger">Блокирај странца</string>
+  <string name="block_entire_domain">Блокирај читав домен</string>
+  <string name="retry_decryption">Покушај дешифровање поново</string>
+  <string name="session_failure">Неуспех сесије</string>
 </resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 5a4166db7..0a49e410b 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict">Användarnamn används redan</string>
   <string name="account_status_regis_success">Registrering klar</string>
   <string name="account_status_regis_not_sup">Servern stödjer inte registrering</string>
-  <string name="account_status_security_error">Säkerhetsfel</string>
   <string name="account_status_policy_violation">Kränkning av policy</string>
   <string name="account_status_incompatible_server">Inkompatibel server</string>
   <string name="account_status_stream_error">Strömningsfel</string>
@@ -173,7 +172,6 @@
   <string name="republish_pgp_keys">Kom ihåg att återpublicera dina publika OpenPGP nycklar.</string>
   <string name="mgmt_account_enable">Aktivera konto</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>
   <string name="attach_record_voice">Spela in röst</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="block_jabber_id">Blockera Jabber-ID</string>
@@ -331,7 +329,6 @@
   <string name="check_x_filesize">Kontrollera filstorleken på %s</string>
   <string name="check_x_filesize_on_host">Kontrollera filstorlek för %1$s på %2$s</string>
   <string name="message_options">Meddelandealternativ</string>
-  <string name="copy_text">Kopiera text</string>
   <string name="select_text">Markera text</string>
   <string name="quote">Citera</string>
   <string name="copy_original_url">Kopiera orginal-URL</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 655a6b792..99332bb94 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict">Kullanıcı adı kullanılıyor</string>
   <string name="account_status_regis_success">Hesap oluşturuldu</string>
   <string name="account_status_regis_not_sup">Sunucu hesap oluşturma işlemini desteklemiyor</string>
-  <string name="account_status_security_error">Güvenlik hatası</string>
   <string name="account_status_policy_violation">Politika ihlali</string>
   <string name="account_status_incompatible_server">Sunucu uyuşmazlığı</string>
   <string name="account_status_stream_error">Akış hatası</string>
@@ -173,7 +172,6 @@
   <string name="republish_pgp_keys">OpenPGP genel anahtarınızı yeniden yayımlamayı unutmayın!</string>
   <string name="mgmt_account_enable">Hesabı etkinleştir</string>
   <string name="mgmt_account_are_you_sure">Emin misiniz?</string>
-  <string name="mgmt_account_delete_confirm_text">Hesabınızı silerseniz tüm konuşma geçmişiniz silinecek</string>
   <string name="attach_record_voice">Ses kaydet</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Jabber ID engelle</string>
@@ -331,7 +329,6 @@
   <string name="check_x_filesize">%s boyutunu denetle</string>
   <string name="check_x_filesize_on_host">%2$s üzerindeki %1$s boyutunu denetle</string>
   <string name="message_options">İleti seçenekleri</string>
-  <string name="copy_text">Metni kopyala</string>
   <string name="select_text">Metni seç</string>
   <string name="quote">Alıntı</string>
   <string name="copy_original_url">Orijinal URL\'i kopyala</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 15a4130bc..23bf19c9f 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -153,7 +153,6 @@
   <string name="account_status_regis_conflict">Ім\'я користувача вже використовується</string>
   <string name="account_status_regis_success">Реєстрацію виконано</string>
   <string name="account_status_regis_not_sup">Сервер не підтримує режстрацію</string>
-  <string name="account_status_security_error">Помилка безпеки</string>
   <string name="account_status_policy_violation">Порушення політики</string>
   <string name="account_status_incompatible_server">Несумісний сервер</string>
   <string name="account_status_stream_error">Помилка потоку</string>
@@ -170,7 +169,6 @@
   <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>
   <string name="attach_record_voice">Записати голос</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">Пароль</string>
@@ -325,7 +323,6 @@
   <string name="check_x_filesize">Перевірити %s розмір</string>
   <string name="check_x_filesize_on_host">Перевірити %1$s розмір на %2$s</string>
   <string name="message_options">Налаштування повідомлення</string>
-  <string name="copy_text">Скопіювати текст</string>
   <string name="copy_original_url">Скопіювати оригінальний URL</string>
   <string name="send_again">Надіслати знову</string>
   <string name="file_url">URL файла</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 6565d5e5d..a4bce7829 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict">Tên người dùng đã được sử dụng</string>
   <string name="account_status_regis_success">Đăng ký hoàn tất</string>
   <string name="account_status_regis_not_sup">Máy chủ không hỗ trợ việc đăng ký</string>
-  <string name="account_status_security_error">Lỗi bảo mật</string>
   <string name="account_status_policy_violation">Vi phạm chính sách</string>
   <string name="account_status_incompatible_server">Máy chủ không tương thích</string>
   <string name="account_status_stream_error">Lỗi truyền phát</string>
@@ -173,7 +172,6 @@
   <string name="republish_pgp_keys">Nhớ phát hành lại các khoá công cộng OpenPGP!</string>
   <string name="mgmt_account_enable">Bật tài khoản</string>
   <string name="mgmt_account_are_you_sure">Bạn chắc chứ?</string>
-  <string name="mgmt_account_delete_confirm_text">Nếu xoá tài khoản, toàn bộ lịch sử hội thoại của bạn sẽ bị mất</string>
   <string name="attach_record_voice">Ghi âm</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="account_settings_password">Mật khẩu</string>
@@ -320,7 +318,6 @@
   <string name="not_connected_try_again">Bạn chưa kết nối mạng. Xin thử lại sau</string>
   <string name="check_x_filesize">Kiểm tra kích cỡ %s</string>
   <string name="message_options">Tuỳ chọn tin nhắn</string>
-  <string name="copy_text">Sao chép văn bản</string>
   <string name="copy_original_url">Sao chép URL gốc</string>
   <string name="send_again">Gửi lại</string>
   <string name="file_url">URL tập tin</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 39d18ce74..11bca37de 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -156,7 +156,6 @@
   <string name="account_status_regis_conflict"> 用户名已存在</string>
   <string name="account_status_regis_success">注册完成</string>
   <string name="account_status_regis_not_sup">服务器不支持注册</string>
-  <string name="account_status_security_error">安全错误</string>
   <string name="account_status_policy_violation">违反政策</string>
   <string name="account_status_incompatible_server">服务器不兼容</string>
   <string name="account_status_stream_error">流错误</string>
@@ -173,7 +172,6 @@
   <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>
   <string name="attach_record_voice">录音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_password">密码</string>
@@ -330,7 +328,6 @@
   <string name="check_x_filesize">检查 %s 大小</string>
   <string name="check_x_filesize_on_host">在 %2$s 上检查 %1$s 的大小</string>
   <string name="message_options">消息选项</string>
-  <string name="copy_text">拷贝文本</string>
   <string name="select_text">选择文本</string>
   <string name="quote">引用</string>
   <string name="copy_original_url">拷贝原始URL</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 47a9002bb..73115f7c1 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -80,6 +80,7 @@
   <string name="also_end_conversation">結束此會話以後</string>
   <string name="choose_presence">選擇設備</string>
   <string name="send_unencrypted_message">發送未加密的資訊</string>
+  <string name="send_message">送訊息</string>
   <string name="send_message_to_x">發信息給 %s</string>
   <string name="send_otr_message">發送 OTR 加密資訊</string>
   <string name="send_omemo_message">發送 OMEMO 加密資訊</string>
@@ -156,7 +157,7 @@
   <string name="account_status_regis_conflict"> 用戶名已存在</string>
   <string name="account_status_regis_success">註冊完成</string>
   <string name="account_status_regis_not_sup">伺服器不支援註冊</string>
-  <string name="account_status_security_error">安全錯誤</string>
+  <string name="account_status_tls_error">TLS 協定錯誤</string>
   <string name="account_status_policy_violation">違反政策</string>
   <string name="account_status_incompatible_server">伺服器不相容</string>
   <string name="account_status_stream_error">流錯誤</string>
@@ -169,11 +170,13 @@
   <string name="mgmt_account_disable">暫時不可用</string>
   <string name="mgmt_account_publish_avatar">發佈頭像</string>
   <string name="mgmt_account_publish_pgp">發佈 OpenPGP 公開金鑰</string>
+  <string name="unpublish_pgp">移除 OpenPGP 公開金鑰</string>
+  <string name="unpublish_pgp_message">確定要移除上線狀態中的 OpenPGP 公開金鑰嗎？\n這樣一來，你的聯絡人就無法傳送以 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>
+  <string name="mgmt_account_delete_confirm_text">刪除帳號會導致聊天紀錄全部不見</string>
   <string name="attach_record_voice">錄音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">封鎖 Jabber 識別碼</string>
@@ -275,7 +278,7 @@
   <string name="connect">連接</string>
   <string name="account_already_exists">該帳號已存在</string>
   <string name="next">下一步</string>
-  <string name="server_info_session_established">當前會話已建立</string>
+  <string name="server_info_session_established">已建立了目前的通訊對話</string>
   <string name="additional_information">其他資訊</string>
   <string name="skip">忽略</string>
   <string name="disable_notifications">關閉通知</string>
@@ -331,7 +334,6 @@
   <string name="check_x_filesize">檢查 %s 大小</string>
   <string name="check_x_filesize_on_host">在 %2$s 上檢查 %1$s 的大小</string>
   <string name="message_options">消息選項</string>
-  <string name="copy_text">拷貝文本</string>
   <string name="select_text">選擇文本</string>
   <string name="quote">引用</string>
   <string name="copy_original_url">拷貝原始URL</string>
@@ -360,7 +362,7 @@
   <string name="finish">完成</string>
   <string name="verified">驗證通過！</string>
   <string name="smp_requested">連絡人請求 SMP 驗證</string>
-  <string name="no_otr_session_found">沒有找到 OTR 會話</string>
+  <string name="no_otr_session_found">找不到有效的 OTR 通訊對話！</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">保持前臺服務</string>
   <string name="pref_keep_foreground_service_summary">防止作業系統中斷你的連接</string>
@@ -710,4 +712,7 @@
   <string name="block_stranger">封鎖陌生人</string>
   <string name="block_entire_domain">封鎖整個網域</string>
   <string name="online_right_now">剛剛上線了</string>
+  <string name="retry_decryption">再試解密ㄧ次</string>
+  <string name="session_failure">通訊對話錯誤</string>
+  <string name="downgrade_attack">降級攻擊</string>
 </resources>