pulled translations from transifex

src/main/res/values-ar/strings.xml

@@ -158,11 +158,8 @@
   <string name="mgmt_account_are_you_sure">هل أنت متأكد ؟</string>
   <string name="mgmt_account_delete_confirm_text">إذا قمت حذفت حسابك، فسوف تفقد سجل محادثاتك بالكامل</string>
   <string name="attach_record_voice">تسجيل صوت</string>
-  <string name="account_settings_jabber_id">حساب جابر</string>
-  <string name="block_jabber_id">حظر معرف جابر</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">كلمة السر</string>
-  <string name="invalid_jid">حساب جابر غير صالح</string>
   <string name="error_out_of_memory">خارج الذاكرة. الصورة كبيرة جدا</string>
   <string name="add_phone_book_text">هل تود إضافة %s إلى سجل عناوينك ؟</string>
   <string name="server_info_show_more">معلومات عن المضيف</string>
@@ -387,7 +384,6 @@
   <string name="captcha_required">رمز الكابتشا ضروري</string>
   <string name="captcha_hint">قم بإدخال الرموز المتواجدة في الصورة</string>
   <string name="certificate_chain_is_not_trusted">سلسلة الشهادة غير موثوق فيها</string>
-  <string name="jid_does_not_match_certificate">معرف ID جابر لا يتطابق مع الشهادة</string>
   <string name="action_renew_certificate">تجديد الشهادة</string>
   <string name="error_fetching_omemo_key">خطأ أثناء جلب مفتاح أوميمو OMEMO !</string>
   <string name="device_does_not_support_certificates">إنّ جهازك لا يدعم اختيار شهادات العملاء !</string>
@@ -431,7 +427,6 @@
   <string name="security_error_invalid_file_access">خطأ في الأمان : نفاذ غير سليم إلى ملف</string>
   <string name="no_application_to_share_uri">تعذر العثور على تطبيق يُمكنُ بواسطته مشاركة الرابط</string>
   <string name="share_uri_with">شارك الرابط مع ...</string>
-  <string name="your_full_jid_will_be">سوف تكون هويتك الكاملة على جابر كالتالي : %s</string>
   <string name="create_account">إنشاء حساب</string>
   <string name="use_own_provider">إستخدم مزودي الخاص</string>
   <string name="pick_your_username">إختر إسم المستخدم</string>
@@ -567,7 +562,6 @@
   <string name="today">اليوم</string>
   <string name="yesterday">البارحة</string>
   <string name="pref_validate_hostname">التحقق من صحة إسم المضيف بواسطة DNSSEC</string>
-  <string name="certificate_does_not_contain_jid">الشهادة لا تحتوي على مُعرّف جابر ID</string>
   <string name="server_info_partial">جُزْئِيًّا</string>
   <string name="attach_record_video">تسجيل فيديو</string>
   <string name="copy_to_clipboard">النسخ إلى الحافظة</string>

src/main/res/values-bg/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Затваряне на този разговор</string>
   <string name="action_contact_details">Подробности за контакта</string>
   <string name="action_muc_details">Подробности за груповия разговор</string>
+  <string name="channel_details">Подробности за канала</string>
   <string name="action_secure">Защитен разговор</string>
   <string name="action_add_account">Добавяне на профил</string>
   <string name="action_edit_contact">Редактиране на името</string>
@@ -171,11 +172,8 @@
   <string name="mgmt_account_are_you_sure">Сигурни ли сте?</string>
   <string name="mgmt_account_delete_confirm_text">Ако изтриете профила си, ще загубите цялата история на разговорите си</string>
   <string name="attach_record_voice">Запис на глас</string>
-  <string name="account_settings_jabber_id">Jabber идентификатор</string>
-  <string name="block_jabber_id">Блокиране на Jabber идентификатор</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Парола</string>
-  <string name="invalid_jid">Това не е правилен Jabber идентификатор</string>
   <string name="error_out_of_memory">Няма достатъчно памет. Изображението е твърде голямо.</string>
   <string name="add_phone_book_text">Искате ли да добавите %s към адресния си указател?</string>
   <string name="server_info_show_more">Инф. за сървъра</string>
@@ -297,7 +295,6 @@
   <string name="send_again">Повторно изпращане</string>
   <string name="file_url">Адрес на файла</string>
   <string name="url_copied_to_clipboard">Копиране на адреса</string>
-  <string name="jabber_id_copied_to_clipboard">Jabber идентификаторът е копиран</string>
   <string name="error_message_copied_to_clipboard">Съобщението за грешка е копирано</string>
   <string name="web_address">уеб адрес</string>
   <string name="scan_qr_code">Сканиране на 2-измерен баркод</string>
@@ -446,7 +443,6 @@
   <string name="captcha_required">Проверката е задължителна</string>
   <string name="captcha_hint">Въведете текста от горното изображение</string>
   <string name="certificate_chain_is_not_trusted">Сертификатът не е потвърден</string>
-  <string name="jid_does_not_match_certificate">Jabber идентификатора не съответства на сертификата</string>
   <string name="action_renew_certificate">Подновяване на сертификата</string>
   <string name="error_fetching_omemo_key">Грешка при получаването на ключа за OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Ключът за OMEMO беше потвърден със сертификат!</string>
@@ -496,11 +492,7 @@
   <string name="security_error_invalid_file_access">Грешка в сигурността: неправилен достъп до файл</string>
   <string name="no_application_to_share_uri">Няма намерено приложение за споделяне на адреса</string>
   <string name="share_uri_with">Споделяне на адреса с…</string>
-  <string name="welcome_text">Jabber е мрежа за общуване чрез мигновени съобщения, която не е обвързана с конкретен доставчик. Можете да използвате клиента с всеки сървър, който работи с Jabber.\nЗа Ваше удобство, ние предоставяме лесен начин да си създадете профил в conversations.im¹ — сървър, пригоден да работи добре с Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy е леко променен вариант на популярния клиент за Jabber/XMPP – Conversations, като включва функционалност за автоматично откриване на контактите.<br><br>След като се впишете чрез телефонния си номер, Quicksy ще използва телефонните номера в адресния Ви указател, за да Ви предложи възможни контакти.<br><br>Регистрирайки се, Вие се съгласявате с нашата <a href="https://quicksy.im/#privacy">декларация за поверителност</a>.]]></string>
   <string name="agree_and_continue">Съгласяване и продължаване</string>
-  <string name="magic_create_text">Ще преминем заедно с Вас през процеса за създаване на профил в conversations.im.¹\nАко изберете да използвате conversations.im, ще можете да общувате с потребители, използващи други сървъри, като им дадете своя пълен Jabber идентификатор.</string>
-  <string name="your_full_jid_will_be">Вашият пълен Jabber идентификатор ще бъде: %s</string>
   <string name="create_account">Създаване на профил</string>
   <string name="use_own_provider">Използване на собствен сървър</string>
   <string name="pick_your_username">Изберете потребителското си име</string>
@@ -634,7 +626,6 @@
   <string name="yesterday">Вчера</string>
   <string name="pref_validate_hostname">Проверка на името на сървъра чрез DNSSEC</string>
   <string name="pref_validate_hostname_summary">Сървърните сертификати, които съдържат проверено име на сървъра, се смятат за потвърдени</string>
-  <string name="certificate_does_not_contain_jid">Сертификатът не съдържа Jabber идентификатор</string>
   <string name="server_info_partial">частично</string>
   <string name="attach_record_video">Запис на видео</string>
   <string name="copy_to_clipboard">Копиране в буфера</string>
@@ -696,7 +687,6 @@
   <string name="pref_use_share_location_plugin">Разширение за споделяне на местоположението</string>
   <string name="pref_use_share_location_plugin_summary">Използване на разширението за споделяне на местоположението вместо вградената карта</string>
   <string name="copy_link">Копиране на уеб адрес</string>
-  <string name="copy_jabber_id">Копиране на Jabber идентификатор</string>
   <string name="p1_s3_filetransfer">Споделяне на файлове през HTTP за S3</string>
   <string name="pref_start_search">Директно търсене</string>
   <string name="pref_start_search_summary">На екрана за „Започване на разговор“ да се отваря клавиатурата и да се поставя курсорът в полето за търсене</string>

src/main/res/values-ca/strings.xml

@@ -171,11 +171,8 @@
   <string name="mgmt_account_are_you_sure">N\'esteu segur?</string>
   <string name="mgmt_account_delete_confirm_text">Si suprimiu el vostre compte, es perdrà tot l\'historial de la conversa</string>
   <string name="attach_record_voice">Enregistra veu</string>
-  <string name="account_settings_jabber_id">Identificació de Jabber</string>
-  <string name="block_jabber_id">Bloqueja la identificació de Jabber</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Contrasenya</string>
-  <string name="invalid_jid">Aquesta identificació de Jabber no és vàlida</string>
   <string name="error_out_of_memory">Memòria exhaurida. La imatge és massa gran.</string>
   <string name="add_phone_book_text">Voleu afegir a %s a la vostra llibreta d\'adreces?</string>
   <string name="server_info_show_more">Informació del servidor</string>
@@ -292,7 +289,6 @@
   <string name="send_again">Envia una altra vegada</string>
   <string name="file_url">URL del fitxer</string>
   <string name="url_copied_to_clipboard">URL copiada al portapapers</string>
-  <string name="jabber_id_copied_to_clipboard">Copia l\'ID de Jabber al portapapers</string>
   <string name="error_message_copied_to_clipboard">Missatge d\'error copiat al portapapers</string>
   <string name="web_address">Adreça Web</string>
   <string name="scan_qr_code">Escaneja el codi de barres 2D</string>
@@ -444,7 +440,6 @@ mentrestant.</string>
   <string name="captcha_required">Es necessita Captcha</string>
   <string name="captcha_hint">Introduïu el text de la imatge de dalt</string>
   <string name="certificate_chain_is_not_trusted">La cadena de certificats no és de confiança</string>
-  <string name="jid_does_not_match_certificate">L\'identificador de Jabber no coincideix amb el certificat</string>
   <string name="action_renew_certificate">Renova el certificat</string>
   <string name="error_fetching_omemo_key">S\'ha produït un error en obtenir la clau OMEMO!.</string>
   <string name="verified_omemo_key_with_certificate">Clau OMEMO verificada amb certificat!</string>
@@ -498,14 +493,6 @@ missatges.\n\nAra se us demanarà que desactiveu-las.</string>
   <string name="security_error_invalid_file_access">Error de seguretat: accés d\'arxiu no vàlid</string>
   <string name="no_application_to_share_uri">No s\'ha trobat cap aplicació que comparteixi URI</string>
   <string name="share_uri_with">Comparteix l\'URI amb...</string>
-  <string name="welcome_text">Jabber és una xarxa de missatgeria instantània independent del proveïdor. Podeu
- utilitzar aquest client amb el servidor de Jabber que trieu.\nPerò 
-per a la seva comoditat hem facilitat crear un compte a converses.im¹; un proveïdor especialment indicat per a l\'ús amb Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy és un spin off de les populars Converses client Jabber/XMPP amb detecció automàtica de contactes. <br> <br> Vostè es registra amb el seu número de telèfon i Quicksy es basarà automàticament en els números de telèfon de la seva llibreta d\'adreces per suggerir-li possibles contactes. <br> <br> En registrar-se vostè accepta la nostra <a href="https://quicksy.im/#privacy"> política de privadesa </a>. ]]></string>
-  <string name="magic_create_text">Us guiarem pel procés de creació d\'un compte a conversations.im.¹\nQuan 
-trieu conversations.im com a proveïdor, podreu comunicar-vos amb els usuaris 
-d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
-  <string name="your_full_jid_will_be">La vostra Jabber ID completa serà: %s</string>
   <string name="create_account">Crear compte</string>
   <string name="use_own_provider">Utilitza el meu propi proveïdor</string>
   <string name="pick_your_username">Tria el teu nom d\'usuari</string>
@@ -639,7 +626,6 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="yesterday">Ahir</string>
   <string name="pref_validate_hostname">Valideu el nom del servidor amb DNSSEC</string>
   <string name="pref_validate_hostname_summary">Els certificats de servidor que contenen el nom de host validat es consideren verificats</string>
-  <string name="certificate_does_not_contain_jid">El certificat no conté una identificació de Jabber</string>
   <string name="server_info_partial">parcial</string>
   <string name="attach_record_video">Grava vídeo</string>
   <string name="copy_to_clipboard">Copiar al portapapers</string>
@@ -701,7 +687,6 @@ que l\'administrador del servidor llegeixi els missatges, però pot ser l\'únic
   <string name="view_conversation">Veure conversa</string>
   <string name="pref_use_share_location_plugin">Plugin per Compartir Ubicació</string>
   <string name="copy_link">Copiar adreça web</string>
-  <string name="copy_jabber_id">Copiar ID de Jabber</string>
   <string name="p1_s3_filetransfer">Ús compartit d\'arxius HTTP per a S3</string>
   <string name="pref_start_search">Recerca directa</string>
   <string name="pref_start_search_summary">En la pantalla \'Iniciar conversa\' obri el teclat i col·loqui el cursor en el camp de recerca</string>

src/main/res/values-cs/strings.xml

@@ -146,10 +146,8 @@
   <string name="mgmt_account_enable">Povolit účet</string>
   <string name="mgmt_account_are_you_sure">Jste si jisti?</string>
   <string name="attach_record_voice">Nahrát hlas</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_example_jabber_id">jmeno@server.cz</string>
   <string name="password">Heslo</string>
-  <string name="invalid_jid">Toto není platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
   <string name="add_phone_book_text">Chcete přidat %s do svého adresáře?</string>
   <string name="server_info_show_more">Údaje serveru</string>
@@ -370,7 +368,6 @@
   <string name="captcha_required">Captcha vyžadována</string>
   <string name="captcha_hint">Zadejte text z obrázku výše</string>
   <string name="certificate_chain_is_not_trusted">Řetězec certifikátů není důvěryhodný</string>
-  <string name="jid_does_not_match_certificate">Jabber ID neodpovídá certifikátu</string>
   <string name="action_renew_certificate">Obnovit certifikát</string>
   <string name="error_fetching_omemo_key">Chyba získání OMEMO klíče!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO klíč ověřen certifikátem!</string>
@@ -414,8 +411,6 @@
   <string name="security_error_invalid_file_access">Chyba zabezpečení: Neplatný přístup k souboru</string>
   <string name="no_application_to_share_uri">Nebyla nalezena aplikace pro sdílení URI</string>
   <string name="share_uri_with">Sdílet URI s...</string>
-  <string name="magic_create_text">Provedeme vás procesem založení uživatelského účtu u conversations.im.¹\nVybráním conversations.im za svého poskytovatele budete moci komunikovat s uživateli u jiných poskytovatelů, poté co jim sdělíte své Jabber ID.</string>
-  <string name="your_full_jid_will_be">Vaše celé Jabber ID bude: %s</string>
   <string name="create_account">Vytvořit účet</string>
   <string name="use_own_provider">Použít vlastního provozovatele</string>
   <string name="pick_your_username">Zadejte své uživatelské jméno</string>

src/main/res/values-de/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Diese Unterhaltung beenden</string>
   <string name="action_contact_details">Kontaktdetails</string>
   <string name="action_muc_details">Gruppenchatdetails</string>
+  <string name="channel_details">Raumdetails</string>
   <string name="action_secure">Verschlüsselte Unterhaltung</string>
   <string name="action_add_account">Konto hinzufügen</string>
   <string name="action_edit_contact">Namen bearbeiten</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Teilen mit…</string>
   <string name="start_conversation">Unterhaltung beginnen</string>
   <string name="invite_contact">Kontakt einladen</string>
+  <string name="invite">Einladen</string>
   <string name="contacts">Kontakte</string>
   <string name="contact">Kontakt</string>
   <string name="cancel">Abbrechen</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string>
   <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löschst, gehen alle Gesprächsverläufe verloren</string>
   <string name="attach_record_voice">Sprache aufzeichnen</string>
-  <string name="account_settings_jabber_id">Jabber-ID</string>
-  <string name="block_jabber_id">Sperre Jabber-ID</string>
+  <string name="account_settings_jabber_id">XMPP-Adresse</string>
+  <string name="block_jabber_id">XMPP-Adresse sperren</string>
   <string name="account_settings_example_jabber_id">benutzer@domain.de</string>
   <string name="password">Passwort</string>
-  <string name="invalid_jid">Ungültige Jabber-ID</string>
+  <string name="invalid_jid">Ungültige XMPP-Adresse</string>
   <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
   <string name="add_phone_book_text">%s zum Telefonbuch hinzufügen</string>
   <string name="server_info_show_more">Server-Info</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Schlüssel werden abgerufen …</string>
   <string name="done">Fertig</string>
   <string name="decrypt">Entschlüsseln</string>
+  <string name="bookmarks">Lesezeichen</string>
   <string name="search">Suchen</string>
   <string name="enter_contact">Kontakt eingeben</string>
   <string name="delete_contact">Kontakt löschen</string>
@@ -220,11 +223,16 @@
   <string name="select">Auswählen</string>
   <string name="contact_already_exists">Der Kontakt existiert bereits</string>
   <string name="join">Beitreten</string>
+  <string name="channel_full_jid_example">channel@conference.domain.de/Nickname</string>
+  <string name="channel_bare_jid_example">channel@conference.domain.de</string>
   <string name="save_as_bookmark">Zur Kontaktliste hinzufügen</string>
   <string name="delete_bookmark">Von Kontaktliste entfernen</string>
   <string name="destroy_room">Gruppenchat löschen</string>
+  <string name="destroy_channel">Channel löschen</string>
   <string name="destroy_room_dialog">Bist du sicher, dass du diesen Gruppenchat löschen willst?\n\n<b>Achtung:</b> Der Gruppenchat wird dabei vollständig auf dem Server gelöscht.</string>
+  <string name="destroy_channel_dialog">Bist du sicher, dass du diesen öffentlichen Channel löschen willst?\n\n<b>Achtung:</b> Der Channel wird dabei vollständig auf dem Server gelöscht.</string>
   <string name="could_not_destroy_room">Gruppenchat konnte nicht gelöscht werden</string>
+  <string name="could_not_destroy_channel">Channel konnte nicht gelöscht werden</string>
   <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string>
   <string name="action_edit_subject">Gruppenchatthema bearbeiten</string>
   <string name="topic">Thema</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Erneut senden</string>
   <string name="file_url">Datei-URL</string>
   <string name="url_copied_to_clipboard">URL in die Zwischenablage kopiert</string>
-  <string name="jabber_id_copied_to_clipboard">Jabber-ID in Zwischenablage kopiert</string>
+  <string name="jabber_id_copied_to_clipboard">XMPP-Adresse in Zwischenablage kopiert</string>
   <string name="error_message_copied_to_clipboard">Fehlermeldung in Zwischenablage kopiert</string>
   <string name="web_address">Internetadresse</string>
   <string name="scan_qr_code">Barcode scannen</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Erneut versuchen</string>
   <string name="pref_keep_foreground_service">Dienst im Vordergrund ausführen</string>
   <string name="pref_keep_foreground_service_summary">Verhindert, dass Android Conversations beendet und die Verbindung unterbricht</string>
+  <string name="pref_create_backup">Sicherung erstellen</string>
+  <string name="pref_create_backup_summary">Sicherungsdateien werden gespeichert in %s</string>
+  <string name="notification_create_backup_title">Erstelle Sicherungsdateien</string>
+  <string name="notification_backup_created_title">Deine Sicherung wurde erstellt</string>
+  <string name="notification_backup_created_subtitle">Die Sicherungsdateien wurden gespeichert in %s</string>
+  <string name="restoring_backup">Stelle Sicherung wieder her</string>
+  <string name="notification_restored_backup_title">Deine Sicherung wurde wiederhergestellt</string>
+  <string name="notification_restored_backup_subtitle">Vergiss nicht, das Konto zu aktivieren.</string>
   <string name="choose_file">Datei auswählen</string>
   <string name="receiving_x_file">Empfange %1$s (%2$d%% abgeschlossen)</string>
   <string name="download_x_file">%s herunterladen</string>
@@ -353,14 +369,25 @@
   <string name="outcast">Ausgeschlossen</string>
   <string name="member">Mitglied</string>
   <string name="advanced_mode">Erweiterter Modus</string>
+  <string name="grant_membership">Mitgliederrechte gewähren</string>
+  <string name="remove_membership">Mitgliederrechte entziehen</string>
   <string name="grant_admin_privileges">Administratorrechte gewähren</string>
   <string name="remove_admin_privileges">Administratorrechte entziehen</string>
+  <string name="grant_owner_privileges">Eigentümerrechte gewähren</string>
+  <string name="remove_owner_privileges">Eigentümerrechte entziehen</string>
   <string name="remove_from_room">Aus Gruppenchat entfernen</string>
+  <string name="remove_from_channel">Aus Channel entfernen</string>
   <string name="could_not_change_affiliation">Zugehörigkeit von %s konnte nicht verändert werden</string>
   <string name="ban_from_conference">Vom Gruppenchat ausschließen</string>
+  <string name="ban_from_channel">Vom Channel ausschließen</string>
+  <string name="removing_from_public_conference">Du versuchst %s aus einem öffentlichen Channel zu entfernen. Die einzige Möglichkeit, dies dauerhaft zu tun, ist den Kontakt auszuschließen.</string>
   <string name="ban_now">Kontakt ausschließen</string>
   <string name="could_not_change_role">Rolle von %s konnte nicht geändert werden</string>
+  <string name="conference_options">Einstellungen für private Gruppenchats</string>
+  <string name="channel_options">Einstellungen für öffentlichen Channel</string>
   <string name="members_only">Privat, nur Mitglieder</string>
+  <string name="non_anonymous">XMPP-Adressen für alle sichtbar machen</string>
+  <string name="moderated">Channel wird moderiert</string>
   <string name="you_are_not_participating">Du bist kein Mitglied</string>
   <string name="modified_conference_options">Gruppenchatoptionen wurden modifiziert!</string>
   <string name="could_not_modify_conference_options">Gruppenchatoptionen konnten nicht modifiziert werden</string>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">Keine Anwendung für die Standortanzeige gefunden</string>
   <string name="location">Standort</string>
   <string name="title_undo_swipe_out_conversation">Unterhaltung beendet</string>
+  <string name="title_undo_swipe_out_group_chat">Privaten Gruppenchat verlassen</string>
+  <string name="title_undo_swipe_out_channel">Öffentlichen Channel verlassen</string>
   <string name="pref_dont_trust_system_cas_title">Zertifizierungsstellen nicht vertrauen</string>
   <string name="pref_dont_trust_system_cas_summary">Alle Zertifikate müssen manuell bestätigt werden</string>
   <string name="pref_remove_trusted_certificates_title">Zertifikate löschen</string>
@@ -413,6 +442,7 @@
   <string name="recently_used">Zuletzt verwendet</string>
   <string name="choose_quick_action">Wähle Schnell-Taste</string>
   <string name="search_contacts">Kontakte durchsuchen</string>
+  <string name="search_bookmarks">Lesezeichen durchsuchen</string>
   <string name="send_private_message">Private Nachricht senden</string>
   <string name="user_has_left_conference">%1$s hat den Gruppenchat verlassen!</string>
   <string name="username">Benutzername</string>
@@ -446,7 +476,7 @@
   <string name="captcha_required">Captcha erforderlich</string>
   <string name="captcha_hint">Gib den Text von obigem Bild ein</string>
   <string name="certificate_chain_is_not_trusted">Zertifikat wird nicht vertraut</string>
-  <string name="jid_does_not_match_certificate">Jabber-ID stimmt nicht dem Zertifikat überein</string>
+  <string name="jid_does_not_match_certificate">XMPP-Adresse stimmt nicht dem Zertifikat überein</string>
   <string name="action_renew_certificate">Zertifikat erneuern</string>
   <string name="error_fetching_omemo_key">Kann OMEMO-Schlüssel nicht empfangen!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO-Schlüssel mit Zertifikat bestätigt!</string>
@@ -496,11 +526,11 @@
   <string name="security_error_invalid_file_access">Sicherheitsfehler: Dateizugriff nicht erlaubt</string>
   <string name="no_application_to_share_uri">Keine Anwendung zum Teilen der URI gefunden</string>
   <string name="share_uri_with">Teile URI mit…</string>
-  <string name="welcome_text">Jabber ist ein anbieterunabhängiges Instant Messaging Netzwerk. Du kannst diesen Client mit jedem beliebigen Jabber-Server nutzen.\nUm es dir leicht zu machen, haben wir die Möglichkeit geschaffen, ein Konto auf conversations.im¹ anzulegen; ein Anbieter, der speziell für die Verwendung mit Conversations geeignet ist.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy ist ein Ableger des beliebten Jabber/XMPP-Clients Conversations mit automatischer Kontakterkennung.<br><br>Du registrierst dich mit deiner Telefonnummer und Quicksy wird automatisch auf der Grundlage der Telefonnummern in deinem Adressbuch mögliche Kontakte vorschlagen.<br><br>Mit der Anmeldung erklärst du dich mit unserer <a href="https://quicksy.im/#privacy">Datenschutzerklärung</a> einverstanden.]]></string>
+  <string name="welcome_text">XMPP ist ein anbieterunabhängiges Instant Messaging Netzwerk. Du kannst diesen Client mit jedem beliebigen XMPP-Server nutzen.\nUm es dir leicht zu machen, haben wir die Möglichkeit geschaffen, ein Konto auf conversations.im¹ anzulegen; ein Anbieter, der speziell für die Verwendung mit Conversations geeignet ist.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy ist ein Ableger des beliebten XMPP-Clients Conversations mit automatischer Kontakterkennung.<br><br>Du registrierst dich mit deiner Telefonnummer und Quicksy wird automatisch auf der Grundlage der Telefonnummern in deinem Adressbuch mögliche Kontakte vorschlagen.<br><br>Mit der Anmeldung erklärst du dich mit unserer <a href="https://quicksy.im/#privacy">Datenschutzerklärung</a> einverstanden.]]></string>
   <string name="agree_and_continue">Zustimmen &amp; fortfahren</string>
-  <string name="magic_create_text">Wir führen dich durch den Prozess der Kontoerstellung auf conversations.im.¹\nWenn du conversations.im als Provider wählst, kannst du mit Nutzern anderer Anbieter kommunizieren, indem du ihnen deine vollständige Jabber-ID gibst.</string>
-  <string name="your_full_jid_will_be">Deine vollständige Jabber ID lautet: %s</string>
+  <string name="magic_create_text">Wir führen dich durch den Prozess der Kontoerstellung auf conversations.im.¹\nWenn du conversations.im als Provider wählst, kannst du mit Nutzern anderer Anbieter kommunizieren, indem du ihnen deine vollständige XMPP-Adresse gibst.</string>
+  <string name="your_full_jid_will_be">Deine vollständige XMPP-Adresse lautet: %s</string>
   <string name="create_account">Konto erstellen</string>
   <string name="use_own_provider">Nutze eigenen Provider</string>
   <string name="pick_your_username">Wähle deinen Benutzernamen</string>
@@ -556,7 +586,7 @@
   <string name="show_error_message">Zeige Fehlermeldung</string>
   <string name="error_message">Fehlermeldung</string>
   <string name="data_saver_enabled">Datensparmodus aktiv</string>
-  <string name="data_saver_enabled_explained">Dein Betriebssystem verbietet Conversations im Hintergrund den Zugang zum Internet. Um Benachrichtigungen erhalten zu können, solltest du Conversations den Zugang erlauben, wenn der Datensparmodus aktiv ist. Conversations wird dennoch versuchen, so viele Daten wie möglich einzusparen.</string>
+  <string name="data_saver_enabled_explained">Dein Betriebssystem verhindert, dass Conversations im Hintergrund auf das Internet zugreift. Um Benachrichtigungen erhalten zu können, solltest du Conversations den Zugang erlauben, wenn der Datensparmodus aktiv ist. Conversations wird dennoch versuchen, so viele Daten wie möglich einzusparen.</string>
   <string name="device_does_not_support_data_saver">Dein Gerät unterstützt den Datensparmodus für Conversations nicht.</string>
   <string name="error_unable_to_create_temporary_file">Temporäre Datei kann nicht erstellt werden</string>
   <string name="this_device_has_been_verified">Dieses Gerät wurde überprüft</string>
