17 files changed, 1014 insertions, 307 deletions
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 04f1ed022..82eae092c 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="action_settings">إعدادات</string>
+    <string name="action_settings">الإعدادات</string>
     <string name="action_add">محادثة جديدة</string>
     <string name="action_accounts">إدارة الحسابات</string>
     <string name="action_end_conversation">إنهاء هذه المحادثة</string>
-    <string name="action_contact_details">بيانات المتصل</string>
+    <string name="action_contact_details">بيانات المُراسِل</string>
     <string name="action_secure">محادثة آمنة</string>
     <string name="action_add_account">إضافة حساب</string>
     <string name="action_edit_contact">تعديل الاسم</string>
     <string name="action_add_phone_book">إضافة إلى دفتر العناوين</string>
     <string name="action_delete_contact">حذف من القائمة</string>
-    <string name="action_block_contact">كتلة الاتصال</string>
-    <string name="action_unblock_contact">إلغاء حظر جهة الإتصال</string>
-    <string name="action_block_domain">حظر المجال</string>
-    <string name="action_unblock_domain">إلغاء حظر المجال</string>
+    <string name="action_block_contact">حجب المُراسِل</string>
+    <string name="action_unblock_contact">إلغاء حجب المُراسِل</string>
+    <string name="action_block_domain">حجب اسم النطاق</string>
+    <string name="action_unblock_domain">إلغاء حجب اسم النطاق</string>
     <string name="title_activity_manage_accounts">إدارة الحسابات</string>
     <string name="title_activity_settings">الإعدادات</string>
-    <string name="title_activity_conference_details">تفاصيل مجموعة الدردشة</string>
-    <string name="title_activity_contact_details">تفاصيل الإتصال</string>
-    <string name="title_activity_sharewith">مشاركة مع المحادثة</string>
-    <string name="title_activity_start_conversation">بدء محادثة</string>
-    <string name="title_activity_choose_contact">إختر جهة اتصال</string>
+    <string name="title_activity_conference_details">تفاصيل فريق المحادثة</string>
+    <string name="title_activity_contact_details">تفاصيل المُراسِل</string>
+    <string name="title_activity_sharewith">شارك بواسطة بيكسل آرت ماسنجر</string>
+    <string name="title_activity_start_conversation">الشروع في محادثة</string>
+    <string name="title_activity_choose_contact">إختر مُراسلك</string>
+    <string name="title_activity_choose_contacts">اختر مُراسِليك</string>
     <string name="title_activity_block_list">قائمة الحظر</string>
     <string name="just_now">الآن</string>
     <string name="minute_ago">منذ دقيقة</string>
-    <string name="minutes_ago">منذ%d دقيقة</string>
-    <string name="unread_conversations">محادثة غير مقروءة</string>
-    <string name="sending">إرسال…</string>
-    <string name="message_decrypting">فك تشفير الرسالة. الرجاء الإنتظار…</string>
+    <string name="minutes_ago">منذ %d دقيقة</string>
+    <string name="unread_conversations">محادثات غير مقروءة</string>
+    <string name="sending">الإرسال جارٍ…</string>
+    <string name="message_decrypting">جارٍ فك تشفير الرسالة. الرجاء الإنتظار…</string>
     <string name="pgp_message">OpenPGP رسالة مشفرة</string>
-    <string name="nick_in_use">الإسم المستعار مأخوذ بالفعل</string>
-    <string name="admin">المشرف</string>
+    <string name="nick_in_use">الإسم المستعار مُستخدَم مِن طرف شخص آخر</string>
+    <string name="admin">المدير</string>
     <string name="owner">المالك</string>
     <string name="moderator">مُشرف</string>
     <string name="participant">مشارك</string>
@@ -41,4 +42,294 @@
     <string name="unblock_contact_text">هل تريد إزالة الحظر عن %s والسماح لهم بمراسلتك؟</string>
     <string name="block_domain_text">حظر كل جهات الإتصال من %s ؟</string>
     <string name="unblock_domain_text">إزالة الحظر عن كل جهات الإتصال من %s ؟</string>
+    <string name="contact_blocked">المراسل محظور</string>
+    <string name="blocked">تم حجبه</string>
+    <string name="register_account">تسجيل حساب جديد على الخادم</string>
+    <string name="change_password_on_server">تعديل الكلمة السرية على الخادم</string>
+    <string name="share_with">شارك بواسطة…</string>
+    <string name="start_conversation">ابدأ محادثة</string>
+    <string name="invite_contact">دعوة مُراسِل</string>
+    <string name="contacts">المُراسِلون</string>
+    <string name="cancel">إلغاء</string>
+    <string name="set">حدد</string>
+    <string name="add">إضافة</string>
+    <string name="edit">تعديل</string>
+    <string name="delete">حذف</string>
+    <string name="block">حجب</string>
+    <string name="unblock">إلغاء الحظر</string>
+    <string name="save">حفظ</string>
+    <string name="ok">موافق</string>
+    <string name="crash_report_title">لقد تحطم بيكس آرت ماسنجر</string>
+    <string name="send_now">ارسل الآن</string>
+    <string name="send_never">لا تسأل مجددًا</string>
+    <string name="problem_connecting_to_account">لا يمكن الاتصال بالحساب</string>
+    <string name="problem_connecting_to_accounts">السماح بتوصيل عدة حسابات</string>
+    <string name="touch_to_fix">إضغط هنا لإدارة حساباتك</string>
+    <string name="attach_file">إرفاق ملف</string>
+    <string name="add_contact">إضافة مُراسِل</string>
+    <string name="action_clear_history">مسح السجلّ</string>
+    <string name="clear_conversation_history">محو سجلّ المحادثة</string>
+    <string name="delete_messages">حذف الرسائل</string>
+    <string name="choose_presence">اختر الجهاز</string>
+    <string name="send_unencrypted_message">ارسل رسالة غير مشفّرة</string>
+    <string name="send_unencrypted">أرسل من دون تشفير</string>
+    <string name="openkeychain_required">OpenKeychain</string>
+    <string name="restart">إعادة التشغيل</string>
+    <string name="install">تثبيت</string>
+    <string name="openkeychain_not_installed">يُرجى تثبيت OpenKeychain</string>
+    <string name="pref_general">عام</string>
+    <string name="pref_attachments">المرفقات</string>
+    <string name="pref_notification_settings">الإشعارات</string>
+    <string name="pref_vibrate">إهتزاز</string>
+    <string name="pref_sound">النغمة</string>
+    <string name="pref_ui_options">واجهة المستخدم</string>
+    <string name="accept">قبول</string>
+    <string name="your_account">حسابك</string>
+    <string name="attach_choose_picture">اختر صورة</string>
+    <string name="attach_take_from_camera">صورة من الكاميرا</string>
+    <string name="account_status_unknown">مجهول</string>
+    <string name="account_status_online">متصل</string>
+    <string name="account_status_offline">غير متصل</string>
+    <string name="account_status_not_found">لم يتم العثور على الخادم</string>
+    <string name="account_status_no_internet">لا يوجد اتصال</string>
+    <string name="account_status_regis_fail">فشلت عملية تسجيل الحساب</string>
+    <string name="account_status_regis_conflict">اسم المستخدم بالفعل قيد الاستخدام</string>
+    <string name="account_status_regis_success">اكتملت عملية التسجيل</string>
+    <string name="account_status_regis_not_sup">هذا الخادم لا يسمح بإنشاء حسابات جديدة</string>
+    <string name="account_status_policy_violation">انتهاك للشروط</string>
+    <string name="encryption_choice_unencrypted">بدون تشفير</string>
+    <string name="encryption_choice_otr">OTR</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
+    <string name="encryption_choice_omemo">OMEMO</string>
+    <string name="action_account">تعديل الحساب</string>
+    <string name="mgmt_account_delete">حذف الحساب</string>
+    <string name="mgmt_account_publish_avatar">انشر الصورة الرمزية</string>
+    <string name="mgmt_account_publish_pgp">نشر المفتاح العمومي OpenPGP</string>
+    <string name="unpublish_pgp">حذف المفتاح العمومي OpenPGP</string>
+    <string name="mgmt_account_are_you_sure">هل أنت متأكد؟</string>
+    <string name="attach_record_voice">تسجيل مقطع صوتي</string>
+    <string name="account_settings_jabber_id">حساب جابر</string>
+    <string name="account_settings_password">الكلمة السرية</string>
+    <string name="account_settings_example_jabber_id">username@pix-art.de</string>
+    <string name="password">الكلمة السرية</string>
+    <string name="confirm_password">تأكيد كلمة السر</string>
+    <string name="passwords_do_not_match">كلمتا المرور غير متطابقتين</string>
+    <string name="server_info_show_more">معلومات الخادم</string>
+    <string name="server_info_available">نعم</string>
+    <string name="server_info_unavailable">لا</string>
+    <string name="last_seen_now">متصل</string>
+    <string name="last_seen_min">منذ دقيقة</string>
+    <string name="last_seen_mins">منذ %d دقائق</string>
+    <string name="last_seen_hour">منذ ساعة</string>
+    <string name="last_seen_day">منذ يوم</string>
+    <string name="last_seen_days">منذ %d أيام</string>
+    <string name="your_fingerprint">بصمتك</string>
+    <string name="otr_fingerprint">بصمة OTR</string>
+    <string name="other_devices">أجهزة أخرى</string>
+    <string name="done">تم</string>
+    <string name="conferences">المحادثاث الجماعية</string>
+    <string name="search">بحث</string>
+    <string name="create_contact">انشاء مُراسِل</string>
+    <string name="join_conference">الالتحاق بفريق المحادثة</string>
+    <string name="block_contact">حجب مُراسِل</string>
+    <string name="create">إنشاء</string>
+    <string name="join">الانضمام</string>
+    <string name="conference_address">عنوان فريق المحادثة</string>
+    <string name="conference_address_example">groupchat@room.pix-art.de</string>
+    <string name="action_edit_subject">تعديل موضوع فريق المحادثة</string>
+    <string name="topic">الموضوع</string>
+    <string name="leave">المغادرة</string>
+    <string name="add_back">أضف كذلك</string>
+    <string name="publish">انشر</string>
+    <string name="touch_to_choose_picture">انقر على الصورة المصغرة لاختيار صورة مِن المعرض</string>
+    <string name="publishing">جارٍ النشر…</string>
+    <string name="error_publish_avatar_server_reject">رفض الخادم منشورك</string>
+    <string name="private_message_to">إلى %s</string>
+    <string name="connect">اتصل</string>
+    <string name="account_already_exists">هذا الحساب موجود بالفعل</string>
+    <string name="next">التالي</string>
+    <string name="skip">تخطي</string>
+    <string name="disable_notifications">تعطيل الإشعارات</string>
+    <string name="enable">تمكين</string>
+    <string name="enter_password">ادخل الكلمة السرية</string>
+    <string name="delete_fingerprint">حذف البصمة</string>
+    <string name="sure_delete_fingerprint">هل أنت متأكد مِن أنك تريد حذف هذه البصمة؟</string>
+    <string name="ignore">تجاهل</string>
+    <string name="pref_security_settings">حماية البيانات والأمان</string>
+    <string name="pref_allow_message_correction">السماح بتصحيح الرسائل</string>
+    <string name="pref_expert_options">إعدادات الخبراء</string>
+    <string name="title_activity_about">عن التطبيق</string>
+    <string name="title_pref_quiet_hours">ساعات الهدوء</string>
+    <string name="title_pref_quiet_hours_start_time">توقيت البداية</string>
+    <string name="title_pref_quiet_hours_end_time">إلى غاية</string>
+    <string name="title_pref_enable_quiet_hours">تمكين ساعات الهدوء</string>
+    <string name="pref_expert_options_other">أخرى</string>
+    <string name="pref_autojoin">زامن مع الفواصل المرجعية</string>
+    <string name="using_account">تستخدم حاليا حساب %s</string>
+    <string name="message_options">خيارات الرسائل</string>
+    <string name="send_again">إرسل مجددا</string>
+    <string name="file_url">رابط الملف</string>
+    <string name="url_copied_to_clipboard">تم نسخ العنوان إلى الحافظة</string>
+    <string name="scan_qr_code">امسح رمز الاستجابة السريعة QR</string>
+    <string name="show_qr_code">إظهار رمز الكيو آر</string>
+    <string name="account_details">تفاصيل الحساب</string>
+    <string name="confirm">تأكيد</string>
+    <string name="try_again">أعد المحاولة</string>
+    <string name="finish">إنهاء</string>
+    <string name="choose_file">إختر ملفا</string>
+    <string name="download_x_file">تنزيل %s</string>
+    <string name="delete_x_file">حذف %s</string>
+    <string name="file">ملف</string>
+    <string name="open_x_file">افتح %s</string>
+    <string name="pref_show_dynamic_tags">عرض الوسوم الديناميكية</string>
+    <string name="account_image_description">الصورة الرمزية للحساب</string>
+    <string name="clear_other_devices">احذف الأجهزة</string>
+    <string name="distrust_omemo_key">سحب الثقة في الجهاز</string>
+    <string name="password_changed">تم تغيير الكلمة السرية!</string>
+    <string name="could_not_change_password">لا يمكن تغيير الكلمة السرية</string>
+    <string name="change_password">تغيير الكلمة السرية</string>
+    <string name="current_password">الكلمة السرية الحالية</string>
+    <string name="new_password">كلمة السر الجديدة</string>
+    <string name="password_should_not_be_empty">لا يجب ترك حقل الكلمة السرية فارغا</string>
+    <string name="member">عضو</string>
+    <string name="advanced_mode">الوضع المتقدم</string>
+    <string name="grant_membership">منحة صفة العضوية</string>
+    <string name="remove_membership">إلغاء العضوية</string>
+    <string name="grant_admin_privileges">منح صلاحيات المُشرِف</string>
+    <string name="remove_admin_privileges">الغاء صلاحيات المُشرِف</string>
+    <string name="conference_options">خيارات المحادثة الجماعية</string>
+    <string name="video">فيديو</string>
+    <string name="image">صورة</string>
+    <string name="pdf_document">وثيقة PDF</string>
+    <string name="apk">تطبيق أندرويد</string>
+    <string name="hide_offline">إخفاء غير المتّصلين</string>
+    <string name="location">الموقع</string>
+    <string name="pref_dont_trust_system_cas_title">لا تثق في سلطات شهادات النظام</string>
+    <string name="dialog_manage_certs_negativebutton">إلغاء</string>
+    <string name="pref_quick_action">الإجراء السريع</string>
+    <string name="none">لا شيء</string>
+    <string name="recently_used">الأكثر استخداما في الآونة الأخيرة</string>
+    <string name="search_contacts">البحث عن مراسِلين</string>
+    <string name="search_groups">البحث عن محادثات جماعية</string>
+    <string name="choose_quick_action">اختر إجراءا سريعا</string>
+    <string name="send_private_message">أرسل رسالة خاصة</string>
+    <string name="username">اسم المستخدم</string>
+    <string name="username_hint">اسم المستخدم</string>
+    <string name="action_check_update">البحث عن تحديثات</string>
+    <string name="title_activity_updater">خدمة التحديث</string>
+    <string name="remind_later">لاحقا</string>
+    <string name="update">تحديث</string>
+    <string name="no_update_available">لا يوجد تحديثات</string>
+    <string name="account_status_tor_unavailable">شبكة تور غير متوفرة</string>
+    <string name="pref_presence_settings">التوفر</string>
+    <string name="hostname_example">xmpp.pix-art.de</string>
+    <string name="action_add_account_with_certificate">إضافة حساب يحوي شهادة</string>
+    <string name="action_renew_certificate">تجديد الشهادة</string>
+    <string name="error_fetching_omemo_key">خطأ أثناء جلب مفتاح أوميمو!</string>
+    <string name="changelog">التغييرات</string>
+    <string name="account_settings_hostname">اسم المضيف</string>
+    <string name="account_settings_port">المنفذ</string>
+    <string name="hostname_or_onion">خادِم - أو عنوان .onion</string>
+    <string name="load_more_messages">تحميل المزيد من الرسائل</string>
+    <string name="sync_with_contacts">زامِن مع المراسِلين</string>
+    <string name="pref_picture_compression">ضغط الصور</string>
+    <string name="pref_video_compression">ضغط الفيديوهات</string>
+    <string name="always">دائما</string>
+    <string name="disable">تعطيل</string>
+    <string name="cancel_update">إلغاء التحديث؟</string>
+    <string name="yes">نعم</string>
+    <string name="no">لا</string>
+    <string name="no_accounts">(ليس هناك أي حساب نشط)</string>
+    <string name="this_field_is_required">هذة الخانة ضرورية</string>
+    <string name="this_account_is_disabled">لقد قمت بتعطيل هذا الحساب</string>
+    <string name="mgmt_account_reconnect">إعادة الاتصال</string>
+    <string name="welcome_text">… هو تطبيق محادثة حر و آمن لجابر و XMPP.</string>
+    <string name="create_account">إنشاء حساب جديد</string>
+    <string name="welcome_advanced_mode">الوضع المتقدم</string>
+    <string name="pick_your_username">قم باختيار اسم مستخدم خاص بك</string>
+    <string name="presence_chat">حر للمحادثة</string>
+    <string name="presence_online">متصل</string>
+    <string name="presence_away">غائب</string>
+    <string name="presence_xa">غير متوفر</string>
+    <string name="presence_dnd">مشغول</string>
+    <string name="secure_password_generated">تم توليد كلمة سرية آمنة</string>
+    <string name="share">شارك</string>
+    <string name="share_location">مشاركة الموقع</string>
+    <string name="action_end_conversation_muc">مغادرة المحادثة الجماعية</string>
+    <string name="show_password">إظهار الكلمة السرية</string>
+    <string name="registration_password_too_weak">فشلت عملية إنشاء الحساب: إنّ الكلمة السرية ضعيفة</string>
+    <string name="create_conference">انشاء محادثة جماعية</string>
+    <string name="conference_subject">الموضوع</string>
+    <string name="choose_participants">اختر المشاركين</string>
+    <string name="import_text">إنّ جهازك يحتوي على نسخة احتياطية يمكنك استيرادها.\nسوف يتم إعادة تشغيل تطبيقك بعد عملية الإسترجاع. هل تريد استعادة تلك النسخة الإحتياطية؟ </string>
+    <string name="import_database">استيراد نسخة احتياطية</string>
+    <string name="invite_again">إعادة دعوته مجددا</string>
+    <string name="inviteUser_Subject">قام بدعوتك عبر</string>
+    <string name="invite_user">الدعوة إلى بيكس آرت ماسنجر</string>
+    <string name="Password_wrong">الكلمة السرية خاطئة، أعد المحاولة</string>
+    <string name="enter_account_password">يرجى ادخال الكلمة السرية الخاصة بحسابك قصد استيراد نسختك الإحتياطية.</string>
+    <string name="please_wait">يُرجى الانتظار…</string>
+    <string name="me">أنا</string>
+    <string name="allow">سماح</string>
+    <string name="unable_to_update_account">تعذر تحديث حسابك</string>
+    <string name="create_issue">الإبلاغ عن مشكلة</string>
+    <string name="copy_to_clipboard">انسخ إلى الحافظة</string>
+    <string name="message_copied_to_clipboard">تم نسخ الرسالة إلى الحافظة</string>
+    <string name="share_as_barcode">شاركه كرمز كيو آر</string>
+    <string name="share_as_uri">شاركه كعنوان XMPP</string>
+    <string name="share_as_http">شاركه كرابط HTTP</string>
+    <string name="hide_inactive_devices">إخفاء الخاملين</string>
+    <string name="reply">رد</string>
+    <string name="encrypting_message">تشفير الرسالة</string>
+    <string name="today">اليوم</string>
+    <string name="contacts_are_typing">%s يكتبون حاليا…</string>
+    <string name="contact_is_typing">%s يكتب حاليا…</string>
+    <string name="one_participant">مشارك واحد</string>
+    <string name="more_participants">%d مشاركين</string>
+    <string name="presence_offline">غير مُتصل</string>
+    <string name="block_entire_domain">حجب النطاق كاملا</string>
+    <string name="action_take_photo">التقاط صورة</string>
+    <string name="action_take_video">تسجيل فيديو</string>
+    <string name="yesterday">البارحة</string>
+    <string name="server_info_partial">جزئيا</string>
+    <string name="pref_warn_unencrypted_chat">التنبيه إن كانت المحادثة غير مشفّرة</string>
+    <string name="title_activity_share_via_account">شاركه عبر حساب</string>
+    <string name="destroy_muc">حذف المحادثة الجماعية</string>
+    <string name="conference_unknown_error">أنت لم تعد مِن ضمن فريق المحادثة هذا</string>
+    <string name="pref_enable_multi_accounts_title">السماح باستخدام عدة حسابات</string>
+    <string name="mtm_cert_details">تفاصيل الشهادة:</string>
+    <string name="once">مرة واحدة</string>
+    <string name="draft">المسودة:</string>
+    <string name="pref_theme_light">سمة فاتحة</string>
+    <string name="pref_theme_dark">سمة داكنة</string>
+    <string name="pref_theme_options">السمة</string>
+    <string name="chooce_account">اختر حسابا</string>
+    <string name="pref_font_size">حجم الخط</string>
+    <string name="create_shortcut">إنشاء اختصار</string>
+    <string name="gif">صورة متحركة</string>
+    <string name="view_conversation">عرض المحادثة</string>
+    <string name="server_hint">اختر المزوِّد</string>
+    <string name="choose_your_server">اختر مزوّدك لخدمة جابر</string>
+    <string name="show_privacy">سياسة الخصوصية</string>
+    <string name="show_termsofuse">شروط الاستخدام</string>
+    <string name="pref_start_search">البحث المباشر</string>
+    <string name="group_chat_avatar">الصورة الرمزية للمحادثة الجماعية</string>
+    <string name="group_chat_name">التسمية</string>
+    <string name="create_dialog_group_chat_name">اسم فريق المحادثة</string>
+    <string name="delete_message">حذف الرسالة</string>
+    <string name="conference_destroyed">لقد تم تدمير هذه المحادثة الجماعية</string>
+    <string name="welcome_server_info">ننصح باستخدام blabber.im كمزوّد الخدمة الخاص بك.</string>
+    <string name="notification_group_messages">رسائل</string>
+    <string name="messages_channel_name">رسائل</string>
+    <string name="silent_messages_channel_name">رسائل صامتة</string>
+    <string name="pref_more_notification_settings">إعدادات الإشعارات</string>
+    <string name="video_compression_channel_name">ضغط الفيديو</string>
+    <string name="app_update_channel_name">تحديث التطبيق</string>
+    <string name="action_group_details">تفاصيل الفريق</string>
+    <string name="view_media">عرض الوسائط</string>
+    <string name="media_browser">مستعرض الوسائط</string>
+    <string name="action_open">افتح</string>
+    <string name="install_orbot">تثبيت أوربوت</string>
+    <string name="start_orbot">تشغيل أوربوت</string>
+    <string name="ebook">كتاب إلكتروني</string>
 </resources>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 0b8f62855..7eff38c6f 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -256,8 +256,6 @@
     <string name="pref_use_indicate_received_summary">Els missatges rebuts seràn marcats amb uns ticks verds si ho admet</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Pintar el botó d\'enviament per indicar l\'estatus del contacte</string>
     <string name="pref_expert_options_other">Altres</string>
