diff --git a/fastlane/metadata/android/uk/changelogs/4210404.txt b/fastlane/metadata/android/uk/changelogs/4210404.txt
new file mode 100644
index 000000000..05688d8e9
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Виправлення голосових та відеовикликів на Android 8
+* Виправлення проблем у новій інтеграції дзвінків
+* Виправлення проблем зі стисненням відео
diff --git a/fastlane/metadata/android/uk/changelogs/4210504.txt b/fastlane/metadata/android/uk/changelogs/4210504.txt
new file mode 100644
index 000000000..653536f7a
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Відновлено доступ до пошуку каналів на Android 6+7
+* Покращено ведення журналу для невдалої інтеграції викликів
diff --git a/src/conversations/fastlane/metadata/android/ru-RU/full_description.txt b/src/conversations/fastlane/metadata/android/ru-RU/full_description.txt
index 913bf4482..77c8edbb9 100644
--- a/src/conversations/fastlane/metadata/android/ru-RU/full_description.txt
+++ b/src/conversations/fastlane/metadata/android/ru-RU/full_description.txt
@@ -20,9 +20,7 @@
 * Несколько учетных записей / единый почтовый ящик
 * Очень низкое влияние на время работы от батареи
 
-Conversations позволяет очень легко создать учетную запись на бесплатном сервере conversations.im.
-Однако Conversations также будет работать с любым другим сервером XMPP.
-Многие XMPP серверы управляются добровольцами и предоставляются бесплатно.
+Conversations позволяет очень легко создать учетную запись на бесплатном сервере conversations.im. Однако Conversations также будет работать с любым другим сервером XMPP. Многие XMPP серверы управляются добровольцами и предоставляются бесплатно.
 
 Возможности XMPP:
 
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 05ca80c2a..b17a2ff35 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -26,8 +26,8 @@
     <string name="minute_ago">vor einer Minute</string>
     <string name="minutes_ago">vor %d Minuten</string>
     <plurals name="x_unread_conversations">
-        <item quantity="one">%d ungelesene Unterhaltung</item>
-        <item quantity="other">%d ungelesene Unterhaltungen</item>
+        <item quantity="one">%d ungelesener Chat</item>
+        <item quantity="other">%d ungelesene Chats</item>
     </plurals>
     <string name="sending">senden…</string>
     <string name="message_decrypting">Nachricht wird entschlüsselt. Bitte warten…</string>
@@ -39,7 +39,7 @@
     <string name="moderator">Moderator</string>
     <string name="participant">Teilnehmer</string>
     <string name="visitor">Besucher</string>
-    <string name="remove_contact_text">Möchtest du %s von deiner Kontaktliste entfernen? Unterhaltungen mit diesem Kontakt werden dabei nicht entfernt.</string>
+    <string name="remove_contact_text">Möchtest du %s von deiner Kontaktliste entfernen? Der Chat mit diesem Kontakt werden dabei nicht entfernt.</string>
     <string name="block_contact_text">Möchtest du %s sperren und keine Nachrichten mehr erhalten?</string>
     <string name="unblock_contact_text">Möchtest du %s entsperren und wieder Nachrichten empfangen?</string>
     <string name="block_domain_text">Alle Kontakte von %s sperren?</string>
@@ -77,7 +77,7 @@
     <string name="preparing_images">Vorbereitung zum Senden der Bilder</string>
     <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_conversation_history">Chatverlauf 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>
@@ -178,7 +178,7 @@
     <string name="unpublish_pgp_message">Bist du sicher, dass du deinen öffentlichen OpenPGP-Schlüssel aus deiner Anwesenheitsmitteilung entfernen möchtest?\nDeine Kontakte können dir dann keine OpenPGP-verschlüsselten Nachrichten senden.</string>
     <string name="openpgp_has_been_published">Öffentlicher OpenPGP-Schlüssel veröffentlicht.</string>
     <string name="mgmt_account_enable">Konto aktivieren </string>
-    <string name="mgmt_account_delete_confirm_text">Bist du sicher, dass du dein Konto möchtest? Dies wird deinen gesamten Gesprächsverlauf entfernen</string>
+    <string name="mgmt_account_delete_confirm_text">Bist du sicher, dass du dein Konto möchtest? Dies wird deinen gesamten Chatverlauf entfernen</string>
     <string name="attach_record_voice">Sprache aufzeichnen</string>
     <string name="account_settings_jabber_id">XMPP-Adresse</string>
     <string name="block_jabber_id">XMPP-Adresse sperren</string>
@@ -695,14 +695,14 @@
     <string name="error_trustkey_device_list">Geräteliste konnte nicht abgerufen werden</string>
     <string name="error_trustkey_bundle">Verschlüsselungsschlüssel konnte nicht abgerufen werden</string>
     <string name="error_trustkey_hint_mutual">Tipp: In manchen Fällen kann dies behoben werden, indem man sich gegenseitig zu den Kontaktlisten hinzufügt.</string>
-    <string name="disable_encryption_message">Bist du sicher, dass du die OMEMO-Verschlüsselung für dieses Gespräch deaktivieren möchtest?
+    <string name="disable_encryption_message">Bist du sicher, dass du die OMEMO-Verschlüsselung für diesen Chat deaktivieren möchtest?
 \nDies wird es deinem Serveradministrator ermöglichen, deine Nachrichten zu lesen, aber es könnte die einzige Möglichkeit sein, mit Personen zu kommunizieren, die veraltete Clients verwenden.</string>
     <string name="disable_now">Jetzt deaktivieren</string>
     <string name="draft">Entwurf:</string>
     <string name="pref_omemo_setting">OMEMO-Verschlüsselung</string>
     <string name="pref_omemo_setting_summary_always">OMEMO wird immer für persönliche Unterhaltungen und private Gruppenchats verwendet.</string>
-    <string name="pref_omemo_setting_summary_default_on">OMEMO wird standardmäßig für neue Unterhaltungen verwendet.</string>
-    <string name="pref_omemo_setting_summary_default_off">OMEMO muss für neue Unterhaltungen explizit eingeschaltet werden.</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO wird standardmäßig für neue Chats verwendet.</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO muss für neue Chats explizit eingeschaltet werden.</string>
     <string name="create_shortcut">Verknüpfung erstellen</string>
     <string name="default_on">Standardmäßig eingeschaltet</string>
     <string name="default_off">Standardmäßig ausgeschaltet</string>
@@ -723,14 +723,14 @@
     <string name="no_microphone_permission">%1$s den Zugriff auf das Mikrofon gewähren</string>
     <string name="search_messages">Nachrichten durchsuchen</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">Unterhaltung anzeigen</string>
+    <string name="view_conversation">Chat anzeigen</string>
     <string name="pref_use_share_location_plugin"> Plugin zum Standort teilen</string>
     <string name="pref_use_share_location_plugin_summary">Verwende das Plugin zum Teilen des Standorts anstatt der integrierten Karte</string>
     <string name="copy_link">Internetadresse kopieren</string>
     <string name="copy_jabber_id">XMPP-Adresse kopieren</string>
     <string name="p1_s3_filetransfer">HTTP-Dateifreigabe für S3</string>
     <string name="pref_start_search">Direkte Suche </string>
-    <string name="pref_start_search_summary">Beim Dialog \'Unterhaltung beginnen\' Tastatur öffnen und den Cursor im Suchfeld platzieren</string>
+    <string name="pref_start_search_summary">Beim Dialog \'Chat beginnen\' Tastatur öffnen und den Cursor im Suchfeld platzieren</string>
     <string name="group_chat_avatar">Gruppenchat-Profilbild</string>
     <string name="host_does_not_support_group_chat_avatars">Host unterstützt keine Gruppenchat-Profilbilder</string>
     <string name="only_the_owner_can_change_group_chat_avatar">Nur der Eigentümer kann das Gruppenchat-Profilbild ändern</string>
@@ -941,8 +941,8 @@
     <string name="remove_from_favorites">Von oben ablösen</string>
     <string name="gpx_track">GPX-Strecke</string>
     <string name="could_not_correct_message">Nachricht konnte nicht korrigiert werden</string>
-    <string name="search_all_conversations">Alle Unterhaltungen</string>
-    <string name="search_this_conversation">Diese Unterhaltung</string>
+    <string name="search_all_conversations">Alle Chats</string>
+    <string name="search_this_conversation">Dieser Chat</string>
     <string name="your_avatar">Dein Profilbild</string>
     <string name="avatar_for_x">Profilbild für %s</string>
     <string name="encrypted_with_omemo">Verschlüsselt mit OMEMO</string>
@@ -1012,8 +1012,8 @@
     <string name="call_integration_not_available">Anrufintegration nicht verfügbar!</string>
     <string name="no_permission_to_place_call">Keine Berechtigung für Telefonanrufe</string>
     <string name="rtp_state_contact_offline">Kontakt ist nicht verfügbar</string>