@@ -634,7 +664,7 @@
   <string name="yesterday">Gestern</string>
   <string name="pref_validate_hostname">Überprüfe den Hostnamen mit DNSSEC</string>
   <string name="pref_validate_hostname_summary">Serverzertifikate, die den überprüften Hostnamen enthalten, werden als verifiziert betrachtet</string>
-  <string name="certificate_does_not_contain_jid">Zertifikat enthält keine Jabber-ID</string>
+  <string name="certificate_does_not_contain_jid">Zertifikat enthält keine XMPP-Adresse</string>
   <string name="server_info_partial">teilweise</string>
   <string name="attach_record_video">Video aufnehmen</string>
   <string name="copy_to_clipboard">In die Zwischenablage kopieren</string>
@@ -696,7 +726,7 @@
   <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">Jabber-ID 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>
@@ -723,6 +753,8 @@
   <string name="pref_more_notification_settings_summary">Wichtigkeit, Klang, Vibrationen</string>
   <string name="video_compression_channel_name">Video komprimieren</string>
   <string name="view_media">Medien anzeigen</string>
+  <string name="view_users">Teilnehmer anzeigen</string>
+  <string name="group_chat_members">Teilnehmer</string>
   <string name="media_browser">Medienbrowser</string>
   <string name="security_violation_not_attaching_file">Die Datei wurde aufgrund von Sicherheitsverletzungen ausgelassen.</string>
   <string name="pref_video_compression">Videoqualität</string>
@@ -737,7 +769,7 @@
   <string name="phone_number">Telefonnummer</string>
   <string name="verify_your_phone_number">Telefonnummer überprüfen</string>
   <string name="enter_country_code_and_phone_number">Quicksy sendet eine SMS-Nachricht (es können Gebühren anfallen), um deine Telefonnummer zu überprüfen. Gib deine Landesvorwahl und Telefonnummer ein:</string>
-  <string name="we_will_be_verifying"><![CDATA[Wir werden die Telefonnummer <br/><br/><b>%s</b><br/><br/>überprüfen. Ist das Ordnung oder möchtest du die Nummer bearbeiten?]]></string>
+  <string name="we_will_be_verifying"><![CDATA[Wir werden die Telefonnummer <br/><br/><b>%s</b><br/><br/>überprüfen. Ist diese in Ordnung oder möchtest du die Nummer bearbeiten?]]></string>
   <string name="not_a_valid_phone_number">%s ist keine gültige Telefonnummer.</string>
   <string name="please_enter_your_phone_number">Gib bitte deine Telefonnummer ein.</string>
   <string name="search_countries">Land suchen</string>
@@ -781,9 +813,45 @@
   <string name="install_orbot">Orbot installieren</string>
   <string name="start_orbot">Orbot starten</string>
   <string name="no_market_app_installed">Kein App-Store installiert.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Dieser Channel wird deine XMPP-Adresse veröffentlichen.</string>
   <string name="ebook">E-Book</string>
   <string name="video_original">Original (unkomprimiert)</string>
   <string name="open_with">Öffnen mit...</string>
   <string name="set_profile_picture">Conversations-Profilbild</string>
   <string name="choose_account">Konto auswählen</string>
+  <string name="restore_backup">Sicherung wiederherstellen</string>
+  <string name="restore">Wiederherstellung</string>
+  <string name="enter_password_to_restore">Gib dein Passwort für das Konto %s ein, um die Sicherung wiederherzustellen.</string>
+  <string name="restore_warning">Benutze die Sicherungsfunktion nicht, um eine Installation zu klonen (gleichzeitig auszuführen). Die Wiederherstellung einer Sicherung ist nur für Migrationen oder für den Fall gedacht, dass du das ursprüngliche Gerät verloren hast.</string>
+  <string name="unable_to_restore_backup">Die Sicherung kann nicht wiederhergestellt werden.</string>
+  <string name="unable_to_decrypt_backup">Die Sicherung kann nicht entschlüsselt werden. Ist das Passwort korrekt?</string>
+  <string name="backup_channel_name">Sicherung &amp; Wiederherstellung</string>
+  <string name="enter_jabber_id">XMPP-Adresse eingeben</string>
+  <string name="create_group_chat">Gruppenchat erstellen</string>
+  <string name="join_public_channel">Öffentlichen Channel beitreten</string>
+  <string name="create_private_group_chat">Privaten Gruppenchat erstellen</string>
+  <string name="create_public_channel">Öffentlichen Channel erstellen</string>
+  <string name="create_dialog_channel_name">Channelname</string>
+  <string name="xmpp_address">XMPP-Adresse</string>
+  <string name="please_enter_name">Bitte einen Namen für den Channel eingeben</string>
+  <string name="please_enter_xmpp_address">Bitte eine XMPP-Adresse eingeben</string>
+  <string name="this_is_an_xmpp_address">Dies ist eine XMPP-Adresse. Bitte einen Namen eingeben.</string>
+  <string name="creating_channel">Öffentlichen Channel erstellen...</string>
+  <string name="channel_already_exists">Dieser Channel existiert bereits</string>
+  <string name="joined_an_existing_channel">Du bist einem bestehenden Channel beigetreten.</string>
+  <string name="unable_to_set_channel_configuration">Channeleinstellung kann nicht geändert werden</string>
+  <string name="allow_participants_to_edit_subject">Erlaubt es jedem, das Thema zu bearbeiten.</string>
+  <string name="allow_participants_to_invite_others">Erlaubt es jedem, andere einzuladen.</string>
+  <string name="anyone_can_edit_subject">Alle können das Thema bearbeiten.</string>
+  <string name="owners_can_edit_subject">Eigentümer können das Thema bearbeiten.</string>
+  <string name="admins_can_edit_subject">Administratoren können das Thema bearbeiten.</string>
+  <string name="owners_can_invite_others">Eigentümer können andere einladen.</string>
+  <string name="anyone_can_invite_others">Alle können andere einladen.</string>
+  <string name="jabber_ids_are_visible_to_admins">XMPP-Adressen sind für Administratoren sichtbar.</string>
+  <string name="jabber_ids_are_visible_to_anyone">XMPP-Adressen sind für alle sichtbar.</string>
+  <string name="no_users_hint_channel">Dieser öffentliche Channel hat keine Teilnehmer. Lade deine Kontakte ein oder benutzt die \"Teilen\"-Schaltfläche, um die XMPP-Adresse zu verteilen.</string>
+  <string name="no_users_hint_group_chat">Dieser private Gruppenchat hat keine Teilnehmer.</string>
+  <string name="manage_permission">Rechte verwalten</string>
+  <string name="search_participants">Teilnehmer suchen</string>
+  <string name="file_too_large">Datei ist zu groß</string>
 </resources>

src/main/res/values-el/strings.xml

@@ -172,11 +172,8 @@
   <string name="mgmt_account_are_you_sure">Είστε βέβαιοι;</string>
   <string name="mgmt_account_delete_confirm_text">Αν διαγράψετε το λογαριαγμό σας, ολόκληρο το ιστορικό συζήτησης θα χαθεί</string>
   <string name="attach_record_voice">Εγγραφή φωνής</string>
-  <string name="account_settings_jabber_id">ταυτότητα Jabber</string>
-  <string name="block_jabber_id">Μπλοκάρετε Jabber ID</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Συνθηματικό</string>
-  <string name="invalid_jid">Αυτή δεν είναι έγκυρη ταυτότητα Jabber</string>
   <string name="error_out_of_memory">Πλήρης μνήμη. Η εικόνα είναι πολύ μεγάλη</string>
   <string name="add_phone_book_text">Θέλετε να προσθέσετε %s στην ατζέντα σας?</string>
   <string name="server_info_show_more">Πληροφορίες διακομιστή</string>
@@ -298,7 +295,6 @@
   <string name="send_again">Αποστολή ξανά</string>
   <string name="file_url">Διεύθυνση URL αρχείου</string>
   <string name="url_copied_to_clipboard">Η διεύθυνση URL αντιγράφηκε στο πρόχειρο</string>
-  <string name="jabber_id_copied_to_clipboard">Η ταυτότητα Jabber αντιγράφηκε στο πρόχειρο</string>
   <string name="error_message_copied_to_clipboard">Το μήνυμα λάθους αντιγράφηκε στο πρόχειρο</string>
   <string name="web_address">διεύθυνση ιστού</string>
   <string name="scan_qr_code">Σάρωση 2D γραμμοκώδικα</string>
@@ -447,7 +443,6 @@
   <string name="captcha_required">Απαραίτηση η χρήση Captcha</string>
   <string name="captcha_hint">Εισάγετε το κείμενο από την παραπάνω εικόνα</string>
   <string name="certificate_chain_is_not_trusted">Η αλυσίδα του πιστοποιητικού δεν είναι έμπιστη</string>
-  <string name="jid_does_not_match_certificate">Η ταυτότητα Jabber δεν ταιριάζει με το πιστοποιητικό</string>
   <string name="action_renew_certificate">Ανανέωση πιστοποιητικού</string>
   <string name="error_fetching_omemo_key">Σφάλμα μεταφόρτωσης κλειδιού OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Επαληθεύτηκε το κλειδί OMEMO με πιστοποιητικό!</string>
@@ -497,11 +492,7 @@
   <string name="security_error_invalid_file_access">Σφάλμα ασφάλειας: Μη έγκυρη πρόσβαση σε αρχείο</string>
   <string name="no_application_to_share_uri">Δεν βρέθηκε εφαρμογή για να μοιραστείτε την διεύθυνση URI</string>
   <string name="share_uri_with">Διαμοιρασμός της διεύθυνσης URI με...</string>
-  <string name="welcome_text">Το Jabber είναι ένα δίκτυο αποστολής και λήψης άμεσων μηνυμάτων ανεξάρτητο από πάροχο. Μπορείτε να χρησιμοποιήσετε αυτό το πρόγραμμα με οποιονδήποτε διακομιστή Jabber επιλέξετε.\nΓια διευκόλυνσή σας πάντως έχουμε κάνει εύκολη τη διαδικασία δημιουργίας ενός λογαριασμού στο conversations.im¹; έναν πάροχο ειδικά σχεδιασμένο για χρήση με το Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Το Quicksy είναι ένα παρακλάδι του δημοφιλούς προγράμματος Jabber/XMPP Conversations με αυτόματη εύρεση επαφών.<br><br>Εγγράφεστε με τον τηλεφωνικό σας αριθμό και το Quicksy αυτόματα — με βάση τους τηλεφωνικούς αριθμούς στο βιβλίο διευθύνσεών σας — προτείνει πιθανές επαφές για εσάς.<br><br>Με την εγγραφή σας συμφωνείτε με την <a href="https://quicksy.im/#privacy">πολιτική απορρήτου</a> μας.]]></string>
   <string name="agree_and_continue">Συμφωνώ &amp; προχωρήστε</string>
-  <string name="magic_create_text">Θα σας καθοδηγήσουμε στη διαδικασία δημιουργίας ενός λογαριασμού στο Conversations.im.¹\nΕπιλέγοντας το conversations.im ως πάροχο θα μπορείτε να επικοινωνήσετε με χρήστες άλλων παρόχων δίνοντάς τους την πλήρη ταυτότητα Jabber σας.</string>
-  <string name="your_full_jid_will_be">Η πλήρης ταυτότητα Jabber σας θα είναι: %s</string>
   <string name="create_account">Δημιουργία λογαριασμού</string>
   <string name="use_own_provider">Χρήση του δικού μου παρόχου</string>
   <string name="pick_your_username">Επιλογή ονόματος χρήστη</string>
@@ -635,7 +626,6 @@
   <string name="yesterday">Χτες</string>
   <string name="pref_validate_hostname">Επαλήθευση ονόματος μηχανήματος με χρήση DNSSEC</string>
   <string name="pref_validate_hostname_summary">Τα πιστοποιητικά διακομιστή που περιέχουν το επικυρωμένο όνομα μηχανήματος θεωρούνται επαληθευμένα</string>
-  <string name="certificate_does_not_contain_jid">Το πιστοποιητικό δεν περιέχει ταυτότητα Jabber</string>
   <string name="server_info_partial">μερικώς</string>
   <string name="attach_record_video">Εγγραφή βίντεο</string>
   <string name="copy_to_clipboard">Αντιγραφή στο πρόχειρο</string>
@@ -697,7 +687,6 @@
   <string name="pref_use_share_location_plugin">Πρόσθετο διαμοιρασμού τοποθεσίας</string>
   <string name="pref_use_share_location_plugin_summary">Χρήση του πρόσθετου διαμοιρασμού τοποθεσίας αντί για τον ενσωματωμένο χάρτη</string>
   <string name="copy_link">Αντιγραφή διεύθυνσης ιστού</string>
-  <string name="copy_jabber_id">Αντιγραφή ταυτότητας Jabber</string>
   <string name="p1_s3_filetransfer">Διαμοιρασμός αρχείων μέσω HTTP για S3</string>
   <string name="pref_start_search">Άμεση αναζήτηση</string>
   <string name="pref_start_search_summary">Άνοιγμα πληκτρολογίου και τοποθέτηση του δείκτη στο πεδίο αναζήτησης στην οθόνη \'Έναρξη συζήτησης\'</string>

src/main/res/values-es/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Cerrar esta conversación</string>
   <string name="action_contact_details">Detalles del contacto</string>
   <string name="action_muc_details">Detalles de conversación</string>
+  <string name="channel_details">Detalles del canal</string>
   <string name="action_secure">Conversación segura</string>
   <string name="action_add_account">Añadir cuenta</string>
   <string name="action_edit_contact">Editar contacto</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Compartir con...</string>
   <string name="start_conversation">Comenzar conversación</string>
   <string name="invite_contact">Invitar a contacto</string>
+  <string name="invite">Invitar</string>
   <string name="contacts">Contactos</string>
   <string name="contact">Contacto</string>
   <string name="cancel">Cancelar</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
   <string name="mgmt_account_delete_confirm_text">Si borras tu cuenta, tu historial de conversaciones también se perderá</string>
   <string name="attach_record_voice">Grabar audio</string>
-  <string name="account_settings_jabber_id">Identificador Jabber</string>
-  <string name="block_jabber_id">Bloquear Identificador Jabber</string>
+  <string name="account_settings_jabber_id">Dirección XMPP</string>
+  <string name="block_jabber_id">Bloquear dirección XMPP</string>
   <string name="account_settings_example_jabber_id">usuario@ejemplo.com</string>
   <string name="password">Contraseña</string>
-  <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
+  <string name="invalid_jid">Esta no es una dirección XMPP válida</string>
   <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
   <string name="add_phone_book_text">¿Quieres añadir a %s a tus contactos?</string>
   <string name="server_info_show_more">Información de servidor</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Buscando claves...</string>
   <string name="done">Hecho</string>
   <string name="decrypt">Descifrar</string>
+  <string name="bookmarks">Marcadores</string>
   <string name="search">Buscar</string>
   <string name="enter_contact">Introducir contacto</string>
   <string name="delete_contact">Eliminar contacto</string>
@@ -220,11 +223,16 @@
   <string name="select">Seleccionar</string>
   <string name="contact_already_exists">El contacto ya existe</string>
   <string name="join">Unirse</string>
+  <string name="channel_full_jid_example">canal@salas.ejemplo.com/nick</string>
+  <string name="channel_bare_jid_example">canal@salas.ejemplo.com</string>
   <string name="save_as_bookmark">Guardar en marcadores</string>
   <string name="delete_bookmark">Eliminar marcador</string>
   <string name="destroy_room">Destruir conversación en grupo</string>
+  <string name="destroy_channel">Destruir canal</string>
   <string name="destroy_room_dialog">¿Estás seguro de que quieres destruir esta conversación en grupo?\n\n<b>Aviso:</b>La conversación en grupo será eliminada completamente en el servidor.</string>
+  <string name="destroy_channel_dialog">¿Estás seguro de que quieres destruir este canal público?\n\n<b>Aviso:</b>El canal será eliminado completamente en el servidor.</string>
   <string name="could_not_destroy_room">No se ha podido destruir la conversación en grupo</string>
+  <string name="could_not_destroy_channel">No se ha podido destruir el canal</string>
   <string name="bookmark_already_exists">Este marcador ya existe</string>
   <string name="action_edit_subject">Editar asunto de la conversación</string>
   <string name="topic">Asunto</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Volver a enviar</string>
   <string name="file_url">URL de archivo</string>
   <string name="url_copied_to_clipboard">URL copiada al portapapeles</string>
-  <string name="jabber_id_copied_to_clipboard">Identificador Jabber copiado al portapapeles</string>
+  <string name="jabber_id_copied_to_clipboard">Dirección XMPP copiada al portapapeles</string>
   <string name="error_message_copied_to_clipboard">Mensaje de error copiado al portapapeles </string>
   <string name="web_address">dirección web</string>
   <string name="scan_qr_code">Escanear código QR</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Intentar de nuevo</string>
   <string name="pref_keep_foreground_service">Servicio en primer plano</string>
   <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string>
+  <string name="pref_create_backup">Crear una copia de respaldo</string>
+  <string name="pref_create_backup_summary">Los ficheros de respaldo serán almacenados en %s</string>
+  <string name="notification_create_backup_title">Creando los ficheros de respaldo</string>
+  <string name="notification_backup_created_title">Tu copia de respaldo ha sido creada</string>
+  <string name="notification_backup_created_subtitle">Los ficheros de respaldo han sido almacenados en %s</string>
+  <string name="restoring_backup">Restaurando copia de respaldo</string>
+  <string name="notification_restored_backup_title">Tu copia de respaldo ha sido restaurada</string>
+  <string name="notification_restored_backup_subtitle">No olvides habilitar esta cuenta</string>
   <string name="choose_file">Seleccionar archivo</string>
   <string name="receiving_x_file">Recibiendo %1$s (%2$d%% completado)</string>
   <string name="download_x_file">Descargar %s</string>
@@ -353,14 +369,25 @@
   <string name="outcast">Rechazado</string>
   <string name="member">Miembro</string>
   <string name="advanced_mode">Modo avanzado</string>
+  <string name="grant_membership">Conceder privilegios de miembro</string>
+  <string name="remove_membership">Revocar privilegios de miembro</string>
   <string name="grant_admin_privileges">Conceder privilegios de administrador</string>
   <string name="remove_admin_privileges">Revocar privilegios de administrador</string>
+  <string name="grant_owner_privileges">Conceder privilegios de propietario</string>
+  <string name="remove_owner_privileges">Revocar privilegios de propietario</string>
   <string name="remove_from_room">Expulsar de la conversación</string>
+  <string name="remove_from_channel">Eliminar del canal</string>
   <string name="could_not_change_affiliation">No se puede cambiar la afiliación de %s</string>
   <string name="ban_from_conference">Prohibir entrada en la conversación</string>
+  <string name="ban_from_channel">Prohibir entrada al canal</string>
+  <string name="removing_from_public_conference">Estás intentando eliminar a %s de un canal público. La única manera de hacerlo es prohibir su entrada para siempre.</string>
   <string name="ban_now">Prohibir ahora</string>
   <string name="could_not_change_role">No se puede cambiar el rol de %s</string>
+  <string name="conference_options">Configuración de conversación en grupo privada</string>
+  <string name="channel_options">Configuración del canal público</string>
   <string name="members_only">Privada, solo miembros</string>
+  <string name="non_anonymous">Hacer las direcciones XMPP visibles para todos</string>
+  <string name="moderated">Hacer que el canal sea moderado</string>
   <string name="you_are_not_participating">No estás participando</string>
   <string name="modified_conference_options">¡Modificadas las opciones de la conversación!</string>
   <string name="could_not_modify_conference_options">No se pueden modificar las opciones de la conversación</string>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">No se ha encontrado ninguna aplicación para mostrar la ubicación</string>
   <string name="location">Ubicación</string>
   <string name="title_undo_swipe_out_conversation">Conversación cerrada</string>
+  <string name="title_undo_swipe_out_group_chat">Dejar la conversación en grupo</string>
+  <string name="title_undo_swipe_out_channel">Dejar el canal público</string>
   <string name="pref_dont_trust_system_cas_title">No confiar en los CAs del sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Todos los certificados deben ser aprobados manualmente</string>
   <string name="pref_remove_trusted_certificates_title">Eliminar certificados</string>
@@ -413,6 +442,7 @@
   <string name="recently_used">Usada más recientemente</string>
   <string name="choose_quick_action">Elegir acción rápida</string>
   <string name="search_contacts">Buscar contactos</string>
+  <string name="search_bookmarks">Buscar marcadores</string>
   <string name="send_private_message">Enviar mensaje privado</string>
   <string name="user_has_left_conference">%1$s ha dejado la conversación!</string>
   <string name="username">Usuario</string>
@@ -446,7 +476,7 @@
   <string name="captcha_required">Captcha requerido</string>
   <string name="captcha_hint">Introduce el texto de la imagen de arriba</string>
   <string name="certificate_chain_is_not_trusted">La cadena de certificados no es de confianza</string>
-  <string name="jid_does_not_match_certificate">El identificador Jabber no coincide con el del certificado</string>
+  <string name="jid_does_not_match_certificate">La dirección XMPP no coincide con el certificado</string>
   <string name="action_renew_certificate">Renovar certificado</string>
   <string name="error_fetching_omemo_key">¡Error buscando clave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">¡Clave OMEMO con certificado verificada!</string>
@@ -496,11 +526,11 @@
   <string name="security_error_invalid_file_access">Error de seguridad: Acceso a fichero inválido</string>
   <string name="no_application_to_share_uri">No se ha encontrado ninguna aplicación para compartir la URI</string>
   <string name="share_uri_with">Compartir URI con...</string>
-  <string name="welcome_text">Jabber es una red de mensajería instantánea independiente del proveedor. Puedes usar este cliente con cualquier servidor Jabber que elijas.\nSin embargo, para tu conveniencia, hacemos de forma sencilla la creación de una cuenta en conversations.im¹; un proveedor especialmente especializado para el uso con Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy es un derivado del popular cliente de Jabber/XMPP Conversations con detección automática de contactos.<br><br>El registro se realiza con tu número de teléfono y Quicksy automáticamente—basado en los teléfonos de tu agenda de contactos—te sugerirá posibles contactos.<br><br>Registrándote en Quicksy aceptas nuestra<a href="https://quicksy.im/#privacy"> política de privacidad</a>.]]></string>
+  <string name="welcome_text">XMPP es una red de mensajería instantánea independiente del proveedor. Puedes usar este cliente con cualquier servidor XMPP que elijas.\nSin embargo, para tu conveniencia, hacemos de forma sencilla la creación de una cuenta en conversations.im¹; un proveedor especialmente especializado para el uso con Conversations</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy es un derivado del popular cliente XMPP Conversations con detección automática de contactos.<br><br>El registro se realiza con tu número de teléfono y Quicksy automáticamente—basado en los teléfonos de tu agenda de contactos—te sugerirá posibles contactos.<br><br>Registrándote en Quicksy aceptas nuestra <a href="https://quicksy.im/#privacy">política de privacidad</a>.]]> </string>
   <string name="agree_and_continue">Aceptar &amp; continuar</string>
-  <string name="magic_create_text">Te guiaremos durante el proceso de creación de la cuenta en conversations.im.¹\nCuando selecciones conversations.im como proveedor podrás comunicarte con usuarios de otros servidores mediante tu identificador Jabber.</string>
-  <string name="your_full_jid_will_be">Tu identificador Jabber será: %s</string>
+  <string name="magic_create_text">Te guiaremos durante el proceso de creación de la cuenta en conversations.im.¹\nCuando selecciones conversations.im como proveedor podrás comunicarte con usuarios de otros servidores proporcionándoles tu dirección XMPP completa. </string>
+  <string name="your_full_jid_will_be">Tu dirección XMPP completa será: %s</string>
   <string name="create_account">Crear cuenta</string>
   <string name="use_own_provider">Usar otro proveedor de mi elección</string>
   <string name="pick_your_username">Elige tu nombre de usuario</string>
@@ -634,7 +664,7 @@
   <string name="yesterday">Ayer</string>
   <string name="pref_validate_hostname">Validar hostname con DNSSEC</string>
   <string name="pref_validate_hostname_summary">Los certificados del servidor que contienen el hostname validado son considerados verificados</string>
-  <string name="certificate_does_not_contain_jid">El certificado no contiene un identificador Jabber</string>
+  <string name="certificate_does_not_contain_jid">El certificado no contiene una dirección XMPP completa </string>
   <string name="server_info_partial">Parcial</string>
   <string name="attach_record_video">Grabar video</string>
   <string name="copy_to_clipboard">Copiar al portapapeles</string>
@@ -696,7 +726,7 @@
   <string name="pref_use_share_location_plugin">Plugin para Compartir Ubicación</string>
   <string name="pref_use_share_location_plugin_summary">Usar el Plugin Compartir Ubicación en lugar del propio de la aplicación</string>
   <string name="copy_link">Copiar dirección web</string>
-  <string name="copy_jabber_id">Copiar Identificador Jabber</string>
+  <string name="copy_jabber_id">Copiar dirección XMPP</string>
   <string name="p1_s3_filetransfer">Compartición de Archivos mediante S3</string>
   <string name="pref_start_search">Búsqueda directa</string>
   <string name="pref_start_search_summary">En la pantalla de \'Nueva Conversación\' abrir el teclado y poner el cursor en el campo de búsqueda</string>
@@ -723,6 +753,8 @@
   <string name="pref_more_notification_settings_summary">Importancia, Sonido, Vibración</string>
   <string name="video_compression_channel_name">Compresión de video</string>
   <string name="view_media">Ver galería</string>
+  <string name="view_users">Ver participantes</string>
+  <string name="group_chat_members">Participantes</string>
   <string name="media_browser">Galería</string>
   <string name="security_violation_not_attaching_file">Fichero omitido por violación de seguridad</string>
   <string name="pref_video_compression">Calidad del video</string>
@@ -781,9 +813,45 @@
   <string name="install_orbot">Instalar Orbot</string>
   <string name="start_orbot">Iniciar Orbot</string>
   <string name="no_market_app_installed">No hay tienda de aplicaciones instalada.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Este canal hará tu dirección XMPP visible públicamente</string>
   <string name="ebook">e-book</string>
   <string name="video_original">Original (sin comprimir)</string>
   <string name="open_with">Abrir con...</string>
   <string name="set_profile_picture">Foto de perfil en Conversations</string>
   <string name="choose_account">Elige una cuenta</string>