-    <string name="pref_autojoin">Uniu-vos automàticament als xats de grup</string>
-    <string name="pref_autojoin_summary">Respecta l\'indicador d\'autoentrada als marcadors de xat de grup</string>
     <string name="toast_message_otr_fingerprint">Empremta digital OTR copiada al portapapers</string>
     <string name="toast_message_omemo_fingerprint">S\'ha copiat l\'empremta digital d\'OMEMO al porta-retalls.</string>
     <string name="conference_banned">Estàs prohibit en aquest xat de grup</string>
diff --git a/src/main/res/values-ceb/strings.xml b/src/main/res/values-ceb/strings.xml
index 78cbfd41e..d63044770 100644
--- a/src/main/res/values-ceb/strings.xml
+++ b/src/main/res/values-ceb/strings.xml
@@ -271,8 +271,6 @@
     <string name="pref_use_send_button_to_indicate_status_summary">Di-kolor pagpadala ug button para pagpasabot sa kontak nga status</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Di-kolor nga pangan sa kontak para pagpahibalo sa kontak status</string>
     <string name="pref_expert_options_other">Uban pa</string>
-    <string name="pref_autojoin">Awtomatik ang pag apil sa grupo nga chat</string>
-    <string name="pref_autojoin_summary">Respetohi ang awto-apil nga flag sa grupo nga chat nga mga bookmark</string>
     <string name="toast_message_otr_fingerprint">OTR fingerprint gekopya ngadto sa clipboard!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO fingerprint gekopya ngadto sa clipboard!</string>
     <string name="conference_banned">Ikaw ge ban sa kini nga grupo sa chat</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d29077753..63e411cbc 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -262,7 +262,7 @@
     <string name="without_mutual_presence_updates"><b>Achtung:</b> Ohne gegenseitige Kenntnis des Online-Status kann es zu unerwarteten Problemen kommen.\n\n<small>Bitte die Einstellungen in den Kontakt-Details prüfen.</small></string>
     <string name="pref_security_settings">Sicherheit und Datenschutz</string>
     <string name="pref_allow_message_correction">Nachrichtenkorrektur erlauben</string>
-    <string name="pref_allow_message_correction_summary">Erlaube Deinen Kontakten das nachträgliche Korrigieren ihrer Nachrichten</string>
+    <string name="pref_allow_message_correction_summary">Erlaube deinen Kontakten, nachträglich ihre Nachrichten zu korrigieren</string>
     <string name="pref_expert_options">Experteneinstellungen</string>
     <string name="title_activity_about">Über</string>
     <string name="pref_about_conversations_summary">Versions- und Lizenzinformationen</string>
@@ -278,8 +278,8 @@
     <string name="pref_use_send_button_to_indicate_status_summary">Senden-Schaltfläche einfärben, um den Online-Status des Kontakts anzuzeigen</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Kontaktnamen einfärben, um den Online-Status des Kontakts anzuzeigen</string>
     <string name="pref_expert_options_other">Sonstiges</string>
-    <string name="pref_autojoin">Gruppenchats automatisch beitreten</string>
-    <string name="pref_autojoin_summary">Gruppenchats automatisch beitreten, wenn in der Kontaktliste aktiviert</string>
+    <string name="pref_autojoin">Mit Kontaktliste synchronisieren</string>
+    <string name="pref_autojoin_summary">Gruppenchats beitreten oder verlassen gemäß der Kennzeichnung \"Automatisches Beitreten\" in deiner Kontaktliste.</string>
     <string name="toast_message_otr_fingerprint">OTR-Fingerabdruck in die Zwischenablage kopiert!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO-Fingerabdruck in die Zwischenablage kopiert!</string>
     <string name="conference_banned">Du wurdest von dem Gruppenchat ausgeschlossen</string>
@@ -355,8 +355,8 @@
     <string name="otr_session_not_started">Sende eine Nachricht, um eine verschlüsselte Unterhaltung zu beginnen</string>
     <string name="ask_question">Frage stellen</string>
     <string name="smp_explain_question">Falls du mit deinem Kontakt ein gemeinsames Geheimnis hast (z.B. ein Insider-Witz oder was ihr zuletzt gemeinsam zum Mittag gegessen habt), kann dies zur gegenseitigen Überprüfung des Fingerabdrucks genutzt werden.\n\nDu stellst eine Frage oder gibst einen Hinweis und dein Kontakt gibt eine eindeutige Antwort.</string>
-    <string name="smp_explain_answer">Dein Kontakt möchte deinen Fingerabdruck mit Hilfe eines gemeinsamen Schlüssels überprüfen. Dein Kontakt hat dazu folgende Frage gestellt.</string>
-    <string name="shared_secret_hint_should_not_be_empty">Deine Frage darf nicht leer sein.</string>
+    <string name="smp_explain_answer">Dein Kontakt möchte deinen Fingerabdruck mit Hilfe eines gemeinsamen Geheimnisses überprüfen. Dein Kontakt hat folgende Frage oder Hinweis zu diesem Geheimnis angeboten.</string>
+    <string name="shared_secret_hint_should_not_be_empty">Dein Hinweis darf nicht leer sein</string>
     <string name="shared_secret_can_not_be_empty">Dein gemeinsamer Schlüssel darf nicht leer sein</string>
     <string name="manual_verification_explanation">Vergleiche den angezeigten Fingerabdruck sorgfältig mit dem deines Kontakts.\nDu kannst dazu einen sicheren Kommunikationsweg (z.B. verschlüsselte E-Mail oder Telefonanruf) zum Austausch nutzen.</string>
     <string name="change_password">Passwort ändern</string>
@@ -454,12 +454,12 @@
     <string name="server_info_broken">Fehlerhaft</string>
     <string name="pref_presence_settings">Verfügbarkeit</string>
     <string name="pref_away_when_screen_off">Abwesend bei abgeschaltetem Bildschirm</string>
-    <string name="pref_away_when_screen_off_summary">Setzt deinen Status auf abwesend, solange dein Bildschirm abgeschaltet ist</string>
+    <string name="pref_away_when_screen_off_summary">Setze deinen Status auf \"abwesend\", solange dein Bildschirm abgeschaltet ist</string>
     <string name="pref_dnd_on_silent_mode">Bitte nicht stören bei Stummschaltung</string>
     <string name="update_info">Pix-Art Messenger lädt und installiert die neue Version automatisch.\n\nBitte warten…</string>
-    <string name="pref_dnd_on_silent_mode_summary">Setzt deinen Status auf Bitte nicht stören, solange dein Gerät stummgeschaltet ist</string>
+    <string name="pref_dnd_on_silent_mode_summary">Setze deinen Status auf \"Bitte nicht stören\", solange dein Gerät stummgeschaltet ist</string>
     <string name="pref_treat_vibrate_as_silent">Vibration als Lautlos behandeln</string>
-    <string name="pref_treat_vibrate_as_dnd_summary">Setzt deinen Status auf \"Bitte nicht stören\", solange das Gerät auf Vibration geschaltet ist</string>
+    <string name="pref_treat_vibrate_as_dnd_summary">Setze deinen Status auf \"Bitte nicht stören\", solange das Gerät auf Vibration geschaltet ist</string>
     <string name="hostname_example">xmpp.pix-art.de</string>
     <string name="action_add_account_with_certificate">Profil mit Zertifikat hinzufügen</string>
     <string name="unable_to_parse_certificate">Zertifikat kann nicht gelesen werden</string>
@@ -565,7 +565,7 @@
     <string name="InviteText">Hallo,\n\n%s hat dich zu einem Gespräch mit Pix-Art Messenger eingeladen. Falls du Android Nutzer bist, probiere es aus und klicke folgenden Link…</string>
     <string name="pref_broadcast_last_activity">Zuletzt gesehen senden</string>
     <string name="pref_broadcast_last_activity_summary">Lasse deine Kontakte wissen, wann du Pix-Art Messenger nutzt</string>
-    <string name="invite_user">In Pix-Art Messenger einladen</string>
+    <string name="invite_user">Zu Pix-Art Messenger einladen</string>
     <string name="request_permissions_message">Pix-Art Messenger wird dich nach ein paar Berechtigungen fragen. Es ist wichtig, dass du alle Berechtigungen erlaubst, um alle Funktionen nutzen zu können. Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string>
     <string name="request_permissions_message_again">Du hast eine oder alle Berechtigungen, welche für Pix-Art Messenger benötigt werden abgelehnt. Willst du zu den Einstellungen springen, um diese Berechtigungen zu erlauben? Falls du eine dieser Berechtigungen ablehnst wird sich die App schließen.</string>
     <string name="unable_to_connect_to_keychain">Keine Verbindung zu OpenKeychain</string>
@@ -839,4 +839,20 @@
     <string name="delete_message_dialog">Nachricht löschen</string>
     <string name="delete_message_dialog_msg">Bist du sicher, dass du diese Nachricht löschen möchtest?\n\n<b>Achtung:</b> Dies wird keine Kopien dieser Nachricht löschen, die auf anderen Geräten oder Servern gespeichert sind.</string>
     <string name="feature_not_implemented">Funktion ist nicht implementiert</string>
+    <string name="device_does_not_support_unknown_source_op">Dein Gerät bietet keine Einstellung an, um die Installation aus unbekannten Quellen zu erlauben.</string>
+    <string name="reject_request">Anfrage ablehnen</string>
+    <string name="error_message_copied_to_clipboard">Fehlermeldung in die Zwischenablage kopiert</string>
+    <string name="pref_screen_security_summary">Behandele den Inhalt als sicher und verhindere, dass er in Screenshots erscheint.</string>
+    <string name="pref_screen_security">Screenshots verbieten</string>
+    <string name="omemo_decryption_failed">Entschlüsselung der OMEMO-Nachricht fehlgeschlagen.</string>
+    <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 Gruppenchat wird deine Jabber-ID öffentlich zugänglich machen</string>
+    <string name="ebook">E-Book</string>
+    <string name="your_name">Dein Name</string>
+    <string name="enter_your_name">Gib deinen Namen ein</string>
+    <string name="enter_your_name_instructions">Bitte gib deinen Nickname ein, der für deine Kontakte sichtbar sein wird.</string>
+    <string name="no_name_set_instructions">Keinen Nickname festgelegt.</string>
+    <string name="autojoin_groupchat">Diesem Gruppenchat automatisch beitreten</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 1c07a2d57..d4c71a19e 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -22,6 +22,7 @@
     <string name="title_activity_sharewith">Compartir con Conversación</string>
     <string name="title_activity_start_conversation">Comenzar conversación</string>
     <string name="title_activity_choose_contact">Elegir contacto</string>
+    <string name="title_activity_choose_contacts">Elegir Contactos</string>
     <string name="title_activity_block_list">Lista de contactos bloqueados</string>
     <string name="just_now">ahora mismo</string>
     <string name="minute_ago">hace 1 min</string>
@@ -42,6 +43,7 @@
     <string name="block_domain_text">¿Bloquear todos los contactos de %s?</string>
     <string name="unblock_domain_text">¿Desbloquear todos los contatos de %s?</string>
     <string name="contact_blocked">Contacto bloqueado</string>
+    <string name="blocked">Bloqueado</string>
     <string name="remove_bookmark_text">¿Quieres eliminar %s de tus marcadores? La conversación asociada con este marcador no se eliminará.</string>
     <string name="register_account">Registrar nueva cuenta en servidor</string>
     <string name="change_password_on_server">Cambiar contraseña en servidor</string>
@@ -74,6 +76,7 @@
     <string name="sharing_files_please_wait">Compartiendo ficheros. Por favor, espera...</string>
     <string name="action_clear_history">Limpiar historial</string>
     <string name="clear_conversation_history">Limpiar historial de conversación</string>
+    <string name="clear_histor_msg">¿Quieres borrar todos los mensajes de esta conversación?\n\n<b>Atención:</b> Esto no afectará a los mensajes guardados en otros dispositivos o servidores.</string>
     <string name="delete_messages">Borrar mensajes</string>
     <string name="also_end_conversation">Además, terminar esta conversación</string>
     <string name="choose_presence">Seleccionar dispositivo</string>
@@ -94,11 +97,11 @@
     <string name="offering">ofreciendo…</string>
     <string name="waiting">esperando…</string>
     <string name="no_pgp_key">Clave OpenPGP no encontrada</string>
-    <string name="contact_has_no_pgp_key">Pix-Art Messenger no ha podido cifrar tus mensajes porque tu contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
+    <string name="contact_has_no_pgp_key">Pix-Art Messenger no ha podido cifrar tus mensajes porque tu contacto no está anunciando su clave pública.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
     <string name="no_pgp_keys">Claves OpenPGP no encontradas</string>
     <string name="pref_general">General</string>
     <string name="pref_accept_files_wifi">Aceptar archivos en conexiones WiFi</string>
-    <string name="pref_accept_files_summary_wifi">Cuando se conecta a wifi acepta automáticamente el descargo de archivos más pequeños que…</string>
+    <string name="pref_accept_files_summary_wifi">Cuando se conecta a wifi acepta automáticamente descargar archivos más pequeños que…</string>
     <string name="pref_accept_files_mobile">Aceptar archivos en conexiones de red móvil</string>
     <string name="pref_accept_files_summary_mobile">Cuando se conecta a la red móvil acepta automáticamente descargar archivos más pequeños de…</string>
     <string name="pref_accept_files_mobileroaming">Aceptar archivos en conexiones roaming</string>
@@ -151,6 +154,7 @@
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
+    <string name="action_account">Editar cuenta</string>
     <string name="mgmt_account_delete">Eliminar cuenta</string>
     <string name="mgmt_account_publish_avatar">Imagen de perfil</string>
     <string name="mgmt_account_publish_pgp">Publicar clave pública OpenPGP</string>
@@ -179,6 +183,8 @@
     <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string>
     <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string>
     <string name="server_info_push">XEP-0357: Push</string>
+    <string name="server_info_available">sí</string>
+    <string name="server_info_unavailable">no</string>
     <string name="missing_public_keys">Se han perdido las claves de anuncio públicas</string>
     <string name="last_seen_now">en línea</string>
     <string name="last_seen_min">hace 1 minuto</string>
@@ -223,6 +229,7 @@
     <string name="delete_bookmark">Eliminar marcador</string>
     <string name="bookmark_already_exists">Este marcador ya existe</string>
     <string name="action_edit_subject">Editar tema del grupo</string>
+    <string name="topic">Tema</string>
     <string name="joining_conference">Unirse al chat de grupo…</string>
     <string name="leave">Salir</string>
     <string name="contact_added_you">El contacto te ha añadido a su lista de contactos</string>
@@ -271,8 +278,8 @@
     <string name="pref_use_send_button_to_indicate_status_summary">El color del botón enviar indica el estado del contacto</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Colorear el nombre del contacto para mostrar su estado en línea</string>
     <string name="pref_expert_options_other">Otros</string>
-    <string name="pref_autojoin">Unirse automáticamente a los chats de grupo</string>
-    <string name="pref_autojoin_summary">Respetar la opción de unirse automáticamente de los marcadores de las conversaciones en grupo</string>
+    <string name="pref_autojoin">Sincronizar con marcadores</string>
+    <string name="pref_autojoin_summary">Unirse y abandonar los grupos de chat de acuerdo con la configuración de unión automática en tus marcadores.</string>
     <string name="toast_message_otr_fingerprint">¡Huella digital OTR copiada al portapapeles!</string>
     <string name="toast_message_omemo_fingerprint">¡Huella digital OMEMO copiada al portapapeles!</string>
     <string name="conference_banned">Tu entrada a este grupo ha sido prohibido</string>
@@ -289,6 +296,8 @@
     <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="scan_qr_code">Escanear código QR</string>
+    <string name="show_qr_code">Mostrar código QR</string>
     <string name="show_block_list">Mostrar contactos bloqueados</string>
     <string name="account_details">Detalles de la cuenta</string>
     <string name="verify_otr">Verificar OTR</string>
@@ -420,6 +429,8 @@
     <string name="pref_quick_action">Acción rápida</string>
     <string name="none">Ninguna</string>
     <string name="recently_used">Usada más recientemente</string>
+    <string name="search_contacts">Buscar contactos</string>
+    <string name="search_groups">Buscar grupos</string>
     <string name="choose_quick_action">Elegir acción rápida</string>
     <string name="send_private_message">Enviar mensaje privado</string>
     <string name="user_has_left_conference">¡%1$s ha dejado el grupo!</string>
@@ -456,7 +467,7 @@
     <string name="mam_prefs">Preferencias de archivado</string>
     <string name="server_side_mam_prefs">Preferencias de archivado en servidor</string>
     <string name="fetching_mam_prefs">Buscando preferencias de archivado. Por favor, espera...</string>
-    <string name="unable_to_fetch_mam_prefs">No se ha podido conseguir las preferencias de archivado</string>
+    <string name="unable_to_fetch_mam_prefs">No se han podido conseguir las preferencias de archivado</string>
     <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>
@@ -512,7 +523,7 @@
     <string name="correct_message">Corregir mensaje</string>
     <string name="send_corrected_message">Enviar mensaje corregido</string>
     <string name="no_keys_just_confirm">Ya confías en este contacto. Seleccionando \'hecho\', estás confirmando que %s es parte de este grupo.</string>
-    <string name="contacts_have_no_pgp_keys">Pix-Art Messenger no ha podido cifrar tus mensajes porque tus contactos no están anunciando su clave publica.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
+    <string name="contacts_have_no_pgp_keys">Pix-Art Messenger no ha podido cifrar tus mensajes porque tus contactos no están anunciando su clave pública.\n\n<small>Por favor, pide a tus contactos que configuren OpenPGP.</small></string>
     <string name="this_account_is_disabled">Has deshabilitado esta cuenta</string>
     <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>
@@ -522,6 +533,7 @@
     <string name="magic_create_text">A continuación crearemos un perfil con una contraseña generada aleatoriamente que podrás utilizar o cambiar en la página siguiente\ny posteriormente podrás ponerte en contacto con los contactos de este y otros servidores dándoles tu Jabber-ID.</string>
     <string name="your_full_jid_will_be">Tu identificador Jabber será: %s</string>
     <string name="create_account">Crear cuenta</string>
+    <string name="welcome_advanced_mode">Modo avanzado</string>
     <string name="pick_your_username">Selecciona tu nombre de usuario</string>
     <string name="pref_manually_change_presence">Cambiar disponibilidad manualmente</string>
     <string name="pref_manually_change_presence_summary">Establezca su disponibilidad cuando edite su mensaje de estado.</string>
@@ -599,14 +611,19 @@
     <string name="this_device_has_been_verified">Este dispositivo ha sido verificado</string>
     <string name="copy_fingerprint">Copiar huella digital</string>
     <string name="all_omemo_keys_have_been_verified">Todas las huellas digitales OMEMO han sido verificadas</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">El código QR no contiene huellas para esta conversación.</string>
     <string name="verified_fingerprints">Huellas digitales verificadas</string>
+    <string name="use_camera_icon_to_scan_barcode">Use la cámara para escanear el código QR del contacto</string>
     <string name="please_wait_for_keys_to_be_fetched">Por favor, espera a que las claves sean recuperadas</string>
+    <string name="share_as_barcode">Compartir como código QR</string>
     <string name="share_as_uri">Compartir como XMPP URI</string>
     <string name="share_as_http">Compartir como link HTTP</string>
     <string name="blindly_trusted_omemo_keys">Huellas digitales OMEMO de confianza ciega</string>
     <string name="pref_blind_trust_before_verification">Confianza ciega antes de verificación</string>
     <string name="pref_blind_trust_before_verification_summary">Automáticamente confiar en los nuevos dispositivos de tus contactos que no han sido verificados todavía, y solicitar confirmación manual cada vez que un contacto verificado añade un dispositivo nuevo.</string>
     <string name="not_trusted">No confiables</string>
+    <string name="invalid_barcode">Código QR no válido</string>
+    <string name="verify_with_qr_code">verificar con código QR</string>
     <string name="i_followed_this_link_from_a_trusted_source">Enlace desde una fuente de confianza</string>
     <string name="verifying_omemo_keys_trusted_source">Vas a verificar las claves OMEMO de %1$s después de hacer click en el enlace. Esto solo es seguro si conseguiste este enlace desde una fuente de confianza donde solo %2$s pudo haber publicado el enlace</string>
     <string name="verify_omemo_keys">Verificar claves OMEMO</string>
@@ -688,7 +705,7 @@
     <string name="server_info_partial">Parcial</string>
     <string name="pref_show_foreground_service_summary">Algunos dispositivos Android cerrarán algunas aplicaciones al cabo de un tiempo y no podrás recibir nuevos mensajes. Si tiene estos problemas, intente activar el servicio de primer plano. Pero tenga en cuenta que tendrá una notificación permanente con esta opción marcada.</string>
     <string name="pref_show_foreground_service">Usar servicio en primer plano</string>
-    <string name="update_service">Pix-Art Mensajero servicio de actualización</string>
+    <string name="update_service">Servicio de actualización de Pix-Art Messenger</string>
     <string name="install_update">¿Instalar actualización?</string>
     <string name="highlight_in_muc">menciona usuario</string>
     <string name="no_application_found_to_open_link">No se ha encontrado aplicación para abrir la página web</string>
