diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 51dd4ae35b822be14e75246873df8eaaf2a0aed6..10edd879d6a73075a09eb68115aeaa5db8601bc3 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -74,8 +74,6 @@
   <string name="sharing_files_please_wait">جاري إرسال الملفات.  الرجاء الإنتظار ...</string>
   <string name="action_clear_history">حذف سجل المحفوظات</string>
   <string name="clear_conversation_history">حذف سجل المحفوظات للمحادثة</string>
-  <string name="clear_histor_msg">هل ترغب بحذف جميع الرسائل في تلك المحادثة ؟\n\n<b>تنويه :</b> هذا لن يؤثر على الرسائل المخزنة على أجهزة أو خوادم أخرى.</string>
-  <string name="delete_messages">إحذف الرسائل</string>
   <string name="also_end_conversation">قم بإنهاء هذه المحادثة بعد ذلك</string>
   <string name="choose_presence">إختر جهازاً</string>
   <string name="send_unencrypted_message">إرسال رسالة غير مشفرة</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 0099fe8ec5297c77902e88699f0e5c4c88d4f41b..bd5d163b6718fe534d777e5796de9ee219643f07 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Споделяне на файлове. Моля, изчакайте…</string>
   <string name="action_clear_history">Изчистване на историята</string>
   <string name="clear_conversation_history">Изчистване на историята на разговорите</string>
-  <string name="clear_histor_msg">Искате ли да изтриете всички съобщения от този разговор?\n\n<b>Внимание:</b> Това няма да изтрие съобщенията, съхранявани на други устройства или на сървърите.</string>
-  <string name="delete_messages">Изтриване на съобщенията</string>
   <string name="also_end_conversation">Приключване на този разговор след това</string>
   <string name="choose_presence">Изберете устройство</string>
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 3bea1104f76dd147abe8f331bd5e98697f500ef0..db7c94f16e963525f0b5c53c6bb3253b74778632 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">S\'estan compartint els fitxers. Espereu...</string>
   <string name="action_clear_history">Neteja l\'historial</string>
   <string name="clear_conversation_history">Neteja l\'historial de la conversa</string>
-  <string name="clear_histor_msg">Voleu esborrar tots els missatges d\'aquesta conversa?\n\n<b>Avís:</b> Això no afectarà els missatges desats en altres dispositius o servidors.</string>
-  <string name="delete_messages">Esborra els missatges</string>
   <string name="also_end_conversation">Finalitza aquesta conversa després</string>
   <string name="choose_presence">Tria el dispositiu</string>
   <string name="send_unencrypted_message">Envia un missatge no xifrat</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index db6a8e58d0f1ebd86ecd31283d351cb3a0c44904..7071d270e9dc4c2bab1e70ec4459a8c145de1806 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">Sdílení souborů. Chvíli strpení...</string>
   <string name="action_clear_history">Smazat historii</string>
   <string name="clear_conversation_history">Smaže historii konverzací</string>
-  <string name="clear_histor_msg">Chcete smazat všechny zprávy v této konverzaci?\n\n<b>Varování:</b> Toto neovlivní zprávy uložené na jiných přístrojích nebo serverech.</string>
-  <string name="delete_messages">Smazat zprávy</string>
   <string name="also_end_conversation">Poté ukončit tuto konverzaci</string>
   <string name="choose_presence">Vybrat přístroj</string>
   <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 43ebeef9b148982a3990f9cfa6e326c29a01dc82..658740c23788a5ff2721222273aa5e1663c87528 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Teile Dateien. Bitte warten…</string>
   <string name="action_clear_history">Verlauf löschen</string>
   <string name="clear_conversation_history">Unterhaltungsverlauf löschen</string>
-  <string name="clear_histor_msg">Möchtest du alle Nachrichten in dieser Unterhaltung löschen?\n\n<b>Achtung:</b> Dies beeinflusst nicht Nachrichten, die auf anderen Geräten oder Servern gespeichert sind.</string>
-  <string name="delete_messages">Nachrichten löschen</string>
   <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>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index b7d50d824aca21de07d4078d39fa1ac4aa98adf9..21ec90093536a3eb715f78e94f1ee37d9c569870 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -74,8 +74,6 @@
   <string name="sharing_files_please_wait">Διαμοιρασμός φακέλων. Παρακαλώ περιμένετε...</string>
   <string name="action_clear_history">Καθαρισμός ιστορικού</string>
   <string name="clear_conversation_history">Καθαρισμός ιστορικού Συζήτησης</string>