-    <string name="remove_bookmark_and_close">Möchtest du das Lesezeichen für %s entfernen und die Unterhaltung schließen?</string>
-    <string name="delete_and_close">Löschen &amp; Schließen</string>
+    <string name="remove_bookmark_and_close">Möchtest du das Lesezeichen für %s entfernen und den Chat archivieren?</string>
+    <string name="delete_and_close">Chat löschen &amp; archivieren</string>
     <string name="remove_bookmark">Willst du das Lesezeichen für %s entfernen?</string>
     <string name="title_activity_share_with">Teilen mit…</string>
     <string name="pref_use_colorful_bubbles_summary">Farbige Chatblasen helfen, gesendete und empfangene Nachrichten zu unterscheiden</string>
@@ -1022,4 +1022,12 @@
     <string name="pref_dynamic_colors_summary">Systemfarben (Material You)</string>
     <string name="start_chat">Chat starten</string>
     <string name="no_certificate_selected">Kein Client-Zertifikat ausgewählt!</string>
+    <string name="title_activity_new_chat">Neuer Chat</string>
+    <string name="archive_this_chat">Diesen Chat archivieren</string>
+    <string name="corresponding_chats_closed">Entsprechende Chats werden archiviert.</string>
+    <string name="switch_to_chat">Zum Chat wechseln</string>
+    <string name="action_archive_chat">Chat archivieren</string>
+    <string name="welcome_header">Nimm an der Unterhaltung teil</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">Der Barcode enthält keine Fingerabdrücke für diesen Chat.</string>
+    <string name="title_undo_swipe_out_chat">Chat archiviert</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index f13d10e3d..5c727681f 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -4,7 +4,7 @@
     <string name="action_accounts">Xestionar contas</string>
     <string name="action_account">Xestionar conta</string>
     <string name="action_contact_details">Detalles do contacto</string>
-    <string name="action_muc_details">Detalles da conversa de grupo</string>
+    <string name="action_muc_details">Detalles do chat en grupo</string>
     <string name="channel_details">Detalles da canle</string>
     <string name="action_add_account">Engadir conta</string>
     <string name="action_edit_contact">Editar contacto</string>
@@ -26,8 +26,8 @@
     <string name="minute_ago">Hai 1 min</string>
     <string name="minutes_ago">hai %d minutos</string>
     <plurals name="x_unread_conversations">
-        <item quantity="one">%d conversa sen ler</item>
-        <item quantity="other">%d conversas sen ler</item>
+        <item quantity="one">%d chat sen ler</item>
+        <item quantity="other">%d chats sen ler</item>
     </plurals>
     <string name="sending">enviando…</string>
     <string name="message_decrypting">Descifrando a mensaxe. Agarda por favor…</string>
@@ -39,7 +39,7 @@
     <string name="moderator">Moderador</string>
     <string name="participant">Participante</string>
     <string name="visitor">Visitante</string>
-    <string name="remove_contact_text">Desexas eliminar a %s da túa lista de contactos? As conversas con este contacto non se eliminarán.</string>
+    <string name="remove_contact_text">Desexas eliminar a %s da túa lista de contactos? O chat con este contacto non se eliminará.</string>
     <string name="block_contact_text">Queres evitar que %s che envíe mensaxes?</string>
     <string name="unblock_contact_text">Queres desbloquear a %s e permitirlle que che envíe mensaxes?</string>
     <string name="block_domain_text">Bloquear todos os contactos desde 1%s?</string>
@@ -77,8 +77,8 @@
     <string name="preparing_images">Preparándose para enviar imaxes</string>
     <string name="sharing_files_please_wait">Compartindo ficheiros. Agarda…</string>
     <string name="action_clear_history">Baleirar historial</string>
-    <string name="clear_conversation_history">Eliminar historial da conversa</string>
-    <string name="clear_histor_msg">¿Queres eliminar tódalas mensaxes desta conversa? 
+    <string name="clear_conversation_history">Limpar historial do chat</string>
+    <string name="clear_histor_msg">¿Queres eliminar tódalas mensaxes deste chat? 
 \n 
 \n<b>Aviso:</b> Esto non lle afecta ás mensaxes gardadas noutros dispositivos ou servidores.</string>
     <string name="delete_file_dialog">Eliminar ficheiro</string>
@@ -180,7 +180,7 @@
     <string name="unpublish_pgp_message">Tes a certeza de que queres eliminar a túa chave pública OpenPGP do  anuncio de presenza? \nOs teus contactos non poderán enviarche mensaxes cifradas con OpenPGP.</string>
     <string name="openpgp_has_been_published">Publicada a chave pública OpenPGP.</string>
     <string name="mgmt_account_enable">Habilitar</string>
-    <string name="mgmt_account_delete_confirm_text">Tes a certeza de querer eliminar a túa conta? Ao eliminar a conta eliminas todo o historial de conversas</string>
+    <string name="mgmt_account_delete_confirm_text">Tes a certeza de querer eliminar a túa conta? Ao eliminar a conta eliminas todo o historial de chat</string>
     <string name="attach_record_voice">Gravar audio</string>
     <string name="account_settings_jabber_id">Enderezo XMPP</string>
     <string name="block_jabber_id">Bloquear enderezo XMPP</string>
@@ -236,15 +236,17 @@
     <string name="channel_bare_jid_example">canle@sala.exemplo.com</string>
     <string name="save_as_bookmark">Gardar como marcador</string>
     <string name="delete_bookmark">Eliminar marcador</string>
-    <string name="destroy_room">Destruír a conversa en grupo</string>
+    <string name="destroy_room">Destruír o chat en grupo</string>
     <string name="destroy_channel">Eliminar canle</string>
-    <string name="destroy_room_dialog">Tes a certeza de querer destruír esta conversa en grupo?\n\n<b>Aviso:</b> A conversa en grupo será totalmente eliminada do servidor.</string>
+    <string name="destroy_room_dialog">Tes a certeza de querer destruír esta conversa en grupo?
+\n
+\n<b>Aviso:</b> O chat en grupo será totalmente eliminado do servidor.</string>
     <string name="destroy_channel_dialog">Tes a certeza de querer eliminar a canle?\n\n<b>Aviso:</b> A canle será eliminada completamente do servidor.</string>
-    <string name="could_not_destroy_room">Non se desfixo a conversa en grupo</string>
+    <string name="could_not_destroy_room">Non se puido eliminar o chat en grupo</string>
     <string name="could_not_destroy_channel">Non se puido eliminar a canle</string>
-    <string name="action_edit_subject">Editar o tema da conversa en grupo</string>
+    <string name="action_edit_subject">Editar o tema do chat en grupo</string>
     <string name="topic">Tema</string>
-    <string name="joining_conference">Entrando na conversa en grupo…</string>
+    <string name="joining_conference">Entrando no chat en grupo…</string>
     <string name="leave">Saír</string>
     <string name="contact_added_you">Contacto engadido a túa lista de contactos</string>
     <string name="add_back">Volver a engadir</string>
@@ -270,7 +272,7 @@
     <string name="skip">Omitir</string>
     <string name="disable_notifications">Desactivar notificacións</string>
     <string name="enable">Habilitar</string>
-    <string name="conference_requires_password">A conversa en grupo require contrasinal</string>
+    <string name="conference_requires_password">O chat en grupo require contrasinal</string>
     <string name="enter_password">Introducir contrasinal</string>
     <string name="request_presence_updates">Primeiro solicita actualizacións de presenza aos contactos.\n\n<small>Esto utilizarase para determinar que aplicación de chat está a utilizar o contacto</small>.</string>
     <string name="request_now">Solicitar agora</string>
@@ -294,10 +296,10 @@
     <string name="conference_banned">Non podes acceder a esta conversa en grupo</string>
     <string name="conference_members_only">Este chat en grupo é so para membros</string>
     <string name="conference_resource_constraint">Restrición do recurso</string>
-    <string name="conference_kicked">Xa foi expulsado de esta conversa en grupo</string>
-    <string name="conference_shutdown">A conversa en grupo foi apagada</string>
-    <string name="conference_unknown_error">Xa non estás nesta conversa en grupo</string>
-    <string name="conference_technical_problems">Deixaches esta conversa en grupo por razóns técnicas</string>
+    <string name="conference_kicked">Expulsáronte de esta conversa en grupo</string>
+    <string name="conference_shutdown">Pechouse o chat en grupo</string>
+    <string name="conference_unknown_error">Xa non estás neste chat en grupo</string>
+    <string name="conference_technical_problems">Saíches de este chat en grupo por razóns técnicas</string>
     <string name="using_account">utilizando a conta %s</string>
     <string name="hosted_on">hospedado en %s</string>
     <string name="checking_x">Comprobando %s no servidor HTTP</string>
