diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index b489574f0..5f265b491 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -9,6 +9,7 @@
   <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>
@@ -19,7 +20,7 @@
   <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_start_conversation">ابدأ محادثة</string>
   <string name="title_activity_choose_contact">إختيار جهة اتصال</string>
   <string name="title_activity_block_list">قائمة المحجوبين</string>
   <string name="just_now">الآن</string>
@@ -45,14 +46,14 @@
   <string name="register_account">تسجيل حساب جديد في سيرفر</string>
   <string name="change_password_on_server">تغيير كلمة المرور في سيرفر</string>
   <string name="share_with">مشاركة مع</string>
-  <string name="start_conversation">بدأ محادثة</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="delete">إحذف</string>
   <string name="block">حجب</string>
   <string name="unblock">الغاء حجب</string>
   <string name="save">حفظ</string>
@@ -75,12 +76,14 @@
   <string name="action_clear_history">حذف سجل المحفوظات</string>
   <string name="clear_conversation_history">حذف سجل المحفوظات للمحادثة</string>
   <string name="clear_histor_msg">هل ترغب بحذف جميع الرسائل في تلك المحادثة?\n\n<b>تنويه:</b> هذا لن يؤثر على الرسائل المخزنة على الأجهزة أو أي أماكن أخرى.</string>
-  <string name="delete_messages">حذف الرسائل</string>
+  <string name="delete_messages">إحذف الرسائل</string>
+  <string name="also_end_conversation">قم بإنهاء هذه المحادثة بعد ذلك</string>
   <string name="choose_presence">إختر جهازاً</string>
   <string name="send_unencrypted_message">إرسال رسالة غير مشفرة</string>
   <string name="send_message_to_x">إبعث رسالة إلى %s</string>
   <string name="send_otr_message">إرسال رسالة مشفرة عبر OTR</string>
   <string name="send_omemo_message">إرسال رسالة مشفرة عبر OMEMO</string>
+  <string name="send_omemo_x509_message">إبعث رسالة مشفَّرة بـ أومي مو OMEMO</string>
   <string name="send_pgp_message">إرسال رسالة مشفرة عبر OpenPGP</string>
   <string name="your_nick_has_been_changed">تم تغيير لقبك بنجاح</string>
   <string name="send_unencrypted">إرسال بدون تشفير</string>
@@ -98,6 +101,7 @@
   <string name="contacts_have_no_pgp_keys">Conversations::لا يستطيع تشفير الرساله\n\n<small>من فضلك أخبر صديقك بتنصيب تطبيق OpenPGP.</small></string>
   <string name="pref_general">عام</string>
   <string name="pref_xmpp_resource">الريسورس</string>
+  <string name="pref_xmpp_resource_summary">الإسم الذي يقوم جهازك بالتعريف عن نفسه</string>
   <string name="pref_accept_files">ضبط استقبال الملفات</string>
   <string name="pref_accept_files_summary">اقبل تلقائيا الملفات أقل من</string>
   <string name="pref_attachments">الملفات المرفقة</string>
@@ -109,23 +113,31 @@
   <string name="pref_vibrate_summary">إهتز عند وصول رسالة جديدة</string>
   <string name="pref_led">إشعار ضوئي</string>
   <string name="pref_sound">التنبيه الصوتي</string>
+  <string name="pref_sound_summary">أصدر صوتاً حال ما تصل رسالة جديدة</string>
   <string name="pref_advanced_options">متقدم</string>
   <string name="pref_never_send_crash">لا ترسل تقارير أخطاء</string>
   <string name="pref_never_send_crash_summary">الغاء ارسال تقارير الأخطاء يقلل من فرص حل المشكلة سريعا فكن متعاون</string>
   <string name="pref_confirm_messages">تأكيد الرسالة</string>
+  <string name="pref_confirm_messages_summary">دع مراسيلك يعرفون متى قد تلقيت و هل قرئت رسائلهم</string>
   <string name="pref_ui_options">واجهة المستخدم</string>
   <string name="accept">قبول</string>
   <string name="error">حدث خطأ ما</string>
   <string name="pref_grant_presence_updates">منح تحديثات الظهور</string>
+  <string name="subscriptions">الإشتراكات</string>
   <string name="your_account">حسابك</string>
   <string name="keys">مفاتيح</string>
   <string name="send_presence_updates">ارسال تحديثات الظهور</string>
+  <string name="receive_presence_updates">تحصل على تحديثات حالة الحضور</string>
+  <string name="ask_for_presence_updates">أطلب تحديثات حالة الحضور</string>
   <string name="attach_choose_picture">اختيار صورة</string>
   <string name="attach_take_picture">التقاط صورة</string>
+  <string name="error_not_an_image_file">الملف الذي حددته ليس صورة</string>
+  <string name="error_compressing_image">خطأ أثناء تحويل ملف الصورة</string>
   <string name="error_file_not_found">الملف غير موجود</string>
   <string name="account_status_unknown">غير معروف</string>
   <string name="account_status_disabled">معطلٌ موقتاً</string>
   <string name="account_status_online">متصل</string>
+  <string name="account_status_connecting">جاري الإتصال\u2026</string>
   <string name="account_status_offline">غير متصل</string>
   <string name="account_status_unauthorized">غير مصرح له</string>
   <string name="account_status_not_found">لا يمكن الاتصال بالسرفر</string>
@@ -134,12 +146,16 @@
   <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_security_error">خطأ أمني</string>
+  <string name="account_status_policy_violation">خرق للقواعد</string>
+  <string name="account_status_incompatible_server">لا يتوافق مع السيرفر</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="mgmt_account_edit">تعديل الحساب</string>
-  <string name="mgmt_account_delete">حذف الحساب</string>
+  <string name="mgmt_account_delete">إحذف الحساب</string>
+  <string name="mgmt_account_disable">عطل موقتاً</string>
   <string name="mgmt_account_publish_avatar">نشر الصورة الرمزية</string>
   <string name="mgmt_account_publish_pgp">أنشر المفتاح العمومي OpenPGP</string>
   <string name="openpgp_has_been_published">لقد تم نشر مفتاح OpenPGP العمومي.</string>
@@ -155,6 +171,8 @@
   <string name="confirm_password">تأكيد كلمة السر</string>
   <string name="passwords_do_not_match">كلمتي المرور غير متطابقتان</string>
   <string name="invalid_jid">حساب جابر غير صالح</string>
+  <string name="error_out_of_memory">خارج الذاكرة. الصورة كبيرة جدا</string>
+  <string name="add_phone_book_text">هل تود إضافة %s إلى سجل عناوينك ؟</string>
   <string name="contact_status_online">متصل</string>
   <string name="contact_status_free_to_chat">متاح للدردشة</string>
   <string name="contact_status_away">بعيد</string>
@@ -175,8 +193,11 @@
   <string name="last_seen_days">آخر ظهور منذ %d يوم</string>
   <string name="never_seen">لم يظهر متصلا حتى الآن</string>
   <string name="unknown_otr_fingerprint">بصمة OTR مجهولة</string>
+  <string name="openpgp_messages_found">تم العثور على رسائل مشفرة بال OpenPGP</string>
+  <string name="reception_failed">خطأ في التلقي</string>
   <string name="your_fingerprint">بصمتك</string>
   <string name="otr_fingerprint">بصمة OTR</string>
+  <string name="openpgp_key_id">معرف ID مفتاح ال OpenPGP</string>
   <string name="omemo_fingerprint">بصمة OMEMO</string>
   <string name="this_device_omemo_fingerprint">بصمة OMEMO الخاصة بك</string>
   <string name="other_devices">أجهزة أخرى</string>
@@ -187,7 +208,7 @@
   <string name="search">بحث</string>
   <string name="create_contact">اضافة جهة اتصال</string>
   <string name="join_conference">دخول الغرف</string>
-  <string name="delete_contact">حذف جهة اتصال</string>
+  <string name="delete_contact">إحذف جهة اتصال</string>
   <string name="view_contact_details">عرض بيانات جهة الاتصال</string>
   <string name="block_contact">حجب جهة اتصال</string>
   <string name="unblock_contact">الغاء حجب جهة اتصال</string>
