diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index d2ee76e58..8f26594ca 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">الإعدادات</string>
   <string name="action_add">محادثة جديدة</string>
   <string name="action_accounts">إدارة الحسابات</string>
-  <string name="action_end_conversation">إنهاء المحادثة</string>
   <string name="action_contact_details">بيانات جهة الإتصال</string>
   <string name="action_muc_details">تفاصيل مجموعة المحادثة</string>
   <string name="action_secure">تشفير المحادثة</string>
@@ -74,7 +73,6 @@
   <string name="sharing_files_please_wait">جاري إرسال الملفات.  الرجاء الإنتظار ...</string>
   <string name="action_clear_history">حذف سجل المحفوظات</string>
   <string name="clear_conversation_history">حذف سجل المحفوظات للمحادثة</string>
-  <string name="also_end_conversation">قم بإنهاء هذه المحادثة بعد ذلك</string>
   <string name="choose_presence">إختر جهازاً</string>
   <string name="send_unencrypted_message">إرسال رسالة غير مشفرة</string>
   <string name="send_message">إبعث رسالة</string>
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index be68f6b7e..3b5de6ea9 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">Нов разговор</string>
   <string name="action_accounts">Управление на профилите</string>
   <string name="action_account">Управление на профила</string>
-  <string name="action_end_conversation">Край на този разговор</string>
   <string name="action_contact_details">Подробности за контакта</string>
   <string name="action_muc_details">Подробности за груповия разговор</string>
   <string name="action_secure">Защитен разговор</string>
@@ -81,7 +80,6 @@
   <string name="clear_histor_msg">Наистина ли искате да изтриете всички съобщения в този разговор?\n\n<b>Внимание:</b> Това няма да изтрие копията на тези съобщения, които се съхраняват на други устройства или сървъри.</string>
   <string name="delete_file_dialog">Изтриване на файла</string>
   <string name="delete_file_dialog_msg">Наистина ли искате да изтриете този файл?\n\n<b>Внимание:</b> Това няма да изтрие копията на файла, които се съхраняват на други устройства или сървъри.</string>
-  <string name="also_end_conversation">Приключване на този разговор след това</string>
   <string name="choose_presence">Изберете устройство</string>
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
   <string name="send_message">Изпращане на съобщение</string>
@@ -300,6 +298,8 @@
   <string name="send_again">Повторно изпращане</string>
   <string name="file_url">Адрес на файла</string>
   <string name="url_copied_to_clipboard">Копиране на адреса</string>
+  <string name="jabber_id_copied_to_clipboard">Jabber идентификаторът е копиран</string>
+  <string name="error_message_copied_to_clipboard">Съобщението за грешка е копирано</string>
   <string name="web_address">уеб адрес</string>
   <string name="scan_qr_code">Сканиране на 2-измерен баркод</string>
   <string name="show_qr_code">Показване на 2-измерен баркод</string>
@@ -794,4 +794,5 @@
   <string name="your_name">Името Ви</string>
   <string name="enter_your_name">Въведете името си</string>
   <string name="no_name_set_instructions">Използвайте бутона за редактиране, за да въведете името си.</string>
+  <string name="reject_request">Отхвърляне на заявката</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 3594589f8..9a75abf93 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Preferències</string>
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Gestiona els comptes</string>
-  <string name="action_end_conversation">Finalitza la conversa</string>
   <string name="action_contact_details">Detalls del contacte</string>
   <string name="action_muc_details">Detalls del xat de grup</string>
   <string name="action_secure">Conversa segura</string>
@@ -77,7 +76,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="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>
   <string name="send_message">Envia un missatge</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 221ab0baa..4fd727d4e 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Nastavení</string>
   <string name="action_add">Nová konverzace</string>
   <string name="action_accounts">Nastavení účtů</string>
-  <string name="action_end_conversation">Ukončit tuto konverzaci</string>
   <string name="action_contact_details">Detaily kontaktu</string>
   <string name="action_secure">Zabezpečená konverzace</string>
   <string name="action_add_account">Přidat účet</string>
@@ -68,7 +67,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="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>
   <string name="send_message_to_x">Odeslat zprávu pro %s</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 342caea06..9eb8f830b 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -4,7 +4,7 @@
   <string name="action_add">Neue Unterhaltung</string>
   <string name="action_accounts">Konten verwalten</string>
   <string name="action_account">Konto verwalten</string>
-  <string name="action_end_conversation">Unterhaltung beenden</string>
+  <string name="action_end_conversation">Diese Unterhaltung beenden</string>
   <string name="action_contact_details">Kontaktdetails</string>
   <string name="action_muc_details">Gruppenchatdetails</string>
   <string name="action_secure">Verschlüsselte Unterhaltung</string>
@@ -300,6 +300,8 @@
   <string name="send_again">Erneut senden</string>
   <string name="file_url">Datei-URL</string>
   <string name="url_copied_to_clipboard">URL in die Zwischenablage kopiert</string>
+  <string name="jabber_id_copied_to_clipboard">Jabber-ID in die Zwischenablage kopiert</string>
+  <string name="error_message_copied_to_clipboard">Fehlermeldung in die Zwischenablage kopiert</string>
   <string name="web_address">Internetadresse</string>
   <string name="scan_qr_code">Barcode scannen</string>
   <string name="show_qr_code">Barcode anzeigen</string>
@@ -489,6 +491,7 @@
   <string name="no_camera_permission">Conversations benötigt Zugriff auf die Kamera</string>
   <string name="sync_with_contacts">Mit Kontakten synchronisieren</string>
   <string name="sync_with_contacts_long">Conversations möchte deine serverseitige Kontaktliste mit deinem lokalen Adressbuch abgleichen, um die vollständigen Namen und Avatare deiner Kontakte anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen, abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest. </string>
+  <string name="sync_with_contacts_quicksy"><![CDATA[Quicksy benötigt Zugriff auf die Telefonnummern deiner Kontakte, um Vorschläge für mögliche Kontakte zu machen, die bereits bei Quicksy sind.<br><br>Wir werden keine Kopie dieser Telefonnummern speichern.\n\nFür weitere Informationen lies unsere <a href="https://quicksy.im/#privacy">Datenschutzerklärung</a>.<br><br>Du wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.]]></string>
   <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
   <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich erwähnt werde</string>
   <string name="notify_never">Benachrichtigungen deaktiviert</string>
@@ -512,6 +515,7 @@
   <string name="no_application_to_share_uri">Keine Anwendung zum Teilen der URI gefunden</string>
   <string name="share_uri_with">Teile URI mit…</string>
   <string name="welcome_text">Jabber ist ein anbieterunabhängiges Instant Messaging Netzwerk. Du kannst diesen Client mit jedem beliebigen Jabber-Server nutzen.\nUm es dir leicht zu machen, haben wir die Möglichkeit geschaffen, ein Konto auf conversations.im¹ anzulegen; ein Anbieter, der speziell für die Verwendung mit Conversations geeignet ist.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy ist ein Ableger des beliebten Jabber/XMPP-Clients Conversations mit automatischer Kontakterkennung.<br><br>Du registrierst dich mit deiner Telefonnummer und Quicksy wird automatisch auf der Grundlage der Telefonnummern in deinem Adressbuch mögliche Kontakte vorschlagen.<br><br>Mit der Anmeldung erklärst du dich mit unserer <a href="https://quicksy.im/#privacy">Datenschutzerklärung</a>einverstanden.]]></string>
   <string name="agree_and_continue">Zustimmen &amp; fortfahren</string>
   <string name="magic_create_text">Wir führen dich durch den Prozess der Kontoerstellung auf conversations.im.¹\nWenn du conversations.im als Provider wählst, kannst du mit Nutzern anderer Anbieter kommunizieren, indem du ihnen deine vollständige Jabber-ID gibst.</string>
   <string name="your_full_jid_will_be">Deine vollständige Jabber ID lautet: %s</string>