+  <string name="restore_backup">Restaurar copia de respaldo</string>
+  <string name="restore">Restaurar</string>
+  <string name="enter_password_to_restore">Introduce tu contraseña para la cuenta %s para restaurar la copia de respaldo.</string>
+  <string name="restore_warning">No utilices la opción de restaurar una copia de respaldo para clonar (ejecutar simultáneamente) una instalación. Restaurar una copia de respaldo se debe utilizar solo para migraciones o en caso de que hayas perdido el dispositivo original.</string>
+  <string name="unable_to_restore_backup">No se ha podido restaurar la copia de respaldo.</string>
+  <string name="unable_to_decrypt_backup">No se ha podido descifrar la copia de respaldo. ¿Es la contraseña correcta?</string>
+  <string name="backup_channel_name">Respaldar &amp; Restaurar</string>
+  <string name="enter_jabber_id">Introduce dirección XMPP</string>
+  <string name="create_group_chat">Crear una conversación en grupo</string>
+  <string name="join_public_channel">Unirse a canal público</string>
+  <string name="create_private_group_chat">Crear una conversación en grupo privada</string>
+  <string name="create_public_channel">Crear un canal público</string>
+  <string name="create_dialog_channel_name">Nombre del canal</string>
+  <string name="xmpp_address">Dirección XMPP</string>
+  <string name="please_enter_name">Por favor, proporciona un nombre para el canal</string>
+  <string name="please_enter_xmpp_address">Por favor, proporciona una dirección XMPP</string>
+  <string name="this_is_an_xmpp_address">Esto es una dirección XMPP. Por favor, proporciona un nombre</string>
+  <string name="creating_channel">Creando canal público...</string>
+  <string name="channel_already_exists">Esta canal ya existe</string>
+  <string name="joined_an_existing_channel">Te has unido a un canal existente</string>
+  <string name="unable_to_set_channel_configuration">No se ha podido establecer la configuración del canal</string>
+  <string name="allow_participants_to_edit_subject">Permitir a cualquiera editar el asunto</string>
+  <string name="allow_participants_to_invite_others">Permitir a cualquiera invitar a otros contactos</string>
+  <string name="anyone_can_edit_subject">Todos pueden editar el asunto</string>
+  <string name="owners_can_edit_subject">Los propietarios pueden editar el asunto.</string>
+  <string name="admins_can_edit_subject">Los administradores pueden editar el asunto.</string>
+  <string name="owners_can_invite_others">Los propietarios pueden invitar a otros contactos.</string>
+  <string name="anyone_can_invite_others">Todos pueden invitar a otros contactos.</string>
+  <string name="jabber_ids_are_visible_to_admins">Las direcciones XMPP son visibles para los administradores.</string>
+  <string name="jabber_ids_are_visible_to_anyone">Las direcciones XMPP son visibles para todos.</string>
+  <string name="no_users_hint_channel">Este canal público no tiene participantes. Invita a tus contactos o usa el botón para distribuir la dirección XMPP del canal.</string>
+  <string name="no_users_hint_group_chat">Esta conversación en grupo privada no tiene participantes.</string>
+  <string name="manage_permission">Gestionar privilegios</string>
+  <string name="search_participants">Buscar participantes</string>
+  <string name="file_too_large">Archivo demasiado grande</string>
 </resources>

src/main/res/values-eu/strings.xml

@@ -171,11 +171,8 @@
   <string name="mgmt_account_are_you_sure">Ziur al zaude?</string>
   <string name="mgmt_account_delete_confirm_text">Zure kontua ezabatzen baduzu, zure elkarrizketen historia guztia galduko da</string>
   <string name="attach_record_voice">Ahotsa grabatu</string>
-  <string name="account_settings_jabber_id">Jabber IDa</string>
-  <string name="block_jabber_id">Jabber IDa blokeatu</string>
   <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
   <string name="password">Pasahitza</string>
-  <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
   <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
   <string name="add_phone_book_text">%s zure helbideen liburura gehitu nahi duzu?</string>
   <string name="server_info_show_more">Zerbitzariaren informazioa</string>
@@ -297,7 +294,6 @@
   <string name="send_again">Berriro bidali</string>
   <string name="file_url">Fitxategiaren URLa</string>
   <string name="url_copied_to_clipboard">URLa arbelera kopiatu da</string>
-  <string name="jabber_id_copied_to_clipboard">Jabber IDa arbelera kopiatu da</string>
   <string name="error_message_copied_to_clipboard">Akats mezua arbelera kopiatu da</string>
   <string name="web_address">web helbidea</string>
   <string name="scan_qr_code">2D barra kodea eskaneatu</string>
@@ -446,7 +442,6 @@
   <string name="captcha_required">Captcha beharrezkoa da</string>
   <string name="captcha_hint">Sar ezazu goiko irudiko testua</string>
   <string name="certificate_chain_is_not_trusted">Ziurtagiriaren katea ez da fidagarria</string>
-  <string name="jid_does_not_match_certificate">Jabber IDa ez du ziurtagiriarekin bat egiten</string>
   <string name="action_renew_certificate">Ziurtagiria berriztu</string>
   <string name="error_fetching_omemo_key">Akatsa OMEMO gakoa eskuratzerakoan!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO gakoa ziurtagiriarekin egiaztatuta!</string>
@@ -494,10 +489,7 @@
   <string name="security_error_invalid_file_access">Segurtasun akatsa: fitxategi sarrera baliogabea</string>
   <string name="no_application_to_share_uri">Ez da aplikaziorik aurkitu URIa partekatzeko</string>
   <string name="share_uri_with">URIa honekin partekatu...</string>
-  <string name="welcome_text">Jabber hornitzaleez independiente den protokolo bat da. Bezero hau aukeratzen duzun edozein Jabber zerbitzariarekin erabili dezakezu.\nHala ere zure erosotasunerako conversations.im¹-en, Conversationsekin bereziki erabiltzeko egokia den hornitzaile batean, kontu bat sortzea erraz egin dugu.</string>
   <string name="agree_and_continue">Onartu eta jarraitu</string>
-  <string name="magic_create_text">conversations.im-en kontu bat sortzeko prozesuan zehar gidatuko zaitugu.\nconversations.im¹ hornitzaile bezala aukeratzerakoan beste hornitzaileen erabiltzaileekin komunikatzeko gai izango zara haiei zure Jabber ID osoa emanez.</string>
-  <string name="your_full_jid_will_be">Zure Jabber ID osoa %s izango da</string>
   <string name="create_account">Kontua sortu</string>
   <string name="use_own_provider">Nire hornitzale propioa erabili</string>
   <string name="pick_your_username">Aukeratu zure erabiltzaile izena</string>
@@ -631,7 +623,6 @@
   <string name="yesterday">Atzo</string>
   <string name="pref_validate_hostname">Ostalariaren izena DNSSECekin balioztatu</string>
   <string name="pref_validate_hostname_summary">Ostalariaren izena balioztatuta daukaten zerbitzarien ziurtagiriak egiaztatutzat hartzen dira</string>
-  <string name="certificate_does_not_contain_jid">Ziurtagiriak ez dauka Jabber ID baliodun bat</string>
   <string name="server_info_partial">partziala</string>
   <string name="attach_record_video">Bideoa grabatu</string>
   <string name="copy_to_clipboard">Arbelera kopiatu</string>
@@ -693,7 +684,6 @@
   <string name="pref_use_share_location_plugin">Kokapena partekatzeko plugina</string>
   <string name="pref_use_share_location_plugin_summary">Erabili kokapena partekatzeko plugina mapa erabili beharrean</string>
   <string name="copy_link">Web helbidea kopiatu</string>
-  <string name="copy_jabber_id">Jabber IDa kopiatu</string>
   <string name="p1_s3_filetransfer">HTTP fitxategiak partekatzea S3rentzako</string>
   <string name="pref_start_search">Bilaketa zuzena</string>
   <string name="pref_start_search_summary">\'Elkarrizketa hasi\' pantailan teklatua ireki eta kurtsorea bilaketa eremuan jarri</string>

src/main/res/values-fr/strings.xml

@@ -4,6 +4,7 @@
   <string name="action_add">Nouvelle conversation</string>
   <string name="action_accounts">Gérer les comptes</string>
   <string name="action_account">Gérer le compte</string>
+  <string name="action_end_conversation">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="action_secure">Conversation sécurisée</string>
@@ -50,6 +51,7 @@
   <string name="share_with">Partager avec…</string>
   <string name="start_conversation">Démarrer une conversation</string>
   <string name="invite_contact">Inviter un contact</string>
+  <string name="invite">Inviter</string>
   <string name="contacts">Contacts</string>
   <string name="contact">Contact</string>
   <string name="cancel">Annuler</string>
@@ -120,6 +122,8 @@
   <string name="pref_confirm_messages">Confirmation de lecture</string>
   <string name="pref_confirm_messages_summary">Informer vos contacts quand vous avez reçu et lu leurs messages</string>
   <string name="pref_ui_options">Interface</string>
+  <string name="openpgp_error">OpenKeychain a signalé une erreur.</string>
+  <string name="bad_key_for_encryption">Mauvaise clef pour le chiffrement.</string>
   <string name="accept">Accepter</string>
   <string name="error">Une erreur s\'est produite</string>
   <string name="recording_error">Erreur</string>
@@ -167,11 +171,11 @@
   <string name="mgmt_account_are_you_sure">Êtes-vous sûr ?</string>
   <string name="mgmt_account_delete_confirm_text">Si vous supprimez votre compte ainsi que tout votre historique de conversation sera perdu</string>
   <string name="attach_record_voice">Enregistrer un son</string>
-  <string name="account_settings_jabber_id">Identifiant</string>
-  <string name="block_jabber_id">Bloquer l\'ID Jabber</string>
+  <string name="account_settings_jabber_id">Adresse XMPP</string>
+  <string name="block_jabber_id">Bloquer l\'adresse XMPP</string>
   <string name="account_settings_example_jabber_id">nom@exemple.com</string>
   <string name="password">Mot de passe</string>
-  <string name="invalid_jid">Cet identifiant n\'est pas valide</string>
+  <string name="invalid_jid">Ce n\'est pas une adresse XMPP valide</string>
   <string name="error_out_of_memory">Plus de mémoire disponible. L\'image est trop volumineuse.</string>
   <string name="add_phone_book_text">Voulez-vous ajouter %s à votre carnet d\'adresses ?</string>
   <string name="server_info_show_more">Infos sur le serveur</string>
@@ -258,6 +262,7 @@
   <string name="pref_allow_message_correction_summary">Permet à vos contacts d\'éditer leurs messages rétroactivement</string>
   <string name="pref_expert_options">Paramètres avancés</string>
   <string name="pref_expert_options_summary">À utiliser avec précaution.</string>
+  <string name="title_activity_about_x">À propos de %s</string>
   <string name="title_pref_quiet_hours">Heures tranquilles</string>
   <string name="title_pref_quiet_hours_start_time">Heure de début</string>
   <string name="title_pref_quiet_hours_end_time">Heure de fin</string>
@@ -287,6 +292,7 @@
   <string name="send_again">Envoyer de nouveau</string>
   <string name="file_url">URL du fichier</string>
   <string name="url_copied_to_clipboard">URL copiée dans le presse-papier</string>
+  <string name="jabber_id_copied_to_clipboard">Adresse XMPP copiée dans le presse-papiers</string>
   <string name="web_address">adresse internet</string>
   <string name="scan_qr_code">Scanner le code-barres 2D</string>
   <string name="show_qr_code">Montrer le code-barres 2D</string>
@@ -296,6 +302,14 @@
   <string name="try_again">Réessayer</string>
   <string name="pref_keep_foreground_service">Garder le service au 1er plan</string>
   <string name="pref_keep_foreground_service_summary">Évite que le système ne ferme votre connexion.</string>
+  <string name="pref_create_backup">Créer une sauvegarde</string>
+  <string name="pref_create_backup_summary">La sauvegarde sera stockée dans %s</string>
+  <string name="notification_create_backup_title">Création des fichiers de sauvegarde</string>
+  <string name="notification_backup_created_title">Votre sauvegarde a été créée</string>
+  <string name="notification_backup_created_subtitle">Les fichiers de sauvegarde ont été stockés dans %s</string>
+  <string name="restoring_backup">Restauration de la sauvegarde</string>
+  <string name="notification_restored_backup_title">Votre sauvegarde a été restaurée</string>
+  <string name="notification_restored_backup_subtitle">N\'oubliez pas d\'activer le compte.</string>
   <string name="choose_file">Choix du fichier</string>
   <string name="receiving_x_file">Réception %1$s (%2$d%% complété)</string>
   <string name="download_x_file">Télécharger %s</string>
@@ -383,6 +397,7 @@
   <string name="no_application_found_to_display_location">Aucune application trouvée pour afficher la position</string>
   <string name="location">Position</string>
   <string name="title_undo_swipe_out_conversation">Conversation fermée</string>
+  <string name="title_undo_swipe_out_group_chat">Quitter le groupe de discussion privé</string>
   <string name="pref_dont_trust_system_cas_title">Ne pas utiliser les CAs système</string>
   <string name="pref_dont_trust_system_cas_summary">Tous les certificats doivent être approuvés manuellement.</string>
   <string name="pref_remove_trusted_certificates_title">Retirer les certificats</string>
@@ -434,7 +449,7 @@
   <string name="captcha_required">Captcha obligatoire</string>
   <string name="captcha_hint">Entrez le texte de l\'image ci-dessus</string>
   <string name="certificate_chain_is_not_trusted">La chaîne de certificats n\'est pas digne de confiance</string>
-  <string name="jid_does_not_match_certificate">L\'identifiant ne correspond pas au certificat</string>
+  <string name="jid_does_not_match_certificate">L\'adresse XMPP ne correspond pas au certificat</string>
   <string name="action_renew_certificate">Renouveler le certificat</string>
   <string name="error_fetching_omemo_key">Erreur lors de la récupération de la clef OMEMO !</string>
   <string name="verified_omemo_key_with_certificate">Clef OMEMO vérifiée avec un certificat !</string>
@@ -482,9 +497,8 @@
   <string name="security_error_invalid_file_access">Erreur de sécurité : accès fichier non-valide</string>
   <string name="no_application_to_share_uri">Aucune application trouvée pour partager l\'URI</string>
   <string name="share_uri_with">Partager l\'URI avec...</string>
-  <string name="welcome_text">Jabber est un réseau de messagerie instantanée indépendant du fournisseur. Vous pouvez utiliser ce client avec n\'importe quel serveur Jabber que vous choisissez.\nToutefois, pour votre commodité, nous avons facilité la création d\'un compte sur conversations.im¹ ; un fournisseur spécialement adapté à l\'utilisation avec Conversations.</string>
-  <string name="magic_create_text">Nous vous guiderons pendant toute la procédure de création d\'un compte utilisateur sur conversations.im.¹\nEn choisissant conversations.im comme fournisseur, vous pourrez communiquer avec les utilisateurs d\'autres fournisseurs en leur transmettant votre Jabber ID complet. </string>
-  <string name="your_full_jid_will_be">Votre Jabber ID complet sera : %s</string>
+  <string name="agree_and_continue">Accepter &amp; continuer</string>
+  <string name="your_full_jid_will_be">Votre adresse XMPP complète sera : %s</string>
   <string name="create_account">Créer un compte</string>
   <string name="use_own_provider">Utiliser votre propre fournisseur</string>
   <string name="pick_your_username">Choisissez votre nom d\'utilisateur</string>
@@ -618,7 +632,7 @@
   <string name="yesterday">Hier</string>
   <string name="pref_validate_hostname">Valider le nom de domaine avec DNSSEC</string>
   <string name="pref_validate_hostname_summary">Les certificats serveur qui comportent le nom de domaine validé sont considérés comme validés</string>
-  <string name="certificate_does_not_contain_jid">Le certificat ne contient pas d\'ID Jabber</string>
+  <string name="certificate_does_not_contain_jid">Le certificat ne contient pas d\'adresse XMPP</string>
   <string name="server_info_partial">partiel</string>
   <string name="attach_record_video">Enregistrer une vidéo</string>
   <string name="copy_to_clipboard">Copier dans le presse-papier</string>
@@ -660,6 +674,7 @@
   <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="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>
   <string name="action_fix_to_location">Figer la position</string>
@@ -678,7 +693,7 @@
   <string name="view_conversation">Voir la conversation</string>
   <string name="pref_use_share_location_plugin">Plugin de partage de localisation</string>
   <string name="copy_link">Copier l\'adresse internet</string>
-  <string name="copy_jabber_id">Copier le Jabber ID</string>
+  <string name="copy_jabber_id">Copier l\'adresse XMPP</string>
   <string name="p1_s3_filetransfer">Partage de fichier HTTP pour S3</string>
   <string name="pref_start_search">Recherche directe</string>
   <string name="pref_start_search_summary">Sur l\'écran de démarrage de Conversation, afficher le clavier et placer le curseur sur le champ recherche</string>
@@ -705,6 +720,8 @@
   <string name="pref_more_notification_settings_summary">Importance, son, vibration</string>
   <string name="video_compression_channel_name">Compression vidéo</string>
   <string name="view_media">Voir les média</string>
+  <string name="view_users">Voir les participants</string>
+  <string name="group_chat_members">Participants</string>
   <string name="media_browser">Navigateur de média</string>
   <string name="security_violation_not_attaching_file">Fichier omis en raison d\'une violation de la sécurité.</string>
   <string name="pref_video_compression">Qualité de la vidéo</string>
@@ -726,4 +743,48 @@
   <string name="we_have_sent_you_another_sms">Nous vous avons envoyé un autre SMS avec un code à 6 chiffres.</string>
   <string name="please_enter_pin_below">Veuillez saisir ci-dessous le code PIN à 6 chiffres.</string>
   <string name="resend_sms">Renvoyer un SMS.</string>
+  <string name="please_enter_pin">Veuillez entrer votre code PIN à 6 chiffres.</string>
+  <string name="abort_registration_procedure">Vous êtes sûr de vouloir quitter la procédure d\'enregistrement ?</string>
+  <string name="yes">Oui</string>
+  <string name="no">Non</string>
+  <string name="verifying">Vérification....</string>
+  <string name="incorrect_pin">Le code PIN que vous avez entré est incorrect.</string>
+  <string name="pin_expired">Le code PIN que nous vous avons envoyé a expiré.</string>
+  <string name="unable_to_connect_to_server">Impossible de se connecter au serveur.</string>
+  <string name="something_went_wrong_processing_your_request">Une erreur est survenue pendant le traitement de votre requête.</string>
+  <string name="invalid_user_input">Entrée utilisateur incorrecte</string>
+  <string name="temporarily_unavailable">Temporairement indisponible. Réessayez plus tard.</string>
+  <string name="no_network_connection">Pas de connexion réseau.</string>
+  <string name="too_many_attempts">Trop de tentatives</string>
+  <string name="the_app_is_out_of_date">Vous utilisez une version obsolète de cette application.</string>
+  <string name="your_name">Votre nom</string>
+  <string name="enter_your_name">Entrez votre nom</string>
+  <string name="no_name_set_instructions">Utilisez le bouton modifier pour définir votre nom.</string>
+  <string name="reject_request">Rejeter la demande</string>
+  <string name="ebook">e-book</string>
+  <string name="video_original">Original (non compressé)</string>
+  <string name="open_with">Ouvrir avec...</string>
+  <string name="set_profile_picture">Photo de profil pour Conversations</string>
+  <string name="choose_account">Choisir un compte</string>
+  <string name="restore_backup">Restaurer la sauvegarde</string>
+  <string name="restore">Restaurer</string>
+  <string name="unable_to_restore_backup">Impossible de restaurer la sauvegarde.</string>
+  <string name="unable_to_decrypt_backup">Impossible de déchiffrer la sauvegarde. Le mot de passe est-il correct ?</string>
+  <string name="backup_channel_name">Sauvegarde &amp; restauration</string>
+  <string name="enter_jabber_id">Entrez l\'adresse XMPP</string>
+  <string name="xmpp_address">Adresse XMPP</string>
+  <string name="please_enter_xmpp_address">Veuillez renseigner une adresse XMPP</string>
+  <string name="this_is_an_xmpp_address">Ceci est une adresse XMPP. Veuillez renseigner un nom.</string>
+  <string name="allow_participants_to_edit_subject">Autoriser quiconque à éditer le sujet</string>
+  <string name="allow_participants_to_invite_others">Permettre à quiconque d\'inviter d\'autres personnes</string>
+  <string name="anyone_can_edit_subject">N\'importe qui peut éditer le sujet.</string>
+  <string name="owners_can_edit_subject">Les propriétaires peuvent éditer le sujet.</string>
+  <string name="admins_can_edit_subject">Les administrateurs peuvent modifier le sujet.</string>
+  <string name="owners_can_invite_others">Les propriétaires peuvent inviter d\'autres personnes.</string>
+  <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="manage_permission">Gérer les privilèges</string>
+  <string name="search_participants">Rechercher des participants</string>
+  <string name="file_too_large">Fichier trop volumineux</string>
 </resources>

src/main/res/values-gl/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Pechar esta conversa</string>
   <string name="action_contact_details">Detalles do contacto</string>
   <string name="action_muc_details">Detalles da conversa de grupo</string>
+  <string name="channel_details">Detalles do canal</string>
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Engadir conta</string>
   <string name="action_edit_contact">Editar contacto</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Compartir con</string>
   <string name="start_conversation">Comezar conversa</string>
   <string name="invite_contact">Invitar contacto</string>
+  <string name="invite">Convidar</string>
   <string name="contacts">Contactos</string>
   <string name="contact">Contacto</string>
   <string name="cancel">Cancelar</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">Seguro?</string>
   <string name="mgmt_account_delete_confirm_text">Si elimina a conta perderá todo o historial de conversas</string>
   <string name="attach_record_voice">Grabar audio</string>
-  <string name="account_settings_jabber_id">ID Jabber</string>
-  <string name="block_jabber_id">Bloquear ID Jabber</string>
+  <string name="account_settings_jabber_id">Enderezo XMPP</string>
+  <string name="block_jabber_id">Bloquear enderezo XMPP</string>
   <string name="account_settings_example_jabber_id">usuaria@exemplo.com</string>
   <string name="password">Contrasinal</string>
-  <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
+  <string name="invalid_jid">Non é un enderezo XMPP válido</string>
   <string name="error_out_of_memory">Exceso de memoria. A imaxe é demasiado grande</string>
   <string name="add_phone_book_text">Quere engadir a 1%s a súa libreta de enderezos?</string>
   <string name="server_info_show_more">Info do servidor</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Obtendo chaves...</string>
   <string name="done">Feito</string>
   <string name="decrypt">Descifrar</string>
+  <string name="bookmarks">Marcadores</string>
   <string name="search">Buscar</string>
   <string name="enter_contact">Introducir contacto</string>
   <string name="delete_contact">Eliminar contacto</string>
@@ -220,11 +223,16 @@
   <string name="select">Selecionar</string>
   <string name="contact_already_exists">Xa existe o contacto</string>
   <string name="join">Unirse</string>
+  <string name="channel_full_jid_example">canal@sala.exemplo.com/alcume</string>
+  <string name="channel_bare_jid_example">canal@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_channel">Eliminar canal</string>
   <string name="destroy_room_dialog">Está segura 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_channel_dialog">Está segura de que quere eliminar o canal?\n\n<b>Aviso:</b> O canal eliminarase completamente do servidor.</string>
   <string name="could_not_destroy_room">Non se desfixo a conversa en grupo</string>
+  <string name="could_not_destroy_channel">Non se puido eliminar o canal</string>
   <string name="bookmark_already_exists">Este marcador xa existe</string>
   <string name="action_edit_subject">Editar o tema da conversa en grupo</string>
   <string name="topic">Asunto</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Enviar de novo</string>
   <string name="file_url">URL do ficheiro</string>
   <string name="url_copied_to_clipboard">URL copiado ao portapapeis</string>
-  <string name="jabber_id_copied_to_clipboard">ID Jabber copiado ao portapapeis</string>
+  <string name="jabber_id_copied_to_clipboard">Copiouse o enderezo XMPP ao portapapeis</string>
   <string name="error_message_copied_to_clipboard">Mensaxe do fallo copiado ao portapapeis</string>
   <string name="web_address">Dirección Web</string>
   <string name="scan_qr_code">Escanear código de barras 2D</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Inténteo de novo</string>
   <string name="pref_keep_foreground_service">Manter servizo en primeiro plano</string>
   <string name="pref_keep_foreground_service_summary">Evita que o sistema operativo corte a súa conexión</string>
+  <string name="pref_create_backup">Crear respaldo</string>
+  <string name="pref_create_backup_summary">Os ficheiros de respaldo gardaranse en %s</string>
+  <string name="notification_create_backup_title">Creando ficheiros de respaldo</string>
+  <string name="notification_backup_created_title">Creouse o respaldo</string>
+  <string name="notification_backup_created_subtitle">Os ficheiros de respaldo gardáronse en %s</string>
+  <string name="restoring_backup">Restaurando o respaldo</string>
+  <string name="notification_restored_backup_title">O seu respaldo foi restablecido</string>
+  <string name="notification_restored_backup_subtitle">Non esqueza activar a conta.</string>
   <string name="choose_file">Escoller ficheiro</string>
   <string name="receiving_x_file">Recibindo %1$s (%2$d %% completado)</string>
   <string name="download_x_file">Descargar %s</string>
@@ -353,14 +369,25 @@
   <string name="outcast">Outcast</string>
   <string name="member">Membro</string>
   <string name="advanced_mode">Modo avanzado</string>
+  <string name="grant_membership">Conceder privilexios de membresía</string>
+  <string name="remove_membership">Retirar privilexios de membresía</string>
   <string name="grant_admin_privileges">Dar privilexios de administración</string>
   <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_channel">Retirar do canal</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_channel">Prohibir no canal</string>
+  <string name="removing_from_public_conference">Está a eliminar %s de un canal público. O único xeito de facer esto é vetar esta usuaria 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="channel_options">Configuración do canal público</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 canal como moderado</string>
   <string name="you_are_not_participating">Vostede non está 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>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">Non se atopou un aplicativo para mostrar a localización</string>
   <string name="location">Localización</string>
   <string name="title_undo_swipe_out_conversation">Pechouse a conversa</string>
+  <string name="title_undo_swipe_out_group_chat">Deixar o grupo de conversa privada</string>
+  <string name="title_undo_swipe_out_channel">Deixar o canal público</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>
   <string name="pref_remove_trusted_certificates_title">Eliminar certificados</string>
@@ -413,6 +442,7 @@
   <string name="recently_used">Utilizadas recentemente</string>
   <string name="choose_quick_action">Escolla a acción rápida</string>
   <string name="search_contacts">Buscar contactos</string>
+  <string name="search_bookmarks">Buscar marcadores</string>
   <string name="send_private_message">Enviar mensaxe privada</string>
   <string name="user_has_left_conference">%1$s abandonou a sala!</string>
   <string name="username">Identificador</string>
@@ -446,7 +476,7 @@
   <string name="captcha_required">Requírese Captcha</string>
   <string name="captcha_hint">Introduza o texto da imaxe superior</string>
   <string name="certificate_chain_is_not_trusted">A cadea de certificados non é de confianza</string>
-  <string name="jid_does_not_match_certificate">O ID Jabber non coincide co certificado</string>
+  <string name="jid_does_not_match_certificate">Os enderezos XMPP non concordan co certificado</string>
   <string name="action_renew_certificate">Anvoar certificado</string>
   <string name="error_fetching_omemo_key">Fallo obtendo a chave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Comprobouse a chave OMEMO co certificado!</string>
@@ -496,11 +526,11 @@
   <string name="security_error_invalid_file_access">Fallo na seguridade: Acceso non válido ao ficheiro</string>
   <string name="no_application_to_share_uri">Non se atopou un aplicativo para compartir URI</string>
   <string name="share_uri_with">Compartir URI con...</string>
-  <string name="welcome_text">Jabber é una rede de mensajería instantánea independente do proveedor. Podes usar este cliente con calquera servidor Jabber que elixas.\nCon todo, para a túa comodidade facilitamos a creación dunha conta en conversations.im¹; un proveedor especialmente adecuado para o uso con Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy é un proxecto derivado do popular cliente Jabber/XMPP Conversations con descubrimento automático de contactos.<br><br>Vostede rexístrase co seu número de teléfono e Quicksy suxerirá automáticamente —baseándose nos números de teléfono da súa axenda— posibles contactos para vostede.<br><br>Ao rexistrarse vostede acepta a nosa <a href="https://quicksy.im/#privacy">política de intimidade</a>.]]></string>
+  <string name="welcome_text">XMPP é un fornecedor de mensaxería instantánea independente da rede. Pode utilizar este cliente con calquera servidor XMPP que escolla.\nPorén, para a súa conveniencia, puxémolo fácil para crear unha conta en conversations.im¹; un fornecedor especialmente axeitado para o uso con Conversations.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy é un derivado do popular cliente XMPP Conversations con descubrimento automático de contactos.<br><br>Pode rexistrarse co seu número de teléfono e Quicksy suxeriralle automáticamente —tomando os números da súa libreta de enderezos como referencia—  posibles contactos para vostede.<br><br>Ao rexistarse vostede acepta a nosa <a href="https://quicksy.im/#privacy">política de intimidade</a>.]]></string>
   <string name="agree_and_continue">Aceptar &amp; continuar</string>