@@ -732,7 +749,7 @@
     <string name="disable_encryption">Desactivar cifrado</string>
     <string name="error_trustkey_general">Pix-Art Messenger no puede enviar mensajes cifrados a %1$s. Esto puede ser debido a que tu contacto está usando un servidor o un cliente desactualizado que no puede manejar las claves OMEMO.</string>
     <string name="error_trustkey_device_list">No se pudo obtener la lista de dispositivos</string>
-    <string name="error_trustkey_bundle">No se ha podido conseguir las claves del dispositivo</string>
+    <string name="error_trustkey_bundle">No se han podido conseguir las claves del dispositivo</string>
     <string name="error_trustkey_hint_mutual">Consejo: En algunas ocasiones esto se puede arreglar al agregarse cada uno a su lista de contactos.</string>
     <string name="disable_encryption_message">¿Estás seguro de que quieres deshabilitar el cifrado OMEMO en esta conversación?\nEsto permitirá al administrador de tu servidor leer tus mensajes, aunque esta podría ser la única via de comunicación con personas que usen clientes desactualizados.</string>
     <string name="disable_now">Deshabilitar ahora</string>
@@ -747,4 +764,95 @@
     <string name="pref_theme_dark">Tema oscuro</string>
     <string name="pref_theme_options_summary">Selecciona el color de la paleta</string>
     <string name="pref_theme_options">Tema</string>
+    <string name="chooce_account">Elegir cuenta</string>
+    <string name="pref_font_size">Tamaño de tipografía</string>
+    <string name="pref_font_size_summary">Tamaño de tipografía usado en la aplicación.</string>
+    <string name="small">Pequeño</string>
+    <string name="medium">Mediano</string>
+    <string name="large">Grande</string>
+    <string name="create_shortcut">Crear atajo</string>
+    <string name="not_encrypted_for_this_device">El mensaje no fue cifrado para este dispositivo.</string>
+    <string name="no_microphone_permission">Pix-Art Messenger necesita acceder al micrófono</string>
+    <string name="search_messages">Buscar mensajes</string>
+    <string name="gif">GIF</string>
+    <string name="view_conversation">Ver conversación</string>
+    <string name="web_address">dirección web</string>
+    <string name="jabber_id_copied_to_clipboard">Copiado JID en el portapapeles</string>
+    <string name="copy_jabber_id">Copiar JID</string>
+    <string name="copy_link">Copiar dirección web</string>
+    <string name="server_hint">Elegir proveedor</string>
+    <string name="choose_your_server">Elegir su servidor jabber</string>
+    <string name="show_privacy">Política de Privacidad</string>
+    <string name="show_termsofuse">Términos y condiciones de uso</string>
+    <string name="p1_s3_filetransfer">HTTP File Sharing for S3 (Amazon)</string>
+    <string name="pref_start_search">Búsqueda directa</string>
+    <string name="pref_start_search_summary">En la pantalla \'Comenzar conversación\', abrir el teclado y situar el cursor en el campo de búsqueda</string>
+    <string name="paste_as_quote">Pegar como cita</string>
+    <string name="group_chat_avatar">Imagen de perfil del grupo</string>
+    <string name="host_does_not_support_group_chat_avatars">El servidor no soporta imágenes de perfil de grupos de chat</string>
+    <string name="only_the_owner_can_change_group_chat_avatar">Únicamente el propietario puede cambiar la imagen de perfil de un grupo de conversación</string>
+    <string name="contact_name">Nombre de contacto</string>
+    <string name="nickname">Apodo para este grupo de conversación</string>
+    <string name="group_chat_name">Nombre</string>
+    <string name="providing_a_name_is_optional">Proporcionar un nombre es opcional</string>
+    <string name="create_dialog_group_chat_name">Nombre de conversación en grupo</string>
+    <string name="everyone_has_read_up_to_this_point">Todos han leído hasta aquí</string>
+    <string name="conference_resource_constraint">Recurso limitado</string>
+    <string name="delete_message">Borrar mensaje</string>
+    <string name="conference_destroyed">Este grupo de chat ha sido destruido</string>
+    <string name="no_application_found_to_view_contact">No se ha encontrado ninguna aplicación con la que ver este contacto</string>
+    <string name="welcome_server_info">Recomendamos el uso de blabber.im como tu proveedor.</string>
+    <string name="no_location_permission">Pix-Art Messenger necesita acceder a los servicios de ubicación</string>
+    <string name="pref_show_record_voice_btn_summary">Mostrar el botón de grabación de voz en conversaciones como acción rápida</string>
+    <string name="pref_show_record_voice_btn">Mostrar botón de grabación de voz</string>
+    <string name="pref_use_quick_share_attachment_choice_summary">Reemplazar el botón de enviar con selección de adjunto si no se está tecleando un mensaje. En otro caso mostrar acciones rápidas, que pueden ser configuradas en la siguiente opción.</string>
+    <string name="pref_quick_share_attachment_choice">Seleccionar adjunto</string>
+    <string name="phone_book">Libreta de direcciones</string>
+    <string name="unable_to_save_recording">Imposible guardar la grabación</string>
+    <string name="foreground_service_channel_name">Servicio en primer plano</string>
+    <string name="foreground_service_channel_description">Esta categoría se usa para mostrar una notificación permanente indicando que Pix-Art Messenger se está ejecutando.</string>
+    <string name="notification_group_status_information">Información de estado</string>
+    <string name="error_channel_name">Problemas de conectividad</string>
+    <string name="error_channel_description">Esta categoría se usa para mostrar una notificación en el caso de que exista algún problema conectando a una cuenta.</string>
+    <string name="notification_group_messages">Mensajes</string>
+    <string name="messages_channel_name">Mensajes</string>
+    <string name="silent_messages_channel_name">Mensajes silenciosos</string>
+    <string name="silent_messages_channel_description">Esta categoría se usa para mostrar notificaciones que no deberían activar ningún sonido. Por ejemplo, cuando está activo en otro dispositivo (Periodo de gracia).</string>
+    <string name="pref_more_notification_settings">Configuración de notificaciones</string>
+    <string name="pref_more_notification_settings_summary">Importancia, Sonido, Vibración</string>
+    <string name="video_compression_channel_name">Compresión de vídeo</string>
+    <string name="backup_channel_name">Copia de seguridad de base de datos</string>
+    <string name="app_update_channel_name">Actualizar aplicación</string>
+    <string name="action_group_details">Detalles del grupo</string>
+    <string name="view_media">Visualizar multimedia</string>
+    <string name="media_browser">Navegador multimedia</string>
+    <string name="account_status_stream_opening_error">Error en la apertura de la transmisión</string>
+    <string name="action_open">Abrir</string>
+    <string name="action_delete">Borrar</string>
+    <string name="security_violation_not_attaching_file">Fichero omitido por violación de seguridad.</string>
+    <string name="delete_file_dialog">Borrar archivo</string>
+    <string name="delete_file_dialog_msg">¿Está seguro de que quiere borrar este archivo?\n\n<b>Atención:</b> Esto no afectará a las copias guardadas en otros dispositivos o servidores.</string>
+    <string name="cancelled">cancelado</string>
+    <string name="remote_server_timeout">Tiempo de espera agotado en el servidor</string>
+    <string name="already_drafting_message">Todavía estás redactando un mensaje.</string>
+    <string name="bad_key_for_encryption">Bad key for encryption.</string>
+    <string name="delete_message_dialog">Borrar mensaje</string>
+    <string name="delete_message_dialog_msg">¿Está seguro de que quiere borrar este mensaje?\n\n<b>Atención:</b> Esto no afectará a las copias guardadas en otros dispositivos o servidores.</string>
+    <string name="feature_not_implemented">Característica no implementada</string>
+    <string name="device_does_not_support_unknown_source_op">Tu dispositivo no soporta instalar aplicaciones desde orígenes desconocidos.</string>
+    <string name="reject_request">Rechazar petición</string>
+    <string name="error_message_copied_to_clipboard">Mensaje de error copiado al portapapeles</string>
+    <string name="pref_screen_security_summary">Tratar el contenido como seguro y evitar que aparezca en capturas de pantalla.</string>
+    <string name="pref_screen_security">Capturas de pantalla no permitidas</string>
+    <string name="omemo_decryption_failed">El descifrado del mensaje OMEMO ha fallado.</string>
+    <string name="install_orbot">Instalar Orbot</string>
+    <string name="start_orbot">Arrancar Orbot</string>
+    <string name="no_market_app_installed">Aplicación no instalada.</string>
+    <string name="group_chat_will_make_your_jabber_id_public">Esta conversación en grupo publicará tu identificador Jabber</string>
+    <string name="ebook">e-book (libro electrónico)</string>
+    <string name="your_name">Tu nombre</string>
+    <string name="enter_your_name">Escribe tu nombre</string>
+    <string name="enter_your_name_instructions">Por favor, escribe tu alias que será visible para tus contactos.</string>
+    <string name="no_name_set_instructions">Alias no configurado.</string>
+    <string name="autojoin_groupchat">Unirse automáticamente a este grupo de chat</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 8b201eeae..932ab3c4e 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -256,8 +256,6 @@
     <string name="pref_use_indicate_received_summary">Jasotako mezuak marka berde batekin markatuko dira. Baliteke kasu guztietan ez funtzionatzea.</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Bidaltze botoia koloreztatu kontaktu baten egoera adierazteko</string>
     <string name="pref_expert_options_other">Besteak</string>
-    <string name="pref_autojoin">Taldeetara automatikoki batu</string>
-    <string name="pref_autojoin_summary">Automatikoki batzeko marka errespetatu taldeen laster-marketan</string>
     <string name="toast_message_otr_fingerprint">OTR hatz-marka arbelara kopiatu da</string>
     <string name="toast_message_omemo_fingerprint">OMEMO hatz-marka arbelara kopiatu da</string>
     <string name="conference_banned">Talde honetara sartzea debekatuta duzu</string>
diff --git a/src/main/res/values-fil/strings.xml b/src/main/res/values-fil/strings.xml
index 691e6fcf2..f9e92fe91 100644
--- a/src/main/res/values-fil/strings.xml
+++ b/src/main/res/values-fil/strings.xml
@@ -182,7 +182,7 @@
     <string name="missing_public_keys">Nawalang public key na mga anunsyo</string>
     <string name="last_seen_now">online</string>
     <string name="last_seen_min">1 minutong nakalipas</string>
-    <string name="last_seen_mins">minutong nakalipas</string>
+    <string name="last_seen_mins">%d minutong nakalipas</string>
     <string name="last_seen_hour">1 oras na ang nakalipas</string>
     <string name="last_seen_hours">%d oras na nakalipas</string>
     <string name="last_seen_day">1 araw na nakalipas</string>
@@ -271,8 +271,6 @@
     <string name="pref_use_send_button_to_indicate_status_summary">May color na panghatid na pindutan para magpahiwatig ng estado</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">May color na pangalan sa kontak ay nagpapahiwatig ng estado sa kontak</string>
     <string name="pref_expert_options_other">Iba pa</string>
-    <string name="pref_autojoin">Automatikong pagsali sa grupo ng chat</string>
-    <string name="pref_autojoin_summary">Paggalang sa awtomatikong bandira sa pagsali sa grupo ng chat bookmarks</string>
     <string name="toast_message_otr_fingerprint">OTR tatak ng daliri ay nakopya sa klipboard!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO tatak ng daliri ay nakopya sa klipboard!</string>
     <string name="conference_banned">Ikaw ay pinagbawalan dito sa grupo ng chat</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 4404dbd3b..7793667cd 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -3,13 +3,13 @@
 <resources>
     <string name="action_settings">Paramètres</string>
     <string name="action_add">Nouvelle conversation</string>
-    <string name="action_accounts">Gérer les comptes</string>
+    <string name="action_accounts">Gestion des comptes</string>
     <string name="action_end_conversation">Terminer cette conversation</string>
     <string name="action_contact_details">Détails du contact</string>
     <string name="action_secure">Conversation sécurisée</string>
     <string name="action_add_account">Ajouter un compte</string>
     <string name="action_edit_contact">Modifier le nom</string>
-    <string name="action_add_phone_book">Ajouter au carnet d\'adresses</string>
+    <string name="action_add_phone_book">Ajouter au carnet d’adresses</string>
     <string name="action_delete_contact">Retirer des contacts</string>
     <string name="action_block_contact">Bloquer le contact</string>
     <string name="action_unblock_contact">Débloquer le contact</string>
@@ -17,12 +17,14 @@
     <string name="action_unblock_domain">Débloquer le domaine</string>
     <string name="title_activity_manage_accounts">Gestion des comptes</string>
     <string name="title_activity_settings">Paramètres</string>
+    <string name="title_activity_conference_details">Détails de la conférence</string>
     <string name="title_activity_contact_details">Détails du contact</string>
     <string name="title_activity_sharewith">Partager avec Conversation</string>
     <string name="title_activity_start_conversation">Démarrer une conversation</string>
     <string name="title_activity_choose_contact">Choix du contact</string>
+    <string name="title_activity_choose_contacts">Choisie des contacts</string>
     <string name="title_activity_block_list">Bloquer la liste</string>
-    <string name="just_now">À l\'instant</string>
+    <string name="just_now">à l’instant</string>
     <string name="minute_ago">Il y a 1 minute</string>
     <string name="minutes_ago">Il y a %d minutes</string>
     <string name="unread_conversations">Conversations non lues</string>
@@ -33,19 +35,22 @@
     <string name="admin">Administrateur</string>
     <string name="owner">Propriétaire</string>
     <string name="moderator">Modérateur</string>
+    <string name="participant">Participant</string>
     <string name="visitor">Visiteur</string>
     <string name="remove_contact_text">Voulez-vous supprimer %s de votre liste ? Les conversations associées à ce contact ne seront pas supprimées.</string>
-    <string name="block_contact_text">Voulez-vous bloquer %s pour l\'empêcher de vous envoyer des messages ?</string>
+    <string name="block_contact_text">Voulez-vous bloquer %s pour l’empêcher de vous envoyer des messages ?</string>
     <string name="unblock_contact_text">Voulez-vous débloquer %s et lui permettre de vous envoyer des messages?</string>
     <string name="block_domain_text">Bloquer tous les contacts de %s ?</string>
     <string name="unblock_domain_text">Débloquer tous les contacts de %s ?</string>
     <string name="contact_blocked">Contact bloqué</string>
+    <string name="blocked">Bloqué</string>
     <string name="remove_bookmark_text">Voulez-vous retirer %s des favoris? La conversation associée à ce favori ne sera pas supprimée.</string>
     <string name="register_account">Créer un nouveau compte sur le serveur</string>
     <string name="change_password_on_server">Changer de mot de passe sur le serveur</string>
     <string name="share_with">Partager avec…</string>
     <string name="start_conversation">Démarrer une conversation</string>
     <string name="invite_contact">Inviter des contacts</string>
+    <string name="contacts">Contacts</string>
     <string name="cancel">Annuler</string>
     <string name="set">Établir</string>
     <string name="add">Ajouter</string>
@@ -54,6 +59,7 @@
     <string name="block">Bloquer</string>
     <string name="unblock">Débloquer</string>
     <string name="save">Enregistrer</string>
+    <string name="ok">OK</string>
     <string name="crash_report_title">Pix-Art Messenger a planté</string>
     <string name="crash_report_message">En envoyant des logs, vous aidez le développement de Pix-Art Messenger.\n<b>Attention:</b> Votre compte XMPP sera utilisé pour envoyer les logs aux développeurs.</string>
     <string name="send_now">Envoyer</string>
@@ -62,17 +68,18 @@
     <string name="problem_connecting_to_accounts">Impossible de se connecter aux comptes.</string>
     <string name="touch_to_fix">Appuyez pour gérer vos comptes.</string>
     <string name="attach_file">Joindre un fichier</string>
-    <string name="not_in_roster">Le contact n\'est pas dans votre carnet d\'adresses. Voulez-vous l\'y ajouter ?</string>
+    <string name="not_in_roster">Le contact n’est pas dans votre carnet d’adresses. Voulez-vous l’y ajouter ?</string>
     <string name="add_contact">Ajouter un contact</string>
-    <string name="send_failed">Échec de l\'envoi.</string>
-    <string name="preparing_image">Préparation de l\'image pour envoi...</string>
-    <string name="preparing_images">Préparation des images à l\'envoi</string>
+    <string name="send_failed">échec de l’envoi</string>
+    <string name="preparing_image">Préparation de l’image pour envoi</string>
+    <string name="preparing_images">Préparation des images à l’envoi</string>
     <string name="sharing_files_please_wait">Partage des fichiers. Veuillez patienter...</string>
-    <string name="action_clear_history">Vider l\'historique</string>
-    <string name="clear_conversation_history">Vider l\'historique de la conversation</string>
+    <string name="action_clear_history">Vider l’historique</string>
+    <string name="clear_conversation_history">Vider l’historique de la conversation</string>
+    <string name="clear_histor_msg">Voulez-vous supprimer tous les messages de cette conversation? \n\n<b>Attention :</b> Les messages à supprimer ne concernent pas ceux stockés sur d’autres serveurs et appareils mais uniquement ceux sur votre périphérique actuel.</string>
     <string name="delete_messages">Supprimer les messages</string>
     <string name="also_end_conversation">Fermer cette conversation ensuite</string>
-    <string name="choose_presence">Choisir l\'appareil</string>
+    <string name="choose_presence">Choisir l’appareil</string>
     <string name="send_unencrypted_message">Envoyer un message en clair</string>
     <string name="send_message_to_x">Envoyer un message à %s</string>
     <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
@@ -83,40 +90,49 @@
     <string name="send_unencrypted">Envoyer en clair</string>
     <string name="decryption_failed">Echec du déchiffrement. Avez-vous la bonne clef privée ?</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Pix-Art Messenger requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Veuillez redémarrer Pix-Art Messenger après l\'installation de l\'app)</small></string>
+    <string name="openkeychain_required_long">Pix-Art Messenger requiert une application tierce nommée <b>OpenKeychain</b> pour chiffrer et déchiffrer les messages.\n\nOpenKeychain est sous licence GPLv3 et est disponible sur F-Droid et Google Play.\n\n<small>(Veuillez redémarrer Pix-Art Messenger après l’installation de l’app)</small></string>
     <string name="restart">Redémarrer</string>
     <string name="install">Installer</string>
     <string name="openkeychain_not_installed">Veuillez installer OpenKeychain</string>
     <string name="offering">Proposition…</string>
     <string name="waiting">Patientez…</string>
     <string name="no_pgp_key">Aucune clef OpenPGP trouvée.</string>
-    <string name="contact_has_no_pgp_key">Pix-Art Messenger ne peut pas chiffrer vos messages car votre contact n\'a pas communiqué sa clef publique.\n\n<small>Demandez-lui de configurer OpenPGP.</small></string>
+    <string name="contact_has_no_pgp_key">Pix-Art Messenger ne peut pas chiffrer vos messages car votre contact n’a pas communiqué sa clef publique.\n\n<small>Demandez-lui de configurer OpenPGP.</small></string>
     <string name="no_pgp_keys">Aucune clef OpenPGP n\'a été trouvée.</string>
     <string name="pref_general">Général</string>
+    <string name="pref_accept_files_wifi">Accepter les fichier en mode Wi-Fi</string>
+    <string name="pref_accept_files_summary_wifi">En mode Wi-Fi, accepter automatiquement les fichiers d’une taille inférieure à …</string>
+    <string name="pref_accept_files_mobile">Accepter les fichier en mode connexion de données mobiles</string>
+    <string name="pref_accept_files_summary_mobile">En mode données mobiles, accepter automatiquement les fichiers d’une taille inférieure à …</string>
+    <string name="pref_accept_files_mobileroaming">Accepter les fichiers en mode roaming mobile</string>
+    <string name="pref_accept_files_summary_mobileroaming">En mode roaming mobile, accepter automatiquement les fichiers d’une taille inférieure à …</string>
     <string name="pref_attachments">Pièces jointes</string>
+    <string name="pref_notification_settings">Notifications</string>
     <string name="pref_vibrate">Vibration</string>
-    <string name="pref_vibrate_summary">Vibrer lors de la réception d\'un message</string>
+    <string name="pref_vibrate_summary">Vibrer lors de la réception d’un nouveau message</string>
     <string name="pref_led">Notification LED</string>
-    <string name="pref_led_summary">Faire clignoter la LED lors de la réception d\'un message</string>
+    <string name="pref_led_summary">Faire clignoter la led lors de la réception d’un nouveau message</string>
     <string name="pref_sound">Sonnerie</string>
-    <string name="pref_sound_summary">Jouer un son lors de la réception d\'un message</string>
+    <string name="pref_sound_summary">Jouer un son lors de la réception d’un nouveau message</string>
+    <string name="pref_send_crash">Envoyer les rapports de plantage</string>
     <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="accept">Accepter</string>
-    <string name="error">Une erreur s\'est produite</string>
+    <string name="error">Une erreur s’est produite</string>
     <string name="your_account">Votre compte</string>
     <string name="send_presence_updates">Envoyer mes màj de disponibilité</string>
     <string name="receive_presence_updates">Recevoir ses màj de disponibilité</string>
     <string name="ask_for_presence_updates">Demander les màj de disponibilité</string>
     <string name="attach_choose_picture">Choisir une image</string>
+    <string name="attach_take_from_camera">Depuis l’appareil photo</string>
     <string name="preemptively_grant">Accepter par avance les demandes de publication.</string>
     <string name="error_not_an_image_file">Le fichier choisi n\'est pas une image</string>
-    <string name="error_compressing_image">Une erreur s\'est produite en convertissant l\'image</string>
+    <string name="error_compressing_image">Une erreur s’est produite lors de la conversion de l’image</string>
     <string name="error_file_not_found">Impossible de trouver le fichier</string>
-    <string name="error_io_exception">Erreur générale d\'E/S. Avez-vous encore de l\'espace libre?</string>
-    <string name="error_security_exception_during_image_copy">L\'application utilisée ne nous donne pas la permission de lire l\'image.\n\n<small>Utilisez une autre application pour choisir une image.</small></string>
+    <string name="error_io_exception">Erreur générale d\'E/S. Avez-vous encore de l’espace libre ?</string>
+    <string name="error_security_exception_during_image_copy">L’application utilisée ne nous donne pas la permission de lire l’image.\n\n<small>Utilisez une autre application pour choisir une image.</small></string>
     <string name="account_status_unknown">Inconnu</string>
     <string name="account_status_disabled">Désactivé temporairement</string>
     <string name="account_status_online">En ligne</string>