@@ -195,8 +216,9 @@
   <string name="contact_already_exists">جهة الاتصال موجودة لديك مسبقا</string>
   <string name="join">دخول</string>
   <string name="conference_address">الاسم الكامل لغرفة المحادثة</string>
+  <string name="conference_address_example">room@conference.example.com/nick</string>
   <string name="save_as_bookmark">حفظ بالمفضلة</string>
-  <string name="delete_bookmark">حذف من المفضلة</string>
+  <string name="delete_bookmark">إحذف من المفضلة</string>
   <string name="bookmark_already_exists">موجوده بالمفضلة سابقا</string>
   <string name="you">انت</string>
   <string name="action_edit_subject">تعديل موضوع الغرفة</string>
@@ -206,6 +228,7 @@
   <string name="contact_added_you">جهة اتصال أضافتك </string>
   <string name="publish">نشر</string>
   <string name="publishing">نشر ...</string>
+  <string name="private_message">همس</string>
   <string name="private_message_to">الى %s</string>
   <string name="send_private_message_to">ارسال رسالة خاصة الى %s</string>
   <string name="connect">اتصال</string>
@@ -220,10 +243,15 @@
   <string name="conference_requires_password">الغرفة تطلب كلمة مرور</string>
   <string name="enter_password">أدخل كلمة المرور</string>
   <string name="request_now">اطلب الآن</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_force_encryption">أجبر التشفير لكلا الطرفين</string>
+  <string name="pref_allow_message_correction">السماح بمراجعة الرسالة</string>
   <string name="pref_dont_save_encrypted">لا تقم بالاحتفاظ بالرسائل المشفرة</string>
   <string name="pref_expert_options">إعدادات متقدمة</string>
+  <string name="pref_expert_options_summary">كن حذراً مع هذه من فضلك</string>
   <string name="title_activity_about">حول برنامج المحادثات Conversations</string>
   <string name="pref_about_conversations_summary">معلومات حول التطبيق و الرخصة</string>
   <string name="title_pref_quiet_hours">ساعات السكون</string>
@@ -240,12 +268,21 @@
   <string name="conference_banned">أنت مفصول في هذه الغرفة</string>
   <string name="conference_members_only">هذه الغرفة للأعضاء فقط</string>
   <string name="conference_kicked">تم طردك من الغرفة</string>
+  <string name="using_account">أنت تستعمل حساب %s</string>
   <string name="not_connected_try_again">انقطع الإتصال .. حاول مرة أخرى</string>
   <string name="message_options">خيارات الرساله</string>
   <string name="copy_text">نسخ النص</string>
   <string name="select_text">حدد النص</string>
+  <string name="quote">إقتبس</string>
+  <string name="copy_original_url">أنسخ الرابط الأصلي</string>
+  <string name="send_again">أعد الإرسال</string>
+  <string name="file_url">رابط الملف</string>
   <string name="message_text">نص الرسالة</string>
   <string name="url_copied_to_clipboard">تم نسخ الرابط إلى الحافظة</string>
+  <string name="message_copied_to_clipboard">تم نسخ الرسالة إلى الحافظة</string>
+  <string name="image_transmission_failed">لقد أخفق إرسال الصورة</string>
+  <string name="scan_qr_code">إمسح شفرة التّعرّف 2D</string>
+  <string name="show_qr_code">أظهر شفرة التّعرّف 2D</string>
   <string name="account_details">تفاصيل الحساب</string>
   <string name="verify_otr">التحقق من OTR</string>
   <string name="scan">سكان</string>
@@ -262,6 +299,7 @@
   <string name="choose_file">اختيار ملف</string>
   <string name="receiving_x_file">اكتمل الإستلام %1$s (%2$d%% بنسبة)</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="sending_file">إكتمل الإرسال (%1$d%% بنسبة)</string>
@@ -269,7 +307,7 @@
   <string name="x_file_offered_for_download">%s عرض وتنزيل</string>
   <string name="cancel_transmission">الغاء الارسال</string>
   <string name="file_transmission_failed">تعذر ارسال الملف</string>
-  <string name="file_deleted">تم مسح الملف</string>
+  <string name="file_deleted">تم حذف الملف</string>
   <string name="no_application_found_to_open_file">لا يوجد تطبيق متاح لعرض الملف</string>
   <string name="could_not_verify_fingerprint">لا يمكن التحقق من البصمة</string>
   <string name="manually_verify">التحقق يدوياً</string>
@@ -300,12 +338,13 @@
   <string name="manual_verification_explanation">بعناية قارن بين بصمتك المعروضه أدناه وبصمة جهات اتصالك\n يمكنك استخدام أي شكل موثوق به للاتصال مثل بريد إلكتروني مشفر أو مكالمة هاتفية لتبادلها.</string>
   <string name="change_password">تغيير كلمة المرور</string>
   <string name="current_password">كلمة المرور الحالية</string>
-  <string name="new_password">كلمة مرور جديدة</string>
+  <string name="new_password">كلمة المرور الجديدة</string>
   <string name="password_should_not_be_empty">لا يمكن لكلمة المرور أن تبقى فارغةً</string>
   <string name="enable_all_accounts">تفعيل كل الحسابات</string>
   <string name="disable_all_accounts">تعطيل كل الحسابات</string>
   <string name="perform_action_with">تنفيذ الإجراء مع</string>
   <string name="no_affiliation">زائر</string>
+  <string name="no_role">غير متصل</string>
   <string name="outcast">مفصول</string>
   <string name="member">عضو</string>
   <string name="advanced_mode">الوضع المتقدم</string>
@@ -322,7 +361,9 @@
   <string name="public_conference">الدخول إلى الغرفة متاح للجميع</string>
   <string name="private_conference">خاصٌ بأعضاء الغرفة فقط</string>
   <string name="conference_options">اعدادت المؤتمر</string>
+  <string name="members_only">سرِّي ، للأعضاء فقط</string>
   <string name="non_anonymous">لا تسمح للمجهولين بالدخول</string>
+  <string name="moderated">تحت الرقابة</string>
   <string name="modified_conference_options">تم تعديل اعدادات المؤتمر!</string>
   <string name="could_not_modify_conference_options">لا يمكن تعديل اعدادات المؤتمر</string>
   <string name="never">أبداً</string>
@@ -349,10 +390,17 @@
   <string name="offering_x_file">عرض %s</string>
   <string name="hide_offline">اخفاء غير المتصلين</string>
   <string name="disable_account">ايقاف الحساب</string>
+  <string name="send_location">إرسل موقعك</string>
+  <string name="show_location">أظهر الموقع</string>
+  <string name="location">الموقع</string>
+  <string name="title_undo_swipe_out_muc">خرج من المكالمة الجماعية</string>
   <string name="pref_remove_trusted_certificates_title">حذف شهادات</string>
+  <string name="dialog_manage_certs_title">إحذف الشهادات</string>
+  <string name="dialog_manage_certs_positivebutton">قم بحذف المختارة</string>
   <string name="dialog_manage_certs_negativebutton">الغاء</string>
   <string name="pref_quick_action_summary">إستبدال زر الارسال بحركة سريعة</string>
   <string name="pref_quick_action">حركة سريعة</string>
+  <string name="none">لا شيء</string>
   <string name="choose_quick_action">إختر حركة سريعة</string>
   <string name="search_for_contacts_or_groups">إبحث عن أصدقاء أو مجموعات</string>
   <string name="send_private_message">إبعث برسالة على الخاص</string>
@@ -361,38 +409,59 @@
   <string name="username_hint">إسم المستخدم</string>
   <string name="invalid_username">إسم المستخدم هذا ليس صالحاً</string>
   <string name="conference_name">إسم غرفة المحادثة</string>
+  <string name="pref_use_white_background">إستخدم خلفية بيضاء اللون</string>
   <string name="account_status_tor_unavailable">شبكة طور غير متاحة</string>
+  <string name="account_status_host_unknown">هذا السيرفر غير مسؤول عن إسم النطاق</string>
+  <string name="server_info_broken">مكسر</string>
   <string name="pref_presence_settings">الحضور</string>
   <string name="hostname_example">xmpp.example.com</string>
   <string name="action_add_account_with_certificate">أضف حساباً مرفوقاً بشهادة</string>
+  <string name="mam_prefs">إعدادت الأرشيف</string>
   <string name="captcha_required">رمز الكابتشا ضروري</string>
   <string name="captcha_hint">قم بإدخال الرموز المتواجدة في الصورة</string>
