diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 206394c78..b673aefd3 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -859,7 +859,6 @@
   <string name="discover_channels">Channels entdecken</string>
   <string name="search_channels">Channels suchen</string>
   <string name="channel_discovery_opt_in_title">Mögliche Datenschutzverletzung!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[Die Channel-Entdeckung verwendet einen Drittanbieterservice namens <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Wenn du diese Funktion verwendest, werden deine IP-Adresse und deine Suchbegriffe an diesen Dienst übertragen. Weitere Informationen findest du in der <a href="https://search.jabbercat.org/privacy">Datenschutzerklärung</a>.]]></string>
   <string name="i_already_have_an_account">Ich habe bereits ein Konto</string>
   <string name="add_existing_account">Vorhandenes Konto hinzufügen</string>
   <string name="register_new_account">Neues Konto erstellen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 2dc0f6b0a..5fda4fbe9 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -859,7 +859,6 @@
   <string name="discover_channels">Ανακάλυψη καναλιών</string>
   <string name="search_channels">Αναζήτηση καναλιών</string>
   <string name="channel_discovery_opt_in_title">Πιθανή παραβίαση ιδιωτικότητας!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[Η ανακάλυψη καναλιού χρησιμοποιεί μια τρίτη υπηρεσία που λέγεται <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Χρησιμοποιώντας αυτή τη λειτουργία θα μεταβιβαστεί η διεύθυνση IP σας και οι όροι αναζήτησης σε αυτή την υπηρεσία. Δείτε την <a href="https://search.jabbercat.org/privacy">Πολιτική Ιδιωτικότητας</a> της για περισσότερες πληροφορίες.]]></string>
   <string name="i_already_have_an_account">Έχω ήδη λογαριασμό</string>
   <string name="add_existing_account">Προσθήκη υπάρχοντος λογαριασμού</string>
   <string name="register_new_account">Εγγραφή νέου λογαριασμού</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index d1370c337..bdacb8df4 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -859,7 +859,6 @@
   <string name="discover_channels">Descubrir canales</string>
   <string name="search_channels">Buscar canales</string>
   <string name="channel_discovery_opt_in_title">¡Posible violación de privacidad!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[La búsqueda de canales usa un servicio de terceros llamado search.jabbercat.org<a href="https://search.jabbercat.org">. <br><br>Usando esta funcionalidad transmitirás tu dirección IP y los términos buscados a este servicio. Ver su <a href="https://search.jabbercat.org/privacy">Política de Privacidad</a> para más información.]]></string>
   <string name="i_already_have_an_account">Ya tengo una cuenta</string>
   <string name="add_existing_account">Añadir una cuenta existente</string>
   <string name="register_new_account">Registrar una cuenta nueva</string>
@@ -874,4 +873,5 @@
   <string name="account_already_setup">Esta cuenta ya fue configurada</string>
   <string name="please_enter_password">Por favor ingrese la contraseña para esta cuenta</string>
   <string name="unable_to_perform_this_action">No se ha podido realizar esta acción</string>
+  <string name="open_join_dialog">Unirse a canal público...</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 57c737611..4f38b7907 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -856,7 +856,6 @@
   <string name="discover_channels">Kanalak aurkitu</string>
   <string name="search_channels">Kanalak bilatu</string>
   <string name="channel_discovery_opt_in_title">Balizko pribatutasun urraketa!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[Kanalak aurkitzeko ezaugarriak <a href="https://search.jabbercat.org">search.jabbercat.org</a> izeneko hirugarren zerbitzu bat erabiltzen du.<br><br>Ezaugarri hau erabiltzeak zure IP helbidea eta bilatutako testua zerbitzu horretara bidaltzea dakar. Ikusi beren <a href="https://search.jabbercat.org/privacy">pribatutasun politika</a> informazio gehiago lortzeko.]]></string>
   <string name="i_already_have_an_account">Badaukat kontu bat dagoeneko</string>
   <string name="add_existing_account">Gehitu existitzen den kontu bat</string>
   <string name="register_new_account">Kontu berria erregistratu</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index f34a6a0ac..accb284d0 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -7,7 +7,7 @@
   <string name="action_end_conversation">Fermer 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="channel_details">Détails de la chaîne</string>
+  <string name="channel_details">Détails du canal</string>
   <string name="action_secure">Conversation sécurisée</string>
   <string name="action_add_account">Ajouter un compte</string>
   <string name="action_edit_contact">Modifier le nom</string>
@@ -17,6 +17,8 @@
   <string name="action_unblock_contact">Débloquer le contact</string>
   <string name="action_block_domain">Bloquer le domaine</string>
   <string name="action_unblock_domain">Débloquer le domaine</string>