-  <string name="magic_create_text">Guiarémola a través do proceso de crear unha conta en conversations.im.\nCando escolla conversations.im como proveedor poderá comunicarse con outras usuarias de outros proveedores que lle proporcionen un ID Jabber completo.</string>
-  <string name="your_full_jid_will_be">O seu ID Jabber será: %s</string>
+  <string name="magic_create_text">Guiarémola a través do proceso de creación de unha conta en conversations.im.¹\nAo escoller a conversations.im como fornecedor poderá comunicar con usuarias de outros fornecedores proporcionándolles o seu enderezo XMPP completo.</string>
+  <string name="your_full_jid_will_be">O seu enderezo XMPP completo será: %s</string>
   <string name="create_account">Crear conta</string>
   <string name="use_own_provider">Utilizar o meu propio proveedor</string>
   <string name="pick_your_username">Escolla un identificador</string>
@@ -634,7 +664,7 @@
   <string name="yesterday">Onte</string>
   <string name="pref_validate_hostname">Validar servidor con DNSSEC</string>
   <string name="pref_validate_hostname_summary">Os certificados de servidor que conteñen o nome de servidor validado considéranse verificados</string>
-  <string name="certificate_does_not_contain_jid">O certificado non contén un ID Jabber</string>
+  <string name="certificate_does_not_contain_jid">O certificado non contén un enderezo XMPP</string>
   <string name="server_info_partial">parcial</string>
   <string name="attach_record_video">Gravar vídeo</string>
   <string name="copy_to_clipboard">Copiar ao portapapeis</string>
@@ -696,7 +726,7 @@
   <string name="pref_use_share_location_plugin">Engadido para Compartir Localización</string>
   <string name="pref_use_share_location_plugin_summary">Utilice o Engadido de Compartir Localización no lugar do mapa incluíndo</string>
   <string name="copy_link">Copiar a dirección web</string>
-  <string name="copy_jabber_id">Copiar a ID de Jabber</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 por o cursor no campo de busca</string>
@@ -723,6 +753,8 @@
   <string name="pref_more_notification_settings_summary">Importancia, Son, Vibrar</string>
   <string name="video_compression_channel_name">Compresión de vídeo</string>
   <string name="view_media">Ver medios</string>
+  <string name="view_users">Ver participantes</string>
+  <string name="group_chat_members">Participantes</string>
   <string name="media_browser">Navegador de medios</string>
   <string name="security_violation_not_attaching_file">Ficheiro omitido debido a transgresión da seguridade.</string>
   <string name="pref_video_compression">Calidade de vídeo</string>
@@ -781,9 +813,45 @@
   <string name="install_orbot">Instalar Orbot</string>
   <string name="start_orbot">Iniciar Orbot</string>
   <string name="no_market_app_installed">Non ten loxa de aplicacións instalada.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Este canal fará público o seu enderezo XMPP</string>
   <string name="ebook">e-book</string>
   <string name="video_original">Orixinal (non comprimido)</string>
   <string name="open_with">Abrir con...</string>
   <string name="set_profile_picture">Imaxe de perfil en Conversations</string>
   <string name="choose_account">Escoller conta</string>
+  <string name="restore_backup">Restablecer respaldo</string>
+  <string name="restore">Restablecer</string>
+  <string name="enter_password_to_restore">Introduza o contrasinal da conta %s para restablecer o respaldo.</string>
+  <string name="restore_warning">Non utilice a función de restaurar o respaldo nun intento de clonar (utilizar simultaneamente) unha instalación. Restaurar un respaldo só ten sentido para migrar ou en caso de perda do dispositivo orixinal.</string>
+  <string name="unable_to_restore_backup">Non se puido restaurar o respaldo.</string>
+  <string name="unable_to_decrypt_backup">Non se puido descifrar o respaldo. É 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="join_public_channel">Unirse a canal público</string>
+  <string name="create_private_group_chat">Crear grupo privado de conversa</string>
+  <string name="create_public_channel">Crear canal público</string>
+  <string name="create_dialog_channel_name">Nome do canal</string>
+  <string name="xmpp_address">Enderezo XMPP</string>
+  <string name="please_enter_name">Por favor, proporcione un nome para o canal</string>
+  <string name="please_enter_xmpp_address">Por favor, proporcione un enderezo XMPP</string>
+  <string name="this_is_an_xmpp_address">Esto é un enderezo XMPP. Por favor, proporcione un nome.</string>
+  <string name="creating_channel">Creando canal público...</string>
+  <string name="channel_already_exists">Este canal xa existe</string>
+  <string name="joined_an_existing_channel">Entrou nun canal existente</string>
+  <string name="unable_to_set_channel_configuration">Non se estableceron os axustes do canal</string>
+  <string name="allow_participants_to_edit_subject">Permitir que calquera cambie o asunto</string>
+  <string name="allow_participants_to_invite_others">Permitir que calquera poida convidar</string>
+  <string name="anyone_can_edit_subject">Calquera pode editar o asunto.</string>
+  <string name="owners_can_edit_subject">As propietarias poden editar o asunto.</string>
+  <string name="admins_can_edit_subject">Admins poden editar o asunto.</string>
+  <string name="owners_can_invite_others">Propietarias poden convidar a outras.</string>
+  <string name="anyone_can_invite_others">Calquera pode convidar a outras.</string>
+  <string name="jabber_ids_are_visible_to_admins">Os enderezos XMPP son visibles para a administración.</string>
+  <string name="jabber_ids_are_visible_to_anyone">Os enderezos XMPP son visibles para calquera.</string>
+  <string name="no_users_hint_channel">Este canal público non ten participantes. Convide aos seus contactos ou utilice o botón compartir para distribuír o seu enderezo XMPP.</string>
+  <string name="no_users_hint_group_chat">Este grupo privado non ten participantes.</string>
+  <string name="manage_permission">Xestionar privilexios</string>
+  <string name="search_participants">Buscar participantes</string>
+  <string name="file_too_large">Ficheiro demasiado grande</string>
 </resources>

src/main/res/values-hu/strings.xml

@@ -171,11 +171,8 @@
   <string name="mgmt_account_are_you_sure">Biztos vagy ebben?</string>
   <string name="mgmt_account_delete_confirm_text">Ha törli fiókját, az egész beszélgetési előzménye elvész</string>
   <string name="attach_record_voice">Hang felvétele</string>
-  <string name="account_settings_jabber_id">Jabber azonosító</string>
-  <string name="block_jabber_id">Jabber azonosító blokkolása</string>
   <string name="account_settings_example_jabber_id">felhasznalo@peldaoldal.com</string>
   <string name="password">Jelszó</string>
-  <string name="invalid_jid">Nem érvényes Jabber azonosító</string>
   <string name="error_out_of_memory">Nincs elég memória. Képfájl túl nagy</string>
   <string name="add_phone_book_text">Szeretnéd %s nevű személyt hozzáadni a névjegyzékhez?</string>
   <string name="server_info_show_more">Szerver részletek</string>
@@ -297,7 +294,6 @@
   <string name="send_again">Elküldi újra</string>
   <string name="file_url">Fájl URL-je</string>
   <string name="url_copied_to_clipboard">URL vágólapra másolása</string>
-  <string name="jabber_id_copied_to_clipboard">A Jabber azonosítót a vágólapra másoltuk</string>
   <string name="error_message_copied_to_clipboard">A hibaüzenetet a vágólapra másoltuk</string>
   <string name="web_address">webcím</string>
   <string name="scan_qr_code">2D vonalkód olvasás</string>
@@ -446,7 +442,6 @@
   <string name="captcha_required">Captcha szükséges</string>
   <string name="captcha_hint">Írja be a fenti képen található szöveget</string>
   <string name="certificate_chain_is_not_trusted">A tanúsítványlánc nem megbízható</string>
-  <string name="jid_does_not_match_certificate">A Jabber azonosító nem egyezik a tanúsítvánnyal</string>
   <string name="action_renew_certificate">Tanúsítvány megújítása</string>
   <string name="error_fetching_omemo_key">Hiba történt az OMEMO kulcs megszerzésében!</string>
   <string name="verified_omemo_key_with_certificate">Igazolt OMEMO kulcs tanúsítvánnyal!</string>
@@ -496,11 +491,7 @@
   <string name="security_error_invalid_file_access">Biztonsági hiba: Érvénytelen fájl hozzáférés</string>
   <string name="no_application_to_share_uri">Nem találtunk URI-t használó alkalmazást</string>
   <string name="share_uri_with">Megosztás URI-ként</string>
-  <string name="welcome_text">A Jabber egy szolgáltató független, azonnali üzenetküldő hálózat. Ezt az ügyfél programot bármelyik Jabber szerverhez használhatja.\nDe a könnyebbség kedvéért létrehozhat egy fiókot a conversations.im¹ szolgáltatón is; ami kifejezetten a Conversations programmal való használatra lett tervezve.</string>
-  <string name="welcome_text_quicksy"><![CDATA[A Quicksy a népszerű Conversations Jabber / XMPP kliens mellékhajtása automatikus kapcsolat felfedezéssel.<br><br>Regisztrál a telefonszámával, és a Quicksy automatikusan - a címjegyzékben szereplő telefonszámok alapján - jelzi a lehetséges kapcsolatokat.<br><br>A feliratkozással elfogadja az<a href="https://quicksy.im/#privacy">adatvédelmi irányelvet</a>.]]></string>
   <string name="agree_and_continue">Egyetért &amp; folytatás</string>
-  <string name="magic_create_text">Végigvezetjük a fiók létrehozás folyamatán a conversations.im-en.¹ \ nHa a conversations.im-et választja szolgáltatójának, akkor képes lesz kommunikálni a más szolgáltatóknál lévő felhasználókkal, ha megadja nekik a teljes Jabber azonosítóját.</string>
-  <string name="your_full_jid_will_be">A teljes Jabber azonosítód ez lesz: %s</string>
   <string name="create_account">Fiók létrehozása</string>
   <string name="use_own_provider">Saját szolgáltató használata</string>
   <string name="pick_your_username">Válassz felhasználónevet</string>
@@ -634,7 +625,6 @@
   <string name="yesterday">Tegnap</string>
   <string name="pref_validate_hostname">Gazdanév validálása DNSSEC-el</string>
   <string name="pref_validate_hostname_summary">A hitelesített gazdanevet tartalmazó kiszolgálói tanúsítványok hitelesek</string>
-  <string name="certificate_does_not_contain_jid">A tanúsítvány nem tartalmaz Jabber azonosítót</string>
   <string name="server_info_partial">részleges</string>
   <string name="attach_record_video">Videó felvétele</string>
   <string name="copy_to_clipboard">Másolja a vágólapra</string>
@@ -696,7 +686,6 @@
   <string name="pref_use_share_location_plugin">Helymegosztás bővítmény</string>
   <string name="pref_use_share_location_plugin_summary">A beépített térkép helyett használja a \"Share Location Plugin\"-t</string>
   <string name="copy_link">Webcím másolása</string>
-  <string name="copy_jabber_id">Jabber azonosító másolása</string>
   <string name="p1_s3_filetransfer">HTTP fájlmegosztás S3-nak</string>
   <string name="pref_start_search">Közvetlen keresés</string>
   <string name="pref_start_search_summary">A \"Beszélgessünk\" képernyőn nyissa meg a billentyűzetet, és helyezze a kurzort a keresőmezőbe</string>

src/main/res/values-id/strings.xml

@@ -135,10 +135,8 @@
   <string name="mgmt_account_enable">Aktifkan Akun</string>
   <string name="mgmt_account_are_you_sure">Apakah Anda yakin.?</string>
   <string name="attach_record_voice">Rekam suara</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Password</string>
-  <string name="invalid_jid">Jabber ID tidak valid</string>
   <string name="error_out_of_memory">Memori habis. Gambar terlalu besar</string>
   <string name="server_info_show_more">Info Server</string>
   <string name="server_info_mam">XEP-0313: MAM</string>
@@ -337,7 +335,6 @@
   <string name="correct_message">Perbaiki pesan</string>
   <string name="send_corrected_message">Kirim perbaikan pesan</string>
   <string name="share_uri_with">Bagikan URI dengan...</string>
-  <string name="your_full_jid_will_be">Jabber ID anda akan seperti: %s</string>
   <string name="create_account">Buat Akun</string>
   <string name="pick_your_username">Pilih username anda</string>
   <string name="status_message">Status</string>

src/main/res/values-it/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Chiudi questa conversazione</string>
   <string name="action_contact_details">Dettagli del contatto</string>
   <string name="action_muc_details">Dettagli chat di gruppo</string>
+  <string name="channel_details">Dettagli canale</string>
   <string name="action_secure">Conversazione sicura</string>
   <string name="action_add_account">Aggiungi account</string>
   <string name="action_edit_contact">Modifica il nome</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Condividi con</string>
   <string name="start_conversation">Inizia conversazione</string>
   <string name="invite_contact">Invita contatto</string>
+  <string name="invite">Invita</string>
   <string name="contacts">Contatti</string>
   <string name="contact">Contatto</string>
   <string name="cancel">Annulla</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">Sei sicuro?</string>
   <string name="mgmt_account_delete_confirm_text">Se elimini il tuo account perderai tutta la cronologia delle conversazioni</string>
   <string name="attach_record_voice">Registra la voce</string>
-  <string name="account_settings_jabber_id">ID Jabber</string>
-  <string name="block_jabber_id">Blocca ID Jabber</string>
+  <string name="account_settings_jabber_id">Indirizzo XMPP</string>
+  <string name="block_jabber_id">Blocca indirizzo XMPP</string>
   <string name="account_settings_example_jabber_id">utente@esempio.com</string>
   <string name="password">Password</string>
-  <string name="invalid_jid">Questo non è un ID Jabber valido</string>
+  <string name="invalid_jid">Questo non è un indirizzo XMPP valido</string>
   <string name="error_out_of_memory">Memoria esaurita. L’immagine è tropppo grande</string>
   <string name="add_phone_book_text">Vuoi aggiungere %s alla tua rubrica?</string>
   <string name="server_info_show_more">Info server</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Ricezione chiavi...</string>
   <string name="done">Fatto</string>
   <string name="decrypt">Decripta</string>
+  <string name="bookmarks">Segnalibri</string>
   <string name="search">Cerca</string>
   <string name="enter_contact">Inserisci contatto</string>
   <string name="delete_contact">Elimina contatto</string>
@@ -220,11 +223,16 @@
   <string name="select">Seleziona</string>
   <string name="contact_already_exists">Il contatto esiste già</string>
   <string name="join">Entra</string>
+  <string name="channel_full_jid_example">canale@conferenza.esempio.com/nick</string>
+  <string name="channel_bare_jid_example">canale@conferenza.esempio.com</string>
   <string name="save_as_bookmark">Salva come segnalibro</string>
   <string name="delete_bookmark">Elimina segnalibro</string>
   <string name="destroy_room">Distruggi chat di gruppo</string>
+  <string name="destroy_channel">Distruggi canale</string>
   <string name="destroy_room_dialog">Sei sicuro di voler distruggere questa chat di gruppo?\n\n<b>Attenzione:</b> la chat di gruppo verrà completamente rimossa dal server.</string>
+  <string name="destroy_channel_dialog">Sei sicuro di voler distruggere questo canale pubblico?\n\n<b>Attenzione:</b> il canale verrà completamente rimosso sul server.</string>
   <string name="could_not_destroy_room">Distruzione della chat di gruppo fallita</string>
+  <string name="could_not_destroy_channel">Distruzione canale fallita</string>
   <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
   <string name="action_edit_subject">Modifica titolo chat di gruppo</string>
   <string name="topic">Argomento</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Invia di nuovo</string>
   <string name="file_url">URL del file</string>
   <string name="url_copied_to_clipboard">URL copiato negli appunti</string>
-  <string name="jabber_id_copied_to_clipboard">ID Jabber copiato negli appunti</string>
+  <string name="jabber_id_copied_to_clipboard">Indirizzo XMPP copiato negli appunti</string>
   <string name="error_message_copied_to_clipboard">Messaggio di errore copiato negli appunti</string>
   <string name="web_address">indirizzo web</string>
   <string name="scan_qr_code">Scansiona codice a barre 2D</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Prova di nuovo</string>
   <string name="pref_keep_foreground_service">Mantieni il servizio in primo piano</string>
   <string name="pref_keep_foreground_service_summary">Evita che il sistema operativo chiuda la connessione</string>
+  <string name="pref_create_backup">Crea backup</string>
+  <string name="pref_create_backup_summary">I file di backup verranno salvati in %s</string>
+  <string name="notification_create_backup_title">Creazione file di backup</string>
+  <string name="notification_backup_created_title">Il tuo backup è stato creato</string>
+  <string name="notification_backup_created_subtitle">I file di backup sono stati salvati in %s</string>
+  <string name="restoring_backup">Ripristino backup</string>
+  <string name="notification_restored_backup_title">Il tuo backup è stato ripristinato</string>
+  <string name="notification_restored_backup_subtitle">Non dimenticare di attivare l\'account.</string>
   <string name="choose_file">Scegli un file</string>
   <string name="receiving_x_file">Ricezione di %1$s file (%2$d%% completato)</string>
   <string name="download_x_file">Scarica %s</string>
@@ -353,14 +369,25 @@
   <string name="outcast">Emarginato</string>
   <string name="member">Membro</string>
   <string name="advanced_mode">Modalità avanzata</string>
+  <string name="grant_membership">Concedi appartenenza</string>
+  <string name="remove_membership">Revoca appartenenza</string>
   <string name="grant_admin_privileges">Concedi i privilegi di amministratore</string>
   <string name="remove_admin_privileges">Revoca i privilegi di amministratore</string>
+  <string name="grant_owner_privileges">Rendi proprietario</string>
+  <string name="remove_owner_privileges">Revoca privilegi di proprietario</string>
   <string name="remove_from_room">Rimuovi dalla chat di gruppo</string>
+  <string name="remove_from_channel">Rimuovi dal canale</string>
   <string name="could_not_change_affiliation">Impossibile cambiare l’affiliazione di %s</string>
   <string name="ban_from_conference">Bandisci dalla chat di gruppo</string>
+  <string name="ban_from_channel">Bandisci dal canale</string>
+  <string name="removing_from_public_conference">Stai tentando di rimuovere %s da un canale pubblico. L\'unico modo per farlo è di bandire quell\'utente per sempre.</string>
   <string name="ban_now">Bandisci</string>
   <string name="could_not_change_role">Impossibile cambiare ruolo di %s</string>
+  <string name="conference_options">Configurazione chat di gruppo privata</string>
+  <string name="channel_options">Configurazione canale pubblico</string>
   <string name="members_only">Privato, solo membri</string>
+  <string name="non_anonymous">Rendi gli indirizzi XMPP visibili a chiunque</string>
+  <string name="moderated">Rendi il canale moderato</string>
   <string name="you_are_not_participating">Non stai partecipando</string>
   <string name="modified_conference_options">Opzioni della chat di gruppo modificate!</string>
   <string name="could_not_modify_conference_options">Impossibile modificare le opzioni della chat di gruppo</string>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">Non è stata trovata alcuna applicazione per mostrare la posizione</string>
   <string name="location">Posizione</string>
   <string name="title_undo_swipe_out_conversation">Conversazione interrotta</string>
+  <string name="title_undo_swipe_out_group_chat">Chat di gruppo privata abbandonata</string>
+  <string name="title_undo_swipe_out_channel">Canale pubblico abbandonato</string>
   <string name="pref_dont_trust_system_cas_title">Non ti fidare delle CA di sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Tutti i certificati devono essere accettati manualmente</string>
   <string name="pref_remove_trusted_certificates_title">Elimina i certificati</string>
@@ -413,6 +442,7 @@
   <string name="recently_used">Usati recentemente</string>
   <string name="choose_quick_action">Scegli azione rapida</string>
   <string name="search_contacts">Cerca contatti</string>
+  <string name="search_bookmarks">Cerca segnalibri</string>
   <string name="send_private_message">Invia messaggio privato</string>
   <string name="user_has_left_conference">%1$s ha abbandonato la chat di gruppo!</string>
   <string name="username">Utente</string>
@@ -446,7 +476,7 @@
   <string name="captcha_required">Captcha richiesto</string>
   <string name="captcha_hint">Inserisci il testo dell\'immagine soprastante</string>
   <string name="certificate_chain_is_not_trusted">Catena di certificati non affidabile</string>
-  <string name="jid_does_not_match_certificate">L\'ID Jabber non corrisponde al certificato</string>
+  <string name="jid_does_not_match_certificate">L\'indirizzo XMPP non corrisponde al certificato</string>
   <string name="action_renew_certificate">Rinnova certificato</string>
   <string name="error_fetching_omemo_key">Errore ricezione chiave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Chiave OMEMO verificata con certificato!</string>
@@ -496,11 +526,11 @@
   <string name="security_error_invalid_file_access">Errore di sicurezza: accesso file non valido</string>
   <string name="no_application_to_share_uri">Nessuna applicazione trovata per condividere l\'URI</string>
   <string name="share_uri_with">Condividi l\'URI con...</string>
-  <string name="welcome_text">Jabber è una rete di messaggeria istantanea indipendente dal provider. Puoi usare questo client con qualsiasi server Jabber scelto.\nComunque, per tua comodità, abbiamo semplificato la creazione di un account su conversations.im¹; un provider particolarmente adatto all\'uso con Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy è una variante del popolare client Jabber/XMPP Conversations con ricerca automatica dei contatti.<br><br>Ti registri con il tuo numero di telefono e Quicksy ti suggerirà—in base ai numeri di telefono nella tua rubrica—automaticamente i possibili contatti.<br><br>Registrandoti accetti la nostra <a href="https://quicksy.im/#privacy">politica sulla privacy</a>.]]></string>
+  <string name="welcome_text">XMPP è una rete di messaggeria istantanea indipendente dal provider. Puoi usare questo client con qualsiasi server XMPP scelto.\nComunque, per tua comodità, abbiamo semplificato la creazione di un account su conversations.im¹; un provider particolarmente adatto all\'uso con Conversations.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy è una variante del popolare client XMPP Conversations con ricerca automatica dei contatti.<br><br>Ti registri con il tuo numero di telefono e Quicksy ti suggerirà—in base ai numeri di telefono nella tua rubrica—automaticamente i possibili contatti.<br><br>Registrandoti accetti la nostra <a href="https://quicksy.im/#privacy">politica sulla privacy</a>.]]></string>
   <string name="agree_and_continue">Accetta e continua</string>
-  <string name="magic_create_text">Ti guideremo nel processo di creazione di un account su conversations.im.¹\nQuando scegli conversations.im come provider potrai comunicare con utenti di altri provider dando il tuo ID Jabber completo.</string>
-  <string name="your_full_jid_will_be">Il tuo ID Jabber completo sarà: %s</string>
+  <string name="magic_create_text">Ti guideremo nel processo di creazione di un account su conversations.im.¹\nQuando scegli conversations.im come provider potrai comunicare con utenti di altri provider dando il tuo indirizzo XMPP completo.</string>
+  <string name="your_full_jid_will_be">Il tuo indirizzo XMPP completo sarà: %s</string>
   <string name="create_account">Crea account</string>
   <string name="use_own_provider">Usa un altro provider</string>
   <string name="pick_your_username">Scegli il tuo nome utente</string>
@@ -634,7 +664,7 @@
   <string name="yesterday">Ieri</string>
   <string name="pref_validate_hostname">Convalida hostname con DNSSEC</string>
   <string name="pref_validate_hostname_summary">I certificati dei server che contengono l\'hostname convalidato sono considerati verificati</string>
-  <string name="certificate_does_not_contain_jid">Il certificato non contiene un ID Jabber</string>
+  <string name="certificate_does_not_contain_jid">Il certificato non contiene un indirizzo XMPP</string>
   <string name="server_info_partial">parziale</string>
   <string name="attach_record_video">Registra un video</string>
   <string name="copy_to_clipboard">Copia negli appunti</string>
@@ -696,7 +726,7 @@
   <string name="pref_use_share_location_plugin">Plugin Condivisione Posizione</string>
   <string name="pref_use_share_location_plugin_summary">Usa il plugin Condividi Posizione al posto della mappa integrata</string>
   <string name="copy_link">Copia indirizzo web</string>
-  <string name="copy_jabber_id">Copia ID Jabber</string>
+  <string name="copy_jabber_id">Copia indirizzo XMPP</string>
   <string name="p1_s3_filetransfer">Condivisione file in HTTP per S3</string>
   <string name="pref_start_search">Ricerca diretta</string>
   <string name="pref_start_search_summary">Nella schermata \'Inizia conversazione\' apri la tastiera e posiziona il cursore nella casella di ricerca</string>
@@ -723,6 +753,8 @@
   <string name="pref_more_notification_settings_summary">Importanza, suono, vibrazione</string>
   <string name="video_compression_channel_name">Compressione video</string>
   <string name="view_media">Vedi i media</string>
+  <string name="view_users">Vedi i partecipanti</string>
+  <string name="group_chat_members">Partecipanti</string>
   <string name="media_browser">Browser multimediale</string>
   <string name="security_violation_not_attaching_file">File omesso per violazione di sicurezza.</string>
   <string name="pref_video_compression">Qualità video</string>
@@ -781,9 +813,45 @@
   <string name="install_orbot">Installa Orbot</string>
   <string name="start_orbot">Avvia Orbot</string>
   <string name="no_market_app_installed">Nessuna app market installata.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Questo canale renderà pubblico il tuo indirizzo XMPP</string>
   <string name="ebook">e-book</string>
   <string name="video_original">Originale (non compresso)</string>
   <string name="open_with">Apri con…</string>
   <string name="set_profile_picture">Immagine profilo di Conversations</string>
   <string name="choose_account">Scegli account</string>
+  <string name="restore_backup">Ripristina backup</string>
+  <string name="restore">Ripristina</string>
+  <string name="enter_password_to_restore">Inserisci la tua password per l\'account %s per ripristinare il backup.</string>
+  <string name="restore_warning">Non usare la funzione di ripristino del backup tentando di clonare (eseguire simultaneamente) un\'installazione. Il ripristino di un backup è inteso solo per migrazioni o in caso di smarrimento del dispositivo.</string>
+  <string name="unable_to_restore_backup">Impossibile ripristinare il backup.</string>
+  <string name="unable_to_decrypt_backup">Impossibile decifrare il backup. La password è giusta?</string>
+  <string name="backup_channel_name">Backup e ripristino</string>
+  <string name="enter_jabber_id">Inserisci l\'indirizzo XMPP</string>
+  <string name="create_group_chat">Crea chat di gruppo</string>
+  <string name="join_public_channel">Entra in un canale pubblico</string>
+  <string name="create_private_group_chat">Crea chat di gruppo privata</string>
+  <string name="create_public_channel">Crea canale pubblico</string>
+  <string name="create_dialog_channel_name">Nome del canale</string>
+  <string name="xmpp_address">Indirizzo XMPP</string>
+  <string name="please_enter_name">Fornire un nome per il canale</string>
+  <string name="please_enter_xmpp_address">Fornire un indirizzo XMPP</string>
+  <string name="this_is_an_xmpp_address">Questo è un indirizzo XMPP. Fornisci un nome.</string>
+  <string name="creating_channel">Creazione canale pubblico…</string>
+  <string name="channel_already_exists">Questo canale esiste già</string>
+  <string name="joined_an_existing_channel">Sei entrato in un canale esistente</string>
+  <string name="unable_to_set_channel_configuration">Impossibile impostare la configurazione del canale</string>
+  <string name="allow_participants_to_edit_subject">Permetti a chiunque di modificare l\'argomento</string>
+  <string name="allow_participants_to_invite_others">Permetti a chiunque di invitare altri</string>
+  <string name="anyone_can_edit_subject">Chiunque può modificare l\'argomento.</string>
+  <string name="owners_can_edit_subject">I proprietari possono modificare l\'argomento.</string>
+  <string name="admins_can_edit_subject">Gli admin possono modificare l\'argomento.</string>
+  <string name="owners_can_invite_others">I proprietari possono invitare altri.</string>
+  <string name="anyone_can_invite_others">Chiunque può invitare altri.</string>
+  <string name="jabber_ids_are_visible_to_admins">Gli indirizzi XMPP sono visibili agli admin.</string>
+  <string name="jabber_ids_are_visible_to_anyone">Gli indirizzi XMPP sono visibili a chiunque.</string>
+  <string name="no_users_hint_channel">Questo canale pubblico non ha partecipanti. Invita i tuoi contatti o usa il pulsante condividi per distribuirne l\'indirizzo XMPP.</string>
+  <string name="no_users_hint_group_chat">Questa chat di gruppo privata non ha partecipanti.</string>
+  <string name="manage_permission">Gestisci i privilegi</string>
+  <string name="search_participants">Cerca partecipanti</string>
+  <string name="file_too_large">File troppo grande</string>
 </resources>