@@ -125,10 +141,10 @@
     <string name="account_status_unauthorized">Non autorisé</string>
     <string name="account_status_not_found">Impossible de trouver le serveur</string>
     <string name="account_status_no_internet">Aucune connectivité</string>
-    <string name="account_status_regis_fail">Échec de l\'enregistrement</string>
+    <string name="account_status_regis_fail">Échec de l’enregistrement</string>
     <string name="account_status_regis_conflict">Identifiant déjà utilisé</string>
     <string name="account_status_regis_success">Enregistrement réussi</string>
-    <string name="account_status_regis_not_sup">Le serveur ne permet pas l\'enregistrement</string>
+    <string name="account_status_regis_not_sup">Le serveur ne permet pas la création de nouveaux comptes</string>
     <string name="account_status_tls_error">La négociation TLS a echoué</string>
     <string name="account_status_policy_violation">Violation de politique</string>
     <string name="account_status_incompatible_server">Serveur incompatible</string>
@@ -137,6 +153,7 @@
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
+    <string name="action_account">Modifier le compte</string>
     <string name="mgmt_account_delete">Supprimer</string>
     <string name="mgmt_account_publish_avatar">Publier un avatar</string>
     <string name="mgmt_account_publish_pgp">Publier la clef publique OpenPGP</string>
@@ -145,7 +162,7 @@
     <string name="openpgp_has_been_published">La clef publique OpenPGP a été publiée</string>
     <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="attach_record_voice">Enregistrer une voix</string>
     <string name="account_settings_jabber_id">Identifiant</string>
     <string name="account_settings_password">Mot de passe</string>
     <string name="account_settings_example_jabber_id">nom@exemple.com</string>
@@ -153,8 +170,8 @@
     <string name="confirm_password">Confirmer le mot de passe</string>
     <string name="passwords_do_not_match">Les deux mots de passe ne correspondent pas.</string>
     <string name="invalid_jid">Cet identifiant n\'est pas 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="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>
     <string name="server_info_mam">XEP-0313 : MAM</string>
     <string name="server_info_carbon_messages">XEP-0280 : Copies carbone</string>
@@ -165,8 +182,10 @@
     <string name="server_info_pep">XEP-0163 : PEP (Avatars / OMEMO)</string>
     <string name="server_info_http_upload">XEP-0363 : Envoi de fichiers via HTTP</string>
     <string name="server_info_push">XEP-0357 : Notifications Push</string>
+    <string name="server_info_available">oui</string>
+    <string name="server_info_unavailable">non</string>
     <string name="missing_public_keys">Annonce de clef publique manquante</string>
-    <string name="last_seen_now">en ligne à l\'instant</string>
+    <string name="last_seen_now">en ligne</string>
     <string name="last_seen_min">en ligne il y a 1 minute</string>
     <string name="last_seen_mins">en ligne il y a %d minutes</string>
     <string name="last_seen_hour">en ligne il y a 1 heure</string>
@@ -190,9 +209,11 @@
     <string name="done">Terminé</string>
     <string name="verify">Vérifier</string>
     <string name="decrypt">Déchiffrer</string>
+    <string name="conferences">Conférences</string>
     <string name="search">Rechercher</string>
     <string name="create_contact">Ajouter un contact</string>
     <string name="enter_contact">Ajouter contact</string>
+    <string name="join_conference">Rejoindre une conférence</string>
     <string name="delete_contact">Supprimer le contact</string>
     <string name="view_contact_details">Afficher les détails du contact</string>
     <string name="block_contact">Bloquer le contact</string>
@@ -201,20 +222,24 @@
     <string name="select">Sélectionner</string>
     <string name="contact_already_exists">Le contact existe déjà.</string>
     <string name="join">Rejoindre</string>
+    <string name="conference_address">Adresse de la conférence</string>
+    <string name="conference_address_example">groupchat@room.pix-art.de</string>
     <string name="save_as_bookmark">Enregistrer comme favori</string>
     <string name="delete_bookmark">Supprimer le favori</string>
     <string name="bookmark_already_exists">Le favori existe déjà</string>
+    <string name="action_edit_subject">Modifier le sujet de la conférence</string>
+    <string name="topic">Sujet</string>
     <string name="leave">Partir</string>
     <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
     <string name="add_back">Ré-ajouter</string>
     <string name="publish">Publier</string>
-    <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
+    <string name="touch_to_choose_picture">Appuyez sur l’avatar pour choisir une image depuis la galerie</string>
     <string name="publishing">Mise à jour…</string>
     <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre publication</string>
-    <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
-    <string name="error_saving_avatar">Impossible de stocker l\'avatar sur le disque</string>
+    <string name="error_publish_avatar_converting">Une erreur s’est produite lors de la conversion de votre image</string>
+    <string name="error_saving_avatar">Impossible d’enregistrer l’avatar</string>
     <string name="or_long_press_for_default">(Un appui long réinitialise le paramètre)</string>
-    <string name="error_publish_avatar_no_server_support">Votre serveur n\'autorise pas la publication d\'avatars</string>
+    <string name="error_publish_avatar_no_server_support">Votre serveur ne supporte pas la publication d’avatars</string>
     <string name="private_message">chuchoté</string>
     <string name="private_message_to">pour %s</string>
     <string name="send_private_message_to">Envoyer un message privé à %s</string>
@@ -225,16 +250,17 @@
     <string name="skip">Passer</string>
     <string name="disable_notifications">Désactiver les notifications</string>
     <string name="enable">Activer</string>
+    <string name="conference_requires_password">Cette conférence requiert un mot de passe</string>
     <string name="enter_password">Entrer le mot de passe</string>
     <string name="request_presence_updates">Veuillez demander à votre contact de partager ses mises à jour de disponibilité.\n\n<small>Elles seront utilisées pour déterminer son client.</small></string>
     <string name="request_now">Demander maintenant</string>
-    <string name="delete_fingerprint">Supprimer l\'empreinte</string>
-    <string name="sure_delete_fingerprint">Êtes-vous sûr de vouloir supprimer l\'empreinte ?</string>
+    <string name="delete_fingerprint">Supprimer l’empreinte</string>
+    <string name="sure_delete_fingerprint">Êtes-vous sûr de vouloir supprimer l’empreinte ?</string>
     <string name="ignore">Ignorer</string>
-    <string name="without_mutual_presence_updates"><b>Attention :</b> peut poser problème si l\'un des deux correspondants n\'a pas activé les mises à jour de disponibilité.\n\n<small>Vérifiez dans les détails du contact que vous y avez bien souscrit.</small></string>
+    <string name="without_mutual_presence_updates"><b>Attention :</b> peut poser problème si l’un des deux correspondants n’a pas activé les mises à jour de disponibilité.\n\n<small>Vérifiez dans les détails du contact que vous y avez bien souscrit.</small></string>
     <string name="pref_security_settings">Sécurité</string>
     <string name="pref_allow_message_correction">Autoriser la correction</string>
-    <string name="pref_allow_message_correction_summary">Permet à vos contacts d\'éditer leurs messages rétroactivement</string>
+    <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="title_activity_about">À propos</string>
     <string name="pref_about_conversations_summary">Informations sur la version et les licences</string>
@@ -244,40 +270,51 @@
     <string name="title_pref_enable_quiet_hours">Activer les heures tranquilles</string>
     <string name="pref_quiet_hours_summary">Les notifications seront muettes pendant les heures tranquilles.</string>
     <string name="pref_use_send_button_to_indicate_status">Statut sur le bouton Envoyer</string>
+    <string name="pref_use_colored_names_to_indicate_status">Noms colorés pour indiquer les statuts</string>
     <string name="pref_use_indicate_received">Accusés de réception</string>
-    <string name="pref_use_indicate_received_summary">Les messages reçus seront marqués d\'une coche verte (si supporté).</string>
+    <string name="pref_use_indicate_received_summary">Les messages reçus seront marqués d’une coche verte, si supporté</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Le bouton Envoyer change de couleur pour indiquer le statut du contact.</string>
+    <string name="pref_use_colored_names_to_indicate_status_summary">Colorer les noms des contacts pour indiquer leurs statut</string>
     <string name="pref_expert_options_other">Autres</string>
+    <string name="pref_autojoin">Synchroniser les favoris</string>
+    <string name="pref_autojoin_summary">Joindre et quitter des conférences dépendamment de vos paramètres.</string>
     <string name="toast_message_otr_fingerprint">Empreinte OTR copiée dans le presse-papier !</string>
     <string name="toast_message_omemo_fingerprint">Empreinte OMEMO copiée dans le presse-papier !</string>
+    <string name="conference_banned">Vous êtes banni de cette conférence</string>
+    <string name="conference_members_only">Cette conférence est autorisée aux membres uniquement</string>
+    <string name="conference_kicked">Vous avez été expulsé de cette conférence</string>
+    <string name="conference_shutdown">Cette conférence n’existe plus</string>
     <string name="using_account">avec le compte %s</string>
-    <string name="checking_x">Vérification de %s sur l\'hôte HTTP</string>
+    <string name="checking_x">Vérification de %s sur l’hôte HTTP</string>
     <string name="not_connected_try_again">Vous n\'êtes pas connecté. Essayez plus tard.</string>
     <string name="check_x_filesize">Vérification de la taille de %s</string>
     <string name="check_x_filesize_on_host">Vérification de la taille de %1$s sur %2$s</string>
     <string name="message_options">Options du message</string>
-    <string name="copy_original_url">Copier l\'URL</string>
+    <string name="copy_original_url">Copier l’URL originale</string>
     <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="scan_qr_code">Scanner le QR code</string>
+    <string name="show_qr_code">Afficher le QR Code</string>
     <string name="show_block_list">Afficher la liste des contacts bloqués</string>
     <string name="account_details">Détails du compte</string>
-    <string name="verify_otr">Vérifier l\'OTR</string>
-    <string name="remote_fingerprint">Supprimer l\'empreinte</string>
+    <string name="verify_otr">Vérifier l’OTR</string>
+    <string name="remote_fingerprint">Empreinte distante</string>
     <string name="shared_secret_hint">Indice ou question</string>
     <string name="shared_secret_secret">Secret partagé</string>
     <string name="confirm">Confirmer</string>
     <string name="in_progress">En cours</string>
     <string name="respond">Répondre</string>
+    <string name="failed">Échec</string>
     <string name="secrets_do_not_match">Les secrets ne correspondent pas</string>
     <string name="try_again">Réessayer</string>
     <string name="finish">Terminé</string>
     <string name="verified">Vérifié !</string>
     <string name="smp_requested">Le contact requiert la vérification du SMP</string>
     <string name="no_otr_session_found">Aucune session OTR valide n\'a été trouvée !</string>
-    <string name="pref_export_logs">Exporter l\'historique</string>
-    <string name="pref_export_logs_summary">Sauvegarder l\'historique des conversations sur la carte SD</string>
-    <string name="notification_export_logs_title">Sauvegarde des historiques sur la carte SD...</string>
+    <string name="pref_export_logs">Exporter l’historique</string>
+    <string name="pref_export_logs_summary">Sauvegarder l’historique des conversations sur la carte SD</string>
+    <string name="notification_export_logs_title">Sauvegarde des historiques des conversations sur la carte SD</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>
@@ -285,34 +322,37 @@
     <string name="file">fichier</string>
     <string name="open_x_file">Ouvrir %s</string>
     <string name="sending_file">envoi (%1$d%% complété)</string>
-    <string name="preparing_file">Préparation du fichier pour l\'envoi</string>
+    <string name="preparing_file">Préparation du fichier pour l’envoi</string>
     <string name="x_file_offered_for_download">%s proposé à télécharger</string>
-    <string name="cancel_transmission">Annuler l\'envoi</string>
-    <string name="file_transmission_failed">Échec de l\'envoi du fichier</string>
+    <string name="cancel_transmission">Annuler l’envoi</string>
+    <string name="file_transmission_failed">Échec de l’envoi du fichier</string>
     <string name="file_deleted">Le fichier a été supprimé</string>
     <string name="no_application_found_to_open_file">Aucune application disponible pour ouvrir le fichier</string>
-    <string name="could_not_verify_fingerprint">Impossible de vérifier l\'empreinte</string>
+    <string name="could_not_verify_fingerprint">Impossible de vérifier l’empreinte</string>
     <string name="manually_verify">Vérifier manuellement</string>
-    <string name="are_you_sure_verify_fingerprint">Êtes-vous sûr de vouloir vérifier l\'empreinte OTR de votre contact ?</string>
+    <string name="are_you_sure_verify_fingerprint">Êtes-vous sûr de vouloir vérifier l’empreinte OTR de votre contact ?</string>
     <string name="pref_show_dynamic_tags">Afficher les tags dynamiques</string>
     <string name="pref_show_dynamic_tags_summary">Afficher des tags en lecture seule en dessous des contacts.</string>
+    <string name="no_conference_server_found">Aucun serveur de conférences n’a été trouvé</string>
+    <string name="conference_creation_failed">Échec de la création de la conférence !</string>
     <string name="account_image_description">Avatar du compte</string>
-    <string name="copy_otr_clipboard_description">Copier l\'empreinte OTR dans le presse-papier</string>
-    <string name="copy_omemo_clipboard_description">Copier l\'empreinte OMEMO dans le presse-papier</string>
-    <string name="regenerate_omemo_key">Régénérer l\'empreinte OMEMO</string>
+    <string name="copy_otr_clipboard_description">Copier l’empreinte OTR dans le presse-papier</string>
+    <string name="copy_omemo_clipboard_description">Copier l’empreinte OMEMO dans le presse-papier</string>
+    <string name="regenerate_omemo_key">Régénérer la clé OMEMO</string>
     <string name="clear_other_devices">Supprimer les appareils</string>
-    <string name="clear_other_devices_desc">Êtes-vous sûr de vouloir supprimer les autres appareils de l\'annonce OMEMO ? Ils s\'annonceront de nouveau à leur prochaine connexion, mais ils peuvent ne pas recevoir les messages envoyés entre temps.</string>
+    <string name="clear_other_devices_desc">Êtes-vous sûr de vouloir supprimer les autres appareils de l’annonce OMEMO ? Ils s’annonceront de nouveau à leur prochaine connexion, mais ils peuvent ne pas recevoir les messages envoyés entre temps.</string>
     <string name="distrust_omemo_key">Ne plus faire confiance à cet appareil</string>
     <string name="distrust_omemo_key_text">Êtes-vous sûr de vouloir supprimer la vérification pour cet appareil ?\nCet appareil et les messages qui en proviennent seront marqués comme n\'étant pas dignes de confiance.</string>
     <string name="error_no_keys_to_trust_server_error">Il n\'y a aucune clef utilisable disponible pour ce contact.\nLa récupération de nouvelles clefs sur le serveur a échoué. Peut-être y a-t-il un problème avec votre serveur de contacts ?</string>
-    <string name="fetching_history_from_server">Récupération de l\'historique sur le serveur</string>
-    <string name="no_more_history_on_server">Plus d\'historique sur le serveur</string>
+    <string name="error_trustkeys_title">Une erreur s’est produite</string>
+    <string name="fetching_history_from_server">Récupération de l’historique sur le serveur</string>
+    <string name="no_more_history_on_server">Plus d’historique sur le serveur</string>
     <string name="updating">Mise à jour…</string>
     <string name="password_changed">Mot de passe modifié !</string>
     <string name="could_not_change_password">Impossible de changer le mot de passe</string>
     <string name="otr_session_not_started">Envoyez un message pour commencer la conversation chiffrée</string>
     <string name="ask_question">Poser une question</string>
-    <string name="smp_explain_question">Si vous et votre contact avez en commun un secret que personne d\'autre ne connaît (comme une blague ou ce que vous avez mangé lors de votre dernière rencontre), vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous donnez un indice ou posez votre question à votre contact, qui répondra en faisant attention à la casse.</string>
+    <string name="smp_explain_question">Si vous et votre contact avez en commun un secret que personne d’autre ne connaît (comme une blague ou ce que vous avez mangé lors de votre dernière rencontre), vous pouvez utiliser ce secret pour vérifier vos empreintes respectives.\n\nVous donnez un indice ou posez votre question à votre contact, qui répondra en faisant attention à la casse.</string>
     <string name="smp_explain_answer">Votre contact souhaite confirmer votre identité grâce à un secret partagé. Il vous a envoyé le message/indice suivant concernant ce secret.</string>
     <string name="shared_secret_hint_should_not_be_empty">Votre indice ne doit pas être vide</string>
     <string name="shared_secret_can_not_be_empty">Votre secret partagé ne doit pas être vide</string>
@@ -329,31 +369,43 @@
     <string name="advanced_mode">Mode expert</string>
     <string name="grant_membership">Accorder le statut de membre</string>
     <string name="remove_membership">Révoquer le statut de membre</string>
-    <string name="grant_admin_privileges">Accorder des privilèges d\'administrateur</string>
-    <string name="remove_admin_privileges">Révoquer des privilèges d\'administrateur</string>
-    <string name="could_not_change_affiliation">Impossible de changer l\'affiliation de %s</string>
+    <string name="grant_admin_privileges">Accorder des privilèges d’administrateur</string>
+    <string name="remove_admin_privileges">Révoquer les privilèges d’administrateur</string>
+    <string name="remove_from_room">Retirer de la conférence</string>
+    <string name="could_not_change_affiliation">Impossible de changer l’affiliation de %s</string>
+    <string name="ban_from_conference">Bannir de la conférence</string>
+    <string name="removing_from_public_conference">Vous essayez d’éjecter %s d’une conférence publique. La seule façon de le faire consiste à bannir cet utilisateur définitivement.</string>
     <string name="ban_now">Bannir maintenant</string>
     <string name="could_not_change_role">Impossible de changer le rôle de %s</string>
+    <string name="public_conference">Conférence accessible publiquement</string>
+    <string name="private_conference">Privée, accès réservé aux membres de la conférence uniquement</string>
+    <string name="conference_options">Options de la conférence</string>
     <string name="members_only">Privé, membres uniquement</string>
     <string name="non_anonymous">Non anonyme</string>
     <string name="moderated">Modéré</string>
     <string name="you_are_not_participating">Vous ne participez pas</string>
+    <string name="modified_conference_options">Les options de la conférence ont été modifiées !</string>
+    <string name="could_not_modify_conference_options">Impossible de modifier les options de la conférence</string>
     <string name="never">Jamais</string>
-    <string name="until_further_notice">Jusqu\'à nouvel ordre</string>
+    <string name="until_further_notice">Jusqu’à nouvel ordre</string>
     <string name="pref_input_options">Saisie</string>
     <string name="pref_enter_is_send">Touche Entrée pour envoyer</string>
     <string name="pref_enter_is_send_summary">Utiliser la touche Entrée pour envoyer un message.</string>
     <string name="pref_display_enter_key">Afficher la touche Entrée</string>
     <string name="pref_display_enter_key_summary">Remplacer la touche Émoticônes par une touche Entrée.</string>
+    <string name="audio">audio</string>
     <string name="video">vidéo</string>
+    <string name="image">image</string>
     <string name="pdf_document">document PDF</string>
     <string name="apk">Application Android</string>
-    <string name="touch_to_open_conversations">Cliquez pour ouvrir Pix-Art Messenger</string>
-    <string name="avatar_has_been_published">L\'avatar a été publié !</string>
-    <string name="sending_x_file">%s en cours d\'envoi</string>
+    <string name="vcard">Contact</string>
+    <string name="touch_to_open_conversations">Appuyez pour ouvrir Pix-Art Messenger</string>
+    <string name="avatar_has_been_published">L’avatar a été publié !</string>
+    <string name="sending_x_file">%s en cours d’envoi</string>
     <string name="offering_x_file">En train de proposer un(e) %s</string>
     <string name="hide_offline">Cacher contacts hors-ligne</string>
-    <string name="pref_chat_states">Notifications d\'écriture</string>
+    <string name="is_typing">est entrain d’écrire …</string>
+    <string name="pref_chat_states">Notifications d’écriture</string>
     <string name="pref_chat_states_summary">Informer vos contacts quand vous leur écrivez des messages</string>
     <string name="send_location">Envoyer la position</string>
     <string name="show_location">Afficher la position</string>
@@ -375,80 +427,113 @@
     <string name="pref_quick_action">Action Rapide</string>
     <string name="none">Aucune</string>
     <string name="recently_used">Dernière utilisée</string>
-    <string name="choose_quick_action">Sélectionner l\'action rapide</string>
+    <string name="search_contacts">Rechercher des contacts</string>
+    <string name="search_groups">Rechercher des conférences</string>
+    <string name="choose_quick_action">Sélectionner l’action rapide</string>
     <string name="send_private_message">Envoyer un message privé</string>
+    <string name="user_has_left_conference">%1$s a quitté la discussion !</string>
     <string name="username">Identifiant</string>
     <string name="username_hint">Identifiant</string>
     <string name="invalid_username">Cet identifiant n\'est pas valide</string>
     <string name="download_failed_server_not_found">Échec du téléchargement : impossible de trouver le serveur</string>
     <string name="download_failed_file_not_found">Échec du téléchargement : impossible de trouver le fichier</string>
-    <string name="download_failed_could_not_connect">Échec du téléchargement : impossible de se connecter à l\'hôte</string>
+    <string name="download_failed_could_not_connect">Échec du téléchargement : impossible de se connecter à l’hôte</string>
     <string name="download_failed_could_not_write_file">Échec du téléchargement : Écriture impossible</string>
+    <string name="action_check_update">Vérifier les mises à jour</string>
+    <string name="title_activity_updater">Mise à jour du service</string>
+    <string name="update_available">Version %1$s est disponible.\n\nTaille du fichier : %2$s\n\nMettre à jour maintenant vers %1$s ?</string>
+    <string name="remind_later">ultérieurement</string>
+    <string name="update">mettre à jour</string>
+    <string name="no_update_available">Aucune mise à jour disponible</string>
+    <string name="download_started">Le téléchargement a commencé</string>
     <string name="account_status_tor_unavailable">Réseau Tor inaccessible</string>
     <string name="account_status_bind_failure">La liaison a échoué</string>
     <string name="account_status_host_unknown">Le serveur n\'est pas responsable du domaine</string>
     <string name="server_info_broken">Détraqué</string>