-  <string name="clear_histor_msg">Θέλετε να σβήσετε όλα τα μηνύματα αυτής της Συζήτησης;\n\n<b>Προειδοποίηση:</b> Αυτό δεν θα επηρεάσει τα μηνύματα που είναι αποθηκευμένα σε άλλες συσκευές ή άλλους διακομιστές.</string>
-  <string name="delete_messages">Διαγραφή μηνυμάτων</string>
   <string name="also_end_conversation">Τέλος συζήτησης</string>
   <string name="choose_presence">Επιλογή συσκευής</string>
   <string name="send_unencrypted_message">Αποστολή κρυπτογραφημένου μηνύματος</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 10856f5037f51b2e64901b528dfcd22a2474646e..77d267ede528d7a29a40e030f71b4af78c98765a 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Compartiendo ficheros. Por favor, espera...</string>
   <string name="action_clear_history">Limpiar historial</string>
   <string name="clear_conversation_history">Limpiar historial de conversación</string>
-  <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
-  <string name="delete_messages">Borrar mensajes</string>
   <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>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index eaf1e22ce091984df39fd7ceb7a8dc5ab57c5cb3..f01509c668b18ef48806651e867c18a18a5844be 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Fitxategiak partekatzen. Mesedez itxaron...</string>
   <string name="action_clear_history">Historia garbitu</string>
   <string name="clear_conversation_history">Elkarrizketa historia garbitu</string>
-  <string name="clear_histor_msg">Elkarrizketa honetako mezu guztiak ezabatu nahi al dituzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako mezuetan eraginik izango.</string>
-  <string name="delete_messages">Mezuak ezabatu</string>
   <string name="also_end_conversation">Elkarrizketa hau jarraian amaitu</string>
   <string name="choose_presence">Gailua aukeratu</string>
   <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index 1b5a88fe1fd63ecf2de9879890fd54c3e87882b5..2eb03ff854ea8630bdd5243bb25ff7603a5e65b2 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -69,7 +69,6 @@
   <string name="sharing_files_please_wait">در حال به اشتراک گذاری فایل ها. لطفا صبور باشید...</string>
   <string name="action_clear_history">پاک سازی تاریخچه</string>
   <string name="clear_conversation_history">پاک سازی تاریخچه گفتگو ها</string>
-  <string name="delete_messages">حذف پیام ها</string>
   <string name="also_end_conversation">سپس گفتگو را خاتمه بده</string>
   <string name="choose_presence">انتخاب دستگاه</string>
   <string name="send_unencrypted_message">پیام رمز نشده ارسال کن</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index cd01603829840a9b259cb81a13be9cfd9bc28b49..b5397f3fd93de072585d0820b9775c6c4855eddb 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Partage des fichiers. Veuillez patienter...</string>
   <string name="action_clear_history">Vider l\'historique</string>
   <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
-  <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation ?\n\n<b>Attention :</b> Les messages seront supprimés uniquement sur cet appareil.</string>
-  <string name="delete_messages">Supprimer les messages</string>
   <string name="also_end_conversation">Fermer cette conversation ensuite</string>
   <string name="choose_presence">Choisir l\'appareil</string>
   <string name="send_unencrypted_message">Envoyer un message en clair</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 1af1e4bc0a8409df404c62fd7357a68a909aa39c..471de7a7cc71be890de017fac2615e712bd2091c 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Compartindo ficheiros. Por favor agarde...</string>
   <string name="action_clear_history">Limpar historial</string>
   <string name="clear_conversation_history">Limpar historial de conversa</string>
-  <string name="clear_histor_msg">¿Queres borrar todas as mensaxes desta conversa?\n\n<b>Ollo:</b> Isto non afectará ás mensaxes gardadas noutros dispositivos ou servidores.</string>
-  <string name="delete_messages">Borrar mensaxes</string>
   <string name="also_end_conversation">Finalizar esta conversación tras o proceso</string>
   <string name="choose_presence">Escoller dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensaxe non cifrada</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 865098ec2d3d3ff87e978a238457ae19c08e7399..b81f86ba86aa138be10670be89a407c457e5712f 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Fájlok megosztása. Kérlek várj...</string>
   <string name="action_clear_history">Előzmények törlése</string>
   <string name="clear_conversation_history">Beszélgetés előzményének törlése</string>