src/main/res/values-iw/strings.xml

@@ -126,10 +126,8 @@
   <string name="mgmt_account_enable">הפעל חשבון</string>
   <string name="mgmt_account_are_you_sure">האם אתה בטוח?</string>
   <string name="attach_record_voice">הקלט קול</string>
-  <string name="account_settings_jabber_id">מזהה Jabber</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">סיסמה</string>
-  <string name="invalid_jid">מזהה ה Jabber אינו תקין</string>
   <string name="error_out_of_memory">חסר זיכרון. תצלום גדול מדי</string>
   <string name="server_info_show_more">פרטי השרת</string>
   <string name="server_info_mam">XEP-0313: MAM - היסטוריית שרת</string>
@@ -318,7 +316,6 @@
   <string name="authenticate_with_certificate">השאר ריק כדי להזדהות בלי תעודה</string>
   <string name="captcha_required">דרוש טקסט Captcha</string>
   <string name="certificate_chain_is_not_trusted">שרשרת תעודה אינה מהימנה</string>
-  <string name="jid_does_not_match_certificate">אין התאמה בין מזהה Jabber לבין תעודה</string>
   <string name="action_renew_certificate">חידוש תעודה</string>
   <string name="error_fetching_omemo_key">שגיאה בתפיסת OMEMO!</string>
   <string name="pref_use_tor">התחבר דרך Tor</string>

src/main/res/values-ja/strings.xml

@@ -171,11 +171,8 @@
   <string name="mgmt_account_are_you_sure">よろしいですか?</string>
   <string name="mgmt_account_delete_confirm_text">アカウントを削除すると、会話履歴すべてが失われます</string>
   <string name="attach_record_voice">音声を録音</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">Jabber ID をブロック</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">パスワード</string>
-  <string name="invalid_jid">これは有効な Jabber ID ではありません</string>
   <string name="error_out_of_memory">メモリ不足です。画像が大きすぎます</string>
   <string name="add_phone_book_text">%s をお使いのアドレス帳に追加しますか?</string>
   <string name="server_info_show_more">サーバー情報</string>
@@ -297,7 +294,6 @@
   <string name="send_again">再送</string>
   <string name="file_url">ファイル URL</string>
   <string name="url_copied_to_clipboard">URL をクリップボードにコピーしました</string>
-  <string name="jabber_id_copied_to_clipboard">Jabber ID をクリップボードにコピーしました</string>
   <string name="error_message_copied_to_clipboard">エラーメッセージをクリップボードにコピーしました</string>
   <string name="web_address">ウェブアドレス</string>
   <string name="scan_qr_code">2D バーコードをスキャン</string>
@@ -445,7 +441,6 @@
   <string name="captcha_required">キャプチャが必要です</string>
   <string name="captcha_hint">上の画像からテキストを入力してください</string>
   <string name="certificate_chain_is_not_trusted">証明書チェーンは信頼済ではありません</string>
-  <string name="jid_does_not_match_certificate">Jabber ID が証明書と一致しません</string>
   <string name="action_renew_certificate">証明書を更新</string>
   <string name="error_fetching_omemo_key">OMEMO 鍵の取得中にエラー!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO 鍵の取得中にエラー!</string>
@@ -493,8 +488,6 @@
   <string name="security_error_invalid_file_access">セキュリティエラー: 不正なファイルアクセス</string>
   <string name="no_application_to_share_uri">URI を共有するアプリケーションが見つかりません</string>
   <string name="share_uri_with">…で URI を共有</string>
-  <string name="magic_create_text">conversations.imのアカウントを作成する手順をガイドします。\nプロバイダーとしてconversations.imを選択すると、あなたの完全なJabber IDを指定することによって、他のプロバイダーのユーザと通信することができるようになります。</string>
-  <string name="your_full_jid_will_be">あなたの完全な Jabber ID は: %s</string>
   <string name="create_account">アカウントを作成</string>
   <string name="use_own_provider">独自のプロバイダーを使用する</string>
   <string name="pick_your_username">ユーザー名を選択</string>
@@ -616,7 +609,6 @@
   <string name="yesterday">昨日</string>
   <string name="pref_validate_hostname">DNSSEC でホスト名を検証</string>
   <string name="pref_validate_hostname_summary">検証されたホスト名を含むサーバー証明書は検証済みと見なされます</string>
-  <string name="certificate_does_not_contain_jid">証明書に Jabber ID が含まれていません</string>
   <string name="server_info_partial">一時的</string>
   <string name="attach_record_video">ビデオを録画</string>
   <string name="copy_to_clipboard">クリップボードにコピー</string>
@@ -650,7 +642,6 @@
   <string name="search_messages">メッセージを検索</string>
   <string name="gif">GIF</string>
   <string name="copy_link">ウェブアドレスをコピー</string>
-  <string name="copy_jabber_id">Jabber ID をコピー</string>
   <string name="yes">はい</string>
   <string name="no">いいえ</string>
   <string name="verifying">検証しています…</string>

src/main/res/values-ko/strings.xml

@@ -146,11 +146,8 @@
   <string name="mgmt_account_enable">계정 사용 </string>
   <string name="mgmt_account_are_you_sure">확실합니까? </string>
   <string name="attach_record_voice">녹음 </string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">Jabber ID 차단</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">암호 </string>
-  <string name="invalid_jid">올바른 Jabber ID가 아닙니다 </string>
   <string name="error_out_of_memory">메모리 부족. 이미지 용량이 너무 큽니다 </string>
   <string name="add_phone_book_text">주소록에 %s를 추가하시겠습니까?</string>
   <string name="server_info_show_more">서버 정보 </string>
@@ -374,7 +371,6 @@
   <string name="captcha_required">Captcha가 필요함</string>
   <string name="captcha_hint">위의 이미지에서 텍스트를 입력하십시오</string>
   <string name="certificate_chain_is_not_trusted">인증서 체인을 신뢰할 수 없습니다</string>
-  <string name="jid_does_not_match_certificate">Jabber ID가 인증서와 일치하지 않습니다</string>
   <string name="action_renew_certificate">인증서 갱신</string>
   <string name="error_fetching_omemo_key">OMEMO key를 가져오는 도중 오류가 발생했습니다</string>
   <string name="verified_omemo_key_with_certificate">OMEMO 키와 인증서 검증됨</string>
@@ -415,8 +411,6 @@
   <string name="security_error_invalid_file_access">보안 오류 : 잘못된 파일 액세스</string>
   <string name="no_application_to_share_uri">URI를 공유하는 응용 프로그램을 찾을 수 없습니다</string>
   <string name="share_uri_with">URI를 공유할 대상...</string>
-  <string name="magic_create_text">conversations. im 계정을 만드는 단계를 안내합니다. \n 제공자로 conversations. im을 선택하면 당신의 완전한 Jabber ID를 지정하여 다른 공급자의 사용자와 통신 할 수 있습니다.</string>
-  <string name="your_full_jid_will_be">나의 전체 Jabber ID: %s</string>
   <string name="create_account">계정 생성</string>
   <string name="use_own_provider">다른 서버 이용</string>
   <string name="pick_your_username">유저네임을 고르세요</string>

src/main/res/values-nb-rNO/strings.xml

@@ -158,11 +158,8 @@
   <string name="mgmt_account_are_you_sure">Bekreft.</string>
   <string name="mgmt_account_delete_confirm_text">Hvis du sletter kontoen din, vil hele samtalehistorikken gå tapt.</string>
   <string name="attach_record_voice">Ta opp stemme</string>
-  <string name="account_settings_jabber_id">Jabber-ID</string>
-  <string name="block_jabber_id">Blokker XMPP-ID</string>
   <string name="account_settings_example_jabber_id">brukernavn@eksempel.no</string>
   <string name="password">Passord</string>
-  <string name="invalid_jid">Dette er ikke en gyldig Jabber-ID</string>
   <string name="error_out_of_memory">Slapp opp for minne, bildet er for stort</string>
   <string name="add_phone_book_text">Ønsker du å legge %s til i din kontaktliste?</string>
   <string name="server_info_show_more">Tjenerinfo</string>
@@ -413,7 +410,6 @@
   <string name="captcha_required">CAPTCHA-påkrevd</string>
   <string name="captcha_hint">Skriv inn teksten fra bildet ovenfor</string>
   <string name="certificate_chain_is_not_trusted">Sertifikat-kjeden er ikke betrodd</string>
-  <string name="jid_does_not_match_certificate">Jabber-ID-en samsvarer ikke med sertifikatet</string>
   <string name="action_renew_certificate">Forny sertifikat</string>
   <string name="error_fetching_omemo_key">Feil ved innhenting av OMEMO-nøkkel!</string>
   <string name="verified_omemo_key_with_certificate">Bekreftet OMEMO-nøkkel med sertifikat!</string>
@@ -457,8 +453,6 @@
   <string name="security_error_invalid_file_access">Sikkerhetsfeil: Ugyldig filtilgang</string>
   <string name="no_application_to_share_uri">Fant inget program til deling av URI</string>
   <string name="share_uri_with">Del URI med…</string>
-  <string name="magic_create_text">Vi geleider deg gjennom prosessen med å opprette en konto på conversations.im.¹\nNår du velger conversations.im som tilbyder vil du kunne snakke med brukere fra andre tilbyder ved å gi dem din fulle XMPP-ID.</string>
-  <string name="your_full_jid_will_be">Din fulle Jabber-ID vil være: %s</string>
   <string name="create_account">Opprett konto</string>
   <string name="use_own_provider">Bruk min egen tilbyder</string>
   <string name="pick_your_username">Velg ditt brukernavn</string>
@@ -562,7 +556,6 @@
   <string name="yesterday">I går</string>
   <string name="pref_validate_hostname">Gyldig vertsnavn med DNSSEC</string>
   <string name="pref_validate_hostname_summary">Tjenersertifikat som inneholder gyldige vertsnavn anses som bekreftet</string>
-  <string name="certificate_does_not_contain_jid">Tjenersertifikatet inneholder ikke en Jabber-ID</string>
   <string name="server_info_partial">delvis</string>
   <string name="attach_record_video">Ta opp video</string>
   <string name="copy_to_clipboard">Kopier til utklippstavle</string>

src/main/res/values-nl/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Dit gesprek sluiten</string>
   <string name="action_contact_details">Contactgegevens</string>
   <string name="action_muc_details">Gespreksgegevens</string>
+  <string name="channel_details">Kanaalinformatie</string>
   <string name="action_secure">Beveiligd gesprek</string>
   <string name="action_add_account">Account toevoegen</string>
   <string name="action_edit_contact">Naam veranderen</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Delen met…</string>
   <string name="start_conversation">Gesprek beginnen</string>
   <string name="invite_contact">Contact uitnodigen</string>
+  <string name="invite">Uitnodigen</string>
   <string name="contacts">Contacten</string>
   <string name="contact">Contact</string>
   <string name="cancel">Annuleren</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">Weet je het zeker?</string>
   <string name="mgmt_account_delete_confirm_text">Als je je account verwijdert, wordt je volledige gespreksgeschiedenis gewist</string>
   <string name="attach_record_voice">Stem opnemen</string>
-  <string name="account_settings_jabber_id">Jabber-ID:</string>
-  <string name="block_jabber_id">Jabber-ID blokkeren</string>
+  <string name="account_settings_jabber_id">XMPP-adres</string>
+  <string name="block_jabber_id">XMPP-adres blokkeren</string>
   <string name="account_settings_example_jabber_id">gebruikersnaam@voorbeeld.nl</string>
   <string name="password">Wachtwoord</string>
-  <string name="invalid_jid">Dit is geen geldige Jabber-ID</string>
+  <string name="invalid_jid">Dit is geen geldig XMPP-adres</string>
   <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
   <string name="add_phone_book_text">Wil je %s toevoegen aan je adresboek?</string>
   <string name="server_info_show_more">Server-info</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Sleutels ophalen…</string>
   <string name="done">Klaar</string>
   <string name="decrypt">Ontsleutelen</string>
+  <string name="bookmarks">Bladwijzers</string>
   <string name="search">Zoeken</string>
   <string name="enter_contact">Contact invoeren</string>
   <string name="delete_contact">Contact verwijderen</string>
@@ -220,11 +223,16 @@
   <string name="select">Selecteren</string>
   <string name="contact_already_exists">Het contact bestaat al</string>
   <string name="join">Deelnemen</string>
+  <string name="channel_full_jid_example">kanaal@groepsgesprek.voorbeeld.nl/naam</string>
+  <string name="channel_bare_jid_example">kanaal@groepsgesprek.voorbeeld.nl</string>
   <string name="save_as_bookmark">Opslaan als bladwijzer</string>
   <string name="delete_bookmark">Bladwijzer verwijderen</string>
   <string name="destroy_room">Groepsgesprek vernietigen</string>
+  <string name="destroy_channel">Kanaal vernietigen</string>
   <string name="destroy_room_dialog">Weet je zeker dat je dit groepsgesprek wilt vernietigen?\n\n<b>Waarschuwing:</b> Dit gesprek wordt volledig verwijderd van de server.</string>
+  <string name="destroy_channel_dialog">Weet je zeker dat je dit openbare kanaal wilt vernietigen?\n\n<b>Waarschuwing:</b> Dit kanaal wordt volledig verwijderd van de server.</string>
   <string name="could_not_destroy_room">Kan groepsgesprek niet vernietigen</string>
+  <string name="could_not_destroy_channel">Kan kanaal niet vernietigen</string>
   <string name="bookmark_already_exists">Deze bladwijzer bestaat al</string>
   <string name="action_edit_subject">Gespreksonderwerp bewerken</string>
   <string name="topic">Onderwerp</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Opnieuw versturen</string>
   <string name="file_url">Bestands-URL</string>
   <string name="url_copied_to_clipboard">URL gekopieerd naar klembord</string>
-  <string name="jabber_id_copied_to_clipboard">Jabber-ID gekopieerd naar klembord</string>
+  <string name="jabber_id_copied_to_clipboard">XMPP-adres gekopieerd naar klembord</string>
   <string name="error_message_copied_to_clipboard">Foutmelding gekopieerd naar klembord</string>
   <string name="web_address">webadres</string>
   <string name="scan_qr_code">2D-streepjescode scannen</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Opnieuw proberen</string>
   <string name="pref_keep_foreground_service">Dienst in voorgrond houden</string>
   <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem je verbinding te onderbreken</string>
+  <string name="pref_create_backup">Back-up creëren</string>
+  <string name="pref_create_backup_summary">Back-upbestanden worden opgeslagen in %s</string>
+  <string name="notification_create_backup_title">Bezig met creëren van back-upbestanden...</string>
+  <string name="notification_backup_created_title">Je back-up is opgeslagen</string>
+  <string name="notification_backup_created_subtitle">De back-upbestanden zijn opgeslagen in %s</string>
+  <string name="restoring_backup">Bezig met herstellen van back-up...</string>
+  <string name="notification_restored_backup_title">Je back-up is hersteld</string>
+  <string name="notification_restored_backup_subtitle">Vergeet niet om het account in te schakelen.</string>
   <string name="choose_file">Bestand kiezen</string>
   <string name="receiving_x_file">Ontvangen van %1$s (%2$d%% voltooid)</string>
   <string name="download_x_file">%s downloaden</string>
@@ -353,14 +369,25 @@
   <string name="outcast">Verstoteling</string>
   <string name="member">Lid</string>
   <string name="advanced_mode">Geavanceerde modus</string>
+  <string name="grant_membership">Lidprivileges verlenen</string>
+  <string name="remove_membership">Lidprivileges intrekken</string>
   <string name="grant_admin_privileges">Beheerdersprivileges verlenen</string>
   <string name="remove_admin_privileges">Beheerdersprivileges ontzeggen</string>
+  <string name="grant_owner_privileges">Eigenaarsprivileges verlenen</string>
+  <string name="remove_owner_privileges">Eigenaarsprivileges intrekken</string>
   <string name="remove_from_room">Verwijderen uit groepsgesprek</string>
+  <string name="remove_from_channel">Verwijderen uit kanaal</string>
   <string name="could_not_change_affiliation">Kon aansluiting niet wijzigen</string>
   <string name="ban_from_conference">Verbannen uit groepsgesprek</string>
+  <string name="ban_from_channel">Verbannen uit kanaal</string>
+  <string name="removing_from_public_conference">Je probeert %s te verwijderen uit een openbaar kanaal. De enige manier om dat te doen is door hem/haar permanent te verbannen.</string>
   <string name="ban_now">Nu verbannen</string>
   <string name="could_not_change_role">Kon rol van %s niet wijzigen</string>
+  <string name="conference_options">Instellingen voor privégroep</string>
+  <string name="channel_options">Instellingen voor openbaar kanaal</string>
   <string name="members_only">Privé, enkel leden</string>
+  <string name="non_anonymous">XMPP-adressen openbaren</string>
+  <string name="moderated">Kanaal modereren</string>
   <string name="you_are_not_participating">Je neemt geen deel</string>
   <string name="modified_conference_options">Gespreksopties aangepast!</string>
   <string name="could_not_modify_conference_options">Kon gespreksopties niet aanpassen</string>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">Geen applicatie om locatie weer te geven</string>
   <string name="location">Locatie</string>
   <string name="title_undo_swipe_out_conversation">Gesprek gesloten</string>
+  <string name="title_undo_swipe_out_group_chat">Privégroep verlaten</string>
+  <string name="title_undo_swipe_out_channel">Openbaar kanaal verlaten</string>
   <string name="pref_dont_trust_system_cas_title">Systeem-CA\'s niet vertrouwen</string>
   <string name="pref_dont_trust_system_cas_summary">Alle certificaten moeten handmatig goedgekeurd worden</string>
   <string name="pref_remove_trusted_certificates_title">Certificaten verwijderen</string>
@@ -413,6 +442,7 @@
   <string name="recently_used">Recent gebruikt</string>
   <string name="choose_quick_action">Snelle actie kiezen</string>
   <string name="search_contacts">Contacten zoeken</string>
+  <string name="search_bookmarks">Bladwijzers doorzoeken</string>
   <string name="send_private_message">Privébericht sturen</string>
   <string name="user_has_left_conference">%1$s heeft het groepsgesprek verlaten!</string>
   <string name="username">Gebruikersnaam</string>
@@ -446,7 +476,7 @@
   <string name="captcha_required">Captcha vereist</string>
   <string name="captcha_hint">Voer de tekst van de afbeelding hierboven in</string>
   <string name="certificate_chain_is_not_trusted">Certificaatsketen is niet vertrouwd</string>
-  <string name="jid_does_not_match_certificate">Jabber-ID komt niet overeen met certificaat</string>
+  <string name="jid_does_not_match_certificate">XMPP-adres komt niet overeen met certificaat</string>
   <string name="action_renew_certificate">Certificaat vernieuwen</string>
   <string name="error_fetching_omemo_key">Fout bij ophalen van OMEMO-sleutel!</string>
   <string name="verified_omemo_key_with_certificate">OMEMO-sleutel geverifieerd met certificaat!</string>
@@ -491,16 +521,16 @@
   <string name="this_field_is_required">Dit veld is vereist</string>
   <string name="correct_message">Bericht corrigeren</string>
   <string name="send_corrected_message">Gecorrigeerd bericht versturen</string>
-  <string name="no_keys_just_confirm">Je vertrouwt dit contact al. Door \'klaar\' te kiezen bevestig je enkel dat %s deel uitmaakt van dit groepsgesprek.</string>
+  <string name="no_keys_just_confirm">Je vertrouwt dit contact al. Door ‘klaar’ te kiezen bevestig je enkel dat %s deel uitmaakt van dit groepsgesprek.</string>
   <string name="this_account_is_disabled">Je hebt deze account uitgeschakeld</string>
   <string name="security_error_invalid_file_access">Beveiligingsfout: Ongeldige bestandstoegang</string>
   <string name="no_application_to_share_uri">Geen applicatie om URI te delen</string>
   <string name="share_uri_with">URI delen met…</string>
-  <string name="welcome_text">Jabber is een provider-onafhankelijk berichtennetwerk. Je kan deze cliënt gebruiken met elke willekeurige Jabber-server.\nOm het je gemakkelijker te maken kun je simpelweg een account aanmaken conversations.im¹; een provider speciaal geschikt voor Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy is een afgeleide van de populaire Jabber/XMPP-cliënt Conversations, met automatische contactontdekking.<br><br>Je meldt je aan met je telefoonnummer en Quicksy zal automatisch—gebaseerd op de telefoonnummers in je adresboek—mogelijke contacten aanbevelen.<br><br>Door je aan te melden, stem je in met ons <a href="https://quicksy.im/#privacy">privacybeleid</a>.]]></string>
+  <string name="welcome_text">XMPP is een provider-onafhankelijk berichtennetwerk. Je kan deze cliënt gebruiken met eender welke XMPP-server.\nOm het je gemakkelijker te maken kun je simpelweg een account aanmaken op conversations.im¹; een provider speciaal geschikt voor Conversations.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy is een afgeleide van de populaire XMPP-cliënt Conversations, met automatische contactontdekking.<br><br>Je meldt je aan met je telefoonnummer en Quicksy zal automatisch—gebaseerd op de telefoonnummers in je adresboek—mogelijke contacten aanbevelen.<br><br>Door je aan te melden, stem je in met ons <a href="https://quicksy.im/#privacy">privacybeleid</a>.]]></string>
   <string name="agree_and_continue">Akkoord gaan &amp; doorgaan</string>
-  <string name="magic_create_text">We zullen je helpen een account op conversations.im¹ aan te maken.\nWanneer je conversations.im als je provider kiest kan je met gebruikers van andere providers communiceren door hen je volledige Jabber-ID te geven.</string>
-  <string name="your_full_jid_will_be">Je volledige Jabber-ID zal %s zijn</string>
+  <string name="magic_create_text">We zullen je helpen een account op conversations.im¹ aan te maken.\nWanneer je conversations.im als je provider kiest kan je met gebruikers van andere providers communiceren door hen je volledige XMPP-adres te geven.</string>
+  <string name="your_full_jid_will_be">Je volledige XMPP-adres zal %s zijn</string>
   <string name="create_account">Account aanmaken</string>
   <string name="use_own_provider">Gebruik mijn eigen provider</string>
   <string name="pick_your_username">Kies je gebruikersnaam</string>
@@ -634,7 +664,7 @@
   <string name="yesterday">Gisteren</string>
   <string name="pref_validate_hostname">Valideer hostnaam met DNSSEC</string>
   <string name="pref_validate_hostname_summary">Servercertificaten die de gevalideerde hostnaam bevatten worden beschouwd als geverifieerd</string>
-  <string name="certificate_does_not_contain_jid">Certificaat bevat geen Jabber-ID</string>
+  <string name="certificate_does_not_contain_jid">Certificaat bevat geen XMPP-adres</string>
   <string name="server_info_partial">gedeeltelijk</string>
   <string name="attach_record_video">Video opnemen</string>
   <string name="copy_to_clipboard">Kopiëren naar klembord</string>
@@ -696,7 +726,7 @@
   <string name="pref_use_share_location_plugin">Plug-in voor delen van locatie</string>
   <string name="pref_use_share_location_plugin_summary">Gebruik de ‘Plug-in voor delen van locatie’ in plaats van de ingebouwde kaart</string>
   <string name="copy_link">Webadres kopiëren</string>
-  <string name="copy_jabber_id">Jabber-ID kopiëren</string>
+  <string name="copy_jabber_id">XMPP-adres kopiëren</string>
   <string name="p1_s3_filetransfer">Bestanden delen via HTTP voor S3</string>
   <string name="pref_start_search">Rechtstreeks zoeken</string>
   <string name="pref_start_search_summary">Open het toetsenbord op het scherm ‘Gesprek starten’ en plaats de cursor in het zoekveld</string>
@@ -723,6 +753,8 @@
   <string name="pref_more_notification_settings_summary">Belang, geluid, trillen</string>
   <string name="video_compression_channel_name">Videocompressie</string>
   <string name="view_media">Media bekijken</string>
+  <string name="view_users">Deelnemers bekijken</string>
+  <string name="group_chat_members">Deelnemers</string>
   <string name="media_browser">Mediabrowser</string>
   <string name="security_violation_not_attaching_file">Bestand weggelaten wegens beveiligingsovertreding.</string>
   <string name="pref_video_compression">Videokwaliteit</string>
@@ -781,9 +813,45 @@
   <string name="install_orbot">Orbot installeren</string>
   <string name="start_orbot">Orbot starten</string>
   <string name="no_market_app_installed">Geen app-winkel geïnstalleerd.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Dit kanaal openbaart je XMPP-adres</string>
   <string name="ebook">e-boek</string>
   <string name="video_original">Origineel (zonder compressie)</string>
   <string name="open_with">Openen met…</string>
   <string name="set_profile_picture">Conversations-profielafbeelding</string>
   <string name="choose_account">Kies een account</string>
+  <string name="restore_backup">Back-up herstellen</string>
+  <string name="restore">Herstellen</string>
+  <string name="enter_password_to_restore">Voer het wachtwoord in voor %s om de back-up te herstellen.</string>
+  <string name="restore_warning">Gebruik de back-upfunctie niet als je een installatie wilt klonen (gelijktijdig draaien). Back-ups zijn alleen bedoeld voor migraties of als je het oorspronkelijke apparaat bent kwijtgeraakt.</string>
+  <string name="unable_to_restore_backup">Kan back-up niet herstellen.</string>
+  <string name="unable_to_decrypt_backup">Kan back-up niet ontsleutelen. Is het wachtwoord juist?</string>
+  <string name="backup_channel_name">Back-up en herstel</string>
+  <string name="enter_jabber_id">Voer XMPP-adres in</string>
+  <string name="create_group_chat">Groepsgesprek creëren</string>
+  <string name="join_public_channel">Deelnemen aan openbaar kanaal</string>
+  <string name="create_private_group_chat">Privégroep creëren</string>
+  <string name="create_public_channel">Openbaar kanaal creëren</string>
+  <string name="create_dialog_channel_name">Kanaalnaam</string>
+  <string name="xmpp_address">XMPP-adres</string>
+  <string name="please_enter_name">Voer een naam in voor het kanaal</string>
+  <string name="please_enter_xmpp_address">Voer een XMPP-adres in</string>
+  <string name="this_is_an_xmpp_address">Dit is een XMPP-adres. Voer een naam in.</string>
+  <string name="creating_channel">Bezig met creëren van openbaar kanaal...</string>
+  <string name="channel_already_exists">Dit kanaal bestaat al</string>
+  <string name="joined_an_existing_channel">Je hebt deelgenomen aan een bestaand kanaal</string>
+  <string name="unable_to_set_channel_configuration">Kan kanaalinstellingen niet instellen</string>
+  <string name="allow_participants_to_edit_subject">Iedereen mag het onderwerp aanpassen</string>
+  <string name="allow_participants_to_invite_others">Iedereen mag anderen uitnodigen</string>
+  <string name="anyone_can_edit_subject">Iedereen mag het onderwerp aanpassen.</string>
+  <string name="owners_can_edit_subject">Eigenaars mogen het onderwerp aanpassen.</string>
+  <string name="admins_can_edit_subject">Beheerders mogen het onderwerp aanpassen.</string>
+  <string name="owners_can_invite_others">Eigenaren mogen anderen uitnodigen.</string>
+  <string name="anyone_can_invite_others">Iedereen mag anderen uitnodigen.</string>
+  <string name="jabber_ids_are_visible_to_admins">XMPP-adressen zijn zichtbaar voor beheerders.</string>
+  <string name="jabber_ids_are_visible_to_anyone">XMPP-adressen zijn openbaar.</string>
+  <string name="no_users_hint_channel">Dit openbare kanaal heeft geen deelnemers. Nodig je contactpersonen uit of gebruik de knop ‘Delen’ om het XMPP-adres te delen.</string>
+  <string name="no_users_hint_group_chat">Deze privégroep heeft geen deelnemers.</string>
+  <string name="manage_permission">Privileges beheren</string>
+  <string name="search_participants">Deelnemers zoeken</string>
+  <string name="file_too_large">Bestand te groot</string>
 </resources>