@@ -731,7 +735,7 @@
   <string name="error_channel_description">Diese Benachrichtigungsart wird verwendet, um eine Benachrichtigung anzuzeigen, falls es ein Problem bei der Verbindung zu einem Konto gibt.</string>
   <string name="notification_group_messages">Nachrichten</string>
   <string name="messages_channel_name">Nachrichten</string>
-  <string name="silent_messages_channel_name">Lautlose Benachrichtigungen</string>
+  <string name="silent_messages_channel_name">Lautlose Nachrichten</string>
   <string name="silent_messages_channel_description">Diese Benachrichtigungsart wird verwendet, um Benachrichtigungen anzuzeigen, die keinen Ton auslösen sollen. Zum Beispiel, wenn du auf einem anderen Gerät aktiv bist (Schonfrist).</string>
   <string name="pref_more_notification_settings">Benachrichtigungseinstellungen</string>
   <string name="pref_more_notification_settings_summary">Wichtigkeit, Klang, Vibrationen</string>
@@ -752,10 +756,12 @@
   <string name="phone_number">Telefonnummer</string>
   <string name="verify_your_phone_number">Telefonnummer überprüfen</string>
   <string name="enter_country_code_and_phone_number">Quicksy sendet eine SMS-Nachricht (es können Gebühren anfallen), um deine Telefonnummer zu überprüfen. Gib deine Landesvorwahl und Telefonnummer ein:</string>
+  <string name="we_will_be_verifying"><![CDATA[Wir werden die Telefonnummer <br/><br/><b>%s</b><br/><br/>überprüfen. Ist das Ordnung oder möchtest du die Nummer bearbeiten?]]></string>
   <string name="not_a_valid_phone_number">%s ist keine gültige Telefonnummer.</string>
   <string name="please_enter_your_phone_number">Gib bitte deine Telefonnummer ein.</string>
   <string name="search_countries">Land suchen</string>
   <string name="verify_x">Überprüfe %s</string>
+  <string name="we_have_sent_you_an_sms_to_x"><![CDATA[Wir haben dir eine SMS an <b>%s</b>geschickt.]]></string>
   <string name="we_have_sent_you_another_sms">Wir haben dir eine weitere SMS mit einem 6-stelligen Code geschickt.</string>
   <string name="please_enter_pin_below">Gib bitte den 6-stellige PIN unten ein.</string>
   <string name="resend_sms">SMS erneut versenden</string>
@@ -790,4 +796,5 @@
   <string name="your_name">Dein Name</string>
   <string name="enter_your_name">Deinen Namen eingeben</string>
   <string name="no_name_set_instructions">Benutze die \"Bearbeiten\"-Schaltfläche, um deinen Namen festzulegen.</string>
+  <string name="reject_request">Anfrage ablehnen</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index de43c7eff..6fafad7c8 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Ρυθμίσεις</string>
   <string name="action_add">Νέα συζήτηση</string>
   <string name="action_accounts">Διαχείριση λογαριασμών</string>
-  <string name="action_end_conversation">Λήξη συζήτησης</string>
   <string name="action_contact_details">Λεπτομέρειες επαφής</string>
   <string name="action_muc_details">Λεπτομέρειες ομαδικής συζήτησης</string>
   <string name="action_secure">Ασφαλής συζήτηση</string>
@@ -74,7 +73,6 @@
   <string name="sharing_files_please_wait">Διαμοιρασμός φακέλων. Παρακαλώ περιμένετε...</string>
   <string name="action_clear_history">Καθαρισμός ιστορικού</string>
   <string name="clear_conversation_history">Καθαρισμός ιστορικού Συζήτησης</string>
-  <string name="also_end_conversation">Τέλος συζήτησης</string>
   <string name="choose_presence">Επιλογή συσκευής</string>
   <string name="send_unencrypted_message">Αποστολή κρυπτογραφημένου μηνύματος</string>
   <string name="send_message">Αποστολή μηνύματος</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 90104cfb3..7155d7f61 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Ajustes</string>
   <string name="action_add">Nueva conversación</string>
   <string name="action_accounts">Gestionar cuentas</string>
-  <string name="action_end_conversation">Terminar conversación</string>
   <string name="action_contact_details">Detalles del contacto</string>
   <string name="action_muc_details">Detalles de conversación</string>
   <string name="action_secure">Conversación segura</string>
@@ -80,7 +79,6 @@
   <string name="clear_histor_msg">¿Estás seguro de que quieres borrar todos los mensajes de esta conversación?\n\n<b>Aviso:</b> Esto no borrará las copias de estos mensajes en otros dispositivos o servidores. </string>
   <string name="delete_file_dialog">Eliminar fichero</string>
   <string name="delete_file_dialog_msg">¿Estás seguro de que quieres borrar este fichero?\n\n<b>Aviso:</b>Esto no borrará las copias de este fichero almacenado en otros dispositivos o servidores.</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>
   <string name="send_message">Enviar mensaje</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 932c06bca..5781aad7d 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -3,7 +3,7 @@
   <string name="action_settings">Ezarpenak</string>
   <string name="action_add">Elkarrizketa berria</string>
   <string name="action_accounts">Kontuak kudeatu</string>
-  <string name="action_end_conversation">Elkarrizketa hau amaitu</string>
+  <string name="action_account">Kontua kudeatu</string>
   <string name="action_contact_details">Kontaktuaren xehetasunak</string>
   <string name="action_muc_details">Taldearen xehetasunak</string>
   <string name="action_secure">Elkarrizketa segurua</string>
@@ -80,7 +80,6 @@
   <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 mezuen kopiak ezabatuko.</string>
   <string name="delete_file_dialog">Fitxategia ezabatu</string>
   <string name="delete_file_dialog_msg">Fitxategi hau ezabatu nahi al duzu?\n\n<b>Abisua:</b> Honek ez du beste gailu edo zerbitzarietan gordetako fitxategi honen kopiak ezabatuko.</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>
   <string name="send_message">Mezua bidali</string>
@@ -267,6 +266,7 @@
   <string name="pref_allow_message_correction_summary">Zure kontaktuak haien mezuak atzeraeraginez editatzea baimendu</string>
   <string name="pref_expert_options">Adituentzako ezarpenak</string>
   <string name="pref_expert_options_summary">Mesedez kontuz ibili hauekin</string>
+  <string name="title_activity_about_x">%s buruz</string>
   <string name="title_pref_quiet_hours">Ordu lasaiak</string>
   <string name="title_pref_quiet_hours_start_time">Hasiera ordua</string>
   <string name="title_pref_quiet_hours_end_time">Amaiera ordua</string>
@@ -298,6 +298,8 @@
   <string name="send_again">Berriro bidali</string>
   <string name="file_url">Fitxategiaren URLa</string>
   <string name="url_copied_to_clipboard">URLa arbelera kopiatu da</string>
+  <string name="jabber_id_copied_to_clipboard">Jabber IDa arbelera kopiatu da</string>
+  <string name="error_message_copied_to_clipboard">Akats mezua arbelera kopiatu da</string>
   <string name="web_address">web helbidea</string>
   <string name="scan_qr_code">2D barra kodea eskaneatu</string>
   <string name="show_qr_code">2D barra kodea erakutsi</string>
@@ -509,6 +511,7 @@
   <string name="no_application_to_share_uri">Ez da aplikaziorik aurkitu URIa partekatzeko</string>
   <string name="share_uri_with">URIa honekin partekatu...</string>
   <string name="welcome_text">Jabber hornitzaleez independiente den protokolo bat da. Bezero hau aukeratzen duzun edozein Jabber zerbitzariarekin erabili dezakezu.\nHala ere zure erosotasunerako conversations.im¹-en, Conversationsekin bereziki erabiltzeko egokia den hornitzaile batean, kontu bat sortzea erraz egin dugu.</string>