@@ -349,8 +351,8 @@
     <string name="pref_show_dynamic_tags">Etiquetas dinámicas</string>
     <string name="pref_show_dynamic_tags_summary">Mostra o estado debaixo do nome do contacto</string>
     <string name="enable_notifications">Habilitar notificacións</string>
-    <string name="no_conference_server_found">Non se atopou ningún servidor de conversa en grupo</string>
-    <string name="conference_creation_failed">Non se puido crear a conversa en grupo</string>
+    <string name="no_conference_server_found">Non se atopou ningún servidor de chat en grupo</string>
+    <string name="conference_creation_failed">Non se puido crear o chat en grupo</string>
     <string name="account_image_description">Avatar da conta</string>
     <string name="copy_omemo_clipboard_description">Copiar impresión OMEMO ao portapapeis</string>
     <string name="regenerate_omemo_key">Rexenerar a chave OMEMO</string>
@@ -382,22 +384,22 @@
     <string name="remove_admin_privileges">Revocar privilexios de administración</string>
     <string name="grant_owner_privileges">Conceder privilexios de propiedade</string>
     <string name="remove_owner_privileges">Retirar privilexios de propiedade</string>
-    <string name="remove_from_room">Eliminar da conversa en grupo</string>
+    <string name="remove_from_room">Eliminar o chat en grupo</string>
     <string name="remove_from_channel">Retirar da canle</string>
     <string name="could_not_change_affiliation">Non se puido mudar a afiliación de %s</string>
-    <string name="ban_from_conference">Prohibición da conversa en grupo</string>
+    <string name="ban_from_conference">Vetar no chat en grupo</string>
     <string name="ban_from_channel">Vetar na canle</string>
     <string name="removing_from_public_conference">Estás a intentar eliminar a %s dunha canle pública. O único xeito de facelo é prohibíndolle o acceso para sempre.</string>
     <string name="ban_now">Rexeitar agora</string>
     <string name="could_not_change_role">Non se puido mudar o rol de %s</string>
-    <string name="conference_options">Configuración do grupo privado de conversa</string>
+    <string name="conference_options">Configuración do chat privado en grupo</string>
     <string name="channel_options">Configuración da canle pública</string>
     <string name="members_only">Privada, só para membros</string>
     <string name="non_anonymous">Facer os enderezos XMPP visibles para calquera</string>
     <string name="moderated">Establecer canle como moderada</string>
     <string name="you_are_not_participating">Non estás a participar</string>
-    <string name="modified_conference_options">¡Opcións da conversa en grupo modificadas!</string>
-    <string name="could_not_modify_conference_options">Non se puideron modificar as opcións da conversa en grupo</string>
+    <string name="modified_conference_options">Opcións do chat en grupo modificadas!</string>
+    <string name="could_not_modify_conference_options">Non se puideron modificar as opcións do chat en grupo</string>
     <string name="never">Nunca</string>
     <string name="until_further_notice">Ate novo aviso</string>
     <string name="snooze">Pospor</string>
@@ -430,7 +432,7 @@
     <string name="show_location">Mostrar localización</string>
     <string name="no_application_found_to_display_location">Non se atopou unha app para mostrar a localización</string>
     <string name="location">Localización</string>
-    <string name="title_undo_swipe_out_group_chat">Deixar o grupo de conversa privada</string>
+    <string name="title_undo_swipe_out_group_chat">Saír do chat en grupo privado</string>
     <string name="title_undo_swipe_out_channel">Deixar a canle pública</string>
     <string name="pref_dont_trust_system_cas_title">Non confiar nas CAs do sistema</string>
     <string name="pref_dont_trust_system_cas_summary">Todos os certificados deberán ser aprobados manualmente</string>
@@ -450,7 +452,7 @@
     <string name="choose_quick_action">Elixe a acción rápida</string>
     <string name="search_contacts">Buscar contactos</string>
     <string name="send_private_message">Enviar mensaxe privada</string>
-    <string name="user_has_left_conference">%1$s deixou a conversa en grupo</string>
+    <string name="user_has_left_conference">%1$s saíu do chat en grupo</string>
     <string name="username">Identificador</string>
     <string name="username_hint">Identificador</string>
     <string name="invalid_username">Este non é un identificador válido</string>
@@ -528,7 +530,7 @@
     <string name="this_field_is_required">Este campo é requerido</string>
     <string name="correct_message">Correxir mensaxe</string>
     <string name="send_corrected_message">Enviar mensaxe correxida</string>
-    <string name="no_keys_just_confirm">Xa confiaches na impresión dixital destas persoas. Ao escoller \"Feito\" estás simplemente confirmando que %s é parte desta conversa en grupo.</string>
+    <string name="no_keys_just_confirm">Xa confiaches na impresión dixital destas persoas. Ao escoller \"Feito\" estás simplemente confirmando que %s é parte deste chat en grupo.</string>
     <string name="this_account_is_disabled">Desactivou esta conta</string>
     <string name="security_error_invalid_file_access">Fallo de seguridade: Acceso non válido ao ficheiro!</string>
     <string name="no_application_to_share_uri">Non se atopou unha app para compartir URI</string>
@@ -553,7 +555,7 @@
     <string name="registration_please_wait">Fallo no rexistro: inténteo de novo</string>
     <string name="registration_password_too_weak">Fallo no rexistro: contrasinal moi feble</string>
     <string name="choose_participants">Escoller participantes</string>
-    <string name="creating_conference">Creando conversa en grupo…</string>
+    <string name="creating_conference">Creando chat en grupo…</string>
     <string name="invite_again">Convidar de novo</string>
     <string name="gp_disable">Desactivar</string>
     <string name="gp_short">Breve</string>
@@ -695,14 +697,14 @@
     <string name="error_trustkey_device_list">Non se obtivo a lista de dispositivos</string>
     <string name="error_trustkey_bundle">Non se obtiveron as chaves da cifraxe</string>
     <string name="error_trustkey_hint_mutual">Suxestión: Nalgúns casos, isto pode solucionarse engadíndovos mutuamente as vosas listas de contactos.</string>
-    <string name="disable_encryption_message">Tes a certeza de querer desactivar a cifraxe OMEMO para esta conversa?
+    <string name="disable_encryption_message">Tes a certeza de querer desactivar a cifraxe OMEMO para este chat?
 \nIsto permitirá á administración do teu servidor ler as túas mensaxes, pero pode ser a única forma de comunicarse con persoas que usan clientes obsoletos.</string>
     <string name="disable_now">Desactivar agora</string>
     <string name="draft">Borrador:</string>
     <string name="pref_omemo_setting">Cifraxe OMEMO</string>
     <string name="pref_omemo_setting_summary_always">OMEMO sempre se utilizará para charlas individuais e privadas en grupo.</string>
-    <string name="pref_omemo_setting_summary_default_on">OMEMO utilizarase por defecto para as novas conversas.</string>
-    <string name="pref_omemo_setting_summary_default_off">OMEMO terá que ser activado explícitamente para novas conversacións.</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO utilizarase por defecto para os novos chats.</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO deberá ser activado explícitamente para os novos chats.</string>
     <string name="create_shortcut">Crear acceso directo</string>
     <string name="default_on">Activado por defecto</string>
     <string name="default_off">Desactivado por defecto</string>
@@ -723,23 +725,23 @@
     <string name="no_microphone_permission">Permitir que %1$s acceda ao micrófono</string>
     <string name="search_messages">Buscar mensaxes</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">Ver conversa</string>
+    <string name="view_conversation">Ver chat</string>
     <string name="pref_use_share_location_plugin">Complemento para Compartir Localización</string>
     <string name="pref_use_share_location_plugin_summary">Utiliza o Complemento para Compartir Localización no lugar do mapa incluído</string>
     <string name="copy_link">Copiar a dirección web</string>
     <string name="copy_jabber_id">Copiar enderezo XMPP</string>
     <string name="p1_s3_filetransfer">Compartición de ficheiro HTTP para S3</string>
     <string name="pref_start_search">Busca directa</string>
-    <string name="pref_start_search_summary">Na pantalla \'Iniciar Conversa\' abrir teclado e pór o cursor no campo de busca</string>
-    <string name="group_chat_avatar">Avatar da conversa de grupo</string>
-    <string name="host_does_not_support_group_chat_avatars">O servidor non soporta o avatar na conversa de grupo</string>
-    <string name="only_the_owner_can_change_group_chat_avatar">Só a propietaria pode cambiar o avatar da conversa</string>
+    <string name="pref_start_search_summary">Na pantalla \'Iniciar chat\' abrir teclado e pór o cursor no campo de busca</string>
+    <string name="group_chat_avatar">Avatar do chat en grupo</string>
+    <string name="host_does_not_support_group_chat_avatars">O servidor non ten soporte para avatar do chat en grupo</string>
+    <string name="only_the_owner_can_change_group_chat_avatar">Só a propietaria pode cambiar o avatar do chat</string>
     <string name="contact_name">Nome do contacto</string>
     <string name="nickname">Alcume</string>
     <string name="group_chat_name">Nome</string>
     <string name="providing_a_name_is_optional">Proporcionar un nome é optativo</string>