src/main/res/values-pl/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Zamknij konwersację</string>
   <string name="action_contact_details">Szczegóły kontaktu</string>
   <string name="action_muc_details">Szczegóły konferencji</string>
+  <string name="channel_details">Szczegóły kanału</string>
   <string name="action_secure">Konwersacja szyfrowana</string>
   <string name="action_add_account">Dodaj konto</string>
   <string name="action_edit_contact">Edytuj nazwę</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Udostępnij...</string>
   <string name="start_conversation">Rozpocznij rozmowę</string>
   <string name="invite_contact">Zaproś kontakt</string>
+  <string name="invite">Zaproś</string>
   <string name="contacts">Kontakty</string>
   <string name="contact">Kontakt</string>
   <string name="cancel">Anuluj</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">Czy na pewno?</string>
   <string name="mgmt_account_delete_confirm_text">Jeśli usuniesz swoje konto, cała historia wiadomości zostanie stracona.</string>
   <string name="attach_record_voice">Nagraj głos</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">Zablokuj Jabber ID</string>
+  <string name="account_settings_jabber_id">Adres XMPP</string>
+  <string name="block_jabber_id">Zablokuj adres XMPP</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Hasło</string>
-  <string name="invalid_jid">Wprowadzono niepoprawny Jabber ID</string>
+  <string name="invalid_jid">To nie jest poprawny adres XMPP</string>
   <string name="error_out_of_memory">Brak pamięci, obraz jest za duży</string>
   <string name="add_phone_book_text">Czy chcesz dodać %s do listy kontaktów?</string>
   <string name="server_info_show_more">Informacje o serwerze</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Pobieranie kluczy...</string>
   <string name="done">Ukończono</string>
   <string name="decrypt">Odszyfruj</string>
+  <string name="bookmarks">Zakładki</string>
   <string name="search">Szukaj</string>
   <string name="enter_contact">Wpisz kontakt</string>
   <string name="delete_contact">Usuń kontakt</string>
@@ -220,11 +223,16 @@
   <string name="select">Wybierz</string>
   <string name="contact_already_exists">Kontakt już istnieje</string>
   <string name="join">Dołącz</string>
+  <string name="channel_full_jid_example">kanał@konferencje.example.com/nick</string>
+  <string name="channel_bare_jid_example">kanał@konferencja.example.com</string>
   <string name="save_as_bookmark">Dodaj jako zakładkę</string>
   <string name="delete_bookmark">Usuń zakładkę</string>
   <string name="destroy_room">Usuń konferencję</string>
+  <string name="destroy_channel">Usuń kanał</string>
   <string name="destroy_room_dialog">Czy jesteś pewien, że chcesz usunąć tą konferencję?\n\n<b>Ostrzeżenie:</b> Ta konferencja zostanie całkowicie usunięta na serwerze.</string>
+  <string name="destroy_channel_dialog">Czy na pewno chcesz usunąć ten kanał publiczny?\n\n<b>Ostrzeżenie:</b> Ten kanał zostanie całkowicie usunięty z serwera.</string>
   <string name="could_not_destroy_room">Usuwanie konferencji nieudane</string>
+  <string name="could_not_destroy_channel">Nie można usunąć kanału</string>
   <string name="bookmark_already_exists">Zakładka już istnieje</string>
   <string name="action_edit_subject">Edytuj tytuł konferencji</string>
   <string name="topic">Temat</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Wyślij ponownie</string>
   <string name="file_url">URL pliku</string>
   <string name="url_copied_to_clipboard">Skopiowano URL do schowka</string>
-  <string name="jabber_id_copied_to_clipboard">Skopiowano Jabber ID do schowka</string>
+  <string name="jabber_id_copied_to_clipboard">Skopiowano adres XMPP do schowka</string>
   <string name="error_message_copied_to_clipboard">Skopiowano komunikat błędu do schowka</string>
   <string name="web_address">adres URL</string>
   <string name="scan_qr_code">Zeskanuj kod</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Spróbuj ponownie</string>
   <string name="pref_keep_foreground_service">Usługa na pierwszym planie</string>
   <string name="pref_keep_foreground_service_summary">Uniemożliwia systemowi przerwanie połączenia</string>
+  <string name="pref_create_backup">Utwórz kopię zapasową</string>
+  <string name="pref_create_backup_summary">Kopia zapasowa będzie zapisana w %s</string>
+  <string name="notification_create_backup_title">Tworzenie kopii zapasowej</string>
+  <string name="notification_backup_created_title">Kopia zapasowa została utworzona</string>
+  <string name="notification_backup_created_subtitle">Kopia zapasowa zapisana w %s</string>
+  <string name="restoring_backup">Przywracanie kopii zapasowej</string>
+  <string name="notification_restored_backup_title">Kopia zapasowa została przywrócona</string>
+  <string name="notification_restored_backup_subtitle">Nie zapomnij o włączeniu tego konta.</string>
   <string name="choose_file">Wybierz plik</string>
   <string name="receiving_x_file">Odbieranie %1$s (ukończono %2$d%%)</string>
   <string name="download_x_file">Pobierz %s</string>
@@ -353,14 +369,25 @@
   <string name="outcast">Wykluczony</string>
   <string name="member">Członek</string>
   <string name="advanced_mode">Tryb zaawansowany</string>
+  <string name="grant_membership">Przyznaj uprawnienia członkostwa</string>
+  <string name="remove_membership">Usuń uprawnienia członkostwa</string>
   <string name="grant_admin_privileges">Przyznaj uprawnienia administratora</string>
   <string name="remove_admin_privileges">Odbierz uprawnienia administratora</string>
+  <string name="grant_owner_privileges">Przyznaj uprawnienia właściciela</string>
+  <string name="remove_owner_privileges">Usuń uprawnienia właściciela</string>
   <string name="remove_from_room">Usuń z konferencji</string>
+  <string name="remove_from_channel">Usuń z kanału</string>
   <string name="could_not_change_affiliation">Nie udało się zmienić stanowiska dla %s</string>
   <string name="ban_from_conference">Zbanuj</string>
+  <string name="ban_from_channel">Zbanuj na kanale</string>
+  <string name="removing_from_public_conference">Chcesz usunąć %s z publicznego kanału. Jedynym sposobem aby to zrobić jest zbanowanie tego użytkownika na zawsze.</string>
   <string name="ban_now">Zbanuj teraz</string>
   <string name="could_not_change_role">Nie udało się zmienić funkcji %s</string>
+  <string name="conference_options">Konfiguracja prywatnej rozmowy grupowej</string>
+  <string name="channel_options">Konfiguracja publicznego kanału</string>
   <string name="members_only">Prywatne, tylko dla członków.</string>
+  <string name="non_anonymous">Spraw aby adres XMPP był widoczny dla wszystkich</string>
+  <string name="moderated">Włącz moderację na kanale</string>
   <string name="you_are_not_participating">Nie bierzesz udziału</string>
   <string name="modified_conference_options">Ustawienia konferencji zostały zmodyfikowane</string>
   <string name="could_not_modify_conference_options">Nie można zmodyfikować ustawień konferencji</string>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">Nie odnaleziono aplikacji do wyświetlenia lokalizacji</string>
   <string name="location">Lokalizacja</string>
   <string name="title_undo_swipe_out_conversation">Zamknięto konwersację</string>
+  <string name="title_undo_swipe_out_group_chat">Opuść prywatną rozmowę grupową</string>
+  <string name="title_undo_swipe_out_channel">Opuść publiczny kanał</string>
   <string name="pref_dont_trust_system_cas_title">Nie ufaj certyfikatom systemowym</string>
   <string name="pref_dont_trust_system_cas_summary">Wymagaj ręcznego potwierdzania certyfikatów</string>
   <string name="pref_remove_trusted_certificates_title">Usuń certyfikaty</string>
@@ -415,6 +444,7 @@
   <string name="recently_used">Ostatnio używana</string>
   <string name="choose_quick_action">Wybierz szybką akcję</string>
   <string name="search_contacts">Przeszukuj kontakty</string>
+  <string name="search_bookmarks">Przeszukaj zakładki</string>
   <string name="send_private_message">Wyślij wiadomość prywatną</string>
   <string name="user_has_left_conference">%1$s opuścił konferencję!</string>
   <string name="username">Nazwa użytkownika</string>
@@ -448,7 +478,7 @@
   <string name="captcha_required">Captcha wymagana</string>
   <string name="captcha_hint">Wprowadź tekst z powyższego obrazka</string>
   <string name="certificate_chain_is_not_trusted">Łańcuch certyfikatu nie jest zaufany</string>
-  <string name="jid_does_not_match_certificate">Jabber ID nie odpowiada certyfikatowi</string>
+  <string name="jid_does_not_match_certificate">Adres XMPP nie pasuje do certyfikatu</string>
   <string name="action_renew_certificate">Odnów certyfikat</string>
   <string name="error_fetching_omemo_key">Błąd pobierania klucza OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Zweryfikowano klucz OMEMO z certyfikatem</string>
@@ -500,12 +530,11 @@
   <string name="security_error_invalid_file_access">Błąd bezpieczeństwa: nieprawidłowy dostęp do pliku</string>
   <string name="no_application_to_share_uri">Nie odnaleziono aplikacji skojarzonej z URI</string>
   <string name="share_uri_with">Udostępnij URI za pomocą...</string>
-  <string name="welcome_text">Jabber to niezależna sieć komunikacji natychmiastowej. Możesz użyć tego klienta z dowolnym serwerem który wybierzesz.
-Dla twojej wygody ułatwiliśmy stworzenie konta na conversations.im; serwerze dostosowanym do Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy to klient Jabbera/XMPP oparty na Conversations z automatycznym odkrywaniem konetaktów. <br><br> Zapisujesz się swoim numerem telefonu i Quicksy automatycznie — na podstawie numerów telefonów w twojej książce adresowej — zasugeruje możliwe kontakty. <br><br> Zapisując się zgadzasz się na naszą <a href="https://quicksy.im/#privacy">politykę prywatności</a>.]]></string>
+  <string name="welcome_text">XMPP to niezależna od dostawcy sieć komunikacji natychmiastowej. Możesz użyć tej aplikacji z dowolnym serwerem XMPP jaki wybierzesz.\nJednak dla twojej wygody ułatwiliśmy stworzenie konta na conversations.im¹; dostawcy specjalnego dobrego do Conversations.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy to modyfikacja poparnego klienta XMPP Conversations, z automatycznym wykrywaniem kontaktów.<br><br>Zapisujesz się przy użyciu numeru telefonu i Quicksy automatycznie - na podstawie numerów telefonów w książce adresowej - zasugeruje potencjalne kontakty dla ciebie.<br><br>Zapisując się zgadzasz się na naszą <a href="https://quicksy.im/#privacy">politykę prywatności</a>.]]></string>
   <string name="agree_and_continue">Zgoda i kontynuuj</string>
-  <string name="magic_create_text">Przeprowadzimy Cię przez proces tworzenia konta na conversations.im.\nKiedy wybierzesz konto na serwerze conversations.im, będziesz mógł komunikować się z użytkownikami na innych serwerach podając im swój pełen Jabber ID.</string>
-  <string name="your_full_jid_will_be">Twój pełen Jabber ID będzie następujący: %s</string>
+  <string name="magic_create_text">Poprowadzimy ciebie przez proces tworzenia konta na conversations.im.¹\nKiedy wybierzesz conversations.im jako dostawcę będziesz mógł komunikować się z innymi osobami jeśli znasz ich pełen adres XMPP.</string>
+  <string name="your_full_jid_will_be">Twój pełen adres XMPP to: %s</string>
   <string name="create_account">Utwórz konto</string>
   <string name="use_own_provider">Użyj innego serwera</string>
   <string name="pick_your_username">Wybierz nazwę użytkownika</string>
@@ -652,7 +681,7 @@ Conversations będzie wciąż ograniczał transfer danych, kiedy tylko to jest m
   <string name="yesterday">Wczoraj</string>
   <string name="pref_validate_hostname">Potwierdź nazwę hosta za pomocą DNSSEC</string>
   <string name="pref_validate_hostname_summary">Certyfikaty serwera posiadające prawidłową nazwę hosta są uznawane za zweryfikowane</string>
-  <string name="certificate_does_not_contain_jid">Certyfikat nie zawiera Jabber ID</string>
+  <string name="certificate_does_not_contain_jid">Certyfikat nie zawiera żadnych adresów XMPP</string>
   <string name="server_info_partial">częściowo</string>
   <string name="attach_record_video">Nagraj film</string>
   <string name="copy_to_clipboard">Skopiuj do schowka</string>
@@ -715,7 +744,7 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="pref_use_share_location_plugin">Wtyczka Udostępniania Lokalizacji</string>
   <string name="pref_use_share_location_plugin_summary">Użyj Wtyczki Udostępniania Lokalizacji zamiast wbudowanej mapy</string>
   <string name="copy_link">Skopiuj URL</string>
-  <string name="copy_jabber_id">Skopiuj JID</string>
+  <string name="copy_jabber_id">Skopiuj adres XMPP</string>
   <string name="p1_s3_filetransfer">Udostępnianie plików przez HTTP S3</string>
   <string name="pref_start_search">Wyszukiwanie bezpośrednie</string>
   <string name="pref_start_search_summary">Na ekranie \'Rozpocznij konwersację\' otwórz klawiaturę i umieść kursor w polu wyszukiwania</string>
@@ -742,6 +771,8 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="pref_more_notification_settings_summary">Ważność, Dźwięk, Wibracja</string>
   <string name="video_compression_channel_name">Kompresja wideo</string>
   <string name="view_media">Pokaż media</string>
+  <string name="view_users">Pokaż członków</string>
+  <string name="group_chat_members">Uczestnicy</string>
   <string name="media_browser">Przeglądarka mediów</string>
   <string name="security_violation_not_attaching_file">Plik pominięty w związku z naruszeniem bezpieczeństwa.</string>
   <string name="pref_video_compression">Jakość wideo</string>
@@ -800,9 +831,45 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="install_orbot">Zainstaluj Orbot</string>
   <string name="start_orbot">Uruchom Orbot</string>
   <string name="no_market_app_installed">Aplikacja marketu niezainstalowana.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Ten kanał sprawi, że twój adres XMPP będzie publiczny</string>
   <string name="ebook">e-book</string>
   <string name="video_original">Oryginalne (nieskompresowane)</string>
   <string name="open_with">Otwórz za pomocą...</string>
   <string name="set_profile_picture">Obrazek profilowy Conversations</string>
   <string name="choose_account">Wybierz konto</string>
+  <string name="restore_backup">Przywróć kopię zapasową</string>
+  <string name="restore">Przywróć</string>
+  <string name="enter_password_to_restore">Wpisz swoje hasło do konta %s aby przywrócić kopię zapasową</string>
+  <string name="restore_warning">Nie używaj kopii zapasowej aby klonować (uruchamiać równolegle) instalację. Przywracanie kopii jest przeznaczone tylko do migracji albo kiedy urządzenie zostało zgubione.</string>
+  <string name="unable_to_restore_backup">Nie można przywrócić kopii zapasowej.</string>
+  <string name="unable_to_decrypt_backup">Nie można odszyfrować kopii zapasowej. Czy hasło jest poprawne?</string>
+  <string name="backup_channel_name">Kopia i Przywracanie</string>
+  <string name="enter_jabber_id">Wpisz adres XMPP</string>
+  <string name="create_group_chat">Stwórz rozmowę grupową</string>
+  <string name="join_public_channel">Dołącz do kanału publicznego</string>
+  <string name="create_private_group_chat">Stwórz prywatną rozmowę grupową</string>
+  <string name="create_public_channel">Stwórz kanał publiczny</string>
+  <string name="create_dialog_channel_name">Nazwa kanału</string>
+  <string name="xmpp_address">Adres XMPP</string>
+  <string name="please_enter_name">Podaj nazwę kanału</string>
+  <string name="please_enter_xmpp_address">Podaj adres XMPP</string>
+  <string name="this_is_an_xmpp_address">To jest adres XMPP. Podaj nazwę.</string>
+  <string name="creating_channel">Tworzenie kanału publicznego...</string>
+  <string name="channel_already_exists">Ten kanał już istnieje</string>
+  <string name="joined_an_existing_channel">Dołączono do istniejącego kanału</string>
+  <string name="unable_to_set_channel_configuration">Nie można ustawić konfiguracji kanału</string>
+  <string name="allow_participants_to_edit_subject">Pozwól wszystkim na zmianę tematu</string>
+  <string name="allow_participants_to_invite_others">Pozwól wszystkim na zapraszanie innych</string>
+  <string name="anyone_can_edit_subject">Każdy może zmieniać temat.</string>
+  <string name="owners_can_edit_subject">Właściciele mogą zmieniać temat.</string>
+  <string name="admins_can_edit_subject">Administratorzy mogą zmieniać temat.</string>
+  <string name="owners_can_invite_others">Właściciele mogą zapraszać innych.</string>
+  <string name="anyone_can_invite_others">Każdy może zapraszać innych.</string>
+  <string name="jabber_ids_are_visible_to_admins">Adresy XMPP widoczne dla administratorów.</string>
+  <string name="jabber_ids_are_visible_to_anyone">Adresy XMPP widoczne dla wszystkich.</string>
+  <string name="no_users_hint_channel">Ten publiczny kanał nie ma uczestników. Zaproś swoje kontakty lub użyj udostępniania aby opublikować adres XMPP.</string>
+  <string name="no_users_hint_group_chat">Ta prywatna rozmowa grupowa nie ma uczestników.</string>
+  <string name="manage_permission">Zarządzaj uprawnieniami</string>
+  <string name="search_participants">Wyszukaj uczestników</string>
+  <string name="file_too_large">Plik jest zbyt duży</string>
 </resources>

src/main/res/values-pt-rBR/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Encerrar essa conversa</string>
   <string name="action_contact_details">Detalhes do contato</string>
   <string name="action_muc_details">Detalhes da conversa em grupo</string>
+  <string name="channel_details">Detalhes do canal</string>
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Adicionar conta</string>
   <string name="action_edit_contact">Editar o nome</string>
@@ -34,7 +35,7 @@
   <string name="nick_in_use">Este apelido já está em uso</string>
   <string name="invalid_muc_nick">Apelido inválido</string>
   <string name="admin">Administrador</string>
-  <string name="owner">Dono</string>
+  <string name="owner">Proprietário</string>
   <string name="moderator">Moderador</string>
   <string name="participant">Participante</string>
   <string name="visitor">Visitante</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Compartilhar com...</string>
   <string name="start_conversation">Iniciar conversa</string>
   <string name="invite_contact">Convidar contato</string>
+  <string name="invite">Convidar</string>
   <string name="contacts">Contatos</string>
   <string name="contact">Contato</string>
   <string name="cancel">Cancelar</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">Tem certeza?</string>
   <string name="mgmt_account_delete_confirm_text">Se você excluir esta conta, todo o seu histórico de conversas será perdido</string>
   <string name="attach_record_voice">Gravar voz</string>
-  <string name="account_settings_jabber_id">ID Jabber</string>
-  <string name="block_jabber_id">Bloquear ID do Jabber</string>
+  <string name="account_settings_jabber_id">Endereço XMPP</string>
+  <string name="block_jabber_id">Bloquear endereço XMPP</string>
   <string name="account_settings_example_jabber_id">nomedeusuario@exemplo.com</string>
   <string name="password">Senha</string>
-  <string name="invalid_jid">Esse não é um ID Jabber válido</string>
+  <string name="invalid_jid">Esse não é um endereço XMPP válido</string>
   <string name="error_out_of_memory">Memória insuficiente. A imagem é muito grande</string>
   <string name="add_phone_book_text">Deseja adicionar %s ao seu livro de endereços?</string>
   <string name="server_info_show_more">Informações do servidor</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Buscando as chaves...</string>
   <string name="done">Concluído</string>
   <string name="decrypt">Descriptografar</string>
+  <string name="bookmarks">Favoritos</string>
   <string name="search">Pesquisar</string>
   <string name="enter_contact">Digite o contato</string>
   <string name="delete_contact">Excluir contato</string>
@@ -220,11 +223,16 @@
   <string name="select">Selecionar</string>
   <string name="contact_already_exists">Esse contato já existe</string>
   <string name="join">Entrar</string>
+  <string name="channel_full_jid_example">canal@conferencia.exemplo.com/apelido</string>
+  <string name="channel_bare_jid_example">canal@conferencia.exemplo.com</string>
   <string name="save_as_bookmark">Salvar como favorito</string>
   <string name="delete_bookmark">Excluir o favorito</string>
   <string name="destroy_room">Destruir a conversa em grupo</string>
+  <string name="destroy_channel">Destruir o canal</string>
   <string name="destroy_room_dialog">Deseja realmente destruir essa conversa em grupo?\n\n<b>Atenção:</b> A conversa em grupo será completamente removida do servidor.</string>
+  <string name="destroy_channel_dialog">Tem certeza que deseja destruir esse canal público?\n\n<b>Atenção:</b> O canal será removido completamente do servidor.</string>
   <string name="could_not_destroy_room">Não foi possível destruir a conversa em grupo</string>
+  <string name="could_not_destroy_channel">Não foi possível destruir o canal</string>
   <string name="bookmark_already_exists">Esse favorito já existe</string>
   <string name="action_edit_subject">Editar o assunto da conversa em grupo</string>
   <string name="topic">Tópico</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Enviar novamente</string>
   <string name="file_url">URL do arquivo</string>
   <string name="url_copied_to_clipboard">URL copiada para a área de transferência</string>
-  <string name="jabber_id_copied_to_clipboard">O ID Jabber foi copiado para a área de transferência</string>
+  <string name="jabber_id_copied_to_clipboard">O endereço XMPP foi copiado para a área de transferência</string>
   <string name="error_message_copied_to_clipboard">A mensagem de erro foi copiada para a área de transferência</string>
   <string name="web_address">endereço web</string>
   <string name="scan_qr_code">Capturar código de barras 2D</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Tentar novamente</string>
   <string name="pref_keep_foreground_service">Manter o serviço em segundo plano</string>
   <string name="pref_keep_foreground_service_summary">Impede que o sistema operacional encerre sua conexão.</string>
+  <string name="pref_create_backup">Criar backup</string>
+  <string name="pref_create_backup_summary">Os arquivos de backup serão armazenados em %s</string>
+  <string name="notification_create_backup_title">Criando arquivos de backup</string>
+  <string name="notification_backup_created_title">O seu backup foi criado</string>
+  <string name="notification_backup_created_subtitle">Os arquivos de backup foram armazenados em %s</string>
+  <string name="restoring_backup">Restaurando o backup</string>
+  <string name="notification_restored_backup_title">Seu backup foi restaurado</string>
+  <string name="notification_restored_backup_subtitle">Não se esqueça de habilitar a conta.</string>
   <string name="choose_file">Selecione o arquivo</string>
   <string name="receiving_x_file">Recebendo %1$s (completou %2$d%%)</string>
   <string name="download_x_file">Baixar %s</string>
@@ -353,14 +369,25 @@
   <string name="outcast">Banido</string>
   <string name="member">Membro</string>
   <string name="advanced_mode">Modo avançado</string>
+  <string name="grant_membership">Conceder privilégios de membro</string>
+  <string name="remove_membership">Revogar os privilégios de membro</string>
   <string name="grant_admin_privileges">Conceder privilégios de administrador</string>
   <string name="remove_admin_privileges">Revogar os privilégios de administrador</string>
+  <string name="grant_owner_privileges">Conceder privilégios de proprietário</string>
+  <string name="remove_owner_privileges">Revogar os privilégios de proprietário</string>
   <string name="remove_from_room">Remover da conversa em grupo</string>
+  <string name="remove_from_channel">Remover do canal</string>
   <string name="could_not_change_affiliation">Não foi possível alterar a filiação de %s</string>
   <string name="ban_from_conference">Banir da conversa em grupo</string>
+  <string name="ban_from_channel">Banir do canal</string>
+  <string name="removing_from_public_conference">Você está tentando remover %s de um canal público. A única forma de fazer isso e banir esse usuário para sempre.</string>
   <string name="ban_now">Banir agora</string>
   <string name="could_not_change_role">Não foi possível alterar o papel de %s</string>
+  <string name="conference_options">Configuração da conversa em grupo privada</string>
+  <string name="channel_options">Configuração do canal público</string>
   <string name="members_only">Privada, somente para membros</string>
+  <string name="non_anonymous">Tornar os endereços XMPP visíveis para todos</string>
+  <string name="moderated">Tornar o canal moderável</string>
   <string name="you_are_not_participating">Você não está participando</string>
   <string name="modified_conference_options">As opções da conversa em grupo foram modificadas!</string>
   <string name="could_not_modify_conference_options">Não foi possível modificar as opções da conversa em grupo</string>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">Não foi encontrado nenhum aplicativo para exibir a localização</string>
   <string name="location">Localização</string>
   <string name="title_undo_swipe_out_conversation">A conversa foi fechada</string>
+  <string name="title_undo_swipe_out_group_chat">Deixar a conversa em grupo privada</string>
+  <string name="title_undo_swipe_out_channel">Deixar o canal público</string>
   <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
   <string name="pref_dont_trust_system_cas_summary">Todos os certificados devem ser aprovados manualmente.</string>
   <string name="pref_remove_trusted_certificates_title">Remover certificados</string>
@@ -413,6 +442,7 @@
   <string name="recently_used">Usada mais recentemente</string>
   <string name="choose_quick_action">Selecione a ação rápida</string>
   <string name="search_contacts">Pesquisar contatos</string>
+  <string name="search_bookmarks">Pesquisar favoritos</string>
   <string name="send_private_message">Enviar mensagem privada</string>
   <string name="user_has_left_conference">%1$s deixou a conversa em grupo!</string>
   <string name="username">Nome de usuário</string>
@@ -446,7 +476,7 @@
   <string name="captcha_required">Captcha obrigatório</string>
   <string name="captcha_hint">Digite o texto da imagem acima</string>
   <string name="certificate_chain_is_not_trusted">A cadeia de certificação não é confiável</string>
-  <string name="jid_does_not_match_certificate">O ID Jaber não corresponde ao certificado</string>
+  <string name="jid_does_not_match_certificate">O endereço XMPP não corresponde ao certificado</string>
   <string name="action_renew_certificate">Renovar o certificado</string>
   <string name="error_fetching_omemo_key">Ocorreu um erro na obtenção da chave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado.</string>
@@ -496,11 +526,11 @@
   <string name="security_error_invalid_file_access">Erro de segurança: Acesso inválido ao arquivo</string>
   <string name="no_application_to_share_uri">Não foi encontrado nenhum aplicativo para compartilhar a URI</string>
   <string name="share_uri_with">Compartilhar a URI com...</string>