+  <string name="action_block_participant">Bloquer le participant</string>
+  <string name="action_unblock_participant">Débloquer le participant</string>
   <string name="title_activity_manage_accounts">Gestion des comptes</string>
   <string name="title_activity_settings">Paramètres</string>
   <string name="title_activity_sharewith">Partager avec Conversation</string>
@@ -28,6 +30,7 @@
   <string name="just_now">À l\'instant</string>
   <string name="minute_ago">Il y a 1 minute</string>
   <string name="minutes_ago">Il y a %d minutes</string>
+  <string name="x_unread_conversations">%d conversations non lues</string>
   <string name="sending">Envoi…</string>
   <string name="message_decrypting">Déchiffrement du message. Veuillez patienter...</string>
   <string name="pgp_message">Message chiffré avec OpenPGP</string>
@@ -334,6 +337,7 @@
   <string name="x_file_offered_for_download">%s proposé à télécharger</string>
   <string name="cancel_transmission">Annuler l\'envoi</string>
   <string name="file_transmission_failed">Échec de l\'envoi du fichier</string>
+  <string name="file_transmission_cancelled">Transfert de fichier annulé</string>
   <string name="file_deleted">Le fichier a été supprimé</string>
   <string name="no_application_found_to_open_file">Aucune application disponible pour ouvrir le fichier</string>
   <string name="no_application_found_to_open_link">Aucune application trouvée pour ouvrir le lien</string>
@@ -703,7 +707,7 @@
   <string name="small">Petite</string>
   <string name="medium">Moyenne</string>
   <string name="large">Grande</string>
-  <string name="not_encrypted_for_this_device">OMEMO sera utilisé par défaut pour toute nouvelle conversation.</string>
+  <string name="not_encrypted_for_this_device">Le message n\'était pas chiffré pour cet appareil.</string>
   <string name="omemo_decryption_failed">Échec de déchiffrement du message OMEMO.</string>
   <string name="undo">annuler</string>
   <string name="location_disabled">Le partage de positionnement est désactivé.</string>
@@ -847,7 +851,7 @@
   <string name="anyone_can_invite_others">N\'importe qui peut inviter d\'autres personnes.</string>
   <string name="jabber_ids_are_visible_to_admins">Les adresses XMPP sont visibles par les administrateurs.</string>
   <string name="jabber_ids_are_visible_to_anyone">Les adresses XMPP sont visibles par tous.</string>
-  <string name="no_users_hint_channel">Cette chaîne publique n\'a pas de participants. Invitez vos contacts ou utilisez le bouton de partage pour distribuer son adresse XMPP.</string>
+  <string name="no_users_hint_channel">Ce canal publique n\'a pas de participants. Invitez vos contacts ou utilisez le bouton de partage pour distribuer son adresse XMPP.</string>
   <string name="no_users_hint_group_chat">Ce chat de groupe privé n\'a aucun participant.</string>
   <string name="manage_permission">Gérer les privilèges</string>
   <string name="search_participants">Rechercher des participants</string>