-    <string name="create_dialog_group_chat_name">Nome da conversa de grupo</string>
-    <string name="conference_destroyed">Esta conversa de grupo foi destruída</string>
+    <string name="create_dialog_group_chat_name">Nome do chat en grupo</string>
+    <string name="conference_destroyed">Este chat en grupo foi destruído</string>
     <string name="unable_to_save_recording">Non se gardou a gravación</string>
     <string name="foreground_service_channel_name">Servizo en segundo plano</string>
     <string name="foreground_service_channel_description">Esta categoría de notificacións utilízase para mostrar unha notificación permanente indicando que %1$s está a funcionar.</string>
@@ -787,15 +789,15 @@
     <string name="resend_sms_in">Reenviar SMS (%s)</string>
     <string name="wait_x">Agarda por favor (%s)</string>
     <string name="back">Volver</string>
-    <string name="possible_pin">Copiado automático desde o portapapeis.</string>
-    <string name="please_enter_pin">Por favor, escribe o pin de 6 díxitos.</string>
+    <string name="possible_pin">Copiado automático do PIN desde o portapapeis.</string>
+    <string name="please_enter_pin">Por favor, escribe o PIN de 6 díxitos.</string>
     <string name="abort_registration_procedure">Seguro que quere cancelar o proceso de rexistro?</string>
     <string name="yes">Si</string>
     <string name="no">Non</string>
     <string name="verifying">Validando…</string>
     <string name="requesting_sms">Solicitando SMS…</string>
-    <string name="incorrect_pin">O pin introducido non é correcto.</string>
-    <string name="pin_expired">O pin que che enviamos caducou.</string>
+    <string name="incorrect_pin">O PIN escrito non é correcto.</string>
+    <string name="pin_expired">O PIN que che enviamos caducou.</string>
     <string name="unknown_api_error_network">Fallo descoñecido na rede.</string>
     <string name="unknown_api_error_response">Resposta descoñecida desde o servidor.</string>
     <string name="unable_to_connect_to_server">Non se puido conectar co servidor.</string>
@@ -833,9 +835,9 @@
     <string name="unable_to_decrypt_backup">Non se puido descifrar a copia. É correcto o contrasinal?</string>
     <string name="backup_channel_name">Respaldar &amp; Restaurar</string>
     <string name="enter_jabber_id">Introducir enderezo XMPP</string>
-    <string name="create_group_chat">Crear grupo de conversa</string>
+    <string name="create_group_chat">Crear chat en grupo</string>
     <string name="join_public_channel">Unirse a canle pública</string>
-    <string name="create_private_group_chat">Crear grupo privado de conversa</string>
+    <string name="create_private_group_chat">Crear chat privado en grupo</string>
     <string name="create_public_channel">Crear canle pública</string>
     <string name="create_dialog_channel_name">Nome da canle</string>
     <string name="xmpp_address">Enderezo XMPP</string>
@@ -871,7 +873,7 @@
     <string name="add_anway">Engadir igualmente</string>
     <string name="this_looks_like_channel">Esto semella o enderezo dunha canle</string>
     <string name="share_backup_files">Compartir ficheiros de apoio</string>
-    <string name="conversations_backup">Respaldar Conversations</string>
+    <string name="conversations_backup">Copia de apoio Conversations</string>
     <string name="event">Evento</string>
     <string name="open_backup">Abrir copia de apoio</string>
     <string name="not_a_backup_file">O ficheiro seleccionado non é un ficheiro de apoio Conversations</string>
@@ -880,7 +882,7 @@
     <string name="unable_to_perform_this_action">Non se puido completar a acción</string>
     <string name="open_join_dialog">Unirse a canle pública…</string>
     <string name="sharing_application_not_grant_permission">A aplicación que comparte non proporciona permiso para acceder ao ficheiro.</string>
-    <string name="group_chats_and_channels"><![CDATA[Grupos de conversa & Canles]]></string>
+    <string name="group_chats_and_channels">Chats en grupo e Canles</string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">Servidor local</string>
     <string name="pref_channel_discovery_summary">A maioría das usuarias debería escoller \'jabber.network\' para obter mellores suxestións desde o ecosistema público XMPP.</string>
@@ -941,8 +943,8 @@
     <string name="remove_from_favorites">Desafixar de enriba</string>
     <string name="gpx_track">Ruta GPX</string>
     <string name="could_not_correct_message">No se pode correxir a mensaxe</string>
-    <string name="search_all_conversations">Todas as conversas</string>
-    <string name="search_this_conversation">Esta conversa</string>
+    <string name="search_all_conversations">Todos os chats</string>
+    <string name="search_this_conversation">Este chat</string>
     <string name="your_avatar">O teu avatar</string>
     <string name="avatar_for_x">Avatar para %s</string>
     <string name="encrypted_with_omemo">Cifrada con OMEMO</string>
@@ -952,7 +954,7 @@
     <string name="record_voice_mail">Gravar correo de voz</string>
     <string name="play_audio">Reproducir audio</string>
     <string name="pause_audio">Pausar audio</string>
-    <string name="add_contact_or_create_or_join_group_chat">Engade un contacto, crea o únete a unha conversa en grupo ou descubre canles</string>
+    <string name="add_contact_or_create_or_join_group_chat">Engade un contacto, crea o únete a un chat en grupo ou descubre canles</string>
     <plurals name="view_users">
         <item quantity="one">Ver %1$d Participante</item>
         <item quantity="other">Ver %1$d Participantes</item>
@@ -989,9 +991,9 @@
     <string name="outgoing_call_timestamp">Chamada saínte · %s</string>
     <string name="delete_from_server">Eliminar a conta no servidor</string>
     <string name="could_not_delete_account_from_server">Non se puido eliminar a conta no servidor</string>
-    <string name="save_as_group_chat">Gardar como conversa en grupo</string>
-    <string name="search_group_chats">Buscar conversas en grupo</string>
-    <string name="group_chats">Conversas en grupo</string>
+    <string name="save_as_group_chat">Gardar como chat en grupo</string>
+    <string name="search_group_chats">Buscar chats en grupo</string>
+    <string name="group_chats">Chats en grupo</string>
     <string name="restore_warning_continued">Non intentes restablecer unha copia de apoio que non tiveses creado ti!</string>
     <string name="outdated_backup_file_format">Estás intentando importar un ficheiro de apoio co formato antigo</string>
     <string name="audiobook">Audiolibro</string>
@@ -1012,12 +1014,23 @@
     <string name="no_permission_to_place_call">Sen permiso para chamar por teléfono</string>
     <string name="call_integration_not_available">Non está dispoñible o servizo de chamadas!</string>
     <string name="rtp_state_contact_offline">O contacto non está dispoñible</string>
-    <string name="remove_bookmark_and_close">Queres eliminar o marcador para %s e pechar a conversa?</string>
+    <string name="remove_bookmark_and_close">Queres eliminar o marcador para %s e arquivar o chat?</string>
     <string name="remove_bookmark">Queres eliminar o marcador para %s?</string>
-    <string name="delete_and_close">Eliminar e Pechar</string>
-    <string name="pref_use_colorful_bubbles_summary">As burburllas de cores nos chats axudan a distinguir as mensaxes enviadas e recibidas</string>
+    <string name="delete_and_close">Eliminar e Arquivar o chat</string>
+    <string name="pref_use_colorful_bubbles_summary">As burburllas de cores axudan a distinguir as mensaxes enviadas e recibidas</string>
     <string name="pref_use_colorful_bubbles">Burbullas coloridas nos chats</string>
     <string name="pref_dynamic_colors">Cores dinámicas</string>
     <string name="pref_dynamic_colors_summary">Cores do sistema (Material You)</string>
     <string name="title_activity_share_with">Compartir con…</string>