-  <string name="welcome_text">Jabber é uma rede de mensageria instantânea independente de provedor. Você pode usar este cliente com qualquer servidor Jabber que você escolher.\nEntretanto, para sua conveniência, nós simplificamos o processo de criação de uma conta no conversations.im¹; um provedor especialmente configurado para ser usado com o Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy é um derivado do popular cliente para Jabber/XMPP Conversations, com a descoberta automática de contatos.<br><br>Você se registra com o seu número de telefone e o Quicksy sugere automaticamente - baseado nos números de telefone do seu livro de endereços - possíveis contatos para você..<br><br>Ao se registrar você concorda com nossa <a href="https://quicksy.im/#privacy">política de privacidade</a>.]]></string>
+  <string name="welcome_text">O XMPP é uma rede de mensagens instantâneas independente de provedor. Você pode usar esse cliente com qualquer servidor XMPP que você escolher.\nEntretanto, para sua conveniência, nós simplificamos o processo de criação de uma conta em conversations.im¹, um provedor especialmente configurado para se usar com o Conversations.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy é um derivado do popular cliente para XMPP Conversations, com a descoberta automática de contatos.<br><br>Você se registra com o seu número de telefone e o Quicksy sugere automaticamente - baseado nos números de telefone do seu livro de endereços - possíveis contatos para você..<br><br>Ao se registrar você concorda com nossa <a href="https://quicksy.im/#privacy">política de privacidade</a>.]]></string>
   <string name="agree_and_continue">Concordar &amp; continuar</string>
-  <string name="magic_create_text">Nós guiaremos você ao longo do processo de criar uma conta em conversations.im.¹\nAo usar esse provedor você também poderá se comunicar com usuários de outros provedores. Basta fornecê-los a sua identificação Jabber completa.</string>
-  <string name="your_full_jid_will_be">Sua ID Jabber será: %s</string>
+  <string name="magic_create_text">Nós guiaremos você ao longo do processo de criação de conta no conversations.im.¹\nAo usar esse provedor você também poderá se comunicar com usuários de outros provedores. Basta fornecê-los o sua endereço XMPP completo.</string>
+  <string name="your_full_jid_will_be">Seu endereço XMPP completo será: %s</string>
   <string name="create_account">Criar conta</string>
   <string name="use_own_provider">Usar meu próprio provedor</string>
   <string name="pick_your_username">Selecione seu nome de usuário</string>
@@ -634,7 +664,7 @@
   <string name="yesterday">Ontem</string>
   <string name="pref_validate_hostname">Validar o nome do host com o DNSSEC</string>
   <string name="pref_validate_hostname_summary">Certificados do servidor que contenham o nome de host validade são considerados verificados</string>
-  <string name="certificate_does_not_contain_jid">O certificado não contém uma ID Jabber</string>
+  <string name="certificate_does_not_contain_jid">O certificado não contém um endereço XMPP</string>
   <string name="server_info_partial">parcial</string>
   <string name="attach_record_video">Gravar vídeo</string>
   <string name="copy_to_clipboard">Copiar para a área de transferência</string>
@@ -696,7 +726,7 @@
   <string name="pref_use_share_location_plugin">Plugin de Compartilhamento de Localização</string>
   <string name="pref_use_share_location_plugin_summary">Use o Plugin de Compartilhamento de Localização ao invés do mapa nativo.</string>
   <string name="copy_link">Copiar endereço web</string>
-  <string name="copy_jabber_id">Copiar ID do Jabber</string>
+  <string name="copy_jabber_id">Copiar endereço XMPP</string>
   <string name="p1_s3_filetransfer">Compartilhamento de arquivos via HTTP para S3</string>
   <string name="pref_start_search">Pesquisa direta</string>
   <string name="pref_start_search_summary">Na tela \"Conversar\", abra o teclado e coloque o cursor no campo de pesquisa</string>
@@ -723,6 +753,8 @@
   <string name="pref_more_notification_settings_summary">Importância, som, vibração.</string>
   <string name="video_compression_channel_name">Compressão de vídeo</string>
   <string name="view_media">Ver mídia</string>
+  <string name="view_users">Ver participantes</string>
+  <string name="group_chat_members">Participantes</string>
   <string name="media_browser">Navegador de mídia</string>
   <string name="security_violation_not_attaching_file">Arquivo omitido devido a violação de segurança</string>
   <string name="pref_video_compression">Qualidade do vídeo</string>
@@ -781,9 +813,45 @@
   <string name="install_orbot">Instalar Orbot</string>
   <string name="start_orbot">Iniciar Orbot</string>
   <string name="no_market_app_installed">Nenhum app de loja instalado.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Este canal tornará público o seu endereço XMPP</string>
   <string name="ebook">e-book</string>
   <string name="video_original">Original (não comprimido)</string>
   <string name="open_with">Abrir com...</string>
   <string name="set_profile_picture">Imagem de perfil do Conversations</string>
   <string name="choose_account">Selecione a conta</string>
+  <string name="restore_backup">Restaurar o backup</string>
+  <string name="restore">Restaurar</string>
+  <string name="enter_password_to_restore">Digite sua senha para a conta %s para restaurar o backup.</string>
+  <string name="restore_warning">Não use o recurso de restaurar um backup para tentar clonar (rodar simultaneamente) uma instalação. A restauração de backups é destinada a migrações ou caso você tenha perdido o dispositivo original.</string>
+  <string name="unable_to_restore_backup">Não foi possível restaurar o backup.</string>
+  <string name="unable_to_decrypt_backup">Não foi possível descriptografar o backup. A senha está correta?</string>
+  <string name="backup_channel_name">Backup &amp; Restauração</string>
+  <string name="enter_jabber_id">Digite o endereço XMPP</string>
+  <string name="create_group_chat">Criar conversa em grupo</string>
+  <string name="join_public_channel">Entrar no canal público</string>
+  <string name="create_private_group_chat">Criar uma conversa em grupo privada</string>
+  <string name="create_public_channel">Criar um canal público</string>
+  <string name="create_dialog_channel_name">Nome do canal</string>
+  <string name="xmpp_address">Endereço XMPP</string>
+  <string name="please_enter_name">Por favor, forneça um nome para o canal</string>
+  <string name="please_enter_xmpp_address">Por favor, forneça um endereço XMPP</string>
+  <string name="this_is_an_xmpp_address">Esse é um endereço XMPP. Por favor, forneça um nome.</string>
+  <string name="creating_channel">Criando o canal público...</string>
+  <string name="channel_already_exists">Este canal já existe</string>
+  <string name="joined_an_existing_channel">Você entrou em um canal existente</string>
+  <string name="unable_to_set_channel_configuration">Não foi possível definir a configuração do canal</string>
+  <string name="allow_participants_to_edit_subject">Permitir que qualquer um edite o tópico</string>
+  <string name="allow_participants_to_invite_others">Permitir que qualquer um convide outras pessoas</string>
+  <string name="anyone_can_edit_subject">Qualquer um pode editar o tópico</string>
+  <string name="owners_can_edit_subject">Proprietários podem editar o tópico.</string>
+  <string name="admins_can_edit_subject">Administradores podem editar o tópico.</string>
+  <string name="owners_can_invite_others">Proprietários podem convidar outras pessoas.</string>
+  <string name="anyone_can_invite_others">Qualquer um podem convidar outras pessoas.</string>
+  <string name="jabber_ids_are_visible_to_admins">Os endereços XMPP são visíveis para os administradores.</string>
+  <string name="jabber_ids_are_visible_to_anyone">Os endereços XMPP são visíveis para todos.</string>
+  <string name="no_users_hint_channel">Esse canal público não tem participantes. Convide seus contatos ou use o botão compartilhar para distribuir seu endereço XMPP.</string>
+  <string name="no_users_hint_group_chat">Esta conversa em grupo privada não tem nenhum participante.</string>
+  <string name="manage_permission">Gerenciar privilégios</string>
+  <string name="search_participants">Pesquisar participantes</string>
+  <string name="file_too_large">Arquivo muito grande</string>
 </resources>

src/main/res/values-pt/strings.xml

@@ -152,11 +152,8 @@
   <string name="mgmt_account_are_you_sure">Tem a certeza?</string>
   <string name="mgmt_account_delete_confirm_text">Se apagar a sua conta todo o seu histórico de conversas será perdido</string>
   <string name="attach_record_voice">Gravar voz</string>
-  <string name="account_settings_jabber_id">ID Jabber</string>
-  <string name="block_jabber_id">Bloquear ID Jabber</string>
   <string name="account_settings_example_jabber_id">nomedeutilizador@exemplo.com</string>
   <string name="password">Palavra-passe</string>
-  <string name="invalid_jid">Esse não é um ID Jabber válido</string>
   <string name="error_out_of_memory">Memória insuficiente. A imagem é muito grande</string>
   <string name="add_phone_book_text">Deseja adicionar %s aos seus contactos?</string>
   <string name="server_info_show_more">Informações do servidor</string>
@@ -403,7 +400,6 @@
   <string name="captcha_required">Captcha obrigatório</string>
   <string name="captcha_hint">Escreva o texto da imagem acima</string>
   <string name="certificate_chain_is_not_trusted">A cadeia de certificados não é confiável</string>
-  <string name="jid_does_not_match_certificate">O ID Jabber não coincide com o certificado</string>
   <string name="action_renew_certificate">Renovar certificado</string>
   <string name="error_fetching_omemo_key">Erro ao obter a chave OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado!</string>
@@ -449,7 +445,6 @@
   <string name="security_error_invalid_file_access">Erro de segurança: Acesso ao ficheiro inválido</string>
   <string name="no_application_to_share_uri">Não foi encontrada nenhuma aplicação para partilhar o URI</string>
   <string name="share_uri_with">Partilhar URI com...</string>
-  <string name="your_full_jid_will_be">O seu ID Jabber completo será: %s</string>
   <string name="create_account">Criar conta</string>
   <string name="pick_your_username">Escolha o seu nome de utilizador</string>
   <string name="pref_manually_change_presence">Gerir manualmente a disponibilidade</string>

src/main/res/values-ro-rRO/strings.xml

@@ -7,6 +7,7 @@
   <string name="action_end_conversation">Închide conversația</string>
   <string name="action_contact_details">Detalii contact</string>
   <string name="action_muc_details">Detalii discuție de grup</string>
+  <string name="channel_details">Detalii canal</string>
   <string name="action_secure">Securizează conferința</string>
   <string name="action_add_account">Adaugă cont</string>
   <string name="action_edit_contact">Editează nume</string>
@@ -51,6 +52,7 @@
   <string name="share_with">Partajează cu...</string>
   <string name="start_conversation">Pornește o conversație</string>
   <string name="invite_contact">Invită contact</string>
+  <string name="invite">Invită</string>
   <string name="contacts">Contacte</string>
   <string name="contact">Contact</string>
   <string name="cancel">Anulează</string>
@@ -171,11 +173,11 @@
   <string name="mgmt_account_are_you_sure">Sigur doriți asta?</string>
   <string name="mgmt_account_delete_confirm_text">Dacă vă ștergeți contul, întregul istoric de conversații va fi pierdut</string>
   <string name="attach_record_voice">Înregistrare voce</string>
-  <string name="account_settings_jabber_id">ID-ul Jabber</string>
-  <string name="block_jabber_id">Blochează ID Jabber</string>
+  <string name="account_settings_jabber_id">Adresä XMPP</string>
+  <string name="block_jabber_id">Blochează adresă XMPP</string>
   <string name="account_settings_example_jabber_id">numeutilizator@exemplu.ro</string>
   <string name="password">Parolă</string>
-  <string name="invalid_jid">Acesta nu este un ID Jabber valabil</string>
+  <string name="invalid_jid">Acesta nu este o adresă XMPP valabilă</string>
   <string name="error_out_of_memory">Memorie epuizată. Imaginea este prea mare.</string>
   <string name="add_phone_book_text">Vreți să adăugați pe %s în lista de contacte?</string>
   <string name="server_info_show_more">Informații server</string>
@@ -210,6 +212,7 @@
   <string name="fetching_keys">Se preiau cheile...</string>
   <string name="done">Gata</string>
   <string name="decrypt">Decriptează</string>
+  <string name="bookmarks">Semne de carte</string>
   <string name="search">Caută</string>
   <string name="enter_contact">Introduceți contact</string>
   <string name="delete_contact">Șterge contact</string>
@@ -218,14 +221,19 @@
   <string name="unblock_contact">Deblochează contact</string>
   <string name="create">Creeaza</string>
   <string name="select">Selectează</string>
-  <string name="contact_already_exists">Contactul exista deja</string>
+  <string name="contact_already_exists">Contactul există deja</string>
   <string name="join">Alatura-te</string>
+  <string name="channel_full_jid_example">canal@conferinta.exemplu.ro/numeutilizator</string>
+  <string name="channel_bare_jid_example">canal@conferinta.exemplu.ro</string>
   <string name="save_as_bookmark">Salvează semn de carte</string>
   <string name="delete_bookmark">Șterge semn de carte</string>
   <string name="destroy_room">Distruge discuția de grup</string>
+  <string name="destroy_channel">Distruge canal</string>
   <string name="destroy_room_dialog">Sigur doriți distrugerea acestei discuții de grup?\n\n<b>Atenție:</b> Discuția de grup v-a fi complet ștearsä de pe server.</string>
+  <string name="destroy_channel_dialog">Sigur doriți distrugerea acestui canal public?\n\n<b>Atenție:</b> Canalul public v-a fi complet șters de pe server.</string>
   <string name="could_not_destroy_room">Nu s-a putut distruge discuția de grup</string>
-  <string name="bookmark_already_exists">Acest semn de carte exista</string>
+  <string name="could_not_destroy_channel">Nu s-a putut distruge canalul</string>
+  <string name="bookmark_already_exists">Acest semn de carte există deja</string>
   <string name="action_edit_subject">Editează subiectul discuției de grup</string>
   <string name="topic">Subiect discuție</string>
   <string name="joining_conference">Vă alăturați discuției de grup...</string>
@@ -248,7 +256,7 @@
   <string name="private_message_to">către %s</string>
   <string name="send_private_message_to">Trimite mesaj privat catre %s</string>
   <string name="connect">Conectare</string>
-  <string name="account_already_exists">Acest cont exista deja</string>
+  <string name="account_already_exists">Acest cont există deja</string>
   <string name="next">Următoarea</string>
   <string name="server_info_session_established">Sesiune curentă stabilită</string>
   <string name="skip">Omite</string>
@@ -297,7 +305,7 @@
   <string name="send_again">Trimite din nou</string>
   <string name="file_url">Adresă fișier</string>
   <string name="url_copied_to_clipboard">Adresă copiată în memorie</string>
-  <string name="jabber_id_copied_to_clipboard">Adresă ID Jabber copiată în memorie</string>
+  <string name="jabber_id_copied_to_clipboard">Adresă XMPP copiată în memorie</string>
   <string name="error_message_copied_to_clipboard">Mesaj de eroare copiat în memorie</string>
   <string name="web_address">adresă web</string>
   <string name="scan_qr_code">Scanează cod de bare 2D</string>
@@ -308,6 +316,14 @@
   <string name="try_again">Încearcă din nou</string>
   <string name="pref_keep_foreground_service">Păstrează serviciul activ în prim-plan</string>
   <string name="pref_keep_foreground_service_summary">Previne închiderea conexiunii de către sistemul de operare</string>
+  <string name="pref_create_backup">Creează copie de siguranță</string>
+  <string name="pref_create_backup_summary">Fișierele copiei de siguranță vor fi salvate în %s</string>
+  <string name="notification_create_backup_title">Se creează copia de siguranță</string>
+  <string name="notification_backup_created_title">Copia de siguranță a fost creată</string>
+  <string name="notification_backup_created_subtitle">Fișierele copiei de siguranță au fost salvate în %s</string>
+  <string name="restoring_backup">Se restaurează din copia de siguranță</string>
+  <string name="notification_restored_backup_title">Copia de siguranță a fost restaurată</string>
+  <string name="notification_restored_backup_subtitle">Nu uitați să activați contul.</string>
   <string name="choose_file">Alegeți un fișier</string>
   <string name="receiving_x_file">Primesc %1$s (%2$d%% complet)</string>
   <string name="download_x_file">Descarcă %s</string>
@@ -353,14 +369,25 @@
   <string name="outcast">proscris</string>
   <string name="member">Membru</string>
   <string name="advanced_mode">Mod avansat</string>
+  <string name="grant_membership">Acordă privilegii de membru</string>
+  <string name="remove_membership">Abrogă privilegiile de membru</string>
   <string name="grant_admin_privileges">Acordă privilegiile de administrator</string>
   <string name="remove_admin_privileges">Abrogă privilegiile de administrator</string>
+  <string name="grant_owner_privileges">Acordă privilegii de proprietar</string>
+  <string name="remove_owner_privileges">Abrogă privilegiile de proprietar</string>
   <string name="remove_from_room">Înlătură din discuția de grup</string>
+  <string name="remove_from_channel">Înlătură din canal</string>
   <string name="could_not_change_affiliation">Nu s-a putut schimba afilierea lui %s</string>
   <string name="ban_from_conference">Interzice accesul la discuția de grup</string>
+  <string name="ban_from_channel">Interzice accesul la canal</string>
+  <string name="removing_from_public_conference">Încercați să înlăturați pe %s dintr-un canal public. Singurul mod în care puteți face asta este să blocați utilizatorul pentru totdeauna.</string>
   <string name="ban_now">Interzice accesul acum</string>
   <string name="could_not_change_role">Nu s-a putut schimba rolul lui %s</string>
+  <string name="conference_options">Configurare discuție de grup privată</string>
+  <string name="channel_options">Configurare canal public</string>
   <string name="members_only">Privat, numai pentru membri</string>
+  <string name="non_anonymous">Adresele XMPP sunt vizibile tuturor</string>
+  <string name="moderated">Canalul este moderat</string>
   <string name="you_are_not_participating">Nu participați</string>
   <string name="modified_conference_options">Opțiuni discuție de grup modificate!</string>
   <string name="could_not_modify_conference_options">Nu s-au putut modifica opțiunile discuției de grup</string>
@@ -395,6 +422,8 @@
   <string name="no_application_found_to_display_location">Nu s-a găsit nici o aplicație care să afișeze locația</string>
   <string name="location">Locatie</string>
   <string name="title_undo_swipe_out_conversation">Conversație închisă</string>
+  <string name="title_undo_swipe_out_group_chat">A părăsit discuția de grup privată</string>
+  <string name="title_undo_swipe_out_channel">A părăsit canalul public</string>
   <string name="pref_dont_trust_system_cas_title">Nu ai încredere în CA din sistem</string>
   <string name="pref_dont_trust_system_cas_summary">Toate certificatele trebuie aprobate manual</string>
   <string name="pref_remove_trusted_certificates_title">Înlătură certificatele</string>
@@ -414,6 +443,7 @@
   <string name="recently_used">Folosită recent</string>
   <string name="choose_quick_action">Alegeți acțiunea rapidă</string>
   <string name="search_contacts">Caută contacte</string>
+  <string name="search_bookmarks">Caută semne de carte</string>
   <string name="send_private_message">Trimite mesaj privat</string>
   <string name="user_has_left_conference">%1$s a părăsit discuția de grup!</string>
   <string name="username">Nume utilizator</string>
@@ -447,7 +477,7 @@
   <string name="captcha_required">Text captcha de verificare necesar</string>
   <string name="captcha_hint">Introduceți textul din imaginea de mai sus</string>
   <string name="certificate_chain_is_not_trusted">Seria de certificate nu este de încredere</string>
-  <string name="jid_does_not_match_certificate">ID-ul Jabber nu corespunde cu certificatul</string>
+  <string name="jid_does_not_match_certificate">Adresa XMPP nu corespunde cu certificatul</string>
   <string name="action_renew_certificate">Înnoiește certificatul</string>
   <string name="error_fetching_omemo_key">Eroare la preluarea cheii OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Verifica cheia OMEMO cu un certificat</string>
@@ -500,11 +530,11 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="security_error_invalid_file_access">Eroare de securitate.: Acces fișier invalid</string>
   <string name="no_application_to_share_uri">Nu s-a găsit nici o aplicație care să partajeze adresa</string>
   <string name="share_uri_with">Partajează adresa cu...</string>
-  <string name="welcome_text">Jabber este o rețea de mesagerie instant ce nu depinde de un anumit furnizor. Aveți posibilitatea să utilizați acest client cu orice server Jabber doriți.\nTotuși, pentru confortul dumneavoastră, am facilitat crearea unui cont pe conversations.im¹; un furnizor potrivit pentru utilizarea cu aplicația Conversations.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Quicksy este o versiune a popularului client Jabber/XMPP Conversations cu descoperire automată a contactelor.<br><br>Vă înscrieți cu numărul de telefon și Quicksy—pe baza numerelor de telefon din agenda dumneavoastră—vă va sugera automat posibile contacte.<br><br>Înscriindu-vă sunteți de acord cu <a href="https://quicksy.im/#privacy">politica noastră de confidențialitate</a>.]]></string>
+  <string name="welcome_text">XMPP este o rețea de mesagerie instant ce nu depinde de un anumit furnizor. Aveți posibilitatea să utilizați acest client cu orice server XMPP doriți.\nTotuși, pentru confortul dumneavoastră, am facilitat crearea unui cont pe conversations.im¹; un furnizor potrivit pentru utilizarea cu aplicația Conversations.</string>
+  <string name="welcome_text_quicksy"><![CDATA[Quicksy este o versiune a popularului client XMPP Conversations cu descoperire automată a contactelor.<br><br>Vă înscrieți cu numărul de telefon și Quicksy—pe baza numerelor de telefon din agenda dumneavoastră—vă va sugera automat posibile contacte.<br><br>Înscriindu-vă sunteți de acord cu <a href="https://quicksy.im/#privacy">politica noastră de confidențialitate</a>.]]></string>
   <string name="agree_and_continue">De acord &amp; continuă</string>
-  <string name="magic_create_text">Vă vom ghida prin procesul de creare al unui cont pe conversations.im.¹\nCând alegeți conversations.im ca furnizor veți putea comunica cu utilizatorii altor furnizori oferindu-le ID-ul dumneavoastră Jabber.</string>
-  <string name="your_full_jid_will_be">ID-ul Jabber va fi: %s</string>
+  <string name="magic_create_text">Vă vom ghida prin procesul de creare al unui cont pe conversations.im.¹\nCând alegeți conversations.im ca furnizor veți putea comunica cu utilizatorii altor furnizori oferindu-le adresa dumneavoastră completă XMPP.</string>
+  <string name="your_full_jid_will_be">Adresa dumneavoastră XMPP completă va fi: %s</string>
   <string name="create_account">Creează cont</string>
   <string name="use_own_provider">Folosește furnizorul meu</string>
   <string name="pick_your_username">Alegeți un nume de utilizator</string>
@@ -644,7 +674,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="yesterday">Ieri</string>
   <string name="pref_validate_hostname">Validează numele domeniului cu ajutorul DNSSEC</string>
   <string name="pref_validate_hostname_summary">Certificatele serverelor care conțin nume de domenii validate sunt considerate verificate</string>
-  <string name="certificate_does_not_contain_jid">Certificatul nu conține un ID Jabber</string>
+  <string name="certificate_does_not_contain_jid">Certificatul nu conține o adresă XMPP</string>
   <string name="server_info_partial">parțial</string>
   <string name="attach_record_video">Înregistrare video</string>
   <string name="copy_to_clipboard">Copiază în clipboard</string>
@@ -706,7 +736,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <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ă ID Jabber</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>
@@ -733,6 +763,8 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="pref_more_notification_settings_summary">Importanță, sunete, vibrații</string>
   <string name="video_compression_channel_name">Compresie video</string>
   <string name="view_media">Vizualizare fișiere media</string>
+  <string name="view_users">Arată participanții</string>
+  <string name="group_chat_members">Participanți</string>
   <string name="media_browser">Vizualizare fișiere media</string>
   <string name="security_violation_not_attaching_file">Fișier omis ca urmare a unei probleme de securitate.</string>
   <string name="pref_video_compression">Calitate video</string>
@@ -791,9 +823,45 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="install_orbot">Instalare Orbot</string>
   <string name="start_orbot">Pornire Orbot</string>
   <string name="no_market_app_installed">Nici un magazin de aplicații instalat.</string>
+  <string name="group_chat_will_make_your_jabber_id_public">Acest canal vă face publică adresa XMPP</string>
   <string name="ebook">carte electronică</string>
   <string name="video_original">Original (necompresat)</string>
   <string name="open_with">Deschide cu…</string>
   <string name="set_profile_picture">Poză profil Conversations</string>
   <string name="choose_account">Alegeți contul</string>
+  <string name="restore_backup">Restaurează copie de siguranță</string>
+  <string name="restore">Restaurează</string>
+  <string name="enter_password_to_restore">Introduceți parola contului %s pentru a restaura copia de siguranță.</string>
+  <string name="restore_warning">Nu folosiți funcția de restaurare a copiei de siguranță pentru a încerca clonarea (rularea simultană a) instalării. Restaurarea copiei de siguranță este gândită doar pentru a migra pe un alt dispozitiv sau în cazul în care ați pierdut dispozitivul original.</string>
+  <string name="unable_to_restore_backup">Nu s-a putut restaura copia de siguranță.</string>
+  <string name="unable_to_decrypt_backup">Nu s-a putut decripta copia de siguranță. Parola este corectă?</string>
+  <string name="backup_channel_name">Copie de siguranță &amp; Restaurare</string>
+  <string name="enter_jabber_id">Introduceți adresa XMPP</string>
+  <string name="create_group_chat">Creează discuție de grup</string>
+  <string name="join_public_channel">Alătură-te unui canal public</string>
+  <string name="create_private_group_chat">Creează discuție de grup privată</string>
+  <string name="create_public_channel">Creează canal public</string>
+  <string name="create_dialog_channel_name">Nume canal</string>
+  <string name="xmpp_address">Adresä XMPP</string>
+  <string name="please_enter_name">Vă rugăm să furnizați un nume pentru canal</string>
+  <string name="please_enter_xmpp_address">Vă rugăm să furnizați o adresă XMPP</string>
+  <string name="this_is_an_xmpp_address">Aceasta este o adresă XMPP. Vă rugăm să furnizați un nume.</string>
+  <string name="creating_channel">Se creează canalul public...</string>
+  <string name="channel_already_exists">Acest canal există deja</string>
+  <string name="joined_an_existing_channel">V-ați alăturat unui canal existent</string>
+  <string name="unable_to_set_channel_configuration">Nu se poate seta configurația canalului</string>
+  <string name="allow_participants_to_edit_subject">Permite oricui să editeze subiectul</string>
+  <string name="allow_participants_to_invite_others">Permite oricui să invite alte persoane</string>
+  <string name="anyone_can_edit_subject">Oricine poate edita subiectul.</string>
+  <string name="owners_can_edit_subject">Proprietarii pot edita subiectul.</string>
+  <string name="admins_can_edit_subject">Administratorii pot edita subiectul.</string>
+  <string name="owners_can_invite_others">Proprietarii pot invita alte persoane.</string>
+  <string name="anyone_can_invite_others">Oricine poate invita alte persoane.</string>
+  <string name="jabber_ids_are_visible_to_admins">Adresele XMPP sunt vizibile administratorilor.</string>
+  <string name="jabber_ids_are_visible_to_anyone">Adresele XMPP sunt vizibile tuturor.</string>
+  <string name="no_users_hint_channel">Acest canal public nu are participanți. Invitați-vă contactele sau folosiți butonul de partajare pentru a-i distribui adresa XMPP.</string>
+  <string name="no_users_hint_group_chat">Această discuție de grup privată nu are participanți.</string>
+  <string name="manage_permission">Gestionare privilegii</string>
+  <string name="search_participants">Caută participanți</string>
+  <string name="file_too_large">Fișier prea mare</string>
 </resources>

src/main/res/values-ru/strings.xml

@@ -165,11 +165,8 @@
   <string name="mgmt_account_are_you_sure">Вы уверены?</string>
   <string name="mgmt_account_delete_confirm_text">Если вы удалите аккаунт, будет потеряна вся история переписки.</string>
   <string name="attach_record_voice">Запись голоса</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">Заблокировать Jabber ID</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Пароль</string>