+  <string name="agree_and_continue">Onartu eta jarraitu</string>
   <string name="magic_create_text">conversations.im-en kontu bat sortzeko prozesuan zehar gidatuko zaitugu.\nconversations.im¹ hornitzaile bezala aukeratzerakoan beste hornitzaileen erabiltzaileekin komunikatzeko gai izango zara haiei zure Jabber ID osoa emanez.</string>
   <string name="your_full_jid_will_be">Zure Jabber ID osoa %s izango da</string>
   <string name="create_account">Kontua sortu</string>
@@ -742,4 +745,51 @@
   <string name="video_720p">Altua (720p)</string>
   <string name="cancelled">utzita</string>
   <string name="already_drafting_message">Dagoeneko mezu baten zirriborroa idazten ari zara.</string>
+  <string name="feature_not_implemented">Ezaugarria ez da inplementatu</string>
+  <string name="invalid_country_code">Herrialde kode ez balioduna</string>
+  <string name="choose_a_country">Herrialde bat hautatu</string>
+  <string name="phone_number">telefono zenbakia</string>
+  <string name="verify_your_phone_number">Zure telefono zenbakia egiaztatu</string>
+  <string name="enter_country_code_and_phone_number">Quicksyk SMS mezu bat bidali dizu (baliteke ordaindu behar izatea)  zure telefono zenbakia egiaztatzeko.</string>
+  <string name="we_will_be_verifying"><![CDATA[<br/><br/><b>%s</b><br/><br/>telefono zenbakia egiaztatuko dugu. Zuzena da, edo zenbakia editatu nahiko al zenuke?]]></string>
+  <string name="not_a_valid_phone_number">%s ez da telefono zenbaki baliodun bat.</string>
+  <string name="please_enter_your_phone_number">Mesedez idatzi zure telefono zenbakia.</string>
+  <string name="search_countries">Herrialdeak bilatu</string>
+  <string name="verify_x">%s egiaztatu</string>
+  <string name="we_have_sent_you_an_sms_to_x"><![CDATA[SMS mezu bat bidali dizugu <b>%s</b> zenbakira.]]></string>
+  <string name="we_have_sent_you_another_sms">Beste SMS bat bidali dizugu 6 digituzko kode batekin.</string>
+  <string name="please_enter_pin_below">Mesedez idatzi 6 digituzko kodea behean.</string>
+  <string name="resend_sms">SMSa birbidali</string>
+  <string name="resend_sms_in">SMSa birbidali (%s)</string>
+  <string name="wait_x">Itxaron mesedez (%s)</string>
+  <string name="back">atzera</string>
+  <string name="possible_pin">Izan daitekeen kodea arbeletik automatikoki itsatsi da.</string>
+  <string name="please_enter_pin">Mesedez idatzi zure 6 digituzko kodea.</string>
+  <string name="abort_registration_procedure">Izen emate prozesua bertan behera utzi nahi duzu?</string>
+  <string name="yes">Bai</string>
+  <string name="no">Ez</string>
+  <string name="verifying">Egiaztatzen…</string>
+  <string name="requesting_sms">SMSa eskatzen…</string>
+  <string name="incorrect_pin">Idatzi duzun kodea ez da zuzena.</string>
+  <string name="pin_expired">Bidali dizugun kodea iraungi egin da.</string>
+  <string name="unknown_api_error_network">Sareko akats ezezaguna.</string>
+  <string name="unknown_api_error_response">Zerbitzariaren erantzun ezezaguna.</string>
+  <string name="unable_to_connect_to_server">Ezin izan da zerbitzariarekin konektatu.</string>
+  <string name="unable_to_establish_secure_connection">Ezin izan da konexio seguru bat ezarri.</string>
+  <string name="unable_to_find_server">Ezin izan da zerbitzaria aurkitu.</string>
+  <string name="something_went_wrong_processing_your_request">Zerbait oker joan da zure eskaera prozesatzerakoan.</string>
+  <string name="invalid_user_input">Idatzitakoa ez da balioduna</string>
+  <string name="temporarily_unavailable">Aldi baterako ez eskuragarri. Saiatu beranduago.</string>
+  <string name="no_network_connection">Ez dago sareko konexiorik.</string>
+  <string name="try_again_in_x">Mesedez saiatu berriro %s barru</string>
+  <string name="rate_limited">Mugatutako tasa duzu</string>
+  <string name="too_many_attempts">Saiakera gehiegi</string>
+  <string name="the_app_is_out_of_date">Aplikazio honen bertsio zahar bat erabiltzen ari zara.</string>
+  <string name="update">Eguneratu</string>
+  <string name="logged_in_with_another_device">Telefono zenbaki hau beste gailu batean saioa hasita dauka une honetan.</string>
+  <string name="enter_your_name_instructions">Mesedez idatzi zure izena besteek, zu haien helbideen liburuan ez zaituztenek, nor zaren jakin ahal dezaten.</string>
+  <string name="your_name">Zure izena</string>
+  <string name="enter_your_name">Idatzi zure izena</string>
+  <string name="no_name_set_instructions">Erabili ezazu editatu botoia zure izena ezartzeko.</string>
+  <string name="reject_request">Eskaera ukatu</string>
 </resources>
diff --git a/src/main/res/values-fa-rIR/strings.xml b/src/main/res/values-fa-rIR/strings.xml
index 2eb03ff85..15e5a1373 100644
--- a/src/main/res/values-fa-rIR/strings.xml
+++ b/src/main/res/values-fa-rIR/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">تنظیمات</string>
   <string name="action_add">مکالمه جدید</string>
   <string name="action_accounts">مدیریت حساب های کاربری</string>
-  <string name="action_end_conversation">اتمام مکالمه</string>
   <string name="action_contact_details">جزییات مخاطب</string>
   <string name="action_muc_details">جزئیات چت گروهی</string>
   <string name="action_secure">مکالمه امن</string>
@@ -69,7 +68,6 @@
   <string name="sharing_files_please_wait">در حال به اشتراک گذاری فایل ها. لطفا صبور باشید...</string>
   <string name="action_clear_history">پاک سازی تاریخچه</string>
   <string name="clear_conversation_history">پاک سازی تاریخچه گفتگو ها</string>
-  <string name="also_end_conversation">سپس گفتگو را خاتمه بده</string>
   <string name="choose_presence">انتخاب دستگاه</string>
   <string name="send_unencrypted_message">پیام رمز نشده ارسال کن</string>
   <string name="send_message">ارسال پیام</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index dfd30e5d5..660845369 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">Nouvelle conversation</string>
   <string name="action_accounts">Gérer les comptes</string>
   <string name="action_account">Gérer le compte</string>
-  <string name="action_end_conversation">Terminer cette conversation</string>
   <string name="action_contact_details">Détails du contact</string>
   <string name="action_muc_details">Détails de la conversation de groupe</string>
   <string name="action_secure">Conversation sécurisée</string>
@@ -81,7 +80,6 @@
   <string name="clear_histor_msg">Êtes-vous sûr de vouloir supprimer tous les messages de cette conversation ?\n\n <b>Avertissement :</b> Cela ne supprimera pas les copies des messages qui sont stockés sur d\'autres appareils ou serveurs.</string>
   <string name="delete_file_dialog">Supprimer le fichier</string>
   <string name="delete_file_dialog_msg">Êtes-vous sûr de vouloir supprimer ce fichier ?\n\n <b>Avertissement :</b> Cela ne supprimera pas les copies de ce fichier qui sont stockés sur d\'autres appareils ou serveurs.</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>
   <string name="send_message">Envoyer le message</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 6904f1d37..fc95aad58 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Axustes</string>
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Xestionar contas</string>
-  <string name="action_end_conversation">Terminar conversa</string>
   <string name="action_contact_details">Detalles do contacto</string>
   <string name="action_muc_details">Detalles da conversa de grupo</string>
   <string name="action_secure">Conversa segura</string>