+    <string name="action_archive_chat">Arquivar conversa</string>
+    <string name="title_activity_new_chat">Novo chat</string>
+    <string name="start_chat">Inciar chat</string>
+    <string name="archive_this_chat">Arquivar este chat</string>
+    <string name="welcome_header">Únete á Conversa</string>
+    <string name="switch_to_chat">Cambiar ao chat</string>
+    <string name="no_certificate_selected">Sen certificado cliente seleccionado!</string>
+    <string name="channel_discover_opt_in_message">O descubrimento de canles usa un servizo alleo chamado &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Ao usar esta ferramenta vas enviar o teu enderezo IP e termos de busca a ese servizo. Le a súa &lt;a href=https://search.jabber.network/privacy&gt;Política de Privacidade&lt;/a&gt; para saber máis.</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">O código de barras non contén impresións dixitais para este chat.</string>
+    <string name="corresponding_chats_closed">Arquiváronse os chats correspondentes.</string>
+    <string name="title_undo_swipe_out_chat">Chat arquivado</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 3d11aa927..f45eccb79 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -26,9 +26,9 @@
     <string name="minute_ago">acum un minut</string>
     <string name="minutes_ago">acum %d minute</string>
     <plurals name="x_unread_conversations">
-        <item quantity="one">%d conversație necitită</item>
-        <item quantity="few">%d conversații necitite</item>
-        <item quantity="other">%d de conversații necitite</item>
+        <item quantity="one">%d discuție necitită</item>
+        <item quantity="few">%d discuții necitite</item>
+        <item quantity="other">%d de discuții necitite</item>
     </plurals>
     <string name="sending">trimitere…</string>
     <string name="message_decrypting">Decriptare mesaj. Vă rugăm să așteptați…</string>
@@ -40,7 +40,7 @@
     <string name="moderator">Moderator</string>
     <string name="participant">Participant</string>
     <string name="visitor">Vizitator</string>
-    <string name="remove_contact_text">Ați dori să ștergeți pe %s din lista de contacte? Conversațiile asociate cu acest contact nu vor fi șterse.</string>
+    <string name="remove_contact_text">Ați dori să ștergeți pe %s din lista de contacte? Discuția cu acest contact nu va fi ștersă.</string>
     <string name="block_contact_text">Ați dori să blocați pe %s ca să nu vă mai trimită mesaje?</string>
     <string name="unblock_contact_text">Ați dori să deblocați pe %s și să îi permiteți să vă trimită mesaje?</string>
     <string name="block_domain_text">Blochează toate contactele de la %s?</string>
@@ -78,8 +78,8 @@
     <string name="preparing_images">Se pregătește trimiterea imaginilor</string>
     <string name="sharing_files_please_wait">Trimitere fișiere. Vă rugăm să așteptați…</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?
+    <string name="clear_conversation_history">Șterge istoricul discuției</string>
+    <string name="clear_histor_msg">Doriți să ștergeți toate mesajele din această discuție?
 \n
 \n<b>Atenție:</b> Această acțiune nu va afecta mesajele aflate pe alte dispozitive sau servere.</string>
     <string name="delete_file_dialog">Șterge fișierul</string>
@@ -181,7 +181,7 @@
     <string name="unpublish_pgp_message">Sigur doriți să vă ștergeți cheia publică OpenPGP din mesajele de prezență?\nContactele dumneavoastră nu vor mai putea să vă trimită mesaje criptate cu OpenPGP.</string>
     <string name="openpgp_has_been_published">Cheia publică OpenPGP a fost publicată.</string>
     <string name="mgmt_account_enable">Activează cont</string>
-    <string name="mgmt_account_delete_confirm_text">Sigur doriți să vă ștergeți contul? Dacă vă ștergeți contul, întregul istoric de conversații va fi pierdut</string>
+    <string name="mgmt_account_delete_confirm_text">Sigur doriți să vă ștergeți contul? Dacă vă ștergeți contul, întregul istoric de discuții va fi pierdut</string>
     <string name="attach_record_voice">Înregistrare voce</string>
     <string name="account_settings_jabber_id">Adresă XMPP</string>
     <string name="block_jabber_id">Blochează adresă XMPP</string>
@@ -709,7 +709,7 @@
     <string name="error_trustkey_device_list">Nu s-a putut descărca lista dispozitivelor</string>
     <string name="error_trustkey_bundle">Nu s-au putut descărca cheile de criptare</string>
     <string name="error_trustkey_hint_mutual">Sugestie: În unele cazuri se poate rezolva dacă vă adăugați reciproc în lista de contacte.</string>
-    <string name="disable_encryption_message">Sigur doriți să dezactivați criptarea OMEMO pentru această conversație?
+    <string name="disable_encryption_message">Sigur doriți să dezactivați criptarea OMEMO pentru această discuție?
 \nAstfel veți permite administratorilor serverului să vă citească mesajele, dar se poate ca ăsta să fie singurul mod în care puteți să comunicați cu persoanele care folosesc clienți învechiți.</string>
     <string name="disable_now">Dezactivează acum</string>
     <string name="draft">Ciornă:</string>
@@ -737,14 +737,14 @@
     <string name="no_microphone_permission">Permiteți %1$s acces la microfon</string>
     <string name="search_messages">Caută mesaje</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">Arată conversația</string>
+    <string name="view_conversation">Arată discuția</string>
     <string name="pref_use_share_location_plugin">Extensia Share Location</string>
     <string name="pref_use_share_location_plugin_summary">Folosește extensia Share Location în loc de harta inclusă</string>
     <string name="copy_link">Copiază adresa web</string>
     <string name="copy_jabber_id">Copiază adresa XMPP</string>
     <string name="p1_s3_filetransfer">Partajare fișiere prin HTTP pentru S3</string>
     <string name="pref_start_search">Activează direct căutarea</string>
-    <string name="pref_start_search_summary">În ecranul \"Pornește o conversație\" focalizează câmpul de căutare și arată tastatura</string>
+    <string name="pref_start_search_summary">În ecranul \"Pornește discuție\" focalizează câmpul de căutare și arată tastatura</string>
     <string name="group_chat_avatar">Avatar discuție de grup</string>
     <string name="host_does_not_support_group_chat_avatars">Serverul gazdă nu suporta avatare pentru grupuri</string>
     <string name="only_the_owner_can_change_group_chat_avatar">Doar proprietarul grupului poate schimba avatarul</string>
@@ -800,7 +800,7 @@
     <string name="resend_sms">Retrimitere SMS</string>
     <string name="resend_sms_in">Retrimite SMS (%s)</string>
     <string name="wait_x">Vă rugăm să așteptați (%s)</string>
-    <string name="back">înapoi</string>
+    <string name="back">Înapoi</string>
     <string name="possible_pin">S-a copiat automat un posibil cod din memorie.</string>
     <string name="please_enter_pin">Vă rugăm să vă introduceți codul de 6 cifre.</string>
     <string name="abort_registration_procedure">Sigur doriți să anulați procedura de înregistrare?</string>
@@ -958,8 +958,8 @@
     <string name="remove_from_favorites">Anulează fixarea</string>
     <string name="gpx_track">Traseu GPX</string>
     <string name="could_not_correct_message">Nu s-a putut corecta mesajul</string>
-    <string name="search_all_conversations">Toate conversațiile</string>
-    <string name="search_this_conversation">Această conversație</string>
+    <string name="search_all_conversations">Toate discuțiile</string>
+    <string name="search_this_conversation">Această discuție</string>
     <string name="your_avatar">Avatarul dumneavoastră</string>
     <string name="avatar_for_x">Avatar pentru %s</string>
     <string name="encrypted_with_omemo">Criptare OMEMO</string>
@@ -1031,7 +1031,23 @@
     <string name="no_permission_to_place_call">Nu este permisă efectuarea de apeluri</string>
     <string name="call_integration_not_available">Integrarea apelurilor nu este disponibilă!</string>
     <string name="rtp_state_contact_offline">Contactul nu este disponibil</string>
-    <string name="remove_bookmark_and_close">Ați dori să ștergeți semnul de carte pentru %s și să închideți conversația?</string>
+    <string name="remove_bookmark_and_close">Ați dori să ștergeți semnul de carte pentru %s și să arhivați discuția?</string>
     <string name="remove_bookmark">Ați dori să ștergeți semnul de carte pentru %s?</string>
-    <string name="delete_and_close">Șterge și închide</string>
+    <string name="delete_and_close">Șterge și închide discuția</string>
+    <string name="pref_use_colorful_bubbles_summary">Bule de chat colorate ajută la distingerea mesajelor trimise și primite</string>
+    <string name="title_activity_share_with">Partajează cu…</string>
+    <string name="pref_use_colorful_bubbles">Bule de chat colorate</string>
+    <string name="pref_dynamic_colors">Culori dinamice</string>
+    <string name="pref_dynamic_colors_summary">Culori de sistem (Material You)</string>
+    <string name="action_archive_chat">Arhivează discuția</string>
+    <string name="archive_this_chat">Arhivează această discuție</string>
+    <string name="title_undo_swipe_out_chat">Discuție arhivată!</string>
+    <string name="channel_discover_opt_in_message">Descoperirea de canale publice folosește un serviciu terț numit &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Folosind această funcție se va transmite adresa dumneavoastră IP și cuvintele căutate către acest serviciu. Pentru mai multe informații citiți &lt;a href=https://search.jabber.network/privacy&gt;Politica de confidențialitate&lt;/a&gt; a serviciului.</string>
+    <string name="switch_to_chat">Treci la discutie</string>
+    <string name="no_certificate_selected">Nu a fost selectat un certificat client!</string>
+    <string name="start_chat">Începe discuție</string>
+    <string name="corresponding_chats_closed">Discuțiile aferente au fost arhivate.</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">Codul de bare nu conține o amprentă pentru această discuție.</string>
+    <string name="welcome_header">Alăturați-vă conversației</string>
+    <string name="title_activity_new_chat">Discuție nouă</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index d6b7612f4..4626517d5 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -65,7 +65,7 @@
     <string name="preparing_images">Po bëhet gati për dërgim figurash</string>
     <string name="sharing_files_please_wait">Po jepen kartela. Ju lutemi, prisni…</string>
     <string name="action_clear_history">Spastro historikun</string>