-  <string name="clear_histor_msg">Szeretnéd az üzeneteket törölni ebben a beszélgetésben?\n\n<b>Figyelem:</b> Ez nem befolyásolja más eszközökön vagy szervereken tárolt üzeneteidet.</string>
-  <string name="delete_messages">Üzenetek törlése</string>
   <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>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index a310c4f74b21fb35ad0e0ea8b5fc6d17022de102..0c34ef25e95d713d739861f5489db763dd7fef68 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">Membagikan berkas. Mohon tunggu…</string>
   <string name="action_clear_history">Bersihkan riwayat</string>
   <string name="clear_conversation_history">Hapus Riwayat Percakapan</string>
-  <string name="clear_histor_msg">Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\n<b>Peringatan:</b>ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain.</string>
-  <string name="delete_messages">Hapus pesan</string>
   <string name="send_unencrypted_message">Kirim pesan tak-terenkripsi</string>
   <string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>
   <string name="your_nick_has_been_changed">Nick kamu telah dirubah</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 813e8a27b353e3acdeb657353d6602d127ef54a4..2cbbc614bfafb360163eaaf0c1e01f41327d988d 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Condivisione file. Attendere prego...</string>
   <string name="action_clear_history">Pulisci la cronologia</string>
   <string name="clear_conversation_history">Pulisci la cronologia della conversazione</string>
-  <string name="clear_histor_msg">Vuoi cancellare tutti i messaggi di questa Conversazione?\n\n<b>Attenzione:</b> Questo non influenzerà i messaggi presenti su altri dispositivi o server.</string>
-  <string name="delete_messages">Elimina messaggi</string>
   <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>
@@ -152,6 +150,7 @@
   <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>
+  <string name="account_status_stream_opening_error">Errore apertura flusso</string>
   <string name="encryption_choice_unencrypted">Non cifrato</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -736,4 +735,5 @@
   <string name="view_media">Vedi il media</string>
   <string name="media_browser">Browser multimediale</string>
   <string name="export_channel_name">Esportazione cronologia</string>
+  <string name="security_violation_not_attaching_file">File omesso per violazione di sicurezza.</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 23ac8e1ab47a416bd9ae1aed00fa2375c14e8019..6adddf29a66c21153e0d878af217231be8c62cd4 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -65,8 +65,6 @@
   <string name="preparing_image">מכין תמונה לשליחה</string>
   <string name="action_clear_history">נקה היסטוריה</string>
   <string name="clear_conversation_history">נקה היסטוריית שיחה</string>
-  <string name="clear_histor_msg">האם ברצונך למחוק את כל ההודעות בשיחה זאת?\n\n<b>אזהרה:</b> פעולה זו לא תשפיע על הודעות מאוחסנות על מכשירים או שרתים אחרים.</string>
-  <string name="delete_messages">מחק הודעות</string>
   <string name="also_end_conversation">סיים את השיחה לאחר מכן</string>
   <string name="send_unencrypted_message">שלח הודעה בלתי מוצפנת</string>
   <string name="send_omemo_message">של הודעה בהצפנת OMEMO</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 73938468bf9f424eb389d732bbb828f7cdccfab6..747e237248041eaa73982dcdb534bcc7897b7146 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -74,8 +74,6 @@
   <string name="sharing_files_please_wait">フィルを共有しています。しばらくお待ちください…</string>
   <string name="action_clear_history">履歴をクリア</string>
   <string name="clear_conversation_history">会話履歴をクリア</string>
-  <string name="clear_histor_msg">この会話のすべてのメッセージを削除しますか?\n\n<b>警告:</b> これは、他のデバイスやサーバーに保存されているメッセージには影響しません。</string>
-  <string name="delete_messages">メッセージを削除</string>
   <string name="also_end_conversation">その後、この会話を終了</string>
   <string name="choose_presence">デバイスを選択</string>
   <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index b8dde8cbf8f234f91cc6381d4c8df3b183ccfe7d..7d684a1dd49248a730822f725db1176419aa5065 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">파일을 공유중입니다. 기다리세요...</string>
   <string name="action_clear_history">기록 삭제 </string>
   <string name="clear_conversation_history">대화 기록 삭제 </string>