@@ -80,7 +79,6 @@
   <string name="clear_histor_msg">Está segura de querer eliminar todas as mensaxes de esta conversación¿\n\n<b>Aviso:</b> Esto non eliminará as copias de esas mensaxes que están gardadas en outros dispositivos ou servidores.</string>
   <string name="delete_file_dialog">Eliminar ficheiro</string>
   <string name="delete_file_dialog_msg">Está segura de querer eliminar este ficheiro?\n\n<b>Aviso:</b> Esto non eliminará as copias de este ficheiro que están gardadas en outros dispositivos ou servidores.</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>
   <string name="send_message">Enviar mensaxe</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 6c59f59e3..46d718c16 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -3,7 +3,7 @@
   <string name="action_settings">Beállítások</string>
   <string name="action_add">Új beszélgetés</string>
   <string name="action_accounts">Fiókok kezelése</string>
-  <string name="action_end_conversation">Beszélgetés befejezése</string>
+  <string name="action_account">Fiók kezelése</string>
   <string name="action_contact_details">Kapcsolat részletek</string>
   <string name="action_muc_details">Konferencia részletei</string>
   <string name="action_secure">Biztonságos beszélgetés</string>
@@ -80,7 +80,6 @@
   <string name="clear_histor_msg">Biztosan szeretnéd az üzeneteket törölni ebben a beszélgetésben?\n\n<b>Figyelem:</b> Ez nem törli más eszközökön vagy szervereken tárolt üzeneteidet.</string>
   <string name="delete_file_dialog">Fájl törlése</string>
   <string name="delete_file_dialog_msg">Biztosan szeretnéd ezt a fájlt törölni?\n\n<b>Figyelem:</b> Ez nem törli más eszközökön vagy szervereken tárolt fájljaidat.</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>
   <string name="send_message">Üzenet küldése</string>
@@ -267,6 +266,7 @@
   <string name="pref_allow_message_correction_summary">Visszamenőlegesen is megengedi az üzenetek szerkesztését</string>
   <string name="pref_expert_options">Haladó beállítások</string>
   <string name="pref_expert_options_summary">Kérlek, légy óvatos!</string>
+  <string name="title_activity_about_x">Róla: %s</string>
   <string name="title_pref_quiet_hours">Csöndes órák</string>
   <string name="title_pref_quiet_hours_start_time">Kezdése</string>
   <string name="title_pref_quiet_hours_end_time">Befejezése</string>
@@ -298,6 +298,8 @@
   <string name="send_again">Elküldi újra</string>
   <string name="file_url">Fájl URL-je</string>
   <string name="url_copied_to_clipboard">URL vágólapra másolása</string>
+  <string name="jabber_id_copied_to_clipboard">A Jabber azonosítót a vágólapra másoltuk</string>
+  <string name="error_message_copied_to_clipboard">A hibaüzenetet a vágólapra másoltuk</string>
   <string name="web_address">webcím</string>
   <string name="scan_qr_code">2D vonalkód olvasás</string>
   <string name="show_qr_code">2D vonalkód mutatása</string>
@@ -486,6 +488,8 @@
   <string name="no_storage_permission">A Conversations-nek hozzáférésre lenne szüksége a külső tárhelyhez</string>
   <string name="no_camera_permission">A Conversations-nek hozzáférésre lenne szüksége a kamerához</string>
   <string name="sync_with_contacts">Szinkronizáljon a névjegyekkel</string>
+  <string name="sync_with_contacts_long">A Conversations szeretné megfeleltetni a szerver oldali partnerlistát  a helyi címjegyzékkel, hogy megmutassa az ismerősök teljes nevét és arcképet.\n\nA Conversations csak olvassa a névjegyeit és helyileg felelteti meg őket anélkül, hogy feltöltené azokat a szerverre.\n\nMost meg lesz kérdezve, hogy engedélyezi-e a névjegyekhez való hozzáférést.</string>
+  <string name="sync_with_contacts_quicksy"><![CDATA[A Quicksy-nek hozzáférést kell kapnia a ismerősei telefonszámához, hogy javaslatokat tegyen a lehetséges Quicksy-kapcsolatokról.<br><br>E telefonszámok másolatát nem tároljuk.\n\nTöbb információért olvassa el az <a href="https://quicksy.im/#privacy">adatvédelmi irányelvek</a>.<br><br>Most megkérjük, adjon engedélyt a névjegyek eléréséhez.]]></string>
   <string name="notify_on_all_messages">Értesítsen minden üzenetnél</string>
   <string name="notify_only_when_highlighted">Csak akkor értesítsen, ha megemlítenek</string>
   <string name="notify_never">Értesítések letiltva</string>
@@ -509,6 +513,8 @@
   <string name="no_application_to_share_uri">Nem találtunk URI-t használó alkalmazást</string>
   <string name="share_uri_with">Megosztás URI-ként</string>
   <string name="welcome_text">A Jabber egy szolgáltató független, azonnali üzenetküldő hálózat. Ezt az ügyfél programot bármelyik Jabber szerverhez használhatja.\nDe a könnyebbség kedvéért létrehozhat egy fiókot a conversations.im¹ szolgáltatón is; ami kifejezetten a Conversations programmal való használatra lett tervezve.</string>
+  <string name="welcome_text_quicksy"><![CDATA[A Quicksy a népszerű Conversations Jabber / XMPP kliens mellékhajtása automatikus kapcsolat felfedezéssel.<br><br>Regisztrál a telefonszámával, és a Quicksy automatikusan - a címjegyzékben szereplő telefonszámok alapján - jelzi a lehetséges kapcsolatokat.<br><br>A feliratkozással elfogadja az<a href="https://quicksy.im/#privacy">adatvédelmi irányelvet</a>.]]></string>
+  <string name="agree_and_continue">Egyetért &amp; folytatás</string>
   <string name="magic_create_text">Végigvezetjük a fiók létrehozás folyamatán a conversations.im-en.¹ \ nHa a conversations.im-et választja szolgáltatójának, akkor képes lesz kommunikálni a más szolgáltatóknál lévő felhasználókkal, ha megadja nekik a teljes Jabber azonosítóját.</string>
   <string name="your_full_jid_will_be">A teljes Jabber azonosítód ez lesz: %s</string>
   <string name="create_account">Fiók létrehozása</string>
@@ -742,4 +748,51 @@
   <string name="video_720p">Magas (720p)</string>
   <string name="cancelled">visszavonva</string>
   <string name="already_drafting_message">Már írja az üzenet vázlatát.</string>