-    <string name="clear_conversation_history">Spastoni Historik Bisedash</string>
+    <string name="clear_conversation_history">Spastroje historikun e fjalosjes</string>
     <string name="delete_file_dialog">Fshije kartelën</string>
     <string name="choose_presence">Zgjidhni pajisje</string>
     <string name="send_unencrypted_message">Dërgoni mesazh të pafshehtëzuar</string>
@@ -552,7 +552,7 @@
     <string name="no_microphone_permission">Akordoni hyrje %1$s për mikrofonin</string>
     <string name="search_messages">Kërko te mesazhet</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">Shihni bisedë</string>
+    <string name="view_conversation">Shihni fjalosje</string>
     <string name="pref_use_share_location_plugin">Shtojcë Tregimi Vendndodhjeje</string>
     <string name="copy_link">Kopjo adresë web</string>
     <string name="copy_jabber_id">Kopjo adresë XMPP</string>
@@ -727,8 +727,8 @@
     <string name="remove_from_favorites">Shfiksoje prej kreut</string>
     <string name="gpx_track">Gjurmë GPX</string>
     <string name="could_not_correct_message">S’u ndreq dot mesazhi</string>
-    <string name="search_all_conversations">Krejt bisedat</string>
-    <string name="search_this_conversation">Këtë bisedë</string>
+    <string name="search_all_conversations">Krejt fjalosjet</string>
+    <string name="search_this_conversation">Këtë fjalosje</string>
     <string name="your_avatar">Avatari juaj</string>
     <string name="avatar_for_x">Avatar për %s</string>
     <string name="encrypted_with_omemo">Fshehtëzuar me OMEMO</string>
@@ -763,8 +763,8 @@
     <string name="reject_switch_to_video">Hidh poshtë kalim në thirrje video</string>
     <string name="open_join_dialog">Hyni në kanal publik…</string>
     <plurals name="x_unread_conversations">
-        <item quantity="one">%d bisedë e palexuar</item>
-        <item quantity="other">%d biseda të palexuara</item>
+        <item quantity="one">%d fjalosje e palexuar</item>
+        <item quantity="other">%d fjalosje të palexuara</item>
     </plurals>
     <plurals name="toast_delete_certificates">
         <item quantity="one">U fshi %d dëshmi</item>
@@ -821,11 +821,11 @@
     <string name="pref_automatically_delete_messages_description">Fshi vetvetiu nga kjo pajisje mesazhe që janë më të vjetër se intervali kohor i formësuar.</string>
     <string name="not_fetching_history_retention_period">S’po sillen mesazhe, për shkak të një periudhe lokale mbajtjeje.</string>
     <string name="action_delete_contact">Fshije prej liste</string>
-    <string name="remove_contact_text">Do të donit të hiqet %s prej listës tuaj të kontakteve? Bisedat me këtë kontakt s’do të hiqen.</string>
+    <string name="remove_contact_text">Do të donit të hiqet %s prej listës tuaj të kontakteve? Fjalosja me këtë kontakt s’do të hiqet.</string>
     <string name="block_contact_text">Do të donit t’i bllokohet %s dërgimi i mesazheve për ju\?</string>
     <string name="unblock_contact_text">Do të donit të zhbllokohet %s dhe të lejohet t’ju dërgojë mesazhe\?</string>
     <string name="crash_report_message">Përdorimi i llogarisë tuaj XMPP për të dërguar “stack traces” ndihmon zhvillimin e pandërprerë të %1$s.</string>
-    <string name="clear_histor_msg">Doni të fshihen krejt mesazhet te kjo bisedë? 
+    <string name="clear_histor_msg">Doni të fshihen krejt mesazhet te kjo fjalosje? 
 \n 
 \n<b>Kujdes:</b> Kjo s’do të ndikojë mesazhet e depozituar në pajisje apo shërbyes të tjerë.</string>
     <string name="delete_file_dialog_msg">Jeni i sigurt se doni të fshihet kjo kartelë\?
@@ -852,7 +852,7 @@
     <string name="error_security_exception">Aplikacioni që përdorët për të dhënë këtë kartelë, nuk jep leje të mjaftueshme.</string>
     <string name="unpublish_pgp_message">Jeni i sigurt se doni të hiqet kyçi juaj publik OpenPGP nga njoftimi juaj për prani\?
 \nKontaktet tuaj s’do të jenë më në gjendje t’ju dërgojnë mesazhe të fshehtëzuar me OpenPGP.</string>
-    <string name="mgmt_account_delete_confirm_text">Jeni i sigurt se doni të fshihet llogaria juaj? Fshirja e saj shkakton fshirjen e krejt historikut të bisedave tuaja</string>
+    <string name="mgmt_account_delete_confirm_text">Jeni i sigurt se doni të fshihet llogaria juaj? Fshirja e saj shkakton fshirjen e krejt historikut të fjalosjeve tuaja</string>
     <string name="install_openkeychain">Mesazh i fshehtëzuar. Që ta shfshehtëzoni, ju lutemi, instaloni OpenKeychain.</string>
     <string name="omemo_fingerprint_selected_message">Shenja gishtash OMEMO (origjinë mesazhi)</string>
     <string name="omemo_fingerprint_x509_selected_message">Shenja gishtash v\\OMEMO (origjinë mesazhi)</string>
@@ -936,12 +936,12 @@
     <string name="pref_scroll_to_bottom_summary">Pas dërgimit të një mesazhi, rrëshqit poshtë</string>
     <string name="error_trustkey_general">%1$s s’është në gjendje të fshehtëzojë mesazhe te %2$s. Kjo mund të vijë për shkak se kontakti juaj përdor një shërbyes, ose klient të vjetruar, që s’mund të përdorë OMEMO.</string>
     <string name="error_trustkey_hint_mutual">Ndihmëz: Në disa raste, kjo mund të ndreqet duke shtuar listat e kontakteve të njëri-tjetrit.</string>
-    <string name="disable_encryption_message">Jeni i sigurt se doni të çaktivizohet fshehtëzimi OMEMO për këtë bisedë?
+    <string name="disable_encryption_message">Jeni i sigurt se doni të çaktivizohet fshehtëzimi OMEMO për këtë fjalosje?
 \nKjo do t’i lejojë përgjegjësit të shërbyesit tuaj të lexojë mesazhet tuaj, por mund të jetë e vetmja rrugë për të komunikuar me persona që përdorin klientë të vjetruar.</string>
     <string name="pref_omemo_setting_summary_always">OMEMO do të përdoret përherë për fjalosje tek-për-tek dhe në grup.</string>
-    <string name="pref_omemo_setting_summary_default_on">OMEMO do të përdoret për biseda të reja, si parazgjedhje.</string>
-    <string name="pref_omemo_setting_summary_default_off">OMEMO do të duhet të aktivizohet shprehimisht për biseda të reja.</string>
-    <string name="pref_start_search_summary">Te skena “Nisni Bisedë” hapni tastierën dhe vendoseni kursorin te fusha e kërkimeve</string>
+    <string name="pref_omemo_setting_summary_default_on">Si parazgjedhje, për fjalosje të reja do të përdoret OMEMO.</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO do të duhet të aktivizohet shprehimisht për fjalosje të reja.</string>
+    <string name="pref_start_search_summary">Te skena “Nisni fjalosje”, hapni tastierën dhe vendoseni kursorin te fusha e kërkimeve</string>
     <string name="host_does_not_support_group_chat_avatars">Streha nuk mbulon avatarë fjalosjeje në grup</string>
     <string name="only_the_owner_can_change_group_chat_avatar">Vetëm i zoti mund të ndryshyjë avatarin e një fjalosje në grup</string>
     <string name="pref_use_share_location_plugin_summary">Përdor Shtojcën Për Tregim Vendndodhjeje, në vend se hartën e brendshme</string>