-  <string name="clear_histor_msg">이 대화의 모든 메세지를 삭제하시겠습니까? 경고: 이것은 다른 기기나 서버에 있는 메세지에는 영향을 미치지 않습니다. </string>
-  <string name="delete_messages">메세지 삭제 </string>
   <string name="also_end_conversation">나중에 이 대화 끝내기 </string>
   <string name="choose_presence">기기 선택</string>
   <string name="send_unencrypted_message">암호화하지 않은 메세지 전송</string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index 3bfcf5474791a3243b9a5ec927dbf223ed75a461..11838df39a9a5d319ab56a3f45953a21e49c862d 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -74,8 +74,6 @@
   <string name="sharing_files_please_wait">Deler filer. Vent…</string>
   <string name="action_clear_history">Tøm historikk</string>
   <string name="clear_conversation_history">Tøm samtalehistorikk</string>
-  <string name="clear_histor_msg">Ønsker du å slette alle meldinger i denne samtalen?\n\n<b>Advarsel:</b> Dette har ingen innvirkning på meldinger lagret på andre enheter eller tjenere.</string>
-  <string name="delete_messages">Slett meldinger</string>
   <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>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index cf742b76ececae2578d792ce3e7e8c66d673e21c..0cc56564c860ec13a1beb9b32090b3d322bd4176 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Bestanden delen. Even geduld…</string>
   <string name="action_clear_history">Geschiedenis wissen</string>
   <string name="clear_conversation_history">Gespreksgeschiedenis wissen</string>
-  <string name="clear_histor_msg">Wil je alle berichten in dit gesprek verwijderen?\n\n<b>Waarschuwing:</b> Dit zal geen invloed hebben op de berichten opgeslagen op andere apparaten of servers.</string>
-  <string name="delete_messages">Berichten verwijderen</string>
   <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>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 6c1e5b0b900a89bb406f88ebc5935a277a6a03f0..ec56ed9f8810fbae9196be10f9f9ba1a662d0e3b 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Udostępnianie plików. Proszę czekać...</string>
   <string name="action_clear_history">Wyczyść historię</string>
   <string name="clear_conversation_history">Wyczyść historię konwersacji</string>
-  <string name="clear_histor_msg">Czy na pewno usunąć wszystkie wiadomości powiązane z konwersacją?\n\n<b>Uwaga:</b> Działanie nie wpływa na wiadomości przechowywane na innych urządzeniach lub serwerach.</string>
-  <string name="delete_messages">Usuń wiadomości</string>
   <string name="also_end_conversation">po czym zakończ tę rozmowę</string>
   <string name="choose_presence">Wybierz urządzenie</string>
   <string name="send_unencrypted_message">Wyślij wiadomość bez szyfrowania</string>
@@ -152,6 +150,7 @@
   <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>
+  <string name="account_status_stream_opening_error">Błąd otwierania strumienia</string>
   <string name="encryption_choice_unencrypted">Bez szyfrowania</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -755,4 +754,5 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="view_media">Pokaż media</string>
   <string name="media_browser">Przeglądarka mediów</string>
   <string name="export_channel_name">Eksport historii</string>
+  <string name="security_violation_not_attaching_file">Plik pominięty w związku z naruszeniem bezpieczeństwa.</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 0baa253998e99670811443a899ba3aea7b889836..46e3e7274d54b2a982936c7f0bd675ce2c956476 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Compartilhando arquivos. Por favor, aguarde...</string>
   <string name="action_clear_history">Limpar o histórico</string>
   <string name="clear_conversation_history">Limpa o histórico de conversas</string>
-  <string name="clear_histor_msg">Deseja excluir todas as mensagens dessa conversa?\n\n<b>Atenção:</b> Isso não afetará mensagens armazenadas em outros dispositivos ou servidores.</string>
-  <string name="delete_messages">Excluir mensagens</string>
   <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>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 37f53d648930c94ad2cbf1239e6323d7f2da434c..ed59b69fb21d9bc3d5cb649ee7be06c93d9ba215 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -75,8 +75,6 @@
   <string name="sharing_files_please_wait">Partilhando os ficheiros. Por favor aguarde...</string>
   <string name="action_clear_history">Limpar histórico</string>
   <string name="clear_conversation_history">Limpar o histórico de conversas</string>