+  <string name="feature_not_implemented">A funkció nem működik</string>
+  <string name="invalid_country_code">Érvénytelen országkód</string>
+  <string name="choose_a_country">Válassz egy országot</string>
+  <string name="phone_number">telefonszám</string>
+  <string name="verify_your_phone_number">Erősítsd meg a telefonszámod</string>
+  <string name="enter_country_code_and_phone_number">A Quicksy SMS-üzenetet küld (a szolgáltató díjat számolhat fel), hogy ellenőrizze a telefonszámát. Írja be az ország kódját és telefonszámát:</string>
+  <string name="we_will_be_verifying"><![CDATA[Ellenőrizni fogjuk a telefonszámát<br/><br/><b>%s</b><br/><br/>Ez rendben van, vagy szeretné szerkeszteni a számot?]]></string>
+  <string name="not_a_valid_phone_number">%s nem egy valós telefonszám.</string>
+  <string name="please_enter_your_phone_number">Kérlek add meg a telefonszámod.</string>
+  <string name="search_countries">Országok keresése</string>
+  <string name="verify_x">Ellenőrzés %s</string>
+  <string name="we_have_sent_you_an_sms_to_x"><![CDATA[Küldtünk egy SMS-t erre: <b>%s</b>.]]></string>
+  <string name="we_have_sent_you_another_sms">Küldtünk neked egy másik 6 számjegyű kódot SMS-ben.</string>
+  <string name="please_enter_pin_below">Kérjük adja meg az alábbi 6 számjegyű PIN-t.</string>
+  <string name="resend_sms">SMS újraküldése</string>
+  <string name="resend_sms_in">SMS újraküldése (%s)</string>
+  <string name="wait_x">Kérjük várjon (%s)</string>
+  <string name="back">vissza</string>
+  <string name="possible_pin">Automatikusan beillesztett lehetséges PIN a vágólapról.</string>
+  <string name="please_enter_pin">Kérjük adja meg a 6 számjegyű PIN-t.</string>
+  <string name="abort_registration_procedure">Biztosan meg akarja szakítani a regisztrációs folyamatot?</string>
+  <string name="yes">Igen</string>
+  <string name="no">Nem</string>
+  <string name="verifying">Ellenőrzés...</string>
+  <string name="requesting_sms">SMS kérése...</string>
+  <string name="incorrect_pin">A beírt PIN helytelen.</string>
+  <string name="pin_expired">A PIN amit küldtünk lejárt.</string>
+  <string name="unknown_api_error_network">Ismeretlen hálózati hiba.</string>
+  <string name="unknown_api_error_response">Ismeretlen válasz a szervertől.</string>
+  <string name="unable_to_connect_to_server">Nem sikerül a szerverhez csatlakozni.</string>
+  <string name="unable_to_establish_secure_connection">Nem sikerül biztonságos kapcsolatot létrehozni.</string>
+  <string name="unable_to_find_server">Nem sikerül szervert találni.</string>
+  <string name="something_went_wrong_processing_your_request">Valami hiba történt a kérelem feldolgozása során.</string>
+  <string name="invalid_user_input">Érvénytelen felhasználói bevitel</string>
+  <string name="temporarily_unavailable">Ideiglenesen nem elérhető. Próbáld újra később.</string>
+  <string name="no_network_connection">Nincs hálózati kapcsolat.</string>
+  <string name="try_again_in_x">Kérjük próbálja meg %s múlva</string>
+  <string name="rate_limited">Az Ön rátája limitált</string>
+  <string name="too_many_attempts">Túl sok próbálkozás</string>
+  <string name="the_app_is_out_of_date">Az alkalmazás elavult verzióját használja.</string>
+  <string name="update">Frissítés</string>
+  <string name="logged_in_with_another_device">Ez a telefonszám jelenleg egy másik eszközzel van bejelentkezve.</string>
+  <string name="enter_your_name_instructions">Kérjük, adja meg nevét, hogy az emberek, akiknek nincs benne a címjegyzékében, tudják, kicsoda Ön.</string>
+  <string name="your_name">A neve</string>
+  <string name="enter_your_name">Adja meg nevét</string>
+  <string name="no_name_set_instructions">A szerkesztő gombbal állítsa be a nevét.</string>
+  <string name="reject_request">Kérés elutasítása</string>
 </resources>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 0a027e0d9..ba8abc785 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Pengaturan</string>
   <string name="action_add">Percakapan Baru</string>
   <string name="action_accounts">Pengaturan Akun</string>
-  <string name="action_end_conversation">Akhiri Percakapan</string>
   <string name="action_contact_details">Detil Kontak</string>
   <string name="action_secure">Amankan Percakapan</string>
   <string name="action_add_account">Tambah Akun</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 721fa5b0f..63e717778 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -3,7 +3,7 @@
   <string name="action_settings">Impostazioni</string>
   <string name="action_add">Nuova conversazione</string>
   <string name="action_accounts">Gestisci account</string>
-  <string name="action_end_conversation">Termina questa conversazione</string>
+  <string name="action_account">Gestisci account</string>
   <string name="action_contact_details">Dettagli del contatto</string>
   <string name="action_muc_details">Dettagli chat di gruppo</string>
   <string name="action_secure">Conversazione sicura</string>
@@ -80,7 +80,6 @@
   <string name="clear_histor_msg">Sei sicuro di voler eliminare tutti i messaggi di questa conversazione?\n\n<b>Attenzione:</b> non verranno eliminate copie di questi messaggi memorizzati in altri dispositivi o server.</string>
   <string name="delete_file_dialog">Elimina file</string>
   <string name="delete_file_dialog_msg">Sei sicuro di voler eliminare questo file?\n\n<b>Attenzione:</b> non verranno eliminate copie di questo file memorizzate in altri dispositivi o server. </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>
   <string name="send_message">Invia messaggio</string>
@@ -267,6 +266,7 @@
   <string name="pref_allow_message_correction_summary">Consenti ai tuoi contatti di modificare retroattivamente i loro messaggi</string>
   <string name="pref_expert_options">Impostazioni esperto</string>
   <string name="pref_expert_options_summary">Fai attenzione con queste impostazioni</string>
+  <string name="title_activity_about_x">Informazioni su %s</string>
   <string name="title_pref_quiet_hours">Ore di quiete</string>
   <string name="title_pref_quiet_hours_start_time">Orario inizio</string>
   <string name="title_pref_quiet_hours_end_time">Orario fine</string>
@@ -298,6 +298,8 @@
   <string name="send_again">Invia di nuovo</string>
   <string name="file_url">URL del file</string>
   <string name="url_copied_to_clipboard">URL copiato negli appunti</string>
+  <string name="jabber_id_copied_to_clipboard">ID Jabber copiato negli appunti</string>
+  <string name="error_message_copied_to_clipboard">Messaggio di errore copiato negli appunti</string>
   <string name="web_address">indirizzo web</string>
   <string name="scan_qr_code">Scansiona codice a barre 2D</string>
   <string name="show_qr_code">Mostra codice a barre 2D</string>
@@ -486,6 +488,8 @@
   <string name="no_storage_permission">Conversations ha bisogno di accedere all\'archiviazione esterna</string>
   <string name="no_camera_permission">Conversations ha bisogno di accedere alla fotocamera</string>
   <string name="sync_with_contacts">Sincronizza con i contatti</string>