@@ -1021,8 +1021,8 @@
     <string name="call_integration_not_available">S’ka integrim thirrjesh!</string>
     <string name="no_permission_to_place_call">Pa leje për bërje thirrjesh</string>
     <string name="sasl_downgrade">U kalua në version të mëparshëm SASL-i</string>
-    <string name="remove_bookmark_and_close">Doni të hiqet faqerojtësi për %s dhe të mbyllet biseda?</string>
-    <string name="delete_and_close">Fshije &amp; Mbylle</string>
+    <string name="remove_bookmark_and_close">Doni të hiqet faqerojtësi për %s dhe arkivohet fjalosja?</string>
+    <string name="delete_and_close">Fshije &amp; Arkivoje fjalosjen</string>
     <string name="remove_bookmark">Doni të hiqet faqerojtësi për %s?</string>
     <string name="pref_use_colorful_bubbles_summary">Flluska të ngjyrosura fjalosjeje ndihmojnë të dalloni mesazhe të dërguar dhe të marrë</string>
     <string name="pref_dynamic_colors">Ngjyra dinamike</string>
@@ -1032,4 +1032,12 @@
     <string name="pref_use_colorful_bubbles">Flluska fjalosjeje të ngjyrosura</string>
     <string name="title_activity_share_with">Ndajeni me të tjerë me…</string>
     <string name="start_chat">Nisni fjalosje</string>
+    <string name="action_archive_chat">Arkivoje fjalosjen</string>
+    <string name="title_activity_new_chat">Fjalosje e re</string>
+    <string name="archive_this_chat">Arkivoje këtë fjalosje</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">Kodi me vija s’përmban shenja gishtash për këtë fjalosje.</string>
+    <string name="switch_to_chat">Kaloni te fjalosja</string>
+    <string name="title_undo_swipe_out_chat">Fjalosja u arkivua!</string>
+    <string name="welcome_header">Ejani në Conversation</string>
+    <string name="corresponding_chats_closed">Fjalosjet përkatëse u arkivuan.</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index c435d1d60..71e9a721e 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -35,7 +35,7 @@
     <string name="moderator">Модератор</string>
     <string name="participant">Учасник</string>
     <string name="visitor">Гість</string>
-    <string name="remove_contact_text">Бажаєте вилучити %s зі свого списку контактів? Розмови з цим контактом не буде вилучено.</string>
+    <string name="remove_contact_text">Бажаєте вилучити %s зі свого списку контактів? Розмову з цим контактом не буде вилучено.</string>
     <string name="block_contact_text">Бажаєте заборонити %s надсилати Вам повідомлення\?</string>
     <string name="unblock_contact_text">Бажаєте розблокувати %s та дозволити цій особі надсилати Вам повідомлення\?</string>
     <string name="block_domain_text">Заблокувати всі контакти з %s\?</string>
@@ -72,8 +72,8 @@
     <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 
+    <string name="clear_histor_msg">Дійсно вилучити всі повідомлення цієї розмови?
+\n
 \n<b>Увага:</b> Повідомлення, збережені на інших пристроях або серверах, і надалі залишаться там.</string>
     <string name="delete_file_dialog">Вилучити файл</string>
     <string name="delete_file_dialog_msg">Ви впевнені, що хочете вилучити цей файл\?
@@ -688,7 +688,7 @@
     <string name="error_trustkey_device_list">Неможливо отримати перелік пристроїв</string>
     <string name="error_trustkey_bundle">Неможливо отримати пакети пристроїв</string>
     <string name="error_trustkey_hint_mutual">Підказка: В деяких випадках це можна виправити, якщо додати один одного у свої списки контактів.</string>
-    <string name="disable_encryption_message">Дійсно вимкнути шифрування OMEMO?
+    <string name="disable_encryption_message">Дійсно вимкнути шифрування OMEMO для цієї розмови?
 \nПісля цього в адміністратора Вашого сервера буде можливість мати доступ до Ваших повідомлень. Проте, це може бути єдиним способом спілкуватися з людьми, які використовують застарілі застосунки.</string>
     <string name="disable_now">Вимкнути зараз</string>
     <string name="draft">Чернетка:</string>
@@ -775,7 +775,7 @@
     <string name="resend_sms">Надіслати нове SMS</string>
     <string name="resend_sms_in">Надіслати нове SMS (%s)</string>
     <string name="wait_x">Будь ласка, зачекайте (%s)</string>
-    <string name="back">повернутися</string>
+    <string name="back">Повернутися</string>
     <string name="possible_pin">Код автоматично вставлений з буфера обміну.</string>
     <string name="please_enter_pin">Будь ласка, введіть нижче код із 6 цифр.</string>
     <string name="abort_registration_procedure">Ви впевнені, що хочете припинити процедуру реєстрації\?</string>
@@ -784,7 +784,7 @@
     <string name="verifying">Перевірка…</string>
     <string name="requesting_sms">Запит SMS…</string>
     <string name="incorrect_pin">Код, який Ви ввели, неправильний.</string>
-    <string name="pin_expired">Код, який Ви ввели, застарів.</string>
+    <string name="pin_expired">Код, який ми Вам надіслали, застарів.</string>
     <string name="unknown_api_error_network">Невідома помилка мережі.</string>
     <string name="unknown_api_error_response">Сервер дав незрозумілу відповідь.</string>
     <string name="unable_to_connect_to_server">Неможливо приєднатися до сервера.</string>
@@ -1060,7 +1060,23 @@
     <string name="no_permission_to_place_call">Немає дозволу на телефонні дзвінки</string>
     <string name="rtp_state_contact_offline">Контакт недоступний</string>
     <string name="call_integration_not_available">Інтеграція викликів недоступна!</string>
-    <string name="delete_and_close">Видалити і закрити</string>
-    <string name="remove_bookmark_and_close">Бажаєте видалити закладку %s і закрити розмову?</string>
+    <string name="delete_and_close">Видалити й архівувати</string>
+    <string name="remove_bookmark_and_close">Бажаєте видалити закладку %s й архівувати розмову?</string>
     <string name="remove_bookmark">Бажаєте видалити закладку %s?</string>
+    <string name="welcome_header">Приєднуйтеся до розмови</string>
+    <string name="no_certificate_selected">Сертифікат клієнта не вибрано!</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">QR-код не містить цифрового підпису для цієї розмови.</string>
+    <string name="corresponding_chats_closed">Відповідні розмови заархівовано.</string>
+    <string name="channel_discover_opt_in_message">Пошук каналів використовує сторонній сервіс &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Використання цієї функції передає Вашу IP-адресу та пошукові запити цьому сервісу. Перегляньте їхню &lt;a href=https://search.jabber.network/privacy&gt;Політику конфіденційності&lt;/a&gt;, щоб отримати більше інформації.</string>
+    <string name="title_activity_share_with">Поділитися…</string>
+    <string name="pref_dynamic_colors">Динамічні кольори</string>
+    <string name="pref_dynamic_colors_summary">Системні кольори (Material You)</string>
+    <string name="pref_use_colorful_bubbles_summary">Барвисті бульбашки допомагають розрізняти надіслані та отримані повідомлення</string>
+    <string name="pref_use_colorful_bubbles">Кольорові бульбашки в розмовах</string>
+    <string name="title_activity_new_chat">Нова розмова</string>
+    <string name="action_archive_chat">Архівувати розмову</string>
+    <string name="archive_this_chat">Архівувати цю розмову</string>
+    <string name="title_undo_swipe_out_chat">Розмову заархівовано</string>
+    <string name="switch_to_chat">Перемкнути на чат</string>
+    <string name="start_chat">Почати розмову</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a8e0851b9..a6216a600 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -26,7 +26,7 @@
     <string name="minute_ago">1 分钟前</string>
     <string name="minutes_ago">%d 分钟前</string>
     <plurals name="x_unread_conversations">
-        <item quantity="other">%d 个未读对话</item>
+        <item quantity="other">%d 个未读聊天</item>
     </plurals>
     <string name="sending">正在发送…</string>
     <string name="message_decrypting">解密消息中。请稍候…</string>
@@ -38,7 +38,7 @@
     <string name="moderator">主持人</string>
     <string name="participant">参与者</string>
     <string name="visitor">访客</string>
-    <string name="remove_contact_text">是否从联系人列表中移除 %s？将不会移除与对方的对话。</string>
+    <string name="remove_contact_text">是否从联系人列表中移除 %s？将不会移除与对方的聊天。</string>
     <string name="block_contact_text">是否屏蔽 %s 向您发送消息？</string>
     <string name="unblock_contact_text">是否解除屏蔽 %s 并允许对方向您发送消息？</string>
     <string name="block_domain_text">屏蔽来自 %s 的所有联系人？</string>
@@ -76,9 +76,9 @@
     <string name="preparing_images">正在准备发送图片</string>
     <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 