-    <string name="pref_away_when_screen_off">Absent quand l\'écran est éteint</string>
-    <string name="pref_away_when_screen_off_summary">Marquer cette ressource comme absente quand l\'écran est éteint.</string>
+    <string name="pref_presence_settings">Disponibilité</string>
+    <string name="pref_away_when_screen_off">Absent lorsque l’écran est éteint</string>
+    <string name="pref_away_when_screen_off_summary">Marquer votre ressource comme absente lorsque l’écran est éteint</string>
     <string name="pref_dnd_on_silent_mode">Indisponible en mode silencieux</string>
-    <string name="pref_dnd_on_silent_mode_summary">Marquer cette ressource comme Indisponible quand l\'appareil est en mode silencieux</string>
+    <string name="update_info">Pix-Art Messenger est entrain de télécharger et d’installer la nouvelle version automatiquement.\n\nVeuillez patienter …</string>
+    <string name="pref_dnd_on_silent_mode_summary">Marquer votre ressource comme « Ne pas déranger » lorsque l’appareil est en mode silencieux</string>
     <string name="pref_treat_vibrate_as_silent">Indisponible en mode vibreur</string>
-    <string name="pref_treat_vibrate_as_dnd_summary">Marquer cette ressource comme Indisponible quand l\'appareil est en mode vibreur</string>
+    <string name="pref_treat_vibrate_as_dnd_summary">Marquer votre ressource comme « Ne pas déranger » lorsque l’appareil est en mode vibreur</string>
     <string name="hostname_example">xmpp.example.com</string>
     <string name="action_add_account_with_certificate">Compte avec certificat</string>
-    <string name="unable_to_parse_certificate">Impossible d\'analyser le certificat</string>
-    <string name="authenticate_with_certificate">Laisser vide pour s\'identifier avec un certificat</string>
-    <string name="mam_prefs">Paramètres d\'archivage</string>
-    <string name="server_side_mam_prefs">Paramètres d\'archivage du serveur</string>
-    <string name="fetching_mam_prefs">Récupération des paramètres d\'archivage en cours...</string>
-    <string name="unable_to_fetch_mam_prefs">Impossible de récupérer les paramètres d\'archivage</string>
+    <string name="unable_to_parse_certificate">Impossible d’analyser le certificat</string>
+    <string name="authenticate_with_certificate">Laisser vide pour s’authentifier avec un certificat</string>
+    <string name="mam_prefs">Paramètres d’archivage</string>
+    <string name="server_side_mam_prefs">Paramètres d’archivage côté serveur</string>
+    <string name="fetching_mam_prefs">Récupération des paramètres d’archivage en cours …</string>
+    <string name="unable_to_fetch_mam_prefs">Impossible de récupérer les paramètres d’archivage</string>
     <string name="captcha_required">Captcha obligatoire</string>
-    <string name="captcha_hint">Entrez le texte de l\'image ci-dessus</string>
+    <string name="captcha_hint">Entrez le texte à partir 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’identifiant Jabber 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>
     <string name="device_does_not_support_certificates">Votre appareil ne supporte pas la sélection de certificats client !</string>
-    <string name="account_settings_hostname">Nom d\'hôte</string>
+    <string name="changelog">Changements</string>
+    <string name="account_settings_hostname">Nom d’hôte</string>
+    <string name="account_settings_port">Port</string>
     <string name="hostname_or_onion">Adresse du serveur ou .onion</string>
     <string name="not_a_valid_port">Ce numéro de port n\'est pas valide</string>
-    <string name="not_valid_hostname">Ce nom d\'hôte n\'est pas valide</string>
+    <string name="not_valid_hostname">Ce nom d’hôte n’est pas valide</string>
     <string name="connected_accounts">%1$d compte(s) sur %2$d connecté(s)</string>
+    <plurals name="x_messages">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
     <string name="load_more_messages">Charger plus de messages</string>
     <string name="shared_file_with_x">Fichier partagé avec %s</string>
     <string name="shared_image_with_x">Image partagée avec %s</string>
-    <string name="no_storage_permission">Pix-Art Messenger a besoin d\'accéder au stockage externe</string>
+    <string name="no_storage_permission">Pix-Art Messenger a besoin d’accéder au stockage externe</string>
     <string name="shared_images_with_x">Image partagée avec %s</string>
     <string name="shared_text_with_x">Texte partagé avec %s</string>
     <string name="sync_with_contacts">Synchroniser avec contacts</string>
-    <string name="sync_with_contacts_long">Pix-Art Messenger souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nPix-Art Messenger va uniquement lire vos contacts et les associer localement, sans les envoyer sur le serveur XMPP.\n\nVotre appareil va maintenant vous demander la permission d\'accéder à vos contacts.</string>
+    <string name="sync_with_contacts_long">Pix-Art Messenger souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nPix-Art Messenger va uniquement lire vos contacts et les associer localement, sans les envoyer sur le serveur XMPP.\n\nVotre appareil va maintenant vous demander la permission d’accéder à vos contacts.</string>
     <string name="notify_on_all_messages">Notifier pour tous les messages</string>
     <string name="notify_only_when_highlighted">Notifier seulement en cas de mention</string>
     <string name="notify_never">Notifications désactivées</string>
     <string name="notify_paused">Notifications en pause</string>
     <string name="pref_picture_compression">Compresser images</string>
     <string name="pref_picture_compression_summary">Redimensionner et compresser les images</string>
+    <string name="pref_video_compression">Compression des vidéos</string>
+    <string name="pref_video_compression_summary">Redimensionner et compresser les vidéos</string>
+    <string name="video_low">basse (144p)</string>
+    <string name="video_mid">moyenne (360p)</string>
+    <string name="video_high">haute (720p)</string>
     <string name="always">Toujours</string>
     <string name="battery_optimizations_enabled">Optimisations de batterie activées</string>
     <string name="battery_optimizations_enabled_explained">Votre appareil applique sur Pix-Art Messenger des optimisations de batterie très strictes qui pourraient provoquer des retards dans les notifications, voire des pertes de messages.\nNous vous recommandons de les désactiver.</string>
     <string name="battery_optimizations_enabled_dialog">Votre appareil applique sur Pix-Art Messenger des optimisations de batterie très strictes qui pourraient provoquer des retards dans les notifications, voire des pertes de messages.\nVous allez maintenant avoir la possibilité de les désactiver.</string>
+    <string name="install_from_unknown_sources_disabled">L’nstallation à partir de sources inconnues a été désactivée</string>
     <string name="disable">Désactiver</string>
     <string name="selection_too_large">La zone sélectionnée est trop grande</string>
+    <string name="cancel_update">Annuler la mise à jour ?</string>
+    <string name="yes">Oui</string>
+    <string name="no">Non</string>
     <string name="no_accounts">(Aucun compte activé)</string>
     <string name="this_field_is_required">Ce champ est requis</string>
+    <string name="no_participants">Aucun participant</string>
     <string name="correct_message">Corriger le message</string>
     <string name="send_corrected_message">Envoyer le message corrigé</string>
-    <string name="contacts_have_no_pgp_keys">Pix-Art Messenger ne peut pas chiffrer votre message car vos contacts ne communiquent pas leur clef publique.\n\n<small>Demandez-leur de configurer OpenPGP.</small></string>
+    <string name="no_keys_just_confirm">Vous faites déjà confiance à ce contact. En sélectionnant « Terminé » vous confirmerez seulement que %s est membre de cette conférence.</string>
+    <string name="contacts_have_no_pgp_keys">Pix-Art Messenger ne peut pas chiffrer vos messages car vos contacts ne communiquent pas leurs clefs publiques.\n\n</string>
     <string name="this_account_is_disabled">Vous avez désactivé ce compte</string>
     <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">XMPP est un protocole indépendant. Vous pouvez utiliser ce client avec le serveur XMPP de votre choix.\nCependant, pour votre confort, vous pouvez créer un compte sur conversations.im¹, un fournisseur spécialement approprié pour Pix-Art Messenger.</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="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="mgmt_account_reconnect">Reconnecter</string>
+    <string name="welcome_text">… est un client XMPP/Jabber libre et sécure.</string>
+    <string name="magic_create_text">Nous vous guiderons pendant toute la procédure de création d’un compte utilisateur avec un mot de passe aléatoire que vous pourrez utiliser ou modifier, au choix durant, la prochaine étape. \nEnsuite vous pourrez communiquer avec les utilisateur·trice·s des autres fournisseurs en leur transmettant votre identifiant complet de Jabber.</string>
     <string name="your_full_jid_will_be">Votre Jabber ID complet sera : %s</string>
-    <string name="create_account">Créer un compte</string>
-    <string name="pick_your_username">Choisissez votre nom d\'utilisateur</string>
+    <string name="create_account">Création d’un nouveau compte</string>
+    <string name="welcome_advanced_mode">Mode expert</string>
+    <string name="pick_your_username">Choisissez votre nom d’utilisateur</string>
+    <string name="pref_manually_change_presence">Gérer la disponibilité manuellement</string>
+    <string name="pref_manually_change_presence_summary">Paramètre votre disponibilité lorsque vous éditez votre message de statut.</string>
     <string name="status_message">Message de statut</string>
     <string name="presence_chat">Disponible</string>
     <string name="presence_online">En ligne</string>
@@ -457,82 +542,297 @@
     <string name="presence_dnd">Occupé</string>
     <string name="secure_password_generated">Un mot de passe fort a été généré</string>
     <string name="device_does_not_support_battery_op">Les optimisations de batterie ne peuvent pas être désactivées sur votre appareil</string>
+    <string name="share">Partager</string>
+    <string name="share_location">Partager ma position</string>
+    <string name="location_sharing_disabled">Le partage de position a été désactivé dans les paramètres</string>
+    <string name="locating">En cours de localisation …</string>
+    <string name="action_end_conversation_muc">Quitter la conférence</string>
+    <string name="leave_conference_warning">Désirez-vous quitter ce groupe de discussion ? Vous ne serez plus notifié de l’arrivée des nouveaux messages jusqu’à ce que vous rejoignez la conférence.</string>
     <string name="show_password">Afficher le mot de passe</string>
-    <string name="registration_please_wait">L\'enregistrement a échoué : Réessayer plus tard</string>
-    <string name="registration_password_too_weak">Échec de l\'enregistrement : le mot de passe n\'est pas assez fort</string>
+    <string name="registration_please_wait">L’enregistrement a échoué : Réessayer plus tard</string>
+    <string name="registration_password_too_weak">Échec de l’enregistrement : le mot de passe n’est pas assez fort</string>
+    <string name="create_conference">Créer une conférence</string>
     <string name="conference_subject">Objet</string>
     <string name="choose_participants">Choisir les participants</string>
+    <string name="creating_conference">Création de la conférence …</string>
+    <string name="import_text">Votre appareil contient une sauvegarde que vous pouvez importer.\nVotre Messager sera redémarré une fois la sauvegarde restaurée. Désivrez-vous l’importer ? </string>
+    <string name="import_database">Importer une sauvegarde</string>
     <string name="invite_again">Inviter à nouveau</string>
+    <string name="inviteUser_Subject">vous a invité via</string>
+    <string name="InviteText">Bonjour,\n\nl’utilisateur·rice %s vous a invité sur Pix-Art Messenger. Si vous utilisez Android, essayez-le en cliquant sur le lien suivant pour continuer …</string>
     <string name="pref_broadcast_last_activity">Diffuser la dernière action utilisateur</string>
     <string name="pref_broadcast_last_activity_summary">Informer tous vos contacts lorsque vous utitlisez Pix-Art Messenger</string>
+    <string name="invite_user">Inviter à Pix-Art Messenger</string>
     <string name="unable_to_connect_to_keychain">Connection à OpenKeychain impossible</string>
+    <string name="send_image">Envoyer l’image ?</string>
     <string name="this_device_is_no_longer_in_use">Cet appareil n\'est plus utilisé</string>
+    <string name="import_canceled">Importation annulée</string>
+    <string name="Import_failed">Échec d’import de la base de données, impossible d’effectuer l’importation</string>
+    <string name="Password_wrong">Mot de passe erroné, essayez à nouveau</string>
+    <string name="enter_account_password">Veuillez saisir le mot de passe de votre compte pour pouvoir importer votre sauvegarde.</string>
+    <string name="please_wait">Veuillez patienter …</string>
+    <string name="databaseimport_started">La sauvegarde sera importée. Ceci peut prendre un peu de temps.</string>
+    <string name="pref_export_plain_text_logs">Exporter les journaux des conversations dans un format lisible</string>
     <string name="payment_required">Paiement requis</string>
     <string name="missing_internet_permission">Permission Internet manquante</string>
     <string name="me">Moi</string>
     <string name="contact_asks_for_presence_subscription">Le contact demande la notification de présence</string>
     <string name="allow">Autoriser</string>
-    <string name="no_permission_to_access_x">Permission d\'accéder à %s refusée</string>
+    <string name="no_permission_to_access_x">Permission d’accéder à %s refusée</string>
     <string name="remote_server_not_found">Serveur distant non trouvé</string>
+    <string name="error_file_corrupt">Le fichier semble être corrompu.</string>
     <string name="unable_to_update_account">Mise à jour du compte impossible</string>
     <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités.</string>
+    <string name="create_issue">Signaler un problème</string>
     <string name="pref_delete_omemo_identities">Effacer les identités OMEMO</string>
-    <string name="pref_delete_omemo_identities_summary">Régénérer vos clefs OMEMO. Tous vos contacts devront vous vérifier à nouveau. À n\'utiliser qu\'en dernier recours.</string>
+    <string name="pref_delete_omemo_identities_summary">Régénérer vos clefs OMEMO. Tous vos contacts devront vous vérifier à nouveau. À n’utiliser qu’en dernier recours.</string>
     <string name="delete_selected_keys">Supprimer les clefs sélectionnées</string>
     <string name="error_publish_avatar_offline">Vous devez être connecté pour publier votre avatar.</string>
+    <string name="copy_to_clipboard">Copier vers le presse-papier</string>
+    <string name="message_copied_to_clipboard">Message copié dans le presse-papier</string>
+    <string name="message">Message</string>
     <string name="quote">Citation</string>
-    <string name="show_error_message">Afficher le message d\'erreur</string>
-    <string name="error_message">Message d\'erreur</string>
+    <string name="show_error_message">Afficher le message d’erreur</string>
+    <string name="error_message">Message d’erreur</string>
     <string name="data_saver_enabled">Économiseur de données activé</string>
-    <string name="data_saver_enabled_explained">Votre système d\'exploitation empêche Pix-Art Messenger d’accéder à Internet lorsque l\'application est en arrière plan. Pour recevoir les notifications de nouveaux messages, vous devez autoriser Pix-Art Messenger à accéder au réseau sans restriction quand l\'Économiseur de données est activé.\n Pix-Art Messenger tentera de consommer le moins de données possible.</string>
-    <string name="device_does_not_support_data_saver">Votre appareil ne prend pas en charge la désactivation de l\'Économiseur de données pour Pix-Art Messenger.</string>
+    <string name="data_saver_enabled_explained">Votre système d’exploitation empêche Pix-Art Messenger d’accéder à Internet lorsque l’application est en arrière plan. Pour recevoir les notifications des nouveaux messages, vous devez autoriser Pix-Art Messenger à accéder au réseau sans restriction quand l’Économiseur de données est activé.\n Pix-Art Messenger tentera de consommer le moins de données possible.</string>
+    <string name="device_does_not_support_data_saver">Votre appareil ne prend pas en charge la désactivation de l’Économiseur de données pour Pix-Art Messenger.</string>
+    <string name="navigate">Naviguez jusqu’à l’emplacement</string>
+    <string name="add_to_contact_list">Ajouter aux contacts</string>
+    <string name="contact">Contact</string>
+    <string name="unable_to_start_recording">Impossible de démarrer l’enregistrement</string>
     <string name="error_unable_to_create_temporary_file">Impossible de créer un fichier temporaire</string>
     <string name="this_device_has_been_verified">Cet appareil a été vérifié</string>
-    <string name="copy_fingerprint">Copier l\'empreinte</string>
+    <string name="copy_fingerprint">Copier l’empreinte</string>
     <string name="all_omemo_keys_have_been_verified">Toutes les clefs OMEMO ont étés vérifiées</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_conversation">Le code QR ne contient pas d’empreintes pour cette conversation.</string>
     <string name="verified_fingerprints">Empreintes vérifiées</string>
+    <string name="use_camera_icon_to_scan_barcode">Utilisez l’appareil photo pour scanner le code QR des contacts</string>
     <string name="please_wait_for_keys_to_be_fetched">Veuillez attendre que les clefs soient récupérées</string>
+    <string name="share_as_barcode">Partager comme code QR</string>
     <string name="share_as_uri">Partager par URI XMPP</string>
     <string name="share_as_http">Partager par lien HTTP</string>
     <string name="blindly_trusted_omemo_keys">Faire aveuglément confiance aux clefs OMEMO</string>
     <string name="pref_blind_trust_before_verification">Faire aveuglément confiance avant vérification</string>
-    <string name="pref_blind_trust_before_verification_summary">Faire automatiquement confiance aux nouveaux appareils des contacts qui n\'ont pas été vérifiés auparavant, et requérir une confirmation manuelle à chaque fois qu\'un contact vérifié auparavant utilise un nouvel appareil.</string>
+    <string name="pref_blind_trust_before_verification_summary">Faire automatiquement confiance aux nouveaux appareils des contacts qui n’ont pas été vérifiés auparavant, et requérir une confirmation manuelle à chaque fois qu’un contact vérifié auparavant utilise un nouvel appareil.</string>
     <string name="not_trusted">Non approuvée</string>
-    <string name="i_followed_this_link_from_a_trusted_source">J\'ai obtenu ce lien d\'une source de confiance</string>
-    <string name="verifying_omemo_keys_trusted_source">Vous êtes sur le point de vérifier les clefs OMEMO de %1$s en cliquant sur un lien. Cette procédure n\'est sécurisée que si le lien en question n\'a pu être publié que par %2$s et que vous l\'avez obtenu d\'une source digne de confiance.</string>
+    <string name="invalid_barcode">Code QR non valide</string>
+    <string name="verify_with_qr_code">vérifier avec un code QR</string>
+    <string name="i_followed_this_link_from_a_trusted_source">J’ai suivi ce lien à partir d’une source de confiance</string>
+    <string name="verifying_omemo_keys_trusted_source">Vous êtes sur le point de vérifier les clefs OMEMO de %1$s en cliquant sur un lien. Cette procédure n’est sécurisée que si le lien en question n’a pu être publié que par %2$s et que vous l’avez obtenu d’une source digne de confiance.</string>
     <string name="verify_omemo_keys">Vérifier les clefs OMEMO</string>
+    <string name="show_inactive_devices">Afficher les inactifs</string>
+    <string name="hide_inactive_devices">Masquer les inactifs</string>
+    <string name="reply">Répondre</string>
     <string name="encrypting_message">Chiffrement du message en cours</string>
     <string name="transcoding_video">Compression de la vidéo en cours</string>
-    <string name="not_fetching_history_retention_period">Aucun message récupéré, en raison de la configuration de rétention de l\'appareil.</string>
-    <string name="today">Aujourd\'hui</string>
-    <string name="block_jabber_id">Bloquer l\'ID Jabber</string>
+    <string name="not_fetching_history_retention_period">Aucun message récupéré, en raison de la configuration de la période de rétention.</string>
+    <plurals name="seconds">
+        <item quantity="one">%d seconde</item>
+        <item quantity="other">%d secondes</item>
+    </plurals>
+    <plurals name="minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d heure</item>
+        <item quantity="other">%d heures</item>
+    </plurals>
+    <plurals name="days">
+        <item quantity="one">%d jour</item>
+        <item quantity="other">%d jours</item>
+    </plurals>
+    <plurals name="weeks">
+        <item quantity="one">%d semaine</item>
+        <item quantity="other">%d semaines</item>
+    </plurals>
+    <plurals name="months">
+        <item quantity="one">%d mois</item>
+        <item quantity="other">%d mois</item>
+    </plurals>
+    <string name="today">Aujourd’hui</string>
+    <string name="pref_use_max_brightness_summary">Bascule en mode luminosité maximale lors du visionnement des vidéos ou des images en mode plein écran.</string>
+    <string name="pref_use_max_brightness">Luminosité maximale</string>
+    <string name="block_jabber_id">Bloquer l’ID Jabber</string>
     <string name="corresponding_conversations_closed">Conversations correspondantes fermées.</string>
     <string name="contact_blocked_past_tense">Contact bloqué.</string>
-    <string name="pref_notifications_from_strangers">Notifications d\'inconnus</string>
+    <string name="pref_notifications_from_strangers">Notifications d’inconnus</string>
     <string name="pref_notifications_from_strangers_summary">Notifier pour les messages envoyés par des personnes inconnues</string>
-    <string name="received_message_from_stranger">Message d\'un inconnu reçu</string>
-    <string name="contacts_are_typing">%s sont en train d\'écrire...</string>
-    <string name="contact_is_typing">%s est en train d\'écrire</string>
-    <string name="block_stranger">Bloquer l\'inconnu</string>
+    <string name="received_message_from_stranger">Message d’un inconnu reçu</string>
+    <string name="contacts_are_typing">%s sont en train d’écrire …</string>
+    <string name="contact_is_typing">%s est en train d’écrire …</string>
+    <string name="one_participant">un participant</string>
+    <string name="more_participants">%d participants</string>
+    <string name="presence_offline">Hors ligne</string>
+    <string name="block_stranger">Bloquer l’inconnu</string>
     <string name="block_entire_domain">Bloquer le domaine entier</string>
+    <string name="pref_use_auto_rotate_summary">Rotation des images et vidéos en mode plein écran pour s’adapter à la taille de celui-ci</string>
+    <string name="pref_use_auto_rotate">Rotation des médias en mode plein écran</string>
     <string name="pref_use_tor">Connexion via Tor</string>
     <string name="pref_use_tor_summary">Rediriger toutes les connexions via le réseau Tor. Nécessite Orbot.</string>
     <string name="pref_connection_options">Connexion</string>