-  <string name="invalid_jid">Недопустимый Jabber ID</string>
   <string name="error_out_of_memory">Недостаточно памяти. Изображение слишком большое</string>
   <string name="add_phone_book_text">Вы хотите добавить %s в вашу адресную книгу?</string>
   <string name="server_info_show_more">Информация о сервере</string>
@@ -431,7 +428,6 @@
   <string name="captcha_required">Необходима проверка</string>
   <string name="captcha_hint">Введите текст с изображения</string>
   <string name="certificate_chain_is_not_trusted">Цепочка сертификата не доверена</string>
-  <string name="jid_does_not_match_certificate">Jabber ID не соответствует сертификату</string>
   <string name="action_renew_certificate">Обновить сертификат</string>
   <string name="error_fetching_omemo_key">Ошибка при получении OMEMO ключа!</string>
   <string name="verified_omemo_key_with_certificate">Проверен OMEMO ключ с сертификатом!</string>
@@ -479,8 +475,6 @@
   <string name="security_error_invalid_file_access">Ошибка безопасности: недействительный доступ к файлу</string>
   <string name="no_application_to_share_uri">Не найдено приложения для отправки</string>
   <string name="share_uri_with">Отправить URI…</string>
-  <string name="magic_create_text">Мы поможем Вам создать аккаунт на conversations.im¹.\nВыбрав conversations.im в качестве провайдера, вы сможете общаться с пользователями других провайдеров, сообщив им свой полный Jabber ID.</string>
-  <string name="your_full_jid_will_be">Ваш полный Jabber ID: %s</string>
   <string name="create_account">Создать аккаунт</string>
   <string name="use_own_provider">Использовать свой провайдер</string>
   <string name="pick_your_username">Выберите имя пользователя</string>
@@ -621,7 +615,6 @@
   <string name="yesterday">Вчера</string>
   <string name="pref_validate_hostname">Проверить имя сервера с помощью DNSSEC</string>
   <string name="pref_validate_hostname_summary">Серверные сертификаты, содержащие проверенное имя хоста, считаются проверенными</string>
-  <string name="certificate_does_not_contain_jid">Сертификат не содержит Jabber ID</string>
   <string name="server_info_partial">частичный</string>
   <string name="attach_record_video">Записать видео</string>
   <string name="copy_to_clipboard">Скопировать в буфер обмена</string>
@@ -647,5 +640,4 @@
   <string name="share">Поделиться</string>
   <string name="please_wait">Пожалуйста, подождите…</string>
   <string name="search_messages">Поиск сообщений</string>
-  <string name="copy_jabber_id">Копировать Jabber ID</string>
 </resources>

src/main/res/values-sk/strings.xml

@@ -123,10 +123,8 @@
   <string name="mgmt_account_enable">Povoliť účet</string>
   <string name="mgmt_account_are_you_sure">Ste si istý?</string>
   <string name="attach_record_voice">Nahrať hlas</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="account_settings_example_jabber_id">meno@priklad.com</string>
   <string name="password">Heslo</string>
-  <string name="invalid_jid">Toto nie je platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatok pamäti. Obrázok je príliš veľký</string>
   <string name="server_info_show_more">Informácie o serveri</string>
   <string name="server_info_mam">XEP-0313: MAM</string>

src/main/res/values-sr/strings.xml

@@ -162,11 +162,8 @@
   <string name="mgmt_account_are_you_sure">Да ли сте сигурни?</string>
   <string name="mgmt_account_delete_confirm_text">Ако обришете ваш налог изгубићете сав историјат преписке</string>
   <string name="attach_record_voice">Сними глас</string>
-  <string name="account_settings_jabber_id">Џабер ИД</string>
-  <string name="block_jabber_id">Блокирај Џабер ИД</string>
   <string name="account_settings_example_jabber_id">korisnickoime@primer.com</string>
   <string name="password">Лозинка</string>
-  <string name="invalid_jid">Ово није исправан Џабер ИД</string>
   <string name="error_out_of_memory">Нестало меморије. Слика је превелика</string>
   <string name="add_phone_book_text">Желите ли да додате %s у ваш именик?</string>
   <string name="server_info_show_more">Подаци о серверу</string>
@@ -429,7 +426,6 @@
   <string name="captcha_required">Потребна стопка</string>
   <string name="captcha_hint">Унесите текст са слике изнад</string>
   <string name="certificate_chain_is_not_trusted">Ланац сертификата није поуздан</string>
-  <string name="jid_does_not_match_certificate">Џабер ИД не одговара сертификату</string>
   <string name="action_renew_certificate">Обнови сертификат</string>
   <string name="error_fetching_omemo_key">Грешка добављања ОМЕМО кључа!</string>
   <string name="verified_omemo_key_with_certificate">Оверен ОМЕМО кључ помоћу сертификата!</string>
@@ -472,8 +468,6 @@
   <string name="security_error_invalid_file_access">Безбедносна грешка: неисправан приступ фајлу</string>
   <string name="no_application_to_share_uri">Нема апликације за дељење веза</string>
   <string name="share_uri_with">Подели везу помоћу…</string>
-  <string name="magic_create_text">Водићемо вас кроз процес прављења налога на conversations.im.¹\nАко изаберете conversations.im за даваоца услуге моћи ћете да комуницирате са корисницима других сервера ако им дате ваш Џабер ИД.</string>
-  <string name="your_full_jid_will_be">Ваш пуни Џабер ИД ће бити: %s</string>
   <string name="create_account">Направи налог</string>
   <string name="use_own_provider">Користићу сопствени провајдер</string>
   <string name="pick_your_username">Одредите ваше корисничко име</string>
@@ -598,7 +592,6 @@
   <string name="application_found_to_open_website">Нема апликације за отварање вебсајта</string>
   <string name="today">Данас</string>
   <string name="yesterday">Јуче</string>
-  <string name="certificate_does_not_contain_jid">Сертификат не садржи Џабер ИД</string>
   <string name="server_info_partial">делимично</string>
   <string name="attach_record_video">Сними видео</string>
   <string name="copy_to_clipboard">Копирај на клипборд</string>
@@ -623,7 +616,6 @@
   <string name="search_messages">Тражи поруке</string>
   <string name="view_conversation">Погледај преписку</string>
   <string name="copy_link">Копирај веб адресу</string>
-  <string name="copy_jabber_id">Копирај Џабер ИД</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>

src/main/res/values-sv/strings.xml

@@ -151,11 +151,8 @@
   <string name="mgmt_account_are_you_sure">Är du säker?</string>
   <string name="mgmt_account_delete_confirm_text">Om du tar bort ditt konto kommer hela konversationshistoriken att försvinna</string>
   <string name="attach_record_voice">Spela in röst</string>
-  <string name="account_settings_jabber_id">Jabber-ID</string>
-  <string name="block_jabber_id">Blockera Jabber-ID</string>
   <string name="account_settings_example_jabber_id">användarnamn@exempel.se</string>
   <string name="password">Lösenord</string>
-  <string name="invalid_jid">Detta är inte ett korrekt Jabber-ID</string>
   <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
   <string name="add_phone_book_text">Vill du lägga till %s i din enhets kontakter?</string>
   <string name="server_info_show_more">Server-info</string>
@@ -380,7 +377,6 @@
   <string name="captcha_required">CAPTCHA krävs</string>
   <string name="captcha_hint">Skriv i texten från bilden ovan</string>
   <string name="certificate_chain_is_not_trusted">Certifikatskedjan är inte betrodd</string>
-  <string name="jid_does_not_match_certificate">Jabber-ID matchar inte certifikat</string>
   <string name="action_renew_certificate">Förnya certifikat</string>
   <string name="error_fetching_omemo_key">Misslyckades med att hämta OMEMO-nyckel!</string>
   <string name="verified_omemo_key_with_certificate">Verifierade OMEMO-nyckel med certifikat!</string>
@@ -422,8 +418,6 @@
   <string name="security_error_invalid_file_access">Säkerhetsfel: Ogiltig filaccess</string>
   <string name="no_application_to_share_uri">Ingen applikation kunde hittas för att dela URI</string>
   <string name="share_uri_with">Dela URI med...</string>
-  <string name="magic_create_text">Du kommer nu att få hjälp med att skapa ett konto på conversations.im.¹\nNär conversations.im väljs som leverantör kommer du kunna kommunicera med användare hos andra leverantörer genom att ge dem ditt Jabber ID.</string>
-  <string name="your_full_jid_will_be">Ditt jabber ID blir: %s</string>
   <string name="create_account">Skapa konto</string>
   <string name="use_own_provider">Använd min egen leverantör</string>
   <string name="pick_your_username">Välj användarnamn</string>

src/main/res/values-tr-rTR/strings.xml

@@ -147,11 +147,8 @@
   <string name="mgmt_account_enable">Hesabı etkinleştir</string>
   <string name="mgmt_account_are_you_sure">Emin misiniz?</string>
   <string name="attach_record_voice">Ses kaydet</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">Jabber ID engelle</string>
   <string name="account_settings_example_jabber_id">kullanıcıadı@ornek.com</string>
   <string name="password">parola</string>
-  <string name="invalid_jid">Jabber ID geçersiz</string>
   <string name="error_out_of_memory">Yetersiz bellek. Görüntü dosyası çok büyük.</string>
   <string name="add_phone_book_text">%s kişisini listenize eklemek ister misiniz?</string>
   <string name="server_info_show_more">Sunucu bilgisi</string>
@@ -376,7 +373,6 @@
   <string name="captcha_required">Captcha gerekli</string>
   <string name="captcha_hint">Resimdeki yazıyı girin</string>
   <string name="certificate_chain_is_not_trusted">Sertifika zinciri güvenilir değil</string>
-  <string name="jid_does_not_match_certificate">Jabber ID sertifikayla eşleşmiyor</string>
   <string name="action_renew_certificate">Sertifikayı yenile</string>
   <string name="error_fetching_omemo_key">OMEMO anahtarı alınırken hata oluştu!</string>
   <string name="verified_omemo_key_with_certificate">Sertifikalı OMEMO anahtarı onaylandı!</string>
@@ -418,8 +414,6 @@
   <string name="security_error_invalid_file_access">Güvenlik hatası: Geçersiz dosya erişimi</string>
   <string name="no_application_to_share_uri">URI paylaşmak için uygulama bulunamadı</string>
   <string name="share_uri_with">URI paylaş ile...</string>
-  <string name="magic_create_text">conversation.im sağlayıcısında hesap açma sürecinde size yol göstereceğiz.\nconversation.im\'i bir servis sağlayıcı olarak kullandığınızda diğer sağlayıcıları kullananlarla tam Jabber kimliğinizi vererek iletişim kurabilirsiniz.</string>
-  <string name="your_full_jid_will_be">Tam Jabber kimliğiniz %s olacak</string>
   <string name="create_account">Hesap Oluştur</string>
   <string name="use_own_provider">Kendi sağlayıcımı kullan</string>
   <string name="pick_your_username">Kullanıcı adınızı seçin</string>

src/main/res/values-uk/strings.xml

@@ -171,11 +171,8 @@
   <string name="mgmt_account_are_you_sure">Ви впевнені?</string>
   <string name="mgmt_account_delete_confirm_text">Якщо ви видалите ваш обліковий запис, буде втрачено всю історію листування</string>
   <string name="attach_record_voice">Записати голос</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">Заблокувати Jabber ID</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Пароль</string>
-  <string name="invalid_jid">Це не є дійсним Jabber ID</string>
   <string name="error_out_of_memory">Пам\'ять вичерпано. Завелике зображення.</string>
   <string name="add_phone_book_text">Бажаєте додати %s до своєї книги контактів?</string>
   <string name="server_info_show_more">Інформація про сервер</string>
@@ -298,7 +295,6 @@
   <string name="send_again">Надіслати знову</string>
   <string name="file_url">URL файла</string>
   <string name="url_copied_to_clipboard">URL скопійовано до комірки обміну</string>
-  <string name="jabber_id_copied_to_clipboard">Jabber ID скопійовано до комірки обміну</string>
   <string name="error_message_copied_to_clipboard">Текст повідомлення про помилку скопійовано до комірки обміну</string>
   <string name="web_address">веб адреса</string>
   <string name="scan_qr_code">Розпізнати QR-код</string>
@@ -449,7 +445,6 @@
   <string name="captcha_required">Потрібно вирішити головоломку</string>
   <string name="captcha_hint">Уведіть текст із зображення вище</string>
   <string name="certificate_chain_is_not_trusted">Ланцюжок сертифікатів не довірений</string>
-  <string name="jid_does_not_match_certificate">Jabber ID не відповідає сертифікату</string>
   <string name="action_renew_certificate">Оновити сертифікат</string>
   <string name="error_fetching_omemo_key">Помилка отримання ключа OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Ключ OMEMO звірено з сертифікатом!</string>
@@ -501,11 +496,7 @@
   <string name="security_error_invalid_file_access">Помилка безпеки: Недійсний доступ до файлу</string>
   <string name="no_application_to_share_uri">Не знайдено програми, щоб поділитися URI</string>
   <string name="share_uri_with">Поділитися URI з…</string>
-  <string name="welcome_text">Jabber забезпечує незалежну мережу обміну миттєвими повідомленнями. Ви можете використовувати цю програму з будь-яким сервером Jabber на Ваш вибір.\nЗадля Вашої зручності ми зробили простим створити обліковий запис на conversations.im¹; це один із серверів, який спеціально налаштований для цієї програми.</string>
-  <string name="welcome_text_quicksy"><![CDATA[Ця програма («Quicksy») — версія популярного Jabber/XMPP клієнта «Conversations», яка дозволяє автоматично знайти контакти.<br><br>Ви реєструєтеся зі своїм номером телефону, а програма автоматично, виходячи з номерів телефонів у Вашій книзі контактів, пропонує Вам можливі контакти.<br><br>Реєструючись, Ви надаєте згоду з нашою <a href="https://quicksy.im/#privacy">політикою конфіденційності</a>.]]></string>
   <string name="agree_and_continue">Прийняти й продовжити</string>
-  <string name="magic_create_text">Ми допоможемо вам крок за кроком створити обліковий запис на conversations.im.¹\nОбравши conversations.im постачальником послуг, ви зможете спілкуватися з користувачами інших постачальників, надавши їм ваш повний Jabber ID.</string>
-  <string name="your_full_jid_will_be">Ваш повний Jabber ID буде: %s</string>
   <string name="create_account">Створити обліковий запис</string>
   <string name="use_own_provider">Використати мого власного провайдера</string>
   <string name="pick_your_username">Оберіть Ваше ім\'я користувача</string>
@@ -651,7 +642,6 @@
   <string name="yesterday">Учора</string>
   <string name="pref_validate_hostname">Перевіряти адресу з допомогою DNSSEC</string>
   <string name="pref_validate_hostname_summary">Сертифікати, які містять завірену адресу, вважаються засвідченими</string>
-  <string name="certificate_does_not_contain_jid">Сертифікат не містить ідентифікатора Jabber ID</string>
   <string name="server_info_partial">частково</string>
   <string name="attach_record_video">Записати відео</string>
   <string name="copy_to_clipboard">Скопіювати до комірки обміну</string>
@@ -713,7 +703,6 @@
   <string name="pref_use_share_location_plugin">Додаток поширення місцезнаходження</string>
   <string name="pref_use_share_location_plugin_summary">Використовувати додаток поширення місце-знаходження замість вбудованої карти</string>
   <string name="copy_link">Скопіювати веб адресу</string>
-  <string name="copy_jabber_id">Скопіювати Jabber ID</string>
   <string name="p1_s3_filetransfer">Доступ до файлів по HTTP для S3</string>
   <string name="pref_start_search">Безпосередній пошук</string>
   <string name="pref_start_search_summary">На екрані початку розмови відкривати клавіатуру й розміщувати курсор в поле пошуку</string>

src/main/res/values-vi/strings.xml

@@ -147,10 +147,8 @@
   <string name="mgmt_account_enable">Bật tài khoản</string>
   <string name="mgmt_account_are_you_sure">Bạn chắc chứ?</string>
   <string name="attach_record_voice">Ghi âm</string>
-  <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">Mật khẩu</string>
-  <string name="invalid_jid">ID Jabber này không hợp lệ</string>
   <string name="error_out_of_memory">Hết bộ nhớ. Ảnh quá lớn</string>
   <string name="add_phone_book_text">Bạn có muốn thêm %s vào danh bạ?</string>
   <string name="server_info_show_more">Thông tin máy chủ</string>
@@ -348,7 +346,6 @@
   <string name="authenticate_with_certificate">Bỏ trống để xác minh với chứng nhận</string>
   <string name="captcha_required">Yêu cầu hình xác minh</string>
   <string name="certificate_chain_is_not_trusted">Chuỗi chứng nhận không được tin tưởng</string>
-  <string name="jid_does_not_match_certificate">ID Jabber không khớp với chứng nhận</string>
   <string name="action_renew_certificate">Gia hạn chứng nhận</string>
   <string name="error_fetching_omemo_key">Lỗi nhập khoá OMEMO!</string>
   <string name="verified_omemo_key_with_certificate">Khoá OMEMO đã xác minh với chứng nhận!</string>

src/main/res/values-zh-rCN/strings.xml

@@ -167,11 +167,8 @@
   <string name="mgmt_account_are_you_sure">确定?</string>
   <string name="mgmt_account_delete_confirm_text">如果您删除帐户，您的整个聊天记录将会丢失</string>
   <string name="attach_record_voice">录音</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">屏蔽 Jabber ID</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">密码</string>
-  <string name="invalid_jid">该 Jabber ID 无效</string>
   <string name="error_out_of_memory">空间不足。图片过大</string>
   <string name="add_phone_book_text">是否添加 %s 到地址薄？</string>
   <string name="server_info_show_more">服务器信息</string>
@@ -433,7 +430,6 @@
   <string name="captcha_required">需要验证码</string>
   <string name="captcha_hint">输入上图中的文字</string>
   <string name="certificate_chain_is_not_trusted">证书链不受信任</string>
-  <string name="jid_does_not_match_certificate">Jabber ID 与证书不匹配</string>
   <string name="action_renew_certificate">更新证书</string>
   <string name="error_fetching_omemo_key">获取 OMEMO 密钥错误！</string>
   <string name="verified_omemo_key_with_certificate">请用证书验证 OMEMO 密钥！</string>
@@ -482,9 +478,6 @@
   <string name="security_error_invalid_file_access">安全错误：文件访问权限无效</string>
   <string name="no_application_to_share_uri">未找到可以分享此链接的应用</string>
   <string name="share_uri_with">分享链接……</string>
-  <string name="welcome_text">Jabber 是一个独立即时通讯网络服务商。无论您选择何种 Jabber 服务器，您都可使用本客户端\n但是为了让您更方便些，我们希望您在 conversations.im¹ 创建账号，它专门为 Conversations 服务。</string>
-  <string name="magic_create_text">我们将会引导你完成在 conversations.im¹ 上注册账号的过程。\n当获得了 conversations.im 提供的账号以后，你可以通过添加使用其他提供商的好友的完整 Jabber ID 来与他们联络。</string>
-  <string name="your_full_jid_will_be">您完整的 Jabble ID 是：%s </string>
   <string name="create_account">创建账户</string>
   <string name="use_own_provider">使用我自己的服务端</string>
   <string name="pick_your_username">输入您的用户名</string>
@@ -612,7 +605,6 @@
   <string name="yesterday">昨天</string>
   <string name="pref_validate_hostname">使用 DNSSEC 来验证主机名</string>
   <string name="pref_validate_hostname_summary">包含已验证的主机名的服务器证书被认为是已验证的</string>
-  <string name="certificate_does_not_contain_jid">证书不包含一个 Jabber ID</string>
   <string name="server_info_partial">部分的</string>
   <string name="attach_record_video">录制视频</string>
   <string name="copy_to_clipboard">复制</string>
@@ -672,7 +664,6 @@
   <string name="view_conversation">查看对话</string>
   <string name="pref_use_share_location_plugin">分享位置插件</string>
   <string name="copy_link">复制web地址</string>
-  <string name="copy_jabber_id">复制Jabber ID</string>
   <string name="p1_s3_filetransfer">用于S3的HTTP文件共享</string>
   <string name="pref_start_search">直接搜索</string>
   <string name="pref_start_search_summary">在“开始对话”屏幕上打开键盘并将光标放在搜索栏中</string>

src/main/res/values-zh-rTW/strings.xml

@@ -151,11 +151,8 @@
   <string name="mgmt_account_are_you_sure">確定?</string>
   <string name="mgmt_account_delete_confirm_text">刪除帳號會導致聊天紀錄全部不見</string>
   <string name="attach_record_voice">錄音</string>
-  <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="block_jabber_id">封鎖 Jabber 識別碼</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
   <string name="password">密碼</string>
-  <string name="invalid_jid">該 Jabber ID 無效</string>
   <string name="error_out_of_memory">空間不足。圖片過大</string>
   <string name="add_phone_book_text">是否添加 %s 到地址薄？</string>
   <string name="server_info_show_more">伺服器資訊</string>
@@ -379,7 +376,6 @@
   <string name="captcha_required">需要驗證碼</string>
   <string name="captcha_hint">輸入上圖中的文字</string>
   <string name="certificate_chain_is_not_trusted">憑證連結不受信任</string>
-  <string name="jid_does_not_match_certificate">Jabber ID 與證書不匹配</string>
   <string name="action_renew_certificate">更新證書</string>
   <string name="error_fetching_omemo_key">獲取 OMEMO 金鑰錯誤！</string>
   <string name="verified_omemo_key_with_certificate">請用證書驗證 OMEMO 金鑰！</string>
@@ -422,8 +418,6 @@
   <string name="security_error_invalid_file_access">安全錯誤：檔案存取無效</string>
   <string name="no_application_to_share_uri">找不到可以分享網址(URI)的應用程式</string>
   <string name="share_uri_with">分享網址(URI)…</string>
-  <string name="magic_create_text">我們將會引導你完成在 conversations.im¹ 上註冊帳號的過程。\n當獲得了 conversations.im 提供的帳號以後，你可以通過添加使用其他提供商的好友的完整 Jabber ID 來與他們聯絡。</string>
-  <string name="your_full_jid_will_be">您完整的 Jabble ID 是：%s </string>
   <string name="create_account">創建帳戶</string>
   <string name="use_own_provider">使用我自己的服務端</string>
   <string name="pick_your_username">輸入您的用戶名</string>

src/quicksy/res/values-de/strings.xml

@@ -12,7 +12,7 @@
     <string name="battery_optimizations_enabled_explained">Dein Telefon verwendet Akkuoptimierungen bei Quicksy, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können.\nEs wird empfohlen, diese zu deaktivieren.</string>
     <string name="battery_optimizations_enabled_dialog">Dein Telefon verwendet Akkuoptimierungen bei Quicksy, welche verspätete Benachrichtigungen oder Nachrichtenverlust verursachen können.\n\nDu wirst nun gefragt, diese zu deaktivieren.</string>
     <string name="pref_broadcast_last_activity_summary">Informiere deine Kontakte, wann du Quicksy nutzt</string>
-    <string name="data_saver_enabled_explained">Dein Betriebssystem verbietet Quicksy im Hintergrund den Zugang zum Internet. Um Benachrichtigungen erhalten zu können, solltest du Quicksy den Zugang erlauben, wenn der Datensparmodus aktiv ist. Quicksy wird dennoch versuchen, so viele Daten wie möglich einzusparen.</string>
+    <string name="data_saver_enabled_explained">Dein Betriebssystem verhindert, dass Quicksy im Hintergrund auf das Internet zugreift. Um Benachrichtigungen erhalten zu können, solltest du Quicksy den Zugang erlauben, wenn der Datensparmodus aktiv ist. Quicksy wird dennoch versuchen, so viele Daten wie möglich einzusparen.</string>
     <string name="device_does_not_support_data_saver">Dein Gerät unterstützt den Datensparmodus für Quicksy nicht.</string>
     <string name="huawei_protected_apps_summary">Um weiterhin Benachrichtigungen zu erhalten, auch wenn der Bildschirm ausgeschaltet ist, musst du Quicksy zur Liste der geschützten Apps hinzufügen.</string>
     <string name="error_trustkey_general">Quicksy ist nicht in der Lage, verschlüsselte Nachrichten an %1$s zu senden. Dies kann daran liegen, dass dein Kontakt einen veralteten Server oder Client verwendet, der mit OMEMO nicht umgehen kann.</string>

src/quicksy/res/values-nl/strings.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="crash_report_title">Quicksy is gecrasht</string>
     <string name="crash_report_message">Door het versturen van crashrapportages help je de ontwikkeling van Quicksy.\n\n<b>Waarschuwing:</b> Deze app zal je XMPP-account gebruiken om de crashrapportages te versturen naar de ontwikkelaars.</string>
-    <string name="openkeychain_required_long">Quicksy gebruikt een derdepartijapp genaamd <b>OpenKeychain</b> om berichten te versleutelen en ontsleutelen, en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Quicksy na installatie.)</small></string>
+    <string name="openkeychain_required_long">Quicksy gebruikt een derdepartijapp genaamd <b>OpenKeychain</b> om berichten te versleutelen, ontsleutelen en om publieke sleutels te beheren.\n\nOpenKeychain is beschikbaar onder de GPLv3 en beschikbaar op F-Droid en Google Play.\n\n<small>(Herstart Quicksy na installatie.)</small></string>
     <string name="contact_has_no_pgp_key">Quicksy kan je berichten niet versleutelen omdat je contact geen publieke sleutel heeft ingesteld.\n\n<small>Vraag je contact om OpenPGP te configureren.</small></string>
     <string name="contacts_have_no_pgp_keys">Quicksy kan je berichten niet versleutelen omdat je contacten geen publieke sleutel hebben ingesteld.\n\n<small>Vraag je contacten om OpenPGP te configureren.</small></string>
     <string name="pref_notification_grace_period_summary">Hoe lang Quicksy stil blijft na activiteit op een ander apparaat waar te nemen</string>
@@ -12,7 +12,7 @@
     <string name="battery_optimizations_enabled_explained">Je apparaat voert sterke batterij-optimalisaties uit op Quicksy, die kunnen leiden tot vertraagde meldingen of zelfs verlies van berichten.\nHet is aangeraden deze optimalisaties uit te schakelen.</string>
     <string name="battery_optimizations_enabled_dialog">Je apparaat voert sterke batterij-optimalisaties uit op Quicksy, die kunnen leiden tot vertraagde meldingen of zelfs verlies van berichten.\nJe zal nu gevraagd worden deze optimalisaties uit te schakelen.</string>
     <string name="pref_broadcast_last_activity_summary">Laat al je contactpersonen weten wanneer je Quicksy gebruikt</string>
-    <string name="data_saver_enabled_explained">Je besturingssysteem verhindert Quicksy toegang tot het internet wanneer Quicksy zich in de achtergrond bevindt. Om meldingen van nieuwe berichten te krijgen moet je Quicksy onbeperkte toegang geven wanneer gegevensbesparing is ingeschakeld.\nQuicksy zal nog steeds proberen wanneer mogelijk gegevens te besparen.</string>
+    <string name="data_saver_enabled_explained">Je besturingssysteem verhindert Quicksy toegang tot het internet wanneer Quicksy zich op de achtergrond bevindt. Om meldingen van nieuwe berichten te krijgen moet je Quicksy onbeperkte toegang geven wanneer gegevensbesparing is ingeschakeld.\nQuicksy zal nog steeds proberen wanneer mogelijk gegevens te besparen.</string>
     <string name="device_does_not_support_data_saver">Je apparaat ondersteunt het uitschakelen van gegevensbesparing voor Quicksy niet.</string>
     <string name="huawei_protected_apps_summary">Om meldingen te blijven ontvangen, zelfs wanneer het scherm uit staat, moet je Quicksy toevoegen aan de lijst met beschermde apps.</string>
     <string name="error_trustkey_general">Quicksy kan geen versleutelde berichten sturen naar %1$s. Dit komt mogelijk omdat je contact gebruik maakt van een verouderde server, of een cliënt die geen ondersteuning biedt voor OMEMO.</string>