@@ -856,11 +860,20 @@
   <string name="discover_channels">Découverte des canaux</string>
   <string name="search_channels">Recherche des canaux</string>
   <string name="channel_discovery_opt_in_title">Violation possible de la confidentialité !</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[La découverte de chaînes utilise un service tiers appelé <a href="https://search.jabbercat.org">search.jabbercat.org</a> qui transmet votre adresse IP et les termes de recherche à ce service. Voir leur <a href="https://search.jabbercat.org/privacy">politique de confidentialité</a> pour plus d\'informations]]>.</string>
+  <string name="channel_discover_opt_in_message"><![CDATA[Channel discovery utilise un service tiers appelé <a href="https://search.jabber.network">search.jabber.network</a>.<br><br>L\'utilisation de cette fonction transmettra votre adresse IP et les termes de recherche à ce service. Veuillez consulter leur <a href="https://search.jabber.network/privacy">Politique de confidentialité</a> pour plus d\'information.]]></string>
   <string name="i_already_have_an_account">J\'ai déjà un compte</string>
   <string name="add_existing_account">Ajouter un compte existant</string>
   <string name="register_new_account">Enregistrer un nouveau compte</string>
   <string name="this_looks_like_a_domain">Ceci ressemble à une adresse de domaine</string>
   <string name="add_anway">Ajouter quand même</string>
   <string name="this_looks_like_channel">Ceci ressemble à une adresse de canal</string>
+  <string name="share_backup_files">Partager les fichiers de sauvegardes</string>
+  <string name="conversations_backup">Sauvegarder les conversations</string>
+  <string name="event">Événement </string>
+  <string name="open_backup">Ouvrir sauvegarde</string>
+  <string name="not_a_backup_file">Le fichier sélectionné n\'est pas une sauvegarde de Conversations</string>
+  <string name="account_already_setup">Ce compte a déjà été configuré</string>
+  <string name="please_enter_password">Veuillez saisir le mot de passe pour ce compte</string>
+  <string name="unable_to_perform_this_action">Action impossible à réaliser</string>
+  <string name="open_join_dialog">Rejoindre le canal public ...</string>
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 1ad4780d1..98cfc58c8 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -859,7 +859,6 @@
   <string name="discover_channels">Descubrir canales</string>
   <string name="search_channels">Buscar canales</string>
   <string name="channel_discovery_opt_in_title">Posible intrusión na intimidade!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[O descubrimento de canales utiliza un servizo de terceiros chamado <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Ao utilizar esta característica transmitirá o seu enderezo IP e os termos de busca a ese servizo. Lea a súa <a href="https://search.jabbercat.org/privacy">Política de Intimidade</a> para máis información.]]></string>
   <string name="i_already_have_an_account">Xa teño unha conta</string>
   <string name="add_existing_account">Engadir conta existente</string>
   <string name="register_new_account">Rexistrar unha nova conta</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 885617701..629897a70 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -858,7 +858,6 @@
   <string name="discover_channels">Csatornák felderítése</string>
   <string name="search_channels">Csatornák keresése</string>
   <string name="channel_discovery_opt_in_title">Magánélet lehetséges megsértése!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[A csatorna felderítés egy harmadik fél által biztosított szolgáltatást használ: <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Ezen funkció használata során át fog kerülni az IP címe és a keresési kifejezés ahhoz a szolgáltatáshoz. További információért tekintse meg az <a href="https://search.jabbercat.org/privacy">Adatvédelmi Irányelveiket</a>.]]></string>
   <string name="i_already_have_an_account">Már rendelkezem fiókkal</string>
   <string name="add_existing_account">Már létező fiók hozzáadása</string>
   <string name="register_new_account">Új fiók létrehozása</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0297db8b8..b20802d14 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -859,7 +859,6 @@
   <string name="discover_channels">Individua i canali</string>
   <string name="search_channels">Cerca i canali</string>
   <string name="channel_discovery_opt_in_title">Possibile violazione della privacy!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[La ricerca dei canali usa un servizio di terze parti chiamato <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Usando questa opzione trasmetterai il tuo indirizzo IP e la stringa di ricerca al servizio. Controlla la loro <a href="https://search.jabbercat.org/privacy">Policy per la privacy</a> per maggiori informazioni.]]></string>
   <string name="i_already_have_an_account">Ho già un account</string>
   <string name="add_existing_account">Aggiungi un account pre-esistente</string>
   <string name="register_new_account">Registra un nuovo account</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 81670b3e7..f423ac37c 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -337,6 +337,7 @@
   <string name="x_file_offered_for_download">%s aangeboden om te downloaden</string>
   <string name="cancel_transmission">Bestandsoverdracht annuleren</string>
   <string name="file_transmission_failed">bestandsoverdracht mislukt</string>
+  <string name="file_transmission_cancelled">bestandsoverdracht geannuleerd</string>
   <string name="file_deleted">Het bestand is verwijderd</string>
   <string name="no_application_found_to_open_file">Geen applicatie om bestand te openen</string>
   <string name="no_application_found_to_open_link">Geen applicatie om verwijzing te openen</string>
@@ -859,7 +860,7 @@
   <string name="discover_channels">Kanalen ontdekken</string>
   <string name="search_channels">Kanalen doorzoeken</string>
   <string name="channel_discovery_opt_in_title">Mogelijke privacyschending!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[Kanaalontdekking maakt gebruik van een derdepartijdienst genaamd <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Door deze functie te gebruiken, zullen je IP-adres en zoekopdrachten naar die dienst verstuurd worden. Bekijk hun <a href="https://search.jabbercat.org/privacy">privacybeleid</a> voor meer informatie.]]></string>
+  <string name="channel_discover_opt_in_message"><![CDATA[Kanaalontdekking maakt gebruik van een derdepartijdienst genaamd <a href="https://search.jabber.network">search.jabber.network</a>.<br><br>Door deze functie te gebruiken, zullen je IP-adres en zoekopdrachten naar die dienst verstuurd worden. Bekijk hun <a href="https://search.jabber.network/privacy">privacybeleid</a> voor meer informatie.]]></string>
   <string name="i_already_have_an_account">Ik heb al een account</string>
   <string name="add_existing_account">Bestaande account toevoegen</string>
   <string name="register_new_account">Nieuwe account registreren</string>
@@ -874,4 +875,5 @@
   <string name="account_already_setup">Deze account is al ingesteld</string>
   <string name="please_enter_password">Voer het wachtwoord voor deze account in</string>
   <string name="unable_to_perform_this_action">Kan deze actie niet uitvoeren</string>