+  <string name="sync_with_contacts_long">Conversations vuole confrontare il tuo elenco di contatti lato server con la tua rubrica locale per mostrare i nomi ed avatar dei contatti.\n\nConversations leggerà solamente i contatti e li confronterà localmente senza caricarli sul server.\n\nTi verrà ora chiesta l\'autorizzazione di accedere ai tuoi contatti.</string>
+  <string name="sync_with_contacts_quicksy"><![CDATA[Quicksy richiede l\'accesso ai numeri di telefono dei tuoi contatti per dare suggerimenti su possibili contatti già presenti su Quicksy.<br><br>Non salveremo una copia di quei numeri di telefono.\n\nPer maggiori informazioni leggi la nostra <a href="https://quicksy.im/#privacy">politica sulla privacy</a>.<br><br>Ti verrà ora chiesta l\'autorizzazione di accedere ai tuoi contatti.]]></string>
   <string name="notify_on_all_messages">Notifica per tutti i messaggi</string>
   <string name="notify_only_when_highlighted">Notifica solo quando menzionato</string>
   <string name="notify_never">Notifiche disattivate</string>
@@ -509,6 +513,8 @@
   <string name="no_application_to_share_uri">Nessuna applicazione trovata per condividere l\'URI</string>
   <string name="share_uri_with">Condividi l\'URI con...</string>
   <string name="welcome_text">Jabber è una rete di messaggeria istantanea indipendente dal provider. Puoi usare questo client con qualsiasi server Jabber scelto.\nComunque, per tua comodità, abbiamo semplificato la creazione di un account su conversations.im¹; un provider particolarmente adatto all\'uso con Conversations.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy è una variante del popolare client Jabber/XMPP Conversations con ricerca automatica dei contatti.<br><br>Ti registri con il tuo numero di telefono e Quicksy ti suggerirà—in base ai numeri di telefono nella tua rubrica—automaticamente i possibili contatti.<br><br>Registrandoti accetti la nostra <a href="https://quicksy.im/#privacy">politica sulla privacy</a>.]]></string>
+  <string name="agree_and_continue">Accetta e continua</string>
   <string name="magic_create_text">Ti guideremo nel processo di creazione di un account su conversations.im.¹\nQuando scegli conversations.im come provider potrai comunicare con utenti di altri provider dando il tuo ID Jabber completo.</string>
   <string name="your_full_jid_will_be">Il tuo ID Jabber completo sarà: %s</string>
   <string name="create_account">Crea account</string>
@@ -742,4 +748,50 @@
   <string name="video_720p">Alta (720p)</string>
   <string name="cancelled">annullato</string>
   <string name="already_drafting_message">Hai già un messaggio in bozze.</string>
+  <string name="feature_not_implemented">Funzionalità non implementata</string>
+  <string name="invalid_country_code">Codice nazionale non valido</string>
+  <string name="choose_a_country">Scegli una nazione</string>
+  <string name="phone_number">numero di telefono</string>
+  <string name="verify_your_phone_number">Verifica il tuo numero di telefono</string>
+  <string name="enter_country_code_and_phone_number">Quicksy invierà un SMS (possono essere applicati costi dal gestore) per verificare il tuo numero. Inserisci il tuo codice nazionale e numero di telefono:</string>
+  <string name="we_will_be_verifying"><![CDATA[Verificheremo il numero di telefono<br/><br/><b>%s</b><br/><br/>È corretto o vuoi modificare il numero?]]></string>
+  <string name="not_a_valid_phone_number">%s non è un numero di telefono valido.</string>
+  <string name="please_enter_your_phone_number">Inserisci il tuo numero di telefono:</string>
+  <string name="search_countries">Cerca nazioni</string>
+  <string name="verify_x">Verifica %s</string>
+  <string name="we_have_sent_you_an_sms_to_x"><![CDATA[Ti abbiamo inviato un SMS a <b>%s</b>.]]></string>
+  <string name="we_have_sent_you_another_sms">Ti abbiamo inviato un altro SMS con un codice di 6 cifre.</string>
+  <string name="please_enter_pin_below">Inserisci il pin di 6 cifre qua sotto.</string>
+  <string name="resend_sms">Reinvia SMS</string>
+  <string name="resend_sms_in">Reinvia SMS (%s)</string>
+  <string name="wait_x">Attendere prego (%s)</string>
+  <string name="back">indietro</string>
+  <string name="possible_pin">Possibile pin incollato automaticamente dagli appunti.</string>
+  <string name="please_enter_pin">Inserisci il pin di 6 cifre.</string>
+  <string name="abort_registration_procedure">Sei sicuro di voler annullare la procedura di registrazione?</string>
+  <string name="yes">Sì</string>
+  <string name="no">No</string>
+  <string name="verifying">Verifica…</string>
+  <string name="requesting_sms">Richiesta SMS…</string>
+  <string name="incorrect_pin">Il pin che hai inserito è sbagliato.</string>
+  <string name="pin_expired">Il pin che ti abbiamo inviato è scaduto.</string>
+  <string name="unknown_api_error_network">Errore di rete sconosciuto.</string>
+  <string name="unknown_api_error_response">Risposta dal server sconosciuta.</string>
+  <string name="unable_to_connect_to_server">Impossibile connettersi al server.</string>
+  <string name="unable_to_establish_secure_connection">Impossibile stabilire una connessione sicura.</string>
+  <string name="unable_to_find_server">Impossibile trovare il server.</string>
+  <string name="something_went_wrong_processing_your_request">Qualcosa è andato storto elaborando la tua richiesta.</string>
+  <string name="invalid_user_input">Input utente non valido</string>
+  <string name="temporarily_unavailable">Temporaneamente non disponibile. Riprova più tardi.</string>
+  <string name="no_network_connection">Nessuna connessione di rete.</string>
+  <string name="try_again_in_x">Riprova in %s</string>
+  <string name="too_many_attempts">Troppi tentativi</string>
+  <string name="the_app_is_out_of_date">Stai usando una versione obsoleta di questa app.</string>
+  <string name="update">Aggiorna</string>
+  <string name="logged_in_with_another_device">Questo numero di telefono è attualmente connesso con un altro dispositivo.</string>
+  <string name="enter_your_name_instructions">Inserisci il tuo nome per far sapere chi sei alle persone che non ti hanno nelle loro rubriche.</string>
+  <string name="your_name">Il tuo nome</string>
+  <string name="enter_your_name">Inserisci il tuo nome</string>
+  <string name="no_name_set_instructions">Usa il pulsante modifica per impostare il tuo nome.</string>
+  <string name="reject_request">Rifiuta la richiesta</string>
 </resources>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 1bea1d59c..1a5b63e34 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">הגדרות</string>
   <string name="action_add">שיחה חדשה</string>
   <string name="action_accounts">נהל חשבונות</string>
-  <string name="action_end_conversation">סיים שיחה זו</string>
   <string name="action_contact_details">פרטי איש קשר</string>
   <string name="action_secure">דיון מאובטח</string>
   <string name="action_add_account">הוסף חשבון</string>
@@ -65,7 +64,6 @@
   <string name="preparing_image">מכין תמונה לשליחה</string>
   <string name="action_clear_history">נקה היסטוריה</string>
   <string name="clear_conversation_history">נקה היסטוריית שיחה</string>
-  <string name="also_end_conversation">סיים את השיחה לאחר מכן</string>
   <string name="send_unencrypted_message">שלח הודעה בלתי מוצפנת</string>
   <string name="send_omemo_message">של הודעה בהצפנת OMEMO</string>
   <string name="send_pgp_message">שלח הודעה בהצפנת OpenPGP</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index fab7463cc..ef666366a 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -3,7 +3,7 @@
   <string name="action_settings">設定</string>
   <string name="action_add">新しい会話</string>
   <string name="action_accounts">アカウントの管理</string>
-  <string name="action_end_conversation">この会話を終了</string>
+  <string name="action_account">アカウントの管理</string>
   <string name="action_contact_details">連絡先の詳細</string>
   <string name="action_muc_details">談話室の詳細</string>
   <string name="action_secure">安全に会話</string>
@@ -20,6 +20,8 @@
   <string name="title_activity_sharewith">会話で共有</string>
   <string name="title_activity_start_conversation">会話の開始</string>
   <string name="title_activity_choose_contact">連絡先を選択</string>
+  <string name="title_activity_choose_contacts">連絡先の選択</string>
+  <string name="title_activity_share_via_account">アカウントで共有</string>
   <string name="title_activity_block_list">ブロックリスト</string>
   <string name="just_now">ちょうど今</string>
   <string name="minute_ago">1 分前</string>
@@ -41,6 +43,7 @@
   <string name="block_domain_text">%s からの連絡をすべてブロックしますか?</string>
   <string name="unblock_domain_text">%s からの連絡をすべてブロック解除しますか?</string>
   <string name="contact_blocked">連絡先をブロックしました</string>
+  <string name="blocked">ブロックしました</string>
   <string name="remove_bookmark_text">ブックマークとして %s を削除しますか? このブックマークに関連した会話は削除されません。</string>
   <string name="register_account">サーバーに新しいアカウントを登録</string>
   <string name="change_password_on_server">サーバーのパスワードを変更</string>
@@ -74,7 +77,7 @@
   <string name="sharing_files_please_wait">フィルを共有しています。しばらくお待ちください…</string>
   <string name="action_clear_history">履歴をクリア</string>
   <string name="clear_conversation_history">会話履歴をクリア</string>
-  <string name="also_end_conversation">その後、この会話を終了</string>
+  <string name="delete_file_dialog">ファイルを削除</string>
   <string name="choose_presence">デバイスを選択</string>
   <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
   <string name="send_message">メッセージを送信</string>
@@ -631,4 +634,10 @@
   <string name="gif">GIF</string>
   <string name="copy_link">ウェブアドレスをコピー</string>
   <string name="copy_jabber_id">Jabber ID をコピー</string>
+  <string name="yes">はい</string>
+  <string name="no">いいえ</string>
+  <string name="verifying">検証しています…</string>
+  <string name="requesting_sms">SMSを要求しています…</string>
+  <string name="something_went_wrong_processing_your_request">要求の処理中に、何か問題が発生しました。</string>
+  <string name="reject_request">要求を拒否</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 171186d99..30e4ef84b 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">설정</string>
   <string name="action_add">새 대화</string>
   <string name="action_accounts">계정 </string>
-  <string name="action_end_conversation">이 대화 </string>
   <string name="action_contact_details">연락처 정보</string>
   <string name="action_secure">안전한 대화 </string>
   <string name="action_add_account">계정 추가 </string>
@@ -68,7 +67,6 @@
   <string name="sharing_files_please_wait">파일을 공유중입니다. 기다리세요...</string>
   <string name="action_clear_history">기록 삭제 </string>
   <string name="clear_conversation_history">대화 기록 삭제 </string>
-  <string name="also_end_conversation">나중에 이 대화 끝내기 </string>
   <string name="choose_presence">기기 선택</string>
   <string name="send_unencrypted_message">암호화하지 않은 메세지 전송</string>
   <string name="send_message_to_x">%s 에게 매세지 보내기 </string>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index f70415dc5..f213285d6 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Innstillinger</string>
   <string name="action_add">Ny samtale</string>
   <string name="action_accounts">Kontobehandling</string>
-  <string name="action_end_conversation">Avslutt denne samtalen</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
   <string name="action_muc_details">Gruppesludringsdetaljer</string>
   <string name="action_secure">Sikret samtale</string>
@@ -74,7 +73,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="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>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index edfbf1c40..fae341105 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -4,7 +4,6 @@
   <string name="action_add">Nieuw gesprek</string>
   <string name="action_accounts">Accounts beheren</string>
   <string name="action_account">Account beheren</string>
-  <string name="action_end_conversation">Gesprek beëindigen</string>
   <string name="action_contact_details">Contactgegevens</string>
   <string name="action_muc_details">Gespreksgegevens</string>
   <string name="action_secure">Beveiligd gesprek</string>
@@ -81,7 +80,6 @@
   <string name="clear_histor_msg">Weet je zeker dat je alle berichten in dit gesprek wil verwijderen?\n\n<b>Waarschuwing:</b> Dit zal kopieën van deze berichten die opgeslagen zijn op andere apparaten of servers niet verwijderen.</string>
   <string name="delete_file_dialog">Bestand verwijderen</string>
   <string name="delete_file_dialog_msg">Weet je zeker dat je dit bestand wil verwijderen?\n\n<b>Waarschuwing:</b> Dit zal kopieën van dit bericht die opgeslagen zijn op andere apparaten of servers niet 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>
   <string name="send_message">Verstuur bericht</string>
@@ -300,6 +298,8 @@
   <string name="send_again">Opnieuw versturen</string>
   <string name="file_url">Bestands-URL</string>
   <string name="url_copied_to_clipboard">URL gekopieerd naar klembord</string>
+  <string name="jabber_id_copied_to_clipboard">Jabber-ID gekopieerd naar klembord</string>
+  <string name="error_message_copied_to_clipboard">Foutmelding gekopieerd naar klembord</string>
   <string name="web_address">webadres</string>
   <string name="scan_qr_code">2D-streepjescode scannen</string>
   <string name="show_qr_code">2D-streepjescode tonen</string>
@@ -750,6 +750,8 @@
   <string name="choose_a_country">Kies een land</string>
   <string name="phone_number">telefoonnummer</string>
   <string name="verify_your_phone_number">Verifieer je telefoonnummer</string>
+  <string name="enter_country_code_and_phone_number">Quicksy zal een sms sturen om je telefoonnummer te bevestigen. Voer je landcode en telefoonnummer in:</string>
+  <string name="we_will_be_verifying"><![CDATA[We gaan het volgende telefoonnummer verifiëren:<br/><br/><b>%s</b><br/><br/>Is dit oké, of wil je het nummer bewerken?]]></string>
   <string name="not_a_valid_phone_number">%s is geen geldig telefoonnummer.</string>
   <string name="please_enter_your_phone_number">Voer je telefoonnummer in.</string>
   <string name="search_countries">Landen doorzoeken</string>
@@ -789,4 +791,5 @@
   <string name="your_name">Je naam</string>
   <string name="enter_your_name">Voer je naam in</string>
   <string name="no_name_set_instructions">Gebruik de knop \'bewerken\' op je naam in te stellen.</string>
+  <string name="reject_request">Verzoek afwijzen</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index a08f8f42f..f2c894718 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -3,7 +3,7 @@
   <string name="action_settings">Ustawienia</string>
   <string name="action_add">Nowa konwersacja</string>
   <string name="action_accounts">Zarządzaj kontami</string>
-  <string name="action_end_conversation">Zakończ konwersację</string>
+  <string name="action_account">Zarządzaj kontem</string>
   <string name="action_contact_details">Szczegóły kontaktu</string>
   <string name="action_muc_details">Szczegóły konferencji</string>
   <string name="action_secure">Konwersacja szyfrowana</string>
@@ -80,7 +80,6 @@
   <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_file_dialog">Usuń plik</string>
   <string name="delete_file_dialog_msg">Czy na pewno usunąć ten plik?\n\n<b>Uwaga:</b> Działanie nie wpływa na kopie pliku przechowywane na innych urządzeniach lub serwerach.</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>
   <string name="send_message">Wyślij wiadomość</string>
@@ -267,6 +266,7 @@
   <string name="pref_allow_message_correction_summary">Pozwól swoim kontaktom poprawiać wiadomości</string>
   <string name="pref_expert_options">Ustawienia zaawansowane</string>
   <string name="pref_expert_options_summary">Modyfikuj ustawienia ostrożnie</string>
+  <string name="title_activity_about_x">O %s</string>
   <string name="title_pref_quiet_hours">Godziny ciszy</string>
   <string name="title_pref_quiet_hours_start_time">Początek</string>
   <string name="title_pref_quiet_hours_end_time">Koniec</string>
@@ -298,6 +298,8 @@
   <string name="send_again">Wyślij ponownie</string>
   <string name="file_url">URL pliku</string>
   <string name="url_copied_to_clipboard">Skopiowano URL do schowka</string>
+  <string name="jabber_id_copied_to_clipboard">Skopiowano Jabber ID do schowka</string>
+  <string name="error_message_copied_to_clipboard">Skopiowano komunikat błędu do schowka</string>
   <string name="web_address">adres URL</string>
   <string name="scan_qr_code">Zeskanuj kod</string>
   <string name="show_qr_code">Pokaż kod QR</string>
@@ -761,4 +763,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="video_720p">Wysoka (720p)</string>
   <string name="cancelled">anulowane</string>
   <string name="already_drafting_message">Już tworzysz nową wiadomość.</string>
+  <string name="yes">Tak</string>
+  <string name="no">Nie</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 696c0a7cb..78daf533c 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Configurações</string>
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Gerenciar contas</string>
-  <string name="action_end_conversation">Encerrar essa conversa</string>
   <string name="action_contact_details">Detalhes do contato</string>
   <string name="action_muc_details">Detalhes da conversa em grupo</string>
   <string name="action_secure">Conversa segura</string>
@@ -80,7 +79,6 @@
   <string name="clear_histor_msg">Deseja realmente excluir todas as mensagens dessa conversa?\n\n<b>Atenção:</b> Isso não excluirá cópias dessas mensagens armazenadas em outros dispositivos ou servidores.</string>
   <string name="delete_file_dialog">Excluir arquivo</string>
   <string name="delete_file_dialog_msg">Deseja realmente excluir este arquivo?\n\n<b>Atenção:</b> Isso não excluirá cópias deste arquivo armazenadas em outros dispositivos ou servidores.</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>
   <string name="send_message">Enviar mensagem</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 5b5704542..9748873ea 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Definições</string>
   <string name="action_add">Nova conversa</string>
   <string name="action_accounts">Gerir contas</string>
-  <string name="action_end_conversation">Finalizar essa conversa</string>
   <string name="action_contact_details">Detalhes do contacto</string>
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Adicionar conta</string>
@@ -75,7 +74,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="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>
   <string name="send_message">Enviar mensagem</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 0c149ea93..5133ffa8b 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -300,6 +300,8 @@
   <string name="send_again">Trimite din nou</string>
   <string name="file_url">Adresă fișier</string>
   <string name="url_copied_to_clipboard">Adresă copiată în memorie</string>
+  <string name="jabber_id_copied_to_clipboard">Adresă ID Jabber copiată în memorie</string>
+  <string name="error_message_copied_to_clipboard">Mesaj de eroare copiat în memorie</string>
   <string name="web_address">adresă web</string>
   <string name="scan_qr_code">Scanează cod de bare 2D</string>
   <string name="show_qr_code">Arată cod de bare 2D</string>
@@ -804,4 +806,5 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="your_name">Numele dumneavoastă</string>
   <string name="enter_your_name">Introducețivä numele</string>
   <string name="no_name_set_instructions">Folosiți butonul de editare pentru a vă seta numele.</string>
+  <string name="reject_request">Refuză cererea</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index a635b6f3f..90afa1c38 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Настройки</string>
   <string name="action_add">Новая беседа</string>
   <string name="action_accounts">Управление аккаунтами</string>
-  <string name="action_end_conversation">Закончить текущую беседу</string>
   <string name="action_contact_details">Сведения о контакте</string>
   <string name="action_muc_details">Подробности конференции</string>
   <string name="action_secure">Защищённая беседа</string>
@@ -79,7 +78,6 @@
   <string name="clear_histor_msg">Вы хотите удалить все сообщения в этой беседе?\n\n<b>Предупреждение:</b> Данная операция не повлияет на сообщения, хранящиеся на других устройствах или серверах.</string>
   <string name="delete_file_dialog">Удалить файл</string>
   <string name="delete_file_dialog_msg">Вы уверены, что хотите удалить этот файл?\n\n<b>Предупреждение:</b> Данная операция не удалит копии этого файла, хранящиеся на других устройствах или серверах.</string>
-  <string name="also_end_conversation">Закончить эту беседу впоследствии</string>
   <string name="choose_presence">Выберите устройство</string>
   <string name="send_unencrypted_message">Нешифрованное сообщение</string>
   <string name="send_message">Сообщение</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 40f1dc82a..f32bef53f 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Nastavenia</string>
   <string name="action_add">Nová konverzácia</string>
   <string name="action_accounts">Nastavenie účtov</string>
-  <string name="action_end_conversation">Ukončiť túto konverzáciu</string>
   <string name="action_contact_details">Detaily kontaktu</string>
   <string name="action_secure">Zabezpečená konverzácia</string>
   <string name="action_add_account">Pridať účet</string>
@@ -63,7 +62,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="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>
   <string name="send_pgp_message">Poslať OpenPGP šifrovanú správu</string>
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 02077f275..0a328a316 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Поставке</string>
   <string name="action_add">Нова преписка</string>
   <string name="action_accounts">Управљај налозима</string>
-  <string name="action_end_conversation">Окончај преписку</string>
   <string name="action_contact_details">Детаљи контакта</string>
   <string name="action_muc_details">Детаљи групног ћаскања</string>
   <string name="action_secure">Безбедна преписка</string>
@@ -77,7 +76,6 @@
   <string name="sharing_files_please_wait">Делим фајлове, сачекајте…</string>
   <string name="action_clear_history">Очисти историјат</string>
   <string name="clear_conversation_history">Брисање историјата преписки</string>
-  <string name="also_end_conversation">Окончај ову преписку након тога</string>
   <string name="choose_presence">Изаберите уређај</string>
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
   <string name="send_message">Пошаљи поруку</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 9b7977f9f..155be4ef2 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Inställningar</string>
   <string name="action_add">Ny konversation</string>
   <string name="action_accounts">Kontoinställningar</string>
-  <string name="action_end_conversation">Avsluta denna konversation</string>
   <string name="action_contact_details">Kontaktdetaljer</string>
   <string name="action_secure">Säker konversation</string>
   <string name="action_add_account">Lägg till konto</string>
@@ -68,7 +67,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="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>
   <string name="send_message">Skicka meddelande</string>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index 29c1ffcb5..54bb812ad 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Ayarlar</string>
   <string name="action_add">Yeni konuşma</string>
   <string name="action_accounts">Hesapları yönet</string>
-  <string name="action_end_conversation">Konuşmayı sonlandır</string>
   <string name="action_contact_details">Kişi bilgileri</string>
   <string name="action_secure">Güvenli konuşma</string>
   <string name="action_add_account">Hesap ekle</string>
@@ -68,7 +67,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="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>
   <string name="send_message_to_x">%s kişisine ileti gönder</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index dcb22ae82..70faf6eab 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Налаштування</string>
   <string name="action_add">Нова розмова</string>
   <string name="action_accounts">Впорядкувати облікові записи</string>
-  <string name="action_end_conversation">Завершити цю розмову</string>
   <string name="action_contact_details">Деталі контакту</string>
   <string name="action_secure">Захищена розмова</string>
   <string name="action_add_account">Додати обліковий запис</string>
@@ -68,7 +67,6 @@
   <string name="sharing_files_please_wait">Поширюю файли. Зачекайте, будь ласка…</string>
   <string name="action_clear_history">Очистити історію</string>
   <string name="clear_conversation_history">Очистити історію розмов</string>
-  <string name="also_end_conversation">Завершити цю розмову опісля</string>
   <string name="choose_presence">Вибрати пристрій</string>
   <string name="send_unencrypted_message">Відправити незашифроване повідомлення</string>
   <string name="send_message">Відправити повідомленн</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index e59a2a1dc..aa1c1ab56 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">Cài đặt</string>
   <string name="action_add">Hội thoại mới</string>
   <string name="action_accounts">Quản lý tài khoản</string>
-  <string name="action_end_conversation">Kết thúc hội thoại</string>
   <string name="action_contact_details">Thông tin liên hệ</string>
   <string name="action_secure">Bảo mật hội thoại</string>
   <string name="action_add_account">Thêm tài khoản</string>
@@ -68,7 +67,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="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>
   <string name="send_message_to_x">Gửi tin nhắn đến %s</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 89a8dafa1..6ebade551 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">设置</string>
   <string name="action_add">新会话</string>
   <string name="action_accounts">管理账户</string>
-  <string name="action_end_conversation">结束会话</string>
   <string name="action_contact_details">联系人详情</string>
   <string name="action_muc_details">群聊详情</string>
   <string name="action_secure">安全对话</string>
@@ -79,7 +78,6 @@
   <string name="clear_conversation_history">清除会话记录</string>
   <string name="clear_histor_msg">您确定要删除此对话中的所有消息吗？\n\n<b>警告：</b>这不会删除存储在其他设备或服务器上的那些消息的副本。</string>
   <string name="delete_file_dialog">删除文件</string>
-  <string name="also_end_conversation">之后结束此会话</string>
   <string name="choose_presence">选择设备</string>
   <string name="send_unencrypted_message">发送未加密的信息</string>
   <string name="send_message">发送信息</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 322def109..5b8c733ee 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -3,7 +3,6 @@
   <string name="action_settings">設定</string>
   <string name="action_add">新對話</string>
   <string name="action_accounts">管理帳戶</string>
-  <string name="action_end_conversation">結束對話</string>
   <string name="action_contact_details">聯絡人詳情</string>
   <string name="action_secure">安全對話</string>
   <string name="action_add_account">新增帳戶</string>
@@ -68,7 +67,6 @@
   <string name="sharing_files_please_wait">正在分享檔案中，請稍候…</string>
   <string name="action_clear_history">清除歷史記錄</string>
   <string name="clear_conversation_history">清除會話記錄</string>
-  <string name="also_end_conversation">結束此會話以後</string>
   <string name="choose_presence">選擇設備</string>
   <string name="send_unencrypted_message">發送未加密的訊息</string>
   <string name="send_message">送訊息</string>