+    <string name="clear_conversation_history">清空聊天记录</string>
+    <string name="clear_histor_msg">是否要删除此聊天中的所有消息？
+\n
 \n<b>警告：</b>存储在其他设备或服务器上的消息将不受影响。</string>
     <string name="delete_file_dialog">删除文件</string>
     <string name="delete_file_dialog_msg">是否确定要删除此文件？
@@ -184,7 +184,7 @@
 \n您的联系人将无法再向您发送 OpenPGP 加密消息。</string>
     <string name="openpgp_has_been_published">OpenPGP 公钥已发布。</string>
     <string name="mgmt_account_enable">启用账号</string>
-    <string name="mgmt_account_delete_confirm_text">是否确定要删除账号？删除账号会擦除全部对话历史记录</string>
+    <string name="mgmt_account_delete_confirm_text">是否确定要删除账号？删除账号会擦除全部聊天记录</string>
     <string name="attach_record_voice">录制语音</string>
     <string name="account_settings_jabber_id">XMPP 地址</string>
     <string name="block_jabber_id">屏蔽 XMPP 地址</string>
@@ -706,14 +706,14 @@
     <string name="error_trustkey_device_list">无法获取设备列表</string>
     <string name="error_trustkey_bundle">无法获取密钥</string>
     <string name="error_trustkey_hint_mutual">提示：某些情况下，双方可以添加到联系人列表解决此问题。</string>
-    <string name="disable_encryption_message">是否确定要禁用此对话的 OMEMO 加密？
+    <string name="disable_encryption_message">是否确定要禁用此聊天的 OMEMO 加密？
 \n将允许服务器管理员读取您的消息，但可能是与使用过时客户端的用户交流的唯一方法。</string>
     <string name="disable_now">立即禁用</string>
     <string name="draft">草稿：</string>
     <string name="pref_omemo_setting">OMEMO 加密</string>
-    <string name="pref_omemo_setting_summary_always">OMEMO 加密将始终用于一对一聊天和私人群聊。</string>
-    <string name="pref_omemo_setting_summary_default_on">默认情况下，新对话将使用 OMEMO 加密。</string>
-    <string name="pref_omemo_setting_summary_default_off">对于新对话，必须明确地打开 OMEMO 加密。</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO 将始终用于一对一和私人群聊。</string>
+    <string name="pref_omemo_setting_summary_default_on">新聊天将默认使用 OMEMO。</string>
+    <string name="pref_omemo_setting_summary_default_off">新聊天必须明确开启 OMEMO。</string>
     <string name="create_shortcut">创建快捷方式</string>
     <string name="default_on">默认开启</string>
     <string name="default_off">默认关闭</string>
@@ -734,14 +734,14 @@
     <string name="no_microphone_permission">授予 %1$s 访问麦克风的权限</string>
     <string name="search_messages">搜索消息</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">查看对话</string>
+    <string name="view_conversation">查看聊天</string>
     <string name="pref_use_share_location_plugin">位置共享插件</string>
     <string name="pref_use_share_location_plugin_summary">使用“位置共享插件”代替内置地图</string>
     <string name="copy_link">复制 web 地址</string>
     <string name="copy_jabber_id">复制 XMPP 地址</string>
     <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件共享</string>
     <string name="pref_start_search">直接搜索</string>
-    <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索栏中</string>
+    <string name="pref_start_search_summary">在“开始聊天”屏幕上打开键盘并将光标放在搜索栏中</string>
     <string name="group_chat_avatar">群聊头像</string>
     <string name="host_does_not_support_group_chat_avatars">主机不支持群聊头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改群聊头像</string>
@@ -793,19 +793,19 @@
     <string name="verify_x">验证 %s</string>
     <string name="we_have_sent_you_an_sms_to_x">我们已向您发送短信至 <b>%s</b>。</string>
     <string name="we_have_sent_you_another_sms">我们已经向您发送了另一条带有 6 位数验证码的短信。</string>
-    <string name="please_enter_pin_below">请在下方输入 6 位数的 PIN 码。</string>
+    <string name="please_enter_pin_below">请在下方输入 6 位 PIN 码。</string>
     <string name="resend_sms">重新发送短信</string>
     <string name="resend_sms_in">重新发送短信 (%s)</string>
     <string name="wait_x">请稍候 (%s)</string>
     <string name="back">返回</string>
     <string name="possible_pin">已自动从剪贴板粘贴可能的 PIN 码。</string>
-    <string name="please_enter_pin">请输入您的 6 位数字 PIN 码。</string>
+    <string name="please_enter_pin">请输入您的 6 位 PIN 码。</string>
     <string name="abort_registration_procedure">是否确定要中止注册程序？</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="verifying">正在验证…</string>
     <string name="requesting_sms">正在请求短信…</string>
-    <string name="incorrect_pin">您输入的 PIN 码有误。</string>
+    <string name="incorrect_pin">您输入的 PIN 码不正确。</string>
     <string name="pin_expired">我们发送给您的 PIN 码已过期。</string>
     <string name="unknown_api_error_network">网络错误未知。</string>
     <string name="unknown_api_error_response">服务器响应未知。</string>
@@ -842,7 +842,7 @@
     <string name="restore_warning">请勿使用恢复备份功能尝试克隆（同时运行）安装。恢复备份仅适用于迁移或您丢失原始设备的情况。</string>
     <string name="unable_to_restore_backup">无法恢复备份。</string>
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
-    <string name="backup_channel_name">备份 &amp; 恢复</string>
+    <string name="backup_channel_name">备份与恢复</string>
     <string name="enter_jabber_id">输入 XMPP 地址</string>
     <string name="create_group_chat">创建群聊</string>
     <string name="join_public_channel">加入公开频道</string>
@@ -891,7 +891,7 @@
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="open_join_dialog">加入公开频道…</string>
     <string name="sharing_application_not_grant_permission">共享应用未授予访问此文件的权限。</string>
-    <string name="group_chats_and_channels">群聊 &amp; 频道</string>
+    <string name="group_chats_and_channels">群聊和频道</string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户应该选择“jabber.network”以便从整个公共 XMPP 生态系统中获得更好的建议。</string>
@@ -949,8 +949,8 @@
     <string name="remove_from_favorites">取消置顶</string>
     <string name="gpx_track">GPX 轨迹</string>
     <string name="could_not_correct_message">无法更正消息</string>
-    <string name="search_all_conversations">所有对话</string>
-    <string name="search_this_conversation">此对话</string>
+    <string name="search_all_conversations">所有聊天</string>
+    <string name="search_this_conversation">此聊天</string>
     <string name="your_avatar">您的头像</string>
     <string name="avatar_for_x">%s 的头像</string>
     <string name="encrypted_with_omemo">用 OMEMO 加密</string>
@@ -1018,14 +1018,23 @@
     <string name="rtp_state_contact_offline">联系人不可用</string>
     <string name="no_permission_to_place_call">没有拨打电话的权限</string>
     <string name="call_integration_not_available">呼叫集成不可用！</string>
-    <string name="remove_bookmark_and_close">是否移除 %s 的书签并关闭对话？</string>
+    <string name="remove_bookmark_and_close">是否移除 %s 的书签并存档聊天？</string>
     <string name="remove_bookmark">是否移除 %s 的书签？</string>
     <string name="delete_and_close">删除 &amp; 关闭</string>
+    <string name="channel_discover_opt_in_message">频道发现使用称为 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服务。&lt;br&gt;&lt;br&gt;使用此功能会将您的 IP 地址和搜索词传输到此服务。请参阅其 &lt;a href=https://search.jabber.network/privacy&gt;隐私政策&lt;/a&gt; 以获取更多信息。</string>
     <string name="start_chat">开始聊天</string>
     <string name="title_activity_share_with">分享至…</string>
-    <string name="pref_use_colorful_bubbles_summary">彩色聊天气泡有助于区分发送和接收的信息</string>
+    <string name="pref_use_colorful_bubbles_summary">彩色聊天气泡有助于区分发送和接收的消息</string>
     <string name="no_certificate_selected">未选择客户端证书！</string>
     <string name="pref_use_colorful_bubbles">彩色聊天气泡</string>
     <string name="pref_dynamic_colors">动态色彩</string>
     <string name="pref_dynamic_colors_summary">系统色彩 (Material You)</string>
-</resources>
\ No newline at end of file
+    <string name="title_activity_new_chat">新聊天</string>
+    <string name="archive_this_chat">存档此聊天</string>
+    <string name="title_undo_swipe_out_chat">聊天已存档</string>
+    <string name="switch_to_chat">切换到聊天</string>
+    <string name="action_archive_chat">存档聊天</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">二维码不包含此聊天的指纹。</string>
+    <string name="welcome_header">加入对话</string>
+    <string name="corresponding_chats_closed">相应的聊天已存档。</string>
+</resources>