+  <string name="open_join_dialog">Deelnemen aan openbaar kanaal…</string>
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 2980b86ea..b1c815273 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -877,7 +877,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="discover_channels">Odkryj kanały</string>
   <string name="search_channels">Wyszukaj kanał</string>
   <string name="channel_discovery_opt_in_title">Możliwe naruszenie prywatności!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[Odkrywanie kanałów używa usługi firmy trzeciej <a href="https://search.jabbercat.org">search.jabbercat.org</a>. <br><br>Używając tej funkcji twój adres IP oraz kryteria wyszukiwania zostaną wysłane do tej usługi. Sprawdź <a href="https://search.jabbercat.org/privacy">Politykę Prywatności</a> aby uzyskać więcej informacji.]]></string>
   <string name="i_already_have_an_account">Już mam konto</string>
   <string name="add_existing_account">Dodaj istniejące konto</string>
   <string name="register_new_account">Zarejestruj nowe konto</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 535677f3c..f38b657e7 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -859,7 +859,6 @@
   <string name="discover_channels">Descobrir canais</string>
   <string name="search_channels">Pesquisar canais</string>
   <string name="channel_discovery_opt_in_title">Provável violação de privacidade!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[A descoberta de canais utiliza um serviço de terceiros chamado <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Ao usar esse recurso, você enviará o seu endereço IP e termos de pesquisa para esse serviço. Veja sua <a href="https://search.jabbercat.org/privacy">Política de Privacidade</a> para maiores informações.]]></string>
   <string name="i_already_have_an_account">Eu já tenho uma conta.</string>
   <string name="add_existing_account">Adicionar uma conta já existente</string>
   <string name="register_new_account">Registrar uma nova conta</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 8aecce6b8..15dd820a7 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -869,7 +869,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="discover_channels">Descoperă canale publice</string>
   <string name="search_channels">Caută canale publice</string>
   <string name="channel_discovery_opt_in_title">Posibilă încălcare a intimității!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[Descoperirea de canale publice folosește un serviciu terț numit <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>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 <a href="https://search.jabbercat.org/privacy">Politica de confidențialitate</a> a serviciului.]]></string>
   <string name="i_already_have_an_account">Eu am deja un cont</string>
   <string name="add_existing_account">Adaugă un cont existent</string>
   <string name="register_new_account">Înregistrează un cont nou</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 8a5c64fe6..afdaaa1aa 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -873,7 +873,6 @@
   <string name="discover_channels">Знайти канали</string>
   <string name="search_channels">Шукати канали</string>
   <string name="channel_discovery_opt_in_title">Можливе порушення приватності!</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[Пошук каналів використовує сторонній сервіс з назвою <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Використання цієї функції передає Вашу IP адресу та пошукові запити цьому сервісу. Перегляньте їхню <a href="https://search.jabbercat.org/privacy">політику конфіденційності</a>, щоб отримати більше інформації.]]></string>
   <string name="i_already_have_an_account">Я вже маю обліковий запис</string>
   <string name="add_existing_account">Додати наявний обліковий запис</string>
   <string name="register_new_account">Зареєструвати новий обліковий запис</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index af4c7c48d..cae8ab964 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -852,7 +852,6 @@
   <string name="discover_channels">发现群聊</string>
   <string name="search_channels">搜索群聊</string>
   <string name="channel_discovery_opt_in_title">可能侵犯隐私！</string>
-  <string name="channel_discover_opt_in_message"><![CDATA[探索群聊功能使用一个叫<a href="https://search.jabbercat.org">search.jabbercat.org</a>的第三方服务。在探索群聊时，您的IP地址和搜索内容将传送到他们的服务器上。有关更多信息，请参阅他们的<a href="https://search.jabbercat.org/privacy">隐私政策</a>。]]></string>
   <string name="i_already_have_an_account">我已有账户</string>
   <string name="add_existing_account">添加已有账户</string>
   <string name="register_new_account">注册新账户</string>
diff --git a/src/quicksy/res/values-fr/strings.xml b/src/quicksy/res/values-fr/strings.xml
index d86768e1d..3168c7676 100644
--- a/src/quicksy/res/values-fr/strings.xml
+++ b/src/quicksy/res/values-fr/strings.xml
@@ -19,4 +19,8 @@
     <string name="no_microphone_permission">Quicksy doit avoir accès au microphone</string>
     <string name="foreground_service_channel_description">Cette catégorie de notification est utilisée pour afficher une notification permanente indiquant que Quicksy est en cours d\'exécution.</string>
     <string name="set_profile_picture">Photo de profil Quicksy</string>
-    </resources>
+    <string name="not_available_in_your_country">Quicksy n\'est pas disponible dans votre pays.</string>
+    <string name="unable_to_verify_server_identity">Vérification de l\'identité du serveur impossible.</string>
+    <string name="unknown_security_error">Erreur de sécurité inconnue.</string>
+    <string name="timeout_while_connecting_to_server">Timeout lors de la connexion au serveur.</string>
+</resources>