-  <string name="clear_histor_msg">Deseja remover todas as mensagens nesta conversa?\n\n&lt;b&gt;Aviso:&lt;b&gt; Isto não irá influenciar mensagens guardadas noutros dispositivos ou servidores.</string>
-  <string name="delete_messages">Remover mensagens</string>
   <string name="also_end_conversation">Terminar esta conversa depois</string>
   <string name="choose_presence">Escolher dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensagem não cifrada</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 098eb37e6925e51d45d6a2eca8675bf62d758639..7c813de63f211d49aff88d502ebc54c412fb94f0 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Trimitere fișiere. Te rog asteaptă...</string>
   <string name="action_clear_history">Șterge istoric</string>
   <string name="clear_conversation_history">Șterge istoricul conversației</string>
-  <string name="clear_histor_msg">Doriți să ștergeți toate mesajele din această conversație?\n\n<b>Atenție:</b> Această acțiune nu va influența mesajele aflate pe alte telefoane/tablete/servere.</string>
-  <string name="delete_messages">Șterge mesajele</string>
   <string name="also_end_conversation">Închide conversația după ștergere</string>
   <string name="choose_presence">Alegeți dispozitiv</string>
   <string name="send_unencrypted_message">Trimite mesaje necriptate</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index a9947c9d78b2a3ddc7c30d332a6f2cde97e2960e..b2fc0ad0f637631bce5d73373e21f3bebbfda445 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -75,8 +75,6 @@
   <string name="sharing_files_please_wait">Обмен файлами. Пожалуйста, подождите…</string>
   <string name="action_clear_history">Очистить историю</string>
   <string name="clear_conversation_history">Очистить историю</string>
-  <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Предупреждение:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах.</string>
-  <string name="delete_messages">Удалить сообщения</string>
   <string name="also_end_conversation">Закончить эту беседу впоследствии</string>
   <string name="choose_presence">Выберите устройство</string>
   <string name="send_unencrypted_message">Нешифрованное сообщение</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 2b951d0f74e1ef84bd1c016d191e08a02f0b05e0..250619031eb9152b3874d8d1af28f6de8d99d3ae 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -63,8 +63,6 @@
   <string name="preparing_image">Pripravujem obrázok na prenos</string>
   <string name="action_clear_history">Vymazať históriu</string>
   <string name="clear_conversation_history">Vymazať históriu konverzácií</string>
-  <string name="clear_histor_msg">Chcete vymazať všetky správy v tejto konverzácii?\n\n<b>Varovanie:</b> Toto neovplyvní správy uložené v iných zariadeniach alebo serveroch.</string>
-  <string name="delete_messages">Vymazať správy</string>
   <string name="also_end_conversation">Neskôr ukončiť konverzáciu</string>
   <string name="send_unencrypted_message">Poslať nezašifrovanú správu</string>
   <string name="send_omemo_message">Poslať OMEMO šifrovanú správu</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 8519ccbe65e9786e8a72ee3668b2d683d02a1b02..5aa9787d4164dfb75e757c3427d301d81b998fb1 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">Делим фајлове, сачекајте…</string>
   <string name="action_clear_history">Очисти историјат</string>
   <string name="clear_conversation_history">Брисање историјата преписки</string>
-  <string name="clear_histor_msg">Желите ли да обришете све поруке ове преписке?\n\n<b>Упозорење:</b> Ово неће утицати на поруке складиштене на осталим уређајима или серверима.</string>
-  <string name="delete_messages">Обриши поруке</string>
   <string name="also_end_conversation">Окончај ову преписку након тога</string>
   <string name="choose_presence">Изаберите уређај</string>
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index d9111021e8ad8a7728621c6ad5dcdf4004d9a125..558a770deffba09de78cd8ab5a24cb52888e7b80 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">Delar filer. Vänta...</string>
   <string name="action_clear_history">Rensa historik</string>
   <string name="clear_conversation_history">Rensa konversationshistorik</string>