+  <string name="jid_does_not_match_certificate">معرف ID جابر لا يتطابق مع الشهادة</string>
   <string name="action_renew_certificate">تجديد الشهادة</string>
   <string name="pref_connection_options">الإتصال</string>
   <string name="pref_use_tor">الإتصال عبر شبكة طور Tor</string>
   <string name="pref_use_tor_summary">تمرير كافة الاتصالات عبر شبكة تور. يتطلب أوربوت Orbot</string>
   <string name="account_settings_hostname">إسم المضيف</string>
   <string name="account_settings_port">المنفذ</string>
+  <string name="hostname_or_onion">خادوم أو عنوان .onion</string>
+  <string name="not_a_valid_port">هذا ليس برقم منفذٍ صالح</string>
+  <string name="load_more_messages">أظهر أكثر</string>
   <string name="certificate_information">معلومات حول الشهادة</string>
   <string name="certificate_subject">الموضوع</string>
   <string name="certificate_issuer">المصدر</string>
   <string name="certificate_o">المنظمة</string>
   <string name="certificate_sha1">SHA-1</string>
+  <string name="certicate_info_not_available">(غير متاح)</string>
+  <string name="certificate_not_found">لم يتم العثور على أية شهادة</string>
   <string name="notify_on_all_messages">اخبرني عند وصول أية رسالة</string>
   <string name="notify_never">الاشعارات معطلة</string>
   <string name="pref_picture_compression">ضغط الصور</string>
   <string name="pref_picture_compression_summary">تغيير حجم الصور وضغطها</string>
   <string name="always">دائماً</string>
   <string name="automatically">آليا</string>