+    <string name="image_low">basse (720p)</string>
+    <string name="image_mid">moyenne (1920p)</string>
+    <string name="image_high">haute (3840p)</string>
+    <string name="last_seen_just_away">récemment</string>
     <string name="send_message">Envoyer le message</string>
-    <string name="pref_show_connection_options_summary">Montrer le nom d\'hôte et le port lors du paramétrage d\'un compte</string>
+    <string name="send_failed_resend">échec de livraison, renvoi en cours …</string>
+    <string name="pref_show_connection_options_summary">Affiche le nom d’hôte et le port lors du paramétrage d’un compte</string>
     <string name="pref_show_connection_options">Paramètres de connexion avancés</string>
     <string name="retry_decryption">Nouvelle tentative de déchiffrement</string>
     <string name="session_failure">Échec de la session</string>
     <string name="sasl_downgrade">Mécanisme SASL dégradé</string>
+    <string name="action_take_photo">prendre une photo</string>
+    <string name="action_take_video">enregistrer une vidéo</string>
     <string name="account_status_regis_web">Le serveur nécessite une identification sur son site web </string>
     <string name="application_found_to_open_website">Aucune application trouvée pour afficher le site web</string>
     <string name="open_website">Ouvrir le site web</string>
-    <string name="pref_headsup_notifications">Notifications \"pop-up\"</string>
-    <string name="pref_headsup_notifications_summary">Afficher les notifications \"pop-up\"</string>
+    <string name="pref_headsup_notifications">Notifications « pop-up »</string>
+    <string name="pref_headsup_notifications_summary">Afficher les notifications « pop-up »</string>
     <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="error_no_keys_to_trust_presence">Il n\'y a aucune clé utilisable disponible pour ce contact.\nAssurez-vous d\'avoir un abonnement de présence mutuelle.</string>
+    <string name="certificate_does_not_contain_jid">Le certificat ne contient pas d’ID Jabber</string>
+    <string name="error_no_keys_to_trust_presence">Il n’y a aucune clé utilisable disponible pour ce contact.\nAssurez-vous d’avoir un abonnement de présence mutuelle.</string>
+    <string name="mark_as_read">Marquer comme lu</string>
     <string name="server_info_partial">partiel</string>
+    <string name="pref_show_foreground_service">Utiliser le service en premier plan</string>
+    <string name="update_service">Service de mise à jour de Pix-Art Messenger</string>
+    <string name="install_update">Installer la mise à jour ?</string>
+    <string name="highlight_in_muc">mettre en évidence l’utilisateur·rice</string>
+    <string name="no_application_found_to_open_link">Aucune application disponible pour ouvrir le lien</string>
+    <string name="contacts_have_read_up_to_this_point">%s ont tout lu jusqu’ici</string>
+    <string name="contact_has_read_up_to_this_point">%s a tout lu jusqu’ici</string>
+    <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s et %2$d autres ont tout lu jusqu’ici</string>
+    <string name="conversation_unencrypted_hint">Cette discussion est non chiffrée et pour des raisons de sécurité, il est préférable d’activer le chiffrement des messages en utilisant l’icône du cadenas en haut. Le chiffrement recommandé est OMEMO.</string>
+    <string name="pref_warn_unencrypted_chat">Avertir lorsque la discussion n’est pas chiffrée</string>
+    <string name="pref_warn_unencrypted_chat_summary">Si le chiffrement des messages est disponible, il est conseillé de l’utiliser. Si vous n’utilisez pas de chiffrement de messages, afficher un avertissement dans la fenêtre de discussion.</string>
+    <string name="pref_use_bundled_emoji">Utiliser les émojis intégrés</string>
+    <string name="pref_use_bundled_emoji_summary">Utilise la libraire d’émojis intégrée au lieu de ceux de votre appareil. Les modifications seront prises en considération à la réouverture de l’application.</string>
+    <string name="invalid_muc_nick">Psœudonyme invalide</string>
+    <string name="title_activity_share_via_account">Partager via le compte</string>
+    <string name="private_messages_are_disabled">Les messages privés ont étés désactivés</string>
+    <string name="destroy_muc">Supprimer complètement la conférence</string>
+    <string name="conference_unknown_error">Vous ne faîtes plus partie de cette conférence</string>
+    <string name="destroy_muc_text">Désirez-vous supprimer complètement la conférence %s ? Ceci supprimera la conférence pour de bon.</string>
+    <string name="destroy_muc_succeed">La conférence a été supprimée avec succès</string>
+    <string name="destroy_muc_failed">Impossible de supprimer la conférence</string>
+    <string name="snooze">Silencer</string>
+    <string name="huawei_protected_apps">Applications protégées</string>
+    <string name="pref_enable_multi_accounts_title">Activer les comptes multiples</string>
+    <string name="pref_enable_multi_accounts_summary">Si vous désirez utiliser plusieurs comptes, vous devez spécifier un mot de passe pour les sauvegardes quotidiennes.</string>
+    <string name="mtm_accept_cert">Accepter ce certificat inconnu ?</string>
+    <string name="mtm_trust_anchor">Le certificat serveur n’est signé par une Autorité de Certification connue.</string>
+    <string name="mtm_accept_servername">Accepter même non-concordant avec le nom du serveur ?</string>
+    <string name="mtm_connect_anyway">Voulez-vous vous connecter malgré tout ?</string>
+    <string name="mtm_cert_details">Détails du certificat :</string>
+    <string name="once">Une fois</string>
+    <string name="qr_code_scanner_needs_access_to_camera">Le scanner de code QR a besoin d’accéder à votre appareil photo</string>
+    <string name="pref_scroll_to_bottom_summary">Défiler en bas une fois le message est envoyé</string>
+    <string name="pref_scroll_to_bottom">Défiler vers le bas</string>
+    <string name="no_camera_permission">Pix-Art Messenger a besoin d’accéder à l’appareil photo</string>
+    <string name="edit_status_message_title">Modifier le message du Statut</string>
+    <string name="edit_status_message">Modifier Message de Statut</string>
+    <string name="pref_automatically_delete_messages_description">Supprimer automatiquement de cet appareil les anciens messages ayant dépassé la période spécifiée.</string>
+    <string name="pref_automatically_delete_messages">Suppression automatique des messages</string>
+    <string name="disable_encryption">Désactiver le chiffrement</string>
+    <string name="error_trustkey_general">Pix-Art Messenger ne peut envoyer de messages chiffrés à %1$s. Il se peut que votre contact utilise soit un serveur ou un client anciens ne prenant pas en charge le chiffrement via OMEMO.</string>
+    <string name="error_trustkey_device_list">Impossible d’obtenir la liste des appareils</string>
+    <string name="error_trustkey_hint_mutual">Astuce : Dans certains cas ceci peut être résolu en se rajoutant mutuellement dans les listes de contacts.</string>
+    <string name="disable_now">Désactiver maintenant</string>
+    <string name="draft">Brouillon :</string>
+    <string name="pref_omemo_setting">Chiffrement OMEMO</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO sera toujours utilisé dans les discussions privées à deux.</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO sera utilisé par défaut dans les nouvelles discussions.</string>
+    <string name="default_on">Activé par défaut</string>
+    <string name="default_off">Désactivé par défaut</string>
+    <string name="pref_theme_light">Thème clair</string>
+    <string name="pref_theme_dark">Thème sombre</string>
+    <string name="pref_theme_options_summary">Sélectionner la palette de couleurs</string>
+    <string name="pref_theme_options">Thème</string>
+    <string name="chooce_account">Choisir un compte</string>
+    <string name="pref_font_size">Taille de la police de caractères</string>
+    <string name="pref_font_size_summary">La taille relative de la police de caractères utilisée dans l’app.</string>
+    <string name="small">Petite</string>
+    <string name="medium">Normale</string>
+    <string name="large">Grande</string>
+    <string name="create_shortcut">Créer un raccourci</string>
+    <string name="not_encrypted_for_this_device">Le message n’a pas été chiffré pour cet appareil.</string>
+    <string name="no_microphone_permission">Pix-Art Messenger a besoin d’accéder au microphone</string>
+    <string name="search_messages">Rechercher des messages</string>
+    <string name="gif">GIF</string>
+    <string name="view_conversation">Afficher la conversation</string>
+    <string name="web_address">adresse Web</string>
+    <string name="jabber_id_copied_to_clipboard">JID copié dans le presse-papiers</string>
+    <string name="copy_jabber_id">Copier le JID</string>
+    <string name="copy_link">Copier l’adresse Web</string>
+    <string name="server_hint">Sélectionnez un service</string>
+    <string name="choose_your_server">Choisissez votre fournisseur jabber</string>
+    <string name="show_privacy">Politique de confidentialité</string>
+    <string name="show_termsofuse">Conditions d’utilisation</string>
+    <string name="p1_s3_filetransfer">Paratge de fichiers via HTTP Pour S3</string>
+    <string name="pref_start_search">Recherche directe</string>
+    <string name="pref_start_search_summary">Ouvre le clavier et place le curseur sur le champs de recherche dans la fenêtre « Démarrer une conversation »</string>
+    <string name="paste_as_quote">Coller comme une citation</string>
+    <string name="group_chat_avatar">Avatar de la conférence</string>
+    <string name="host_does_not_support_group_chat_avatars">L’hôte ne prend pas en charge les avatars de conférences</string>
+    <string name="only_the_owner_can_change_group_chat_avatar">Seul le propriétaire peut changer l’avatar de la conférence</string>
+    <string name="contact_name">Nom du contact</string>
+    <string name="nickname">Psœudonyme pour cette conférence</string>
+    <string name="group_chat_name">Nom</string>
+    <string name="providing_a_name_is_optional">Le nom est optionnel</string>
+    <string name="create_dialog_group_chat_name">Nom de la conférence</string>
+    <string name="everyone_has_read_up_to_this_point">Tout le monde a tout lu jusqu’ici</string>
+    <string name="delete_message">Supprimer le message</string>
+    <string name="conference_destroyed">La conférence a été supprimée</string>
+    <string name="no_application_found_to_view_contact">Aucune application permettant d’afficher ce contact n’a été trouvée</string>
+    <string name="welcome_server_info">Nous vous recommandons d’utiliser blabber.im en tant que votre fournisseur.</string>
+    <string name="no_location_permission">Pix-Art Messenger a besoin d’accéder aux services de géolocalisation</string>
+    <string name="pref_show_record_voice_btn_summary">Affiche le bouton d’enregisrement de la voix dans les conversations en tant que bouton d’action rapide</string>
+    <string name="pref_show_record_voice_btn">Afficher le bouton d’enregisrement de la voix</string>
+    <string name="pref_quick_share_attachment_choice">Choix des fichiers attachés</string>
+    <string name="phone_book">Carnet d’adresses</string>
+    <string name="unable_to_save_recording">Impossible de sauvegarder l’enregistrement</string>
+    <string name="foreground_service_channel_name">Service au premier plan</string>
+    <string name="error_channel_name">Problèmes de connexion</string>
+    <string name="notification_group_messages">Messages</string>
+    <string name="messages_channel_name">Messages</string>
+    <string name="pref_more_notification_settings">Paramètres des notifications</string>
+    <string name="pref_more_notification_settings_summary">Importance, Sonnerie, Vibreur</string>
+    <string name="video_compression_channel_name">Compression vidéo</string>
+    <string name="backup_channel_name">Sauvegarde de base de données</string>
+    <string name="app_update_channel_name">Mise à jour de l’application</string>
+    <string name="action_group_details">Détails du groupe</string>
+    <string name="view_media">Afficher le média</string>
+    <string name="media_browser">Gestionnaire de médias</string>
+    <string name="account_status_stream_opening_error">Erreur lors de l’ouverture du flux</string>
+    <string name="action_open">Ouvrir</string>
+    <string name="action_delete">Supprimer</string>
+    <string name="security_violation_not_attaching_file">Fichier écarté pour des raisons de violations de la sécurité.</string>
+    <string name="delete_file_dialog">Supprimer le fichier</string>
+    <string name="delete_file_dialog_msg">Voulez-vous vraiment supprimer ce fichier ? \n\n<b>Attention :</b> Ceci ne procédera pas à la suppression des copies stockées sur d’autres serveurs ou appareils.</string>
+    <string name="cancelled">annulé</string>
+    <string name="remote_server_timeout">Délai d’attente dépassé lors de la connexion au serveur distant</string>
+    <string name="already_drafting_message">Vous êtes déjà entrain de rédiger un brouillon.</string>
+    <string name="bad_key_for_encryption">Mauvaise clé pour le chiffrement.</string>
+    <string name="delete_message_dialog">Supprimer le message</string>
+    <string name="delete_message_dialog_msg">Voulez-vous vraiment supprimer ce message ? \n\n<b>Attention :</b> Ceci ne procédera pas à la suppression des copies stockées sur d’autres serveurs ou appareils.</string>
+    <string name="feature_not_implemented">Fonctionnalité non implémentée</string>
+    <string name="device_does_not_support_unknown_source_op">Votre appareil n’autorise pas l’installation d’applications venant de sources inconnues.</string>
+    <string name="reject_request">Refuser la demande</string>
+    <string name="error_message_copied_to_clipboard">Message d’erreur copié vers le presse-papier</string>
+    <string name="pref_screen_security_summary">Traiter le contenu comme sécure et interdire son apparition dans les captures d’écran.</string>
+    <string name="pref_screen_security">Interdire les captures d’écran</string>
+    <string name="omemo_decryption_failed">Échec de déchiffrement du message OMEMO.</string>
+    <string name="install_orbot">Installer Orbot</string>
+    <string name="start_orbot">Démarrer Orbot</string>
+    <string name="no_market_app_installed">Aucun magasin d’applications n’est installé.</string>
+    <string name="group_chat_will_make_your_jabber_id_public">Cette conférence rendra visible publiquement votre ID Jabber</string>
+    <string name="ebook">e-book</string>
+    <string name="your_name">Votre nom</string>
+    <string name="enter_your_name">Saisissez votre nom</string>
+    <string name="enter_your_name_instructions">Veuillez saisir le psœudonyme que vous désirez rendre visible à vos contacts.</string>
+    <string name="no_name_set_instructions">Aucun psœudonyme n’a été spécifié.</string>
+    <string name="autojoin_groupchat">Rejoindre automatiquement cette conférence</string>
 </resources>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 73703c783..1101b6a81 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -256,8 +256,6 @@
     <string name="pref_use_indicate_received_summary">As mensaxes recibidas marcaránse cun sinal verde si este está admitido</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Boton de enviar de cor para indicar o estado do contacto</string>
     <string name="pref_expert_options_other">Outro</string>
-    <string name="pref_autojoin">Unirse automaticamente ás conversas en grupo</string>
-    <string name="pref_autojoin_summary">Respecta a marca de autoentrada nos marcadores da conversa en grupo</string>
     <string name="toast_message_otr_fingerprint">Copiouse a pegada dixital OTR ao portapapeis!</string>
     <string name="toast_message_omemo_fingerprint">Copiouse a pegada dixital OMEMO ao portapapeis!</string>
     <string name="conference_banned">Vostede non pode acceder a esta conversa en grupo</string>
diff --git a/src/main/res/values-id/strings.xml b/src/main/res/values-id/strings.xml
index 4b1b3bc6e..7c0e4190b 100644
--- a/src/main/res/values-id/strings.xml
+++ b/src/main/res/values-id/strings.xml
@@ -271,8 +271,6 @@
     <string name="pref_use_send_button_to_indicate_status_summary">Warna tombol kirim untuk menunjukkan status kontak</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Warna nama kontak untuk menunjukkan status kontak</string>
     <string name="pref_expert_options_other">Lainnya</string>
-    <string name="pref_autojoin">Otomatis bergabung dengan obrolan kelompok</string>
-    <string name="pref_autojoin_summary">Hormati bendera autojoin di grup chat bookmark</string>
     <string name="toast_message_otr_fingerprint">Sidik jari OTR disalin ke clipboard!</string>
     <string name="toast_message_omemo_fingerprint">Sidik jari OMEMO disalin ke clipboard!</string>
     <string name="conference_banned">Anda dilarang melakukan obrolan kelompok ini</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index c53278573..0416c481a 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -210,11 +210,11 @@
     <string name="done">Fatto</string>
     <string name="verify">Verifica</string>
     <string name="decrypt">Decripta</string>
-    <string name="conferences">Chat di gruppo</string>
+    <string name="conferences">Conversazioni di gruppo</string>
     <string name="search">Cerca</string>
     <string name="create_contact">Crea contatto</string>
     <string name="enter_contact">Inserisci contatto</string>
-    <string name="join_conference">Unisciti alla chat</string>
+    <string name="join_conference">Unisciti alla conversazione di gruppo</string>
     <string name="delete_contact">Elimina contatto</string>
     <string name="view_contact_details">Mostra dettagli contatto</string>
     <string name="block_contact">Blocca contatto</string>
@@ -223,14 +223,14 @@
     <string name="select">Seleziona</string>
     <string name="contact_already_exists">Il contatto esiste già</string>
     <string name="join">Entra</string>
-    <string name="conference_address">Indirizzo chat di gruppo</string>
+    <string name="conference_address">Indirizzo della conversazione di gruppo</string>
     <string name="conference_address_example">stanza@conferenza.esempio.com/nick</string>
     <string name="save_as_bookmark">Salva come segnalibro</string>
     <string name="delete_bookmark">Elimina segnalibro</string>
     <string name="bookmark_already_exists">Questo segnalibro esiste già</string>
-    <string name="action_edit_subject">Modifica titolo chat di gruppo</string>
+    <string name="action_edit_subject">Modifica titolo conversazione di gruppo</string>
     <string name="topic">Argomento</string>
-    <string name="joining_conference">Ingresso nella chat di gruppo...</string>
+    <string name="joining_conference">Ingresso nella conversazione di gruppo…</string>
     <string name="leave">Abbandona</string>
     <string name="contact_added_you">Il contatto ti ha aggiunto alla sua lista contatti</string>
     <string name="add_back">Aggiungi anche tu</string>
@@ -252,7 +252,7 @@
     <string name="skip">Salta</string>
     <string name="disable_notifications">Disabilita le notifiche</string>
     <string name="enable">Abilita</string>
-    <string name="conference_requires_password">La chat di gruppo richiede una password</string>
+    <string name="conference_requires_password">La conversazione di gruppo richiede una password</string>
     <string name="enter_password">Inserisci la password</string>
     <string name="request_presence_updates">Richiedi gli aggiornamenti della presenza dal tuo contatto.\n\n<small>Questo verrà usato per determinare quali client sta usando il tuo contatto.</small></string>
     <string name="request_now">Rechiedi adesso</string>
@@ -278,14 +278,14 @@
     <string name="pref_use_send_button_to_indicate_status_summary">Colora il pulsante di invio per indicare lo stato del contatto</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Colora i nomi dei contatti per indicare lo stato dei contatti</string>
     <string name="pref_expert_options_other">Altro</string>
-    <string name="pref_autojoin">Unisciti automaticamente alle chat di gruppo</string>
-    <string name="pref_autojoin_summary">Rispetta l\'opzione di entrata automatica nei segnalibri di chat di gruppo</string>
+    <string name="pref_autojoin">Sincronizza con segnalibri</string>
+    <string name="pref_autojoin_summary">Unisciti e lascia conversazioni di gruppo in accordo con la tua scelta di auto-unisci nei tuoi segnalibri.</string>
     <string name="toast_message_otr_fingerprint">Impronta OTR copiata!</string>
     <string name="toast_message_omemo_fingerprint">impronta OMEMO copiata negli appunti|</string>
-    <string name="conference_banned">Sei stato bandito da questa chat di gruppo</string>
-    <string name="conference_members_only">Questa chat di gruppo è solo per membri</string>
-    <string name="conference_kicked">Sei stato buttato fuori da questa chat di gruppo</string>
-    <string name="conference_shutdown">La chat di gruppo è stata chiusa</string>
+    <string name="conference_banned">Sei stato bandito da questa conversazione di gruppo</string>
+    <string name="conference_members_only">Questa conversazione di gruppo è solo per membri</string>
+    <string name="conference_kicked">Sei stato buttato fuori da questa conversazione di gruppo</string>
+    <string name="conference_shutdown">La conversazione di gruppo è stata chiusa</string>
     <string name="using_account">usando l’account %s</string>
     <string name="checking_x">Controllo %s su host HTTP</string>
     <string name="not_connected_try_again">Non sei connesso. Riprova più tardi</string>
@@ -335,8 +335,8 @@
     <string name="are_you_sure_verify_fingerprint">Sei sicuro di voler verificare l\'impronta OTR del tuo contatto?</string>
     <string name="pref_show_dynamic_tags">Mostra tag dinamici</string>
     <string name="pref_show_dynamic_tags_summary">Mostra tag in sola lettura sotto i contatti</string>
-    <string name="no_conference_server_found">Nessun server per chat di gruppo trovato</string>
-    <string name="conference_creation_failed">Creazione della chat di gruppo fallita!</string>
+    <string name="no_conference_server_found">Nessun server per conversazioni di gruppo trovato</string>
+    <string name="conference_creation_failed">Creazione della conversazione di gruppo fallita!</string>
     <string name="account_image_description">Avatar utente</string>
     <string name="copy_otr_clipboard_description">Copia impronta OTR</string>
     <string name="copy_omemo_clipboard_description">Copia impronta OMEMO negli appunti</string>
@@ -373,21 +373,21 @@
     <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="remove_from_room">Rimuovi dalla chat di gruppo</string>
+    <string name="remove_from_room">Rimuovi dalla conversazione di gruppo</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="removing_from_public_conference">Stai cercando di rimuovere %s da una chat di gruppo pubblica. L\'unico modo per farlo è bandire per sempre quell\'utente.</string>
+    <string name="ban_from_conference">Bandisci dalla conversazione di gruppo</string>
+    <string name="removing_from_public_conference">Stai cercando di rimuovere %s da una conversazione di gruppo pubblica. L\'unico modo per farlo è bandire per sempre quell\'utente.</string>
     <string name="ban_now">Bandisci</string>
     <string name="could_not_change_role">Impossibile cambiare ruolo di %s</string>