-  <string name="clear_histor_msg">Vill du ta bort alla meddelanden i denna konversation?\n\n<b>Varning:</b> Detta kommer inte påverka meddelanden lagrade på andra enheter eller servrar.</string>
-  <string name="delete_messages">Ta bort meddelanden</string>
   <string name="also_end_conversation">Avsluta denna konversation efteråt</string>
   <string name="choose_presence">Välj enhet</string>
   <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 7f6c00473323f2982ada25af8ba1b4fe70cd4264..6873e9582857317b087e076e847a627e654c6857 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">Dosyalar Paylaşılıyor. Lütfen bekleyin...</string>
   <string name="action_clear_history">Geçmişi sil</string>
   <string name="clear_conversation_history">Konuşma geçmişini sil</string>
-  <string name="clear_histor_msg">Bu konuşmadaki tüm iletileri silmek istiyor musunuz?\n\n<b>Uyarı:</b>Başka aygıtlardaki ya da sunuculardaki iletiler bundan etkilenmeyecektir.</string>
-  <string name="delete_messages">İletileri sil</string>
   <string name="also_end_conversation">Sonrasında bu konuşmayı sonlandır</string>
   <string name="choose_presence">Aygıt seç</string>
   <string name="send_unencrypted_message">Şifrelenmemiş ileti gönder</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 4c2fb937690e6b118f087856e9b6e9b419212420..2a2656bafc5ff45918589bd57aceda744030a2a0 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">Поширюю файли. Зачекайте, будь ласка…</string>
   <string name="action_clear_history">Очистити історію</string>
   <string name="clear_conversation_history">Очистити історію розмов</string>
-  <string name="clear_histor_msg">Бажаєте видалити всі повідомлення з цієї розмови?\n\n<b>Увага:</b> Це не вплине на повідомлення, які знаходяться на інших пристроях або серверах.</string>
-  <string name="delete_messages">Видалити повідомлення</string>
   <string name="also_end_conversation">Завершити цю розмову опісля</string>
   <string name="choose_presence">Вибрати пристрій</string>
   <string name="send_unencrypted_message">Відправити незашифроване повідомлення</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 2eecb6a144aa951f82de1affa6a307b4892a3b3f..9b1c01be225025b6f18fc66d68d76c7552ceaa4e 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">Đang chia sẻ các tập tin. Xin chờ...</string>
   <string name="action_clear_history">Xoá lịch sử</string>
   <string name="clear_conversation_history">Xoá lịch sử hội thoại</string>
-  <string name="clear_histor_msg">Bạn có muốn xoá toàn bộ tin nhắn trong hội thoại này?\n\n<b>Cảnh báo:</b> Thao tác này sẽ không ảnh hưởng đến tin nhắn đã lưu trên các thiết bị hoặc máy chủ khác.</string>
-  <string name="delete_messages">Xoá tin nhắn</string>
   <string name="also_end_conversation">Dừng hội thoại này sau đó</string>
   <string name="choose_presence">Chọn thiết bị</string>
   <string name="send_unencrypted_message">Gửi tin nhắn không mã hoá</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 265c8583cc595752b038219601f7acc1b971f885..bf8e3dd407e8652e3b7ee849cf7eea35ef2ccbbb 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -77,8 +77,6 @@
   <string name="sharing_files_please_wait">正在分享文件，请稍候…</string>
   <string name="action_clear_history">清除历史记录</string>
   <string name="clear_conversation_history">清除会话记录</string>
-  <string name="clear_histor_msg">删除该会话中所有信息？\n\n<b>注:</b> 该操作不会影响其他设备或服务器保存的信息。</string>
-  <string name="delete_messages">删除消息</string>
   <string name="also_end_conversation">之后结束此会话</string>
   <string name="choose_presence">选择设备</string>
   <string name="send_unencrypted_message">发送未加密的信息</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index c8883ed1a8b61f2c73fb66e70bbcf6c423b36fd7..44d384c61ecdfe5d2a977203ae899d402402a46f 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -68,8 +68,6 @@
   <string name="sharing_files_please_wait">正在分享檔案中，請稍候…</string>
   <string name="action_clear_history">清除歷史記錄</string>
   <string name="clear_conversation_history">清除會話記錄</string>
-  <string name="clear_histor_msg">要刪除該會話中所有的訊息嗎？\n\n<b>注:</b> 該操作不會影響其他設備或伺服器保存的資訊。</string>
-  <string name="delete_messages">刪除訊息</string>
   <string name="also_end_conversation">結束此會話以後</string>
   <string name="choose_presence">選擇設備</string>
   <string name="send_unencrypted_message">發送未加密的訊息</string>