+  <string name="disable">تعطيل</string>
   <string name="no_accounts">)ليس هناك أي حساب مفعل(</string>
   <string name="this_field_is_required">هذه الخانة مطلوبة</string>
+  <string name="correct_message">صَحِّح الرسالة</string>
+  <string name="send_corrected_message">إبعث الرسالةَ مُصححة</string>
+  <string name="select_image_and_crop">إختر صورة ثم قم بقصها</string>
   <string name="this_account_is_disabled">لقد قمت بتعطيل هذا الحساب</string>
+  <string name="share_uri_with">شارك الرابط مع ...</string>
   <string name="welcome_text">XMPP هو مزود بروتوكول مستقل. يمكنك استخدام هذا العميل مع أي خادم إكس أم بي بي اخترته. و لراحتك جعلنا من السهل إنشاء حساب على conversations.im¹؛ مزود خدمة يتناسب خصيصا للاستخدام مع تطبيق المحادثات Conversations.</string>
   <string name="your_full_jid_will_be">سوف تكون هويتك الكاملة على جابر كالتالي : %s</string>
   <string name="create_account">إنشاء حساب</string>
   <string name="use_own_provider">إستخدم مزودي الخاص</string>
   <string name="pick_your_username">إختر إسم المستخدم</string>
+  <string name="pref_manually_change_presence">غيِّر يدويًا صفة الحضور</string>
+  <string name="change_presence">تعديل الحضور</string>
+  <string name="status_message">حالة الرسالة</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="show_password">إظهار كلمة المرور</string>
   <string name="registration_please_wait">فشل تسجيل الحساب : حاول مرةً أخرى لاحقاً</string>
@@ -402,23 +471,50 @@
   <string name="conference_subject">الموضوع</string>
   <string name="choose_participants">إختر المشاركين</string>
   <string name="creating_conference">جاري إنشاء المحادثة ...</string>
+  <string name="invite_again">أعد إرسال الدعوة</string>
+  <string name="gp_short">قصير</string>
+  <string name="gp_medium">متوسط</string>
+  <string name="gp_long">طويل</string>
   <string name="pref_privacy">الخصوصية</string>
   <string name="pref_theme_options">السمة</string>
+  <string name="pref_theme_options_summary">إختر اللون المناسب</string>
   <string name="pref_theme_light">سمة فاتحة</string>
   <string name="pref_theme_dark">سمة مظلمة</string>
   <string name="pref_use_green_background">خلفية خضراء</string>
+  <string name="pref_use_green_background_summary">إستخدم خلفية خضراء للرسائل المُستَلَمة</string>
   <string name="type_pc">كمبيوتر</string>
   <string name="type_phone">هاتف نقال</string>
   <string name="type_tablet">لوحة مفاتيحية</string>
   <string name="type_web">متصفح الواب</string>
   <string name="payment_required">مطلوب منك الدفع</string>
   <string name="me">أنا</string>
+  <string name="allow">إسمح</string>
   <string name="unable_to_update_account">لا يمكن تحديث الحساب</string>
   <string name="this_conference_has_no_members">لا يتواجد أي عضوٍ في هذه غرفة المحادثة هذه</string>
+  <string name="pref_delete_omemo_identities">إحذف تعريفات أو مي مو OMEMO</string>
+  <string name="delete_selected_keys">إحذف المفاتيح المختارة</string>
+  <string name="show_error_message">أظهر رسالة الخطأ</string>
+  <string name="error_message">رسالة خطأ</string>
   <string name="copy_fingerprint">انسخ البصمة</string>
   <string name="all_omemo_keys_have_been_verified">لقد تم التحقق من جميع مفاتيح OMEMO</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">لا تحتوي شفرة التّعرّف على بصمات لهذه المحادثة</string>
+  <string name="verified_fingerprints">البصمات المصادق عليها</string>
+  <string name="use_camera_icon_to_scan_barcode">إستخدم آلة التصوير لمسح شفرة التعرف على مراسلك</string>
   <string name="share_as_barcode">شاركه كشَفْرة خَيْطيّة</string>
   <string name="share_as_uri">شاركه كعنوان XMPP</string>
   <string name="share_as_http">شاركه كرابط HTTP</string>
   <string name="not_trusted">غير موثوق بها</string>
+  <string name="invalid_barcode">الشفْرة الخيْطيّة خاطئة</string>
+  <string name="pref_clean_cache">تفريغ الذاكرة الوسيطة</string>
+  <string name="pref_clean_private_storage">تفريغ مساحة التخرين الخاصة</string>
+  <string name="verify_omemo_keys">قم بفحص مفاتيح أو مي مو OMEMO</string>
+  <string name="show_inactive_devices">أظهر الأجهزة المعطلة</string>
+  <string name="hide_inactive_devices">قم بإخفاء الأجهزة المعطلة</string>
+  <string name="timeout_24_hours">24 ساعة</string>
+  <string name="timeout_7_days">7 أيام</string>
+  <string name="timeout_30_days">30 يوماً</string>
+  <string name="timeout_6_months">6 أشهر</string>
+  <string name="pref_automatically_delete_messages">الحذف الآلي للرسائل</string>
+  <string name="encrypting_message">تشفير الرسالة</string>
+  <string name="transcoding_video_progress">جاري ضغط الفيديو (%s%% تم)</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c10d47bf4..b5f82f04a 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -74,7 +74,7 @@
   <string name="preparing_images">Bilder werden für Übertragung vorbereitet</string>
   <string name="sharing_files_please_wait">Teile Dateien. Bitte warten…</string>
   <string name="action_clear_history">Verlauf löschen</string>
-  <string name="clear_conversation_history">Verlauf löschen</string>
+  <string name="clear_conversation_history">Unterhaltungsverlauf löschen</string>
   <string name="clear_histor_msg">Möchtest du alle Nachrichten in dieser Unterhaltung löschen?\n\n<b>Achtung:</b> Dies beeinflusst nicht Nachrichten, die auf anderen Geräten oder Servern gespeichert sind.</string>
   <string name="delete_messages">Nachrichten löschen</string>
   <string name="also_end_conversation">Diese Unterhaltung danach beenden</string>
@@ -294,7 +294,7 @@
   <string name="pref_force_encryption">Ende-zu-Ende-Verschlüsselung erzwingen</string>
   <string name="pref_force_encryption_summary">Nachrichten immer verschlüsseln (außer für Konferenzen)</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 das nachträgliche Korrigieren ihrer Nachrichten</string>
   <string name="pref_dont_save_encrypted">Verschlüsselte Nachrichten nicht speichern</string>
   <string name="pref_dont_save_encrypted_summary">Achtung: kann zu Nachrichtenverlust führen</string>
   <string name="pref_expert_options">Experteneinstellungen</string>
@@ -349,12 +349,12 @@
   <string name="scan">Scannen</string>
   <string name="smp">Socialist Millionaire Protocol</string>
   <string name="shared_secret_hint">Hinweis oder Frage</string>
-  <string name="shared_secret_secret">Gemeinsamer Schlüssel</string>
+  <string name="shared_secret_secret">Gemeinsames Geheimnis</string>
   <string name="confirm">Bestätigen</string>
   <string name="in_progress">In Bearbeitung</string>
   <string name="respond">Antworten</string>
   <string name="failed">Fehlgeschlagen</string>
-  <string name="secrets_do_not_match">Schlüssel stimmen nicht überein</string>
+  <string name="secrets_do_not_match">Geheimnis stimmt nicht überein</string>
   <string name="try_again">Erneut versuchen</string>
   <string name="finish">Fertig</string>
   <string name="verified">Überprüft!</string>
@@ -388,7 +388,7 @@
   <string name="conference_with">Konferenz erstellen mit…</string>
   <string name="no_conference_server_found">Kein Konferenzserver gefunden</string>
   <string name="conference_creation_failed">Erstellen der Konferenz fehlgeschlagen!</string>
-  <string name="secret_accepted">Schlüssel akzeptiert!</string>
+  <string name="secret_accepted">Geheimnis akzeptiert!</string>
   <string name="reset">Zurücksetzen</string>
   <string name="account_image_description">Konto-Avatar</string>
   <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string>
@@ -410,7 +410,7 @@
   <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 Geheimnisses ü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="shared_secret_can_not_be_empty">Dein gemeinsamer Schlüssel darf nicht leer sein</string>
+  <string name="shared_secret_can_not_be_empty">Dein gemeinsames Geheimnis 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>
   <string name="current_password">Aktuelles Passwort</string>
@@ -696,7 +696,7 @@
   <string name="timeout_30_days">30 Tage</string>
   <string name="timeout_6_months">6 Monate</string>
   <string name="pref_automatically_delete_messages">Automatische Nachrichtenlöschung</string>
-  <string name="pref_automatically_delete_messages_description">Lösche Nachrichten automatisch, wenn diese älter sind als die eingestellte Zeit.</string>
+  <string name="pref_automatically_delete_messages_description">Lösche Nachrichten automatisch, wenn diese älter als die eingestellte Zeit sind.</string>
   <string name="encrypting_message">Nachricht wird verschlüsselt</string>
   <string name="not_fetching_history_retention_period">Nachrichten werden aufgrund der eingestellten lokalen Speicherfrist nicht abgerufen. </string>
   <string name="transcoding_video_progress">Video wird komprimiert (%s%% abgeschlossen)</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 8d4670e61..000a8066b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -573,7 +573,7 @@
   <string name="certicate_info_not_available">(No disponible)</string>
   <string name="certificate_not_found">Certificado no encontrado</string>
   <string name="notify_on_all_messages">Notificar para todos los mensajes</string>
-  <string name="notify_only_when_highlighted">Notificar solo cuando se recibe un mensjae resaltado</string>
+  <string name="notify_only_when_highlighted">Notificar solo cuando se recibe un mensaje resaltado</string>
   <string name="notify_never">Notificaciones deshabilitadas</string>
   <string name="notify_paused">Notificaciones pausadas</string>
   <string name="pref_picture_compression">Comprimir imágenes</string>
@@ -698,5 +698,6 @@
   <string name="pref_automatically_delete_messages">Borrado automático de mensajes</string>
   <string name="pref_automatically_delete_messages_description">Automáticamente borrar mensajes del dispositivo más antiguos que el configurado en el marco de tiempo.</string>
   <string name="encrypting_message">Cifrando mensaje</string>
+  <string name="not_fetching_history_retention_period">No buscar mensajes más antiguos que el establecido en el marco de tiempo.</string>
   <string name="transcoding_video_progress">Comprimiendo vídeo (%s%% completado)</string>
 </resources>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index c97a70e63..be458ab80 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -268,7 +268,7 @@
   <string name="error_saving_avatar">Ezin izan da profileko argazkia diskoan gorde</string>
   <string name="or_long_press_for_default">(Edo sakatu luze lehenetsira bueltatzeko)</string>
   <string name="error_publish_avatar_no_server_support">Zure zerbitzariak ez du profileko argazkien argitarapena onartzen</string>
-  <string name="private_message">xuxurlatu</string>
+  <string name="private_message">xuxurlatu du</string>
   <string name="private_message_to">%s(r)i</string>
   <string name="send_private_message_to">%s(r)i mezu pribatua bidali</string>
   <string name="connect">Konektatu</string>
@@ -576,8 +576,8 @@
   <string name="notify_only_when_highlighted">Jakinarazi nabarmentzerakoan soilik</string>
   <string name="notify_never">Jakinarazpenak ezgaituta</string>
   <string name="notify_paused">Jakinarazpenak gelditu dira</string>
-  <string name="pref_picture_compression">Irudiak konprimitu</string>
-  <string name="pref_picture_compression_summary">Irudiak konprimitu eta neurriz aldatu</string>
+  <string name="pref_picture_compression">Irudiak konprimatu</string>
+  <string name="pref_picture_compression_summary">Irudiak konprimatu eta neurriz aldatu</string>
   <string name="always">Beti</string>
   <string name="automatically">Automatikoki</string>
   <string name="battery_optimizations_enabled">Bateriaren optimizazioak gaituta</string>
@@ -698,5 +698,6 @@
   <string name="pref_automatically_delete_messages">Mezuen ezabatze automatikoa</string>
   <string name="pref_automatically_delete_messages_description">Ezarritako denbora tartea baino zaharragoak diren mezuak gailu honetatik automatikoki ezabatu.</string>
   <string name="encrypting_message">Mezua enkriptatzen</string>
+  <string name="not_fetching_history_retention_period">Mezurik ez eskuratzen gelditze tarte lokalarengatik.</string>
   <string name="transcoding_video_progress">Bideoa konprimatzen (%s%% osatua)</string>
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 32041187e..df16bd8f3 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -59,6 +59,7 @@
   <string name="save">Mentés</string>
   <string name="ok">Rendben</string>
   <string name="crash_report_title">Conversations összeomlott</string>
+  <string name="crash_report_message">Veremkövetések beküldésével segítesz a Conversations folyamatos fejlesztésében\n&lt;b&gt;Figyelem:&lt;/ b&gt; Ez a XMPP fiókodat fogja használni az adatküldéshez.</string>
   <string name="send_now">Elküldi most</string>
   <string name="send_never">Ne kérdezze többször</string>
   <string name="problem_connecting_to_account">Nem sikerül a fiókhoz csatlakozni</string>
@@ -88,13 +89,15 @@
   <string name="send_unencrypted">Küldés titkosítás nélkül</string>
   <string name="decryption_failed">Dekódolás nem sikerült. Lehet, hogy nincs megfelelő személyes kulcsod?</string>
   <string name="openkeychain_required">OpenKeychain</string>
+  <string name="openkeychain_required_long">A Conversations egy harmadik fél által biztosított alkalmazást használ: <b>OpenKeychain</b> arra, hogy titkosítsa az üzeneteket és kezelje a publikus kulcsokat.n\nAz OpenKeychain GPLv3 engedélyes és letölthető az F-Droid-ról és a Google Play-ről.\n\n<small>(Kérjük, indítsa újra a Conversations programot ezután.)</small></string>
   <string name="restart">Újrakezd</string>
   <string name="install">Telepít</string>
   <string name="openkeychain_not_installed">Kérlek telepítsd az OpenKeychain-t</string>
-  <string name="offering">megkisérli...</string>
+  <string name="offering">felajánlás alatt...</string>
   <string name="waiting">várakozik...</string>
   <string name="no_pgp_key">Nem talált OpenPGP kulcsot</string>
   <string name="no_pgp_keys">Nem talált OpenPGP kulcsokat</string>
+  <string name="contacts_have_no_pgp_keys">A Conversations nem képes titkosítani az üzeneteket, mert az ismerősei nem jelentik be a nyilvános kulcsaikat.\n\n<small> Kérje meg az ismerőseit, hogy állítsák be az OpenPGP-t.</small></string>
   <string name="pref_general">Általános</string>
   <string name="pref_xmpp_resource">XMPP erőforrás</string>
   <string name="pref_xmpp_resource_summary">A név amivel a kliens azonosítja magát</string>
@@ -311,11 +314,23 @@
   <string name="pref_conference_name_summary">A chat szoba tárgyát használja a JID helyett azonosításra </string>
   <string name="pref_autojoin">Automatikus csatlakozás konferenciákhoz </string>
   <string name="pref_autojoin_summary">Tartsa tiszteletben az automata csatlakozás beállítást a konferencia könyvjelzőkben</string>
+  <string name="conference_banned">Ki vagy tiltva ebből a konferenciából</string>
+  <string name="conference_members_only">Ez a konferencia csak tagoknak szól</string>
+  <string name="conference_shutdown">A konferencia le lett állítva</string>
+  <string name="conference_unknown_error">Ön már nincs benne ebben a konferenciában</string>
   <string name="using_account">használt fiók: %s</string>
+  <string name="not_connected_try_again">Nem kapcsolódik. Próbálja újra később</string>
   <string name="message_options">Műveletek üzenetekkel</string>
   <string name="copy_text">Szöveg másolása</string>
   <string name="select_text">Szöveg kijelölése</string>
+  <string name="quote">Idéz</string>
+  <string name="copy_original_url">Eredeti URL másolása</string>
   <string name="send_again">Elküldi újra</string>
+  <string name="file_url">Fájl URL-je</string>
+  <string name="message_text">Üzenet szövege</string>
+  <string name="url_copied_to_clipboard">URL a vágólapra másolva</string>
+  <string name="message_copied_to_clipboard">Üzenet a vágólapra másolva</string>
+  <string name="image_transmission_failed">Képátvitel sikertelen</string>
   <string name="scan_qr_code">2D vonalkód olvasás</string>
   <string name="show_qr_code">2D vonalkód mutatása</string>
   <string name="show_block_list">Tiltólista mutatása</string>
@@ -430,9 +445,20 @@
   <string name="pref_remove_trusted_certificates_summary">Törölje a kézzel jóváhagyott tanúsítványokat</string>
   <string name="toast_no_trusted_certs">Nincs kézzel jóváhagyott tanúsítvány</string>
   <string name="dialog_manage_certs_title">Tanúsítványok eltávolítása</string>
+  <string name="dialog_manage_certs_positivebutton">Kiválasztás törlése</string>
   <string name="dialog_manage_certs_negativebutton">Mégse</string>
+  <plurals name="toast_delete_certificates">
+    <item quantity="one">%d tanúsítvány törölve</item>
+    <item quantity="other">%d tanúsítvány törölve</item>
+  </plurals>
+  <plurals name="select_contact">
+    <item quantity="one">%d névjegy kiválasztása</item>
+    <item quantity="other">%d névjegy kiválasztása</item>
+  </plurals>
   <string name="pref_quick_action_summary">Küldés gomb helyett választott funkciógomb</string>
   <string name="pref_quick_action">Gyors gomb</string>
+  <string name="none">Semmi</string>
+  <string name="recently_used">Legutóbb használt</string>
   <string name="choose_quick_action">Gyors gomb funkciója</string>
   <string name="search_for_contacts_or_groups">Keresés a címek között</string>
   <string name="send_private_message">Privát üzenet küldése</string>
@@ -442,7 +468,16 @@
   <string name="invalid_username">Ez nem egy érvényes felhasználónév</string>
   <string name="conference_name">Konferencia neve</string>
   <string name="invalid_conference_name">Nem létezik ez a nevű konferencia</string>
+  <string name="download_failed_server_not_found">Letöltés sikertelen: A kiszolgáló nem található</string>
+  <string name="download_failed_file_not_found">Letöltés sikertelen: A fájl nem található</string>
+  <string name="download_failed_could_not_connect">Letöltés sikertelen: Nem sikerült csatlakozni a fogadó félhez</string>
+  <string name="download_failed_could_not_write_file">Letöltés sikertelen: a fájl írása meghiúsult</string>
+  <string name="pref_use_white_background">Fehér háttér használata</string>
+  <string name="pref_use_white_background_summary">A kapott üzenetek fekete szövegként, fehér alapon jelenjenek meg</string>
   <string name="account_status_tor_unavailable">A Tor hálózat nem érhető el</string>
+  <string name="account_status_bind_failure">Bind hiba</string>
+  <string name="account_status_host_unknown">A szerver nem felel a domain-ért</string>
+  <string name="server_info_broken">Hibás</string>
   <string name="pref_presence_settings">Jelenlét</string>
   <string name="pref_away_when_screen_off">\"Távol\" állapot lezárt telefonnál</string>
   <string name="pref_away_when_screen_off_summary">Kikapcsolt képernyőnél a neved alatt egy \"távol\" címke látható</string>
@@ -457,23 +492,77 @@
   <string name="server_side_mam_prefs">Szerveroldali mentés beállításai</string>
   <string name="fetching_mam_prefs">Archiválási beállítások betöltése. Kérem várjon...</string>
   <string name="unable_to_fetch_mam_prefs">Nem lehet az archiválási beállításokat betölteni</string>
+  <string name="captcha_required">Captcha szükséges</string>
+  <string name="pref_connection_options">Kapcsolat</string>
   <string name="pref_use_tor">Kapcsolódás a Tor hálózatán keresztül</string>
   <string name="pref_use_tor_summary">Minden kapcsolat átvezetése a Tor hálózatán. Szükséges hozzá az Orbot</string>
+  <string name="account_settings_hostname">Hostnév</string>
+  <string name="account_settings_port">Port</string>
+  <plurals name="x_messages">
+    <item quantity="one">%d üzenet</item>
+    <item quantity="other">%d üzenet</item>
+  </plurals>
+  <string name="load_more_messages">További üzenetek betöltése</string>
+  <string name="shared_file_with_x">%s partnerrel fájlt osztott meg</string>
+  <string name="shared_image_with_x">%s partnerrel képet osztott meg</string>
+  <string name="shared_images_with_x">%s partnerrel képeket osztott meg</string>
+  <string name="shared_text_with_x">%s partnerrel szöveget osztott meg</string>
   <string name="no_storage_permission">A Conversations-nek hozzáférést kell biztosítani a külső tárhelyhez</string>
+  <string name="sync_with_contacts">Szinkronizáljon a névjegyekkel</string>
+  <string name="sync_with_contacts_long">A Conversations szeretné megfeleltetni az XMPP névsort a névjegyeivel, hogy megmutassa a teljes nevet és arcképet.\n\nA Conversations csak olvassa a névjegyeit és helyileg felelteti meg őket anélkül, hogy feltöltené azokat a szerverre.\n\nMost meg lesz kérdezve, hogy engedélyezi-e a névjegyekhez való hozzáférést.</string>
   <string name="certicate_info_not_available">(Nem elérhető)</string>
+  <string name="certificate_not_found">Nem talált tanúsítványt</string>
+  <string name="notify_on_all_messages">Értesítsen minden üzenetnél</string>
+  <string name="notify_only_when_highlighted">Akkor értesítsen csak ha kiemelt</string>
+  <string name="notify_never">Értesítések letiltva</string>
+  <string name="notify_paused">Értesítések szüneteltetve</string>
   <string name="pref_picture_compression">Képek tömörítése</string>
   <string name="pref_picture_compression_summary">Átméretezi és tömöríti a képeket</string>
-  <string name="automatically">Automata</string>
+  <string name="always">Mindig</string>
+  <string name="automatically">Automatikusan</string>
+  <string name="battery_optimizations_enabled">Akkumulátor optimalizációk engedélyezve</string>
+  <string name="battery_optimizations_enabled_explained">A készülék erős akkumulátor optimalizálást végez a Conversations programon, ami késleltetett értesítésekhez, vagy akár üzenetet elvesztéséhet is vezethet.\nJavasolt kikapcsolni ezeket az optimalizálásokat.</string>
+  <string name="battery_optimizations_enabled_dialog">A készülék erős akkumulátor optimalizálást végez a Conversations programon, ami késleltetett értesítésekhez, vagy akár üzenetet elvesztéséhet is vezethet.\nMost meg lesz kérve arra, hogy tiltsa le azokat.</string>
+  <string name="disable">Letilt</string>
+  <string name="selection_too_large">A kiválasztott terület túl nagy</string>
+  <string name="no_accounts">(Nincs aktivált fiók)</string>
+  <string name="this_field_is_required">Ez a mező kötelező</string>
   <string name="correct_message">Üzenet szerkesztése</string>
   <string name="send_corrected_message">Kijavított üzenet küldése</string>
+  <string name="select_image_and_crop">Válassza ki a képet és vágja körbe</string>
+  <string name="this_account_is_disabled">Letiltotta ezt a fiókot</string>
+  <string name="security_error_invalid_file_access">Biztonsági hiba: Érvénytelen fájl hozzáférés</string>
   <string name="no_application_to_share_uri">Nem találtunk URI-t használó alkalmazást</string>
   <string name="share_uri_with">Megosztás URI-ként</string>
+  <string name="magic_create_text">Végigvezetjük a fiók létrehozás folyamatán a conversations.im-en.¹ \ nHa a conversations.im-et választja szolgáltatójának, akkor képes lesz kommunikálni a más szolgáltatóknál lévő felhasználókkal, ha megadja nekik a teljes Jabber ID-jét.</string>
+  <string name="your_full_jid_will_be">A teljes Jabber ID-d ez lesz: %s</string>
+  <string name="create_account">Fiók létrehozása</string>
+  <string name="use_own_provider">Saját szolgáltató használata</string>
+  <string name="pick_your_username">Válassz felhasználónevet</string>
   <string name="pref_manually_change_presence">Manuális jelenlét beállítás</string>
   <string name="pref_manually_change_presence_summary">Érintsd meg a képed a jelenlét megváltoztatásához</string>
   <string name="change_presence">Jelenlét megváltoztatása</string>
+  <string name="status_message">Állapotüzenet</string>
+  <string name="all_accounts_on_this_device">Állítsa be az összes fiókhoz ezen az eszközön</string>
+  <string name="presence_chat">Beszélgetésre kész</string>
   <string name="presence_online">Elérhető</string>
   <string name="presence_away">Távol</string>
   <string name="presence_xa">Nem elérhető</string>
+  <string name="presence_dnd">Elfoglalt</string>
+  <string name="secure_password_generated">Egy biztonságos jelszó lett létrehozva</string>
+  <string name="device_does_not_support_battery_op">Az Eszközöd nem támogatja az akkumulátor-optimalizálás kikapcsolását</string>
+  <string name="show_password">Mutasd a jelszót</string>
+  <string name="registration_please_wait">Regisztráció nem sikerült: Próbálkozzon később</string>
+  <string name="registration_password_too_weak">Regisztráció nem sikerült: Jelszó túl gyenge</string>
+  <string name="create_conference">Konferencia létrehozása</string>
+  <string name="join_or_create_conference">Csatlakozz vagy hozz létre konferenciát</string>
+  <string name="conference_subject">Téma</string>
+  <string name="choose_participants">Válaszd ki a résztvevőket</string>
+  <string name="creating_conference">Konferencia létrehozása ...</string>
+  <string name="invite_again">Meghívja újra</string>
+  <string name="gp_short">Rövid</string>
+  <string name="gp_medium">Közepesen hosszú</string>
+  <string name="gp_long">Hosszú</string>
   <string name="pref_broadcast_last_activity">Legutolsó használat megadása</string>
   <string name="pref_broadcast_last_activity_summary">Minden ismerősöd tudja meg, hogy mikor használod a Conversations-t</string>
   <string name="pref_privacy">Személyes</string>
@@ -483,11 +572,43 @@
   <string name="pref_theme_dark">Sötét téma</string>
   <string name="pref_use_green_background">Zöld háttér</string>
   <string name="pref_use_green_background_summary">Használjon zöld hátteret a kapott üzenetek kiemelésére</string>
+  <string name="unable_to_connect_to_keychain">Nem sikerült csatlakozni a OpenKeychain-hez</string>
+  <string name="this_device_is_no_longer_in_use">Ez az eszköz már nincs használatban</string>
+  <string name="type_pc">Számítógép</string>
+  <string name="type_phone">Mobiltelefon</string>
+  <string name="type_tablet">Táblagép</string>
+  <string name="type_web">Böngésző</string>
+  <string name="type_console">Konzol</string>
+  <string name="payment_required">Fizetés szükséges</string>
+  <string name="missing_internet_permission">Hiányzó internet engedély</string>
+  <string name="me">Nekem</string>
   <string name="contact_asks_for_presence_subscription">Ismerősöd állapot frissítéseket kér</string>
+  <string name="allow">Megenged</string>
+  <string name="no_permission_to_access_x">Nincs jogosultságod, hogy hozzáférj ehhez: %s</string>
+  <string name="remote_server_not_found">A távoli szerver nem található</string>
+  <string name="unable_to_update_account">Nem sikerült frissíteni a fiókot</string>
   <string name="missing_presence_subscription_with_x">Hiányzik %s állapotára való feliratkozásod</string>
+  <string name="missing_keys_from_x">Hiányzó OMEMO kulcsok %s nevű felhasználótól.</string>
+  <string name="missing_omemo_keys">Hiányzó OMEMO kulcsok</string>
+  <string name="wrong_conference_configuration">Ez nem egy privát, nem-névtelen konferencia.</string>
+  <string name="this_conference_has_no_members">Jelenleg egy tag sincs ezen a konferencián.</string>
   <string name="pref_delete_omemo_identities">OMEMO identitások törlése</string>
   <string name="pref_delete_omemo_identities_summary">Regenerálja a OMEMO kulcsokat. Minden ismerősödnek engedélyezni kell majd az új kulcsodat. Ezt csak a legvégső esetben érdemes használni.</string>
+  <string name="delete_selected_keys">Kiválasztott kulcsok törlése</string>
+  <string name="error_publish_avatar_offline">Csatlakozni kell, hogy közzé tudd tenni a arcképedet.</string>
+  <string name="show_error_message">Hibaüzenet mutatása</string>
+  <string name="error_message">Hibaüzenet</string>
+  <string name="data_saver_enabled">Adatspórolás engedélyezve</string>
+  <string name="data_saver_enabled_explained">Az operációs rendszer korlátozza a Conversations hozzáférését az internethez, amikor a háttérben fut. Az új üzeneteket értesítésének fogadásához lehetővé kell tennie a Conversations korlátlan hozzáférését, ha az Adatspórolás aktív.\nConversations továbbra is arra törekszik, hogy spóroljon az adatokat, ha lehetséges.</string>
+  <string name="device_does_not_support_data_saver">Az eszköz nem támogatja az adatspórolás letiltását.</string>
+  <string name="error_unable_to_create_temporary_file">Nem sikerült létrehozni egy ideiglenes fájlt</string>
+  <string name="this_device_has_been_verified">Ez a készülék ellenőrzött</string>
+  <string name="copy_fingerprint">Ujjlenyomat másolása</string>
+  <string name="all_omemo_keys_have_been_verified">Minden OMEMO kulcs ellenőrizve lett</string>
+  <string name="barcode_does_not_contain_fingerprints_for_this_conversation">A vonalkód nem tartalmaz ujjlenyomatokat ehhez a beszélgetéshez.</string>
+  <string name="verified_fingerprints">Ellenőrzött ujjlenyomatok</string>
   <string name="use_camera_icon_to_scan_barcode">Használja a kamerát, hogy beolvassa az ismerős vonalkódját</string>
+  <string name="please_wait_for_keys_to_be_fetched">Kérjük várjon a kulcsok lekérésére</string>
   <string name="share_as_barcode">Megosztás vonalkóddal</string>
   <string name="share_as_uri">Megosztás XMPP URI-ként</string>
   <string name="share_as_http">Megosztás HTTP linkkel</string>
@@ -495,12 +616,22 @@
   <string name="pref_blind_trust_before_verification_summary">Automatikusan megbízik ismerőseid új, ellenőrizetlen eszközeiben. Ilyen esetekben manuális megerősítésre buzdítja a felhasználót.</string>
   <string name="blindly_trusted_omemo_keys">Megerősítetlen OMEMO kulcsok</string>
   <string name="not_trusted">Nem megbízható</string>
+  <string name="invalid_barcode">Érvénytelen 2D vonalkód</string>
+  <string name="pref_clean_cache_summary">Gyorsítótár mappa kitisztítása (Kamera szoftver által használt)</string>
   <string name="pref_clean_cache">Gyorsítótár törlése</string>
   <string name="pref_clean_private_storage">Személyes tárhely törlése</string>
   <string name="pref_clean_private_storage_summary">Személyes tárhelyét törli, ahol fájljai vannak (Ezeket újra lehet tölteni a kiszolgálóról)</string>
+  <string name="verify_omemo_keys">OMEMO kulcsok ellenőrzése</string>
   <string name="show_inactive_devices">Inaktív eszközök listája</string>
   <string name="hide_inactive_devices">Inaktívak listájának elrejtése</string>
   <string name="distrust_omemo_key">Ne bízzon az eszközben</string>
+  <string name="timeout_24_hours">24 óra</string>
+  <string name="timeout_7_days">7 nap</string>
+  <string name="timeout_30_days">30 nap</string>
+  <string name="timeout_6_months">6 hónap</string>
   <string name="pref_automatically_delete_messages">Automatikus üzenet törlés</string>
   <string name="pref_automatically_delete_messages_description">Automatikusan törli az üzeneteket az eszközön, amennyiben régebbiek, mint a beállított időkeret.</string>
+  <string name="encrypting_message">Üzenet titkosítása</string>
+  <string name="not_fetching_history_retention_period">Nem tölt le üzeneteket a helyi megőrzési időszak miatt.</string>
+  <string name="transcoding_video_progress">Videó tömörítése (%s%% kész)</string>
 </resources>
diff --git a/src/main/res/values-nb-rNO/strings.xml b/src/main/res/values-nb-rNO/strings.xml
index cbec9c466..cf7a5b224 100644
--- a/src/main/res/values-nb-rNO/strings.xml
+++ b/src/main/res/values-nb-rNO/strings.xml
@@ -691,4 +691,13 @@
   <string name="hide_inactive_devices">Skjul inaktive enheter</string>
   <string name="distrust_omemo_key">Fjern tiltro til enhet</string>
   <string name="distrust_omemo_key_text">Er du sikker på at du vil fjerne bekreftelsen av denne enheten?\nDenne eneheten og meldinger fra den vil bli vises som \'Ikke betrodd\'.</string>
+  <string name="timeout_24_hours">et døgn</string>
+  <string name="timeout_7_days">ei uke</string>
+  <string name="timeout_30_days">30 dager</string>
+  <string name="timeout_6_months">et halvt år</string>
+  <string name="pref_automatically_delete_messages">Automatisk meldingssletting</string>
+  <string name="pref_automatically_delete_messages_description">Slett meldinger fra denne enheten automatisk hvis de er eldre enn oppsatt tidsramme.</string>
+  <string name="encrypting_message">Krypterer melding</string>
+  <string name="not_fetching_history_retention_period">Henter ikke inn meldinger på grunn av lokal oppbevaringsperiode.</string>
+  <string name="transcoding_video_progress">Komprimerer video (%s%% fullført)</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 3a4e9f149..21a8ccdf5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -684,8 +684,8 @@
   <string name="pref_clean_cache">Cache wissen</string>
   <string name="pref_clean_private_storage">Privéopslag wissen</string>
   <string name="pref_clean_private_storage_summary">Privéopslag waar bestanden worden bijgehouden wissen (de bestanden kunnen opnieuw gedownload worden van de server)</string>
-  <string name="i_followed_this_link_from_a_trusted_source">Ik heb deze koppeling gevolgd van een vertrouwde bron</string>
-  <string name="verifying_omemo_keys_trusted_source">Je staat op het punt de OMEMO-sleutels van %1$s te verifiëren door op een koppeling te klikken. Dit is enkel veilig als je de koppeling van een vertrouwde bron hebt gevolgd, waarbij enkel %2$s de koppeling gepubliceerd kan hebben.</string>
+  <string name="i_followed_this_link_from_a_trusted_source">Ik heb deze link gevolgd vanuit een betrouwbare bron</string>
+  <string name="verifying_omemo_keys_trusted_source">Je staat op het punt de OMEMO-sleutels van %1$s te verifiëren door op een link te klikken. Dit is enkel veilig als je de link van een betrouwbare bron hebt gevolgd, waarbij enkel %2$s de link gepubliceerd kan hebben.</string>
   <string name="verify_omemo_keys">OMEMO-sleutels verifiëren</string>
   <string name="show_inactive_devices">Toon niet-actieve apparaten</string>
   <string name="hide_inactive_devices">Verberg niet-actieve apparaten</string>
@@ -694,7 +694,7 @@
   <string name="timeout_24_hours">24 uur</string>
   <string name="timeout_7_days">7 dagen</string>
   <string name="timeout_30_days">30 dagen</string>
-  <string name="timeout_6_months">6 maand</string>
+  <string name="timeout_6_months">6 maanden</string>
   <string name="pref_automatically_delete_messages">Automatisch berichten verwijderen</string>
   <string name="pref_automatically_delete_messages_description">Verwijder automatisch berichten van dit apparaat ouder dan de ingestelde tijdsperiode.</string>
   <string name="encrypting_message">Bericht wordt versleuteld</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index c6fc40a34..927f838ed 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -490,11 +490,13 @@
   <plurals name="toast_delete_certificates">
     <item quantity="one">Usunięto %d certyfikat</item>
     <item quantity="few">Usunięto %d certyfikaty</item>
+    <item quantity="many">Usunięto %d certyfikatów</item>
     <item quantity="other">Usunięto %d certyfikatów</item>
   </plurals>
   <plurals name="select_contact">
     <item quantity="one">%d kontakt wybrany</item>
     <item quantity="few">%d kontakty wybrane</item>
+    <item quantity="many">%d kontaktów wybranych</item>
     <item quantity="other">%d kontaktów wybranych</item>
   </plurals>
   <string name="pref_quick_action_summary">Zastąp przycisk wysyłania szybką akcją</string>
@@ -557,6 +559,7 @@
   <plurals name="x_messages">
     <item quantity="one">%d wiadomość</item>
     <item quantity="few">%d wiadomości</item>
+    <item quantity="many">%d wiadomości</item>
     <item quantity="other">%d wiadomości</item>
   </plurals>
   <string name="load_more_messages">Załaduj wiecej wiadomości</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 31c61de61..b704267ef 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -698,5 +698,6 @@
   <string name="pref_automatically_delete_messages">Automatisk borttagning av meddelanden</string>
   <string name="pref_automatically_delete_messages_description">Ta automatiskt bort meddelanden från denna enhet som är äldre än den konfigurerade tidsramen.</string>
   <string name="encrypting_message">Krypterar meddelande</string>
+  <string name="not_fetching_history_retention_period">Hämtar inte meddelanden på grund av inställningen för borttagning av gamla meddelanden.</string>
   <string name="transcoding_video_progress">Komprimerar video (%s%% klar)</string>
 </resources>
diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index df668568a..d5a9d2ce3 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -695,5 +695,6 @@
   <string name="pref_automatically_delete_messages">Otomatik ileti silmek</string>
   <string name="pref_automatically_delete_messages_description">Bu cihazdan, ayarlanmış zaman aralığından eski olan mesajları otomatik olarak silin.</string>
   <string name="encrypting_message">İletiyi şifrelemek</string>
+  <string name="not_fetching_history_retention_period">Yerel saklama süresi nedeniyle ileti getirilmiyor.</string>
   <string name="transcoding_video_progress">Video sıkıştırılıyor (%s%% tamamlandı)</string>
 </resources>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index e0d0be13c..6565d5e5d 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -71,12 +71,16 @@
   <string name="send_failed">thất bại khi chuyển</string>
   <string name="send_rejected">bị từ chối</string>
   <string name="preparing_image">Đang chuẩn bị hình để chuyển</string>
+  <string name="preparing_images">Đang chuẩn bị hình để chuyển</string>
+  <string name="sharing_files_please_wait">Đang chia sẻ các tập tin. Xin chờ...</string>
   <string name="action_clear_history">Xoá lịch sử</string>
   <string name="clear_conversation_history">Xoá lịch sử hội thoại</string>
   <string name="clear_histor_msg">Bạn có muốn xoá toàn bộ tin nhắn trong hội thoại này?\n\n<b>Cảnh báo:</b> Thao tác này sẽ không ảnh hưởng đến tin nhắn đã lưu trên các thiết bị hoặc máy chủ khác.</string>
   <string name="delete_messages">Xoá tin nhắn</string>
   <string name="also_end_conversation">Dừng hội thoại này sau đó</string>
+  <string name="choose_presence">Chọn thiết bị</string>
   <string name="send_unencrypted_message">Gửi tin nhắn không mã hoá</string>
+  <string name="send_message_to_x">Gửi tin nhắn đến %s</string>
   <string name="send_otr_message">Gửi tin nhắn mã hoá OTR</string>
   <string name="send_omemo_message">Gửi tin nhắn mã hoá OMEMO</string>
   <string name="send_omemo_x509_message">Gửi tin nhắn mã hoá v\\OMEMO</string>
@@ -100,17 +104,32 @@
   <string name="pref_xmpp_resource_summary">Tên của máy trạm này được tự đặt là</string>
   <string name="pref_accept_files">Chấp thuận các tập tin</string>
   <string name="pref_accept_files_summary">Tự động chấp thuận các tập tin nhỏ hơn...</string>
+  <string name="pref_attachments">Tập tin đính kèm</string>
+  <string name="pref_return_to_previous">Chia sẻ nhanh</string>
+  <string name="pref_return_to_previous_summary">Lập tức quay trở lại hoạt động trước đó thay vì mở cuộc hội thoại sau khi chia sẻ </string>
+  <string name="pref_notification_settings">Thông báo</string>
   <string name="pref_notifications">Thông báo</string>
   <string name="pref_notifications_summary">Thông báo khi có tin nhắn mới</string>
   <string name="pref_vibrate">Rung</string>
+  <string name="pref_vibrate_summary">Rung khi có tin nhắn mới</string>
+  <string name="pref_led">Thông báo đèn LED</string>
+  <string name="pref_led_summary">Chớp đèn thông báo khi có tin nhắn mới</string>
+  <string name="pref_sound">Âm báo</string>
+  <string name="pref_sound_summary">Chơi nhạc báo khi có tin nhắn mới</string>
+  <string name="pref_notification_grace_period">Thời gian gia hạn thông báo</string>
+  <string name="pref_notification_grace_period_summary">Khoảng thời gian Conversations giữ yên lặng sau khi xem hoạt động trên một thiết bị khác</string>
+  <string name="pref_advanced_options">Nâng cao</string>
   <string name="pref_never_send_crash">Không bao giờ gửi báo cáo dừng chạy</string>
   <string name="pref_never_send_crash_summary">Bằng việc gửi báo cáo hoạt động, bạn đang hỗ trợ nhóm phát triển của Conversations</string>
   <string name="pref_confirm_messages">Xác nhận tin nhắn</string>
+  <string name="pref_confirm_messages_summary">Báo cho liên hệ của bạn biết khi bạn đã nhận và đọc tin nhắn</string>
+  <string name="pref_ui_options">UI</string>
   <string name="openpgp_error">OpenKeychain đã báo cáo một lỗi</string>
   <string name="error_decrypting_file">Tập tin giải mã lỗi I/O</string>
   <string name="accept">Chấp thuận</string>
   <string name="error">Đã có lỗi xảy ra</string>
   <string name="pref_grant_presence_updates">Trao quyền cập nhật hiện diện</string>
+  <string name="pref_grant_presence_updates_summary">Ưu tiên trao quyền và hỏi đăng ký hiện diện cho các liên hệ bạn đã tạo</string>
   <string name="subscriptions">Đăng ký</string>
   <string name="your_account">Tài khoản của bạn</string>
   <string name="keys">Các khoá</string>
@@ -138,7 +157,9 @@
   <string name="account_status_regis_success">Đăng ký hoàn tất</string>
   <string name="account_status_regis_not_sup">Máy chủ không hỗ trợ việc đăng ký</string>
   <string name="account_status_security_error">Lỗi bảo mật</string>
+  <string name="account_status_policy_violation">Vi phạm chính sách</string>
   <string name="account_status_incompatible_server">Máy chủ không tương thích</string>
+  <string name="account_status_stream_error">Lỗi truyền phát</string>
   <string name="encryption_choice_unencrypted">Không mã hoá</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
@@ -148,6 +169,8 @@
   <string name="mgmt_account_disable">Tạm thời tắt</string>
   <string name="mgmt_account_publish_avatar">Đăng ảnh đại diện</string>
   <string name="mgmt_account_publish_pgp">Đăng khoá công cộng OpenPGP</string>
+  <string name="openpgp_has_been_published">Đã phát hành khoá công cộng OpenPGP.</string>
+  <string name="republish_pgp_keys">Nhớ phát hành lại các khoá công cộng OpenPGP!</string>
   <string name="mgmt_account_enable">Bật tài khoản</string>
   <string name="mgmt_account_are_you_sure">Bạn chắc chứ?</string>
   <string name="mgmt_account_delete_confirm_text">Nếu xoá tài khoản, toàn bộ lịch sử hội thoại của bạn sẽ bị mất</string>
@@ -179,6 +202,7 @@
   <string name="server_info_stream_management">XEP-0198: Stream Management</string>
   <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ẵn sàng</string>
   <string name="server_info_unavailable">không sẵn sàng</string>
   <string name="missing_public_keys">Thông báo khoá công cộng bị thất lạc</string>
@@ -196,6 +220,8 @@
   <string name="reception_failed">Tiếp nhận thất bại</string>
   <string name="your_fingerprint">Dấu vân tay của bạn</string>
   <string name="otr_fingerprint">Dấu vân tay OTR</string>
+  <string name="otr_fingerprint_selected_message">Dấu vân tay OTR của tin nhắn</string>
+  <string name="openpgp_key_id">ID khoá OpenPGP</string>
   <string name="omemo_fingerprint">Dấu vân tay OMEMO</string>
   <string name="omemo_fingerprint_x509">Dấu vân tay v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Dấu vân tay OMEMO của tin nhắn</string>
@@ -221,11 +247,14 @@
   <string name="contact_already_exists">Đã có liên hệ này rồi</string>
   <string name="join">Tham gia</string>
   <string name="conference_address">Địa chỉ diễn đàn</string>
+  <string name="conference_address_example">room@conference.example.com/nick</string>
   <string name="save_as_bookmark">Lưu thành đánh dấu</string>
   <string name="delete_bookmark">Xoá đánh dấu</string>
   <string name="bookmark_already_exists">Đã có đánh dấu này rồi</string>
   <string name="you">Bạn</string>
   <string name="action_edit_subject">Chỉnh sửa tiêu đề diễn đàn</string>
+  <string name="edit_subject_hint">Chủ đề của diễn đàn này</string>
+  <string name="joining_conference">Đang tham gia diễn đàn...</string>
   <string name="leave">Rời khỏi</string>
   <string name="contact_added_you">Liên hệ đã thêm bạn vào danh bạ</string>
   <string name="add_back">Thêm họ vào</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 447651ec3..39d18ce74 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -690,4 +690,13 @@
   <string name="hide_inactive_devices">隐藏非活跃设备</string>
   <string name="distrust_omemo_key">不信任的设备</string>
   <string name="distrust_omemo_key_text">你确认要移除此设备的验证吗？\n此设备及从其发送的信息将会被标识为不可信。</string>
+  <string name="timeout_24_hours">24 个小时</string>
+  <string name="timeout_7_days">7 天</string>
+  <string name="timeout_30_days">30 天</string>
+  <string name="timeout_6_months">6 个月</string>
+  <string name="pref_automatically_delete_messages">自动删除消息</string>
+  <string name="pref_automatically_delete_messages_description">自动从此设备上删除超过配置时间段的消息</string>
+  <string name="encrypting_message">消息加密中</string>
+  <string name="not_fetching_history_retention_period">由于本地保留期限，因此无法提取消息。</string>
+  <string name="transcoding_video_progress">正在压缩视频 (已完成 %s%% )</string>
 </resources>