-    <string name="public_conference">Chat di gruppo pubblicamente accessibile</string>
-    <string name="private_conference">Chat di gruppo privata, solo per membri</string>
-    <string name="conference_options">Opzioni chat di gruppo</string>
+    <string name="public_conference">Conversazione di gruppo pubblicamente accessibile</string>
+    <string name="private_conference">Conversazione di gruppo privata, solo per membri</string>
+    <string name="conference_options">Opzioni conversazione di gruppo</string>
     <string name="members_only">Privato, solo membri</string>
     <string name="non_anonymous">Non anonimo</string>
     <string name="moderated">Moderata</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>
+    <string name="modified_conference_options">Opzioni della conversazione di gruppo modificate!</string>
+    <string name="could_not_modify_conference_options">Impossibile modificare le opzioni della conversazione di gruppo</string>
     <string name="never">Mai</string>
     <string name="until_further_notice">Fino a nuovo avviso</string>
     <string name="pref_input_options">Input</string>
@@ -522,7 +522,7 @@
     <string name="no_participants">Nessun partecipante</string>
     <string name="correct_message">Correggi messaggio</string>
     <string name="send_corrected_message">Invia messaggio corretto</string>
-    <string name="no_keys_just_confirm">Ti fidi già di questo contatto. Selezionando \'fatto\' stai solo confermando che %s fa parte di questa chat di gruppo.</string>
+    <string name="no_keys_just_confirm">Ti fidi già di questo contatto. Selezionando \'fatto\' stai solo confermando che %s fa parte di questa conversazione di gruppo.</string>
     <string name="contacts_have_no_pgp_keys">Pix-Art Messenger non è in grado di criptare i tuoi messaggi perchè i tuoi contatti non stanno annunciando le loro chiavi pubbliche.\n\n</string>
     <string name="this_account_is_disabled">Hai disabilitato questo account</string>
     <string name="security_error_invalid_file_access">Errore di sicurezza: accesso file non valido</string>
@@ -538,7 +538,7 @@
     <string name="pref_manually_change_presence">Gestisci disponibilità manualmente</string>
     <string name="pref_manually_change_presence_summary">Imposta la tua disponibilità quando modifichi il tuo messaggio di stato.</string>
     <string name="status_message">Messaggio di stato</string>
-    <string name="presence_chat">Disponibile a chattare</string>
+    <string name="presence_chat">Disponibile a Conversare</string>
     <string name="presence_online">Online</string>
     <string name="presence_away">Assente</string>
     <string name="presence_xa">Non disponibile</string>
@@ -554,10 +554,10 @@
     <string name="show_password">Mostra la password</string>
     <string name="registration_please_wait">Registrazione fallita: riprova più tardi</string>
     <string name="registration_password_too_weak">Registrazione fallita: password troppo debole</string>
-    <string name="create_conference">Crea chat di gruppo</string>
+    <string name="create_conference">Crea conversazione di gruppo</string>
     <string name="conference_subject">Soggetto</string>
     <string name="choose_participants">Scegli i partecipanti</string>
-    <string name="creating_conference">Creazione chat di gruppo...</string>
+    <string name="creating_conference">Creazione conversazione di gruppo…</string>
     <string name="import_text">C\'è un backup sul tuo dispositivo che può essere importato.\nIl tuo Messenger sarà riavviato durante il processo di backup. Vorresti importare il backup? </string>
     <string name="import_database">Importa backup</string>
     <string name="invite_again">Invita di nuovo</string>
@@ -749,6 +749,7 @@
     <string name="disable_encryption">Disabilita crittografia</string>
     <string name="error_trustkey_general">Pix-Art Messenger non è in grado di inviare messaggi criptati a %1$s. Questo può essere causato dal tuo contatto che utilizza un server non aggiornato o da un client che non gestisce OMEMO.</string>
     <string name="error_trustkey_device_list">Impossibile ottenere l\'elenco dei dispositivi</string>
+    <string name="error_trustkey_bundle">Impossibile recuperare i pacchetti di dispositivi</string>
     <string name="error_trustkey_hint_mutual">Suggerimento: In alcuni casi questo può essere risolto aggiungendosi a vicenda nelle liste dei contatti.</string>
     <string name="disable_encryption_message">Sei sicuro di voler disabilitare la crittografia OMEMO per questa conversazione?\nQuesto può permettere all\'amministratore del server di leggere i tuoi messaggi, ma potrebbe essere l\'unico modo di comunicare con persone che utilizzano client non aggiornati.</string>
     <string name="disable_now">Disabilita ora</string>
@@ -794,7 +795,7 @@
     <string name="nickname">Soprannome per questa conversazione di gruppo</string>
     <string name="group_chat_name">Nome</string>
     <string name="providing_a_name_is_optional">Fornire un nome è facoltativo</string>
-    <string name="create_dialog_group_chat_name">Nome della chat di gruppo</string>
+    <string name="create_dialog_group_chat_name">Nome conversazione di gruppo</string>
     <string name="everyone_has_read_up_to_this_point">Tutti hanno letto fino a questo punto</string>
     <string name="conference_resource_constraint">Vincoli di risorsa</string>
     <string name="delete_message">Elimina messaggio</string>
@@ -830,7 +831,9 @@
     <string name="action_delete">Elimina</string>
     <string name="security_violation_not_attaching_file">File omesso a causa di una violazione di sicurezza.</string>
     <string name="delete_file_dialog">Elimina file</string>
+    <string name="delete_file_dialog_msg">Sei sicuro di voler eliminare questo file?\n\n<b>Attenzione:</b> Questo non eliminerà le copie di questo file che sono salvate su altri dispositivi o server.</string>
     <string name="cancelled">annullato</string>
+    <string name="remote_server_timeout">Tempo scaduto con il server remoto</string>
     <string name="already_drafting_message">Stai già scrivendo una bozza di messaggio.</string>
     <string name="bad_key_for_encryption">Chiave errata per la criptazione.</string>
     <string name="delete_message_dialog">Elimina messaggio</string>
@@ -846,4 +849,10 @@
     <string name="start_orbot">Avvia Orbot</string>
     <string name="no_market_app_installed">Non ci sono app store installati.</string>
     <string name="group_chat_will_make_your_jabber_id_public">Questa conversazione di gruppo renderà il tuo jabber ID pubblico</string>
+    <string name="ebook">e-book</string>
+    <string name="your_name">Il tuo nome</string>
+    <string name="enter_your_name">Inserisci il tuo nome</string>
+    <string name="enter_your_name_instructions">Per favore inserisci il tuo nome che sarà visibile ai tuoi contatti.</string>
+    <string name="no_name_set_instructions">Nessun nome impostato.</string>
+    <string name="autojoin_groupchat">Unisciti automaticamente a questa conversazione di gruppo</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index efaf3433c..226fc4eb0 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -256,8 +256,6 @@
     <string name="pref_use_indicate_received_summary">Indien ondersteund, worden ontvangen berichten met een groen vinkje aangeduid</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Kleur verstuur-knop in om status van contact weer te geven</string>
     <string name="pref_expert_options_other">Andere</string>
-    <string name="pref_autojoin">Automatisch deelnemen aan groepsgesprekken</string>
-    <string name="pref_autojoin_summary">Respecteer de autojoin-vlag bij groepsgespreksbladwijzers</string>
     <string name="toast_message_otr_fingerprint">OTR-vingerafdruk gekopieerd naar klembord!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO-vingerafdruk gekopieerd naar klembord!</string>
     <string name="conference_banned">Je bent verbannen uit dit groepsgesprek</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 622972714..62fc1886f 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-    <string name="action_settings">Definições</string>
+    <string name="action_settings">Configurações</string>
     <string name="action_add">Nova conversa</string>
-    <string name="action_accounts">Gerir contas</string>
-    <string name="action_end_conversation">Finalizar essa conversa</string>
-    <string name="action_contact_details">Detalhes do contacto</string>
+    <string name="action_accounts">Gerenciar contas</string>
+    <string name="action_end_conversation">Finalizar conversa</string>
+    <string name="action_contact_details">Detalhes do contato</string>
     <string name="action_secure">Conversa segura</string>
     <string name="action_add_account">Adicionar conta</string>
     <string name="action_edit_contact">Editar nome</string>
-    <string name="action_add_phone_book">Adicionar ao livro de endereços</string>
+    <string name="action_add_phone_book">Adicionar aos contatos</string>
     <string name="action_delete_contact">Apagar da lista</string>
-    <string name="action_block_contact">Bloquear contacto</string>
-    <string name="action_unblock_contact">Desbloquear contacto</string>
+    <string name="action_block_contact">Bloquear contato</string>
+    <string name="action_unblock_contact">Desbloquear contato</string>
     <string name="action_block_domain">Bloquear domínio</string>
     <string name="action_unblock_domain">Desbloquear domínio</string>
-    <string name="title_activity_manage_accounts">Gerir contas</string>
-    <string name="title_activity_settings">Definições</string>
+    <string name="title_activity_manage_accounts">Gerenciar contas</string>
+    <string name="title_activity_settings">Configurações</string>
     <string name="title_activity_sharewith">Compartilhar conversa</string>
     <string name="title_activity_start_conversation">Iniciar conversa</string>
     <string name="title_activity_block_list">Bloquear lista</string>
@@ -25,25 +25,25 @@
     <string name="minutes_ago">%d minutos atrás</string>
     <string name="unread_conversations">Conversas não lidas</string>
     <string name="sending">enviando...</string>
-    <string name="message_decrypting">Decifrando a mensagem. Por favor aguarde...</string>
-    <string name="pgp_message">Mensagem cifrada OpenPGP</string>
+    <string name="message_decrypting">Decriptando a mensagem. Por favor aguarde...</string>
+    <string name="pgp_message">Mensagem encriptada OpenPGP</string>
     <string name="nick_in_use">O apelido já está em uso</string>
     <string name="admin">Administrador</string>
     <string name="owner">Dono</string>
     <string name="moderator">Moderador</string>
     <string name="participant">Participante</string>
     <string name="visitor">Visitante</string>
-    <string name="remove_contact_text">Deseja remover %s da sua lista? A conversa associada a este contacto não será removida.</string>
+    <string name="remove_contact_text">Deseja remover %s da sua lista? A conversa associada a este contato não será removida.</string>
     <string name="block_contact_text">Deseja bloquear o o recebimento de mensagens de %s?</string>
     <string name="unblock_contact_text">Deseja desbloquear o recebimento de mensagens de %s?</string>
-    <string name="block_domain_text">Bloquear todos os contactos de %s?</string>
-    <string name="unblock_domain_text">Desbloquear todos os contactos de %s?</string>
-    <string name="contact_blocked">Contacto bloqueado</string>
+    <string name="block_domain_text">Bloquear todos os contatos de %s?</string>
+    <string name="unblock_domain_text">Desbloquear todos os contatos de %s?</string>
+    <string name="contact_blocked">Contato bloqueado</string>
     <string name="remove_bookmark_text">Deseja remover %s dos favoritos? A conversa associada a este favorito não será removida.</string>
-    <string name="register_account">Registe uma nova conta no servidor</string>
+    <string name="register_account">Registre uma nova conta no servidor</string>
     <string name="change_password_on_server">Altere a senha no servidor</string>
     <string name="share_with">Compartilhar com...</string>
-    <string name="contacts">Contactos</string>
+    <string name="contacts">Contatos</string>
     <string name="cancel">Cancelar</string>
     <string name="set">Definir</string>
     <string name="add">Adicionar</string>
@@ -51,45 +51,45 @@
     <string name="delete">Remover</string>
     <string name="block">Bloquear</string>
     <string name="unblock">Desbloquear</string>
-    <string name="save">Guardar</string>
+    <string name="save">Salvar</string>
     <string name="ok">OK</string>
     <string name="crash_report_title">Pix-Art Messenger teve um problema e deixou de funcionar</string>
     <string name="crash_report_message">Ao enviar os stack traces você ajudará o desenvolvimento do aplicativo\n<b>Atenção:</b> Isso usará a sua conta XMPP para enviar o stack trace para o desenvolvedor.</string>
     <string name="send_now">Enviar agora</string>
     <string name="send_never">Não perguntar novamente</string>
-    <string name="problem_connecting_to_account">Não foi possível ligar-se à conta</string>
-    <string name="problem_connecting_to_accounts">Não foi possível ligar-se a múltiplas contas</string>
-    <string name="touch_to_fix">Toque aqui para gerir suas contas</string>
+    <string name="problem_connecting_to_account">Não foi possível conectar-se à conta</string>
+    <string name="problem_connecting_to_accounts">Não foi possível conectar-se a múltiplas contas</string>
+    <string name="touch_to_fix">Toque aqui para gerenciar suas contas</string>
     <string name="attach_file">Anexar arquivo</string>
-    <string name="not_in_roster">O contacto não está na sua lista. Deseja adicioná-lo?</string>
-    <string name="add_contact">Adicionar contacto</string>
+    <string name="not_in_roster">O contato não está na sua lista. Deseja adicioná-lo?</string>
+    <string name="add_contact">Adicionar contato</string>
     <string name="send_failed">a entrega falhou</string>
-    <string name="preparing_image">Preparando a imagem para transmissão</string>
-    <string name="preparing_images">Preparando as imagens para a transmissão</string>
-    <string name="sharing_files_please_wait">Partilhando os ficheiros. Por favor aguarde...</string>
+    <string name="preparing_image">Preparando a imagem para envio</string>
+    <string name="preparing_images">Preparando as imagens para o envio</string>
+    <string name="sharing_files_please_wait">Compartilhando arquivos. Por favor aguarde...</string>
     <string name="action_clear_history">Limpar histórico</string>
     <string name="clear_conversation_history">Limpar o histórico de conversas</string>
     <string name="delete_messages">Remover mensagens</string>
     <string name="also_end_conversation">Terminar esta conversa depois</string>
     <string name="choose_presence">Escolher dispositivo</string>
-    <string name="send_unencrypted_message">Enviar mensagem não cifrada</string>
+    <string name="send_unencrypted_message">Enviar mensagem não encriptada</string>
     <string name="send_message_to_x">Enviar mensagem para %s</string>
-    <string name="send_otr_message">Enviar mensagem cifrada com OTR</string>
-    <string name="send_omemo_message">Enviar mensagem cifrada com OMEMO</string>
-    <string name="send_omemo_x509_message">Enviar mensagem cifrada com v\\OMEMO</string>
-    <string name="send_pgp_message">Enviar mensagem cifrada com OpenPGP</string>
+    <string name="send_otr_message">Enviar mensagem encriptada com OTR</string>
+    <string name="send_omemo_message">Enviar mensagem encriptada com OMEMO</string>
+    <string name="send_omemo_x509_message">Enviar mensagem encriptada com v\\OMEMO</string>
+    <string name="send_pgp_message">Enviar mensagem encriptada com OpenPGP</string>
     <string name="your_nick_has_been_changed">O seu apelido foi alterado</string>
-    <string name="send_unencrypted">Enviar não cifrada</string>
-    <string name="decryption_failed">A decifragem falhou. Talvez  não tenha a chave privada correta.</string>
+    <string name="send_unencrypted">Enviar não encriptada</string>
+    <string name="decryption_failed">A decriptação falhou. Talvez  não tenha a chave privada correta.</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">Pix-Art Messenger utiliza uma aplicação de terceiros chamada <b>OpenKeychain</b> para cifrar e decifrar mensagens e gerir as suas chaves públicas.\n\nOpenKeychain é licenciado sob a licença GPLv3 e está disponível no F-Droid e Google Play.\n\n<small>(Por favor reinicie Pix-Art Messenger em seguida)</small></string>
+    <string name="openkeychain_required_long">Pix-Art Messenger utiliza uma aplicação de terceiros chamada <b>OpenKeychain</b> para encriptad e decriptar mensagens e gerenciar as suas chaves públicas.\n\nOpenKeychain é licenciado sob a licença GPLv3 e está disponível no F-Droid e Google Play.\n\n<small>(Por favor reinicie Pix-Art Messenger em seguida)</small></string>
     <string name="restart">Reiniciar</string>
     <string name="install">Instalar</string>
     <string name="openkeychain_not_installed">Por favor instale o OpenKeychain</string>
     <string name="offering">oferecendo...</string>
     <string name="waiting">aguardando...</string>
     <string name="no_pgp_key">Nenhuma chave OpenPGP encontrada</string>
-    <string name="contact_has_no_pgp_key">Pix-Art Messenger não é capaz de cifrar as suas mensagens porque o seu contacto não está a anunciar a sua chave pública.\n\n<small>Por favor peça ao seu contacto para configurar o OpenPGP.</small></string>
+    <string name="contact_has_no_pgp_key">Pix-Art Messenger não é capaz de encriptar as suas mensagens porque o seu contato não está anunciando a sua chave pública.\n\n<small>Por favor peça ao seu contato para configurar o OpenPGP.</small></string>
     <string name="no_pgp_keys">Não foram encontradas chaves OpenPGP</string>
     <string name="pref_general">Geral</string>
     <string name="pref_attachments">Anexos</string>
@@ -112,10 +112,10 @@
     <string name="attach_choose_picture">Escolher imagem</string>
     <string name="preemptively_grant">Conceder pedido de subscrição antecipadamente</string>
     <string name="error_not_an_image_file">O arquivo selecionado não é uma imagem</string>
-    <string name="error_compressing_image">Erro ao converter o ficheiro de imagem</string>
-    <string name="error_file_not_found">Ficheiro não encontrado</string>
+    <string name="error_compressing_image">Erro ao converter o arquivo de imagem</string>
+    <string name="error_file_not_found">Arquivo não encontrado</string>
     <string name="error_io_exception">Erro de I/O genérico. Talvez tenha ficado sem espaço de armazenamento?</string>
-    <string name="error_security_exception_during_image_copy">A aplicação que usou para selecionar esta imagem não nos forneceu permissões suficientes para ler o ficheiro.\n\n<small>Utilize um gestor de ficheiros diferente para escolher uma imagem</small></string>
+    <string name="error_security_exception_during_image_copy">A aplicação que usou para selecionar esta imagem não forneceu permissões suficientes para ler o arquivo.\n\n<small>Utilize um gerenciador de arquivos diferente para escolher uma imagem</small></string>
     <string name="account_status_unknown">Desconhecido</string>
     <string name="account_status_disabled">Temporariamente desativado</string>
     <string name="account_status_online">Online</string>
@@ -123,13 +123,13 @@
     <string name="account_status_offline">Offline</string>
     <string name="account_status_unauthorized">Não autorizado</string>
     <string name="account_status_not_found">Servidor não encontrado</string>
-    <string name="account_status_no_internet">Sem conectividade</string>
-    <string name="account_status_regis_fail">O registo falhou</string>
-    <string name="account_status_regis_conflict">O nome de utilizador já está em uso</string>
-    <string name="account_status_regis_success">Registo efetuado com sucesso</string>
-    <string name="account_status_regis_not_sup">O servidor não aceita o registo</string>
+    <string name="account_status_no_internet">Sem conexão</string>
+    <string name="account_status_regis_fail">O registro falhou</string>
+    <string name="account_status_regis_conflict">O usuário já está em uso</string>
+    <string name="account_status_regis_success">Registro efetuado com sucesso</string>
+    <string name="account_status_regis_not_sup">O servidor não aceita o registro</string>
     <string name="account_status_incompatible_server">Servidor incompatível</string>
-    <string name="encryption_choice_unencrypted">Não cifrado</string>
+    <string name="encryption_choice_unencrypted">Não encriptado</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
@@ -139,12 +139,12 @@
     <string name="mgmt_account_are_you_sure">Tem a certeza?</string>
     <string name="attach_record_voice">Gravar voz</string>
     <string name="account_settings_jabber_id">ID Jabber</string>
-    <string name="account_settings_password">Palavra-passe</string>
+    <string name="account_settings_password">Senha</string>
     <string name="account_settings_example_jabber_id">nomedeutilizador@exemplo.com</string>
-    <string name="password">Palavra-passe</string>
+    <string name="password">Senha</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="add_phone_book_text">Deseja adicionar %s aos seus contatos?</string>
     <string name="server_info_show_more">Informações do servidor</string>
     <string name="server_info_mam">XEP-0313: MAM</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
@@ -181,26 +181,26 @@
     <string name="verify">Verificar</string>
     <string name="decrypt">Decifrar</string>
     <string name="search">Pesquisar</string>
-    <string name="enter_contact">Inserir Contacto</string>
-    <string name="view_contact_details">Ver detalhes do contacto</string>
-    <string name="block_contact">Bloquear contacto</string>
-    <string name="unblock_contact">Desbloquear contacto</string>
+    <string name="enter_contact">Inserir Contato</string>
+    <string name="view_contact_details">Ver detalhes do contato</string>
+    <string name="block_contact">Bloquear contato</string>
+    <string name="unblock_contact">Desbloquear contato</string>
     <string name="create">Criar</string>
     <string name="select">Selecionar</string>
-    <string name="contact_already_exists">O contacto já existe</string>
+    <string name="contact_already_exists">O contato já existe</string>
     <string name="join">Juntar</string>
-    <string name="save_as_bookmark">Guardar como favorito</string>
+    <string name="save_as_bookmark">Salvar como favorito</string>
     <string name="delete_bookmark">Apagar favorito</string>
     <string name="bookmark_already_exists">O favorito já existe</string>
     <string name="leave">Sair</string>
-    <string name="contact_added_you">Contacto adicionado à sua lista de contactos</string>
+    <string name="contact_added_you">Contato adicionado a sua lista de contatos</string>
     <string name="add_back">Adicionar novamente</string>
     <string name="publish">Publicar</string>
     <string name="touch_to_choose_picture">Toque no avatar para escolher uma imagem da galeria</string>
     <string name="publishing">Publicando...</string>
     <string name="error_publish_avatar_server_reject">O servidor rejeitou a sua publicação</string>
     <string name="error_publish_avatar_converting">Algo deu errado ao converter a sua imagem</string>
-    <string name="error_saving_avatar">Não foi possível guardar o avatar no disco</string>
+    <string name="error_saving_avatar">Não foi possível salvar o avatar no disco</string>
     <string name="or_long_press_for_default">(Ou mantenha pressionado por um tempo para voltar para o padrão)</string>
     <string name="error_publish_avatar_no_server_support">O seu servidor não suporta a publicação de avatares</string>
     <string name="private_message">sussurrou</string>
@@ -213,16 +213,16 @@
     <string name="skip">Pular</string>
     <string name="disable_notifications">Desativar notificações</string>
     <string name="enable">Ativar</string>
-    <string name="enter_password">Inserir palavra-passe</string>
-    <string name="request_presence_updates">Por favor peça atualizações de presença ao seu contacto primeiro.\n\n<small>Isto irá ser utilizado para determinar que cliente(s) o seu contacto está a utilizar.</small></string>
+    <string name="enter_password">Inserir senha</string>
+    <string name="request_presence_updates">Por favor peça atualizações de presença ao seu contato primeiro.\n\n<small>Isto irá ser utilizado para determinar que cliente(s) o seu contato está utilizando.</small></string>
     <string name="request_now">Solicitar agora</string>
     <string name="delete_fingerprint">Remover impressão digital</string>
     <string name="sure_delete_fingerprint">Tem a certeza que deseja remover esta impressão digital?</string>
     <string name="ignore">Ignorar</string>
-    <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviar isto sem atualizações de presença mútuas pode causar problemas inesperados.\n\n<small>Vá aos detalhes do contacto para verificar as suas subscrições de presença.</small></string>
+    <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviar isto sem atualizações de presença mútuas pode causar problemas inesperados.\n\n<small>Vá aos detalhes do contato para verificar as suas subscrições de presença.</small></string>
     <string name="pref_security_settings">Segurança</string>
     <string name="pref_allow_message_correction">Permitir a correção de mensagens</string>
-    <string name="pref_allow_message_correction_summary">Permitir que os seus contactos editem as suas mensagens depois de enviadas</string>
+    <string name="pref_allow_message_correction_summary">Permitir que os seus contatos editem as suas mensagens depois de enviadas</string>
     <string name="pref_expert_options">Definições avançadas</string>
     <string name="title_activity_about">Sobre Pix-Art Messenger</string>
     <string name="pref_about_conversations_summary">Informação de licença e construção</string>
@@ -234,7 +234,7 @@
     <string name="pref_use_send_button_to_indicate_status">O botão de enviar indica o estado</string>
     <string name="pref_use_indicate_received">Solicitar recibo de mensagem</string>
     <string name="pref_use_indicate_received_summary">Mensagens recebidas serão marcadas com um visto verde se suportado</string>
-    <string name="pref_use_send_button_to_indicate_status_summary">Colorir o botão de enviar para indicar o estado do contacto</string>
+    <string name="pref_use_send_button_to_indicate_status_summary">Colorir o botão de enviar para indicar o estado do contato</string>
     <string name="pref_expert_options_other">Outros</string>
     <string name="toast_message_otr_fingerprint">Impressão digital OTR copiada para a área de transferência!</string>
     <string name="toast_message_omemo_fingerprint">Impressão digital OMEMO copiada para a área de transferência!</string>
@@ -246,14 +246,14 @@
     <string name="message_options">Opções de mensagem</string>
     <string name="copy_original_url">Copiar o URL original</string>
     <string name="send_again">Enviar novamente</string>
-    <string name="file_url">URL do ficheiro</string>
+    <string name="file_url">URL do arquivo</string>
     <string name="url_copied_to_clipboard">URL copiado para a área de transferência</string>
-    <string name="show_block_list">Mostar lista de bloqueios</string>
+    <string name="show_block_list">Mostrar lista de bloqueios</string>
     <string name="account_details">Detalhes da conta</string>
     <string name="verify_otr">Verificar OTR</string>
     <string name="remote_fingerprint">Impressão digital remota</string>
     <string name="shared_secret_hint">Dica ou Questão</string>
-    <string name="shared_secret_secret">Segredo Partilhado</string>
+    <string name="shared_secret_secret">Segredo Compartilhado</string>
     <string name="confirm">Confirmar</string>
     <string name="in_progress">Em progresso</string>
     <string name="respond">Responder</string>
@@ -261,49 +261,49 @@
     <string name="try_again">Tentar novamente</string>
     <string name="finish">Finalizar</string>
     <string name="verified">Verificado!</string>
-    <string name="smp_requested">O contacto pediu uma verificação SMP</string>
+    <string name="smp_requested">O contato pediu uma verificação SMP</string>
     <string name="no_otr_session_found">Não foi encontrada nenhuma sessão OTR válida!</string>
     <string name="pref_export_logs">Exportar histórico</string>
     <string name="notification_export_logs_title">A escrever os logs para o cartão SD</string>
-    <string name="choose_file">Escolher ficheiro</string>
-    <string name="receiving_x_file">A receber %1$s (%2$d%% concluído)</string>
+    <string name="choose_file">Escolher arquivo</string>
+    <string name="receiving_x_file">Recebendo %1$s (%2$d%% concluído)</string>
     <string name="download_x_file">Transferir %s</string>
     <string name="delete_x_file">Remover %s</string>
-    <string name="file">ficheiro</string>
+    <string name="file">arquivo</string>
     <string name="open_x_file">Abrir %s</string>
-    <string name="sending_file">a enviar (%1$d%% concluído)</string>
-    <string name="preparing_file">Preparando o ficheiro para a transmissão</string>
+    <string name="sending_file">enviando (%1$d%% concluído)</string>
+    <string name="preparing_file">Preparando o arquivo para a transmissão</string>
     <string name="x_file_offered_for_download">%s oferecido para download</string>
     <string name="cancel_transmission">Cancelar transmissão</string>
-    <string name="file_transmission_failed">A transmissão do ficheiro falhou</string>
-    <string name="file_deleted">O ficheiro foi eliminado</string>
-    <string name="no_application_found_to_open_file">Não foi encontrada nenhuma aplicação para abrir o ficheiro</string>
+    <string name="file_transmission_failed">A transmissão do arquivo falhou</string>
+    <string name="file_deleted">O arquivo foi eliminado</string>
+    <string name="no_application_found_to_open_file">Não foi encontrada nenhuma aplicação para abrir o arquivo</string>
     <string name="could_not_verify_fingerprint">Não foi possível verificar a impressão digital</string>
     <string name="manually_verify">Verificar manualmente</string>
     <string name="pref_show_dynamic_tags">Mostrar tags dinâmicas</string>
-    <string name="pref_show_dynamic_tags_summary">Mostrar tags read-only debaixo dos contactos</string>
+    <string name="pref_show_dynamic_tags_summary">Mostrar tags somente leitura debaixo dos contatos</string>
     <string name="account_image_description">Avatar da conta</string>
     <string name="copy_otr_clipboard_description">Copiar a impressão digital OTR para a área de transferência</string>
     <string name="copy_omemo_clipboard_description">Copiar a impressão digital OMEMO para a área de transferência</string>
     <string name="regenerate_omemo_key">Regenerar a chave OMEMO</string>
     <string name="clear_other_devices">Apagar dispositivos</string>
-    <string name="clear_other_devices_desc">Tem a certeza que quer apagar todos os outros dispositivos do anúncio OMEMO? A próxima vez que os seus dispositivos se conectem, irão ser eles mesmos a fazerem o anúncio novamente, mas podem não receber as mensagems enviadas entretanto.</string>
+    <string name="clear_other_devices_desc">Tem certeza que quer apagar todos os outros dispositivos do anúncio OMEMO? A próxima vez que seus dispositivos se conectarem, irão fazer o anúncio novamente mas podem não receber as mensagens enviadas.</string>
     <string name="fetching_history_from_server">Obtendo o histórico do servidor</string>
     <string name="no_more_history_on_server">Não existe mais histórico no servidor</string>
-    <string name="updating">A atualizar...</string>
-    <string name="password_changed">Palavra-passe alterada!</string>
-    <string name="could_not_change_password">Não foi possível alterar a palavra-passe</string>
-    <string name="otr_session_not_started">Enviar uma mensagem para começar uma conversa cifrada</string>
+    <string name="updating">Atualizando...</string>
+    <string name="password_changed">Senha alterada!</string>
+    <string name="could_not_change_password">Não foi possível alterar a senha</string>
+    <string name="otr_session_not_started">Enviar uma mensagem para começar uma conversa encriptada</string>
     <string name="ask_question">Fazer pergunta</string>
-    <string name="smp_explain_question">Se tiver um segredo em comum com o seu contacto que mais ninguém saiba (como uma piada entre vocês ou simplesmente o que comeram ao almoço da última vez que se encontraram) pode usar esse segredo para verificar as impressões digitais um do outro.\n\nForneça uma dica ou uma questão para o seu contacto que irá responder com uma resposta sensível a maiúsculas e minúsculas.</string>
-    <string name="smp_explain_answer">O seu contacto gostaria de verificar a sua impressão digital desafiando-o com um segredo partilhado. O seu contacto forneceu a seguinte dica ou questão para esse segredo.</string>
+    <string name="smp_explain_question">Se tiver um segredo em comum com o seu contato que mais ninguém saiba (como uma piada entre vocês ou simplesmente o que comeram ao almoço da última vez que se encontraram) pode usar esse segredo para verificar as impressões digitais um do outro.\n\nForneça uma dica ou uma questão para o seu contato que irá responder com uma resposta sensível a maiúsculas e minúsculas.</string>
+    <string name="smp_explain_answer">O seu contato gostaria de verificar a sua impressão digital desafiando-o com um segredo compartilhado. O seu contato forneceu a seguinte dica ou questão para esse segredo.</string>
     <string name="shared_secret_hint_should_not_be_empty">A sua dica não deve estar vazia</string>
-    <string name="shared_secret_can_not_be_empty">O seu segredo partilhado não pode estar vazio</string>
-    <string name="manual_verification_explanation">Compare cuidadosamente a impressão digital mostrada abaixo com a impressão digital do seu contacto.\nPode usar qualquer forma de comunicação como um e-mail cifrado ou uma chamada telefónica para as trocar.</string>
-    <string name="change_password">Alterar palavra-passe</string>
-    <string name="current_password">Palavra-passe atual</string>
-    <string name="new_password">Nova palavra-passe</string>
-    <string name="password_should_not_be_empty">A palavra-passe não deve estar vazia</string>
+    <string name="shared_secret_can_not_be_empty">O seu segredo compartilhado não pode estar vazio</string>
+    <string name="manual_verification_explanation">Compare cuidadosamente a impressão digital mostrada abaixo com a impressão digital do seu contato.\nPode usar qualquer forma de comunicação como um e-mail encriptado ou uma chamada telefônica para trocar as impressões digitais.</string>
+    <string name="change_password">Alterar senha</string>
+    <string name="current_password">Senha atual</string>
+    <string name="new_password">Nova senha</string>
+    <string name="password_should_not_be_empty">A senha não deve estar vazia</string>
     <string name="perform_action_with">Realizar a ação com</string>
     <string name="no_affiliation">Sem afiliação</string>
     <string name="outcast">Banido</string>
@@ -319,26 +319,26 @@
     <string name="members_only">Privado, apenas membros</string>
     <string name="non_anonymous">Não-anónimo</string>
     <string name="moderated">Moderado</string>
-    <string name="you_are_not_participating">Não está a participar</string>
+    <string name="you_are_not_participating">Não está participando</string>
     <string name="never">Nunca</string>
     <string name="until_further_notice">Até segunda ordem</string>
     <string name="pref_input_options">Introdução</string>
-    <string name="pref_enter_is_send">O enter envia</string>
-    <string name="pref_enter_is_send_summary">Use o enter para enviar a mensagem</string>
-    <string name="pref_display_enter_key">Exibir tecla enter</string>
-    <string name="pref_display_enter_key_summary">Alterar a tecla dos emoticons para uma tecla enter</string>
+    <string name="pref_enter_is_send">O [enter] envia</string>
+    <string name="pref_enter_is_send_summary">Use o [enter] para enviar a mensagem</string>
+    <string name="pref_display_enter_key">Exibir tecla [enter]</string>
+    <string name="pref_display_enter_key_summary">Alterar a tecla dos emoticons para tecla [enter]</string>
     <string name="audio">áudio</string>
     <string name="video">vídeo</string>
     <string name="image">imagem</string>
     <string name="pdf_document">Documento PDF</string>
     <string name="apk">Aplicação Android</string>
-    <string name="vcard">Contacto</string>
+    <string name="vcard">Contato</string>
     <string name="touch_to_open_conversations">Toque para abrir Pix-Art Messenger</string>
     <string name="avatar_has_been_published">O avatar foi publicado!</string>
     <string name="sending_x_file">Enviando %s</string>
     <string name="offering_x_file">Oferecendo %s</string>
     <string name="hide_offline">Ocultar offline</string>
-    <string name="pref_chat_states">Notificações de escrita</string>
+    <string name="pref_chat_states">Notificações de mensagem</string>
     <string name="send_location">Enviar localização</string>
     <string name="show_location">Exibir localização</string>
     <string name="no_application_found_to_display_location">Não foi encontrada nenhuma aplicação para mostrar a localização</string>
@@ -361,16 +361,16 @@
     <string name="recently_used">Usados mais recentemente</string>
     <string name="choose_quick_action">Escolher ação rápida</string>
     <string name="send_private_message">Enviar mensagem privada</string>
-    <string name="username">Nome de utilizador</string>
-    <string name="username_hint">Nome de utilizador</string>
-    <string name="invalid_username">Este não é um nome de utilizador válido</string>
+    <string name="username">Usuário</string>
+    <string name="username_hint">Usuário</string>
+    <string name="invalid_username">Este não é um usuário válido</string>
     <string name="download_failed_server_not_found">Transferência falhou: Servidor não encontrado</string>
-    <string name="download_failed_file_not_found">Transferência falhou: Ficheiro não encontrado</string>
+    <string name="download_failed_file_not_found">Transferência falhou: Arquivo não encontrado</string>
     <string name="download_failed_could_not_connect">Transferência falhou: Não foi possível conectar ao host</string>
     <string name="account_status_tor_unavailable">Rede Tor indisponível</string>
     <string name="server_info_broken">Existe um problema</string>
-    <string name="pref_away_when_screen_off">Ausente quando o ecrã está desligado</string>
-    <string name="pref_away_when_screen_off_summary">Define o seu recurso como ausente quando o ecrã está desligado</string>
+    <string name="pref_away_when_screen_off">Ausente quando a tela está apagada</string>
+    <string name="pref_away_when_screen_off_summary">Define o seu recurso como ausente quando a tela está apagada</string>
     <string name="pref_treat_vibrate_as_silent">Tratar vibrar como modo silencioso</string>
     <string name="hostname_example">xmpp.exemplo.com</string>
     <string name="action_add_account_with_certificate">Adicionar conta com certificado</string>
@@ -388,9 +388,9 @@
     <string name="verified_omemo_key_with_certificate">A chave OMEMO foi verificada com o certificado!</string>
     <string name="device_does_not_support_certificates">O seu dispositivo não suporta a seleção de certificados de cliente!</string>
     <string name="account_settings_hostname">Hostname</string>
-    <string name="account_settings_port">Porto</string>
+    <string name="account_settings_port">Porta</string>
     <string name="hostname_or_onion">Servidor ou endereço .onion</string>
-    <string name="not_a_valid_port">Este não é um número de porto válido</string>
+    <string name="not_a_valid_port">Este não é um número de porta válida</string>
     <string name="not_valid_hostname">Este não é um hostname válido</string>
     <string name="connected_accounts">%1$d de %2$d contas conectadas</string>
     <plurals name="x_messages">
@@ -398,13 +398,13 @@
         <item quantity="other">%d mensagens</item>
     </plurals>
     <string name="load_more_messages">Carregar mais mensagens</string>
-    <string name="shared_file_with_x">Ficheiro partilhado com %s</string>
-    <string name="shared_image_with_x">Imagem partilhada com %s</string>
+    <string name="shared_file_with_x">Arquivo compartilhado com %s</string>
+    <string name="shared_image_with_x">Imagem compartilhada com %s</string>
     <string name="no_storage_permission">Pix-Art Messenger necessita de acesso ao armazenamento externo</string>
-    <string name="shared_images_with_x">Imagens partilhadas com %s</string>
-    <string name="shared_text_with_x">Mensagem partilhada com %s</string>
-    <string name="sync_with_contacts">Sincronizar com contactos</string>
-    <string name="sync_with_contacts_long">A aplicação Pix-Art Messenger deseja fazer a correspondência entre a sua lista de contactos XMPP e os seus contactos para mostrar os seus nomes completos e os seus avatares.\n\nA aplicação Pix-Art Messenger irá apenas ler os seus contactos e fazer a correspondência localmente sem enviar os dados para o seu servidor.\n\nIrá agora ser-lhe pedido para dar permissão para aceder aos seus contactos.</string>
+    <string name="shared_images_with_x">Imagens compartilhadas com %s</string>
+    <string name="shared_text_with_x">Mensagem compartilhada com %s</string>
+    <string name="sync_with_contacts">Sincronizar com contatos</string>
+    <string name="sync_with_contacts_long">A aplicação Pix-Art Messenger deseja fazer a correspondência entre a sua lista de contatos XMPP e os seus contatos para mostrar os seus nomes completos e os seus avatares.\n\nA aplicação Pix-Art Messenger irá apenas ler os seus contatos e fazer a correspondência localmente sem enviar os dados para o seu servidor.\n\nAgora será pedida permissão para acessar os seus contatos.</string>
     <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
     <string name="notify_never">Notificações desativadas</string>
     <string name="notify_paused">Notificações interrompidas</string>
@@ -412,18 +412,18 @@
     <string name="pref_picture_compression_summary">Redimensionar e comprimir fotografias</string>
     <string name="always">Sempre</string>
     <string name="battery_optimizations_enabled">Otimizações da bateria ativadas</string>
-    <string name="battery_optimizations_enabled_explained">O seu dispositivo está a fazer otimizações de bateria bastante agressivas na aplicação Pix-Art Messenger que poderão levar a notificações atrasadas ou até mesmo a perda de mensagens.\nÉ recomendado que as desative.</string>
-    <string name="battery_optimizations_enabled_dialog">O seu dispositivo está a fazer otimizações de bateria bastantes agressivas na aplicação Pix-Art Messenger que poderão levar a notificações atrasadas ou até mesmo perda de mensagens.\n\nIrá-lhe agora ser pedido para desativá-las.</string>
+    <string name="battery_optimizations_enabled_explained">O seu dispositivo está fazendo otimizações de bateria bastante agressivas na aplicação Pix-Art Messenger que poderão levar a notificações atrasadas ou até mesmo a perda de mensagens.\nÉ recomendado que desative.</string>
+    <string name="battery_optimizations_enabled_dialog">O seu dispositivo está fazendo otimizações de bateria bastantes agressivas na aplicação Pix-Art Messenger que poderão levar a notificações atrasadas ou até mesmo perda de mensagens.\n\nAgora será pedida permissão para desativá-las.</string>
     <string name="disable">Desativar</string>
-    <string name="selection_too_large">A área selecionada é demasiado grande</string>
+    <string name="selection_too_large">A área selecionada é muito grande</string>
     <string name="no_accounts">(Nenhuma conta ativada)</string>
     <string name="this_field_is_required">Este campo é obrigatório</string>
     <string name="correct_message">Corrigir mensagem</string>
     <string name="send_corrected_message">Enviar mensagem corrigida</string>
     <string name="this_account_is_disabled">Desativou esta conta</string>
-    <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="security_error_invalid_file_access">Erro de segurança: Acesso ao arquivo inválido</string>
+    <string name="no_application_to_share_uri">Não foi encontrada nenhuma aplicação para compartilhar o URI</string>
+    <string name="share_uri_with">Compartilhar URI com...</string>
     <string name="create_account">Criar conta</string>
     <string name="contact_is_typing">%s está a escrever...</string>
     <string name="pref_use_tor">Conectar via TOR</string>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index 75f7521d4..622d3e990 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -259,8 +259,6 @@
     <string name="pref_use_indicate_received_summary">Mesajele primite vor fi marcate cu o bifa verde, dacă este suportat</string>
     <string name="pref_use_send_button_to_indicate_status_summary">Colorează butonul de trimitere pentru a indica starea contactului</string>
     <string name="pref_expert_options_other">Altele</string>
-    <string name="pref_autojoin">Alătură-te automat discuțiilor de grup</string>
-    <string name="pref_autojoin_summary">Respectă setarea de alăturare automată la o discuție de grup conform semnului de carte</string>
     <string name="toast_message_otr_fingerprint">Amprentă OTR copiată în memorie!</string>
     <string name="toast_message_omemo_fingerprint">Amprentă OMEMO copiată în memorie!</string>
     <string name="conference_banned">V-a fost interzis accesul la această discuție de grup</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index f4703e8bb..f91147ede 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -274,8 +274,6 @@
     <string name="pref_use_send_button_to_indicate_status_summary">Раскрасить кнопку отсылки сообщений для индикации статуса контакта</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Раскрасить имена контактов для индикации статуса контакта</string>
     <string name="pref_expert_options_other">Другие</string>
-    <string name="pref_autojoin">Автоматически присоединяться к групповым чатам</string>
-    <string name="pref_autojoin_summary">Уважать флаг автовхода в закладках группового чата</string>
     <string name="toast_message_otr_fingerprint">OTR отпечаток был скопирован в буфер обмена!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO отпечаток был скопирован в буфер обмена!</string>
     <string name="conference_banned">Вы заблокированы в этом групповом чате</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 597d5cdcb..4a0720b41 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -271,8 +271,6 @@
     <string name="pref_use_send_button_to_indicate_status_summary">Kişi durumunu belirtmek için gönder butonunu renklendirin</string>
     <string name="pref_use_colored_names_to_indicate_status_summary">Kişi durumunu belirtmek için kişilerin adlarını renklendirin</string>
     <string name="pref_expert_options_other">Diğer</string>
-    <string name="pref_autojoin">Otomatik olarak grup sohbetine katılın</string>
-    <string name="pref_autojoin_summary">Grup sohbeti yer imlerindeki otomatik katılım bayrağına saygı duyun</string>
     <string name="toast_message_otr_fingerprint">OTR parmak izi panoya kopyalandı!</string>
     <string name="toast_message_omemo_fingerprint">OMEMO parmak izi Panoya kopyalandı!</string>
     <string name="conference_banned">Bu sohbet grubundan banlandınız</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
new file mode 100644
index 000000000..70489fbc5
--- /dev/null
+++ b/src/main/res/values-zh/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources></resources>