pulled translations from transifex

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">إرسال رسالة غير مشفرة</string>
   <string name="send_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>
@@ -162,9 +161,7 @@
   <string name="attach_record_voice">تسجيل صوت</string>
   <string name="account_settings_jabber_id">حساب جابر</string>
   <string name="block_jabber_id">حظر معرف جابر</string>
-  <string name="account_settings_password">كلمة السر</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">تأكيد كلمة السر</string>
   <string name="password">كلمة السر</string>
   <string name="invalid_jid">حساب جابر غير صالح</string>
   <string name="error_out_of_memory">خارج الذاكرة. الصورة كبيرة جدا</string>
@@ -189,11 +186,7 @@
   <string name="last_seen_day">آخر ظهور منذ 1 يوم</string>
   <string name="last_seen_days">آخر ظهور منذ %d يوم</string>
   <string name="install_openkeychain">هذه الرسالة مشفرة. قم بتثبيت OpenKeychain لفك الشيفرة.</string>
-  <string name="unknown_otr_fingerprint">بصمة OTR مجهولة</string>
   <string name="openpgp_messages_found">تم العثور على رسائل مشفرة بال OpenPGP</string>
-  <string name="your_fingerprint">بصمتك</string>
-  <string name="otr_fingerprint">بصمة OTR</string>
-  <string name="otr_fingerprint_selected_message">بصمة OTR للرسالة</string>
   <string name="openpgp_key_id">معرف ID مفتاح ال OpenPGP</string>
   <string name="omemo_fingerprint">بصمة OMEMO</string>
   <string name="omemo_fingerprint_x509">بصمة v\\OMEMO</string>
@@ -202,11 +195,9 @@
   <string name="trust_omemo_fingerprints">الثقة في بصمات أوميمو OMEMO</string>
   <string name="fetching_keys">جارإحضار المفاتيح ...</string>
   <string name="done">تم</string>
-  <string name="verify">تأكيد</string>
   <string name="decrypt">فك الشيفرة</string>
   <string name="conferences">مجموعة المحادثات</string>
   <string name="search">بحث</string>
-  <string name="create_contact">إضافة جهة اتصال</string>
   <string name="dialog_title_create_contact">إضافة جهة اتصال</string>
   <string name="enter_contact">قم بإدخال جهة إتصال</string>
   <string name="join_conference">الإنضمام إلى مجموعة محادثة</string>
@@ -251,10 +242,7 @@
   <string name="enable">تفعيل</string>
   <string name="conference_requires_password">تتطلب مجموعة المحادثة إدخال كلمة مرور</string>
   <string name="enter_password">أدخل كلمة المرور</string>
-  <string name="missing_presence_subscription">تنقص المشاركة في حالة الحضور</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_allow_message_correction">السماح بمراجعة الرسالة</string>
@@ -272,7 +260,6 @@
   <string name="pref_expert_options_other">أخرى</string>
   <string name="pref_conference_name">إسم مجموعة المحادثة</string>
   <string name="pref_autojoin">إنضمام تلقائي إلى فِرَق المحادثة</string>
-  <string name="toast_message_otr_fingerprint">تم نسخ بصمة OTR إلى الحافظة</string>
   <string name="toast_message_omemo_fingerprint">تم نسخ بصمة OMEMO إلى الحافظة !</string>
   <string name="conference_banned">حسابك محظور للإلتحاق بمجموعة المحادثة هذه</string>
   <string name="conference_members_only">هذه المجموعة متاحة للأعضاء المنتمين إليها فقط</string>
@@ -292,18 +279,8 @@
   <string name="show_qr_code">أظهر شفرة التّعرّف 2D</string>
   <string name="show_block_list">إعرض قائمة المحبوسين</string>
   <string name="account_details">تفاصيل الحساب</string>
-  <string name="verify_otr">التحقق من OTR</string>
-  <string name="remote_fingerprint">بصمة عن بعد</string>
-  <string name="shared_secret_hint">دلالة أو سؤال</string>
-  <string name="shared_secret_secret">السر المشترك</string>
   <string name="confirm">تأكيد</string>
-  <string name="in_progress">جاري الاتصال</string>
-  <string name="respond">رد</string>
-  <string name="secrets_do_not_match">الأسرار غير متطابقة</string>
   <string name="try_again">حاول مرة أخرى</string>
-  <string name="finish">انهاء</string>
-  <string name="verified">تأكيد!</string>
-  <string name="smp_requested">لقد طلب مراسِلك التحقق عبر SMP</string>
   <string name="conversations_foreground_service">المحادثات</string>
   <string name="pref_keep_foreground_service">احتفظ بالتطبيق يعمل في المقدمة</string>
   <string name="pref_keep_foreground_service_summary">منع نظام التشغيل من انهاء اتصالك</string>
@@ -324,14 +301,10 @@
   <string name="file_deleted">تم حذف الملف</string>
   <string name="no_application_found_to_open_file">لا يوجد تطبيق متاح لعرض الملف</string>
   <string name="no_application_found_to_open_link">تعذر العثور على تطبيق يمكنه فتح الرابط</string>
-  <string name="could_not_verify_fingerprint">لا يمكن التحقق من البصمة</string>
-  <string name="manually_verify">التحقق يدوياً</string>
-  <string name="pref_show_dynamic_tags">عرض العلامات التلقائية</string>
   <string name="pref_show_dynamic_tags_summary">عرض علامات للقراءة فقط أسفل بيانات جهات الإتصال </string>
   <string name="enable_notifications">تفعيل الإشعارات</string>
   <string name="conference_creation_failed">فشلت عملية إنشاء مجموعة المحادثة !</string>
   <string name="account_image_description">الصورة الرمزية للحساب</string>
-  <string name="copy_otr_clipboard_description">نسخ OTR بصمات الأصابع إلى الحافظة</string>
   <string name="copy_omemo_clipboard_description">انسخ بصمة OMEMO إلى الحافظة</string>
   <string name="regenerate_omemo_key">إعادة إنشاء مفتاح أوميمو OMEMO</string>
   <string name="clear_other_devices">حذف أجهزة</string>
@@ -341,12 +314,6 @@
   <string name="updating">جاري التحديث..</string>
   <string name="password_changed">تم تغيير كلمة السر!</string>
   <string name="could_not_change_password">لايمكن تغيير كلمة السر</string>
-  <string name="otr_session_not_started">ارسل رساله لبدأ محادثة مشفّرة</string>
-  <string name="ask_question">أسال سؤال</string>
-  <string name="smp_explain_answer">سترغب جهة الإتصال بتأكيد بصمتك عبر السر المشترك بينكما لذلك أخبره تلميحا أو إسأله سؤالا يذكره بالسر ليكتبه برده</string>
-  <string name="shared_secret_hint_should_not_be_empty">التلميح الذي يراه صديقك لا يمكن ان يكون فارغ</string>
-  <string name="shared_secret_can_not_be_empty">السر المشترك بينكما لا يمكن ان يترك فارغا !!</string>
-  <string name="manual_verification_explanation">بعناية قارن بين بصمتك المعروضة أدناه وبصمة جهات اتصالك\n يمكنك استخدام أي شكل موثوق به للاتصال مثل بريد إلكتروني مشفر أو مكالمة هاتفية لتبادلها.</string>
   <string name="change_password">تغيير كلمة المرور</string>
   <string name="current_password">كلمة المرور الحالية</string>
   <string name="new_password">كلمة المرور الجديدة</string>
@@ -375,6 +342,7 @@
   <string name="non_anonymous">لا تسمح للمجهولين بالدخول</string>
   <string name="moderated">تحت الرقابة</string>
   <string name="you_are_not_participating">لست مشتركا في المجموعة</string>
+  <string name="modified_conference_options">تم تعديل خيارات فريق المحادثة !</string>
   <string name="could_not_modify_conference_options">تعذر تغيير خيارات فريق المحادثة</string>
   <string name="never">أبداً</string>
   <string name="until_further_notice">حتى إشعار آخر</string>
@@ -392,7 +360,6 @@
   <string name="apk">تطبيق اندرويد</string>
   <string name="vcard">تواصل</string>
   <string name="received_x_file">تم التلقي %s</string>
-  <string name="disable_foreground_service">ايقاف عرض تنويهات الخدمات على رئيسية الهاتف</string>
   <string name="touch_to_open_conversations">ألمس لفتح تطبيق المحادثات</string>
   <string name="avatar_has_been_published">تم نشر الصورة الرمزية !</string>
   <string name="sending_x_file">ارسال %s</string>
@@ -474,14 +441,6 @@
   <string name="no_storage_permission">إنّ تطبيق المحادثات Conversations بحاجة إلى النفاذ إلى مساحة التخزين الخارجية</string>
   <string name="no_camera_permission">إنّ تطبيق المحادثات Conversations بحاجة إلى النفاذ إلى آلة التصوير</string>
   <string name="sync_with_contacts">المزامنة مع جهات الإتصال</string>
-  <string name="certificate_information">معلومات حول الشهادة</string>
-  <string name="certificate_subject">الموضوع</string>
-  <string name="certificate_issuer">المصدر</string>
-  <string name="certificate_cn">الإسم الشائع</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_only_when_highlighted">قم بإخطاري عندما يقوم أحدهم بذكري </string>
   <string name="notify_never">تعطيل الإخطارات</string>
@@ -507,22 +466,16 @@
   <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="all_accounts_on_this_device">تعيينه لكل الحسابات على هذا الجهاز</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="show_password">إظهار كلمة المرور</string>
   <string name="registration_please_wait">فشل تسجيل الحساب : حاول مرةً أخرى لاحقاً</string>
   <string name="registration_password_too_weak">فشل تسجيل الحساب : كلمة السر ضعيفة جداً</string>
-  <string name="create_conference">إنشاء فريق محادثة</string>
   <string name="dialog_title_create_conference">إنشاء مجموعة محادثة</string>
-  <string name="join_or_create_conference">إنشاء أو الإنظمام إلى مجموعة محادثة</string>
-  <string name="conference_subject">الموضوع</string>
   <string name="choose_participants">إختر المشاركين</string>
   <string name="creating_conference">جارٍ إنشاء مجموعة المحادثة ...</string>
   <string name="invite_again">أعد إرسال الدعوة</string>
@@ -551,8 +504,6 @@
   <string name="allow">إسمح</string>
   <string name="remote_server_not_found">لم يتم العثور على السيرفر البعدي</string>
   <string name="unable_to_update_account">لا يمكن تحديث الحساب</string>
-  <string name="missing_keys_from_x">إنّ مفاتيح أوميمو %s ناقصة.</string>
-  <string name="missing_omemo_keys">مفاتيح OMEMO مفقودة</string>
   <string name="pref_delete_omemo_identities">إحذف تعريفات أو مي مو OMEMO</string>
   <string name="delete_selected_keys">إحذف المفاتيح المختارة</string>
   <string name="error_publish_avatar_offline">يجب أن تكون متصلا ليسمح لك بنشر الصورة الرمزية الخاصة بك.</string>
@@ -648,6 +599,7 @@
   <string name="yesterday">البارحة</string>
   <string name="pref_validate_hostname">التحقق من صحة إسم المضيف بواسطة DNSSEC</string>
   <string name="network_is_unreachable">لا يمكن الإتصال بالشبكة</string>
+  <string name="certificate_does_not_contain_jid">الشهادة لا تحتوي على مُعرّف جابر ID</string>
   <string name="server_info_partial">جُزْئِيًّا</string>
   <string name="attach_record_video">تسجيل فيديو</string>
   <string name="copy_to_clipboard">النسخ إلى الحافظة</string>
@@ -657,10 +609,8 @@
   <string name="huawei_protected_apps">التطبيقات المُؤمَّنَة</string>
   <string name="mtm_accept_cert">تقبُّل الشهادات المجهولة ؟</string>
   <string name="mtm_trust_anchor">إنّ شهادة الخادوم غير مُوقَّعَة مِن طرف هيئة شهادات معروفة.</string>
-  <string name="mtm_cert_expired">لقد انتهت مدة صلاحية شهادة الخادوم.</string>
   <string name="mtm_connect_anyway">بالرغم مِن ذلك هل تريد مواصلة الإتصال ؟</string>
   <string name="mtm_cert_details">تفاصيل الشهادة :</string>
-  <string name="mtm_notification">التحقق مِن الشهادة</string>
   <string name="once">مرة واحدة</string>
   <string name="pref_scroll_to_bottom">السحب إلى أسفل</string>
   <string name="edit_status_message_title">تعديل رسالة حالة الحضور</string>

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

@@ -49,6 +49,7 @@
   <string name="start_conversation">Започване на разговор</string>
   <string name="invite_contact">Поканете контакт</string>
   <string name="contacts">Контакти</string>
+  <string name="contact">Контакт</string>
   <string name="cancel">Отказ</string>
   <string name="set">Задаване</string>
   <string name="add">Добавяне</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Изпр. на нешифр. съобщение</string>
   <string name="send_message">Изпращане на съобщение</string>
   <string name="send_message_to_x">Изпращане на съобщение до %s</string>
-  <string name="send_otr_message">Изпр. на съобщение, шифр. чрез OTP</string>
   <string name="send_omemo_message">Изпр. на съобщение, шифр. чрез OMEMO</string>
   <string name="send_omemo_x509_message">Изпр. на съобщение, шифр. чрез v\\OMEMO</string>
   <string name="send_pgp_message">Изпр. на съобщение, шифр. чрез OpenPGP</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Запис на глас</string>
   <string name="account_settings_jabber_id">Jabber идентификатор</string>
   <string name="block_jabber_id">Блокиране на Jabber идентификатор</string>
-  <string name="account_settings_password">Парола</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Потвърдете паролата</string>
   <string name="password">Парола</string>
   <string name="invalid_jid">Това не е правилен Jabber идентификатор</string>
   <string name="error_out_of_memory">Няма достатъчно памет. Изображението е твърде голямо.</string>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">последно видян преди 1 ден</string>
   <string name="last_seen_days">последно видян преди %d дни</string>
   <string name="install_openkeychain">Шифровано съобщение. Моля, инсталирайте OpenKeychain, за да го дешифровате.</string>
-  <string name="unknown_otr_fingerprint">Непознат отпечатък OTR</string>
   <string name="openpgp_messages_found">Открити са съобщения, шифровани чрез OpenPGP</string>
-  <string name="your_fingerprint">Вашият отпечатък</string>
-  <string name="otr_fingerprint">Отпечатък OTR</string>
-  <string name="otr_fingerprint_selected_message">Отпечатък OTR на съобщението</string>
   <string name="openpgp_key_id">Ид. на OpenPGP ключа</string>
   <string name="omemo_fingerprint">Отпечатък OMEMO</string>
   <string name="omemo_fingerprint_x509">Отпечатък v\\OMEMO</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">Доверяване на отпечатъци OMEMO</string>
   <string name="fetching_keys">Изтегляне на ключове…</string>
   <string name="done">Готово</string>
-  <string name="verify">Потвърждаване</string>
   <string name="decrypt">Дешифроване</string>
   <string name="conferences">Групови разговори</string>
   <string name="search">Търсене</string>
-  <string name="create_contact">Създаване на контакт</string>
   <string name="dialog_title_create_contact">Създаване на контакт</string>
   <string name="enter_contact">Въведете контакт</string>
   <string name="join_conference">Присъединяване в групов разговор</string>
@@ -263,11 +255,8 @@
   <string name="enable">Включване</string>
   <string name="conference_requires_password">Груповият разговор изисква парола</string>
   <string name="enter_password">Въведете парола</string>
-  <string name="missing_presence_subscription">Липсва абонамент за присъствието</string>
   <string name="request_presence_updates">Моля, първо помолете контакта за актуализации на присъствието му.\n\n<small>Това ще бъде използвано, за да се провери какъв клиент (или клиенти) използва контакта.</small></string>
   <string name="request_now">Поискване сега</string>
-  <string name="delete_fingerprint">Изтриване на отпечатъка</string>
-  <string name="sure_delete_fingerprint">Сигурни ли сте, че искате да изтриете този отпечатък?</string>
   <string name="ignore">Пренебрегване</string>
   <string name="without_mutual_presence_updates"><b>Внимание:</b> Изпращането на това без съвместни актуализации на присъствието може да доведе до неочаквани проблеми.\n\n<small>Погледнете подробностите за контакта, за да проверите дали сте абониран за актуализации на присъствието.</small></string>
   <string name="pref_security_settings">Сигурност</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">Използване на темата вместо JID за идентифициране на груповите разговори</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>
   <string name="conference_members_only">Този групов разговор е само за членове</string>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">Показване на 2-измерен баркод</string>
   <string name="show_block_list">Показване на списъка с блокирани</string>
   <string name="account_details">Подробности за профила</string>
-  <string name="verify_otr">Проверка на OTR</string>
-  <string name="remote_fingerprint">Отдалечен отпечатък</string>
-  <string name="shared_secret_hint">Подсказка или въпрос</string>
-  <string name="shared_secret_secret">Обща тайна</string>
   <string name="confirm">Потвърждаване</string>
-  <string name="in_progress">В процес</string>
-  <string name="respond">Отговаряне</string>
-  <string name="secrets_do_not_match">Тайната информация не съвпада</string>
   <string name="try_again">Повторен опит</string>
-  <string name="finish">Край</string>
-  <string name="verified">Проверено!</string>
-  <string name="smp_requested">Контактът изиска SMP проверка</string>
-  <string name="no_otr_session_found">Няма открита OTR сесия!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Услугата да е на преден план</string>
   <string name="pref_keep_foreground_service_summary">Предотвратява прекъсването на връзката Ви от операционната система</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">Файлът беше изтрит</string>
   <string name="no_application_found_to_open_file">Няма намерено приложение за отваряне на файла</string>
   <string name="no_application_found_to_open_link">Няма намерено приложение за отваряне на връзката</string>
-  <string name="could_not_verify_fingerprint">Неуспешна проверка на отпечатъка</string>
-  <string name="manually_verify">Ръчна проверка</string>
-  <string name="are_you_sure_verify_fingerprint">Наистина ли искате да потвърдите отпечатъка OTR на контакта си?</string>
   <string name="pref_show_dynamic_tags">Динамични етикети</string>
   <string name="pref_show_dynamic_tags_summary">Показване на етикети, предназначени само за четене под контактите</string>
   <string name="enable_notifications">Включване на известията</string>
   <string name="no_conference_server_found">Не е открит сървър за груповия разговор</string>
   <string name="conference_creation_failed">Неуспешно създаване на групов разговор!</string>
   <string name="account_image_description">Аватар на профила</string>
-  <string name="copy_otr_clipboard_description">Копиране на отпечатъка OTR</string>
   <string name="copy_omemo_clipboard_description">Копиране на отпечатъка OMEMO</string>
   <string name="regenerate_omemo_key">Повторно създаване на ключа OMEMO</string>
   <string name="clear_other_devices">Премахване на устройствата</string>
   <string name="clear_other_devices_desc">Сигурни ли сте, че искате да премахнете всички останали устройства от обявлението OMEMO? Следващия път, когато устройствата Ви се свържат, те ще обявят себе си отново, но може да не получат съобщенията, изпратени междувременно.</string>
   <string name="error_no_keys_to_trust_server_error">Няма ключове, които могат да бъдат използвани за този контакт.\nИзтеглянето на нови ключове от сървъра беше неуспешно. Възможно е да има проблем със сървъра на контакта Ви.</string>
   <string name="error_no_keys_to_trust_presence">Няма ключове, които могат да бъдат използвани за този контакт.\nУверете се, че и двамата имате абонамент за присъствието.</string>
-  <string name="error_no_keys_to_trust">Няма ключове, които могат да бъдат използвани за този контакт. Ако сте изчистили някои от ключовете му, то той трябва да създаде нови.</string>
   <string name="error_trustkeys_title">Нещо се обърка</string>
   <string name="fetching_history_from_server">Получаване на историята от сървъра</string>
   <string name="no_more_history_on_server">Няма повече история на сървъра</string>
   <string name="updating">Актуализиране…</string>
   <string name="password_changed">Паролата е променена!</string>
   <string name="could_not_change_password">Неуспешна промяна на паролата</string>
-  <string name="otr_session_not_started">Изпратете съобщение, за да започнете нешифрован разговор</string>
-  <string name="ask_question">Задаване на въпрос</string>
-  <string name="smp_explain_question">Ако Вие и контактът Ви имате някаква тайна информация, която никой друг не знае (като някаква шега или пък просто какво сте обядвали, когато сте се срещнали за последно), можете да я използвате, за да проверите отпечатъците си един на друг.\n\nМожете да подсигурите подсказка или въпрос, на който контактът Ви да отговори, като има предвид, че главните и малките букви се броят за различни.</string>
-  <string name="smp_explain_answer">Вашият контакт би искал да провери отпечатъка Ви, като Ви попита за обща тайна информация. Контактът Ви предостави следната подсказка или въпрос, който да Ви насочи към тази тайна.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Подсказката Ви не трябва да е празна</string>
-  <string name="shared_secret_can_not_be_empty">Общата Ви тайна не може да е празна</string>
-  <string name="manual_verification_explanation">Внимателно сравнете отпечатъка по-долу с този на Вашия контакт.\nМожете да използвате всякакъв начин на сигурна комуникация, като шифрована е-поща или телефонен разговор, за да размените отпечатъците.</string>
   <string name="change_password">Промяна на паролата</string>
   <string name="current_password">Текуща парола</string>
   <string name="new_password">Нова парола</string>
@@ -424,7 +389,6 @@
   <string name="apk">Приложение за Андроид</string>
   <string name="vcard">Контакт</string>
   <string name="received_x_file">Получихте %s</string>
-  <string name="disable_foreground_service">Изключване на услугата на преден план</string>
   <string name="touch_to_open_conversations">Докоснете, за да отворите Conversations</string>
   <string name="avatar_has_been_published">Аватарът беше публикуван!</string>
   <string name="sending_x_file">Изпращане на %s</string>
@@ -525,14 +489,6 @@
   <string name="no_camera_permission">Conversations се нуждае от достъп до камерата</string>
   <string name="sync_with_contacts">Синхронизиране с контактите</string>
   <string name="sync_with_contacts_long">Conversations иска да съчетае Вашия списък в XMPP с контактите Ви, за да показва пълните им имена и снимки..\n\nConversations единствено ще чете контактите Ви и ще ги използва вътрешно, без да ги качва на сървъра Ви.\n\nЩе бъдете помолен/а за позволение за достъп до контактите Ви.</string>
-  <string name="certificate_information">Информация за сертификата</string>
-  <string name="certificate_subject">Обект</string>
-  <string name="certificate_issuer">Издател</string>
-  <string name="certificate_cn">Име</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_only_when_highlighted">Известяване само при споменаване</string>
   <string name="notify_never">Известията са изключени</string>
@@ -564,9 +520,7 @@
   <string name="pick_your_username">Изберете потребителското си име</string>
   <string name="pref_manually_change_presence">Ръчна промяна на присъствието</string>
   <string name="pref_manually_change_presence_summary">Задайте присъствието си, когато редактирате съобщението за състоянието си.</string>
-  <string name="change_presence">Промяна на присъствието</string>
   <string name="status_message">Съобщение за състоянието</string>
-  <string name="all_accounts_on_this_device">Задаване за всички профили на това устройство</string>
   <string name="presence_chat">Свободен за разговор</string>
   <string name="presence_online">На линия</string>
   <string name="presence_away">Отсъстващ</string>
@@ -574,13 +528,9 @@
   <string name="presence_dnd">Зает</string>
   <string name="secure_password_generated">Беше създадена сигурна парола</string>
   <string name="device_does_not_support_battery_op">Устройството Ви не поддържа изключването на оптимизациите за използването на батерията</string>
-  <string name="show_password">Показване на паролата</string>
   <string name="registration_please_wait">Неуспешна регистрация. Опитайте отново по-късно</string>
   <string name="registration_password_too_weak">Неуспешна регистрация: паролата е твърде слаба</string>
-  <string name="create_conference">Създаване на групов разговор</string>
   <string name="dialog_title_create_conference">Създаване на групов разговор</string>
-  <string name="join_or_create_conference">Присъединяване към или създаване на групов разговор</string>
-  <string name="conference_subject">Тема</string>
   <string name="choose_participants">Изберете участниците</string>
   <string name="creating_conference">Създаване на групов разговор…</string>
   <string name="invite_again">Канене отново</string>
@@ -611,11 +561,6 @@
   <string name="no_permission_to_access_x">Няма позволение за достъп до %s</string>
   <string name="remote_server_not_found">Отдалеченият сървър не е намерен</string>
   <string name="unable_to_update_account">Неуспешно обновяване на профила</string>
-  <string name="missing_presence_subscription_with_x">Липсва абонамент за присъствието на %s.</string>
-  <string name="missing_keys_from_x">Липсват ключове OMEMO от %s.</string>
-  <string name="missing_omemo_keys">Липсват ключове OMEMO</string>
-  <string name="wrong_conference_configuration">Това не е частен, не-анонимен групов разговор.</string>
-  <string name="this_conference_has_no_members">Няма участници в този групов разговор.</string>
   <string name="report_jid_as_spammer">Докладване на този JID за изпращане на нежелани съобщения.</string>
   <string name="pref_delete_omemo_identities">Изтриване на идентификаторите OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Пресъздайте своите ключове OMEMO. Всички Ваши контакти ще трябва да Ви потвърдят отново. Използвайте това само в краен случай.</string>
@@ -714,12 +659,10 @@
   <string name="huawei_protected_apps_summary">Ако искате да продължите да получавате известия дори когато екранът е заключен, трябва да добавите „Conversations“ към списъка от защитени приложения.</string>
   <string name="mtm_accept_cert">Приемане на непознатия сертификат?</string>
   <string name="mtm_trust_anchor">Сървърният сертификат не е подписан от познат център за сертификация.</string>
-  <string name="mtm_cert_expired">Сървърният сертификат е с изтекла давност.</string>
   <string name="mtm_accept_servername">Приемане на несъвпадащото име на сървъра?</string>
   <string name="mtm_hostname_mismatch">Сървърът не може да се удостовери като „%s“. Сертификатът важи само за:</string>
   <string name="mtm_connect_anyway">Искате ли да се свържете въпреки това?</string>
   <string name="mtm_cert_details">Подробности за сертификата:</string>
-  <string name="mtm_notification">Проверка на сертификата</string>
   <string name="once">Веднъж</string>
   <string name="qr_code_scanner_needs_access_to_camera">Сканирането на QR-код се нуждае от достъп до камерата</string>
   <string name="pref_scroll_to_bottom">Превъртане до дъното</string>
@@ -733,4 +676,18 @@
   <string name="error_trustkey_hint_mutual">Съвет: В някои случаи това може да се оправи, ако се добавите един друг в списъците си с контакти.</string>
   <string name="disable_encryption_message">Наистина ли искате да изключите шифроването чрез OMEMO за този разговор?\nТова ще позволи на администратора Ви да чете съобщенията Ви, но пък най-вероятно е единственият начин за общуване с хората, използващи стари клиенти.</string>
   <string name="disable_now">Изключване сега</string>
+  <string name="draft">Чернова:</string>
+  <string name="pref_omemo_setting">Шифроване OMEMO</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO ще се използва винаги за частни групови разговори и такива с един събеседник.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO ще се използва по подразбиране за новите разговори.</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO ще трябва да се включва изрично за новите разговори.</string>
+  <string name="create_shortcut">Създаване на пряк път</string>
+  <string name="pref_font_size">Размер на шрифта</string>
+  <string name="pref_font_size_summary">Относителен размер на шрифта в приложението.</string>
+  <string name="default_on">ВКЛ по подразбиране</string>
+  <string name="default_off">ИЗКЛ по подразбиране</string>
+  <string name="small">Малък</string>
+  <string name="medium">Среден</string>
+  <string name="large">Голям</string>
+  <string name="not_encrypted_for_this_device">Съобщението не е било шифровано за това устройство.</string>
 </resources>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Envia un missatge no xifrat</string>
   <string name="send_message">Envia un missatge</string>
   <string name="send_message_to_x">Envia un missatge a %s</string>
-  <string name="send_otr_message">Envia un missatge xifrat amb OTR</string>
   <string name="send_omemo_message">Envia un missatge xifrat amb OMEMO</string>
   <string name="send_omemo_x509_message">Envia un missatge xifrat amb v\\OMEMO</string>
   <string name="send_pgp_message">Envia un missatge xifrat amb OpenPGP</string>
@@ -170,9 +169,7 @@
   <string name="attach_record_voice">Enregistra veu</string>
   <string name="account_settings_jabber_id">Identificació de Jabber</string>
   <string name="block_jabber_id">Bloqueja la identificació de Jabber</string>
-  <string name="account_settings_password">Contrasenya</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Confirma la contrasenya</string>
   <string name="password">Contrasenya</string>
   <string name="invalid_jid">Aquesta identificació de Jabber no és vàlida</string>
   <string name="error_out_of_memory">Memòria exhaurida. La imatge és massa gran.</string>
@@ -198,11 +195,7 @@
   <string name="last_seen_day">darrera connexió: fa 1 dia</string>
   <string name="last_seen_days">darrera connexió: fa %d dies</string>
   <string name="install_openkeychain">Missatge xifrat. Si us plau instal.leu l\'OpenKeychain per desxifrar-lo.</string>
-  <string name="unknown_otr_fingerprint">Empremta digital OTR desconeguda</string>
   <string name="openpgp_messages_found">S\'han trobat missatges xifrats amb OpenPGP</string>
-  <string name="your_fingerprint">La teva empremta digital</string>
-  <string name="otr_fingerprint">Empremta digital OTR</string>
-  <string name="otr_fingerprint_selected_message">Empremta digital OTR del missatge</string>
   <string name="openpgp_key_id">Identificador de la clau d\'OpenPGP</string>
   <string name="omemo_fingerprint">Empremta digital OMEMO</string>
   <string name="omemo_fingerprint_x509">Empremta digital v\\OMEMO</string>
@@ -212,11 +205,9 @@
   <string name="trust_omemo_fingerprints">Confia en les empremtes digitals d\'OMEMO</string>
   <string name="fetching_keys">S\'estan obtenint les claus...</string>
   <string name="done">Fet</string>
-  <string name="verify">Verifica</string>
   <string name="decrypt">Desxifra</string>
   <string name="conferences">Xats de grup</string>
   <string name="search">Cerca</string>
-  <string name="create_contact">Crea un contacte</string>
   <string name="dialog_title_create_contact">Crea un contacte</string>
   <string name="enter_contact">Introduïu un contacte</string>
   <string name="join_conference">Uniu-vos al xat en grup</string>
@@ -263,11 +254,8 @@
   <string name="enable">Habilita</string>
   <string name="conference_requires_password">El xat de grup requereix contrasenya</string>
   <string name="enter_password">Introduïu la contrasenya</string>
-  <string name="missing_presence_subscription">Falta la subscripció a la presència</string>
   <string name="request_presence_updates">Si us plau, primer sol·liciteu les actualitzacions de presència del contacte.\n\n<small>S\'utilitzaran per determinar quin(s) client(s) està fent servir.</small></string>
   <string name="request_now">Sol·licita ara</string>
-  <string name="delete_fingerprint">Elimina l\'empremta digital</string>
-  <string name="sure_delete_fingerprint">Confirmeu que voleu eliminar l\'empremta digital?</string>
   <string name="ignore">Ignora</string>
   <string name="without_mutual_presence_updates"><b>Avís:</b>L\'enviament sense actualitzacions de presència mútues pot causar problemes inesperats.\n\n<small>Aneu als detalls del contacte per verificar les subscripcions de presència.</small></string>
   <string name="pref_security_settings">Seguretat</string>
@@ -291,7 +279,6 @@
   <string name="pref_conference_name_summary">Utilitzeu el tema en comptes de JID per identificar els xats del grup</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>
   <string name="conference_members_only">Aquest xat en grup només és de membres</string>
@@ -313,19 +300,8 @@
   <string name="show_qr_code">Mostra el codi de barres 2D</string>
   <string name="show_block_list">Mostra la llista de bloqueig</string>
   <string name="account_details">Detalls del compte</string>
-  <string name="verify_otr">Verificar OTR</string>
-  <string name="remote_fingerprint">Empremta digital remota</string>
-  <string name="shared_secret_hint">Pista o pregunta</string>
-  <string name="shared_secret_secret">Secret compartit</string>
   <string name="confirm">Confirmar</string>
-  <string name="in_progress">En progrés</string>
-  <string name="respond">Respondre</string>
-  <string name="secrets_do_not_match">Els secrets no coincideixen</string>
   <string name="try_again">Intenta una altra vegada</string>
-  <string name="finish">Acabat</string>
-  <string name="verified">Verificat</string>
-  <string name="smp_requested">Sol.licitar una verificació per SMP del contacte</string>
-  <string name="no_otr_session_found">Cap sessió OTR ha estat trobada!</string>
   <string name="conversations_foreground_service">Converses</string>
   <string name="pref_keep_foreground_service">Mantenir el servei en primer pla</string>
   <string name="pref_keep_foreground_service_summary">Evitar que el sistema operatiu desconnecti la connexió</string>
@@ -346,16 +322,11 @@
   <string name="file_deleted">L\'arxiu ha sigut eliminat</string>
   <string name="no_application_found_to_open_file">Cap aplicació trobada a l\'obrir l\'arxiu</string>
   <string name="no_application_found_to_open_link">No s\'ha trobat cap aplicació per obrir el vincle</string>
-  <string name="could_not_verify_fingerprint">No s\'ha pogut verificar l\'empremta dactilar</string>
-  <string name="manually_verify">Verificat manualment</string>
-  <string name="are_you_sure_verify_fingerprint">Estàs segur que vols verificar l\'empremta digital OTR del teu contacte?</string>
-  <string name="pref_show_dynamic_tags">Mostrar etiquetes dinàmiques</string>
   <string name="pref_show_dynamic_tags_summary">Mostra etiquetes de nomès lectura per sota dels noms dels contactes</string>
   <string name="enable_notifications">Habilitar notificació</string>
   <string name="no_conference_server_found">No s\'ha trobat cap servidor de xat de grup</string>
   <string name="conference_creation_failed">No s\'ha pogut crear el xat de grup</string>
   <string name="account_image_description">Avatar del compte</string>
-  <string name="copy_otr_clipboard_description">Copiar l\'empremta digital OTR al portapapers</string>
   <string name="copy_omemo_clipboard_description">Copieu l\'empremta digital OMEMO al porta-retalls</string>
   <string name="regenerate_omemo_key">Regenerar la clau OMEMO</string>
   <string name="clear_other_devices">Esborra els dispositius</string>
@@ -365,20 +336,12 @@ anunciar, però és possible que no rebeu missatges enviats mentre
 mentrestant.</string>
   <string name="error_no_keys_to_trust_server_error">No hi ha claus utilitzables per a aquest contacte.\nEls fitxers noves del servidor no han tingut èxit. Potser hi ha alguna cosa malament amb el servidor del vostre contacte.</string>
   <string name="error_no_keys_to_trust_presence">No hi ha claus disponibles per a aquest contacte.\nAssegureu-vos que teniu una subscripció de presència mútua.</string>
-  <string name="error_no_keys_to_trust">No hi ha claus disponibles per a aquest contacte. Si heu purgat qualsevol de les claus, heu de generar-ne de noves.</string>
   <string name="error_trustkeys_title">Alguna cosa ha anat malament</string>
   <string name="fetching_history_from_server">Anar a cercar la història als servidors</string>
   <string name="no_more_history_on_server">No hi ha més histories al servidor</string>
   <string name="updating">Actualitzant</string>
   <string name="password_changed">Contrasenya canviada</string>
   <string name="could_not_change_password">No s\'ha pogut canviar la contrasenya</string>
-  <string name="otr_session_not_started">Començar a enviar un missatge de conversació xifrat</string>
-  <string name="ask_question">Fer una pregunta</string>
-  <string name="smp_explain_question">Si vosté i el seu contacte tenen un secret en comú que ningú més sap (com una broma o simplement el que vau dinar l\'última vegada que es van trobar) pot utilitzar aquest secret per comprovar les empremtes de cadascú.\n\nProporcionaràs una pista o una pregunta a la que el seu contacte donarà una resposta, que distingeix entre majúscules i minúscules.</string>
-  <string name="smp_explain_answer">El seu contacte l\'hi agradaria verificar la seva empremta digital per un repte amb un secret compartit.El seu contacte proporciona el següent suggeriment o pregunta per aquest secret.</string>
-  <string name="shared_secret_hint_should_not_be_empty">El seu suggeriment no pot estar buit</string>
-  <string name="shared_secret_can_not_be_empty">El teu secret compartit no pot estar buit</string>
-  <string name="manual_verification_explanation">Compari acuradament l\'empremta digital que és mostra a continuació amb la empremta digital del seu contacte.\n\ També pots utilitzar alguna forma de confiança d la comunicació com a correu electrònic xifrat o alguna trucada telefònica per intercanviar-lo</string>
   <string name="change_password">Cambiar contrasenya</string>
   <string name="current_password">Contrasenya actual</string>
   <string name="new_password">Nova contrasenya</string>
@@ -427,7 +390,6 @@ mentrestant.</string>
   <string name="apk">Aplicació d\'Android</string>
   <string name="vcard">Contacte</string>
   <string name="received_x_file">Rebut %s</string>
-  <string name="disable_foreground_service">Deshabilitat el servei de primer pla</string>
   <string name="touch_to_open_conversations">Tocar per obrir les conversacions</string>
   <string name="avatar_has_been_published">L\'avatar ha sigut publicat!</string>
   <string name="sending_x_file">Enviant %s</string>
@@ -532,14 +494,6 @@ mostrar els noms i avatars complets.\n\nConversations només
 llegeix els vostres contactes i els relacionaran localment sense haver
  de penjar-les al vostre servidor.\n\nAra se us demanarà que 
 concediu permís per accedir als teus contactes.</string>
-  <string name="certificate_information">Informació del certificat</string>
-  <string name="certificate_subject">Subjecte</string>
-  <string name="certificate_issuer">Emissor</string>
-  <string name="certificate_cn">Nom comú</string>
-  <string name="certificate_o">Organització</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(No està disponible)</string>
-  <string name="certificate_not_found">No s\'ha trobat cap certificat</string>
   <string name="notify_on_all_messages">Notifica a tots els missatges</string>
   <string name="notify_only_when_highlighted">Notifica només quan s\'esmenta</string>
   <string name="notify_never">S\'han desactivat les notificacions</string>
@@ -579,9 +533,7 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="pick_your_username">Tria el teu nom d\'usuari</string>
   <string name="pref_manually_change_presence">Gestioneu la disponibilitat manualment</string>
   <string name="pref_manually_change_presence_summary">Establir la vostra disponibilitat en editar el vostre missatge d\'estat.</string>
-  <string name="change_presence">Canvi de presència</string>
   <string name="status_message">Missatge d\'estat</string>
-  <string name="all_accounts_on_this_device">Estableix per a tots els comptes d\'aquest dispositiu</string>
   <string name="presence_chat">Lliure per xatejar</string>
   <string name="presence_online">En línia</string>
   <string name="presence_away">Lluny</string>
@@ -589,13 +541,9 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="presence_dnd">Ocupat</string>
   <string name="secure_password_generated">S\'ha generat una contrasenya segura</string>
   <string name="device_does_not_support_battery_op">El dispositiu no admet l\'exclusió de l\'optimització de la bateria</string>
-  <string name="show_password">Ensenya la contrasenya</string>
   <string name="registration_please_wait">Error de registre: torna-ho a provar més tard</string>
   <string name="registration_password_too_weak">Ha fallat la inscripció: la contrasenya és massa feble</string>
-  <string name="create_conference">Crea un xat en grup</string>
   <string name="dialog_title_create_conference">Crea un Xat en Grup</string>
-  <string name="join_or_create_conference">Uniu-vos o creeu un xat en grup</string>
-  <string name="conference_subject">Subjecte</string>
   <string name="choose_participants">Tria els participants</string>
   <string name="creating_conference">S\'està creant el xat en grup...</string>
   <string name="invite_again">Torna a convidar</string>
@@ -626,11 +574,6 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
   <string name="no_permission_to_access_x">No hi ha permís per accedir %s</string>
   <string name="remote_server_not_found">El servidor remot no s\'ha trobat</string>
   <string name="unable_to_update_account">No es pot actualitzar el compte</string>
-  <string name="missing_presence_subscription_with_x">Falta la subscripció a la presència amb %s</string>
-  <string name="missing_keys_from_x">S\'han perdut les claus OMEMO de %s</string>
-  <string name="missing_omemo_keys">Falten les claus OMEMO</string>
-  <string name="wrong_conference_configuration">No és un xat en grup privat i no anònim.</string>
-  <string name="this_conference_has_no_members">No hi ha membres en aquest xat en grup.</string>
   <string name="report_jid_as_spammer">Informar d\'aquest JID com l\'enviament de missatges no desitjats.</string>
   <string name="pref_delete_omemo_identities">Elimineu les identitats OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenereu les vostres claus OMEMO. Tots els contactes hauran de tornar-vos a verificar. Utilitzeu això només com a últim recurs.</string>
@@ -731,12 +674,10 @@ d\'altres proveïdors donant-los la vostra ID Jabber completa.</string>
 d\'afegir Converses a la llista d\'aplicacions protegides.</string>
   <string name="mtm_accept_cert">Voleu acceptar un certificat desconegut?</string>
   <string name="mtm_trust_anchor">El certificat del servidor no està signat per una autoritat de certificació coneguda.</string>
-  <string name="mtm_cert_expired">El certificat del servidor ha caducat.</string>
   <string name="mtm_accept_servername">Voleu acceptar el nom del servidor associat?</string>
   <string name="mtm_hostname_mismatch">El servidor no s\'ha pogut autenticar com \" 1%s \". El certificat només és vàlid per a:</string>
   <string name="mtm_connect_anyway">Voleu connectar de totes maneres?</string>
   <string name="mtm_cert_details">Detalls del certificat:</string>
-  <string name="mtm_notification">Verificació del certificat</string>
   <string name="once">Un cop</string>
   <string name="qr_code_scanner_needs_access_to_camera">L\'escàner de codi QR necessita accés a la càmera</string>
   <string name="pref_scroll_to_bottom">Desplaça\'t cap a la part inferior</string>

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

@@ -74,7 +74,6 @@
   <string name="choose_presence">Vybrat přístroj</string>
   <string name="send_unencrypted_message">Odeslat nešifrovanou zprávu</string>
   <string name="send_message_to_x">Odeslat zprávu pro %s</string>
-  <string name="send_otr_message">Poslat OTR šifrovanou zprávu</string>
   <string name="send_omemo_message">Poslat OMEMO šifrovanou zprávu</string>
   <string name="send_omemo_x509_message">Odeslat v\\OMEMO šifrovanou zprávu</string>
   <string name="send_pgp_message">Poslat OpenPGP šifrovanou zprávu</string>
@@ -157,9 +156,7 @@
   <string name="mgmt_account_are_you_sure">Jste si jisti?</string>
   <string name="attach_record_voice">Nahrát hlas</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="account_settings_password">Heslo</string>
   <string name="account_settings_example_jabber_id">jmeno@server.cz</string>
-  <string name="account_settings_confirm_password">Potvrdit heslo</string>
   <string name="password">Heslo</string>
   <string name="invalid_jid">Toto není platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatek paměti. Obrázek je příliš velký</string>
@@ -185,11 +182,7 @@
   <string name="last_seen_day">naposledy spatřen před 1 dnem</string>
   <string name="last_seen_days">naposledy spatřen před %d dny</string>
   <string name="install_openkeychain">Šifrovaná zpráva. Nainstaluje prosím OpenKeychain pro dešifrování.</string>
-  <string name="unknown_otr_fingerprint">Neznámý OTR identifikátor</string>
   <string name="openpgp_messages_found">Nalezena OpenPGP šifrovaná zpráva</string>
-  <string name="your_fingerprint">Váš identifikátor</string>
-  <string name="otr_fingerprint">OTR identifikátor</string>
-  <string name="otr_fingerprint_selected_message">OTR otisk zprávy</string>
   <string name="openpgp_key_id">OpenPGP ID klíče</string>
   <string name="omemo_fingerprint">OMEMO otisk</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO otisk</string>
@@ -199,7 +192,6 @@
   <string name="trust_omemo_fingerprints">Věřit OMEMO otiskům</string>
   <string name="fetching_keys">Získávání klíčů...</string>
   <string name="done">Hotovo</string>
-  <string name="verify">Ověřit</string>
   <string name="decrypt">Dešifrovat</string>
   <string name="search">Hledat</string>
   <string name="enter_contact">Vložit kontakt</string>
@@ -237,11 +229,8 @@
   <string name="disable_notifications">Vypnout upozornění</string>
   <string name="enable">Povolit</string>
   <string name="enter_password">Vložit heslo</string>
-  <string name="missing_presence_subscription">Chybí informace o změnách stavu</string>
   <string name="request_presence_updates">Nejdříve si prosím vyžádejte povolení o zasílání změn stavu kontaktu.\n\n<small>To bude poté použito pro zjištění jakou aplikaci tento kontakt používá.</small></string>
   <string name="request_now">Ihned vyžádat</string>
-  <string name="delete_fingerprint">Smazat identifikátor</string>
-  <string name="sure_delete_fingerprint">Chcete opravdu smazat tento identifikátor?</string>
   <string name="ignore">Ignorovat</string>
   <string name="without_mutual_presence_updates"><b>Varování:</b> Odeslání bez povolení změn stavu může způsobit nečekané problémy na obou stranách.\n\n<small>Přejdi na detaily kontaktu pro ověření povolení o změnách stavu.</small></string>
   <string name="pref_security_settings">Zabezpečení</string>
@@ -261,7 +250,6 @@
   <string name="pref_use_indicate_received_summary">Přijaté zprávy budou označeny zeleně, pokud je funkce podporována</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Obarvit tlačítko odesílání barvou indikující stavu kontaktu</string>
   <string name="pref_expert_options_other">Další</string>
-  <string name="toast_message_otr_fingerprint">OTR otisk zkopírován do schránky!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO otisk zkopírován do schránky!</string>
   <string name="using_account">za použití účtu %s</string>
   <string name="checking_x">Ověřuji %s na HTTP hostiteli</string>
@@ -275,19 +263,8 @@
   <string name="url_copied_to_clipboard">URL zkopírováno do schránky</string>
   <string name="show_block_list">Zobrazit seznam blokovaných</string>
   <string name="account_details">Detaily účtu</string>
-  <string name="verify_otr">Ověřit OTR</string>
-  <string name="remote_fingerprint">Vzdálený otisk</string>
-  <string name="shared_secret_hint">Nápověda nebo Otázka</string>
-  <string name="shared_secret_secret">Sdílené tajemství</string>
   <string name="confirm">Potvrdit</string>
-  <string name="in_progress">Probíhá</string>
-  <string name="respond">Odpovědět</string>
-  <string name="secrets_do_not_match">Tajemství se neshodují</string>
   <string name="try_again">Zkusit znovu</string>
-  <string name="finish">Dokončit</string>
-  <string name="verified">Ověřeno!</string>
-  <string name="smp_requested">Kontakt zažádal o ověření SMP</string>
-  <string name="no_otr_session_found">Nebylo nalezeno platné OTR sezení!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Ponechat službu v popředí</string>
   <string name="pref_keep_foreground_service_summary">Zamezit operačnímu systému v ukončení připojení</string>
@@ -307,30 +284,18 @@
   <string name="file_transmission_failed">přenos souboru selhal</string>
   <string name="file_deleted">Soubor byl smazán</string>
   <string name="no_application_found_to_open_file">Nebyla nalezena aplikace umožňující otevření souboru</string>
-  <string name="could_not_verify_fingerprint">Ověření otisku se nezdařilo</string>
-  <string name="manually_verify">Ruční ověření</string>
-  <string name="pref_show_dynamic_tags">Zobrazit dynamické tagy</string>
   <string name="pref_show_dynamic_tags_summary">Zobrazit tagy pro čtení pod kontakty</string>
   <string name="enable_notifications">Povolit upozornění</string>
   <string name="account_image_description">Avatar účtu</string>
-  <string name="copy_otr_clipboard_description">Zkopírovat otisk OTR do schránky</string>
   <string name="copy_omemo_clipboard_description">Zkopírovat OMEMO otisk do schránky</string>
   <string name="regenerate_omemo_key">Znovu vytvořit OMEMO klíč</string>
   <string name="clear_other_devices">Smazat přístroje</string>
   <string name="clear_other_devices_desc">Opravdu chcete vymazat ostatní přístroje z OMEMO upozornění? Až se příště tyto přístroje připojí, znovu se ohlásí, ale pravděpodobně neobdrží zprávy odeslané v mezičase mezi přihlášeními.</string>
-  <string name="error_no_keys_to_trust">Pro tento kontakt nejsou dostupné žádné použitelné klíče. Pokud jste smazali jakýkoliv z jeho klíčů bude třeba vygenerovat nové.</string>
   <string name="fetching_history_from_server">Načíst historii ze serveru</string>
   <string name="no_more_history_on_server">Na serveru není žádná další historie</string>
   <string name="updating">Aktualizuji...</string>
   <string name="password_changed">Heslo změněno!</string>
   <string name="could_not_change_password">Nelze změnit heslo</string>
-  <string name="otr_session_not_started">Zaslat zprávu pro spuštění šifrovaného chatu</string>
-  <string name="ask_question">Položit otázku</string>
-  <string name="smp_explain_question">Pokud máte vy i váš kontakt společné tajemství které neví nikdo jiný (něco jako společný vtip nebo co jste spolu měli k obědu při svém posledním setkání), můžete toto tajemství použít pro ověření pravosti svých šifrovacích otisků.\n\nZadáte nápovědu nebo otázku a kontakt na ni správně odpoví.</string>
-  <string name="smp_explain_answer">Váš kontakt by rád ověřil pravost šifrovacího otisku dotazem na společné tajemství. Váš kontakt zadal následující nápovědu nebo otázku pro zodpovězení tajemství.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Nápověda by měla být vyplněna</string>
-  <string name="shared_secret_can_not_be_empty">Společně tajemství nemůže být nevyplněno</string>
-  <string name="manual_verification_explanation">Opatrně porovnejte otisk zobrazený níže s otiskem vašeho kontatku.\nMůžete využít jakoukoliv bezpečnou formu komunikace pro jejich výměnu, jako třeba šifrovaný email nebo telefonát.</string>
   <string name="change_password">Změnit heslo</string>
   <string name="current_password">Současné heslo</string>
   <string name="new_password">Nové heslo</string>
@@ -368,7 +333,6 @@
   <string name="apk">Aplikace pro Android</string>
   <string name="vcard">Kontakt</string>
   <string name="received_x_file">%s přijat</string>
-  <string name="disable_foreground_service">Vypnout službu v popředí</string>
   <string name="touch_to_open_conversations">Ťuknout pro otevření Konverzace</string>
   <string name="avatar_has_been_published">Avatar byl zveřejněn!</string>
   <string name="sending_x_file">Odesílám %s</string>
@@ -461,14 +425,6 @@
   <string name="shared_text_with_x">Text sdílen s %s</string>
   <string name="sync_with_contacts">Synchronizovat s kontakty</string>
   <string name="sync_with_contacts_long">Aplikace Conversations by ráda porovnala svůj XMPP seznam s vašimi kontakty, aby mohla zobrazit plná jména a avatary.\n\nConversations načte a porovná kontakty pouze lokálně, bez jejich nahrávání na server.\n\nNyní budete dotázáni na udělení práv pro přístup k seznamu kontaktů.</string>
-  <string name="certificate_information">Informace certifikátu</string>
-  <string name="certificate_subject">Předmět</string>
-  <string name="certificate_issuer">Vydavatel</string>
-  <string name="certificate_cn">Jméno</string>
-  <string name="certificate_o">Organizace</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Nedostupné)</string>
-  <string name="certificate_not_found">Certifikát nenalezen</string>
   <string name="notify_on_all_messages">Upozorňovat na všechny zprávy</string>
   <string name="notify_never">Upozornění vypnuta</string>
   <string name="notify_paused">Upozornění pozastavena</string>
@@ -495,9 +451,7 @@
   <string name="create_account">Vytvořit účet</string>
   <string name="use_own_provider">Použít vlastního provozovatele</string>
   <string name="pick_your_username">Zadejte své uživatelské jméno</string>
-  <string name="change_presence">Změnit dostupnost</string>
   <string name="status_message">Stavová zpráva</string>
-  <string name="all_accounts_on_this_device">Nastavit pro všechny účty na tomto přístroji</string>
   <string name="presence_chat">Volný pro chat</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Pryč</string>
@@ -505,10 +459,8 @@
   <string name="presence_dnd">Zaneprázdněný</string>
   <string name="secure_password_generated">Bylo vygenerováno bezpečné heslo</string>
   <string name="device_does_not_support_battery_op">Tento přístroj nepodporuje vypnutí možnosti optimalizace využití baterie</string>
-  <string name="show_password">Zobrazit heslo</string>
   <string name="registration_please_wait">Registrace selhala: Zkuste znovu později</string>
   <string name="registration_password_too_weak">Registrace selhala: Příliš slabé heslo</string>
-  <string name="conference_subject">Předmět</string>
   <string name="choose_participants">Vybrat účastníky</string>
   <string name="invite_again">Pozvat znovu</string>
   <string name="gp_short">Krátký</string>
@@ -538,9 +490,6 @@
   <string name="no_permission_to_access_x">Chybí oprávnění přistupovat k %s</string>
   <string name="remote_server_not_found">Vzdálený server nebyl nalezen</string>
   <string name="unable_to_update_account">Nelze aktualizovat účet</string>
-  <string name="missing_presence_subscription_with_x">Chybí informace o změnách stavu od %s.</string>
-  <string name="missing_keys_from_x">Chybí OMEMO klíče od %s.</string>
-  <string name="missing_omemo_keys">Chybí OMEMO klíče</string>
   <string name="report_jid_as_spammer">Nahlásit toto JID jako odesilatele nevyžádaného obsahu.</string>
   <string name="pref_delete_omemo_identities">Smazat OMEMO identity</string>
   <string name="pref_delete_omemo_identities_summary">Znovu vygenerovat OMEMO klíče. Vyžaduje potvrzení od všech vašich kontaktů. POužijte pouze jako poslední řešení.</string>

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

@@ -49,6 +49,7 @@
   <string name="start_conversation">Unterhaltung beginnen</string>
   <string name="invite_contact">Kontakt einladen</string>
   <string name="contacts">Kontakte</string>
+  <string name="contact">Kontakt</string>
   <string name="cancel">Abbrechen</string>
   <string name="set">Einstellen</string>
   <string name="add">Hinzufügen</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Unverschlüsselt schreiben…</string>
   <string name="send_message">Nachricht senden</string>
   <string name="send_message_to_x">Sende Nachricht an %s</string>
-  <string name="send_otr_message">OTR-verschlüsselt schreiben…</string>
   <string name="send_omemo_message">OMEMO-verschlüsselt schreiben…</string>
   <string name="send_omemo_x509_message">v\\OMEMO-verschlüsselte Nachricht senden</string>
   <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben…</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Sprache aufzeichnen</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="block_jabber_id">Sperre Jabber-ID</string>
-  <string name="account_settings_password">Passwort</string>
   <string name="account_settings_example_jabber_id">benutzer@domain.de</string>
-  <string name="account_settings_confirm_password">Passwort bestätigen</string>
   <string name="password">Passwort</string>
   <string name="invalid_jid">Ungültige Jabber-ID</string>
   <string name="error_out_of_memory">Zu wenig Speicher vorhanden. Das Bild ist zu groß</string>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">vor einem Tag gesehen</string>
   <string name="last_seen_days">vor %d Tagen gesehen</string>
   <string name="install_openkeychain">Verschlüsselte Nachricht. Bitte installiere OpenKeychain zur Entschlüsselung.</string>
-  <string name="unknown_otr_fingerprint">Unbekannter OTR-Fingerabdruck</string>
   <string name="openpgp_messages_found">Verschlüsselte OpenPGP-Nachricht gefunden</string>
-  <string name="your_fingerprint">Dein Fingerabdruck</string>
-  <string name="otr_fingerprint">OTR-Fingerabdruck</string>
-  <string name="otr_fingerprint_selected_message">OTR-Fingerabdruck der Nachricht</string>
   <string name="openpgp_key_id">OpenPGP Schlüssel-ID</string>
   <string name="omemo_fingerprint">OMEMO-Fingerabdruck</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO-Fingerabdruck</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">OMEMO-Fingerabdruck vertrauen</string>
   <string name="fetching_keys">Schlüssel werden abgerufen …</string>
   <string name="done">Fertig</string>
-  <string name="verify">Überprüfen</string>
   <string name="decrypt">Entschlüsseln</string>
   <string name="conferences">Gruppenchats</string>
   <string name="search">Suchen</string>
-  <string name="create_contact">Kontakt erstellen</string>
   <string name="dialog_title_create_contact">Kontakt erstellen</string>
   <string name="enter_contact">Kontakt eingeben</string>
   <string name="join_conference">Gruppenchat beitreten</string>
@@ -263,11 +255,8 @@
   <string name="enable">Aktivieren</string>
   <string name="conference_requires_password">Gruppenchat ist passwortgeschützt</string>
   <string name="enter_password">Passwort eingeben</string>
-  <string name="missing_presence_subscription">Online-Status nicht vorhanden</string>
   <string name="request_presence_updates">Bitte erst Online-Status vom Kontakt anfragen.\n\n<small>Dies wird verwendet, um festzustellen, welche Client(s) der Kontakt benutzt.</small></string>
   <string name="request_now">Jetzt anfordern</string>
-  <string name="delete_fingerprint">Fingerabdruck löschen</string>
-  <string name="sure_delete_fingerprint">Soll dieser Fingerabdruck wirklich gelöscht werden?</string>
   <string name="ignore">Ignorieren</string>
   <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</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">Thema des Gruppenchats anstatt JID als Namen verwenden</string>
   <string name="pref_autojoin">Gruppenchats automatisch beitreten</string>
   <string name="pref_autojoin_summary">Autojoin-Flag in Gruppenchatlesezeichen beachten</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 aus diesem Gruppenchat ausgeschlossen</string>
   <string name="conference_members_only">Dieser Gruppenchat ist nur für Mitglieder</string>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">Barcode anzeigen</string>
   <string name="show_block_list">Sperrliste anzeigen</string>
   <string name="account_details">Kontodetails</string>
-  <string name="verify_otr">OTR prüfen</string>
-  <string name="remote_fingerprint">Fingerabdruck der Gegenseite</string>
-  <string name="shared_secret_hint">Hinweis oder Frage</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="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>
-  <string name="smp_requested">Kontakt fordert eine Überprüfung an</string>
-  <string name="no_otr_session_found">Keine gültige OTR-Sitzung gefunden!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Dienst im Vordergrund ausführen</string>
   <string name="pref_keep_foreground_service_summary">Verhindert, dass Android Conversations beendet und die Verbindung unterbricht</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">Datei wurde gelöscht</string>
   <string name="no_application_found_to_open_file">Keine Anwendung zum Öffnen der Datei gefunden</string>
   <string name="no_application_found_to_open_link">Keine App gefunden, um diesen Link zu öffnen</string>
-  <string name="could_not_verify_fingerprint">Fingerabdruck konnte nicht überprüft werden</string>
-  <string name="manually_verify">Manuell überprüfen</string>
-  <string name="are_you_sure_verify_fingerprint">Bist du sicher, dass du den OTR-Fingerabdruck des Kontakts überprüfen willst?</string>
-  <string name="pref_show_dynamic_tags">Dynamische Tags anzeigen</string>
+  <string name="pref_show_dynamic_tags">Dynamische Tags</string>
   <string name="pref_show_dynamic_tags_summary">Schreibgeschütze Tags unterhalb der Kontakte anzeigen</string>
   <string name="enable_notifications">Benachrichtigungen aktivieren</string>
   <string name="no_conference_server_found">Keinen Gruppenchatserver gefunden</string>
   <string name="conference_creation_failed">Erstellen des Gruppenchats fehlgeschlagen!</string>
   <string name="account_image_description">Konto-Avatar</string>
-  <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string>
   <string name="copy_omemo_clipboard_description">OMEMO-Fingerabdruck in Zwischenablage kopieren</string>
   <string name="regenerate_omemo_key">OMEMO-Schlüssel erneuern</string>
   <string name="clear_other_devices">Geräte entfernen</string>
   <string name="clear_other_devices_desc">Alle anderen Geräte aus der OMEMO-Bekanntmachung entfernen? Die Bekanntmachung wird bei der nächsten Verbindung erneuert, möglicherweise werden aber nicht alle Nachrichten empfangen, die in der Zwischenzeit versendet wurden.</string>
   <string name="error_no_keys_to_trust_server_error">Für diesen Kontakt sind keine nutzbaren Schlüssel verfügbar.\nDas Abrufen neuer Schlüssel vom Server ist fehlgeschlagen. Vielleicht gitb es ein Problem mit dem Server deines Kontaktes.</string>
   <string name="error_no_keys_to_trust_presence">Für diesen Kontakt sind keine benutzbaren Schlüssel verfügbar.\nStelle sicher, dass du den gegenseitigen Online-Status aktiviert hast.</string>
-  <string name="error_no_keys_to_trust">Für diesen Kontakt sind keine benutzbaren Schlüssel verfügbar. Falls sie gelöscht wurden, müssen diese neu erstellt werden.</string>
   <string name="error_trustkeys_title">Etwas ist schief gelaufen</string>
   <string name="fetching_history_from_server">Lade Chatverlauf…</string>
   <string name="no_more_history_on_server">Keine weiteren Nachrichten vorhanden</string>
   <string name="updating">Aktualisieren…</string>
   <string name="password_changed">Passwort geändert.</string>
   <string name="could_not_change_password">Passwort kann nicht geändert werden.</string>
-  <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 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 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>
   <string name="new_password">Neues Passwort</string>
@@ -424,7 +389,6 @@
   <string name="apk">Android App</string>
   <string name="vcard">Kontakt</string>
   <string name="received_x_file">%s empfangen</string>
-  <string name="disable_foreground_service">Vordergrund-Dienst deaktivieren</string>
   <string name="touch_to_open_conversations">Antippen, um Conversations zu öffnen</string>
   <string name="avatar_has_been_published">Avatar wurde gespeichert</string>
   <string name="sending_x_file">%s wird gesendet</string>
@@ -525,14 +489,6 @@
   <string name="no_camera_permission">Conversations benötigt Zugriff auf die Kamera</string>
   <string name="sync_with_contacts">Mit Kontakten synchronisieren</string>
   <string name="sync_with_contacts_long">Conversations möchte deine XMPP-Kontaktliste mit deinen Kontakten abgleichen, um deren vollständige Namen und Avatare anzuzeigen.\n\nConversations wird deine Kontakte nur lokal lesen, abgleichen und überträgt diese nicht auf den Server.\n\nDu wirst nun gefragt, ob du den Zugriff auf deine Kontakte erlauben möchtest.</string>
-  <string name="certificate_information">Zertifikatinformationen</string>
-  <string name="certificate_subject">Betreff</string>
-  <string name="certificate_issuer">Aussteller</string>
-  <string name="certificate_cn">Name</string>
-  <string name="certificate_o">Organisation</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Nicht verfügbar)</string>
-  <string name="certificate_not_found">Kein Zertifikat gefunden</string>
   <string name="notify_on_all_messages">Bei allen Nachrichten benachrichtigen</string>
   <string name="notify_only_when_highlighted">Nur benachrichtigen, wenn ich erwähnt werde</string>
   <string name="notify_never">Benachrichtigungen deaktiviert</string>
@@ -564,9 +520,7 @@
   <string name="pick_your_username">Wähle deinen Benutzernamen</string>
   <string name="pref_manually_change_presence">Status manuell ändern</string>
   <string name="pref_manually_change_presence_summary">Lege deinen Status fest, wenn du deine Statusnachricht bearbeitest.</string>
-  <string name="change_presence">Status ändern</string>
   <string name="status_message">Statusnachricht</string>
-  <string name="all_accounts_on_this_device">Für alle Konten dieses Gerätes festlegen</string>
   <string name="presence_chat">Frei zum Chatten</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Weg</string>
@@ -574,13 +528,9 @@
   <string name="presence_dnd">Beschäftigt</string>
   <string name="secure_password_generated">Ein sicheres Passwort wurde erstellt</string>
   <string name="device_does_not_support_battery_op">Dein Gerät unterstützt kein Ausschalten der Batterieoptimierung</string>
-  <string name="show_password">Passwort anzeigen</string>
   <string name="registration_please_wait">Fehlgeschlagen: Bitte später versuchen.</string>
   <string name="registration_password_too_weak">Registrierung fehlgeschlagen; Passwort zu schwach</string>
-  <string name="create_conference">Gruppenchat erstellen</string>
   <string name="dialog_title_create_conference">Gruppenchat erstellen</string>
-  <string name="join_or_create_conference">Gruppenchat beitreten oder erstellen</string>
-  <string name="conference_subject">Thema</string>
   <string name="choose_participants">Mitglieder wählen</string>
   <string name="creating_conference">Erstelle Gruppenchat…</string>
   <string name="invite_again">Erneut einladen</string>
@@ -611,11 +561,6 @@
   <string name="no_permission_to_access_x">Keine Berechtigung um auf %s zuzugreifen</string>
   <string name="remote_server_not_found">Remote-Server nicht gefunden</string>
   <string name="unable_to_update_account">Konto kann nicht aktualisiert werden.</string>
-  <string name="missing_presence_subscription_with_x">Fehlender Online-Status von %s.</string>
-  <string name="missing_keys_from_x">OMEMO-Schlüssel von %s fehlen.</string>
-  <string name="missing_omemo_keys">OMEMO-Schlüssel fehlen</string>
-  <string name="wrong_conference_configuration">Dies ist kein privater, nicht-anonymer Gruppenchat.</string>
-  <string name="this_conference_has_no_members">Dieser Gruppenchat hat keine Teilnehmer.</string>
   <string name="report_jid_as_spammer">Melde die JID als Sender unerwünschter Nachrichten.</string>
   <string name="pref_delete_omemo_identities">OMEMO-Identitäten zurücksetzen</string>
   <string name="pref_delete_omemo_identities_summary">Regeneriere deine OMEMO-Schlüssel. Alle deine Kontakte müssen dich neu verifizieren. Nutze dies als letzten Ausweg.</string>
@@ -714,12 +659,10 @@
   <string name="huawei_protected_apps_summary">Um weiterhin Benachrichtigungen zu erhalten, auch wenn der Bildschirm ausgeschaltet ist, musst du Conversations zur Liste der geschützten Apps hinzufügen.</string>
   <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
   <string name="mtm_trust_anchor">Das Serverzertifikat wurde nicht von einer bekannten Zertifizierungsstelle signiert.</string>
-  <string name="mtm_cert_expired">Das Serverzertifikat ist abgelaufen.</string>
   <string name="mtm_accept_servername">Nicht übereinstimmenden Servernamen akzeptieren?</string>
   <string name="mtm_hostname_mismatch">Server konnte sich nicht als \"%s\" authentifizieren. Das Zertifikat ist nur gültig für:</string>
   <string name="mtm_connect_anyway">Möchtest du trotzdem eine Verbindung herstellen?</string>
   <string name="mtm_cert_details">Zertifikatsdetails:</string>
-  <string name="mtm_notification">Zertifikatsüberprüfung</string>
   <string name="once">Einmalig</string>
   <string name="qr_code_scanner_needs_access_to_camera">Der QR-Codescanner benötigt Zugriff auf die Kamera.</string>
   <string name="pref_scroll_to_bottom">Nach unten scrollen</string>
@@ -733,4 +676,18 @@
   <string name="error_trustkey_hint_mutual">Tipp: In manchen Fällen kann dies behoben werden, indem man sich gegenseitig die Kontaktlisten hinzufügt.</string>
   <string name="disable_encryption_message">Bist du sicher, dass du die OMEMO-Verschlüsselung für dieses Gespräch deaktivieren möchtest?\nDies wird es deinem Serveradministrator ermöglichen, deine Nachrichten zu lesen, aber es könnte die einzige Möglichkeit sein, mit Personen zu kommunizieren, die veraltete Clients verwenden. </string>
   <string name="disable_now">Jetzt deaktivieren</string>
+  <string name="draft">Entwurf:</string>
+  <string name="pref_omemo_setting">OMEMO-Verschlüsselung</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO wird immer für persönliche Unterhaltungen und private Gruppenchats verwendet.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO wird standardmäßig für neue Unterhaltungen verwendet.</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO muss für neue Unterhaltungen explizit eingeschaltet werden.</string>
+  <string name="create_shortcut">Verknüpfung erstellen</string>
+  <string name="pref_font_size">Schriftgröße</string>
+  <string name="pref_font_size_summary">Die verwendete relative Schriftgröße innerhalb der App.</string>
+  <string name="default_on">Standardmäßig eingeschaltet</string>
+  <string name="default_off">Standardmäßig ausgeschaltet</string>
+  <string name="small">Klein</string>
+  <string name="medium">Mittel</string>
+  <string name="large">Groß</string>
+  <string name="not_encrypted_for_this_device">Die Nachricht wurde für dieses Gerät nicht verschlüsselt.</string>
 </resources>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Αποστολή κρυπτογραφημένου μηνύματος</string>
   <string name="send_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">Αποστολή v\\OMEMO κρυπτογραφημένου μηνύματος</string>
   <string name="send_pgp_message">Αποστολή κρυπτογραφημένου μηνύματος OpenPGP</string>
@@ -171,9 +170,7 @@
   <string name="attach_record_voice">Εγγραφή φωνής</string>
   <string name="account_settings_jabber_id">ταυτότητα Jabber</string>
   <string name="block_jabber_id">Μπλοκάρετε Jabber ID</string>
-  <string name="account_settings_password">Συνθηματικό</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Επιβεβαίωση συνθηματικού</string>
   <string name="password">Συνθηματικό</string>
   <string name="invalid_jid">Αυτή δεν είναι έγκυρη ταυτότητα Jabber</string>
   <string name="error_out_of_memory">Πλήρης μνήμη. Η εικόνα είναι πολύ μεγάλη</string>
@@ -196,18 +193,13 @@
   <string name="last_seen_day">τελευταία σύνδεσ πριν από 1 μέρα</string>
   <string name="last_seen_days">τελευταία σύνδεση πριν από %d μέρες</string>
   <string name="install_openkeychain">Κρυπτογραφημένο μήνυμα. Παρακαλώ εγκαταστήστε το OpenKeychain για αποκρυπτογράφηση</string>
-  <string name="unknown_otr_fingerprint">Άγνωστο αποτύπωμα OTR</string>
   <string name="openpgp_messages_found">Βρέθηκαν μηνύματα κρυπτογραφημένα με OpenPGP</string>
-  <string name="your_fingerprint">Το αποτύπωμά σας</string>
-  <string name="otr_fingerprint">Αποτύπωμα OTR</string>
   <string name="other_devices">\'Αλλες συσκευές</string>
   <string name="trust_omemo_fingerprints">Εμπιστευτίτε τα OMEMO αποτυπώματα</string>
   <string name="done">Έγινε</string>
-  <string name="verify">Επαλήθευση</string>
   <string name="decrypt">Αποκρυπτογράφηση</string>
   <string name="conferences">Ομαδικές συζητήσεις</string>
   <string name="search">Αναζήτηση</string>
-  <string name="create_contact">Δημιούργησε επαφή</string>
   <string name="dialog_title_create_contact">Δημιούργησε Επαφή</string>
   <string name="enter_contact">Πρόσθεσε επαφή</string>
   <string name="join_conference">Συμμετοχή σε ομαδική συζήτηση</string>
@@ -255,8 +247,6 @@
   <string name="enter_password">Εισαγωγή συνθηματικού</string>
   <string name="request_presence_updates">Παρακαλώ αιτηθείτε ενημερώσεις παρουσίας από την επαφή σας πρώτα.\n\n<small>Αυτό θα χρησιμοποιηθεί για να ταυτοποιηθεί το πρόγραμμα-πελάτης που χρησιμοποιεί η επαφή σας.</small></string>
   <string name="request_now">Αίτηση τώρα</string>
-  <string name="delete_fingerprint">Διαγραφή αποτυπώματος</string>
-  <string name="sure_delete_fingerprint">Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το αποτύπωμα;</string>
   <string name="ignore">Αγνόηση</string>
   <string name="without_mutual_presence_updates"><b>Προειδοποίηση:</b> Η αποστολή αυτού χωρίς αμφίδρομες ενημερώσεις παρουσίας μπορεί να προκαλέσει απροσδόκητα προβλήματα.\n\n<small>Πηγαίνετε στις λεπτομέρειες επαφής για να επαληθεύσετε τις συνδρομές παρουσίας σας.</small></string>
   <string name="pref_security_settings">Ασφάλεια</string>
@@ -274,7 +264,6 @@
   <string name="pref_use_indicate_received_summary">Τα ληφθέντα μηνύματα θα σημειώνονται με ένα πράσινο τικ, αν αυτό υποστηρίζεται</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Χρωματισμός του κουμπιού αποστολής ως ένδειξη κατάστασης επαφής</string>
   <string name="pref_expert_options_other">Άλλο</string>
-  <string name="toast_message_otr_fingerprint">Το αποτύπωμα OTR αντιγράφηκε στο πρόχειρο!</string>
   <string name="using_account">χρήση λογαριασμού %s</string>
   <string name="not_connected_try_again">Δεν είστε συνδεμένοι. Δοκιμάστε ξανά αργότερα</string>
   <string name="message_options">Επιλογές μηνυμάτων</string>
@@ -283,19 +272,8 @@
   <string name="url_copied_to_clipboard">Η διεύθυνση URL αντιγράφηκε στο πρόχειρο</string>
   <string name="show_block_list">Εμφάνιση λίστας αποκλεισμένων</string>
   <string name="account_details">Λεπτομέρειες λογαριασμού</string>
-  <string name="verify_otr">Επαλήθευση OTR</string>
-  <string name="remote_fingerprint">Απομακρυσμένο αποτύπωμα</string>
-  <string name="shared_secret_hint">Υπαινιγμός ή ερώτηση</string>
-  <string name="shared_secret_secret">Κοινό μυστικό</string>
   <string name="confirm">Επιβεβαίωση</string>
-  <string name="in_progress">Σε εξέλιξη</string>
-  <string name="respond">Απάντηση</string>
-  <string name="secrets_do_not_match">Τα μυστικά δεν ταιριάζουν</string>
   <string name="try_again">Επανάληψη</string>
-  <string name="finish">Τέλος</string>
-  <string name="verified">Επαληθέυτηκε!</string>
-  <string name="smp_requested">Η επαφή ζήτησε επαλήθευση SMP</string>
-  <string name="no_otr_session_found">Δεν βρέθηκε έγκυρη συνεδρία OTR!</string>
   <string name="conversations_foreground_service">Συζητήσεις</string>
   <string name="pref_keep_foreground_service">Διατήρηση της υπηρεσίας στο προσκήνιο</string>
   <string name="pref_keep_foreground_service_summary">Αποτρέπει τον τερματισμό της σύνδεσης από το λειτουργικό σύστημα</string>
@@ -311,25 +289,14 @@
   <string name="file_transmission_failed">η μετάδοση του αρχείου απέτυχε</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>
-  <string name="pref_show_dynamic_tags">Εμφάνιση δυναμικών ετικετών</string>
   <string name="pref_show_dynamic_tags_summary">Εμφάνιση ετικετών μόνο για ανάγνωση κάτω από τις επαφές</string>
   <string name="enable_notifications">Ενεργοποίηση ειδοποιήσεων</string>
   <string name="account_image_description">Εικόνα προφίλ λογαριασμού</string>
-  <string name="copy_otr_clipboard_description">Αντιγραφή αποτυπώματος OTR στο πρόχειρο</string>
   <string name="fetching_history_from_server">Ανάκτηση ιστορικού από τον διακομιστή</string>
   <string name="no_more_history_on_server">Δεν υπάρχει άλλο ιστορικό στον διακομιστή</string>
   <string name="updating">Ενημέρωση...</string>
   <string name="password_changed">Επιτυχής αλλαγή συνθηματικου!</string>
   <string name="could_not_change_password">Δεν ήταν δυνατή η αλλαγή του συνθηματικού</string>
-  <string name="otr_session_not_started">Αποστολή μηνύματος για την έναρξη κρυπτογραφημένης συνομιλίας</string>
-  <string name="ask_question">Ερώτηση</string>
-  <string name="smp_explain_question">Αν εσείς και η επαφή σας έχετε ένα κοινό μυστικό που κανείς άλλος δεν γνωρίζει (κάτι σαν δικό σας αστείο ή απλώς τι φάγατε την τελευταία φορά που συναντηθήκατε) μπορείτε να χρησιμοποιήσετε αυτό το μυστικό για να επαληθεύσετε τα αποτυπώματά σας.\n\nΠροσφέρετε έναν υπαινιγμό ή μια ερώτηση για την επαφή σας, που θα απαντήσει με μια φράση στην οποία έχουν διαφοροποίηση τα πεζά από τα κεφαλαία.</string>
-  <string name="smp_explain_answer">Η επαφή σας θα ήθελε να επαληθεύσει το αποτύπωμά σας χρησιμοποιώντας ένα κοινό μυστικό. Η επαφή σας προμήθευση τον παρακάτω υπαινιγμό ή ερώτηση για το μυστικό αυτό.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Ο υπαινιγμός σας δεν μπορεί να είναι κενός</string>
-  <string name="shared_secret_can_not_be_empty">Το κοινό μυστικό σας δεν μπορεί να είναι κενό</string>
-  <string name="manual_verification_explanation">Συγκρίνετε προσεκτικά το αποτύπωμα που φαίνεται παρακάτω με το αποτύπωμα της επαφής σας.\nΜπορείτε να χρησιμοποιήσετε οποιαδήποτε μορφή έμπιστης επικοινωνίας, όπως ένα κρυπτογραφημένο e-mail ή μια τηλεφωνική κλήση για να τα ανταλλάξετε.</string>
   <string name="change_password">Αλλαγή συνθηματικού</string>
   <string name="current_password">Τρέχον συνθηματικό</string>
   <string name="new_password">Νέο συνθηματικό</string>
@@ -362,7 +329,6 @@
   <string name="apk">Εφαρμογή Android</string>
   <string name="vcard">Επαφή</string>
   <string name="received_x_file">Λήψη του %s</string>
-  <string name="disable_foreground_service">Απενεργοποίηση της υπηρεσίας στο προσκήνιο</string>
   <string name="touch_to_open_conversations">Επιλέξτε για να ανοίξετε το Conversations</string>
   <string name="avatar_has_been_published">Η εικόνα προφίλ έχει δημοσιευτεί!</string>
   <string name="sending_x_file">Αποστολή του %s</string>

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

@@ -49,6 +49,7 @@
   <string name="start_conversation">Comenzar conversación</string>
   <string name="invite_contact">Invitar a contacto</string>
   <string name="contacts">Contactos</string>
+  <string name="contact">Contacto</string>
   <string name="cancel">Cancelar</string>
   <string name="set">Establecer</string>
   <string name="add">Añadir</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Enviar mensaje sin cifrar</string>
   <string name="send_message">Enviar mensaje</string>
   <string name="send_message_to_x">Enviar mensaje a %s</string>
-  <string name="send_otr_message">Enviar mensaje cifrado con OTR</string>
   <string name="send_omemo_message">Enviar mensaje cifrado con OMEMO </string>
   <string name="send_omemo_x509_message">Enviar mensaje cifrado v\\OMEMO</string>
   <string name="send_pgp_message">Enviar mensaje cifrado con OpenPGP</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Grabar audio</string>
   <string name="account_settings_jabber_id">Identificador Jabber</string>
   <string name="block_jabber_id">Bloquear Identificador Jabber</string>
-  <string name="account_settings_password">Contraseña</string>
   <string name="account_settings_example_jabber_id">usuario@ejemplo.com</string>
-  <string name="account_settings_confirm_password">Confirmar contraseña</string>
   <string name="password">Contraseña</string>
   <string name="invalid_jid">El identificador no es un identificador Jabber válido</string>
   <string name="error_out_of_memory">Sin memoria. La imagen es demasiado grande</string>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">Visto última vez hace 1 día</string>
   <string name="last_seen_days">Visto última vez hace %d días</string>
   <string name="install_openkeychain">Mensaje cifrado. Por favor instala OpenKeychain para descifrar.</string>
-  <string name="unknown_otr_fingerprint">Huella digital OTR desconocida</string>
   <string name="openpgp_messages_found">Encontrado mensaje cifrado con OpenPGP</string>
-  <string name="your_fingerprint">Tu huella digital</string>
-  <string name="otr_fingerprint">Huella digital OTR</string>
-  <string name="otr_fingerprint_selected_message">Huella digital del mensaje OTR</string>
   <string name="openpgp_key_id">OpenPGP Key ID</string>
   <string name="omemo_fingerprint">Huella digital OMEMO</string>
   <string name="omemo_fingerprint_x509">Huella digital v\\OMEMO</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">Huellas digitales OMEMO de confianza</string>
   <string name="fetching_keys">Buscando claves...</string>
   <string name="done">Hecho</string>
-  <string name="verify">Verificar</string>
   <string name="decrypt">Descifrar</string>
   <string name="conferences">Conversaciones en grupo</string>
   <string name="search">Buscar</string>
-  <string name="create_contact">Crear contacto</string>
   <string name="dialog_title_create_contact">Crear Contacto</string>
   <string name="enter_contact">Introducir contacto</string>
   <string name="join_conference">Unirse a conversación en grupo</string>
@@ -263,11 +255,8 @@
   <string name="enable">Habilitar</string>
   <string name="conference_requires_password">Esta conversación en grupo requiere contraseña</string>
   <string name="enter_password">Introduce la contraseña</string>
-  <string name="missing_presence_subscription">Se ha perdido la suscripción de presencia</string>
   <string name="request_presence_updates">Por favor, solicita la suscripción de presencia a tu contacto primero.\n\n<small>Esto se usará para determinar qué cliente(s) está usando tu contacto.</small></string>
   <string name="request_now">Solicitar ahora</string>
-  <string name="delete_fingerprint">Eliminar huella digital OTR</string>
-  <string name="sure_delete_fingerprint">¿Estás seguro de que quieres eliminar esta huella digital OTR?</string>
   <string name="ignore">Ignorar</string>
   <string name="without_mutual_presence_updates"><b>Aviso:</b> Si envías esto sin suscripción de presencia con tu contacto se podrían producir problemas inesperados.\n\n<small>Verifica la suscripción de presencia en detalles del contacto.</small></string>
   <string name="pref_security_settings">Seguridad</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">Usar el asunto de la conversación en lugar del identificador jabber como nombre en las conversaciones en grupo</string>
   <string name="pref_autojoin">Unirse automáticamente a conversaciones en grupo</string>
   <string name="pref_autojoin_summary">Respetar la opción de los marcadores de unirse automáticamente a las conversaciones en grupo</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 esta conversación en grupo ha sido prohibida</string>
   <string name="conference_members_only">Esta conversación en grupo es solo para miembros</string>
@@ -313,19 +301,8 @@
   <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>
-  <string name="remote_fingerprint">Huella digital remota</string>
-  <string name="shared_secret_hint">Sugerencia o pregunta</string>
-  <string name="shared_secret_secret">Secreto compartido</string>
   <string name="confirm">Confirmar</string>
-  <string name="in_progress">En progreso</string>
-  <string name="respond">Responder</string>
-  <string name="secrets_do_not_match">Los secretos no coinciden</string>
   <string name="try_again">Intentar de nuevo</string>
-  <string name="finish">Terminar</string>
-  <string name="verified">¡Verificado!</string>
-  <string name="smp_requested">El contacto solicita verificación SMP</string>
-  <string name="no_otr_session_found">¡No se ha encontrado una sesión OTR válida!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Servicio en primer plano</string>
   <string name="pref_keep_foreground_service_summary">Mantener el servicio en primer plano previene que el sistema cierre la conexión</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">El archivo ha sido eliminado</string>
   <string name="no_application_found_to_open_file">No se ha encontrado ninguna aplicación para abrir el archivo</string>
   <string name="no_application_found_to_open_link">No se ha encontrado aplicación para abrir el link</string>
-  <string name="could_not_verify_fingerprint">No se puede verificar el contacto</string>
-  <string name="manually_verify">Verificar manualmente</string>
-  <string name="are_you_sure_verify_fingerprint">¿Estás seguro de que quieres verificar la huella digital OTR de tu contacto?</string>
-  <string name="pref_show_dynamic_tags">Mostrar etiquetas</string>
+  <string name="pref_show_dynamic_tags">Etiquetas dinámicas</string>
   <string name="pref_show_dynamic_tags_summary">Mostrar información en forma de etiquetas debajo de los contactos</string>
   <string name="enable_notifications">Habilitar notificaciones</string>
   <string name="no_conference_server_found">No se ha encontrado el servidor de la conversación en grupo</string>
   <string name="conference_creation_failed">¡La creación de la conversación en grupo ha fallado!</string>
   <string name="account_image_description">Imagen de perfil</string>
-  <string name="copy_otr_clipboard_description">Copiar huella digital OTR al portapapeles</string>
   <string name="copy_omemo_clipboard_description">Copiar huella digital OMEMO al portapapeles</string>
   <string name="regenerate_omemo_key">Regenerar clave OMEMO</string>
   <string name="clear_other_devices">Limpiar dispositivos</string>
   <string name="clear_other_devices_desc">¿Estás seguro de que quieres limpiar todos los otros dispositivos del anuncio OMEMO? La próxima vez que tus dispositivos conecten, tendrán que volver a anunciarse, pero estos podrían no recibir los mensajes enviados durante el proceso.</string>
   <string name="error_no_keys_to_trust_server_error">No hay claves disponibles para este contacto.\nLa búsqueda de nuevas claves en el servidor ha fallado. Puede que haya algún problema con el servidor de tu contacto.</string>
   <string name="error_no_keys_to_trust_presence">No hay claves disponibles para este contacto.\n Asegúrate que tenéis suscripción de presencia mutua. </string>
-  <string name="error_no_keys_to_trust">No hay claves disponibles para este contacto. Si has eliminado alguna de sus claves, tus contactos necesitarán generar nuevas claves.</string>
   <string name="error_trustkeys_title">Se produjo un error</string>
   <string name="fetching_history_from_server">Buscando historial en el servidor</string>
   <string name="no_more_history_on_server">No hay más historial en el servidor</string>
   <string name="updating">Actualizando…</string>
   <string name="password_changed">¡Contraseña cambiada!</string>
   <string name="could_not_change_password">No se puede cambiar la contraseña</string>
-  <string name="otr_session_not_started">Enviar mensaje para empezar una conversación cifrada</string>
-  <string name="ask_question">Haz una pregunta</string>
-  <string name="smp_explain_question">Si tu contacto y tú tenéis un secreto en común que nadie más sabe (como una broma o simplemente lo que tomasteis para comer la última vez que os visteis) podéis usar ese secreto para verificar la huella digital de cada uno.\n\nPuedes usar una sugerencia o pregunta para hacer a tu contacto que deberá responder distinguiendo mayúsculas y minúsculas.</string>
-  <string name="smp_explain_answer">Tu contacto quiere verificar tu huella digital a través de un secreto compartido. Te hace la siguiente sugerencia o pregunta para ese secreto.</string>
-  <string name="shared_secret_hint_should_not_be_empty">La pregunta no puede ser vacía</string>
-  <string name="shared_secret_can_not_be_empty">El secreto compartido no puede ser vacío</string>
-  <string name="manual_verification_explanation">Compara detenidamente la huella digital mostrada abajo con la de tu contacto.\nPuedes usar cualquier forma de comunicación segura como un correo electrónico cifrado o conversación telefónica para verificarlo.</string>
   <string name="change_password">Cambiar contraseña</string>
   <string name="current_password">Contraseña actual</string>
   <string name="new_password">Nueva contraseña</string>
@@ -424,7 +389,6 @@
   <string name="apk">Android App</string>
   <string name="vcard">Contacto</string>
   <string name="received_x_file">Recibido %s</string>
-  <string name="disable_foreground_service">Deshabilitar servicio en primer plano</string>
   <string name="touch_to_open_conversations">Pulsa para abrir Conversations</string>
   <string name="avatar_has_been_published">¡La imagen de perfil ha sido publicada!</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -525,14 +489,6 @@
   <string name="no_camera_permission">Conversations necesita acceder a la cámara</string>
   <string name="sync_with_contacts">Sincronizar contactos</string>
   <string name="sync_with_contacts_long">Conversations quiere cruzar tu lista de contactos de XMPP con tus contactos del móvil para mostrar sus nombres completos y sus fotos de perfil.\n\nConversations solo leerá tus contactos y los cruzará localmente sin subirlos a tu servidor.\n\nEl sistema te preguntará ahora para conceder los permisos de acceso a tus contactos del móvil.</string>
-  <string name="certificate_information">Información de certificado</string>
-  <string name="certificate_subject">Asunto</string>
-  <string name="certificate_issuer">Editor</string>
-  <string name="certificate_cn">Nombre</string>
-  <string name="certificate_o">Organización</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <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 eres mencionado</string>
   <string name="notify_never">Notificaciones deshabilitadas</string>
@@ -564,9 +520,7 @@
   <string name="pick_your_username">Selecciona tu nombre de usuario</string>
   <string name="pref_manually_change_presence">Gestionar disponibilidad manualmente</string>
   <string name="pref_manually_change_presence_summary">Establezca su disponibilidad cuando edite su mensaje de estado.</string>
-  <string name="change_presence">Cambiar estado</string>
   <string name="status_message">Mensaje de estado</string>
-  <string name="all_accounts_on_this_device">Establecer para todas mis cuentas en este dispositivo</string>
   <string name="presence_chat">Libre para hablar</string>
   <string name="presence_online">Disponible</string>
   <string name="presence_away">Ausente</string>
@@ -574,13 +528,9 @@
   <string name="presence_dnd">Ocupado</string>
   <string name="secure_password_generated">Se ha generado una contraseña segura</string>
   <string name="device_does_not_support_battery_op">Tu dispositivo no soporta la opción de optimización de batería</string>
-  <string name="show_password">Mostrar contraseña</string>
   <string name="registration_please_wait">El registro falló. Prueba de nuevo más tarde</string>
   <string name="registration_password_too_weak">Error en el registro: La contraseña es demasiado débil</string>
-  <string name="create_conference">Crear conversación en grupo</string>
   <string name="dialog_title_create_conference">Crear Conversación en Grupo</string>
-  <string name="join_or_create_conference">Unirse o crear conversación en grupo</string>
-  <string name="conference_subject">Asunto</string>
   <string name="choose_participants">Elige a los participantes</string>
   <string name="creating_conference">Creando conversación en grupo...</string>
   <string name="invite_again">Invitar de nuevo</string>
@@ -611,11 +561,6 @@
   <string name="no_permission_to_access_x">Sin permiso de acceso a %s</string>
   <string name="remote_server_not_found">Servidor no encontrado</string>
   <string name="unable_to_update_account">No se ha podido actualizar la cuenta</string>
-  <string name="missing_presence_subscription_with_x">Se ha perdido la suscripción de presencia con %s.</string>
-  <string name="missing_keys_from_x">Se ha perdido la clave OMEMO de %s.</string>
-  <string name="missing_omemo_keys">Se han perdido las claves OMEMO</string>
-  <string name="wrong_conference_configuration">Ésta no es una conversación privada no anónima.</string>
-  <string name="this_conference_has_no_members">No hay miembros en esta conversación.</string>
   <string name="report_jid_as_spammer">Reportar a este Id Jabber por enviar mensajes no deseados</string>
   <string name="pref_delete_omemo_identities">Eliminar identidades OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenerar tus clave OMEMO. Todos tus contactos tendrán que verificarte de nuevo. Usa esta opción como último recurso.</string>
@@ -714,12 +659,10 @@
   <string name="huawei_protected_apps_summary">Para seguir recibiendo notificaciones, incluso cuando la pantalla está apagada, necesitas añadir Conversations a la lista de aplicaciones protegidas.</string>
   <string name="mtm_accept_cert">¿Aceptar certificado desconocido?</string>
   <string name="mtm_trust_anchor">El certificado del servidor no está firmado por una Autoridad Certificadora conocida.</string>
-  <string name="mtm_cert_expired">El certificado del servidor está expirado.</string>
   <string name="mtm_accept_servername">¿Aceptar nombre del servidor no coincidente?</string>
   <string name="mtm_hostname_mismatch">El servidor no pudo autenticarse como \"%s\". El certificado es solo válido para:</string>
   <string name="mtm_connect_anyway">¿Quieres conectar de todas formas?</string>
   <string name="mtm_cert_details">Detalles del Certificado:</string>
-  <string name="mtm_notification">Verificación del Certificado</string>
   <string name="once">Una vez</string>
   <string name="qr_code_scanner_needs_access_to_camera">El escáner de código QR necesita acceso a la cámara</string>
   <string name="pref_scroll_to_bottom">Desplazarse hasta abajo</string>
@@ -733,4 +676,18 @@
   <string name="error_trustkey_hint_mutual">Consejo: En algunas ocasiones esto puede corregirse agregando a tu contacto a tu lista de contactos. Tu contacto deberá asegurarse también que estás en su lista de contactos.</string>
   <string name="disable_encryption_message">¿Estás seguro de que quieres deshabilitar el cifrado OMEMO para esta conversación?\nEsto permitiría 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>
+  <string name="draft">Borrador:</string>
+  <string name="pref_omemo_setting">Cifrado OMEMO</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO siempre será usado para conversaciones uno a uno y en conversaciones en grupo privadas.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO será usado por defecto para nuevas conversaciones.</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO tendrá que ser explícitamente activado para nuevas conversaciones.</string>
+  <string name="create_shortcut">Crear acceso directo</string>
+  <string name="pref_font_size">Tamaño de fuente</string>
+  <string name="pref_font_size_summary">Tamaño de fuente usado en la aplicación.</string>
+  <string name="default_on">Activo por defecto</string>
+  <string name="default_off">Desactivado por defecto</string>
+  <string name="small">Pequeño</string>
+  <string name="medium">Medio</string>
+  <string name="large">Grande</string>
+  <string name="not_encrypted_for_this_device">El mensaje no fue cifrado para este dispositivo.</string>
 </resources>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Enkriptatu gabeko mezua bidali</string>
   <string name="send_message">Mezua bidali</string>
   <string name="send_message_to_x">%s(r)i mezua bidali</string>
-  <string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
   <string name="send_omemo_message">OMEMOz enkriptatutako mezua bidali</string>
   <string name="send_omemo_x509_message">v\\OMEMOz enkriptatutako mezua bidali</string>
   <string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
@@ -170,9 +169,7 @@
   <string name="attach_record_voice">Ahotsa grabatu</string>
   <string name="account_settings_jabber_id">Jabber IDa</string>
   <string name="block_jabber_id">Jabber IDa blokeatu</string>
-  <string name="account_settings_password">Pasahitza</string>
   <string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
-  <string name="account_settings_confirm_password">Pasahitza berretsi</string>
   <string name="password">Pasahitza</string>
   <string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
   <string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
@@ -198,11 +195,7 @@
   <string name="last_seen_day">azkenengoz ikusia egun 1 lehenago</string>
   <string name="last_seen_days">azkenengoz ikusia %d egun lehenago</string>
   <string name="install_openkeychain">Mezu enkriptatua. Mesedez instalatu OpenKeychain desenkriptatzeko.</string>
-  <string name="unknown_otr_fingerprint">OTR hatz-marka ezezaguna</string>
   <string name="openpgp_messages_found">OpenPGPz enkriptatutako mezuak aurkitu dira</string>
-  <string name="your_fingerprint">Zure hatz-marka</string>
-  <string name="otr_fingerprint">OTR hatz-marka</string>
-  <string name="otr_fingerprint_selected_message">Mezuaren OTR hatz-marka</string>
   <string name="openpgp_key_id">OpenPGP gakoaren nortasuna</string>
   <string name="omemo_fingerprint">OMEMO hatz-marka</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO hatz-marka</string>
@@ -212,11 +205,9 @@
   <string name="trust_omemo_fingerprints">OMEMO hatz-marketaz fidatu</string>
   <string name="fetching_keys">Gakoak eskuratzen...</string>
   <string name="done">Eginda</string>
-  <string name="verify">Egiaztatu</string>
   <string name="decrypt">Desenkriptatu</string>
   <string name="conferences">Taldeak</string>
   <string name="search">Bilatu</string>
-  <string name="create_contact">Kontaktua sortu</string>
   <string name="dialog_title_create_contact">Kontaktua sortu</string>
   <string name="enter_contact">Kontaktua sartu</string>
   <string name="join_conference">Taldera batu</string>
@@ -263,11 +254,8 @@
   <string name="enable">Gaitu</string>
   <string name="conference_requires_password">Taldeak pasahitza behar du</string>
   <string name="enter_password">Sartu pasahitza</string>
-  <string name="missing_presence_subscription">Presentzia harpidetza falta da</string>
   <string name="request_presence_updates">Mesedez eskatu lehenago zure kontaktuaren presentzia eguneraketak.\n\n<small>Kontaktuak erabiltzen ari den bezeroa(k) zehazteko erabilika da hau.</small></string>
   <string name="request_now">Eskatu orain</string>
-  <string name="delete_fingerprint">Hatz-marka ezabatu</string>
-  <string name="sure_delete_fingerprint">Ziur al zaude hatz-marka hau ezabatu nahi duzulaz?</string>
   <string name="ignore">Kasurik ez egin</string>
   <string name="without_mutual_presence_updates"><b>Adi:</b> Bien arteko presentzia eguneraketarik gabe hau bidaltzeak ustekabeko arazoak sor litzake.\n\n<small>Joan zaitez kontaktuaren xehetasunetara zure presentzia eguneraketak egiaztatzeko.</small></string>
   <string name="pref_security_settings">Segurtasuna</string>
@@ -291,7 +279,6 @@
   <string name="pref_conference_name_summary">Erabili gelaren gaia taldeak identifikatzeko eta ez JIDa</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>
   <string name="conference_members_only">Talde hau kideentzat da soilik</string>
@@ -313,19 +300,8 @@
   <string name="show_qr_code">2D barra kodea erakutsi</string>
   <string name="show_block_list">Blokeatutakoen zerrenda ikusi</string>
   <string name="account_details">Kontuaren xehetasunak</string>
-  <string name="verify_otr">OTR egiaztatu</string>
-  <string name="remote_fingerprint">Urruneko hatz-marka</string>
-  <string name="shared_secret_hint">Iradokizuna edo galdera</string>
-  <string name="shared_secret_secret">Partekatutako sekretua</string>
   <string name="confirm">Baieztatu</string>
-  <string name="in_progress">Lanean</string>
-  <string name="respond">Erantzun</string>
-  <string name="secrets_do_not_match">Sekretuak ez dute bat egiten</string>
   <string name="try_again">Saiatu berriz</string>
-  <string name="finish">Amaitu</string>
-  <string name="verified">Egiaztatuta!</string>
-  <string name="smp_requested">Kontaktuak SMP egiaztapena eskatu du</string>
-  <string name="no_otr_session_found">Ez da OTR saio baliodunik aurkitu!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Zerbitzua atzeko planoan mantendu</string>
   <string name="pref_keep_foreground_service_summary">Sistema eragileak zure konexioa hiltzea galarazten du</string>
@@ -346,36 +322,23 @@
   <string name="file_deleted">Fitxategia ezabatu egin da</string>
   <string name="no_application_found_to_open_file">Fitxategia ireki dezakeen aplikaziorik ez da aurkitu</string>
   <string name="no_application_found_to_open_link">Ez da lotura hau ireki dezakeen aplikaziorik aurkitu</string>
-  <string name="could_not_verify_fingerprint">Hatz-marka ezin izan da egiaztatu</string>
-  <string name="manually_verify">Eskuz egiaztatu</string>
-  <string name="are_you_sure_verify_fingerprint">Ziur al zaude zure kontaktuaren OTR hatz-marka egiaztatu nahi duzulaz?</string>
-  <string name="pref_show_dynamic_tags">Etiketa dinamikoak erakutsi</string>
   <string name="pref_show_dynamic_tags_summary">Irakurtzeko soilik diren etiketak erakutsi kontaktuen azpian</string>
   <string name="enable_notifications">Jakinarazpenak gaitu</string>
   <string name="no_conference_server_found">Ez da talde zerbitzaririk aurkitu</string>
   <string name="conference_creation_failed">Taldea sortzeak huts egin du!</string>
   <string name="account_image_description">Kontuaren profileko argazkia</string>
-  <string name="copy_otr_clipboard_description">OTR hatz-marka arbelera kopiatu</string>
   <string name="copy_omemo_clipboard_description">OMEMO hatz-marka arbelara kopiatu</string>
   <string name="regenerate_omemo_key">OMEMO gakoa birsortu</string>
   <string name="clear_other_devices">Gailuak garbitu</string>
   <string name="clear_other_devices_desc">Ziur al zaude OMEMO iragarpenetik beste gailu guztiak garbitu nahi dituzulaz? Zure gailuak konektatzen diren hurrengoan, beraiek berriragarriko dira, baina agian ez dute mezurik jasoko bitartean.</string>
   <string name="error_no_keys_to_trust_server_error">Ez dago gako erabilgarririk kontaktu honetarako.\nEzin izan da zerbitzaritik gako berririk eskuratu. Agian akatsen bat dago zure kontaktuaren zerbitzariarekin.</string>
   <string name="error_no_keys_to_trust_presence">Ez dago gako erabilgarririk kontaktu honetarako.\nEgiaztatu ezazu bien arteko presentzia harpidetza duzuela.</string>
-  <string name="error_no_keys_to_trust">Kontaktu honetarako gako erabilgarririk ez dago. Bere gakoak purgatu badituzu, berri batzuk sortu behar dituzte.</string>
   <string name="error_trustkeys_title">Zerbait gaizki joan da</string>
   <string name="fetching_history_from_server">Mezuak zerbitzaritik eskuratzen</string>
   <string name="no_more_history_on_server">Mezu gehiagorik ez zerbitzarian</string>
   <string name="updating">Eguneratzen...</string>
   <string name="password_changed">Pasahitza aldatu da</string>
   <string name="could_not_change_password">Pasahitza ezin izan da aldatu</string>
-  <string name="otr_session_not_started">Mezu bat bidali enkripatutako elkarrizketa hasteko</string>
-  <string name="ask_question">Galdetu</string>
-  <string name="smp_explain_question">Zu eta zure kontaktua beste inor ezagutzen ez duen elkarren arteko sekreturen bat baduzue (ohiko txantxa edo azkenengo aldian bazkaldu zenutena adibidez) bakoitzaren hatz-markak egiaztatzeko sekretu hori erabili dezakezue.\n\nIradokizun edo galdera bat eman behar duzu zure kontaktuak erantzun dezan, letra larri eta xeheak bereiziz.</string>
-  <string name="smp_explain_answer">Zure kontaktuak zure hatz-marka egiaztatu nahi du partekatutako sekretu batekin erronka eginez. Zure kontaktuak hurrengo iradokizuna edo sekretu horren galdera eman du.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Zure iradokizuna ez luke hutsik egon behar</string>
-  <string name="shared_secret_can_not_be_empty">Zure partekatutako sekretua ezin da hutsik egon</string>
-  <string name="manual_verification_explanation">Kontu handiz konpara ezazu beheko hatz-marka zure kontaktuaren hatz-markarekin.\nEnkriptatutako email bat edota telefono dei bat bezalako edozein komunikabide fidagarriren bat erabili dezakezu horiek trukatzeko.</string>
   <string name="change_password">Pasahitza aldatu</string>
   <string name="current_password">Oraingo pasahitza</string>
   <string name="new_password">Pasahitz berria</string>
@@ -424,7 +387,6 @@
   <string name="apk">Android aplikazioa</string>
   <string name="vcard">Kontaktua</string>
   <string name="received_x_file">%s jaso da</string>
-  <string name="disable_foreground_service">Atzeko planoko zerbiztua ezgaitu</string>
   <string name="touch_to_open_conversations">Ikutu Conversations irekitzeko</string>
   <string name="avatar_has_been_published">Profileko argazkia argitaratu da</string>
   <string name="sending_x_file">%s bidaltzen</string>
@@ -525,14 +487,6 @@
   <string name="no_camera_permission">Conversationsek kamerarako sarbidea behar du</string>
   <string name="sync_with_contacts">Kontaktuekin sinkronizatu</string>
   <string name="sync_with_contacts_long">Conversationsek zure XMPP zerrenda eta zure kontaktuak uztartu nahi ditu haien izenak eta argazkiak erakusteko.\n\nConversationsek zure kontaktuak modu lokalean soilik irakurri eta uztartuko ditu, zure zerbitzarira kargatu gabe.\n\nJarraian baimenak eskatuko zaizkizu zure kontaktuetara sartu ahal izateko.</string>
-  <string name="certificate_information">Ziurtagiriaren informazioa</string>
-  <string name="certificate_subject">Subjektua</string>
-  <string name="certificate_issuer">Igorlea</string>
-  <string name="certificate_cn">Izen arrunta</string>
-  <string name="certificate_o">Erakundea</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Ez eskuragarri)</string>
-  <string name="certificate_not_found">Ez da ziurtagiririk aurkitu</string>
   <string name="notify_on_all_messages">Mezu guztiak jakinarazi</string>
   <string name="notify_only_when_highlighted">Jakinarazi aipatua izaterakoan soilik</string>
   <string name="notify_never">Jakinarazpenak ezgaituta</string>
@@ -562,9 +516,7 @@
   <string name="use_own_provider">Nire hornitzale propioa erabili</string>
   <string name="pick_your_username">Aukeratu zure erabiltzaile izena</string>
   <string name="pref_manually_change_presence">Kudeatu eskuragarritasuna eskuz</string>
-  <string name="change_presence">Presentzia aldatu</string>
   <string name="status_message">Egoera mezua</string>
-  <string name="all_accounts_on_this_device">Gailu honetako kontu guztietarako ezarri</string>
   <string name="presence_chat">Hitzegiteko aske</string>
   <string name="presence_online">Konektatuta</string>
   <string name="presence_away">Kanpoan</string>
@@ -572,13 +524,9 @@
   <string name="presence_dnd">Lanpetuta</string>
   <string name="secure_password_generated">Pasahitz seguru bat sortu da</string>
   <string name="device_does_not_support_battery_op">Zure gailuak ez du bateria optimizatzeko aukerarik ematen</string>
-  <string name="show_password">Pasahitza erakutsi</string>
   <string name="registration_please_wait">Erregistroak huts egin du: saiatu berriz beranduago</string>
   <string name="registration_password_too_weak">Erregistroa huts egin du: pasahitza ahulegia da</string>
-  <string name="create_conference">Taldea sortu</string>
   <string name="dialog_title_create_conference">Taldea sortu</string>
-  <string name="join_or_create_conference">Talde batera batu edo sortu</string>
-  <string name="conference_subject">Gaia</string>
   <string name="choose_participants">Parte hartzaileak hautatu</string>
   <string name="creating_conference">Taldea sortzen…</string>
   <string name="invite_again">Berriz gonbidatu</string>
@@ -609,11 +557,6 @@
   <string name="no_permission_to_access_x">%s(e)ra sartzeko baimenik ez</string>
   <string name="remote_server_not_found">Urruneko zerbitzaria ez da aurkitu</string>
   <string name="unable_to_update_account">Ezin izan da kontua eguneratu</string>
-  <string name="missing_presence_subscription_with_x">%s(r)ekin presentzia harpidetza falta da</string>
-  <string name="missing_keys_from_x">%s(r)en OMEMO gakoak falta dira.</string>
-  <string name="missing_omemo_keys">OMEMO gakoak falta dira</string>
-  <string name="wrong_conference_configuration">Hau ez da talde pribatu, ez anonimo bat.</string>
-  <string name="this_conference_has_no_members">Ez dago kiderik talde honetan.</string>
   <string name="report_jid_as_spammer">JIDa nahi gabeko mezuen bidaltzaile gisa salatu</string>
   <string name="pref_delete_omemo_identities">OMEMO nortasunak ezabatu</string>
   <string name="pref_delete_omemo_identities_summary">Zure OMEMO gakoak birsortu. Zure kontaktu guztiak zu egiaztatu beharko zaituzte berriz. Soilik azken aukera bezala erabili hau.</string>

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

@@ -29,7 +29,7 @@
   <string name="sending">Envoi…</string>
   <string name="message_decrypting">Déchiffrement du message. Veuillez patienter...</string>
   <string name="pgp_message">Message chiffré avec OpenPGP</string>
-  <string name="nick_in_use">Cet identifiant est déjà utilisé.</string>
+  <string name="nick_in_use">Cet identifiant est déjà utilisé</string>
   <string name="invalid_muc_nick">Identifiant non valide</string>
   <string name="admin">Administrateur</string>
   <string name="owner">Propriétaire</string>
@@ -49,6 +49,7 @@
   <string name="start_conversation">Démarrer une conversation</string>
   <string name="invite_contact">Inviter un contact</string>
   <string name="contacts">Contacts</string>
+  <string name="contact">Contact</string>
   <string name="cancel">Annuler</string>
   <string name="set">Établir</string>
   <string name="add">Ajouter</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Envoyer un message en clair</string>
   <string name="send_message">Envoyer le message</string>
   <string name="send_message_to_x">Envoyer un message à %s</string>
-  <string name="send_otr_message">Envoyer un message chiffré avec OTR</string>
   <string name="send_omemo_message">Envoyer un message chiffré avec OMEMO</string>
   <string name="send_omemo_x509_message">Envoyer un message chiffré avec \\OMEMO</string>
   <string name="send_pgp_message">Envoyer un message chiffré avec OpenPGP</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Enregistrer un son</string>
   <string name="account_settings_jabber_id">Identifiant</string>
   <string name="block_jabber_id">Bloquer l\'ID Jabber</string>
-  <string name="account_settings_password">Mot de passe</string>
   <string name="account_settings_example_jabber_id">nom@exemple.com</string>
-  <string name="account_settings_confirm_password">Confirmer le mot de passe</string>
   <string name="password">Mot de passe</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>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">en ligne hier</string>
   <string name="last_seen_days">en ligne il y a %d jours</string>
   <string name="install_openkeychain">Message chiffré. Veuillez installer OpenKeychain pour le déchiffrer.</string>
-  <string name="unknown_otr_fingerprint">Empreinte OTR inconnue.</string>
   <string name="openpgp_messages_found">Messages chiffrés avec OpenPGP détectés.</string>
-  <string name="your_fingerprint">Votre empreinte</string>
-  <string name="otr_fingerprint">Empreinte OTR</string>
-  <string name="otr_fingerprint_selected_message">Empreinte OTR du message</string>
   <string name="openpgp_key_id">ID Clef OpenPGP</string>
   <string name="omemo_fingerprint">Empreinte OMEMO</string>
   <string name="omemo_fingerprint_x509">v\\Empreinte OMEMO</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">Faire confiance aux empreintes OMEMO</string>
   <string name="fetching_keys">Récupération des clefs...</string>
   <string name="done">Terminé</string>
-  <string name="verify">Vérifier</string>
   <string name="decrypt">Déchiffrer</string>
   <string name="conferences">Conversations de groupe</string>
   <string name="search">Rechercher</string>
-  <string name="create_contact">Créer un contact</string>
   <string name="dialog_title_create_contact">Créer un contact</string>
   <string name="enter_contact">Ajouter contact</string>
   <string name="join_conference">Rejoindre la conversation de groupe</string>
@@ -263,11 +255,8 @@
   <string name="enable">Activer</string>
   <string name="conference_requires_password">Conversation de groupe demande un mot de passe</string>
   <string name="enter_password">Entrer le mot de passe</string>
-  <string name="missing_presence_subscription">La notification de présence est manquante </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="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="pref_security_settings">Sécurité</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">Utiliser le sujet au lieu de JID pour identifier les groupes de discussions</string>
   <string name="pref_autojoin">Joindre les conversations de groupe automatiquement</string>
   <string name="pref_autojoin_summary">Respectez l\'indicateur de jointure automatique dans les signets des groupes de discussion</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 bannis de cette conversation de groupe</string>
   <string name="conference_members_only">Cette conversation de groupe est réservée aux membres</string>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">Montrer le code-barres 2D</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="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="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="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Garder le service au 1er plan</string>
   <string name="pref_keep_foreground_service_summary">Évite que le système ne ferme votre connexion.</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">Le fichier a été supprimé</string>
   <string name="no_application_found_to_open_file">Aucune application disponible pour ouvrir le fichier</string>
   <string name="no_application_found_to_open_link">Aucune application trouvée pour ouvrir le lien</string>
-  <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="pref_show_dynamic_tags">Afficher les tags dynamiques</string>
+  <string name="pref_show_dynamic_tags">Tags dynamiques</string>
   <string name="pref_show_dynamic_tags_summary">Afficher des tags en lecture seule en dessous des contacts.</string>
   <string name="enable_notifications">Activer les notifications</string>
   <string name="no_conference_server_found">Serveur de conversation de groupe non trouvé</string>
   <string name="conference_creation_failed">La création d\'un groupe de discussion a échoué!</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="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="error_no_keys_to_trust_server_error">Aucune clef utilisable pour ce contact. \nL\'obtention de nouvelles clefs depuis le serveur a échoué. Il pourrait y avoir un problème avec le serveur de votre contact. </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="error_no_keys_to_trust">il n\'y a pas de clef disponible pour ce contact. Si vous avez purgé toutes ses clefs, il doit en générer de nouvelles.</string>
   <string name="error_trustkeys_title">Une erreur est survenue</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_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>
-  <string name="manual_verification_explanation">Comparez avec soin l\'empreinte ci-dessous avec celle de votre contact.\nPour ce faire, vous pouvez utiliser n\'importe quel moyen de communication auquel vous avez confiance : appel téléphonique, e-mail encrypté...</string>
   <string name="change_password">Changer de mot de passe</string>
   <string name="current_password">Mot de passe actuel</string>
   <string name="new_password">Nouveau mot de passe</string>
@@ -424,7 +389,6 @@
   <string name="apk">Application Android</string>
   <string name="vcard">Contact</string>
   <string name="received_x_file">%s reçu(e)</string>
-  <string name="disable_foreground_service">Ne plus garder le service au 1er plan</string>
   <string name="touch_to_open_conversations">Cliquez pour ouvrir Conversations</string>
   <string name="avatar_has_been_published">L\'avatar a été publié !</string>
   <string name="sending_x_file">%s en cours d\'envoi</string>
@@ -466,6 +430,7 @@
   <string name="choose_quick_action">Sélectionner l\'action rapide</string>
   <string name="search_for_contacts_or_groups">Rechercher des contacts ou des groupes</string>
   <string name="send_private_message">Envoyer un message privé</string>
+  <string name="user_has_left_conference">%1$s a quitté le groupe de discussion !</string>
   <string name="username">Identifiant</string>
   <string name="username_hint">Identifiant</string>
   <string name="invalid_username">Cet identifiant n\'est pas valide</string>
@@ -520,16 +485,10 @@
   <string name="shared_image_with_x">Image partagée avec %s</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="no_storage_permission">Conversations a besoin d\'accéder au stockage externe</string>
+  <string name="no_camera_permission">Conversations a besoin d\'accéder à l\'appareil photo</string>
   <string name="sync_with_contacts">Synchroniser avec contacts</string>
   <string name="sync_with_contacts_long">Conversations souhaite associer vos contacts XMPP avec les contacts de votre appareil, pour utiliser leur nom complet et leur avatar.\n\nConversations 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="certificate_information">Informations du certificat</string>
-  <string name="certificate_subject">Sujet</string>
-  <string name="certificate_issuer">Émetteur</string>
-  <string name="certificate_cn">Nom commun</string>
-  <string name="certificate_o">Organisation</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Non disponible)</string>
-  <string name="certificate_not_found">Aucun certificat trouvé</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>
@@ -559,9 +518,7 @@
   <string name="use_own_provider">Utiliser votre propre fournisseur</string>
   <string name="pick_your_username">Choisissez votre nom d\'utilisateur</string>
   <string name="pref_manually_change_presence">Gérer l\'état de disponibilité manuellement</string>
-  <string name="change_presence">Changer votre disponibilité</string>
   <string name="status_message">Message de statut</string>
-  <string name="all_accounts_on_this_device">Configurer pour tous les comptes sur cet appareil</string>
   <string name="presence_chat">Disponible</string>
   <string name="presence_online">En ligne</string>
   <string name="presence_away">Absent</string>
@@ -569,15 +526,11 @@
   <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="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="create_conference">Créer un groupe de discussion</string>
   <string name="dialog_title_create_conference">Créer un groupe de discussion</string>
-  <string name="join_or_create_conference">Joindre ou créer un groupe de discussion</string>
-  <string name="conference_subject">Objet</string>
   <string name="choose_participants">Choisir les participants</string>
-  <string name="creating_conference">Création d\'un groupe de discussion</string>
+  <string name="creating_conference">Création d\'un groupe de discussion...</string>
   <string name="invite_again">Inviter à nouveau</string>
   <string name="gp_short">Courte</string>
   <string name="gp_medium">Moyenne</string>
@@ -606,11 +559,6 @@
   <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="unable_to_update_account">Mise à jour du compte impossible</string>
-  <string name="missing_presence_subscription_with_x">La notification de présence pour %s est manquante.</string>
-  <string name="missing_keys_from_x">La clef OMEMO de %s est manquante.</string>
-  <string name="missing_omemo_keys">Clefs OMEMO manquantes</string>
-  <string name="wrong_conference_configuration">Ce n\'est pas un groupe de discussion privée et non anonyme.</string>
-  <string name="this_conference_has_no_members">Il n\'y a pas de membres dans ce groupe de discussion</string>
   <string name="report_jid_as_spammer">Signaler ce JID comme envoyant des messages non sollicités.</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>
@@ -708,12 +656,11 @@
   <string name="huawei_protected_apps">Applications protégées</string>
   <string name="huawei_protected_apps_summary">Pour recevoir les notifications, même lorsque l\'écran est éteint, vous devez ajouter Conversations à la liste des applications protégées.</string>
   <string name="mtm_accept_cert">Accepter les certificats inconnus ?</string>
-  <string name="mtm_cert_expired">Le certificat du serveur a expiré.</string>
   <string name="mtm_connect_anyway">Désirez-vous quand-même vous connecter ?</string>
   <string name="mtm_cert_details">Détails du certificat :</string>
-  <string name="mtm_notification">Vérification du certificat</string>
   <string name="once">Une fois</string>
   <string name="edit_status_message_title">Modifier le message de l\'état</string>
   <string name="disable_encryption">Désactiver le chiffrement</string>
   <string name="disable_now">Désactiver maintenant</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO sera toujours utilisé pour des discussions à deux ou de groupes privés.</string>
 </resources>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Enviar mensaxe non cifrada</string>
   <string name="send_message">Enviar mensaxe</string>
   <string name="send_message_to_x">Enviar mensaxe a 1%s</string>
-  <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
   <string name="send_omemo_message">Enviar mensaxe cifrada con OMEMO</string>
   <string name="send_omemo_x509_message">Enviar mensaxe cifrada v\\OMEMO</string>
   <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
@@ -170,9 +169,7 @@
   <string name="attach_record_voice">Grabar audio</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="block_jabber_id">Bloquear ID Jabber</string>
-  <string name="account_settings_password">Contrasinal</string>
   <string name="account_settings_example_jabber_id">usuaria@exemplo.com</string>
-  <string name="account_settings_confirm_password">Confirmar contrasinal</string>
   <string name="password">Contrasinal</string>
   <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
   <string name="error_out_of_memory">Exceso de memoria. A imaxe é demasiado grande</string>
@@ -198,11 +195,7 @@
   <string name="last_seen_day">última vez hai 1 día</string>
   <string name="last_seen_days">última conexión hai 1%d días</string>
   <string name="install_openkeychain">Mensaxe cifrada. Por favor instale OpenKeychain para descifrala.</string>
-  <string name="unknown_otr_fingerprint">Pegada OTR descoñecida</string>
   <string name="openpgp_messages_found">Atopáronse mensaxes cifradas con OpenPGP</string>
-  <string name="your_fingerprint">A súa pegada</string>
-  <string name="otr_fingerprint">Pegada OTR</string>
-  <string name="otr_fingerprint_selected_message">Pegada OTR da mensaxe</string>
   <string name="openpgp_key_id">ID da chave OpenPGP</string>
   <string name="omemo_fingerprint">Pegada OMEMO</string>
   <string name="omemo_fingerprint_x509">v\\pegada OMEMO </string>
@@ -212,11 +205,9 @@
   <string name="trust_omemo_fingerprints">Confiar en pegadas OMEMO</string>
   <string name="fetching_keys">Obtendo chaves...</string>
   <string name="done">Feito</string>
-  <string name="verify">Verificar</string>
   <string name="decrypt">Descifrar</string>
   <string name="conferences">Conversas en grupo</string>
   <string name="search">Buscar</string>
-  <string name="create_contact">Crear unha conta</string>
   <string name="dialog_title_create_contact">Crear un contacto</string>
   <string name="enter_contact">Introducir contacto</string>
   <string name="join_conference">Entrar nunha conversa en grupo</string>
@@ -263,11 +254,8 @@
   <string name="enable">Habilitar</string>
   <string name="conference_requires_password">A conversa en grupo require contrasinal</string>
   <string name="enter_password">Introducir contrasinal</string>
-  <string name="missing_presence_subscription">Falta a suscrición de presenza</string>
   <string name="request_presence_updates">Por favor, primeiro solicite actualizacións de presencia ao seu contacto.\n\n <small> Esto utilizarase para determinar qué cliente(s) está a usar o seu contacto.</small></string>
   <string name="request_now">Solicitar agora</string>
-  <string name="delete_fingerprint">Eliminar pegada dixital</string>
-  <string name="sure_delete_fingerprint">Seguro que quere eliminar esta pegada dixital?</string>
   <string name="ignore">Ignorar</string>
   <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviando esto sen mutuas actualización de presenza podería causar problemas.\n\n<small> Vaia aos detalles do contacto para verificar as súas suscricións de presenza.</small></string>
   <string name="pref_security_settings">Seguridade</string>
@@ -291,7 +279,6 @@
   <string name="pref_conference_name_summary">Utilice o tema en lugar do JID para identificar as conversas en grupo</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>
   <string name="conference_members_only">Esta conversa en grupo é so para membros</string>
@@ -313,19 +300,8 @@
   <string name="show_qr_code">Mostar código de barras 2D</string>
   <string name="show_block_list">Mostrar lista de bloqueo</string>
   <string name="account_details">Detalles da conta</string>
-  <string name="verify_otr">Verificar OTR</string>
-  <string name="remote_fingerprint">Pegada dixital remota</string>
-  <string name="shared_secret_hint">Consulta ou cuestión</string>
-  <string name="shared_secret_secret">Chave secreta compartida</string>
   <string name="confirm">Confirmar</string>
-  <string name="in_progress">En progreso</string>
-  <string name="respond">Responder</string>
-  <string name="secrets_do_not_match">Non coinciden as chaves secretas</string>
   <string name="try_again">Inténteo de novo</string>
-  <string name="finish">Rematar</string>
-  <string name="verified">Comprobado!</string>
-  <string name="smp_requested">O contacto solicitou a comprobación SMP</string>
-  <string name="no_otr_session_found">Non se atopou unha sesión OTR válida!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Manter servizo en primeiro plano</string>
   <string name="pref_keep_foreground_service_summary">Evita que o sistema operativo corte a súa conexión</string>
@@ -346,35 +322,22 @@
   <string name="file_deleted">Este ficheiro eliminouse</string>
   <string name="no_application_found_to_open_file">Non se atopou un aplicativo para abrir o ficheiro</string>
   <string name="no_application_found_to_open_link">Non se atopou ningunha aplicación para abrir a ligazón</string>
-  <string name="could_not_verify_fingerprint">Non se puido comprobar a pegada dixital</string>
-  <string name="manually_verify">Verificación manual</string>
-  <string name="are_you_sure_verify_fingerprint">Seguro que quere verificar a pegada OTR do seu contacto?</string>
-  <string name="pref_show_dynamic_tags">Mostrar etiquetas dinámicas</string>
   <string name="pref_show_dynamic_tags_summary">Mostrar etiquetas de só lectura baixo os contactos</string>
   <string name="enable_notifications">Habilitar notificacións</string>
   <string name="no_conference_server_found">Non se atopou ningún servidor de conversa en grupo</string>
   <string name="conference_creation_failed">Fallou a creación da conversa en grupo</string>
   <string name="account_image_description">Avatar da conta</string>
-  <string name="copy_otr_clipboard_description">Copiar a pegada OTR ao portapapeis</string>
   <string name="copy_omemo_clipboard_description">Copiar pegada OMEMO ao portapapeis</string>
   <string name="regenerate_omemo_key">Rexenerar a chave OMEMO</string>
   <string name="clear_other_devices">Limplar dispositivos</string>
   <string name="clear_other_devices_desc">Está segura de que quere eliminar todos os outros dispositivos da declaración OMEMO? A próxima vez que se conecten os seus dispositivos estos voltarán a anunciarse pero non rebirán mensaxes enviados mentras tanto.</string>
   <string name="error_no_keys_to_trust_server_error">Non hai chaves dispoñibles que se poidan usar con este contacto.\nNon se puideron obter novas chaves do servidor. Quizáis hai algún problema coas chaves do seu contacto.</string>
   <string name="error_no_keys_to_trust_presence">Non hai chaves utilizables dispoñibles para este contacto.\nAsegúrese de que ambos teñen mutua suscrición de presenza.</string>
-  <string name="error_no_keys_to_trust">Non hai chaves utilizables dispoñibles para este contacto. Si eliminou algunha das chaves do contacto, precisan xerar unhas novas.</string>
   <string name="fetching_history_from_server">Obtendo historial desde o servidor</string>
   <string name="no_more_history_on_server">Non hai máis historial no servidor</string>
   <string name="updating">Actualizando....</string>
   <string name="password_changed">Mudou o contrasinal!</string>
   <string name="could_not_change_password">Non puido mudar o contrasinal</string>
-  <string name="otr_session_not_started">Envíe unha mensaxe para iniciar a conversa cifrada</string>
-  <string name="ask_question">Faga unha pregunta</string>
-  <string name="smp_explain_question">Se vostede e o seu contacto teñen un secreto en común que ninguén máis coñece (como unha broma privada da última comida xuntas) poden utilizar ese secreto para verificar as pegadas dixitais respectivas.\n\nVostede proporciona o pé ou fai unha pregunta ao seu contacto que lle responderá con unha resposta diferenciando minúsculas e maiúsculas.</string>
-  <string name="smp_explain_answer">O seu contacto quererá verificar a pegada de vostede desafiandoo con un secreto compartido. O seu contacto daralle pé a unha resposta para ese secreto.</string>
-  <string name="shared_secret_hint_should_not_be_empty">A súa pregunta ou pé non pode estar baldeiro</string>
-  <string name="shared_secret_can_not_be_empty">O seu secreto compartido non pode estar baldeiro</string>
-  <string name="manual_verification_explanation">Comprobe coidadosamente a pegada dixital mostrada embaixo coa pegada dixital do seu contacto.\nVostede pode utilizar calquera forma de comunicación confiable como un correo electrónico cifrado ou unha chamada de teléfono para intercambiar as chaves.</string>
   <string name="change_password">Cambiar contrasinal</string>
   <string name="current_password">Contrasinal actual</string>
   <string name="new_password">Novo contrasinal</string>
@@ -423,7 +386,6 @@
   <string name="apk">App Android</string>
   <string name="vcard">Contacto</string>
   <string name="received_x_file">Recibido %s</string>
-  <string name="disable_foreground_service">Deshabilitar servizo en primeiro plano</string>
   <string name="touch_to_open_conversations">Toque para abrir Conversations</string>
   <string name="avatar_has_been_published">Publicouse o avatar</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -520,14 +482,6 @@
   <string name="shared_text_with_x">Texto compartido con %s</string>
   <string name="sync_with_contacts">Sincronice con todos os contactos</string>
   <string name="sync_with_contacts_long">Conversations quere comparar a súa lista XMPP cos seus contactos para mostrar os seus nomes completos e avatares.\n\nConversations só fará esta comprobación de xeito local sen subilos ao servidor.\n\nAgora pediráselle conceder permiso para acceder aos seus contactos.</string>
-  <string name="certificate_information">Información do certificado</string>
-  <string name="certificate_subject">Asunto</string>
-  <string name="certificate_issuer">Proveedor</string>
-  <string name="certificate_cn">Nome de contacto</string>
-  <string name="certificate_o">Empresa</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(non dispoñible)</string>
-  <string name="certificate_not_found">Non se atopou certificado</string>
   <string name="notify_on_all_messages">Notificar todas as mensaxes</string>
   <string name="notify_only_when_highlighted">Notificar só cando é mencionada</string>
   <string name="notify_never">Notificacións deshabilitadas</string>
@@ -556,9 +510,7 @@
   <string name="create_account">Crear conta</string>
   <string name="use_own_provider">Utilizar o meu propio proveedor</string>
   <string name="pick_your_username">Escolla un identificador</string>
-  <string name="change_presence">Cambiar presenza</string>
   <string name="status_message">Mensaxe de estado</string>
-  <string name="all_accounts_on_this_device">Establecer para todas as contas en este dipositivo</string>
   <string name="presence_chat">Dispoñible para conversar</string>
   <string name="presence_online">En liña</string>
   <string name="presence_away">Fóra</string>
@@ -566,13 +518,9 @@
   <string name="presence_dnd">Ocupada</string>
   <string name="secure_password_generated">Xerouse un contrasinal seguro</string>
   <string name="device_does_not_support_battery_op">O seu dispositivo non permite non optimizar a batería</string>
-  <string name="show_password">Mostar contrasinal</string>
   <string name="registration_please_wait">Fallo no rexistro: inténteo de novo</string>
   <string name="registration_password_too_weak">Fallo no rexistro: contrasinal moi feble</string>
-  <string name="create_conference">Crear conversa en grupo</string>
   <string name="dialog_title_create_conference">Crear Conversa en Grupo</string>
-  <string name="join_or_create_conference">Únete ou crea unha conversa en grupo</string>
-  <string name="conference_subject">Asunto</string>
   <string name="choose_participants">Escoller participantes</string>
   <string name="creating_conference">Creando unha conversa en grupo...</string>
   <string name="invite_again">Invitar de novo</string>
@@ -603,11 +551,6 @@
   <string name="no_permission_to_access_x">Se permiso para acceder %s</string>
   <string name="remote_server_not_found">Non se atopa o servidor remoto</string>
   <string name="unable_to_update_account">Non se puido actualizar a conta</string>
-  <string name="missing_presence_subscription_with_x">Perdida a suscrición de presenza con %s.</string>
-  <string name="missing_keys_from_x">Perdidas as chaves OMEMO de %s.</string>
-  <string name="missing_omemo_keys">Perda das chaves OMEMO</string>
-  <string name="wrong_conference_configuration">Este non é unha conversa en grupo privado e non é anónima.</string>
-  <string name="this_conference_has_no_members">Non hai membros nesta conversa en grupo.</string>
   <string name="report_jid_as_spammer">Informe de este JID como emisor de mensaxes non desexadas.</string>
   <string name="pref_delete_omemo_identities">Borrar identidades OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Rexenerar as súas chaves OMEMO. Todos os seus contactos deberán verificalo de novo. Utilice esto como último recurso.</string>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Titkosítatlan üzenetküldés</string>
   <string name="send_message">Üzenet küldése</string>
   <string name="send_message_to_x">Üzenet elküldése %s számára</string>
-  <string name="send_otr_message">OTR titkosított üzenet küldése</string>
   <string name="send_omemo_message">OMEMO titkosított üzenet küldése</string>
   <string name="send_omemo_x509_message">OMEMO v\\titkosított üzenet küldése</string>
   <string name="send_pgp_message">OpenPGP titkosított üzenet küldése</string>
@@ -170,9 +169,7 @@
   <string name="attach_record_voice">Hang felvétele</string>
   <string name="account_settings_jabber_id">Jabber azonosító</string>
   <string name="block_jabber_id">Jabber azonosító blokkolása</string>
-  <string name="account_settings_password">Jelszó</string>
   <string name="account_settings_example_jabber_id">felhasznalo@peldaoldal.com</string>
-  <string name="account_settings_confirm_password">Erősítsd meg a jelszót</string>
   <string name="password">Jelszó</string>
   <string name="invalid_jid">Nem érvényes Jabber azonosító</string>
   <string name="error_out_of_memory">Nincs elég memória. Képfájl túl nagy</string>
@@ -198,11 +195,7 @@
   <string name="last_seen_day">1 napja volt aktív</string>
   <string name="last_seen_days">%d napja volt aktív</string>
   <string name="install_openkeychain">Titkosított üzenet. Kérlek telepítsd az OpenKeychain-t a dekódoláshoz.</string>
-  <string name="unknown_otr_fingerprint">Ismeretlen OTR ujjlenyomat</string>
   <string name="openpgp_messages_found">OpenPGP kódolású üzeneteket találtunk</string>
-  <string name="your_fingerprint">A Te ujjlenyomatod</string>
-  <string name="otr_fingerprint">OTR ujjlenyomat</string>
-  <string name="otr_fingerprint_selected_message">Az üzenet OTR ujjlenyomata</string>
   <string name="openpgp_key_id">OpenPGP Kulcs Azonosító</string>
   <string name="omemo_fingerprint">OMEMO ujjlenyomat</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO ujjlenyomat</string>
@@ -212,11 +205,9 @@
   <string name="trust_omemo_fingerprints">OMEMO ujjlenyomatokban megbízik</string>
   <string name="fetching_keys">Kulcsok beszerzése...</string>
   <string name="done">Kész</string>
-  <string name="verify">Ellenőriz</string>
   <string name="decrypt">Dekódol</string>
   <string name="conferences">Konferenciák</string>
   <string name="search">Keresés</string>
-  <string name="create_contact">Névjegy létrehozása</string>
   <string name="dialog_title_create_contact">Névjegy létrehozása</string>
   <string name="enter_contact">Névjegy megadása</string>
   <string name="join_conference">Konferenciához csatlakozás</string>
@@ -263,11 +254,8 @@
   <string name="enable">Engedélyez</string>
   <string name="conference_requires_password">A konferenciához jelszó szükséges</string>
   <string name="enter_password">Írd be a jelszót</string>
-  <string name="missing_presence_subscription">Hiányzik az állapotra való feliratkozás</string>
   <string name="request_presence_updates">Kérlek, kérd először az állapot frissítéseket az ismerősödtől.\n\n<small>Ez segíteni fog abban, hogy kiderítsük, milyen klienst használ.</small></string>
   <string name="request_now">Lekérés folyamatban</string>
-  <string name="delete_fingerprint">Ujjlenyomat törlése</string>
-  <string name="sure_delete_fingerprint">Biztosan törölni szeretnéd ezt az ujjlenyomatot?</string>
   <string name="ignore">Mellőz</string>
   <string name="without_mutual_presence_updates"><b>Figyelem:</b>Az elküldés ismeretlen problémákat okozhat, mert nincs beállítva a kölcsönös jelenlét frissítés.\n\n<small>Nézze át a kapcsolat részleteket és ellenőrizze az állapot frissítéseket.</small></string>
   <string name="pref_security_settings">Biztonság</string>
@@ -291,7 +279,6 @@
   <string name="pref_conference_name_summary">A konferencia 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">Tiszteletben tartja az automata csatlakozás beállítást a konferencia könyvjelzőkben</string>
-  <string name="toast_message_otr_fingerprint">Az OTR ujjlenyomat vágólapra lett másolva!</string>
   <string name="toast_message_omemo_fingerprint">Az OMEMO ujjlenyomat vágólapra lett másolva!</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>
@@ -313,19 +300,8 @@
   <string name="show_qr_code">2D vonalkód mutatása</string>
   <string name="show_block_list">Tiltólista mutatása</string>
   <string name="account_details">Fiók részletek</string>
-  <string name="verify_otr">OTR ellenőrzése</string>
-  <string name="remote_fingerprint">Távoli Ujlenyomat</string>
-  <string name="shared_secret_hint">Tipp vagy kérdés</string>
-  <string name="shared_secret_secret">Megosztott titok</string>
   <string name="confirm">Jóváhagy</string>
-  <string name="in_progress">Folyamatban</string>
-  <string name="respond">Válaszol</string>
-  <string name="secrets_do_not_match">A titkok nem egyeznek</string>
   <string name="try_again">megpróbálja újra</string>
-  <string name="finish">Befejez</string>
-  <string name="verified">Hitelesített!</string>
-  <string name="smp_requested">Az ismerős SMP ellenőrzést kért</string>
-  <string name="no_otr_session_found">Nem található érvényes OTR-munkamenet!</string>
   <string name="conversations_foreground_service">Beszélgetések</string>
   <string name="pref_keep_foreground_service">Előtérben futtassa a programot</string>
   <string name="pref_keep_foreground_service_summary">Megakadályozza az operációs rendszert abban, hogy megszakítsa a kapcsolatot a szerverrel a háttérben</string>
@@ -346,36 +322,24 @@
   <string name="file_deleted">A fájl törlésre került</string>
   <string name="no_application_found_to_open_file">Nincs alkalmazás a fájl megnyitására</string>
   <string name="no_application_found_to_open_link">Nincs alkalmazás a link megnyitására</string>
-  <string name="could_not_verify_fingerprint">Nem sikerült ellenőrizni az ujjlenyomatot</string>
-  <string name="manually_verify">Manuális ellenőrzés</string>
-  <string name="are_you_sure_verify_fingerprint">Biztosan ellenőrizni szeretnéd az ismerős OTR ujjlenyomatát?</string>
-  <string name="pref_show_dynamic_tags">Dinamikus címkék mutatása</string>
+  <string name="pref_show_dynamic_tags">Dinamikus címkék</string>
   <string name="pref_show_dynamic_tags_summary">Információs címkék megjelenítése a partnerek alatt</string>
   <string name="enable_notifications">Értesítések bekapcsolása</string>
   <string name="no_conference_server_found">Nem található konferencia szerver</string>
   <string name="conference_creation_failed">Konferencia létrehozás meghiúsult!</string>
   <string name="account_image_description">Fiók profilkép</string>
-  <string name="copy_otr_clipboard_description">Másolja az OTR ujjlenyomatát a vágólapra</string>
   <string name="copy_omemo_clipboard_description">Másolja az OMEMO ujjlenyomatát a vágólapra</string>
   <string name="regenerate_omemo_key">OMEMO kulcs regenerálása</string>
   <string name="clear_other_devices">Eszközök tisztítása</string>
   <string name="clear_other_devices_desc">Biztosan törölni kívánja az összes többi eszközt az OMEMO bejelentéséből? A következő alkalommal, amikor a készülékei csatlakoznak, újra bejelentik magukat, de előfordulhat, hogy nem kapják meg az időközben elküldött üzeneteket.</string>
   <string name="error_no_keys_to_trust_server_error">Ehhez a kapcsolathoz nem áll rendelkezésre használható kulcs.\n A kiszolgáló új kulcsainak letöltése sikertelen volt. Talán van valami baj a kapcsolattartó szerverével.</string>
   <string name="error_no_keys_to_trust_presence">Ehhez a kapcsolathoz nem áll rendelkezésre használható kulcs.\nGyőződjön meg róla, hogy kölcsönösen felíratkoztak egymás állapotfrissítéseire.</string>
-  <string name="error_no_keys_to_trust">Ehhez a kapcsolathoz nem áll rendelkezésre használható kulcs. Ha törölted valamelyik kulcsukat, akkor újakat kell létrehoznod.</string>
   <string name="error_trustkeys_title">Valami nem jó alakult</string>
   <string name="fetching_history_from_server">Előzmények lekérése a szerverről</string>
   <string name="no_more_history_on_server">Nincs több előzmény a szerveren</string>
   <string name="updating">Frissítés...</string>
   <string name="password_changed">Jelszó megváltozott!</string>
   <string name="could_not_change_password">Nem lehet a jelszót megváltoztatni</string>
-  <string name="otr_session_not_started">Küldj egy üzenetet a titkosított csevegés elindításához</string>
-  <string name="ask_question">Feltegyen egy kérdést</string>
-  <string name="smp_explain_question">Ha Ön és az Ön kapcsolatának van olyan közös titkuk amit senki más nem tud (például egy belső vicc vagy amit ebédeltek amikor utoljára találkoztak), használhatja ezt a titkot, hogy ellenőrizze egymás ujjlenyomatait.\n\nFeltesz egy kérdést a kapcsolattartóhoz, aki válaszolni fog kis-és nagybetű érzékeny válasszal.</string>
-  <string name="smp_explain_answer">Az Ön kapcsolata ellenőrizni szeretné az ujjlenyomatát, rákérdezve egy közös titkukra. Az Ön kapcsolata a következő tippet vagy kérdést adta a titokhoz.</string>
-  <string name="shared_secret_hint_should_not_be_empty">A célzás nem lehet üres</string>
-  <string name="shared_secret_can_not_be_empty">A megosztott titok nem lehet üres</string>
-  <string name="manual_verification_explanation">Óvatosan hasonlítsa össze az alábbi ujjlenyomatot a kapcsolatának ujjlenyomatával.\nBármilyen megbízható kommunikációs formát használhat, például titkosított e-mailt vagy telefonhívást azok cseréjéhez.</string>
   <string name="change_password">Jelszó megváltoztatása</string>
   <string name="current_password">Jelenlegi jelszó</string>
   <string name="new_password">Új jelszó</string>
@@ -424,7 +388,6 @@
   <string name="apk">Android applikáció</string>
   <string name="vcard">Névjegy</string>
   <string name="received_x_file">Fogadott fájl: %s</string>
-  <string name="disable_foreground_service">Előtérben futó szolgáltatás letiltása</string>
   <string name="touch_to_open_conversations">A Conversations megnyitásához érintse meg</string>
   <string name="avatar_has_been_published">A önarckép publikálva lett!</string>
   <string name="sending_x_file">Küldés alatt: %s</string>
@@ -525,14 +488,6 @@
   <string name="no_camera_permission">A Conversations-nek hozzáférésre lenne szüksége a kamerához</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="certificate_information">Tanúsítványinformáció</string>
-  <string name="certificate_subject">Tárgy</string>
-  <string name="certificate_issuer">Kibocsátó</string>
-  <string name="certificate_cn">Gyakori név</string>
-  <string name="certificate_o">Szervezet</string>
-  <string name="certificate_sha1">SHA-1</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">Csak akkor értesítsen, ha megemlítenek</string>
   <string name="notify_never">Értesítések letiltva</string>
@@ -564,9 +519,7 @@
   <string name="pick_your_username">Válassz felhasználónevet</string>
   <string name="pref_manually_change_presence">Elérhetőség manuális beállítása</string>
   <string name="pref_manually_change_presence_summary">Az állapotüzenet szerkesztésekor állítsa be elérhetőségét</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>
@@ -574,13 +527,9 @@
   <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="dialog_title_create_conference">Konferencia Létrehozása</string>
-  <string name="join_or_create_conference">Csatlakozni vagy létrehozni 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>
@@ -611,11 +560,6 @@
   <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 anonim konferencia.</string>
-  <string name="this_conference_has_no_members">Jelenleg egy tagja sincsen ennek a konferenciának.</string>
   <string name="report_jid_as_spammer">Jelentse ezt a JID-et, mint nemkívánatos üzenetek küldőjét.</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>
@@ -714,12 +658,10 @@
   <string name="huawei_protected_apps_summary">Ha értesítést szeretne kapni, még akkor is, ha a képernyő ki van kapcsolva, hozzá kell adnia a Conversations-t a védett alkalmazások listájához.</string>
   <string name="mtm_accept_cert">Ismeretlen tanúsítvány elfogadása?</string>
   <string name="mtm_trust_anchor">A szervertanúsítványt nem írta alá ismert Tanúsító Hatóság.</string>
-  <string name="mtm_cert_expired">A szervertanúsítvány lejárt.</string>
   <string name="mtm_accept_servername">Elfogadja a nem megfelelő kiszolgáló nevét?</string>
   <string name="mtm_hostname_mismatch">A kiszolgáló nem tudta hitelesíteni mint \"%s\". A tanúsítvány csak az alábbiakra érvényes:</string>
   <string name="mtm_connect_anyway">Szeretnél akárhogyan is csatlakozni?</string>
   <string name="mtm_cert_details">Tanúsítvány részletek:</string>
-  <string name="mtm_notification">Tanúsítvány Igazolás</string>
   <string name="once">Egyszer</string>
   <string name="qr_code_scanner_needs_access_to_camera">A QR-kódos szkennernek hozzáférésre van szüksége a fényképezőgéphez</string>
   <string name="pref_scroll_to_bottom">Görgessen az aljára</string>
@@ -733,4 +675,16 @@
   <string name="error_trustkey_hint_mutual">Tipp: Bizonyos esetekben ez úgy oldható meg, hogy egymást felveszik a névjegyzékben.</string>
   <string name="disable_encryption_message">Biztosan le szeretné tiltani az OMEMO titkosítást ehhez a beszélgetéshez?\nEz lehetővé fogja tenni a kiszolgáló rendszergazdájának, hogy elolvassa az üzeneteket(ha rosszat akar); de ez lehet az egyetlen módja annak, hogy kommunikáljon az elavult ügyfeleket használó emberekkel.</string>
   <string name="disable_now">Letiltás most</string>
+  <string name="draft">Vázlat:</string>
+  <string name="pref_omemo_setting">OMEMO titkosítás</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO lesz mindig használva az egy-egy és egyéni csoportos beszélgetésekhez.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO lesz az alapértelmezett az új beszélgetésekhez.</string>
+  <string name="pref_omemo_setting_summary_default_off">Az OMEMO-t kifejezetten be kell majd kapcsolni az új beszélgetésekhez.</string>
+  <string name="pref_font_size">Betűméret</string>
+  <string name="pref_font_size_summary">Az alkalmazásban használt relatív betűméret.</string>
+  <string name="default_on">Bekapcsolva alapból</string>
+  <string name="default_off">Kikapcsolva alapból</string>
+  <string name="small">Kicsi</string>
+  <string name="medium">Közepes</string>
+  <string name="large">Nagy</string>
 </resources>

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

@@ -71,7 +71,6 @@
   <string name="clear_histor_msg">Apakah Anda ingin menghapus semua pesan dalam Percakapan ini\n\n<b>Peringatan:</b>ini tidak akan mempengaruhi pesan yang disimpan pada perangkat atau server lain.</string>
   <string name="delete_messages">Hapus pesan</string>
   <string name="send_unencrypted_message">Kirim pesan tak-terenkripsi</string>
-  <string name="send_otr_message">Kirim pesan terenskripsi OTR</string>
   <string name="send_pgp_message">Kirim pesan terenskripsi OpenPGP</string>
   <string name="your_nick_has_been_changed">Nick kamu telah dirubah</string>
   <string name="send_unencrypted">Kirim tidak terenkripsi</string>
@@ -144,9 +143,7 @@
   <string name="mgmt_account_are_you_sure">Apakah Anda yakin.?</string>
   <string name="attach_record_voice">Rekam suara</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="account_settings_password">Password</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Ketik ulang password</string>
   <string name="password">Password</string>
   <string name="invalid_jid">Jabber ID tidak valid</string>
   <string name="error_out_of_memory">Memori habis. Gambar terlalu besar</string>
@@ -171,13 +168,9 @@
   <string name="last_seen_day">terlihat 1 hari lalu</string>
   <string name="last_seen_days">terlihat %d hari lalu</string>
   <string name="install_openkeychain">Pesan terenskripsi. Pasang OpenKeychain untuk menerjemahkan</string>
-  <string name="unknown_otr_fingerprint">Sidik OTR tidak diketahui</string>
   <string name="openpgp_messages_found">pesan terkunci OpenPGP ditemukan</string>
-  <string name="your_fingerprint">Fingerprint Anda</string>
-  <string name="otr_fingerprint">OTR fingerprint</string>
   <string name="other_devices">Perangkat lainnya</string>
   <string name="done">Selesai</string>
-  <string name="verify">Verifikasi</string>
   <string name="decrypt">Deskripsi</string>
   <string name="search">Cari</string>
   <string name="view_contact_details">Lihat detil kontak</string>
@@ -215,8 +208,6 @@
   <string name="enter_password">Masukan password</string>
   <string name="request_presence_updates">Silakan meminta pembaruan kehadiran dari kontak Anda lebih dulu.\n\n<small>Ini akan digunakan untuk menentukan (klien) mana yang digunakan dikontak Anda.</small></string>
   <string name="request_now">Request sekarang</string>
-  <string name="delete_fingerprint">Hapus sidik jari</string>
-  <string name="sure_delete_fingerprint">Apakah anda yakin menghapus sidik jari?</string>
   <string name="ignore">Abaikan</string>
   <string name="without_mutual_presence_updates"><b>Perhatian</b> Mengirim ini tanpa kehadiran sesama pembaruan bisa menyebabkan masalah tak terduga.\n\n<small>Pergi ke kontak untuk memverifikasi langganan kehadiran anda.</small></string>
   <string name="pref_expert_options_summary">Harap berhati-hati dengan ini</string>
@@ -232,7 +223,6 @@
   <string name="pref_use_indicate_received_summary">Pesan yang diterima akan ditambahkan centang hijau jika didukung</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Warnai tombol kirim untuk mengindikasikan status kontak</string>
   <string name="pref_expert_options_other">Lainnya</string>
-  <string name="toast_message_otr_fingerprint">sidik jari OTR disalin ke clipboard!</string>
   <string name="using_account">menggunakan akun %s</string>
   <string name="not_connected_try_again">Anda tidak terhubung. Coba lagi nanti</string>
   <string name="check_x_filesize">Cek %s ukuran</string>
@@ -243,19 +233,8 @@
   <string name="url_copied_to_clipboard">URL disalin ke clipboard</string>
   <string name="show_block_list">Tampilkan daftar blokir</string>
   <string name="account_details">Detil akun</string>
-  <string name="verify_otr">Verifikasi OTR</string>
-  <string name="remote_fingerprint">Remote Sidik jari</string>
-  <string name="shared_secret_hint">Petunjuk atau Pertanyaan</string>
-  <string name="shared_secret_secret">Rahasia bersama</string>
   <string name="confirm">Konfirmasi</string>
-  <string name="in_progress">Sedang diproses</string>
-  <string name="respond">Menanggapi</string>
-  <string name="secrets_do_not_match">Rahasia tidak match</string>
   <string name="try_again">Coba lagi</string>
-  <string name="finish">Selesai</string>
-  <string name="verified">Terverifikasi!</string>
-  <string name="smp_requested">Kontak meminta verifikasi SMP</string>
-  <string name="no_otr_session_found">Tidak ada sesi OTR yang valid ditemukan!</string>
   <string name="conversations_foreground_service">Percakapan</string>
   <string name="pref_keep_foreground_service">Jaga layanan di latar depan</string>
   <string name="pref_keep_foreground_service_summary">Cegah sistem operasi mematikan koneksi</string>
@@ -272,26 +251,15 @@
   <string name="file_transmission_failed">pengiriman berkas gagal</string>
   <string name="file_deleted">Berkas sudah dihapus</string>
   <string name="no_application_found_to_open_file">Tidak ditemukan aplikasi untuk membuka berkas</string>
-  <string name="could_not_verify_fingerprint">Tidak dapat verifikasi fingerprint</string>
-  <string name="manually_verify">Verifikasi secara manual</string>
-  <string name="pref_show_dynamic_tags">Tampilkan tag dinamis</string>
   <string name="pref_show_dynamic_tags_summary">Tampilan read-only tag di bawah kontak</string>
   <string name="enable_notifications">Aktifkan notifikasi</string>
   <string name="account_image_description">Avatar akun</string>
-  <string name="copy_otr_clipboard_description">Salin OTR fingerprint ke clipboard</string>
   <string name="clear_other_devices">Bersihkan perangkat</string>
   <string name="fetching_history_from_server">Mengambil data dari server</string>
   <string name="no_more_history_on_server">Tidak ada data lagi di server</string>
   <string name="updating">Merubah...</string>
   <string name="password_changed">Password diganti!</string>
   <string name="could_not_change_password">Tidak dapat mengubah password</string>
-  <string name="otr_session_not_started">Kirim pesan untuk memulai obrolan dienkripsi</string>
-  <string name="ask_question">Bertanya</string>
-  <string name="smp_explain_question">Jika Anda dan kontak Anda memiliki rahasia yang sama yang tidak ada orang lain yang tahu (seperti sebuah lelucon atau hanya apa yang Anda punya untuk makan siang terakhir kali Anda bertemu) Anda dapat menggunakan rahasia itu untuk memverifikasi sidik jari masing-masing.\n\nAnda memberikan petunjuk atau pertanyaan untuk kontak yang akan merespon dengan jawaban case-sensitive.</string>
-  <string name="smp_explain_answer">Kontak Anda ingin memverifikasi sidik jari Anda dengan menantang Anda dengan rahasia bersama. Kontak Anda memberikan petunjuk berikut atau pertanyaan untuk rahasia itu.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Petunjuk Anda tidak boleh kosong</string>
-  <string name="shared_secret_can_not_be_empty">Rahasia bersama Anda tidak boleh kosong</string>
-  <string name="manual_verification_explanation">Hati-hati membandingkan sidik jari yang ditunjukkan di bawah dengan sidik jari kontak Anda.\nAnda dapat mengunakan layanan komunikasi terpercaya seperti e-mail terenskripsi atau panggilan telepon untuk menukarkannya.</string>
   <string name="change_password">Ubah password</string>
   <string name="current_password">Password sekarang</string>
   <string name="new_password">Password baru</string>
@@ -327,7 +295,6 @@
   <string name="apk">Apl Android</string>
   <string name="vcard">Kontak</string>
   <string name="received_x_file">Diterima %s</string>
-  <string name="disable_foreground_service">Nonaktifkan layanan latar belakang</string>
   <string name="touch_to_open_conversations">Sentuh untuk membuka Conversations</string>
   <string name="avatar_has_been_published">Avatar telah diterbitkan!</string>
   <string name="sending_x_file">Mengirim %s</string>
@@ -380,13 +347,6 @@
     <item quantity="other">%d pesan</item>
   </plurals>
   <string name="sync_with_contacts">Sinkronkan dengan kontak</string>
-  <string name="certificate_information">Informasi Sertifikat</string>
-  <string name="certificate_subject">Subjek</string>
-  <string name="certificate_cn">Nama Umum</string>
-  <string name="certificate_o">Organisasi</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Tidak tersedia)</string>
-  <string name="certificate_not_found">Tidak ada sertifikat ditemukan</string>
   <string name="notify_on_all_messages">Tampilkan notifikasi untuk semua pesan</string>
   <string name="pref_picture_compression">Kompres Gambar</string>
   <string name="pref_picture_compression_summary">Rubah ukuran dan kompres gambar</string>
@@ -404,7 +364,6 @@
   <string name="your_full_jid_will_be">Jabber ID anda akan seperti: %s</string>
   <string name="create_account">Buat Akun</string>
   <string name="pick_your_username">Pilih username anda</string>
-  <string name="change_presence">Ubah Kehadiran</string>
   <string name="status_message">Status</string>
   <string name="presence_chat">Tersedia</string>
   <string name="presence_online">Online</string>
@@ -412,9 +371,7 @@
   <string name="presence_xa">Tidak Tersedia</string>
   <string name="presence_dnd">Sibuk</string>
   <string name="secure_password_generated">Password aman berhasil dibuat</string>
-  <string name="show_password">Tampilkan password</string>
   <string name="registration_please_wait">Registrasi gagal: Coba lagi nanti</string>
-  <string name="conference_subject">Subjek</string>
   <string name="choose_participants">Undang user</string>
   <string name="invite_again">Undang lagi</string>
   <string name="gp_short">Pendek</string>

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

@@ -49,6 +49,7 @@
   <string name="start_conversation">Inizia conversazione</string>
   <string name="invite_contact">Invita contatto</string>
   <string name="contacts">Contatti</string>
+  <string name="contact">Contatto</string>
   <string name="cancel">Annulla</string>
   <string name="set">Imposta</string>
   <string name="add">Aggiungi</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Invia messaggio non cifrato</string>
   <string name="send_message">Invia messaggio</string>
   <string name="send_message_to_x">Invia messaggio a %s</string>
-  <string name="send_otr_message">Messaggio OTR</string>
   <string name="send_omemo_message">Invia messaggio cifrato OMEMO</string>
   <string name="send_omemo_x509_message">Invia messaggio cifrato v\\OMEMO</string>
   <string name="send_pgp_message">Messaggio OpenPGP</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Registra la voce</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="block_jabber_id">Blocca ID Jabber</string>
-  <string name="account_settings_password">Password</string>
   <string name="account_settings_example_jabber_id">utente@esempio.com</string>
-  <string name="account_settings_confirm_password">Conferma password</string>
   <string name="password">Password</string>
   <string name="invalid_jid">Questo non è un ID Jabber valido</string>
   <string name="error_out_of_memory">Memoria esaurita. L’immagine è tropppo grande</string>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">visto 1 giorno fa</string>
   <string name="last_seen_days">visto %d giorni fa</string>
   <string name="install_openkeychain">Messaggio cifrato. Installa OpenKeychain per decifrare.</string>
-  <string name="unknown_otr_fingerprint">Impronta OTR sconosciuta</string>
   <string name="openpgp_messages_found">Messaggi cifrati con OpenPGP trovati</string>
-  <string name="your_fingerprint">La tua impronta</string>
-  <string name="otr_fingerprint">Impronta OTR</string>
-  <string name="otr_fingerprint_selected_message">Impronta OTR del messaggio</string>
   <string name="openpgp_key_id">ID chiave OpenPGP</string>
   <string name="omemo_fingerprint">Impronta OMEMO</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO impronta</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">Fidati delle impronte OMEMO</string>
   <string name="fetching_keys">Ricezione chiavi...</string>
   <string name="done">Fatto</string>
-  <string name="verify">Verifica</string>
   <string name="decrypt">Decripta</string>
   <string name="conferences">Chat di gruppo</string>
   <string name="search">Cerca</string>
-  <string name="create_contact">Crea contatto</string>
   <string name="dialog_title_create_contact">Crea un contatto</string>
   <string name="enter_contact">Inserisci contatto</string>
   <string name="join_conference">Unisciti alla chat</string>
@@ -263,11 +255,8 @@
   <string name="enable">Abilita</string>
   <string name="conference_requires_password">La chat di gruppo richiede una password</string>
   <string name="enter_password">Inserisci la password</string>
-  <string name="missing_presence_subscription">Sottoiscrizione alla presenza mancante</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>
-  <string name="delete_fingerprint">Elimina impronta</string>
-  <string name="sure_delete_fingerprint">Sei sicuro di voler eliminare questa impronta?</string>
   <string name="ignore">Ignora</string>
   <string name="without_mutual_presence_updates"><b>Attenzione:</b> Inviando questo messaggio senza aggiornamenti della presenza reciproci potrebbe causare problemi inaspettati.\n\n<small>Vai nei dettagli del contatto per verificare le tue sottoscrizioni alla presenza.</small></string>
   <string name="pref_security_settings">Sicurezza</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">Usa il titolo invece del JID per identificare le chat di gruppo</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="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>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">Mostra codice a barre 2D</string>
   <string name="show_block_list">Mostra la lista nera</string>
   <string name="account_details">Dettagli account</string>
-  <string name="verify_otr">Verifica OTR</string>
-  <string name="remote_fingerprint">Impronta remota</string>
-  <string name="shared_secret_hint">Suggerimento o domanda</string>
-  <string name="shared_secret_secret">Segreto condiviso</string>
   <string name="confirm">Conferma</string>
-  <string name="in_progress">In corso</string>
-  <string name="respond">Rispondi</string>
-  <string name="secrets_do_not_match">I segreti non corrispondono</string>
   <string name="try_again">Prova di nuovo</string>
-  <string name="finish">Fine</string>
-  <string name="verified">Verificato!</string>
-  <string name="smp_requested">Il contatto ha richiesto la verifica SMP</string>
-  <string name="no_otr_session_found">Non è stata trovata nessuna sessione OTR valida!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Mantieni il servizio in primo piano</string>
   <string name="pref_keep_foreground_service_summary">Evita che il sistema operativo chiuda la connessione</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">Il file è stato eliminato</string>
   <string name="no_application_found_to_open_file">Nessuna applicazione trovata per aprire il file</string>
   <string name="no_application_found_to_open_link">Nessuna applicazione trovata per aprire il link</string>
-  <string name="could_not_verify_fingerprint">Impronta non verificata</string>
-  <string name="manually_verify">Verifica manuale</string>
-  <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">Tag dinamici</string>
   <string name="pref_show_dynamic_tags_summary">Mostra tag in sola lettura sotto i contatti</string>
   <string name="enable_notifications">Abilita le notifiche</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="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>
   <string name="regenerate_omemo_key">Rigenera chiave OMEMO</string>
   <string name="clear_other_devices">Pulisci dispositivi</string>
   <string name="clear_other_devices_desc">Sei sicuro/a di voler rimuovere tutti gli altri dispositivi dall\'annuncio OMEMO? La prossima volta che si connetteranno si riannunceranno, ma potrebbero non ricevere i messaggi inviati nel frattempo.</string>
   <string name="error_no_keys_to_trust_server_error">Non ci sono chiavi utilizzabili per questo contatto.\nRicezione di nuovi chiavi dal server non riuscita. Forse qualcosa non va con il server del tuo contatto.</string>
   <string name="error_no_keys_to_trust_presence">Non ci sono chiavi utilizzabili per questo contatto.\nAssicurati di avere reciprocamente la sottoscrizione sulla presenza.</string>
-  <string name="error_no_keys_to_trust">Non ci sono chiavi usabili per questo contatto. Se hai cancellato qualsiasi loro chiave, devono generarne di nuove.</string>
   <string name="error_trustkeys_title">Qualcosa è andato storto</string>
   <string name="fetching_history_from_server">Caricamento della cronologia dal server</string>
   <string name="no_more_history_on_server">Fine cronologia sul server</string>
   <string name="updating">Caricamento…</string>
   <string name="password_changed">Password cambiata!</string>
   <string name="could_not_change_password">Impossibile cambiare la password</string>
-  <string name="otr_session_not_started">Invia un messaggio per avviare una conversazione cifrata</string>
-  <string name="ask_question">Fai una domanda</string>
-  <string name="smp_explain_question">Se condividi con il tuo contatto un segreto in comune non conosciuto da altri (come uno scherzo privato o semplicemente quel che avete mangiato l\'ultima volta insieme) potete usarlo per verificare le vostre impronte.\n\nInvia un suggerimento o una domanda al tuo contatto il quale dovrà rispondere con una risposta controllando le maiuscole.</string>
-  <string name="smp_explain_answer">Il tuo contatto vorrebbe verificare la tua impronta. Dovrai rispondere correttamente alla sua domanda con una risposta che condividete. Il tuo contatto ti ha fornito il suggerimento o la domanda seguente.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Il suggerimento non dovrebbe essere vuoto</string>
-  <string name="shared_secret_can_not_be_empty">Il segreto condiviso non può essere vuoto</string>
-  <string name="manual_verification_explanation">Confronta attentamente l’impronta mostrata sotto con l’impronta del tuo contatto.\nPuoi usare qualsiasi forma di comunicazione fidata come una e-mail cifrata o una chiamata telefonica per confrontare le impronte.</string>
   <string name="change_password">Cambia password</string>
   <string name="current_password">Password attuale</string>
   <string name="new_password">Nuova password</string>
@@ -424,7 +389,6 @@
   <string name="apk">Applicazione Android</string>
   <string name="vcard">Contatto</string>
   <string name="received_x_file">Ricevuto %s</string>
-  <string name="disable_foreground_service">Disabilita servizio in primo piano</string>
   <string name="touch_to_open_conversations">Tocca per avviare Conversations</string>
   <string name="avatar_has_been_published">Il tuo avatar è stato pubblicato!</string>
   <string name="sending_x_file">Invio %s</string>
@@ -525,14 +489,6 @@
   <string name="no_camera_permission">Conversations ha bisogno di accedere alla fotocamera</string>
   <string name="sync_with_contacts">Sincronizza con i contatti</string>
   <string name="sync_with_contacts_long">Conversations vuole confrontare il tuo roster XMPP con i tuoi contatti per mostrare i loro nomi ed avatar.\n\nConversations leggerà solamente i contatti e li confronterà localmente senza caricarli sul server.\n\nTi verrà ora chiesto il permesso di accedere ai tuoi contatti.</string>
-  <string name="certificate_information">Informazioni del certificato</string>
-  <string name="certificate_subject">Soggetto</string>
-  <string name="certificate_issuer">Emittente</string>
-  <string name="certificate_cn">Nome comune</string>
-  <string name="certificate_o">Organizzazione</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Non disponibile)</string>
-  <string name="certificate_not_found">Nessun certificato trovato</string>
   <string name="notify_on_all_messages">Notifica per tutti i messaggi</string>
   <string name="notify_only_when_highlighted">Notifica solo quando menzionato</string>
   <string name="notify_never">Notifiche disabilitate</string>
@@ -564,9 +520,7 @@
   <string name="pick_your_username">Scegli il tuo nome utente</string>
   <string name="pref_manually_change_presence">Gestisci manualmente la disponibilità</string>
   <string name="pref_manually_change_presence_summary">Imposta la tua disponibilità quando modifichi il messaggio di stato.</string>
-  <string name="change_presence">Cambia la presenza</string>
   <string name="status_message">Messaggio di stato</string>
-  <string name="all_accounts_on_this_device">Imposta per tutti gli account del dispositivo</string>
   <string name="presence_chat">Disponibile a chattare</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Assente</string>
@@ -574,13 +528,9 @@
   <string name="presence_dnd">Occupato</string>
   <string name="secure_password_generated">È stata generata una password sicura</string>
   <string name="device_does_not_support_battery_op">Il tuo dispositivo non supporta l\'esclusione per l\'ottimizzazione della batteria</string>
-  <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="dialog_title_create_conference">Crea una chat di gruppo</string>
-  <string name="join_or_create_conference">Unisciti o crea chat 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="invite_again">Invita di nuovo</string>
@@ -611,11 +561,6 @@
   <string name="no_permission_to_access_x">Nessuna autorizzazione per accedere a %s</string>
   <string name="remote_server_not_found">Server remoto non trovato</string>
   <string name="unable_to_update_account">Impossibile aggiornare l\'account</string>
-  <string name="missing_presence_subscription_with_x">Sottoscrizione della presenza con %s mancante.</string>
-  <string name="missing_keys_from_x">Chiavi OMEMO da %s mancanti.</string>
-  <string name="missing_omemo_keys">Chiave OMEMO mancante</string>
-  <string name="wrong_conference_configuration">Questa non è una chat di gruppo privata o non-anonima.</string>
-  <string name="this_conference_has_no_members">Non ci sono membri in questa chat di gruppo.</string>
   <string name="report_jid_as_spammer">Questo JID invia messaggi non richiesti.</string>
   <string name="pref_delete_omemo_identities">Elimina identità OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Rigenera le tue chiavi OMEMO. I tuoi contatti dovranno verificare un\'altra volta la tua identità. Solo come ultima possibilità.</string>
@@ -714,12 +659,10 @@
   <string name="huawei_protected_apps_summary">Per ricevere notifiche anche quando lo schermo è spento, devi aggiungere Conversations all\'elenco delle app protette.</string>
   <string name="mtm_accept_cert">Accetti il certificato sconosciuto?</string>
   <string name="mtm_trust_anchor">Il certificato del server non è firmato da una Certificate Authority nota.</string>
-  <string name="mtm_cert_expired">Il certificato del server è scaduto.</string>
   <string name="mtm_accept_servername">Accetti il nome del server non corrispondente?</string>
   <string name="mtm_hostname_mismatch">Il server non ha potuto autenticarsi come \"%s\". Il certificato è valido solo per:</string>
   <string name="mtm_connect_anyway">Vuoi connetterti comunque?</string>
   <string name="mtm_cert_details">Dettagli certificato:</string>
-  <string name="mtm_notification">Verifica del certificato</string>
   <string name="once">Una volta sola</string>
   <string name="qr_code_scanner_needs_access_to_camera">Lo scanner di codici QR ha bisogno di accedere alla fotocamera</string>
   <string name="pref_scroll_to_bottom">Scorri in fondo</string>
@@ -733,4 +676,18 @@
   <string name="error_trustkey_hint_mutual">Suggerimento: in alcuni casi può essere risolto aggiungendo a vicenda la vostra lista di contatti.</string>
   <string name="disable_encryption_message">Sei sicuro di disattivare la cifratura OMEMO per questa conversazione?\nCiò permetterà all\'amministratore del server di leggere i tuoi messaggi, ma potrebbe essere il solo modo di comunicare con persone che usano client obsoleti.</string>
   <string name="disable_now">Disattiva adesso</string>
+  <string name="draft">Bozza:</string>
+  <string name="pref_omemo_setting">Cifratura OMEMO</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO verrà sempre usato per chat singole e di gruppi privati.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO verrà usato in modo predefinito nelle nuove conversazioni.</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO dovrà essere attivato a mano nelle nuove conversazioni.</string>
+  <string name="create_shortcut">Crea scorciatoia</string>
+  <string name="pref_font_size">Dimensione carattere</string>
+  <string name="pref_font_size_summary">La dimensione dei caratteri usata all\'interno dell\'app.</string>
+  <string name="default_on">On in modo predefinito</string>
+  <string name="default_off">Off in modo predefinito</string>
+  <string name="small">Piccolo</string>
+  <string name="medium">Medio</string>
+  <string name="large">Grande</string>
+  <string name="not_encrypted_for_this_device">Il messaggio non è stato criptato per questo dispositivo.</string>
 </resources>

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

@@ -69,7 +69,6 @@
   <string name="delete_messages">מחק הודעות</string>
   <string name="also_end_conversation">סיים את השיחה לאחר מכן</string>
   <string name="send_unencrypted_message">שלח הודעה בלתי מוצפנת</string>
-  <string name="send_otr_message">שלח הודעה בהצפנת OTR</string>
   <string name="send_omemo_message">של הודעה בהצפנת OMEMO</string>
   <string name="send_pgp_message">שלח הודעה בהצפנת OpenPGP</string>
   <string name="your_nick_has_been_changed">שם הכינוי שלך השתנה</string>
@@ -135,9 +134,7 @@
   <string name="mgmt_account_are_you_sure">האם אתה בטוח?</string>
   <string name="attach_record_voice">הקלט קול</string>
   <string name="account_settings_jabber_id">מזהה Jabber</string>
-  <string name="account_settings_password">סיסמה</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">אמת סיסמה</string>
   <string name="password">סיסמה</string>
   <string name="invalid_jid">מזהה ה Jabber אינו תקין</string>
   <string name="error_out_of_memory">חסר זיכרון. תצלום גדול מדי</string>
@@ -161,16 +158,12 @@
   <string name="last_seen_day">נראה לאחרונה לפני יום אחד</string>
   <string name="last_seen_days">נראה לאחרונה לפני %d ימים</string>
   <string name="install_openkeychain">הודעה מוצפנת. אנא התקן את OpenKeychain כדי לפענח.</string>
-  <string name="unknown_otr_fingerprint">טביעת אצבע OTR לא מוכרת</string>
   <string name="openpgp_messages_found">הודעות מוצפנות OpenPGP נמצאו</string>
-  <string name="your_fingerprint">טביעת אצבע שלך</string>
-  <string name="otr_fingerprint">טביעת אצבע של OTR</string>
   <string name="omemo_fingerprint">טביעת אצבע של OMEMO</string>
   <string name="omemo_fingerprint_selected_message">טביעת אצבע OMEMO של ההודעה</string>
   <string name="other_devices">מכשירים אחרים</string>
   <string name="trust_omemo_fingerprints">סמוך על טביעות אצבע OMEMO</string>
   <string name="done">בוצע</string>
-  <string name="verify">אמת</string>
   <string name="decrypt">פענח</string>
   <string name="search">חפש</string>
   <string name="view_contact_details">צפה בפרטי איש קשר</string>
@@ -206,8 +199,6 @@
   <string name="enter_password">הכנס סיסמא</string>
   <string name="request_presence_updates">נא לבקש עדכוני נוכחות מאיש הקשר קודם לכך<small>פעולה זו תשמש כדי לקבוע את אקפליקציה שאיש הקשר משתמש בה</small></string>
   <string name="request_now">בקש/י כעת</string>
-  <string name="delete_fingerprint">מחק טביעת אצבע</string>
-  <string name="sure_delete_fingerprint">האם את/ה בטוח שברצונך למחוק טביעת אצבע זו?</string>
   <string name="ignore">התעלם</string>
   <string name="without_mutual_presence_updates"><b>אזהרה:</b>שליחה ללא הרשאות עדכוני נוכחות הדדיות עלולה לגרום לתוצאות בלתי צפויות.\n\n<small>השתמש בתפריט \"פרטי משתמש\" ואשר עדכוני נוכחות</small></string>
   <string name="pref_expert_options_summary">נא להיזהר!</string>
@@ -223,7 +214,6 @@
   <string name="pref_use_indicate_received_summary">יופיע סימן \"וי\" ליד כל הודעה שהתקבלה על ידי איש הקשר, במידה והפעולה נתמכת על ידי איש הקשר.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">צבעו של לחצן שליחת ההודעות יעיד על סטטוס איש הקשר.</string>
   <string name="pref_expert_options_other">אחר</string>
-  <string name="toast_message_otr_fingerprint">טביעת אצבע של OTR הועתקה</string>
   <string name="toast_message_omemo_fingerprint">טביעת אצבע של OMEMO הועתקה</string>
   <string name="using_account">משתמש בחשבון: %s</string>
   <string name="not_connected_try_again">אינך מחובר. נסה שוב אחר כך</string>
@@ -235,19 +225,8 @@
   <string name="url_copied_to_clipboard">הקישור הועתק</string>
   <string name="show_block_list">הראה רשימת חסומים</string>
   <string name="account_details">פרטי חשבון</string>
-  <string name="verify_otr">אמת OTR</string>
-  <string name="remote_fingerprint">טביעת אצבע מרוחקת</string>
-  <string name="shared_secret_hint">שאלה או רמז</string>
-  <string name="shared_secret_secret">סוד משותף</string>
   <string name="confirm">אמת</string>
-  <string name="in_progress">הפעולה מתבצעת</string>
-  <string name="respond">השב</string>
-  <string name="secrets_do_not_match">הסודות אינם תואמים</string>
   <string name="try_again">נסה שוב</string>
-  <string name="finish">סיים</string>
-  <string name="verified">אומת בהצלחה!</string>
-  <string name="smp_requested">איש הקשר ביקש אימות SMP</string>
-  <string name="no_otr_session_found">לא נמצא OTR Session תקין</string>
   <string name="pref_keep_foreground_service">השאר שירות ב Foreground</string>
   <string name="pref_keep_foreground_service_summary">מונע ממערכת ההפעלה לנתק את החיבור לשרת</string>
   <string name="notification_export_logs_title">מייצא logs לכרטיס זיכרון</string>
@@ -263,30 +242,18 @@
   <string name="file_transmission_failed">השליחה נכשלה</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>
-  <string name="pref_show_dynamic_tags">הראה תגים דומיים</string>
   <string name="pref_show_dynamic_tags_summary">הראה תגי read-only מתחת לאנשי הקשר</string>
   <string name="enable_notifications">אפשר התראות</string>
   <string name="account_image_description">תמונת פרופיל</string>
-  <string name="copy_otr_clipboard_description">העתק טביעת אצבע OTR</string>
   <string name="copy_omemo_clipboard_description">העתק טביעת אצבע OMEMO</string>
   <string name="regenerate_omemo_key">צור מפתח OMEMO חדש</string>
   <string name="clear_other_devices">נקה מכשירים</string>
   <string name="clear_other_devices_desc">האם אתה בטוח שברצונך לנקות את כל המכשירים מהכרזת ה OMEMO? בפעם הבאה שהמכשירים יתחברו, הם יכריזו שוב על עצמם, אך הם עלולים לאבד הודעות עד להכרזה זו.</string>
-  <string name="error_no_keys_to_trust">אין מפתחות שימושיים עבור איש קשר זה. אם מחקת אחד מהמפתחות שלהם, יהיה עליהם ליצר מפתח חדש.</string>
   <string name="fetching_history_from_server">הורדת היסטוריה מהשרת</string>
   <string name="no_more_history_on_server">אין עוד היסטוריה בשרת</string>
   <string name="updating">מעדכן...</string>
   <string name="password_changed">הסיסמה שונתה!</string>
   <string name="could_not_change_password">שינוי הסיסמה נכשל</string>
-  <string name="otr_session_not_started">שלח הודעה בכדי להתחיל בהצפנה</string>
-  <string name="ask_question">שאל שאלה</string>
-  <string name="smp_explain_question">במידה ויש לך ולאיש הקשר שלך סוד שרק שניכם יודעים (כמו למשל בדיחה פנימית, או מה אכלתם בפעם האחרונה שנפגשתם), ניתן להשתמש בסוד הנ\"ל על מנת לאמת את מפתחות ההצפנה של אחד את השני.\n\nאיש קשר יספק שאלה או רמז, ואיש הקשר השני יספק תשובה. המלל הוא case-sensitive.</string>
-  <string name="smp_explain_answer">איש הקשר רוצה לאמת את הזהות שלך על ידי סוד משותף. איש הקשר סיפק את הרמז הבא, עליך להזין סוד משותף.</string>
-  <string name="shared_secret_hint_should_not_be_empty">הרמז לא יכול להיות ריק</string>
-  <string name="shared_secret_can_not_be_empty">הסוד המשותף לא יכול להיות ריק</string>
-  <string name="manual_verification_explanation">יש להשוות בזהירות את הטביעת אצבע שמוצגת פה לבין זאת שמוצגת אצל החבר שלך.\nניתן לעשות זאת על ידי שימוש בכל צורת תקשורת שאתה סומך עליה, כמו שיחת טלפון או אימייל מוצפן.</string>
   <string name="change_password">שינוי סיסמה</string>
   <string name="current_password">סיסמה נוכחית</string>
   <string name="new_password">סיסמה חדשה</string>
@@ -321,7 +288,6 @@
   <string name="apk">אפליקציית אנדרויד</string>
   <string name="vcard">איש קשר</string>
   <string name="received_x_file">התקבל %s</string>
-  <string name="disable_foreground_service">בטל שירות Foreground</string>
   <string name="touch_to_open_conversations">לחץ כדי לפתוח את Conversations</string>
   <string name="avatar_has_been_published">תמונת הפרופיל פורסמה!</string>
   <string name="sending_x_file">שולח %s</string>

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

@@ -75,7 +75,6 @@
   <string name="send_unencrypted_message">暗号化されていないメッセージを送信</string>
   <string name="send_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">v\\OMEMO 暗号化メッセージを送信</string>
   <string name="send_pgp_message">OpenPGP 暗号化メッセージを送信</string>
@@ -164,9 +163,7 @@
   <string name="attach_record_voice">音声を録音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Jabber ID をブロック</string>
-  <string name="account_settings_password">パスワード</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">パスワードを確認</string>
   <string name="password">パスワード</string>
   <string name="invalid_jid">これは有効な Jabber ID ではありません</string>
   <string name="error_out_of_memory">メモリ不足です。画像が大きすぎます</string>
@@ -192,11 +189,7 @@
   <string name="last_seen_day">1 日前に会いました</string>
   <string name="last_seen_days">%d 日前に会いました</string>
   <string name="install_openkeychain">暗号化されたメッセージ。復号化するには OpenKeychain をインストールしてください。</string>
-  <string name="unknown_otr_fingerprint">不明な OTR フィンガープリント</string>
   <string name="openpgp_messages_found">OpenPGP 暗号化されたメッセージが見つかりました</string>
-  <string name="your_fingerprint">あなたのフィンガープリント</string>
-  <string name="otr_fingerprint">OTR フィンガープリント</string>
-  <string name="otr_fingerprint_selected_message">メッセージの OTR フィンガープリント</string>
   <string name="openpgp_key_id">OpenPGP 鍵 ID</string>
   <string name="omemo_fingerprint">OMEMO フィンガープリント</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO フィンガープリント</string>
@@ -206,7 +199,6 @@
   <string name="trust_omemo_fingerprints">OMEMO フィンガープリントを信頼</string>
   <string name="fetching_keys">鍵の取得中…</string>
   <string name="done">完了</string>
-  <string name="verify">検証</string>
   <string name="decrypt">復号化</string>
   <string name="search">検索</string>
   <string name="enter_contact">連絡先を入力</string>
@@ -244,11 +236,8 @@
   <string name="disable_notifications">通知を無効にする</string>
   <string name="enable">有効</string>
   <string name="enter_password">パスワードを入力してください</string>
-  <string name="missing_presence_subscription">参加サブスクリプションが見つかりません</string>
   <string name="request_presence_updates">最初に連絡先から参加アップデートを要求してください。\n\n<small>これは、連絡先が何のクライアントを使用しているかを決めるために使用されます。</small></string>
   <string name="request_now">今すぐ要求</string>
-  <string name="delete_fingerprint">フィンガープリントを削除</string>
-  <string name="sure_delete_fingerprint">このフィンガープリントを削除してもよろしいですか?</string>
   <string name="ignore">無視</string>
   <string name="without_mutual_presence_updates"><b>警告:</b> 相互の参加アップデートなしにこれを送信すると、予期しない問題が発生する可能性があります。\n\n<small>あなたの参加サブスクリプションを検証するために、連絡先の詳細に移動します。</small></string>
   <string name="pref_security_settings">セキュリティ</string>
@@ -268,7 +257,6 @@
   <string name="pref_use_indicate_received_summary">サポートされている場合、受信したメッセージに緑色のチェックマークが付きます</string>
   <string name="pref_use_send_button_to_indicate_status_summary">送信ボタンに連絡先ステータスを示す色が付きます</string>
   <string name="pref_expert_options_other">その他</string>
-  <string name="toast_message_otr_fingerprint">OTR フィンガープリントをクリップボードにコピーしました!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO フィンガープリントをクリップボードにコピーしました!</string>
   <string name="using_account">アカウント %s を使用</string>
   <string name="checking_x">HTTP ホストの %s を確認中</string>
@@ -285,19 +273,8 @@
   <string name="show_qr_code">2D バーコードを表示</string>
   <string name="show_block_list">ブロックリストを表示</string>
   <string name="account_details">アカウントの詳細</string>
-  <string name="verify_otr">OTR を検証</string>
-  <string name="remote_fingerprint">リモート フィンガープリント</string>
-  <string name="shared_secret_hint">ヒントまたは質問</string>
-  <string name="shared_secret_secret">共有の秘密</string>
   <string name="confirm">確認</string>
-  <string name="in_progress">実行中</string>
-  <string name="respond">応答</string>
-  <string name="secrets_do_not_match">秘密が一致しません</string>
   <string name="try_again">再度実行してください</string>
-  <string name="finish">完了</string>
-  <string name="verified">検証しました!</string>
-  <string name="smp_requested">連絡先が SMP 検証を要求しました</string>
-  <string name="no_otr_session_found">有効な OTR セッションが見つかりません!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">サービスをフォアグラウンドに保持</string>
   <string name="pref_keep_foreground_service_summary">オペレーティングシステムが接続を切断するのを防止します</string>
@@ -317,33 +294,20 @@
   <string name="file_transmission_failed">ファイル転送に失敗しました</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>
-  <string name="are_you_sure_verify_fingerprint">連絡先の OTR フィンガープリントを検証してもよろしいですか?</string>
-  <string name="pref_show_dynamic_tags">ダイナミック タグを表示</string>
   <string name="pref_show_dynamic_tags_summary">連絡先の下に、読み取り専用タグを表示します</string>
   <string name="enable_notifications">通知を有効にする</string>
   <string name="account_image_description">アカウント アバター</string>
-  <string name="copy_otr_clipboard_description">OTR フィンガープリントをクリップボードにコピー</string>
   <string name="copy_omemo_clipboard_description">OMEMO フィンガープリントをクリップボードにコピー</string>
   <string name="regenerate_omemo_key">OMEMO 鍵を再生成</string>
   <string name="clear_other_devices">デバイスをクリア</string>
   <string name="clear_other_devices_desc">OMEMO のアナウンスから他のすべてのデバイスをクリアしてもよろしいですか? お使いのデバイスが次回接続したとき、それらは自分自身を再アナウンスしますが、それらはその間に送信されたメッセージを受信できない場合があります。</string>
   <string name="error_no_keys_to_trust_server_error">この連絡先で使用可能な鍵がありません。\nサーバーから新しい鍵を取得できませんでした。連絡先のサーバーに問題がある可能性があります。</string>
   <string name="error_no_keys_to_trust_presence">この連絡先で利用可能な鍵はありません。\n相互存在サブスクリプションあることを確認してください。</string>
-  <string name="error_no_keys_to_trust">この連絡先で利用可能な鍵はありません。あなたがその鍵を消去している場合は、新しいものを生成してもらう必要があります。</string>
   <string name="fetching_history_from_server">サーバーから履歴を取得中</string>
   <string name="no_more_history_on_server">サーバーにこれ以上履歴はありません</string>
   <string name="updating">アップデート中…</string>
   <string name="password_changed">パスワードを変更しました!</string>
   <string name="could_not_change_password">パスワードを変更できません</string>
-  <string name="otr_session_not_started">メッセージを送信して、暗号化されたチャットを開始します</string>
-  <string name="ask_question">質問をたずねる</string>
-  <string name="smp_explain_question">あなたと連絡先が、(内輪の冗談や、最後に会って食べた昼食などの) 他の誰も知らない共通の秘密を持っている場合、お互いのフィンガープリントを検証するために、その秘密を使用することができます。\n\nあなたはヒントまたは質問を提供して、連絡先は大文字と小文字を区別した答えで応答します。</string>
-  <string name="smp_explain_answer">連絡先は共有の秘密であなたにチャレンジして、あなたのフィンガープリントを検証したいと思います。連絡先は秘密に対して、次のヒントまたは質問を提供しました。</string>
-  <string name="shared_secret_hint_should_not_be_empty">あなたのヒントは空にできません。</string>
-  <string name="shared_secret_can_not_be_empty">あなたの共有の秘密は空にできません。</string>
-  <string name="manual_verification_explanation">慎重に、連絡先のフィンガープリントと、以下に表示されるフィンガープリントを比較してください。\nこれを交換するためには、暗号化されたメールや、電話のような信頼できる形式の通信を使用することができます。</string>
   <string name="change_password">パスワードの変更</string>
   <string name="current_password">現在のパスワード</string>
   <string name="new_password">新しいパスワード</string>
@@ -381,7 +345,6 @@
   <string name="apk">Android アプリ</string>
   <string name="vcard">連絡先</string>
   <string name="received_x_file">%s を受信しました</string>
-  <string name="disable_foreground_service">フォアグラウンド サービスを無効にする</string>
   <string name="touch_to_open_conversations">タッチして Conversations を開く</string>
   <string name="avatar_has_been_published">アバターを公開しました!</string>
   <string name="sending_x_file">%s の送信中</string>
@@ -474,14 +437,6 @@
   <string name="shared_text_with_x">%s でテキストを共有</string>
   <string name="sync_with_contacts">連絡先と同期</string>
   <string name="sync_with_contacts_long">Conversations はフルネームやアバターを表示するために、連絡先と XMPP 名簿と一致するようにしたいです。\n\nConversations は、サーバーにアップロードすることはなく、ローカルで連絡先を読んで一致させるだけです。\n\n今、連絡先へのアクセス許可を付与するように求められます。</string>
-  <string name="certificate_information">証明書情報</string>
-  <string name="certificate_subject">主題</string>
-  <string name="certificate_issuer">発行者</string>
-  <string name="certificate_cn">一般名称</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_only_when_highlighted">メンションされたときにのみ通知</string>
   <string name="notify_never">通知は無効</string>
@@ -509,9 +464,7 @@
   <string name="create_account">アカウントを作成</string>
   <string name="use_own_provider">独自のプロバイダーを使用する</string>
   <string name="pick_your_username">ユーザー名を選択</string>
-  <string name="change_presence">参加を変更</string>
   <string name="status_message">ステータスメッセージ</string>
-  <string name="all_accounts_on_this_device">このデバイス上のすべてのアカウントに対して設定</string>
   <string name="presence_chat">いつでもチャットできます</string>
   <string name="presence_online">オンライン</string>
   <string name="presence_away">離席中</string>
@@ -519,10 +472,8 @@
   <string name="presence_dnd">取込中</string>
   <string name="secure_password_generated">安全なパスワードが生成されました</string>
   <string name="device_does_not_support_battery_op">お使いのデバイスはバッテリー最適化の停止をサポートしていません</string>
-  <string name="show_password">パスワードを表示</string>
   <string name="registration_please_wait">登録に失敗しました: 後でもう一度試してください</string>
   <string name="registration_password_too_weak">登録に失敗しました: パスワードが弱すぎます</string>
-  <string name="conference_subject">主題</string>
   <string name="choose_participants">参加者を選択</string>
   <string name="invite_again">もう一度招待</string>
   <string name="gp_short">短</string>
@@ -552,9 +503,6 @@
   <string name="no_permission_to_access_x">%s にアクセスする権限がありません</string>
   <string name="remote_server_not_found">リモートサーバーが見つかりません</string>
   <string name="unable_to_update_account">アカウントを更新できません</string>
-  <string name="missing_presence_subscription_with_x">%s の、参加サブスクリプションが見つかりません。</string>
-  <string name="missing_keys_from_x">%s からの OMEMO 鍵が見つかりません。</string>
-  <string name="missing_omemo_keys">OMEMO 鍵が見つかりません</string>
   <string name="report_jid_as_spammer">この JID を不要なメッセージ送信として報告します。</string>
   <string name="pref_delete_omemo_identities">OMEMO ID を削除</string>
   <string name="pref_delete_omemo_identities_summary">OMEMO 鍵を再生成します。すべての連絡先を再度確認する必要があります。最後の手段としてのみ使用してください。</string>

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

@@ -74,7 +74,6 @@
   <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">v\\OMEMO로 암호화된 메세지 전송</string>
   <string name="send_pgp_message">OpenPGP 암호화된 메세지 전송 </string>
@@ -158,9 +157,7 @@
   <string name="attach_record_voice">녹음 </string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Jabber ID 차단</string>
-  <string name="account_settings_password">비밀번호 </string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">암호 확인 </string>
   <string name="password">암호 </string>
   <string name="invalid_jid">올바른 Jabber ID가 아닙니다 </string>
   <string name="error_out_of_memory">메모리 부족. 이미지 용량이 너무 큽니다 </string>
@@ -186,11 +183,7 @@
   <string name="last_seen_day">1일 전까지 접속했었음 </string>
   <string name="last_seen_days">%d 일 전까지 접속했었음  </string>
   <string name="install_openkeychain">암호화된 메세지. 복호화하기 위해 OpenKeychain을 설치하세요. </string>
-  <string name="unknown_otr_fingerprint">알 수 없는 OTR 핑거프린트</string>
   <string name="openpgp_messages_found">OpenPGP 암호화 메세지 발견 </string>
-  <string name="your_fingerprint">당신의 핑거프린트</string>
-  <string name="otr_fingerprint">OTR 핑거프린트</string>
-  <string name="otr_fingerprint_selected_message">메시지 OTR 지문</string>
   <string name="openpgp_key_id">OpenPGP 키ID</string>
   <string name="omemo_fingerprint">OMEMO 핑거프린트</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO 핑거프린트</string>
@@ -200,7 +193,6 @@
   <string name="trust_omemo_fingerprints">OMEMO 핑거프린트 신뢰</string>
   <string name="fetching_keys">키 가져오는 중...</string>
   <string name="done">완료</string>
-  <string name="verify">검증 </string>
   <string name="decrypt">복호화 </string>
   <string name="search">검색 </string>
   <string name="enter_contact">연락처 입력</string>
@@ -238,11 +230,8 @@
   <string name="disable_notifications">알림 해제 </string>
   <string name="enable">사용 </string>
   <string name="enter_password">암호 입력 </string>
-  <string name="missing_presence_subscription"> 참가구독이 필요합니다</string>
   <string name="request_presence_updates">먼저 연락처로부터 프레즌스 업데이트를 요청하세요. 이는 당신의 연락처가 어떤 클라이언트를 사용하는지 결정하는 데 사용됩니다. </string>
   <string name="request_now">지금 요청 </string>
-  <string name="delete_fingerprint">핑거프린트 삭제 </string>
-  <string name="sure_delete_fingerprint">이 핑거프린트를 삭제하시겠습니까? </string>
   <string name="ignore">무시 </string>
   <string name="without_mutual_presence_updates">경고: 상호간의 프레즌스 업데이트 없이 이것을 보내면 예기치 못한 문제를 발생시킬 수 있습니다. 당신의 프레즌스 구독을 검증하기 위해 연락처 상세 정보로 가세요. </string>
   <string name="pref_security_settings">보안</string>
@@ -262,7 +251,6 @@
   <string name="pref_use_indicate_received_summary">만약 지원될 경우, 수신된 메세지는 초록색 기호로 표시됩니다. </string>
   <string name="pref_use_send_button_to_indicate_status_summary">연락처 상태를 표시하기 위해 전송 버튼을 색칠함 </string>
   <string name="pref_expert_options_other">기타 </string>
-  <string name="toast_message_otr_fingerprint">OTR 핑거프린트가 클립보드에 복사되었습니다 </string>
   <string name="toast_message_omemo_fingerprint">OMEMO 핑거프린트가 클립보드에 복사되었습니다</string>
   <string name="using_account">using account %s</string>
   <string name="checking_x">HTTP 호스트에서 %s 확인 중</string>
@@ -279,19 +267,8 @@
   <string name="show_qr_code">2D 바코드를 보여주세요</string>
   <string name="show_block_list">차단 목록 보기 </string>
   <string name="account_details">계정 정보 </string>
-  <string name="verify_otr">OTR 검증 </string>
-  <string name="remote_fingerprint">원격 핑거프린트</string>
-  <string name="shared_secret_hint">힌트 혹은 질문 </string>
-  <string name="shared_secret_secret">공유된 비밀 </string>
   <string name="confirm">확인 </string>
-  <string name="in_progress">진행중 </string>
-  <string name="respond">응답 </string>
-  <string name="secrets_do_not_match">비밀이 일치하지 않습니다 </string>
   <string name="try_again">다시 시도하세요 </string>
-  <string name="finish">완료 </string>
-  <string name="verified">검증 완료 </string>
-  <string name="smp_requested">연락처가 SMP 검증을 요구했습니다 </string>
-  <string name="no_otr_session_found">올바른 OTR 세션이 발견되지 않았습니다 </string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">포어그라운드에서 서비스 유지 </string>
   <string name="pref_keep_foreground_service_summary">운영체제가 접속을 해제하지 못하도록 예방합니다 </string>
@@ -311,31 +288,18 @@
   <string name="file_transmission_failed">파일 전송 실패 </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>
-  <string name="are_you_sure_verify_fingerprint">정말로 주소록의 OTR 핑거프린트를 확인하시겠습니까?</string>
-  <string name="pref_show_dynamic_tags">동적 태그 표시 </string>
   <string name="pref_show_dynamic_tags_summary">연락처 밑에 읽기 전용 태그 표시 </string>
   <string name="enable_notifications">알림 사용 </string>
   <string name="account_image_description">계정 아바타 </string>
-  <string name="copy_otr_clipboard_description">OTR 핑거프린트를 클립보드에 복사 </string>
   <string name="copy_omemo_clipboard_description">OMEMO 핑거프린트를 클립보드에 복사</string>
   <string name="regenerate_omemo_key">OMEMO 키 다시 생성</string>
   <string name="clear_other_devices">기기 제거</string>
   <string name="clear_other_devices_desc">OMEMO 선언으로부터 모든 기기를 지우시겠습니까? 다음에 기기들이 접속할 때, 기기들이 스스로 다시 선언하지만, 그 동안에 보내진 메세지는 받지 못할수도 있습니다.</string>
-  <string name="error_no_keys_to_trust">이 연락처에 사용할 수 있는 키가 없습니다. 당신이 그들의 키 중에서 어떤 것이든 제거했다면, 그들이 새로운 키를 만들어야 합니다.</string>
   <string name="fetching_history_from_server">서버로부터 기록 가져오는중 </string>
   <string name="no_more_history_on_server">서버에 더이상 기록이 없습니다 </string>
   <string name="updating">업데이트중...</string>
   <string name="password_changed">암호 변경됨 </string>
   <string name="could_not_change_password">암호를 변경할 수 없습니다 </string>
-  <string name="otr_session_not_started">암호화된 대화를 시작하기 위해 메세지 보내기 </string>
-  <string name="ask_question">질문하기 </string>
-  <string name="smp_explain_question">만약 당신과 당신의 연락처가 다른 사람은 모르는 비밀을 공유하고 있다면, 그 비밀을 서로의 핑거프린트를 검증하는 데 사용할 수 있습니다. 대소문자가 구분된 대답을 할 연락처에게 힌트나 질문을 주세요. </string>
-  <string name="smp_explain_answer">당신의 연락처는 당신의 핑거프린트를 검증하고자 공유된 비밀을 확인하려고 합니다. 당신의 연락처는 그 비밀에 관한 다음과 같은 힌트 혹은 질문을 제공했습니다. </string>
-  <string name="shared_secret_hint_should_not_be_empty">힌트를 반드시 입력해야 합니다 </string>
-  <string name="shared_secret_can_not_be_empty">공유된 비밀을 반드시 입력해야 합니다 </string>
-  <string name="manual_verification_explanation">아래에 보이는 핑거프린트를 당신의 연락처의 핑거프린트와 세심하게 비교하세요. 당신은 암호화된 이메일이나 전화와 같은 믿을만한 통신수단으로 이것을 주고 받을 수 있습니다. </string>
   <string name="change_password">암호 변경 </string>
   <string name="current_password">현재 암호 </string>
   <string name="new_password">새 암호 </string>
@@ -373,7 +337,6 @@
   <string name="apk">안드로이드 앱 </string>
   <string name="vcard">연락처 </string>
   <string name="received_x_file">%s 수신 </string>
-  <string name="disable_foreground_service">포어그라운드 서비스 해제 </string>
   <string name="touch_to_open_conversations">터치해서 Conversations 열기 </string>
   <string name="avatar_has_been_published">아바타가 공개되었습니다 </string>
   <string name="sending_x_file">%s 전송중 </string>
@@ -463,14 +426,6 @@
   <string name="shared_text_with_x">%s 에서 텍스트를 공유</string>
   <string name="sync_with_contacts">연락처와 동기화</string>
   <string name="sync_with_contacts_long">Conversations는 XMPP 명단과 연락처 명단을 대조시켜서 이름과 아바타를 표시하고자 합니다.\n\nConversations는 당신의 서버에 업로드하지 않고 기기 내부적으로만 연락처를 읽고 대조를 할 것입니다.\n\n이제 연락처에 접근할 권한을 당신에게 물어볼 것입니다.</string>
-  <string name="certificate_information">인증서 정보</string>
-  <string name="certificate_subject">제목</string>
-  <string name="certificate_issuer">발행자</string>
-  <string name="certificate_cn">이름</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="notify_paused">알림 일시중지됨</string>
@@ -497,9 +452,7 @@
   <string name="create_account">계정 생성</string>
   <string name="use_own_provider">다른 서버 이용</string>
   <string name="pick_your_username">유저네임을 고르세요</string>
-  <string name="change_presence">참여를 변경</string>
   <string name="status_message">상태 메세지</string>
-  <string name="all_accounts_on_this_device">이 장치의 모든 계정에 대해 설정</string>
   <string name="presence_chat">대화 가능 </string>
   <string name="presence_online">접속중 </string>
   <string name="presence_away">자리 비움 </string>
@@ -507,10 +460,8 @@
   <string name="presence_dnd">바쁨</string>
   <string name="secure_password_generated">안전한 비밀번호가 생성되었습니다</string>
   <string name="device_does_not_support_battery_op">장치가 배터리 최적화 정지를 지원하지 않습니다</string>
-  <string name="show_password">패스워드 보이기</string>
   <string name="registration_please_wait">등록에 실패했습니다. 나중에 다시 시도하십시오</string>
   <string name="registration_password_too_weak">등록에 실패했습니다 : 암호가 너무 약합니다</string>
-  <string name="conference_subject">제목</string>
   <string name="choose_participants">참가자를 선택</string>
   <string name="invite_again">다시 초대</string>
   <string name="gp_short">짧음</string>
@@ -540,9 +491,6 @@
   <string name="no_permission_to_access_x">%s에 접근할 권한이 없음</string>
   <string name="remote_server_not_found">원격 서버 찾을 수 없음</string>
   <string name="unable_to_update_account">계정을 업데이트 할수없음</string>
-  <string name="missing_presence_subscription_with_x">%s의 참가 구독을 찾을 수 없습니다.</string>
-  <string name="missing_keys_from_x">%s에서 OMEMO 키를 찾을 수 없습니다.</string>
-  <string name="missing_omemo_keys">OMEMO 키가 없습니다</string>
   <string name="report_jid_as_spammer">이 JID를 원치 않는 메시지 전송으로 보고합니다.</string>
   <string name="pref_delete_omemo_identities">OMEMO ID를 삭제</string>
   <string name="pref_delete_omemo_identities_summary">OMEMO 키를 다시 생성합니다. 모든 연락처를 다시 확인해야합니다. 최후의 수단으로만 사용하십시오.</string>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Send ukryptert melding</string>
   <string name="send_message">Send melding</string>
   <string name="send_message_to_x">Send melding til %s</string>
-  <string name="send_otr_message">Send OTR-kryptert melding</string>
   <string name="send_omemo_message">Send OMEMO-kryptert melding</string>
   <string name="send_omemo_x509_message">Send \\OMEMO-kryptert melding</string>
   <string name="send_pgp_message">Send OpenPGP-kryptert melding</string>
@@ -170,9 +169,7 @@
   <string name="attach_record_voice">Ta opp stemme</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="block_jabber_id">Blokker XMPP-ID</string>
-  <string name="account_settings_password">Passord</string>
   <string name="account_settings_example_jabber_id">brukernavn@eksempel.no</string>
-  <string name="account_settings_confirm_password">Bekreft passord</string>
   <string name="password">Passord</string>
   <string name="invalid_jid">Dette er ikke en gyldig Jabber-ID</string>
   <string name="error_out_of_memory">Slapp opp for minne, bildet er for stort</string>
@@ -198,11 +195,7 @@
   <string name="last_seen_day">sist sett i går</string>
   <string name="last_seen_days">sist sett for %d dager siden</string>
   <string name="install_openkeychain">Kryptert melding. Installer OpenKeychain for å dekryptere.</string>
-  <string name="unknown_otr_fingerprint">Ukjent OTR-fingeravtrykk</string>
   <string name="openpgp_messages_found">OpenPGP-krypterte meldinger funnet</string>
-  <string name="your_fingerprint">Ditt fingeravtrykk</string>
-  <string name="otr_fingerprint">OTR-fingeravtrykk</string>
-  <string name="otr_fingerprint_selected_message">Meldingens OTR-fingeravtrykk</string>
   <string name="openpgp_key_id">OpenPGP nøkkel-ID</string>
   <string name="omemo_fingerprint">OMEMO-fingeravtrykk</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO-fingeravtrykk</string>
@@ -212,11 +205,9 @@
   <string name="trust_omemo_fingerprints">Stol på OMEMO-fingeravtrykk</string>
   <string name="fetching_keys">Hener inn nøkler…</string>
   <string name="done">Ferdig</string>
-  <string name="verify">Bekreft</string>
   <string name="decrypt">Dekrypter</string>
   <string name="conferences">Gruppesludringer</string>
   <string name="search">Søk</string>
-  <string name="create_contact">Opprett kontakt</string>
   <string name="dialog_title_create_contact">Opprett kontakt</string>
   <string name="enter_contact">Angi kontakt</string>
   <string name="join_conference">Ta del i gruppesludring</string>
@@ -263,11 +254,8 @@
   <string name="enable">Skru på</string>
   <string name="conference_requires_password">Gruppesludringen krever passord</string>
   <string name="enter_password">Skriv inn passord</string>
-  <string name="missing_presence_subscription">Mangler tilstedeværelsesabonnement</string>
   <string name="request_presence_updates">Forespør tilstedeværelseoppdateringer fra din kontakt først.\n\n<small>Dette brukes til å fastslå hvilke(n) klient(er) din kontakt bruker.</small></string>
   <string name="request_now">Send forespørsel nå</string>
-  <string name="delete_fingerprint">Slett fingeravtrykk</string>
-  <string name="sure_delete_fingerprint">Bekreft fjerning av fingeravtrykk.</string>
   <string name="ignore">Ignorer</string>
   <string name="without_mutual_presence_updates"><b>Advarsel:</b> Å sende dette uten at tilstedeværelsesoppdateringer er i overenstemmelse kan forårsake uventede problemer.\n\n<small>Gå til kontaktdetaljer for å bekrefte dine tilstedeværelsesabonnementer.</small></string>
   <string name="pref_security_settings">Sikkerhet</string>
@@ -291,7 +279,6 @@
   <string name="pref_conference_name_summary">Bruk emne istedenfor JID til å identifisere gruppesludringer</string>
   <string name="pref_autojoin">Ta del i gruppesludringer automatisk</string>
   <string name="pref_autojoin_summary">Respekter flagget for automatisk tilknytning i gruppesludringsbokmerker</string>
-  <string name="toast_message_otr_fingerprint">OTR-fingeravtrykk kopiert til utklippstavle!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-fingeravtrykk kopiert til utklippstavle!</string>
   <string name="conference_banned">Du er bannlyst fra denne gruppesludringen</string>
   <string name="conference_members_only">Denne gruppesludringen er kun for medlemmer</string>
@@ -313,19 +300,8 @@
   <string name="show_qr_code">Vis 2D-strekkode</string>
   <string name="show_block_list">Vis blokkeringsliste</string>
   <string name="account_details">Kontodetaljer</string>
-  <string name="verify_otr">Bekreft OTR</string>
-  <string name="remote_fingerprint">Eksternt fingeravtrykk</string>
-  <string name="shared_secret_hint">Ledetråd eller spørsmål</string>
-  <string name="shared_secret_secret">Delt hemmelighet</string>
   <string name="confirm">Bekreft</string>
-  <string name="in_progress">Underveis</string>
-  <string name="respond">Svar</string>
-  <string name="secrets_do_not_match">Hemmelighetene samsvarer ikke</string>
   <string name="try_again">Prøv igjen</string>
-  <string name="finish">Fullfør</string>
-  <string name="verified">Tiltrodd!</string>
-  <string name="smp_requested">Kontakt forespurte SMP-verifisering</string>
-  <string name="no_otr_session_found">Ingen gyldig OTR-økt funnet!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Forgrunnstjeneste</string>
   <string name="pref_keep_foreground_service_summary">Forhindrer operativsystemet fra å drepe tilkoblingen din</string>
@@ -346,35 +322,22 @@
   <string name="file_deleted">Filen har blitt slettet</string>
   <string name="no_application_found_to_open_file">Fant inget program til åpning av fil</string>
   <string name="no_application_found_to_open_link">Fant inget program til åpning av lenke</string>
-  <string name="could_not_verify_fingerprint">Kunne ikke bekrefte fingeravtrykk</string>
-  <string name="manually_verify">Bekreft manuelt</string>
-  <string name="are_you_sure_verify_fingerprint">Er du sikker på at du ønsker å bekrefte denne kontaktens OTR-fingeravtrykk?</string>
-  <string name="pref_show_dynamic_tags">Vis dynamiske merkelapper</string>
   <string name="pref_show_dynamic_tags_summary">Vis \"bare-les\"-merkelapper under kontakter</string>
   <string name="enable_notifications">Aktiver varslinger</string>
   <string name="no_conference_server_found">Fant ingen gruppesludringstjener</string>
   <string name="conference_creation_failed">Opprettelse av gruppesludring mislyktes!</string>
   <string name="account_image_description">Konto-avatar</string>
-  <string name="copy_otr_clipboard_description">Kopier OTR-fingeravtrykk til utklippstavle</string>
   <string name="copy_omemo_clipboard_description">Kopier OMEMO-fingeravtrykk til utklippstavle</string>
   <string name="regenerate_omemo_key">Regenerer OMEMO-nøkkel</string>
   <string name="clear_other_devices">Rens enheter</string>
   <string name="clear_other_devices_desc">Bekreft rensinga av alla andre enheter fra OMEMO-kunngjøringen. Neste gang dine enheter kobler til, vil de tilkjennegi seg på ny, men det kan hende de ikke mottar meldinger sendt i mellomtiden.</string>
   <string name="error_no_keys_to_trust_server_error">Ingen brukbare tilgjengelig for denne kontakten.\nInnhenting av nye nøkler fra tjeneren mislyktes. Kanskje det er noe galt med din kontakts tjener.</string>
   <string name="error_no_keys_to_trust_presence">Det er ingen brukvare nøkler tilgjengelig for denne kontakten.\nForsikre deg om at dere begge abonnerer på hverandres tilstedeværelse.</string>
-  <string name="error_no_keys_to_trust">Ingen brukbare nøkler tilgjengelige for denne kontakten. Hvis du har tilintetgjort noen av nøklene deres, må de generere nye.</string>
   <string name="fetching_history_from_server">Henter inn historikk fra tjener</string>
   <string name="no_more_history_on_server">Ikke mer historikk på tjeneren</string>
   <string name="updating">Oppdaterer…</string>
   <string name="password_changed">Passord endret!</string>
   <string name="could_not_change_password">Kunne ikke endre passord</string>
-  <string name="otr_session_not_started">Send en melding for å igangsette kryptert sludring</string>
-  <string name="ask_question">Still et spørsmål</string>
-  <string name="smp_explain_question">Om du og din kontakt har en hemmelighet dere deler som ingen andre vet om (som en intern vits eller hva du spiste til lunsj sist gang dere møttes) kan du bruke det til å bekrefte hverandres fingeravtrykk.\n\nDu gir en ledetråd eller stiller et spørsmål til din kontakt som i sin tur gir et versalsensitivt svar.</string>
-  <string name="smp_explain_answer">Din kontakt vil bekrefte ditt fingeravtrykk gjennom å utfordre deg med en delt hemmelighet. Din kontakt oppga følgende ledetråd eller spørsmål for hemmeligheten.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Ledetråden din bør ikke stå tom</string>
-  <string name="shared_secret_can_not_be_empty">Din delte hemmelighet kan ikke være et tomt felt</string>
-  <string name="manual_verification_explanation">Jamfør nøye fingeravtrykket vis nedenfor med din kontakts fingeravtrykk.\nDu kan bruke enhver form for betrodd kommunikasjon som kryptert e-post eller en telefonsamtale for å utveksle disse.</string>
   <string name="change_password">Endre passord</string>
   <string name="current_password">Gjeldende passord</string>
   <string name="new_password">Nytt passord</string>
@@ -423,7 +386,6 @@
   <string name="apk">Android-app</string>
   <string name="vcard">Kontakt</string>
   <string name="received_x_file">Mottatt %s</string>
-  <string name="disable_foreground_service">Skru av forgrunns-tjeneste</string>
   <string name="touch_to_open_conversations">Trykk for å åpne Conversations</string>
   <string name="avatar_has_been_published">Avatar publisert!</string>
   <string name="sending_x_file">Sender %s</string>
@@ -520,14 +482,6 @@
   <string name="shared_text_with_x">Del tekst med %s</string>
   <string name="sync_with_contacts">Synkroniser med kontakter</string>
   <string name="sync_with_contacts_long">Conversations vil jamføre din XMPP-kontaktliste med dine kontakter for å vise dem med navn og profilbilde.\n\nConversations leser bare dine kontakter for å jamføre dem lokalt, uten å laste dem opp til tjeneren din.\n\nDu kommer nå til å bli spurt om tilgangstillatelse til dine kontakter.</string>
-  <string name="certificate_information">Sertifikatsinformasjon</string>
-  <string name="certificate_subject">Emne</string>
-  <string name="certificate_issuer">Utsteder</string>
-  <string name="certificate_cn">Vanlig navn</string>
-  <string name="certificate_o">Organisasjon</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Ikke tilgjengelig)</string>
-  <string name="certificate_not_found">Fant ikke noe sertifikat</string>
   <string name="notify_on_all_messages">Varsle ved alle meldinger</string>
   <string name="notify_only_when_highlighted">Varsle bare når fremhevet</string>
   <string name="notify_never">Varslinger deaktivert</string>
@@ -556,9 +510,7 @@
   <string name="create_account">Opprett konto</string>
   <string name="use_own_provider">Bruk min egen tilbyder</string>
   <string name="pick_your_username">Velg ditt brukernavn</string>
-  <string name="change_presence">Endre tilstedeværelse</string>
   <string name="status_message">Statusmelding</string>
-  <string name="all_accounts_on_this_device">Sett for alle kontoene på denne enheten</string>
   <string name="presence_chat">Ledig for sludring</string>
   <string name="presence_online">Pålogget</string>
   <string name="presence_away">Borte</string>
@@ -566,13 +518,9 @@
   <string name="presence_dnd">Opptatt</string>
   <string name="secure_password_generated">Et sikkert passord har blitt opprettet</string>
   <string name="device_does_not_support_battery_op">Din enhet støtter ikke å melde seg ut av batterioptimeringsprogrammet</string>
-  <string name="show_password">Vis passord</string>
   <string name="registration_please_wait">Registrering mislyktes: Prøv igjen senere</string>
   <string name="registration_password_too_weak">Registrering mislyktes: Passordet er for svakt</string>
-  <string name="create_conference">Opprett gruppesludring</string>
   <string name="dialog_title_create_conference">Opprett gruppesludring</string>
-  <string name="join_or_create_conference">Ta del i eller opprett gruppesludring</string>
-  <string name="conference_subject">Tema</string>
   <string name="choose_participants">Velg deltagere</string>
   <string name="creating_conference">Opprett gruppesludring…</string>
   <string name="invite_again">Inviter igjen</string>
@@ -603,11 +551,6 @@
   <string name="no_permission_to_access_x">Ingen tilgang til %s</string>
   <string name="remote_server_not_found">Fjerntjener ble ikke funnet</string>
   <string name="unable_to_update_account">Kunne ikke oppdatere konto</string>
-  <string name="missing_presence_subscription_with_x">Manglende tilstedeværelsesabonnement med %s.</string>
-  <string name="missing_keys_from_x">Mangler OMEMO-nøkler fra %s.</string>
-  <string name="missing_omemo_keys">Mangler OMEMO-nøkler</string>
-  <string name="wrong_conference_configuration">Dette er ikke en privat, ikke-anonym gruppesludring.</string>
-  <string name="this_conference_has_no_members">Det er ingen medlemmer i denne gruppesludringen.</string>
   <string name="report_jid_as_spammer">Rapporter at denne JID-en sender uønskede meldinger eller søppelpost.</string>
   <string name="pref_delete_omemo_identities">Slett OMEMO-identiteter</string>
   <string name="pref_delete_omemo_identities_summary">Regenerer dine OMEMO-nøkler. Alle dine kontakter vil måtte bekrefte deg igjen. Bruk dette bare som en siste utvei.</string>

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

@@ -49,6 +49,7 @@
   <string name="start_conversation">Gesprek beginnen</string>
   <string name="invite_contact">Contact uitnodigen</string>
   <string name="contacts">Contacten</string>
+  <string name="contact">Contact</string>
   <string name="cancel">Annuleren</string>
   <string name="set">Instellen</string>
   <string name="add">Toevoegen</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Verstuur onversleuteld bericht</string>
   <string name="send_message">Verstuur bericht</string>
   <string name="send_message_to_x">Bericht sturen naar %s</string>
-  <string name="send_otr_message">Verstuur OTR-versleuteld bericht</string>
   <string name="send_omemo_message">Verstuur OMEMO-versleuteld bericht</string>
   <string name="send_omemo_x509_message">Verstuur v\\OMEMO-versleuteld bericht</string>
   <string name="send_pgp_message">Verstuur OpenPGP-versleuteld bericht</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Stem opnemen</string>
   <string name="account_settings_jabber_id">Jabber-ID:</string>
   <string name="block_jabber_id">Jabber-ID blokkeren</string>
-  <string name="account_settings_password">Wachtwoord:</string>
   <string name="account_settings_example_jabber_id">gebruikersnaam@voorbeeld.nl</string>
-  <string name="account_settings_confirm_password">Wachtwoord bevestigen</string>
   <string name="password">Wachtwoord</string>
   <string name="invalid_jid">Dit is geen geldige Jabber-ID</string>
   <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">1 dag geleden voor het laatst gezien</string>
   <string name="last_seen_days">%d dagen geleden voor het laatst gezien</string>
   <string name="install_openkeychain">Versleuteld bericht. Installeer OpenKeychain om te ontsleutelen.</string>
-  <string name="unknown_otr_fingerprint">Onbekende OTR-vingerafdruk</string>
   <string name="openpgp_messages_found">OpenPGP-versleutelde berichten gevonden</string>
-  <string name="your_fingerprint">Jouw vingerafdruk</string>
-  <string name="otr_fingerprint">OTR-vingerafdruk</string>
-  <string name="otr_fingerprint_selected_message">OTR-vingerafdruk van bericht</string>
   <string name="openpgp_key_id">OpenPGP-sleutel-ID</string>
   <string name="omemo_fingerprint">OMEMO-vingerafdruk</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO-vingerafdruk</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">Vertrouw OMEMO-vingerafdrukken</string>
   <string name="fetching_keys">Sleutels ophalen…</string>
   <string name="done">Klaar</string>
-  <string name="verify">Verifiëren</string>
   <string name="decrypt">Ontsleutelen</string>
   <string name="conferences">Groepsgesprekken</string>
   <string name="search">Zoeken</string>
-  <string name="create_contact">Contact aanmaken</string>
   <string name="dialog_title_create_contact">Contact aanmaken</string>
   <string name="enter_contact">Contact invoeren</string>
   <string name="join_conference">Deelnemen aan groepsgesprek</string>
@@ -263,11 +255,8 @@
   <string name="enable">Inschakelen</string>
   <string name="conference_requires_password">Wachtwoord vereist voor toegang tot groepsgesprek</string>
   <string name="enter_password">Wachtwoord invoeren</string>
-  <string name="missing_presence_subscription">Geen aanwezigheidsupdates</string>
   <string name="request_presence_updates">Vraag eerst aanwezigheidsupdates van je contact aan.\n\n<small>Dit wordt gebruikt om te bepalen welke client(s) je contact gebruikt.</small></string>
   <string name="request_now">Nu aanvragen</string>
-  <string name="delete_fingerprint">Vingerafdruk verwijderen</string>
-  <string name="sure_delete_fingerprint">Ben je zeker dat je deze vingerafdruk wil verwijderen?</string>
   <string name="ignore">Negeren</string>
   <string name="without_mutual_presence_updates"><b>Waarschuwing:</b> Dit verzenden zonder wederzijdse aanwezigheidsupdates kan voor onverwachte problemen zorgen.\n\n<small>Ga naar contactgegevens om je aanwezigheidsupdates te bevestigen.</small></string>
   <string name="pref_security_settings">Beveiliging</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">Gebruik onderwerp ipv JID om groepsgesprekken te identificeren</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>
   <string name="conference_members_only">Dit groepsgesprek is enkel voor leden</string>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">2D-streepjescode tonen</string>
   <string name="show_block_list">Geblokkeerde contacten weergeven</string>
   <string name="account_details">Accountgegevens</string>
-  <string name="verify_otr">OTR verifiëren</string>
-  <string name="remote_fingerprint">Externe vingerafdruk</string>
-  <string name="shared_secret_hint">Hint of vraag</string>
-  <string name="shared_secret_secret">Gedeeld geheim</string>
   <string name="confirm">Bevestigen</string>
-  <string name="in_progress">Bezig</string>
-  <string name="respond">Antwoorden</string>
-  <string name="secrets_do_not_match">Geheimen komen niet overeen</string>
   <string name="try_again">Opnieuw proberen</string>
-  <string name="finish">Afsluiten</string>
-  <string name="verified">Geverifieerd!</string>
-  <string name="smp_requested">Contact vraagt SMP-bevestiging</string>
-  <string name="no_otr_session_found">Geen geldige OTR-sessie gevonden!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Dienst in voorgrond houden</string>
   <string name="pref_keep_foreground_service_summary">Belet het besturingssysteem je verbinding te onderbreken</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">Het bestand is verwijderd</string>
   <string name="no_application_found_to_open_file">Geen applicatie om bestand te openen</string>
   <string name="no_application_found_to_open_link">Geen applicatie om verwijzing te openen</string>
-  <string name="could_not_verify_fingerprint">Kon vingerafdruk niet verifiëren</string>
-  <string name="manually_verify">Handmatig verifiëren</string>
-  <string name="are_you_sure_verify_fingerprint">Weet je zeker dat je de OTR-vingerafdruk van je contactpersoon wilt verifiëren?</string>
-  <string name="pref_show_dynamic_tags">Toon dynamische tags</string>
+  <string name="pref_show_dynamic_tags">Dynamische tags</string>
   <string name="pref_show_dynamic_tags_summary">Toon enkel-lezen tags onder contacten</string>
   <string name="enable_notifications">Meldingen inschakelen</string>
   <string name="no_conference_server_found">Geen groepsgespreksserver gevonden</string>
   <string name="conference_creation_failed">Aanmaken van groepsgesprek mislukt!</string>
   <string name="account_image_description">Account-avatar</string>
-  <string name="copy_otr_clipboard_description">OTR-vingerafdruk kopiëren naar klembord</string>
   <string name="copy_omemo_clipboard_description">OMEMO-vingerafdruk kopiëren naar klembord</string>
   <string name="regenerate_omemo_key">OMEMO-sleutel opnieuw aanmaken</string>
   <string name="clear_other_devices">Apparaten wissen</string>
   <string name="clear_other_devices_desc">Weet je zeker dat je alle andere apparaten uit de OMEMO-aankondiging wilt weglaten? De volgende keer dat je apparaten verbinding maken zullen ze zich opnieuw aankondigen, maar zullen ze misschien niet de berichten ontvangen die in de tussentijd zijn verzonden.</string>
   <string name="error_no_keys_to_trust_server_error">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nOphalen van nieuwe sleutels van de server is mislukt. Misschien is er iets mis met de server van je contact.</string>
   <string name="error_no_keys_to_trust_presence">Er zijn geen bruikbare sleutels beschikbaar voor dit contact.\nZorg dat je allebei op elkaars aanwezigheidsupdates bent geabonneerd.</string>
-  <string name="error_no_keys_to_trust">Er zijn geen bruikbare sleutels beschikbaar voor dit contact. Als je zijn/haar sleutels hebt verwijderd dient hij/zij nieuwe aan te maken.</string>
   <string name="error_trustkeys_title">Er ging iets mis</string>
   <string name="fetching_history_from_server">Geschiedenis van server halen</string>
   <string name="no_more_history_on_server">Geen verdere geschiedenis op server</string>
   <string name="updating">Bijwerken…</string>
   <string name="password_changed">Wachtwoord gewijzigd!</string>
   <string name="could_not_change_password">Kon wachtwoord niet wijzigen</string>
-  <string name="otr_session_not_started">Verstuur een bericht om een versleuteld gesprek te starten</string>
-  <string name="ask_question">Stel een vraag</string>
-  <string name="smp_explain_question">Als jij en je contact een gemeenschappelijk geheim hebben dat niemand anders weet (zoals een privé-grap of gewoonweg wat jullie gegeten hebben de laatste keer dat jullie elkaar zagen) kunnen jullie dat geheim gebruiken om elkaars vingerafdrukken te verifiëren.\n\nJe geeft een hint of een vraag voor je contact, en hij/zij moet hier een  hoofdlettergevoelig antwoord op geven.</string>
-  <string name="smp_explain_answer">Je contact wil je vingerafdruk verifiëren door je uit te dagen met een gedeeld geheim. Je contact heeft daarvoor volgende hint of vraag opgegeven.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Je hint zou niet leeg mogen zijn</string>
-  <string name="shared_secret_can_not_be_empty">Je gedeeld geheim can niet leeg zijn</string>
-  <string name="manual_verification_explanation">Vergelijk met zorg de vingerafdruk hieronder met de vingerafdruk van je contact.\nJe kan hiervoor een andere betrouwbare vorm van communicatie gebruiken, zoals een versleutelde e-mail of een telefoongesprek.</string>
   <string name="change_password">Wachtwoord wijzigen</string>
   <string name="current_password">Huidig wachtwoord</string>
   <string name="new_password">Nieuw wachtwoord</string>
@@ -424,7 +389,6 @@
   <string name="apk">Android-applicatie</string>
   <string name="vcard">Contact</string>
   <string name="received_x_file">%s ontvangen</string>
-  <string name="disable_foreground_service">Voorgronddienst uitschakelen</string>
   <string name="touch_to_open_conversations">Tik om Conversations te openen</string>
   <string name="avatar_has_been_published">Avatar is gepubliceerd!</string>
   <string name="sending_x_file">Bezig met versturen van %s</string>
@@ -525,14 +489,6 @@
   <string name="no_camera_permission">Conversations heeft toegang nodig tot de camera</string>
   <string name="sync_with_contacts">Synchroniseer met contacten</string>
   <string name="sync_with_contacts_long">Conversations wil je XMPP-contacten met je systeemcontacten vergelijken om hun volledige namen en avatars te tonen.\n\nConversations zal je contacten enkel lokaal lezen en vergelijken zonder ze te uploaden naar je server.\n\nJe zal nu gevraagd worden Conversations toegang te verlenen tot je contacten.</string>
-  <string name="certificate_information">Certificaatinformatie</string>
-  <string name="certificate_subject">Onderwerp</string>
-  <string name="certificate_issuer">Uitgever</string>
-  <string name="certificate_cn">Algemene naam</string>
-  <string name="certificate_o">Organisatie</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Niet beschikbaar)</string>
-  <string name="certificate_not_found">Geen certificaat gevonden</string>
   <string name="notify_on_all_messages">Melding bij alle berichten</string>
   <string name="notify_only_when_highlighted">Melding enkel wanneer aangesproken</string>
   <string name="notify_never">Meldingen uitgeschakeld</string>
@@ -564,9 +520,7 @@
   <string name="pick_your_username">Kies je gebruikersnaam</string>
   <string name="pref_manually_change_presence">Aanwezigheid handmatig beheren</string>
   <string name="pref_manually_change_presence_summary">Stel je aanwezigheid in bij het bewerken van je statusbericht.</string>
-  <string name="change_presence">Aanwezigheid instellen</string>
   <string name="status_message">Statusbericht</string>
-  <string name="all_accounts_on_this_device">Instellen voor alle accounts op dit apparaat</string>
   <string name="presence_chat">Beschikbaar voor gesprek</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Afwezig</string>
@@ -574,13 +528,9 @@
   <string name="presence_dnd">Bezig</string>
   <string name="secure_password_generated">Een veilig wachtwoord is aangemaakt</string>
   <string name="device_does_not_support_battery_op">Je apparaat ondersteunt het uitschakelen van batterij-optimalisatie niet</string>
-  <string name="show_password">Wachtwoord weergeven</string>
   <string name="registration_please_wait">Registratie mislukt: probeer later opnieuw</string>
   <string name="registration_password_too_weak">Registratie mislukt: wachtwoord te zwak</string>
-  <string name="create_conference">Groepsgesprek aanmaken</string>
   <string name="dialog_title_create_conference">Groepsgesprek aanmaken</string>
-  <string name="join_or_create_conference">Deelnemen aan groepsgesprek of er een aanmaken</string>
-  <string name="conference_subject">Onderwerp</string>
   <string name="choose_participants">Kies deelnemers</string>
   <string name="creating_conference">Groepsgesprek aanmaken…</string>
   <string name="invite_again">Opnieuw uitnodigen</string>
@@ -611,11 +561,6 @@
   <string name="no_permission_to_access_x">Geen toestemming om toegang te krijgen tot %s</string>
   <string name="remote_server_not_found">Externe server niet gevonden</string>
   <string name="unable_to_update_account">Kan account niet bijwerken</string>
-  <string name="missing_presence_subscription_with_x">Geen aanwezigheidsupdates van %s.</string>
-  <string name="missing_keys_from_x">Geen OMEMO-sleutels van %s.</string>
-  <string name="missing_omemo_keys">Geen OMEMO-sleutels</string>
-  <string name="wrong_conference_configuration">Dit is geen privé, niet-anoniem groepsgesprek.</string>
-  <string name="this_conference_has_no_members">Er neemt niemand deel aan dit groepsgesprek.</string>
   <string name="report_jid_as_spammer">Rapporteer deze JID voor het sturen van ongewenste berichten</string>
   <string name="pref_delete_omemo_identities">OMEMO-identiteiten verwijderen</string>
   <string name="pref_delete_omemo_identities_summary">Maak je OMEMO-sleutels opnieuw aan. Al je contacten zullen je opnieuw moeten verifiëren. Gebruik dit enkel als een laatste reddingsmiddel.</string>
@@ -714,12 +659,10 @@
   <string name="huawei_protected_apps_summary">Om meldingen te blijven ontvangen, zelfs wanneer het scherm uit staat, moet je Conversations toevoegen aan de lijst met beschermde apps.</string>
   <string name="mtm_accept_cert">Onbekend certificaat aanvaarden?</string>
   <string name="mtm_trust_anchor">Het servercertificaat is niet ondertekend door een gekende certificaatautoriteit.</string>
-  <string name="mtm_cert_expired">Het servercertificaat is verlopen.</string>
   <string name="mtm_accept_servername">Verkeerde servernaam aanvaarden?</string>
   <string name="mtm_hostname_mismatch">De server kon niet authenticeren als ‘%s’. Het certificaat is enkel geldig voor:</string>
   <string name="mtm_connect_anyway">Wil je toch verbinding maken?</string>
   <string name="mtm_cert_details">Certificaatgegevens:</string>
-  <string name="mtm_notification">Certificaatverificatie</string>
   <string name="once">Eenmalig</string>
   <string name="qr_code_scanner_needs_access_to_camera">De QR-codescanner heeft toegang nodig tot de camera</string>
   <string name="pref_scroll_to_bottom">Scrollen naar beneden</string>
@@ -733,4 +676,18 @@
   <string name="error_trustkey_hint_mutual">Tip: in sommige gevallen kan dit opgelost worden door elkaar toe te voegen aan je contacten.</string>
   <string name="disable_encryption_message">Weet je zeker dat je OMEMO-versleuteling voor dit gesprek wil uitschakelen?\nDit zal je serverbeheerder de mogelijkheid geven je berichten in te kijken, maar is mogelijk de enige manier om te communiceren met anderen die gebruik maken van verouderde cliënten.</string>
   <string name="disable_now">Nu uitschakelen</string>
+  <string name="draft">Ontwerp:</string>
+  <string name="pref_omemo_setting">OMEMO-versleuteling</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO zal altijd gebruikt worden voor één-op-één- privégroepsgesprekken.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO zal standaard gebruikt worden voor nieuwe gesprekken.</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO zal uitdrukkelijk ingeschakeld moeten worden voor nieuwe gesprekken.</string>
+  <string name="create_shortcut">Snelkoppeling aanmaken</string>
+  <string name="pref_font_size">Lettergrootte</string>
+  <string name="pref_font_size_summary">De relatieve lettergrootte in de app.</string>
+  <string name="default_on">Standaard aan</string>
+  <string name="default_off">Standaard uit</string>
+  <string name="small">Klein</string>
+  <string name="medium">Gemiddeld</string>
+  <string name="large">Groot</string>
+  <string name="not_encrypted_for_this_device">Bericht is niet versleuteld voor dit apparaat.</string>
 </resources>

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

@@ -49,6 +49,7 @@
   <string name="start_conversation">Rozpocznij rozmowę</string>
   <string name="invite_contact">Zaproś kontakt</string>
   <string name="contacts">Kontakty</string>
+  <string name="contact">Kontakt</string>
   <string name="cancel">Anuluj</string>
   <string name="set">Ustaw</string>
   <string name="add">Dodaj</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Wyślij wiadomość bez szyfrowania</string>
   <string name="send_message">Wyślij wiadomość</string>
   <string name="send_message_to_x">Wyślij wiadomość do %s</string>
-  <string name="send_otr_message">Wyślij zaszyfrowaną wiadomość (OTR)</string>
   <string name="send_omemo_message">Wyślij wiadomość zaszyfrowaną OMEMO</string>
   <string name="send_omemo_x509_message">Wyślij wiadomość zaszyfrowaną v\\OMEMO</string>
   <string name="send_pgp_message">Wyślij zaszyfrowaną wiadomość (OpenPGP)</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Nagraj głos</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Zablokuj Jabber ID</string>
-  <string name="account_settings_password">Hasło</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Potwierdź hasło</string>
   <string name="password">Hasło</string>
   <string name="invalid_jid">Wprowadzono niepoprawny Jabber ID</string>
   <string name="error_out_of_memory">Brak pamięci, obraz jest za duży</string>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">widziany wczoraj</string>
   <string name="last_seen_days">widziany %d dni temu</string>
   <string name="install_openkeychain">Wiadomość zaszyfrowana. Zainstaluj OpenKeychain, żeby odszyfrować.</string>
-  <string name="unknown_otr_fingerprint">Nieznany odcisk klucza OTR</string>
   <string name="openpgp_messages_found">Znaleziono wiadomości zaszyfrowane przez OpenPGP</string>
-  <string name="your_fingerprint">Twój odcisk klucza</string>
-  <string name="otr_fingerprint">Odcisk klucza OTR</string>
-  <string name="otr_fingerprint_selected_message">Odcisk palca wiadomości OTR</string>
   <string name="openpgp_key_id">ID klucza OpenPGP</string>
   <string name="omemo_fingerprint">Odcisk OMEMO</string>
   <string name="omemo_fingerprint_x509">Odcisk v\\OMEMO</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">Zaufane odciski OMEMO</string>
   <string name="fetching_keys">Pobieranie kluczy...</string>
   <string name="done">Ukończono</string>
-  <string name="verify">Weryfikuj</string>
   <string name="decrypt">Odszyfruj</string>
   <string name="conferences">Konferencje</string>
   <string name="search">Szukaj</string>
-  <string name="create_contact">Utwórz kontakt</string>
   <string name="dialog_title_create_contact">Utwórz kontakt</string>
   <string name="enter_contact">Wpisz kontakt</string>
   <string name="join_conference">Dołącz do konferencji</string>
@@ -234,7 +226,7 @@
   <string name="save_as_bookmark">Dodaj jako zakładkę</string>
   <string name="delete_bookmark">Usuń zakładkę</string>
   <string name="bookmark_already_exists">Zakładka już istnieje</string>
-  <string name="action_edit_subject">Edytuj tytuł</string>
+  <string name="action_edit_subject">Edytuj tytuł konferencji</string>
   <string name="edit_subject_hint">Tytuł konferencji</string>
   <string name="joining_conference">Dołączanie do konferencji</string>
   <string name="leave">Opuść pokój</string>
@@ -261,13 +253,10 @@
   <string name="skip">Pomiń</string>
   <string name="disable_notifications">Wyłącz powiadomienia</string>
   <string name="enable">Włącz</string>
-  <string name="conference_requires_password">Wymagaj hasła</string>
+  <string name="conference_requires_password">Konferencja wymaga hasła</string>
   <string name="enter_password">Wprowadź hasło</string>
-  <string name="missing_presence_subscription">Brakuje subskrypcji obecności</string>
   <string name="request_presence_updates">Poproś kontakt o udostępnienie powiadomień o obecności.\n\n<small>Pozwoli to na ustalenie klienta, z którego korzysta rozmówca.</small></string>
   <string name="request_now">Zażądaj teraz</string>
-  <string name="delete_fingerprint">Usuń odcisk klucza</string>
-  <string name="sure_delete_fingerprint">Czy na pewno chcesz usunąć odcisk klucza?</string>
   <string name="ignore">Ignoruj</string>
   <string name="without_mutual_presence_updates"><b>Uwaga:</b> Wysyłanie bez obustronnych powiadomień o obecności może powodować nieoczekiwane problemy.\n\n<small>Sprawdź subskrypcję powiadomień w szczegółach kontaktu.</small></string>
   <string name="pref_security_settings">Bezpieczeństwo</string>
@@ -288,16 +277,15 @@
   <string name="pref_use_send_button_to_indicate_status_summary">Koloruj przycisk wysyłania w zależności od statusu kontaktu</string>
   <string name="pref_expert_options_other">Inne opcje</string>
   <string name="pref_conference_name">Nazwa konferencji</string>
-  <string name="pref_conference_name_summary">Użyj tytułu zamiast JID do identyfikowania tej konferencji</string>
-  <string name="pref_autojoin">Autodołączanie</string>
+  <string name="pref_conference_name_summary">Użyj tytułu zamiast JID do identyfikowania konferencji</string>
+  <string name="pref_autojoin">Automatycznie dołączaj do konferencji</string>
   <string name="pref_autojoin_summary">Respektuj flagę autodołączenia w tej konferencji</string>
-  <string name="toast_message_otr_fingerprint">Odcisk klucza OTR został skopiowany do schowka</string>
   <string name="toast_message_omemo_fingerprint">Odcisk klucza OMEMO został skopiowany do schowka!</string>
   <string name="conference_banned">Zbanowany</string>
-  <string name="conference_members_only">Tylko dla użytkowników</string>
+  <string name="conference_members_only">Konferencja tylko dla użytkowników</string>
   <string name="conference_kicked">Wykopany</string>
-  <string name="conference_shutdown">Zamknij</string>
-  <string name="conference_unknown_error">Nieznany błąd</string>
+  <string name="conference_shutdown">Konferencja została zamknięta</string>
+  <string name="conference_unknown_error">Nie uczestniczysz już w tej konferencji</string>
   <string name="using_account">używając konta %s</string>
   <string name="checking_x">Sprawdzanie %s na hoście HTTP</string>
   <string name="not_connected_try_again">Brak połączenia. Spróbuj ponownie później</string>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">Pokaż kod QR</string>
   <string name="show_block_list">Wyświetl listę banów</string>
   <string name="account_details">Szczegóły konta</string>
-  <string name="verify_otr">Weryfikuj OTR</string>
-  <string name="remote_fingerprint">Zdalny odcisk klucza</string>
-  <string name="shared_secret_hint">Podpowiedź lub pytanie</string>
-  <string name="shared_secret_secret">Wspólny sekret</string>
   <string name="confirm">Potwierdź</string>
-  <string name="in_progress">W toku</string>
-  <string name="respond">Odpowiedz</string>
-  <string name="secrets_do_not_match">Sekrety są niezgodne</string>
   <string name="try_again">Spróbuj ponownie</string>
-  <string name="finish">Zakończ</string>
-  <string name="verified">Weryfikacja udana!</string>
-  <string name="smp_requested">Kontakt zażądał weryfikacji SMP</string>
-  <string name="no_otr_session_found">Brak ważnej sesji OTR!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Usługa na pierwszym planie</string>
   <string name="pref_keep_foreground_service_summary">Uniemożliwia systemowi przerwanie połączenia</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">Plik został usunięty</string>
   <string name="no_application_found_to_open_file">Nie odnaleziono aplikacji skojarzonej z typem pliku</string>
   <string name="no_application_found_to_open_link">Brak aplikacji do otwarcia linka</string>
-  <string name="could_not_verify_fingerprint">Weryfikacja odcisku klucza nieudana</string>
-  <string name="manually_verify">Weryfikuj ręcznie</string>
-  <string name="are_you_sure_verify_fingerprint">Czy na pewno chcesz zweryfikować odcisk klucza OTR kontaktu?
-</string>
-  <string name="pref_show_dynamic_tags">Etykiety kontaktów</string>
+  <string name="pref_show_dynamic_tags">Dynamiczne tagi</string>
   <string name="pref_show_dynamic_tags_summary">Wyświetlaj etykiety pod kontaktami</string>
   <string name="enable_notifications">Włącz powiadomienia</string>
   <string name="no_conference_server_found">Nie znaleziono serwera konferencji</string>
   <string name="conference_creation_failed">Błąd utworzenia konferencji</string>
   <string name="account_image_description">Awatar konta</string>
-  <string name="copy_otr_clipboard_description">Skopiuj odcisk klucza OTR do schowka</string>
   <string name="copy_omemo_clipboard_description">Skopiuj odcisk klucza OMEMO do schowka</string>
   <string name="regenerate_omemo_key">Wygeneruj ponownie klucz OMEMO</string>
   <string name="clear_other_devices">Wyczyść urządzenia</string>
   <string name="clear_other_devices_desc">Czy na pewno chcesz usunąć wszystkie inne urządzenia z ogłoszenia OMEMO? Następnym razem gdy połączą się Twoje urdzącenia, ogłoszą się one ponownie, ale mogą nie otrzymać wiadomości wysłanych w międzyczasie.</string>
   <string name="error_no_keys_to_trust_server_error">Nie ma dostępnych kluczy dla tego kontaktu.\nPobieranie nowych kluczy z serwera nie powiodło się. Być może jest coś nie tak z serwerem kontaktu?</string>
   <string name="error_no_keys_to_trust_presence">Brak dostępnych kluczy dla tego kontaktu.\nUpewnij się, że wzajemnie powiadamiacie się o obecności.</string>
-  <string name="error_no_keys_to_trust">Nie ma dostępnych żadnych użytecznych kluczy dla tego kontaktu. Jeśli usunąłeś jakieś jego klucze, kontakt będzie musiał wygenerować nowe.</string>
+  <string name="error_trustkeys_title">Coś poszło źle</string>
   <string name="fetching_history_from_server">Pobieranie historii z serwera</string>
   <string name="no_more_history_on_server">Koniec historii na serwerze</string>
   <string name="updating">Aktualizowanie...</string>
   <string name="password_changed">Hasło zostało zmienione!</string>
   <string name="could_not_change_password">Nie udało się zmienić hasła</string>
-  <string name="otr_session_not_started">Wyślij wiadomość, żeby rozpocząć szyfrowaną rozmowę</string>
-  <string name="ask_question">Zadaj pytanie</string>
-  <string name="smp_explain_question">Jeśli ty i twój kontakt macie jakiś wspólny sekret, którego nie zna nikt inny (żart znany tylko wam lub po prostu co jedliście ostatnim razem, gdy się widzieliście) możecie użyć tego sekretu by zweryfikować wzajemnie odciski swoich kluczy.\n\nPodasz podpowiedź lub pytanie dla twojego kontaktu i otrzymasz odpowiedź (wielkość liter ma znaczenie).</string>
-  <string name="smp_explain_answer">Twój kontakt chciałby zweryfikować odcisk Twojego klucza poprzez sprawdzenie znajomości wspólnego sekretu. Twój znajomy przedstawił następującą podpowiedź lub pytanie dotyczącego tego sekretu.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Wskazówka nie powinna być pusta</string>
-  <string name="shared_secret_can_not_be_empty">Sekret nie może być pusty</string>
-  <string name="manual_verification_explanation">Ostrożnie porównaj odcisk klucza pokazany poniżej z odciskiem klucza twojego kontaktu.\nMożesz użyć bezpiecznego kanału komunikacji takiego, jak szyfrowany e-mail lub rozmowa telefoniczna, by wymienić odciski klucza.</string>
   <string name="change_password">Zmień hasło</string>
   <string name="current_password">Obecne hasło</string>
   <string name="new_password">Nowe hasło</string>
@@ -409,6 +374,9 @@
   <string name="could_not_modify_conference_options">Nie można zmodyfikować ustawień konferencji</string>
   <string name="never">Nigdy</string>
   <string name="until_further_notice">Ręcznie</string>
+  <string name="snooze">Odłóż</string>
+  <string name="reply">Odpowiedz</string>
+  <string name="mark_as_read">Oznacz jako przeczytane</string>
   <string name="pref_input_options">Ustawienia wprowadzania</string>
   <string name="pref_enter_is_send">Enter wysyła</string>
   <string name="pref_enter_is_send_summary">Używaj klawisza Enter do wysyłania wiadomości</string>
@@ -421,7 +389,6 @@
   <string name="apk">Aplikacja Androida</string>
   <string name="vcard">Kontakt</string>
   <string name="received_x_file">Odebrano %s</string>
-  <string name="disable_foreground_service">Wyłącz podtrzymanie pierszego planu usługi</string>
   <string name="touch_to_open_conversations">Dotknij, aby otworzyć Conversations</string>
   <string name="avatar_has_been_published">Avatar został pomyślnie opublikowany!</string>
   <string name="sending_x_file">Wysyłanie %s</string>
@@ -467,6 +434,7 @@
   <string name="choose_quick_action">Wybierz szybką akcję</string>
   <string name="search_for_contacts_or_groups">Szukaj kontaktów i grup</string>
   <string name="send_private_message">Wyślij wiadomość prywatną</string>
+  <string name="user_has_left_conference">%1$s opuścił pokój!</string>
   <string name="username">Nazwa użytkownika</string>
   <string name="username_hint">Nazwa użytkownika</string>
   <string name="invalid_username">Błędna nazwa użytkownika</string>
@@ -478,6 +446,7 @@
   <string name="account_status_bind_failure">Błąd połączenia (zasób)</string>
   <string name="account_status_host_unknown">Serwer nie odpowiada domenie</string>
   <string name="server_info_broken">Zepsute</string>
+  <string name="pref_presence_settings">Dostępność</string>
   <string name="pref_away_when_screen_off">Status \"Oddalony\" gdy wyświetlacz jest wyłączony</string>
   <string name="pref_away_when_screen_off_summary">Oznacza Twój zasób jako \"Oddalony\", gdy wyświetlacz jest wyłączony</string>
   <string name="pref_dnd_on_silent_mode">\"Nie przeszkadzać\" w trybie cichym</string>
@@ -522,16 +491,10 @@
   <string name="shared_image_with_x">Dzielony obraz z %s</string>
   <string name="shared_images_with_x">Obraz udostępniony %s</string>
   <string name="shared_text_with_x">Tekst udostępniony %s</string>
+  <string name="no_storage_permission">Conversations potrzebuje dostępu do zewnętrznej pamięci</string>
+  <string name="no_camera_permission">Conversations potrzebuje dostępu do aparatu</string>
   <string name="sync_with_contacts">Synchronizuj z kontaktami</string>
   <string name="sync_with_contacts_long">Conversations chce dopasować Twoje kontakty XMPP z listą kontaktów w telefonie, by uzupełnić ich pełne imiona oraz awatary.\nConversations jedynie przeczyta Twoje kontakty i dopasuje je lokalnie, bez wysyłania na Twój serwer.\n\nZostaniesz teraz poproszony o przydzielenie pozwolenia na odczyt Twoich kontaktów.</string>
-  <string name="certificate_information">Informacja o certyfikacie</string>
-  <string name="certificate_subject">Temat</string>
-  <string name="certificate_issuer">Wystawca</string>
-  <string name="certificate_cn">Nazwa</string>
-  <string name="certificate_o">Organizacja</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Niedostępne)</string>
-  <string name="certificate_not_found">Nie znaleziono certyfikatu</string>
   <string name="notify_on_all_messages">Powiadom o wszystkich wiadomościach</string>
   <string name="notify_only_when_highlighted">Powiadamiaj tylko w przypadku wzmianki o mnie</string>
   <string name="notify_never">Powiadomienia wyłączone</string>
@@ -549,20 +512,22 @@
   <string name="this_field_is_required">To pole jest wymagane</string>
   <string name="correct_message">Popraw wiadomość</string>
   <string name="send_corrected_message">Wyślij poprawioną wiadomość</string>
-  <string name="no_keys_just_confirm">Już zaufałeś temu kontaktowi. Wybierając \'zrobione\' potwierdzasz, że %s jest członkiem konferencji..</string>
+  <string name="no_keys_just_confirm">Już zaufałeś temu kontaktowi. Wybierając \'zrobione\' potwierdzasz, że %s jest członkiem konferencji.</string>
   <string name="select_image_and_crop">Wybierz i przytnij obraz</string>
   <string name="this_account_is_disabled">Wyłączyłeś to konto</string>
   <string name="security_error_invalid_file_access">Błąd bezpieczeństwa: nieprawidłowy dostęp do pliku</string>
   <string name="no_application_to_share_uri">Nie odnaleziono aplikacji skojarzonej z URI</string>
   <string name="share_uri_with">Udostępnij URI za pomocą...</string>
+  <string name="welcome_text">Jabber to niezależna sieć komunikacji natychmiastowej. Możesz użyć tego klienta z dowolnym serwerem który wybierzesz.
+Dla twojej wygody ułatwiliśmy stworzenie konta na conversations.im; serwerze dostosowanym do Conversations.</string>
   <string name="magic_create_text">Przeprowadzimy Cię przez proces tworzenia konta na conversations.im.\nKiedy wybierzesz konto na serwerze conversations.im, będziesz mógł komunikować się z użytkownikami na innych serwerach podając im swój pełen Jabber ID.</string>
   <string name="your_full_jid_will_be">Twój pełen Jabber ID będzie następujący: %s</string>
   <string name="create_account">Utwórz Konto</string>
   <string name="use_own_provider">Użyj innego serwera</string>
   <string name="pick_your_username">Wybierz nazwę użytkownika</string>
-  <string name="change_presence">Zmień dostępność</string>
+  <string name="pref_manually_change_presence">Zarządzaj dostępnością ręcznie</string>
+  <string name="pref_manually_change_presence_summary">Ustaw dostępność w oknie edytowania wiadomości statusu.</string>
   <string name="status_message">Status</string>
-  <string name="all_accounts_on_this_device">Ustaw na wszystkich kontach na tym urządzeniu</string>
   <string name="presence_chat">Chętny do rozmowy</string>
   <string name="presence_online">Dostępny</string>
   <string name="presence_away">Zaraz Wracam</string>
@@ -570,13 +535,9 @@
   <string name="presence_dnd">Zajęty</string>
   <string name="secure_password_generated">Zostało wygenerowane bezpieczne hasło</string>
   <string name="device_does_not_support_battery_op">Twoje urządzenie nie pozwala na wyłączenie optymalizacji baterii</string>
-  <string name="show_password">Pokaż hasło</string>
   <string name="registration_please_wait">Rejestracja nie powiodła się. Spróbuj później</string>
   <string name="registration_password_too_weak">Rejestracja nie powiodła się: hasło zbyt słabe</string>
-  <string name="create_conference">Utwórz konferencję</string>
-  <string name="dialog_title_create_conference">Utwórz nowy pokój</string>
-  <string name="join_or_create_conference">Dołącz lub utwórz konferencję</string>
-  <string name="conference_subject">Temat</string>
+  <string name="dialog_title_create_conference">Utwórz konferencję</string>
   <string name="choose_participants">Wybierz członków</string>
   <string name="creating_conference">Tworzenie konferencji</string>
   <string name="invite_again">Zaproś ponownie</string>
@@ -607,11 +568,6 @@
   <string name="no_permission_to_access_x">Brak pozwolenia na dostęp do %s</string>
   <string name="remote_server_not_found">Nie znaleziono serwera</string>
   <string name="unable_to_update_account">Nie można zaktualizować konta</string>
-  <string name="missing_presence_subscription_with_x">Brakuje subskrypcji obecności dla %s</string>
-  <string name="missing_keys_from_x">Brakuje kluczy OMEMO od %s</string>
-  <string name="missing_omemo_keys">Brakuje kluczy OMEMO</string>
-  <string name="wrong_conference_configuration">Błędna konfiguracja konferencji</string>
-  <string name="this_conference_has_no_members">Brak użytkowników</string>
   <string name="report_jid_as_spammer">Raportuj ten JID jako rozsyłający spam</string>
   <string name="pref_delete_omemo_identities">Usuń tożsamości OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Wygeneruj jeszcze raz klucze OMEMO. Wszystkie Twoje kontakty będą musiały zweryfikować Twoje nowe klucze. Użyj tego tylko w ostateczności.</string>
@@ -646,8 +602,46 @@ Conversations będzie wciąż ograniczał transfer danych, kiedy tylko to jest m
   <string name="i_followed_this_link_from_a_trusted_source">Trafiłem na ten link w zaufanym źródle</string>
   <string name="verifying_omemo_keys_trusted_source">Zaraz zweryfikujesz klucz OMEMO %1$s klikając w link. Jest to bezpieczne jedynie, kiedy link pochodzi z zaufanego źródła gdzie tylko %2$s mógł go opublikować.</string>
   <string name="verify_omemo_keys">Zweryfikuj klucze OMEMO</string>
+  <string name="show_inactive_devices">Pokaż nieaktywne</string>
+  <string name="hide_inactive_devices">Ukryj nieaktywne</string>
   <string name="distrust_omemo_key">Przestań ufać urządzeniu</string>
   <string name="distrust_omemo_key_text">Czy jesteś pewien, że chcesz cofnąć weryfikację tego urządzenia?\nUrządzenie to, i wiadomości z niego przychodzące będą oznaczane jako niezaufane.</string>
+  <plurals name="seconds">
+    <item quantity="one">%d sekunda</item>
+    <item quantity="few">%d sekundy</item>
+    <item quantity="many">%d sekund</item>
+    <item quantity="other">%d sekund</item>
+  </plurals>
+  <plurals name="minutes">
+    <item quantity="one">%d minuta</item>
+    <item quantity="few">%d minuty</item>
+    <item quantity="many">%d minut</item>
+    <item quantity="other">%d minut</item>
+  </plurals>
+  <plurals name="hours">
+    <item quantity="one">%d godzina</item>
+    <item quantity="few">%d godziny</item>
+    <item quantity="many">%d godzin</item>
+    <item quantity="other">%d godzin</item>
+  </plurals>
+  <plurals name="days">
+    <item quantity="one">%d dzień</item>
+    <item quantity="few">%d dni</item>
+    <item quantity="many">%d dni</item>
+    <item quantity="other">%d dni</item>
+  </plurals>
+  <plurals name="weeks">
+    <item quantity="one">%d tydzień</item>
+    <item quantity="few">%d tygodnie</item>
+    <item quantity="many">%d tygodni</item>
+    <item quantity="other">%d tygodni</item>
+  </plurals>
+  <plurals name="months">
+    <item quantity="one">%d miesiąc</item>
+    <item quantity="few">%d miesiące</item>
+    <item quantity="many">%d miesięcy</item>
+    <item quantity="other">%d miesięcy</item>
+  </plurals>
   <string name="pref_automatically_delete_messages">Automatyczne usuwanie wiadomości</string>
   <string name="pref_automatically_delete_messages_description">Automatycznie usuwaj z tego urządzenia wiadomości starsze niż skonfigurowany okres czasu.</string>
   <string name="encrypting_message">Szyfrowanie wiadomości</string>
@@ -680,4 +674,41 @@ Conversations będzie wciąż ograniczał transfer danych, kiedy tylko to jest m
   <string name="copy_to_clipboard">Skopiuj do schowka</string>
   <string name="message_copied_to_clipboard">Wiadomość skopiowana do schowka</string>
   <string name="message">Wiadomość</string>
+  <string name="private_messages_are_disabled">Prywatne wiadomości są wyłączone</string>
+  <string name="huawei_protected_apps">Aplikacje chronione</string>
+  <string name="huawei_protected_apps_summary">Aby otrzymywać wiadomości kiedy ekran jest wyłączony musisz dodać Conversations do listy aplikacji chronionych.</string>
+  <string name="mtm_accept_cert">Zaakceptować nieznany certyfikat?</string>
+  <string name="mtm_trust_anchor">Certyfikat serwera nie jest podpisany przez znany Urząd Certyfikacji</string>
+  <string name="mtm_accept_servername">Czy zaakceptować niepasującą nazwę serwera?</string>
+  <string name="mtm_hostname_mismatch">Nie można potwierdzić serwera jako \"%s\". Certyfikat jest ważny tylko dla:</string>
+  <string name="mtm_connect_anyway">Czy chcesz kontynuować połączenie?</string>
+  <string name="mtm_cert_details">Szczegóły certyfikatu:</string>
+  <string name="once">Tylko raz</string>
+  <string name="qr_code_scanner_needs_access_to_camera">Skaner kodów QR potrzebuje dostępu do aparatu</string>
+  <string name="pref_scroll_to_bottom">Przesuń na dół</string>
+  <string name="pref_scroll_to_bottom_summary">Przesuń na dół po wysłaniu wiadomości</string>
+  <string name="edit_status_message_title">Edytuj Komunikat Statusu</string>
+  <string name="edit_status_message">Edytuj komunikat statusu</string>
+  <string name="disable_encryption">Wyłącz szyfrowanie</string>
+  <string name="error_trustkey_general">Conversations nie mogło wysłać zaszyfrowanej wiadomości do %1$s. Możliwe, że kontakt używa starego serwera lub klienta który nie wspiera OMEMO.</string>
+  <string name="error_trustkey_device_list">Nie powiodło się pobranie listy urządzeń</string>
+  <string name="error_trustkey_bundle">Nie powiodło się pobranie pakietów urządzeń</string>
+  <string name="error_trustkey_hint_mutual">Podpowiedź: W niektórych przypadkach może pomóc wzajemne dodanie się do listy kontaktów.</string>
+  <string name="disable_encryption_message">Czy na pewno chcesz wyłączyć szyfrowanie OMEMO dla tej konwersacji?
+Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale może to być jedyny sposób aby komunikować się z ludźmi korzystającymi ze starych klientów.</string>
+  <string name="disable_now">Wyłącz teraz</string>
+  <string name="draft">Szkic:</string>
+  <string name="pref_omemo_setting">Szyfrowanie OMEMO</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO będzie zawsze używane w rozmowach 1:1 oraz prywatnych rozmowach grupowych.</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO będzie używane domyślnie dla nowych rozmów.</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO będzie musiało być włączone ręcznie dla nowych rozmów.</string>
+  <string name="create_shortcut">Utwórz Skrót</string>
+  <string name="pref_font_size">Rozmiar Czcionki</string>
+  <string name="pref_font_size_summary">Relatywny rozmiar czcionki używany wewnątrz aplikacji.</string>
+  <string name="default_on">Włączone domyślnie</string>
+  <string name="default_off">Wyłączone domyślnie</string>
+  <string name="small">Mała</string>
+  <string name="medium">Średnia</string>
+  <string name="large">Duża</string>
+  <string name="not_encrypted_for_this_device">Wiadomość nie była zaszyfrowana dla tego urządzenia.</string>
 </resources>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Enviar mensagem não criptografada</string>
   <string name="send_message">Enviar mensagem</string>
   <string name="send_message_to_x">Enviar mensagem para %s</string>
-  <string name="send_otr_message">Enviar mensagem criptografada via OTR</string>
   <string name="send_omemo_message">Enviar mensagem criptografada via OMEMO</string>
   <string name="send_omemo_x509_message">Enviar mensagem criptografada via v\\OMEMO</string>
   <string name="send_pgp_message">Enviar mensagem criptografada via OpenPGP</string>
@@ -170,9 +169,7 @@
   <string name="attach_record_voice">Gravar voz</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
   <string name="block_jabber_id">Bloquear ID do Jabber</string>
-  <string name="account_settings_password">Senha</string>
   <string name="account_settings_example_jabber_id">nomedeusuario@exemplo.com</string>
-  <string name="account_settings_confirm_password">Confirme a senha</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>
@@ -198,11 +195,7 @@
   <string name="last_seen_day">visto há 1 dia atrás</string>
   <string name="last_seen_days">visto há %d dias atrás</string>
   <string name="install_openkeychain">Mensagem criptografada. Por favor instale o OpenKeychain para descriptografar.</string>
-  <string name="unknown_otr_fingerprint">Impressão digital OTR desconhecida</string>
   <string name="openpgp_messages_found">Foram encontradas mensagens criptografadas com OpenPGP</string>
-  <string name="your_fingerprint">Sua impressão digital</string>
-  <string name="otr_fingerprint">Impressão digital OTR</string>
-  <string name="otr_fingerprint_selected_message">Impressão digital OTR da mensagem</string>
   <string name="openpgp_key_id">ID da chave OpenPGP</string>
   <string name="omemo_fingerprint">Impressão digital OMEMO</string>
   <string name="omemo_fingerprint_x509">Impressão digital v\\OMEMO</string>
@@ -212,11 +205,9 @@
   <string name="trust_omemo_fingerprints">Confiar nas impressões digitais OMEMO</string>
   <string name="fetching_keys">Buscando as chaves...</string>
   <string name="done">Concluído</string>
-  <string name="verify">Verificar</string>
   <string name="decrypt">Descriptografar</string>
   <string name="conferences">Conversas em grupo</string>
   <string name="search">Pesquisar</string>
-  <string name="create_contact">Criar contato</string>
   <string name="dialog_title_create_contact">Criar contato</string>
   <string name="enter_contact">Digite o contato</string>
   <string name="join_conference">Entrar na conversa em grupo</string>
@@ -263,11 +254,8 @@
   <string name="enable">Habilitar</string>
   <string name="conference_requires_password">Essa conversa em grupo exige uma senha</string>
   <string name="enter_password">Digite a senha</string>
-  <string name="missing_presence_subscription">Sem requisição de presença</string>
   <string name="request_presence_updates">Por favor, primeiro solicite atualizações de presençado seu contato.\n\n<small>Isso determinará qual(is) cliente(s) o seu contato está usando.</small></string>
   <string name="request_now">Solicitar agora</string>
-  <string name="delete_fingerprint">Excluir impressão digital</string>
-  <string name="sure_delete_fingerprint">Tem certeza que deseja remover essa impressão digital?</string>
   <string name="ignore">Ignorar</string>
   <string name="without_mutual_presence_updates"><b>Aviso:</b> Enviar isso sem atualizações mútuas de presença pode provocar problemas inesperados.\n\n<small>Verifique nos detalhes do contato suas inscrições de presença.</small></string>
   <string name="pref_security_settings">Segurança</string>
@@ -291,7 +279,6 @@
   <string name="pref_conference_name_summary">Use o assunto ao invés do JID para identificar as conversas em grupo</string>
   <string name="pref_autojoin">Entrar automaticamente nas conversas em grupo</string>
   <string name="pref_autojoin_summary">Respeita a sinalização de entrada automática dos favoritos de conversa em grupo</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>
   <string name="conference_banned">Você foi banido desta conversa em grupo</string>
   <string name="conference_members_only">Somente membros podem entrar nessa conversa em grupo</string>
@@ -313,19 +300,8 @@
   <string name="show_qr_code">Exibir código de barras 2D</string>
   <string name="show_block_list">Exibir a 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 pergunta</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>
-  <string name="secrets_do_not_match">Os segredos não correspondem</string>
   <string name="try_again">Tentar novamente</string>
-  <string name="finish">Finalizar</string>
-  <string name="verified">Verificado!</string>
-  <string name="smp_requested">O contato solicitou uma verificação SMP</string>
-  <string name="no_otr_session_found">Não foi encontrada nenhuma sessão OTR válida!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Manter o serviço em segundo plano</string>
   <string name="pref_keep_foreground_service_summary">Impede que o sistema operacional encerre sua conexão.</string>
@@ -346,36 +322,23 @@
   <string name="file_deleted">O arquivo foi excluído</string>
   <string name="no_application_found_to_open_file">Não foi encontrado nenhum aplicativo para abrir o arquivo</string>
   <string name="no_application_found_to_open_link">Não foi encontrado nenhum aplicativo para abrir o link</string>
-  <string name="could_not_verify_fingerprint">Não foi possível verificar a impressão digital</string>
-  <string name="manually_verify">Verificado manualmente</string>
-  <string name="are_you_sure_verify_fingerprint">Tem certeza que deseja verificar as impressões digitais OTR do seu contato?</string>
-  <string name="pref_show_dynamic_tags">Exibir etiquetas dinâmicas</string>
   <string name="pref_show_dynamic_tags_summary">Exibe etiquetas de somente-leitura abaixo dos contatos.</string>
   <string name="enable_notifications">Habilitar notificações</string>
   <string name="no_conference_server_found">Não foi encontrado nenhum servidor de conversas em grupo</string>
   <string name="conference_creation_failed">Não foi possível criar a conversa em grupo!</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">Regerar a chave OMEMO</string>
   <string name="clear_other_devices">Remover dispositivos</string>
   <string name="clear_other_devices_desc">Deseja realmente remover todos os outros dispositivos dos anúncios OMEMO? Na próxima vez que seus dispositivos conectarem eles se reanunciarão, entretanto, eles podem não receber mensagens nesse intervalo de tempo.</string>
   <string name="error_no_keys_to_trust_server_error">Não existe nenhuma chave utilizável disponível para este contato.\nA obtenção de novas chaves no servidor não foi bem sucedida. Pode ser que tenha algum problema com o servidor do seu contato.</string>
   <string name="error_no_keys_to_trust_presence">Não existem chaves em condições de uso para esse contato.\nCertifique-se de que existem requisições de presença mútuas.</string>
-  <string name="error_no_keys_to_trust">Não existe nenhuma chave utilizável para esse contato. Caso você tenha expurgado alguma chave dele, ele terá que gerar uma nova.</string>
   <string name="error_trustkeys_title">Alguma coisa deu errado</string>
   <string name="fetching_history_from_server">Obtendo histórico do servidor</string>
   <string name="no_more_history_on_server">Nenhum outro histórico do servidor</string>
   <string name="updating">Atualizando...</string>
   <string name="password_changed">A senha foi alterada!</string>
   <string name="could_not_change_password">Não foi possível alterar a senha</string>
-  <string name="otr_session_not_started">Envie uma mensagem para iniciar uma conversa criptografada</string>
-  <string name="ask_question">Faça uma pergunta</string>
-  <string name="smp_explain_question">Caso você e o seu contato tenham um segredo em comum que ninguém mais saiba (como, por exemplo, uma piada interna ou o que vocês comeram na última vez que se encontraram) vocês podem usar isso para verificar a impressão digital um do outro.\n\nVocê fornece uma dica ou pergunta para o seu contato responder. Atenção! A resposta diferencia maiúsculas de minúsculas.</string>
-  <string name="smp_explain_answer">O seu contato gostaria de verificar sua impressão digital através de um segredo compartilhado. O seu contato enviou a seguinte dica/questão para esse segredo.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Sua dica não pode estar em branco</string>
-  <string name="shared_secret_can_not_be_empty">O seu segredo compartilhado não pode estar em branco</string>
-  <string name="manual_verification_explanation">Compare cuidadosamente a impressão digital abaixo com aquela do seu contato.\nVocê pode usar qualquer forma de comunicação segura, como um e-mail criptografado ou uma ligação telefônica para efetuar a troca.</string>
   <string name="change_password">Alterar a senha</string>
   <string name="current_password">Senha atual</string>
   <string name="new_password">Nova senha</string>
@@ -424,7 +387,6 @@
   <string name="apk">Aplicativo Android</string>
   <string name="vcard">Contato</string>
   <string name="received_x_file">%s recebido</string>
-  <string name="disable_foreground_service">Desabilitar o serviço em segundo plano</string>
   <string name="touch_to_open_conversations">Toque para abrir o Conversations</string>
   <string name="avatar_has_been_published">O avatar foi publicado.</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -525,14 +487,6 @@
   <string name="no_camera_permission">O Conversations necessita de acesso à câmera</string>
   <string name="sync_with_contacts">Sincronizar com os contatos</string>
   <string name="sync_with_contacts_long">O Conversations quer procurar por correspondências entre contatos da sua conta Jabber e do seu telefone, para complementar as informações de nome completo e avatares\n\nO Conversations fará a verificação localmente, sem enviar nenhuma informação sua para o servidor\n\nVocê será solicitado a fornecer permissão de acesso aos seus contatos agora.</string>
-  <string name="certificate_information">Informação do certificado</string>
-  <string name="certificate_subject">Assunto</string>
-  <string name="certificate_issuer">Emitente</string>
-  <string name="certificate_cn">Common Name</string>
-  <string name="certificate_o">Organização</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Indisponível)</string>
-  <string name="certificate_not_found">Não foi encontrado nenhum certificado</string>
   <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
   <string name="notify_only_when_highlighted">Notificar somente quando for mencionado</string>
   <string name="notify_never">Notificações desabilitadas</string>
@@ -564,9 +518,7 @@
   <string name="pick_your_username">Selecione seu nome de usuário</string>
   <string name="pref_manually_change_presence">Gerenciar a disponibilidade manualmente</string>
   <string name="pref_manually_change_presence_summary">Defina sua disponibilidade ao editar a sua mensagem de status</string>
-  <string name="change_presence">Alterar a presença</string>
   <string name="status_message">Mensagem de status</string>
-  <string name="all_accounts_on_this_device">Definir para todas as contas deste dispositivo</string>
   <string name="presence_chat">Livre para conversar</string>
   <string name="presence_online">Conectado</string>
   <string name="presence_away">Afastado</string>
@@ -574,13 +526,9 @@
   <string name="presence_dnd">Ocupado</string>
   <string name="secure_password_generated">Foi gerada uma senha segura</string>
   <string name="device_does_not_support_battery_op">Seu dispositivo não suporta a desativação da otimização de bateria</string>
-  <string name="show_password">Exibir a senha</string>
   <string name="registration_please_wait">Não foi possível efetuar o registro. Por favor, tente novamente mais tarde</string>
   <string name="registration_password_too_weak">Falha no registro: Senha muito fraca</string>
-  <string name="create_conference">Criar a conversa em grupo</string>
   <string name="dialog_title_create_conference">Criar a conversa em grupo</string>
-  <string name="join_or_create_conference">Criar ou entrar em uma conversa em grupo</string>
-  <string name="conference_subject">Assunto</string>
   <string name="choose_participants">Selecione os participantes</string>
   <string name="creating_conference">Criando a conversa em grupo...</string>
   <string name="invite_again">Convidar novamente</string>
@@ -611,11 +559,6 @@
   <string name="no_permission_to_access_x">Sem permissão para acessar %s</string>
   <string name="remote_server_not_found">O servidor remoto não foi encontrado</string>
   <string name="unable_to_update_account">Não foi possível atualizar a conta</string>
-  <string name="missing_presence_subscription_with_x">Sem requisição de atualizações de presença com %s.</string>
-  <string name="missing_keys_from_x">Sem chaves OMEMO para %s.</string>
-  <string name="missing_omemo_keys">Chaves OMEMO ausentes</string>
-  <string name="wrong_conference_configuration">Esse é uma conversa em grupo não privada e/ou não anônima.</string>
-  <string name="this_conference_has_no_members">Esta conversa em grupo não possui participantes.</string>
   <string name="report_jid_as_spammer">Informe que esse JID está enviando mensagens indesejáveis</string>
   <string name="pref_delete_omemo_identities">Excluir identidades OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regerar suas chaves OMEMO. Todos os seus contatos terão que verificá-lo novamente. Utilize isso somente como último recurso.</string>
@@ -714,12 +657,10 @@
   <string name="huawei_protected_apps_summary">Para continuar recebendo notificações, mesmo com a tela apagada, você precisa adicionar o Conversations à lista de apps protegidos.</string>
   <string name="mtm_accept_cert">Aceitar certificado desconhecido?</string>
   <string name="mtm_trust_anchor">O servidor do certificado não está assinado por uma autoridade certificadora reconhecida.</string>
-  <string name="mtm_cert_expired">O certificado do servidor expirou.</string>
   <string name="mtm_accept_servername">Aceitar nome de servidor não correspondente?</string>
   <string name="mtm_hostname_mismatch">Não foi possível autenticar o servidor como \"%s\". O certificado é válido somente para:</string>
   <string name="mtm_connect_anyway">Deseja conectar-se mesmo assim?</string>
   <string name="mtm_cert_details">Detalhes do certificado:</string>
-  <string name="mtm_notification">Verificação do certificado</string>
   <string name="once">Uma vez</string>
   <string name="qr_code_scanner_needs_access_to_camera">O scanner de QR code necessita de acesso à câmera</string>
   <string name="pref_scroll_to_bottom">Rolar para baixo</string>

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

@@ -74,7 +74,6 @@
   <string name="choose_presence">Escolher dispositivo</string>
   <string name="send_unencrypted_message">Enviar mensagem não cifrada</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>
@@ -152,9 +151,7 @@
   <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_example_jabber_id">nomedeutilizador@exemplo.com</string>
-  <string name="account_settings_confirm_password">Confirmar palavra-passe</string>
   <string name="password">Palavra-passe</string>
   <string name="invalid_jid">Esse não é um ID Jabber válido</string>
   <string name="error_out_of_memory">Memória insuficiente. A imagem é muito grande</string>
@@ -180,10 +177,7 @@
   <string name="last_seen_day">visto há 1 dia atrás</string>
   <string name="last_seen_days">visto %d dias atrás</string>
   <string name="install_openkeychain">Mensagem criptografada. Por favor instale o OpenKeychain para desencriptar</string>
-  <string name="unknown_otr_fingerprint">Impressão digital OTR desconhecida</string>
   <string name="openpgp_messages_found">Mensagens encriptadas com OpenPGP encontradas</string>
-  <string name="your_fingerprint">A sua impressão digital</string>
-  <string name="otr_fingerprint">Impressão digital OTR</string>
   <string name="omemo_fingerprint">Impressão digital OMEMO</string>
   <string name="omemo_fingerprint_x509">Impressão digital v\\OMEMO</string>
   <string name="omemo_fingerprint_selected_message">Impressão digital OMEMO da mensagem</string>
@@ -192,7 +186,6 @@
   <string name="trust_omemo_fingerprints">Confiar nas impressões digitais OMEMO</string>
   <string name="fetching_keys">Obtendo as chaves...</string>
   <string name="done">Concluído</string>
-  <string name="verify">Verificar</string>
   <string name="decrypt">Decifrar</string>
   <string name="search">Pesquisar</string>
   <string name="enter_contact">Inserir Contacto</string>
@@ -231,8 +224,6 @@
   <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="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="pref_security_settings">Segurança</string>
@@ -252,7 +243,6 @@
   <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_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>
   <string name="using_account">utilizando a conta %s</string>
   <string name="checking_x">Verificando %s no anfitrião HTTP</string>
@@ -266,19 +256,8 @@
   <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="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="confirm">Confirmar</string>
-  <string name="in_progress">Em progresso</string>
-  <string name="respond">Responder</string>
-  <string name="secrets_do_not_match">Os segredos não coincidem</string>
   <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="no_otr_session_found">Não foi encontrada nenhuma sessão OTR válida!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Manter o serviço em primeiro plano</string>
   <string name="pref_keep_foreground_service_summary">Previne o sistema operativo de terminar a sua conexão</string>
@@ -297,30 +276,18 @@
   <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="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="enable_notifications">Ativar notificações</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="error_no_keys_to_trust">Não existem chaves disponíveis para serem utilizadas para este contacto. Se removeu alguma das chaves dele, ele irá necessitar de gerar chaves novas. </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="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="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>
@@ -357,7 +324,6 @@
   <string name="apk">Aplicação Android</string>
   <string name="vcard">Contacto</string>
   <string name="received_x_file">Recebeu %s</string>
-  <string name="disable_foreground_service">Desativar serviço em primeiro plano</string>
   <string name="touch_to_open_conversations">Toque para abrir Conversations</string>
   <string name="avatar_has_been_published">O avatar foi publicado!</string>
   <string name="sending_x_file">Enviando %s</string>
@@ -443,14 +409,6 @@
   <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 Conversations 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 Conversations 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="certificate_information">Informação do Certificado</string>
-  <string name="certificate_subject">Assunto</string>
-  <string name="certificate_issuer">Emissor</string>
-  <string name="certificate_cn">Nome Comum</string>
-  <string name="certificate_o">Organização</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Não disponível)</string>
-  <string name="certificate_not_found">Nenhum certificado encontrado</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>

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

@@ -49,6 +49,7 @@
   <string name="start_conversation">Pornește o conversație</string>
   <string name="invite_contact">Invită contact</string>
   <string name="contacts">Contacte</string>
+  <string name="contact">Contact</string>
   <string name="cancel">Anulează</string>
   <string name="set">Setează</string>
   <string name="add">Adaugă</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">Trimite mesaje necriptate</string>
   <string name="send_message">Trimite mesaj</string>
   <string name="send_message_to_x">Trimite mesaj către %s</string>
-  <string name="send_otr_message">Trimite mesaj criptat cu OTR</string>
   <string name="send_omemo_message">Trimite mesaj criptat cu OMEMO</string>
   <string name="send_omemo_x509_message">Trimite mesaj criptat cu v\\OMEMO</string>
   <string name="send_pgp_message">Trimite mesaj criptat cu OpenPGP</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">Înregistrare voce</string>
   <string name="account_settings_jabber_id">ID-ul Jabber</string>
   <string name="block_jabber_id">Blochează ID Jabber</string>
-  <string name="account_settings_password">Parolă</string>
-  <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Confirmă parola</string>
+  <string name="account_settings_example_jabber_id">numeutilizator@exemplu.ro</string>
   <string name="password">Parolă</string>
   <string name="invalid_jid">Acesta nu este un ID Jabber valabil</string>
   <string name="error_out_of_memory">Memorie epuizată. Imaginea este prea mare.</string>
@@ -197,12 +195,8 @@
   <string name="last_seen_hours">văzut(ă) ultima dată acum %d ore</string>
   <string name="last_seen_day">văzut(ă) ultima dată acum o zi</string>
   <string name="last_seen_days">văzut(ă) ultima dată acum %d zile</string>
-  <string name="install_openkeychain">Mesaj criptat. Te rog instalează OpenKeychain pentru a-l putea decripta.</string>
-  <string name="unknown_otr_fingerprint">Amprenta OTR necunoscuta</string>
+  <string name="install_openkeychain">Mesaj criptat. Vă rugăm să instalați OpenKeychain pentru a-l putea decripta.</string>
   <string name="openpgp_messages_found">A fost găsit un mesaj criptat cu OpenPGP</string>
-  <string name="your_fingerprint">Amprenta dumneavoastră</string>
-  <string name="otr_fingerprint">Amprenta OTR</string>
-  <string name="otr_fingerprint_selected_message">Amprenta OTR a mesajului</string>
   <string name="openpgp_key_id">ID cheie OpenPGP</string>
   <string name="omemo_fingerprint">Amprenta OMEMO</string>
   <string name="omemo_fingerprint_x509">Amprenta v\\OMEMO</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">Amprente OMEMO de încredere</string>
   <string name="fetching_keys">Se preiau cheile...</string>
   <string name="done">Gata</string>
-  <string name="verify">Verifică</string>
   <string name="decrypt">Decriptează</string>
   <string name="conferences">Discuții de grup</string>
   <string name="search">Caută</string>
-  <string name="create_contact">Creează contact</string>
   <string name="dialog_title_create_contact">Creează contact</string>
   <string name="enter_contact">Introduceți contact</string>
   <string name="join_conference">Alătură-te unei discuții de grup</string>
@@ -230,7 +222,7 @@
   <string name="contact_already_exists">Contactul exista deja</string>
   <string name="join">Alatura-te</string>
   <string name="conference_address">Adresă discuție de grup</string>
-  <string name="conference_address_example">camera@conferinta.exemplu.ro/nume_utilizator</string>
+  <string name="conference_address_example">camera@conferinta.exemplu.ro/numeutilizator</string>
   <string name="save_as_bookmark">Salvează semn de carte</string>
   <string name="delete_bookmark">Șterge semn de carte</string>
   <string name="bookmark_already_exists">Acest semn de carte exista</string>
@@ -263,11 +255,8 @@
   <string name="enable">Activează</string>
   <string name="conference_requires_password">Discuția de grup necesită o parolă</string>
   <string name="enter_password">Introduceți parola</string>
-  <string name="missing_presence_subscription">Lipsește abonarea de la actualizările de prezență</string>
   <string name="request_presence_updates">Vă rugăm, mai întâi cereți actualizări de prezență de la acest contact.\n\n<small>Acestea vor fi folosite pentru a determina ce aplicații folosește contactul dumneavoastră pentru conectare.</small></string>
   <string name="request_now">Cere acum</string>
-  <string name="delete_fingerprint">Șterge amprenta</string>
-  <string name="sure_delete_fingerprint">Sigur vreți să ștergeți această amprentă?</string>
   <string name="ignore">Ignora</string>
   <string name="without_mutual_presence_updates"><b>Atenție:</b> Trimițând aceasta fără actualizări de prezență reciproce, ar putea produce probleme neprevazute.\n\n<small>Mergeți la lista de contacte, la detalii, și verificați abonările la actualizările de prezență.</small></string>
   <string name="pref_security_settings">Siguranță</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">Folosește subiectul discuției pentru a o identifica</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>
   <string name="conference_members_only">Aceasta discuție de grup este rezervată membrilor</string>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">Arată cod de bare 2D</string>
   <string name="show_block_list">Listă contacte blocate</string>
   <string name="account_details">Detalii cont</string>
-  <string name="verify_otr">Verifica OTR</string>
-  <string name="remote_fingerprint">Amprentă la distanta</string>
-  <string name="shared_secret_hint">Indiciu sau Întrebare</string>
-  <string name="shared_secret_secret">Secret împărtășit</string>
   <string name="confirm">Confirmă</string>
-  <string name="in_progress">În desfășurare</string>
-  <string name="respond">Raspunde</string>
-  <string name="secrets_do_not_match">Secretele nu se potrivesc</string>
   <string name="try_again">Încearcă din nou</string>
-  <string name="finish">Încheie</string>
-  <string name="verified">Verificat!</string>
-  <string name="smp_requested">Contactul a cerut verificare SMP</string>
-  <string name="no_otr_session_found">Nu s-a găsit nici o sesiune OTR validă</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Păstrează serviciul activ în prim-plan</string>
   <string name="pref_keep_foreground_service_summary">Previne închiderea conexiunii de către sistemul de operare</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">Fișierul a fost șters</string>
   <string name="no_application_found_to_open_file">Nu s-a găsit nici o aplicație care să deschidă fișierul</string>
   <string name="no_application_found_to_open_link">Nu s-a găsit nici o aplicație care să deschidă legătura</string>
-  <string name="could_not_verify_fingerprint">Nu s-a putut verifica amprenta</string>
-  <string name="manually_verify">Verificare manuală</string>
-  <string name="are_you_sure_verify_fingerprint">Sigur doriți să verificați amprenta OTR a persoanei de contact?</string>
-  <string name="pref_show_dynamic_tags">Arată etichetele de stare</string>
+  <string name="pref_show_dynamic_tags">Etichete dinamice</string>
   <string name="pref_show_dynamic_tags_summary">Sub contacte arată etichete dinamice</string>
   <string name="enable_notifications">Activează notificările</string>
   <string name="no_conference_server_found">Nu s-a găsit serverul pentru discuția de grup</string>
   <string name="conference_creation_failed">Discuția de grup nu a putut fi creată!</string>
   <string name="account_image_description">Avatar cont</string>
-  <string name="copy_otr_clipboard_description">Copiază amprenta OTR în memorie</string>
   <string name="copy_omemo_clipboard_description">Copiază amprenta OMEMO în memorie</string>
   <string name="regenerate_omemo_key">Generează din nou cheia OMEMO</string>
   <string name="clear_other_devices">Curață lista dispozitivelor</string>
   <string name="clear_other_devices_desc">Sigur vreți să înlăturați toate celelalte dispozitive din mesajul de anunț OMEMO? Data viitoare când dispozitivele se vor conecta, vor anunța din nou că sunt accesibile, dar se poate ca ele să nu mai primească mesajele trimise între timp.</string>
   <string name="error_no_keys_to_trust_server_error">Nu există chei utilizabile pentru acest contact.\nÎncercarea de a descărca chei noi de pe server a eșuat. Se poate ca serverul contactului dumneavoastră să aibă o problemă.</string>
   <string name="error_no_keys_to_trust_presence">Nu există chei disponibile ce pot fi folosite pentru acest contact.\nAsigurați-vă că ați activat trimiterea de actualizări de prezență reciproce.</string>
-  <string name="error_no_keys_to_trust">Nu exista chei disponibile și utilizabile pentru acest contact. Dacă ați șters vreuna din cheile contactului, acesta va trebuii să genereze una noua.</string>
   <string name="error_trustkeys_title">A apărut o problemă</string>
   <string name="fetching_history_from_server">Descarc istoric de pe server</string>
   <string name="no_more_history_on_server">Nu mai exista istoric pe server</string>
   <string name="updating">Actualizare...</string>
   <string name="password_changed">Parolă schimbată</string>
   <string name="could_not_change_password">Nu s-a putut schimba parola</string>
-  <string name="otr_session_not_started">Trimite un mesaj pentru a pornii o discutie criptata</string>
-  <string name="ask_question">Întreabă ceva</string>
-  <string name="smp_explain_question">Dumneavoastră și contactul aveți un secret în comun pe care nimeni altcineva nu îl știe (cum ar fi o glumă sau ce ați mâncat ultima dată când v-ați văzut), puteți folosi acel secret ca să vă verificați amprenta fiecăruia.\n\nDumneavoastră puneți la dispoziție un indiciu sau o întrebare contactului iar el/ea va răspunde cu un mesaj sensibil la majuscule.</string>
-  <string name="smp_explain_answer">Contactul dumneavoastră dorește să vă verifice amprenta provocându-vă cu un secret împărtășit. Contactul a furnizat următorul indiciu sau întrebare legat de acel secret.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Indiciul dumneavoastră nu ar trebui să fie gol</string>
-  <string name="shared_secret_can_not_be_empty">Secretul dumneavoastră împărtășit nu poate fi gol</string>
-  <string name="manual_verification_explanation">Comparați cu grijă amprenta afișata mai jos cu amprenta contactului.\nPuteți folosi orice formă de comunicare de încredere precum un e-mail criptat sau o convorbire telefonică pentru a face schimb de amprente.</string>
   <string name="change_password">Schimbare parolă</string>
   <string name="current_password">Parolă curentă</string>
   <string name="new_password">Parolă nouă</string>
@@ -424,7 +389,6 @@
   <string name="apk">Aplicație Android</string>
   <string name="vcard">Contact</string>
   <string name="received_x_file">Primit %s</string>
-  <string name="disable_foreground_service">Dezactivează serviciul în prim-plan</string>
   <string name="touch_to_open_conversations">Atingeți pentru a deschide Conversations</string>
   <string name="avatar_has_been_published">Avatarul a fost publicat!</string>
   <string name="sending_x_file">Trimit %s</string>
@@ -435,7 +399,7 @@
   <string name="contacts_are_typing">%s tastează...</string>
   <string name="contacts_have_stopped_typing">%s s-au oprit din scris</string>
   <string name="pref_chat_states">Notificare tastare</string>
-  <string name="pref_chat_states_summary">Anunță contactul când scrii un nou mesaj</string>
+  <string name="pref_chat_states_summary">Contactul este anunțat atunci când scrieți un nou mesaj</string>
   <string name="send_location">Trimite locația</string>
   <string name="show_location">Arată locația</string>
   <string name="no_application_found_to_display_location">Nu s-a găsit nici o aplicație care să afișeze locația</string>
@@ -464,7 +428,7 @@
   <string name="pref_quick_action_summary">Înlocuiește butonul de trimitere cu o acțiune rapidă</string>
   <string name="pref_quick_action">Acțiune rapidă</string>
   <string name="none">Nimic</string>
-  <string name="recently_used">Folosit recent</string>
+  <string name="recently_used">Folosită recent</string>
   <string name="choose_quick_action">Alegeți acțiunea rapidă</string>
   <string name="search_for_contacts_or_groups">Caută contacte sau grupuri</string>
   <string name="send_private_message">trimite mesaj privat</string>
@@ -482,14 +446,14 @@
   <string name="server_info_broken">Deteriorat</string>
   <string name="pref_presence_settings">Setări de disponibilitate</string>
   <string name="pref_away_when_screen_off">Plecat când ecranul este oprit</string>
-  <string name="pref_away_when_screen_off_summary">Declară clientul drept plecat atunci când ecranul este oprit</string>
+  <string name="pref_away_when_screen_off_summary">Prezintă clientul drept \"Plecat\" atunci când ecranul este oprit</string>
   <string name="pref_dnd_on_silent_mode">\"Nu deranja\" în modul silențios</string>
   <string name="pref_dnd_on_silent_mode_summary">Prezintă clientul drept \"Nu deranja\" atunci când dispozitivul este în mod silențios</string>
   <string name="pref_treat_vibrate_as_silent">Tratează modul vibrație ca silențios</string>
   <string name="pref_treat_vibrate_as_dnd_summary">Prezintă clientul drept \"Nu deranja\" atunci când dispozitivul este în mod vibrație</string>
   <string name="pref_show_connection_options">Opțiuni avansate conexiune</string>
   <string name="pref_show_connection_options_summary">Arată opțiunea de setare a numelui de gazdă și a portului, atunci când se configurează un cont</string>
-  <string name="hostname_example">xmpp.example.com</string>
+  <string name="hostname_example">xmpp.exemplu.ro</string>
   <string name="action_add_account_with_certificate">Adaugă un cont cu certificat</string>
   <string name="unable_to_parse_certificate">Nu se poate analiza certificatul</string>
   <string name="authenticate_with_certificate">Lăsați gol pentru a autentifica cu un certificat</string>
@@ -528,15 +492,6 @@
   <string name="no_camera_permission">Conversations are nevoie de acces la camera foto</string>
   <string name="sync_with_contacts">Sincronizează cu contactele</string>
   <string name="sync_with_contacts_long">Conversations dorește să potrivească lista de contacte XMPP cu cea din dispozitiv pentru a putea afișa numele lor complete și avatarele.\n\nConversations doar va citi și potrivi local fără să le încarce pe vreun server.\n\nUrmează să fiți întrebați dacă doriți să permiteți accesul la contacte.</string>
-  <string name="certificate_information">Informații despre certificat</string>
-  <string name="certificate_subject">Subiect</string>
-  <string name="certificate_issuer">
-Emitent</string>
-  <string name="certificate_cn">Nume comun</string>
-  <string name="certificate_o">Organizatie</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Indisponibil)</string>
-  <string name="certificate_not_found">Certificat inexistent</string>
   <string name="notify_on_all_messages">Notifică la toate mesajele</string>
   <string name="notify_only_when_highlighted">Notifică doar atunci când cineva vă menționează numele</string>
   <string name="notify_never">Notificări dezactivate</string>
@@ -569,10 +524,8 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="use_own_provider">Folosește furnizorul meu</string>
   <string name="pick_your_username">Alegeți un nume de utilizator</string>
   <string name="pref_manually_change_presence">Setează disponibilitate manual</string>
-  <string name="pref_manually_change_presence_summary">Setați-vă disponibilitatea atunci când vă editați mesajul de stare.</string>
-  <string name="change_presence">Setare prezență</string>
+  <string name="pref_manually_change_presence_summary">Atunci când vă editați mesajul de stare.</string>
   <string name="status_message">Mesaj de stare</string>
-  <string name="all_accounts_on_this_device">Setează pentru toate conturile de pe acest dispozitiv</string>
   <string name="presence_chat">Disponibil(ă) pentru conversație</string>
   <string name="presence_online">Conectat(ă)</string>
   <string name="presence_away">Plecat(ă)</string>
@@ -580,13 +533,9 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="presence_dnd">Ocupat(ă)</string>
   <string name="secure_password_generated">O parolă sigură a fost generată</string>
   <string name="device_does_not_support_battery_op">Dispozitivul dumneavoastră nu suportă dezactivarea optimizării de baterie pentru această aplicație</string>
-  <string name="show_password">Arată parola</string>
   <string name="registration_please_wait">Înregistrare eșuată: Încercați din nou mai târziu</string>
   <string name="registration_password_too_weak">Înregistrare eșuată: Parolă nesigură</string>
-  <string name="create_conference">Creează discuție de grup</string>
   <string name="dialog_title_create_conference">Creează discuție de grup</string>
-  <string name="join_or_create_conference">Alătură-te sau creează discuție de grup</string>
-  <string name="conference_subject">Subiect</string>
   <string name="choose_participants">Alegeți participanți</string>
   <string name="creating_conference">Se creează discuția de grup...</string>
   <string name="invite_again">Trimite din nou invitația</string>
@@ -594,7 +543,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="gp_medium">Mediu</string>
   <string name="gp_long">Lung</string>
   <string name="pref_broadcast_last_activity">Anunță ultima interacțiune</string>
-  <string name="pref_broadcast_last_activity_summary">Anunță contactele când folosești Conversations</string>
+  <string name="pref_broadcast_last_activity_summary">Contactele vă sunt anunțate atunci când folosiți Conversations</string>
   <string name="pref_privacy">Intimitate</string>
   <string name="pref_theme_options">Temă</string>
   <string name="pref_theme_options_summary">Selecție paletă culori interfață</string>
@@ -617,11 +566,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="no_permission_to_access_x">Nu există permisiunea de a accesa %s</string>
   <string name="remote_server_not_found">Serverul nu a fost găsit</string>
   <string name="unable_to_update_account">Nu se poate actualiza contul</string>
-  <string name="missing_presence_subscription_with_x">Lipsește abonarea de la actualizările de prezență cu %s.</string>
-  <string name="missing_keys_from_x">Cheie OMEMO lipsă de la %s.</string>
-  <string name="missing_omemo_keys">Chei OMEMO lipsă</string>
-  <string name="wrong_conference_configuration">Aceasta este o discuție de grup care nu este privată și nu este anonimă.</string>
-  <string name="this_conference_has_no_members">Discuția de grup nu are nici un membru.</string>
   <string name="report_jid_as_spammer">Raportează că această identitate trimite mesaje nedorite.</string>
   <string name="pref_delete_omemo_identities">Șterge identitățile OEMO</string>
   <string name="pref_delete_omemo_identities_summary">Regenerează cheile personale OMEMO. Toate contactele vor fi obligate să verifice cheile dumneavoastră din nou. Folosește asta doar ca o ultimă opțiune.</string>
@@ -654,7 +598,7 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="pref_clean_private_storage_summary">Locul unde sunt fișierele păstrate (pot fi descărcate de pe server din nou)</string>
   <string name="i_followed_this_link_from_a_trusted_source">Am urmat aceasta legătură de la o sursă de încredere</string>
   <string name="verifying_omemo_keys_trusted_source">Urmează să verificați cheile OMEMO pentru %1$s după ce veți deschide legătura. Acest lucru se poate face în siguranță doar dacă ați primit legătura de la o sursă de încredere unde doar %2$s putea publica.</string>
-  <string name="verify_omemo_keys">Verifica cheile OMEMO</string>
+  <string name="verify_omemo_keys">Verificare chei OMEMO</string>
   <string name="show_inactive_devices">Arată inactive</string>
   <string name="hide_inactive_devices">Ascunde inactive</string>
   <string name="distrust_omemo_key">Pierde încrederea în acest dispozitiv</string>
@@ -694,10 +638,10 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="encrypting_message">Mesajul se criptează</string>
   <string name="not_fetching_history_retention_period">Politica de retenție locală împiedică descărcarea altor mesaje.</string>
   <string name="transcoding_video">Se comprimă clipul video</string>
-  <string name="corresponding_conversations_closed">Conversațiile corespunzătoare au fost închise</string>
+  <string name="corresponding_conversations_closed">Conversațiile corespunzătoare au fost închise.</string>
   <string name="contact_blocked_past_tense">Contact blocat.</string>
   <string name="pref_notifications_from_strangers">Notificări de la persoane necunoscute</string>
-  <string name="pref_notifications_from_strangers_summary">Nu veți fi deranjat(ă) atunci când o persoană care nu este în lista de contacte vă scrie</string>
+  <string name="pref_notifications_from_strangers_summary">Nu veți fi deranjat(ă) atunci când o persoană care nu este în lista de contacte vă scrie.</string>
   <string name="received_message_from_stranger">Mesaj primit de la o persoana necunoscuta</string>
   <string name="block_stranger">Blocare contact necunoscut</string>
   <string name="block_entire_domain">Blocare tot domeniu</string>
@@ -725,13 +669,11 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="huawei_protected_apps">Aplicații protejate</string>
   <string name="huawei_protected_apps_summary">Pentru a continua să primiți notificări, chiar și când ecranul este oprit, trebuie să adăugați Conversations în lista de aplicații protejate.</string>
   <string name="mtm_accept_cert">Acceptați certificatul necunoscut?</string>
-  <string name="mtm_trust_anchor">Certificatul serverului nu este semnat de o autoritate de certificare (CA) cunoscută</string>
-  <string name="mtm_cert_expired">Certificatul serverului a expirat.</string>
+  <string name="mtm_trust_anchor">Certificatul serverului nu este semnat de o autoritate de certificare (CA) cunoscută.</string>
   <string name="mtm_accept_servername">Acceptați numele serverului ce nu corespunde?</string>
   <string name="mtm_hostname_mismatch">Serverul nu s-a putut autentifica ca \"%s\". Certificatul este valid doar pentru:</string>
   <string name="mtm_connect_anyway">Doriți să vă conectați oricum?</string>
   <string name="mtm_cert_details">Detalii certificat:</string>
-  <string name="mtm_notification">Verificare certificat</string>
   <string name="once">Doar o dată</string>
   <string name="qr_code_scanner_needs_access_to_camera">Scanerul de coduri QR are nevoie de acces la camera foto</string>
   <string name="pref_scroll_to_bottom">Derulează în jos</string>
@@ -739,10 +681,24 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="edit_status_message_title">Editare mesaj de stare</string>
   <string name="edit_status_message">Editare mesaj de stare</string>
   <string name="disable_encryption">Dezactivează criptarea</string>
-  <string name="error_trustkey_general">Conversations nu poate trimite mesaje criptate către %1$s. Aceasta se poate întâmpla dacă contactul dumneavoastră folosește un server sau un client învechit care nu suportă OMEMO.</string>
+  <string name="error_trustkey_general">Conversations nu poate trimite mesaje criptate către %1$s. Aceasta se poate întâmpla dacă contactul dumneavoastră folosește un server sau un client învechit ce nu suportă OMEMO.</string>
   <string name="error_trustkey_device_list">Nu s-a putut descărca lista dispozitivelor</string>
   <string name="error_trustkey_bundle">Nu s-a putut descărca pachetul de dispozitive</string>
   <string name="error_trustkey_hint_mutual">Sugestie: În unele cazuri se poate rezolva dacă vă adăugați reciproc în lista de contacte.</string>
   <string name="disable_encryption_message">Sigur doriți să dezactivați criptarea OMEMO pentru această conversație?\nAstfel veți permite administratorilor serverului să vă citească mesajele, dar se poate ca ăsta să fie singurul mod în care puteți să comunicați cu persoanele care folosesc clienți învechiți.</string>
   <string name="disable_now">Dezactivează acum</string>
+  <string name="draft">Ciornă:</string>
+  <string name="pref_omemo_setting">Criptare OMEMO</string>
+  <string name="pref_omemo_setting_summary_always">Va fi folosită mereu pentru discuțiile unu-la-unu și în grupurile private.</string>
+  <string name="pref_omemo_setting_summary_default_on">Va fi folosită în mod implicit pentru discuțiile noi.</string>
+  <string name="pref_omemo_setting_summary_default_off">Va trebui să fie pornită în mod explicit pentru discuțiile noi.</string>
+  <string name="create_shortcut">Creează scurtătură</string>
+  <string name="pref_font_size">Mărime text</string>
+  <string name="pref_font_size_summary">Dimensiunea relativă a fontului folosită în aplicație.</string>
+  <string name="default_on">Activată implicit</string>
+  <string name="default_off">Dezactivată implicit</string>
+  <string name="small">Mică</string>
+  <string name="medium">Medie</string>
+  <string name="large">Mare</string>
+  <string name="not_encrypted_for_this_device">Mesajul nu a fost criptat pentru acest dispozitiv.</string>
 </resources>

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

@@ -81,7 +81,6 @@
   <string name="send_unencrypted_message">Нешифрованное сообщение</string>
   <string name="send_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">v\\OMEMO зашифр. сообщение</string>
   <string name="send_pgp_message">OpenPGP зашифр. сообщение</string>
@@ -170,9 +169,7 @@
   <string name="attach_record_voice">Запись голоса</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Заблокировать Jabber ID</string>
-  <string name="account_settings_password">Пароль</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Подтвердите пароль</string>
   <string name="password">Пароль</string>
   <string name="invalid_jid">Недопустимый Jabber ID</string>
   <string name="error_out_of_memory">Недостаточно памяти. Изображение слишком большое</string>
@@ -198,11 +195,7 @@
   <string name="last_seen_day">Присутствие: 1 день назад</string>
   <string name="last_seen_days">Присутствие: %d дн. назад</string>
   <string name="install_openkeychain">Зашифрованное сообщение. Пожалуйста, установите OpenKeychain для расшифрования.</string>
-  <string name="unknown_otr_fingerprint">Неизвестный отпечаток OTR</string>
   <string name="openpgp_messages_found">Найдены OpenPGP зашифрованые сообщения</string>
-  <string name="your_fingerprint">Ваш отпечаток</string>
-  <string name="otr_fingerprint">OTR отпечаток</string>
-  <string name="otr_fingerprint_selected_message">OTR отпечаток сообщения</string>
   <string name="openpgp_key_id">ID OpenPGP ключа</string>
   <string name="omemo_fingerprint">OMEMO отпечаток</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO отпечаток</string>
@@ -212,11 +205,9 @@
   <string name="trust_omemo_fingerprints">Доверенные отпечатки OMEMO</string>
   <string name="fetching_keys">Получение ключей…</string>
   <string name="done">Готово</string>
-  <string name="verify">Подтвердить</string>
   <string name="decrypt">Расшифровать</string>
   <string name="conferences">Конференции</string>
   <string name="search">Поиск</string>
-  <string name="create_contact">Создать контакт</string>
   <string name="dialog_title_create_contact">Создание контакта</string>
   <string name="enter_contact">Добавить контакт</string>
   <string name="join_conference">Присоединиться к конференции</string>
@@ -263,11 +254,8 @@
   <string name="enable">Включить</string>
   <string name="conference_requires_password">Конференция требует авторизации</string>
   <string name="enter_password">Введите пароль</string>
-  <string name="missing_presence_subscription">Отсутствует подписка</string>
   <string name="request_presence_updates">Пожалуйста, прежде запросите обновления присутствия у вашего собеседника.\n\n<small>Эта информация будет использоваться для определения того, каким клиентом(ами) пользуетя ваш собеседник.</small></string>
   <string name="request_now">Запросить сейчас</string>
-  <string name="delete_fingerprint">Удалить отпечаток</string>
-  <string name="sure_delete_fingerprint">Вы уверены, что хотите удалить данный отпечаток?</string>
   <string name="ignore">Игнорировать</string>
   <string name="without_mutual_presence_updates"><b>Внимание:</b> Если обновления присутствия не включены на обеих сторонах, это может привести к возникновению неожиданных проблемам.\n\n<small>Уточните сведения о контакте, проверив настройки обновлений присутствия.</small></string>
   <string name="pref_security_settings">Безопасность</string>
@@ -291,7 +279,6 @@
   <string name="pref_conference_name_summary">Использовать тему вместо JID в качестве идентификатора конференций</string>
   <string name="pref_autojoin">Автоматически присоединяться к конференциям</string>
   <string name="pref_autojoin_summary">Использовать флаг autojoin в закладках конференций</string>
-  <string name="toast_message_otr_fingerprint">OTR-отпечаток скопирован в буфер обмена!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO отпечаток скопирован в буфер обмена!</string>
   <string name="conference_banned">Вы заблокированы из этой конференции</string>
   <string name="conference_members_only">Эта конференция — только для участников</string>
@@ -313,19 +300,8 @@
   <string name="show_qr_code">Показать 2D штрихкод</string>
   <string name="show_block_list">Показать чёрный список</string>
   <string name="account_details">Сведения об учётной записи</string>
-  <string name="verify_otr">Подтвердить OTR</string>
-  <string name="remote_fingerprint">Удалённый отпечаток</string>
-  <string name="shared_secret_hint">Подсказка или вопрос</string>
-  <string name="shared_secret_secret">Общий секретный ключ</string>
   <string name="confirm">Подтвердить</string>
-  <string name="in_progress">В ходе выполнения</string>
-  <string name="respond">Ответ</string>
-  <string name="secrets_do_not_match">Ключи не совпадают</string>
   <string name="try_again">Повторить</string>
-  <string name="finish">Завершить</string>
-  <string name="verified">Подтверждён!</string>
-  <string name="smp_requested">Контакт запросил подтверждение SMP</string>
-  <string name="no_otr_session_found">Действительная OTR-сессия не найдена!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Оставить службу на переднем плане</string>
   <string name="pref_keep_foreground_service_summary">Не позволяет операционной системе закрыть ваше соединение</string>
@@ -346,35 +322,22 @@
   <string name="file_deleted">Файл был удалён</string>
   <string name="no_application_found_to_open_file">Не найдено приложения для открытия файла</string>
   <string name="no_application_found_to_open_link">Не найдено приложения, способного открыть эту ссылку</string>
-  <string name="could_not_verify_fingerprint">Не удалось подтвердить отпечаток</string>
-  <string name="manually_verify">Ручная проверка</string>
-  <string name="are_you_sure_verify_fingerprint">Вы точно хотите подтвердить OTR-отпечатки ваших контактов?</string>
-  <string name="pref_show_dynamic_tags">Показывать динамические тэги</string>
   <string name="pref_show_dynamic_tags_summary">Отображать теги только для чтения под контактами</string>
   <string name="enable_notifications">Включить уведомления</string>
   <string name="no_conference_server_found">Сервер конференции не найден</string>
   <string name="conference_creation_failed">Не удалось создать конференцию!</string>
   <string name="account_image_description">Аватар аккаунта</string>
-  <string name="copy_otr_clipboard_description">Скопировать OTR-отпечаток в буфер обмена</string>
   <string name="copy_omemo_clipboard_description">Скопировать OMEMO-отпечаток в буфер обмена</string>
   <string name="regenerate_omemo_key">Создать заново ключ OMEMO</string>
   <string name="clear_other_devices">Очистить устройства</string>
   <string name="clear_other_devices_desc">Вы уверены, что хотите очистить все остальные устройства из анонса ключей OMEMO? При соединении устройств в следующий раз новые ключи анонсируются автоматически, но устройства могут не получить сообщения, посланные до этого.</string>
   <string name="error_no_keys_to_trust_server_error">Для этого контакта не существует доступных ключей.\nПопытка получения новых ключей с сервера оказалась неудачной. Возможно, что-то не так с сервером вашего собеседника.</string>
   <string name="error_no_keys_to_trust_presence">Нет доступных ключей для данного контакта.\nУбедитесь, что у вас есть подписка на взаимное присутствие.</string>
-  <string name="error_no_keys_to_trust">Для этого контакта не существует доступных ключей. Если вы очистили все его ключи, ему необходимо создать новые.</string>
   <string name="fetching_history_from_server">Получение истории с сервера</string>
   <string name="no_more_history_on_server">На сервере больше нет истории</string>
   <string name="updating">Обновление…</string>
   <string name="password_changed">Пароль изменён!</string>
   <string name="could_not_change_password">Не удалось изменить пароль</string>
-  <string name="otr_session_not_started">Отправить сообщение чтобы начать зашифрованный чат</string>
-  <string name="ask_question">Задать вопрос</string>
-  <string name="smp_explain_question">Если у вас и вашего собеседника есть общая тайна, о которой никто кроме вас не знает (например, шутка, понятная только \"своим\" или что вы ели на обед при последней вашей встрече) вы можете использовать эту тайну, чтобы подтвердить отпечаток друг друга.\n\nВы даёте подсказку или задаёте вопрос вашему контакту, а она даст регистрозависимый ответ.</string>
-  <string name="smp_explain_answer">Ваш собеседник желает проверить ваш отпечаток с помощью общего секрета. Ваш собеседник дал следующую подсказку или вопрос в качестве этого секрета.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Ваша подсказка не может быть пустой</string>
-  <string name="shared_secret_can_not_be_empty">Ваш общий секрет не может быть пустым</string>
-  <string name="manual_verification_explanation">Внимательно сверьте отпечаток, показанный ниже с отпечатком вашего собеседника.\nДля обмена ими вы можете использовать любое доверенное средство связи, например, зашифрованное электронное письмо или телефонный звонок.</string>
   <string name="change_password">Изменить пароль</string>
   <string name="current_password">Текущий пароль</string>
   <string name="new_password">Новый пароль</string>
@@ -420,7 +383,6 @@
   <string name="apk">Приложение Android</string>
   <string name="vcard">Контакт</string>
   <string name="received_x_file">Получено %s</string>
-  <string name="disable_foreground_service">Отключить фоновую службу</string>
   <string name="touch_to_open_conversations">Коснитесь, чтобы открыть Conversations</string>
   <string name="avatar_has_been_published">Аватар загружен!</string>
   <string name="sending_x_file">Отправляется %s</string>
@@ -523,14 +485,6 @@
   <string name="shared_text_with_x">Общий текст с %s</string>
   <string name="sync_with_contacts">Синхронизировать с контактами</string>
   <string name="sync_with_contacts_long">Conversations ожидает совпадения вашего XMPP ростера с вашими контактами для отображения их полных имен и аватаров.\n\nConversations только считает ваши контакты и сопоставит их локально без отправки их на ваш сервер.\n\nСейчас вы получите запрос на разрешение доступа к вашим контактам.</string>
-  <string name="certificate_information">Информация о сертификате</string>
-  <string name="certificate_subject">Subject</string>
-  <string name="certificate_issuer">Выпустил</string>
-  <string name="certificate_cn">Общепринятое имя</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_only_when_highlighted">Уведомлять только при упоминании</string>
   <string name="notify_never">Без уведомления</string>
@@ -559,9 +513,7 @@
   <string name="create_account">Создать аккаунт</string>
   <string name="use_own_provider">Использовать свой провайдер</string>
   <string name="pick_your_username">Выберите имя пользователя</string>
-  <string name="change_presence">Сменить присутствие</string>
   <string name="status_message">Статусное собщение</string>
-  <string name="all_accounts_on_this_device">Для всех аккаунтов</string>
   <string name="presence_chat">Свободен для общения</string>
   <string name="presence_online">В сети</string>
   <string name="presence_away">Отошёл</string>
@@ -569,13 +521,9 @@
   <string name="presence_dnd">Занят</string>
   <string name="secure_password_generated">Пароль был сгенерирован</string>
   <string name="device_does_not_support_battery_op">Ваше устройство не поддерживает отключение оптимизации энергопотребления</string>
-  <string name="show_password">Показать пароль</string>
   <string name="registration_please_wait">Регистрация не удалась: повторите попытку позднее</string>
   <string name="registration_password_too_weak">Регистрация не удалась: слишком слабый пароль</string>
-  <string name="create_conference">Создать конференцию</string>
   <string name="dialog_title_create_conference">Создать конференцию</string>
-  <string name="join_or_create_conference">Создать или присоединиться к конференции</string>
-  <string name="conference_subject">Тема</string>
   <string name="choose_participants">Выбрать участников</string>
   <string name="creating_conference">Создание конференции…</string>
   <string name="invite_again">Пригласить ещё раз</string>
@@ -606,11 +554,6 @@
   <string name="no_permission_to_access_x">Нет доступа к %s</string>
   <string name="remote_server_not_found">Удалённый сервер не найден</string>
   <string name="unable_to_update_account">Невозможно обновить аккаунт</string>
-  <string name="missing_presence_subscription_with_x">Отсутствует подписка на %s</string>
-  <string name="missing_keys_from_x">Отсутствуют OMEMO ключи %s</string>
-  <string name="missing_omemo_keys">Отсутствуют OMEMO ключи</string>
-  <string name="wrong_conference_configuration">Это — неприватная, неанонимная конференция.</string>
-  <string name="this_conference_has_no_members">В этой конференции нет ни одного участника.</string>
   <string name="report_jid_as_spammer">Отправить жалобу на нежелательные сообщения.</string>
   <string name="pref_delete_omemo_identities">Удалить OMEMO ключи</string>
   <string name="pref_delete_omemo_identities_summary">Создать заново OMEMO ключи. Необходимо повторное подтверждение. Используйте только в крайнем случае.</string>

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

@@ -67,7 +67,6 @@
   <string name="delete_messages">Vymazať správy</string>
   <string name="also_end_conversation">Neskôr ukončiť konverzáciu</string>
   <string name="send_unencrypted_message">Poslať nezašifrovanú správu</string>
-  <string name="send_otr_message">Poslať OTR šifrovanú správu</string>
   <string name="send_omemo_message">Poslať OMEMO šifrovanú správu</string>
   <string name="send_pgp_message">Poslať OpenPGP šifrovanú správu</string>
   <string name="your_nick_has_been_changed">Prezývka sa zmenila</string>
@@ -132,9 +131,7 @@
   <string name="mgmt_account_are_you_sure">Ste si istý?</string>
   <string name="attach_record_voice">Nahrať hlas</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
-  <string name="account_settings_password">Heslo</string>
   <string name="account_settings_example_jabber_id">meno@priklad.com</string>
-  <string name="account_settings_confirm_password">Potvrdiť heslo</string>
   <string name="password">Heslo</string>
   <string name="invalid_jid">Toto nie je platné Jabber ID</string>
   <string name="error_out_of_memory">Nedostatok pamäti. Obrázok je príliš veľký</string>
@@ -158,16 +155,12 @@
   <string name="last_seen_day">naposledy prihlásený pred 1 dňom</string>
   <string name="last_seen_days">naposledy prihlásený pred %d dňami</string>
   <string name="install_openkeychain">Šifrovaná správa. Nainštalujte, prosím, OpenKeychain pre dešifrovanie.</string>
-  <string name="unknown_otr_fingerprint">Neznámy OTR identifikátor</string>
   <string name="openpgp_messages_found">Našla sa OpenPGP šifrovaná správa</string>
-  <string name="your_fingerprint">Váš identifikátor</string>
-  <string name="otr_fingerprint">OTR identifikátor</string>
   <string name="omemo_fingerprint">OMEMO identifikátor</string>
   <string name="omemo_fingerprint_selected_message">OMEMO identifkátor správy</string>
   <string name="other_devices">Ostatné zariadenia</string>
   <string name="trust_omemo_fingerprints">Dôverovať OMEMO identifikátoru</string>
   <string name="done">Dokončený</string>
-  <string name="verify">Overiť</string>
   <string name="decrypt">Dešifrovať</string>
   <string name="search">Hľadať</string>
   <string name="view_contact_details">Zobraziť detaily kontaktu</string>
@@ -204,8 +197,6 @@
   <string name="enter_password">Vložiť heslo</string>
   <string name="request_presence_updates">Najskôr si, prosím, vyžiadajte povolenie o zasielanie zmien stavu kontaktu.\n\n<small>To bude následne použité na identifikáciu aplikácie, ktorú kontakt používa.</small></string>
   <string name="request_now">Ihneď vyžiadať</string>
-  <string name="delete_fingerprint">Vymazať identifikátor</string>
-  <string name="sure_delete_fingerprint">Naozaj chcete vymazať tento identifikátor?</string>
   <string name="ignore">Ignorovať</string>
   <string name="without_mutual_presence_updates"><b>Varovanie:</b> Odoslanie bez povolenia zmien stavu môže spôsobiť nečakané problémy na obidvoch stranách.\n\n<small>Prejdi na detaily kontaktu pre overenie povolenia o zmenách stavu.</small></string>
   <string name="pref_expert_options_summary">S týmto narábajte veľmi opatrne, prosím</string>
@@ -221,7 +212,6 @@
   <string name="pref_use_indicate_received_summary">Prijaté správy budú označené zelenou kvačkou. Toto nemusí vždy plne fungovať.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Vyfarbiť tlačidlo pre odoslanie na určenie stavu kontaktu</string>
   <string name="pref_expert_options_other">Ďalší</string>
-  <string name="toast_message_otr_fingerprint">OTR identifikátor skopírovaný do schránky!</string>
   <string name="using_account">Používa sa účet %s</string>
   <string name="checking_x">Overiť %s na HTTP host</string>
   <string name="not_connected_try_again">Nie ste pripojený. Skúste to neskôr</string>
@@ -233,19 +223,8 @@
   <string name="url_copied_to_clipboard">URL skopírovaný do schránky</string>
   <string name="show_block_list">Zobraziť zoznam blokovaných</string>
   <string name="account_details">Detaily účtu</string>
-  <string name="verify_otr">Overiť OTR</string>
-  <string name="remote_fingerprint">Vzdialený identifikátor</string>
-  <string name="shared_secret_hint">Pomôcka alebo Otázka</string>
-  <string name="shared_secret_secret">Spoločné tajomstvo</string>
   <string name="confirm">Potvrdiť</string>
-  <string name="in_progress">V procese</string>
-  <string name="respond">Odpovedať</string>
-  <string name="secrets_do_not_match">Tajomstvá nezodpovedajú</string>
   <string name="try_again">Skúste znova</string>
-  <string name="finish">Ukončiť</string>
-  <string name="verified">Overený!</string>
-  <string name="smp_requested">Kontakt žiadal SMP overenie </string>
-  <string name="no_otr_session_found">Našlo sa neplatné OTR stretnutie!</string>
   <string name="conversations_foreground_service">Konverzácie</string>
   <string name="pref_keep_foreground_service">Ponechať službu v prvom pláne</string>
   <string name="pref_keep_foreground_service_summary">Zamedzí operačnému systému ukončiť pripojenie </string>
@@ -261,26 +240,15 @@
   <string name="file_transmission_failed">prenos súboru zlyhal</string>
   <string name="file_deleted">Súbor bol vymazaný</string>
   <string name="no_application_found_to_open_file">Nenašla sa žiadna aplikácia na otvorenie súboru</string>
-  <string name="could_not_verify_fingerprint">Nepodarilo sa overiť identifikátor</string>
-  <string name="manually_verify">Overiť manuálne</string>
-  <string name="pref_show_dynamic_tags">Zobraziť dynamické etikety</string>
   <string name="pref_show_dynamic_tags_summary">Zobraziť etikety na čítanie pod kontakty</string>
   <string name="enable_notifications">Povoliť upozornenia</string>
   <string name="account_image_description">Avatar účtu</string>
-  <string name="copy_otr_clipboard_description">Skopírovať OTR identifikátor do schránky</string>
   <string name="copy_omemo_clipboard_description">Skopírovať OMEMO identifikátor do schránky</string>
   <string name="fetching_history_from_server">Načítať históriu zo serveru</string>
   <string name="no_more_history_on_server">Na serveri nie je žiadna ďalšia história</string>
   <string name="updating">Aktualizujem...</string>
   <string name="password_changed">Heslo zmenené!</string>
   <string name="could_not_change_password">Nepodarilo sa zmeniť heslo</string>
-  <string name="otr_session_not_started">Poslať správu pre spustenie šifrovaného chatu</string>
-  <string name="ask_question">Položiť otázku</string>
-  <string name="smp_explain_question">Ak máte vy a váš kontakt spoločné tajomstvo, ktoré nikto iný nepozná (napríklad nejaký spoločný vtip alebo len čo ste mali na obed, keď ste sa naposledy stretli), môžte použiť toto tajomstvo na overenie vzájomných identifikátorov. \n\nZadáte pomôcku alebo otázku pre váš kontakt, ktorý na ňu správne odpovie. </string>
-  <string name="smp_explain_answer">Váš kontakt by chcel overiť váš identifikátor pomocou spoločného tajomstva. Váš kontakt zadal nasledujúcu pomôcku alebo otázku týkajúcu sa tajomstva. </string>
-  <string name="shared_secret_hint_should_not_be_empty">Vaša pomôcka by nemala byť prázdna</string>
-  <string name="shared_secret_can_not_be_empty">Vaše spoločné tajomstvo nemôže byť prázdne</string>
-  <string name="manual_verification_explanation">Opatrne porovnajte identifikátor zobrazený dole s identifikátorom vášho kontaktu.\nNa ich výmenu môžte použiť akúkoľvek bezpečnú formu komunikácie ako napríklad šifrovaný e-mail alebo telefonát.</string>
   <string name="change_password">Zmeniť heslo</string>
   <string name="current_password">Aktuálne heslo</string>
   <string name="new_password">Nové heslo</string>
@@ -314,7 +282,6 @@
   <string name="apk">Android App</string>
   <string name="vcard">Kontakt</string>
   <string name="received_x_file">Prijatý %s</string>
-  <string name="disable_foreground_service">Vypnúť prvoplánovú službu</string>
   <string name="touch_to_open_conversations">Kliknite na spustenie Conversations</string>
   <string name="avatar_has_been_published">Avatar sa publikoval!</string>
   <string name="sending_x_file">Posielam %s</string>

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

@@ -75,7 +75,6 @@
   <string name="send_unencrypted_message">Пошаљи нешифровану поруку</string>
   <string name="send_message">Пошаљи поруку</string>
   <string name="send_message_to_x">Пошаљи поруку за %s</string>
-  <string name="send_otr_message">Пошаљи ОТР шифровану поруку</string>
   <string name="send_omemo_message">Пошаљи ОМЕМО шифровану поруку</string>
   <string name="send_omemo_x509_message">Пошаљи v\\ОМЕМО шифровану поруку</string>
   <string name="send_pgp_message">Пошаљи ОпенПГП шифровану поруку</string>
@@ -163,9 +162,7 @@
   <string name="attach_record_voice">Сними глас</string>
   <string name="account_settings_jabber_id">Џабер ИД</string>
   <string name="block_jabber_id">Блокирај Џабер ИД</string>
-  <string name="account_settings_password">Лозинка</string>
   <string name="account_settings_example_jabber_id">korisnickoime@primer.com</string>
-  <string name="account_settings_confirm_password">Потврди лозинку</string>
   <string name="password">Лозинка</string>
   <string name="invalid_jid">Ово није исправан Џабер ИД</string>
   <string name="error_out_of_memory">Нестало меморије. Слика је превелика</string>
@@ -191,11 +188,7 @@
   <string name="last_seen_day">виђен/а пре један дан</string>
   <string name="last_seen_days">виђен/а пре %d дана</string>
   <string name="install_openkeychain">Шифрована порука. Инсталирајте Отворени кључарник да бисте је дешифровали.</string>
-  <string name="unknown_otr_fingerprint">Непознат ОТР отисак</string>
   <string name="openpgp_messages_found">Нађене ОпенПГП шифроване поруке</string>
-  <string name="your_fingerprint">Ваш отисак</string>
-  <string name="otr_fingerprint">ОТР отисак</string>
-  <string name="otr_fingerprint_selected_message">ОТР отисак поруке</string>
   <string name="openpgp_key_id">ИД ОпенПГП кључа</string>
   <string name="omemo_fingerprint">ОМЕМО отисак</string>
   <string name="omemo_fingerprint_x509">v\\ОМЕМО отисак</string>
@@ -205,7 +198,6 @@
   <string name="trust_omemo_fingerprints">Поуздај се у ОМЕМО отиске</string>
   <string name="fetching_keys">Добављам кључеве…</string>
   <string name="done">Готово</string>
-  <string name="verify">Овери</string>
   <string name="decrypt">Дешифруј</string>
   <string name="search">Тражи</string>
   <string name="enter_contact">Унеси контакт</string>
@@ -243,11 +235,8 @@
   <string name="disable_notifications">Искључи обавештења</string>
   <string name="enable">Укључи</string>
   <string name="enter_password">Унесите лозинку</string>
-  <string name="missing_presence_subscription">Нема претплате на присутност</string>
   <string name="request_presence_updates">Најпре захтевајте ажурирање присутности од вашег контакта.\n\n<small>Ово ће омогућити да се одреди којег клијента ваш контакт користи.</small></string>
   <string name="request_now">Захтевај одмах</string>
-  <string name="delete_fingerprint">Обриши отисак</string>
-  <string name="sure_delete_fingerprint">Желите ли заиста да обришете овај отисак?</string>
   <string name="ignore">Занемари</string>
   <string name="without_mutual_presence_updates"><b>Упозорење:</b> Слање овога без узајамних ажурирања присутности би могло да узрокује неочекиване проблеме.\n\n<small>Идите на детаље контакта да бисте проверили претплате на присутности.</small></string>
   <string name="pref_security_settings">Безбедност</string>
@@ -267,7 +256,6 @@
   <string name="pref_use_indicate_received_summary">Означи примљене поруке зеленом квачицом, ако је подржано</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Боја дугмета за слање показује стање контакта</string>
   <string name="pref_expert_options_other">Остало</string>
-  <string name="toast_message_otr_fingerprint">ОТР отисак копиран на клипборд!</string>
   <string name="toast_message_omemo_fingerprint">ОМЕМО отисак копиран на клипборд!</string>
   <string name="using_account">преко налога %s</string>
   <string name="checking_x">Проверавам %s на ХТТП домаћину</string>
@@ -284,19 +272,8 @@
   <string name="show_qr_code">Прикажи 2Д бар-кôд</string>
   <string name="show_block_list">Прикажи списак блокираних</string>
   <string name="account_details">Детаљи налога</string>
-  <string name="verify_otr">Овери ОТР</string>
-  <string name="remote_fingerprint">Отисак удаљеног</string>
-  <string name="shared_secret_hint">Наговештај или питање</string>
-  <string name="shared_secret_secret">Заједничка тајна</string>
   <string name="confirm">Потврди</string>
-  <string name="in_progress">У току</string>
-  <string name="respond">Одговори</string>
-  <string name="secrets_do_not_match">Тајне се не поклапају</string>
   <string name="try_again">Покушај поново</string>
-  <string name="finish">Заврши</string>
-  <string name="verified">Оверено!</string>
-  <string name="smp_requested">Контакт захтева СМП оверавање</string>
-  <string name="no_otr_session_found">Нема исправне ОТР сесије!</string>
   <string name="conversations_foreground_service">Конверзација</string>
   <string name="pref_keep_foreground_service">Држи сервис у првом плану</string>
   <string name="pref_keep_foreground_service_summary">Спречава оперативни систем да прекине вашу везу</string>
@@ -316,31 +293,18 @@
   <string name="file_transmission_failed">пренос фајла није успео</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>
-  <string name="are_you_sure_verify_fingerprint">Желите ли заиста да оверите ОТР отисак вашег контакта?</string>
-  <string name="pref_show_dynamic_tags">Прикажи динамичке ознаке</string>
   <string name="pref_show_dynamic_tags_summary">Приказ ознака испод контаката</string>
   <string name="enable_notifications">Укључи обавештења</string>
   <string name="account_image_description">Аватар налога</string>
-  <string name="copy_otr_clipboard_description">Копирај ОТР отисак на клипборд</string>
   <string name="copy_omemo_clipboard_description">Копирај ОМЕМО отисак на клипборд</string>
   <string name="regenerate_omemo_key">Поново генериши ОМЕМО кључ</string>
   <string name="clear_other_devices">Очисти уређаје</string>
   <string name="clear_other_devices_desc">Желите ли заиста да уклоните све остале уређаје са ОМЕМО објаве? Када се ваши уређаји следећи пут повежу, објавиће се сами, али у међувремену можда неће примати поруке.</string>
-  <string name="error_no_keys_to_trust">Нема употребљивих кључева за овај контакт. Ако сте очистили било који од тих кључева, контакт мора да генерише нови.</string>
   <string name="fetching_history_from_server">Добављам историјат са сервера</string>
   <string name="no_more_history_on_server">Нема више историјата на серверу</string>
   <string name="updating">Ажурирам…</string>
   <string name="password_changed">Лозинка промењена!</string>
   <string name="could_not_change_password">Не могох да променим лозинку</string>
-  <string name="otr_session_not_started">Пошаљите поруку да бисте започели шифровано ћаскање</string>
-  <string name="ask_question">Постави питање</string>
-  <string name="smp_explain_question">Ако ви и ваш контакт имате заједничку тајну коју нико не зна (као што је лична шала или једноставно шта сте јели последњи пут кад сте се срели) можете употребити ту тајну да међусобно оверите отиске.\n\nВи дате наговештај или питање за вашег контакта који ће дати одговор (осетљив на велика и мала слова).</string>
-  <string name="smp_explain_answer">Ваш контакт жели да овери ваш отисак изазивајући вас заједничком тајном. Ваш контакт је дао следећи наговештај или питање за ту тајну.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Наговештај не би смео бити празан</string>
-  <string name="shared_secret_can_not_be_empty">Заједничка тајна не може бити празна</string>
-  <string name="manual_verification_explanation">Пажљиво упоредите отисак испод са отиском вашег контакта.\nМожете да употребите било који поверљив облик комуникације као што је шифрована е-пошта или позив телефоном да бисте разменили отиске.</string>
   <string name="change_password">Промени лозинку</string>
   <string name="current_password">Текућа лозинка</string>
   <string name="new_password">Нова лозинка</string>
@@ -378,7 +342,6 @@
   <string name="apk">Апликација за Андроид</string>
   <string name="vcard">Контакт</string>
   <string name="received_x_file">Примљено %s</string>
-  <string name="disable_foreground_service">Искључи сервис у првом плану</string>
   <string name="touch_to_open_conversations">Тапните да отворите Конверзацију</string>
   <string name="avatar_has_been_published">Аватар је објављен!</string>
   <string name="sending_x_file">Шаљем %s</string>
@@ -474,14 +437,6 @@
   <string name="shared_text_with_x">Подељен текст са %s</string>
   <string name="sync_with_contacts">Синхронизуј са контактима</string>
   <string name="sync_with_contacts_long">Конверзација жели да поклапи ваш ИксМПП именик са контактима на вашем уређају да би приказала њихова пуна имена и аватаре.\n\nКонверзација ће само да очита ваше контакте и упореди их локално без отпремања на сервер.\n\nСада ћете бити упитани за дозволу приступа вашим контактима.</string>
-  <string name="certificate_information">Подаци о сертификату</string>
-  <string name="certificate_subject">Предмет</string>
-  <string name="certificate_issuer">Издавач</string>
-  <string name="certificate_cn">Заједничко име</string>
-  <string name="certificate_o">Организација</string>
-  <string name="certificate_sha1">СХА-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="notify_paused">Обавештења паузирана</string>
@@ -508,9 +463,7 @@
   <string name="create_account">Направи налог</string>
   <string name="use_own_provider">Користићу сопствени провајдер</string>
   <string name="pick_your_username">Одредите ваше корисничко име</string>
-  <string name="change_presence">Промени присутност</string>
   <string name="status_message">Порука стања</string>
-  <string name="all_accounts_on_this_device">Постави за све налоге на овом уређају</string>
   <string name="presence_chat">Слободан за ћаскање</string>
   <string name="presence_online">На вези</string>
   <string name="presence_away">Одсутан</string>
@@ -518,10 +471,8 @@
   <string name="presence_dnd">Заузет</string>
   <string name="secure_password_generated">Безбедна лозинка је направљена</string>
   <string name="device_does_not_support_battery_op">Ваш уређај не подржава искључивање оптимизације батерије</string>
-  <string name="show_password">Прикажи лозинку</string>
   <string name="registration_please_wait">Регистрација није успела: покушајте поново касније</string>
   <string name="registration_password_too_weak">Регистрација није успела: лозинка преслаба</string>
-  <string name="conference_subject">Предмет</string>
   <string name="choose_participants">Додај учеснике</string>
   <string name="invite_again">Пошаљи поново</string>
   <string name="gp_short">Кратак</string>
@@ -551,9 +502,6 @@
   <string name="no_permission_to_access_x">Нема дозвола за приступ %s</string>
   <string name="remote_server_not_found">Удаљени сервер није нађен</string>
   <string name="unable_to_update_account">Не могу да ажурирам налог</string>
-  <string name="missing_presence_subscription_with_x">Нема претплате на присутност са %s.</string>
-  <string name="missing_keys_from_x">Нема ОМЕМО кључева у %s.</string>
-  <string name="missing_omemo_keys">Нема ОМЕМО кључева</string>
   <string name="report_jid_as_spammer">Пријави да овај ЈИД шаље нежељене поруке.</string>
   <string name="pref_delete_omemo_identities">Обриши ОМЕМО идентитете</string>
   <string name="pref_delete_omemo_identities_summary">Поновно генерисање ОМЕМО кључева. Сви ваши контакти ће морати поново да вас овере. Користите ово само у крајњем случају.</string>

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

@@ -75,7 +75,6 @@
   <string name="send_unencrypted_message">Skicka okrypterat meddelande</string>
   <string name="send_message">Skicka meddelande</string>
   <string name="send_message_to_x">Skicka meddelande till %s</string>
-  <string name="send_otr_message">Skicka OTR-krypterat meddelande</string>
   <string name="send_omemo_message">Skicka OMEMO-krypterat meddelande</string>
   <string name="send_omemo_x509_message">Skicka v\\OMEMO-krypterat meddelande</string>
   <string name="send_pgp_message">Skicka OpenPGP-krypterat meddelande</string>
@@ -163,9 +162,7 @@
   <string name="attach_record_voice">Spela in röst</string>
   <string name="account_settings_jabber_id">Jabber-ID</string>
   <string name="block_jabber_id">Blockera Jabber-ID</string>
-  <string name="account_settings_password">Lösenord</string>
   <string name="account_settings_example_jabber_id">användarnamn@exempel.se</string>
-  <string name="account_settings_confirm_password">Bekräfta lösenord</string>
   <string name="password">Lösenord</string>
   <string name="invalid_jid">Detta är inte ett korrekt Jabber-ID</string>
   <string name="error_out_of_memory">Slut på minne. Bilden är för stor</string>
@@ -191,11 +188,7 @@
   <string name="last_seen_day">senast sedd 1 dag sedan</string>
   <string name="last_seen_days">senast sedd %d dagar sedan</string>
   <string name="install_openkeychain">Krypterat meddelande. Installera OpenKeychain för att avkryptera.</string>
-  <string name="unknown_otr_fingerprint">Okänt OTR-fingeravtryck</string>
   <string name="openpgp_messages_found">OpenPGP-krypterat meddelande funnet</string>
-  <string name="your_fingerprint">Ditt fingeravtryck</string>
-  <string name="otr_fingerprint">OTR-fingeravtryck</string>
-  <string name="otr_fingerprint_selected_message">Meddelandets OTR-fingeravtryck</string>
   <string name="openpgp_key_id">OpenPGP-nyckel-ID</string>
   <string name="omemo_fingerprint">OMEMO-fingeravtryck</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO-fingeravtryck</string>
@@ -205,7 +198,6 @@
   <string name="trust_omemo_fingerprints">Lita på OMEMO-fingeravtryck</string>
   <string name="fetching_keys">Hämtar nycklar...</string>
   <string name="done">Klar</string>
-  <string name="verify">Verifiera</string>
   <string name="decrypt">Avkryptera</string>
   <string name="search">Sök</string>
   <string name="enter_contact">Fyll i kontakt</string>
@@ -243,11 +235,8 @@
   <string name="disable_notifications">Inaktivera notifieringar</string>
   <string name="enable">Aktivera</string>
   <string name="enter_password">Fyll i lösenord</string>
-  <string name="missing_presence_subscription">Saknar tillgänglighetsuppdateringar</string>
   <string name="request_presence_updates">Begär tillgänglighetsuppdateringar från din kontakt först.\n\n<small>Detta används för att se vilken klient/klienter din kontakt använder.</small></string>
   <string name="request_now">Begär nu</string>
-  <string name="delete_fingerprint">Ta bort fingeravtryck</string>
-  <string name="sure_delete_fingerprint">Är du säker på att du vill ta bort detta fingeravtryck?</string>
   <string name="ignore">Ignorera</string>
   <string name="without_mutual_presence_updates"><b>Varning:</b> Skicka detta utan gemensamma tillgänglighetsuppdateringar kan ge oväntade problem.\n\n<small>Gå till kontaktdetaljer för att verifiera dina tillgänglighetsuppdateringar.</small></string>
   <string name="pref_security_settings">Säkerhet</string>
@@ -267,7 +256,6 @@
   <string name="pref_use_indicate_received_summary">Mottagna meddelanden markeras med en grön bock om det stöds</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Färglägg skickaknappen för att indikera kontaktens status</string>
   <string name="pref_expert_options_other">Annat</string>
-  <string name="toast_message_otr_fingerprint">OTR-fingeravtryck har kopierats till urklipp!</string>
   <string name="toast_message_omemo_fingerprint">OMEMO-fingeravtryck har kopierats till urklipp!</string>
   <string name="using_account">använder konto %s</string>
   <string name="checking_x">Kontrollerar %s på webbserver</string>
@@ -284,19 +272,8 @@
   <string name="show_qr_code">Visa 2D-streckkod</string>
   <string name="show_block_list">Visa blockeringslista</string>
   <string name="account_details">Kontodetaljer</string>
-  <string name="verify_otr">Verifiera OTR</string>
-  <string name="remote_fingerprint">Fjärr-fingeravtryck</string>
-  <string name="shared_secret_hint">Ledtråd eller fråga</string>
-  <string name="shared_secret_secret">Delad hemlighet</string>
   <string name="confirm">Bekräfta</string>
-  <string name="in_progress">Pågående</string>
-  <string name="respond">Svara</string>
-  <string name="secrets_do_not_match">Hemligheter matchar inte</string>
   <string name="try_again">Försök igen</string>
-  <string name="finish">Klar</string>
-  <string name="verified">Verifierad</string>
-  <string name="smp_requested">Kontakt begärde SMP-verifikation</string>
-  <string name="no_otr_session_found">Ingen giltig OTR-session kunde hittas!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Håll tjänst i förgrunden</string>
   <string name="pref_keep_foreground_service_summary">Förehindrar operativsystemet att ta ner uppkopplingen</string>
@@ -316,31 +293,18 @@
   <string name="file_transmission_failed">filöverföring lyckades inte</string>
   <string name="file_deleted">Filen har blivit borttagen</string>
   <string name="no_application_found_to_open_file">Ingen applikation kunde hittas för att öppna filen</string>
-  <string name="could_not_verify_fingerprint">Kunde inte verifiera fingeravtryck</string>
-  <string name="manually_verify">Verifiera manuellt</string>
-  <string name="are_you_sure_verify_fingerprint">Är du säker på att du vill verifiera din kontakts OTR-fingeravtryck?</string>
-  <string name="pref_show_dynamic_tags">Visa dynamiska taggar</string>
   <string name="pref_show_dynamic_tags_summary">Visa skrivskyddade taggar under kontakter</string>
   <string name="enable_notifications">Aktivera notifieringar</string>
   <string name="account_image_description">Kontots avatarbild</string>
-  <string name="copy_otr_clipboard_description">Kopiera OTR-fingeravtryck till urklipp</string>
   <string name="copy_omemo_clipboard_description">Kopiera OMEMO-fingeravtryck till urklipp</string>
   <string name="regenerate_omemo_key">Regenerera OMEMO-nyckel</string>
   <string name="clear_other_devices">Rensa enheter</string>
   <string name="clear_other_devices_desc">Är du säker på att du vill rensa alla andra enheter från OMEMO-annonsering? Nästa gång dina enheter ansluter kommer de att återannonsera sig, men de kanske inte tar emot enheter under tiden.</string>
-  <string name="error_no_keys_to_trust">Det finns inga användbara nycklar tillgängliga för den här kontakten. Om du har rensat någon av dennes nycklar behöver de generera nya.</string>
   <string name="fetching_history_from_server">Hämtar historik från server</string>
   <string name="no_more_history_on_server">Ingen mer historik på server</string>
   <string name="updating">Uppdaterar…</string>
   <string name="password_changed">Lösenord bytt!</string>
   <string name="could_not_change_password">Kunde inte byta lösenord</string>
-  <string name="otr_session_not_started">Skicka meddelande för att påbörja en krypterad chat</string>
-  <string name="ask_question">Ställ fråga</string>
-  <string name="smp_explain_question">Om du och din kontakt har en delad hemlighet som ingen annan känner till (som ett internt skämt eller vad ni åt till lunch senast ni träffades) så kan ni ange den hemligheten för att verifiera varandras fingeravtryck.\n\nDu ger en ledtråd eller en fråga till din kontakt som ska svara med ett svar som är skiftlägeskänsligt.</string>
-  <string name="smp_explain_answer">Din kontakt vill verifiera ditt fingeravtryck genom att utmana dig med en delad hemlighet. Din kontakt gav följande ledtråd eller fråga för hemligheten.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Din ledtråd ska inte vara tom</string>
-  <string name="shared_secret_can_not_be_empty">Din delade hemlighet kan inte vara tom</string>
-  <string name="manual_verification_explanation">Jämför noggrant fingeravtrycket nedan med din kontakts fingeravtryck.\nDu kan använda valfri typ av betrodd kommunikation som ett krypterat e-mail eller ett telefonsamtal för att utbyta dessa.</string>
   <string name="change_password">Byt lösenord</string>
   <string name="current_password">Nuvarande lösenord</string>
   <string name="new_password">Nytt lösenord</string>
@@ -378,7 +342,6 @@
   <string name="apk">Android-app</string>
   <string name="vcard">Kontakt</string>
   <string name="received_x_file">Tagit emot %s</string>
-  <string name="disable_foreground_service">Deaktivera förgrundstjänst</string>
   <string name="touch_to_open_conversations">Tryck för att öppna Conversations</string>
   <string name="avatar_has_been_published">Avatarbild har publicerats!</string>
   <string name="sending_x_file">Skickar %s</string>
@@ -471,14 +434,6 @@
   <string name="shared_text_with_x">Delade text med %s</string>
   <string name="sync_with_contacts">Synkronisera med kontakter</string>
   <string name="sync_with_contacts_long">Conversations vill matcha din XMPP-kontaktlista med dina kontakter för att visa deras namn och profilbild.\n\nConversations läser endast dina kontakter för att matcha dem lokalt utan att ladda upp dem till din server.\n\nDu kommer nu få frågan om tillåtelse för att använda kontakterna.</string>
-  <string name="certificate_information">Certifikatinformation</string>
-  <string name="certificate_subject">Ämne</string>
-  <string name="certificate_issuer">Utfärdare</string>
-  <string name="certificate_cn">Common Name</string>
-  <string name="certificate_o">Organisation</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(Ej tillgänglig)</string>
-  <string name="certificate_not_found">Inget certifikat funnet</string>
   <string name="notify_on_all_messages">Notifiera för alla meddelanden</string>
   <string name="notify_never">Notifieringar deaktiverade</string>
   <string name="notify_paused">Notifieringar pausade</string>
@@ -505,9 +460,7 @@
   <string name="create_account">Skapa konto</string>
   <string name="use_own_provider">Använd min egen leverantör</string>
   <string name="pick_your_username">Välj användarnamn</string>
-  <string name="change_presence">Ändra tillgänglighet</string>
   <string name="status_message">Statusmeddelande</string>
-  <string name="all_accounts_on_this_device">Använd för alla konton på den här enheten</string>
   <string name="presence_chat">Tillgänglig</string>
   <string name="presence_online">Online</string>
   <string name="presence_away">Borta</string>
@@ -515,10 +468,8 @@
   <string name="presence_dnd">Upptagen</string>
   <string name="secure_password_generated">Ett säkert lösenord har genererats</string>
   <string name="device_does_not_support_battery_op">Din enhet stödjer inte deaktivering av batterioptimeringar</string>
-  <string name="show_password">Visa lösenord</string>
   <string name="registration_please_wait">Registreringfel: Försök igen senare</string>
   <string name="registration_password_too_weak">Registreringsfel: Lösenordet är för svagt</string>
-  <string name="conference_subject">Ämne</string>
   <string name="choose_participants">Välj deltagare</string>
   <string name="invite_again">Bjud in igen</string>
   <string name="gp_short">Kort</string>
@@ -548,9 +499,6 @@
   <string name="no_permission_to_access_x">Saknar rättigheter för access till %s</string>
   <string name="remote_server_not_found">Fjärrserver hittas inte</string>
   <string name="unable_to_update_account">Kan inte uppdatera konto</string>
-  <string name="missing_presence_subscription_with_x">Saknar tillgänglighetsuppdateringar från %s.</string>
-  <string name="missing_keys_from_x">Saknar OMEMO nyckel från %s.</string>
-  <string name="missing_omemo_keys">Saknar OMEMO nycklar</string>
   <string name="report_jid_as_spammer">Rapportera detta JID för skickande av oönskade meddelanden.</string>
   <string name="pref_delete_omemo_identities">Ta bort OMEMO identiteter</string>
   <string name="pref_delete_omemo_identities_summary">Regenerera din OMEMO-nyckel. Alla dina kontakter kommer att behöva verifiera dig igen. Använd detta endast som en sista utväg.</string>

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

@@ -74,7 +74,6 @@
   <string name="choose_presence">Aygıt seç</string>
   <string name="send_unencrypted_message">Şifrelenmemiş ileti gönder</string>
   <string name="send_message_to_x">%s kişisine ileti gönder</string>
-  <string name="send_otr_message">OTR ile şifrelenmiş ileti gönder</string>
   <string name="send_omemo_message">OMEMO ile şifrelenmiş ileti gönder</string>
   <string name="send_omemo_x509_message">v\\OMEMO ile şifrelenmiş ileti gönder</string>
   <string name="send_pgp_message">OpenPGP ile şifrelenmiş ileti gönder</string>
@@ -159,9 +158,7 @@
   <string name="attach_record_voice">Ses kaydet</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Jabber ID engelle</string>
-  <string name="account_settings_password">Parola</string>
   <string name="account_settings_example_jabber_id">kullanıcıadı@ornek.com</string>
-  <string name="account_settings_confirm_password">Parolayı doğrula</string>
   <string name="password">parola</string>
   <string name="invalid_jid">Jabber ID geçersiz</string>
   <string name="error_out_of_memory">Yetersiz bellek. Görüntü dosyası çok büyük.</string>
@@ -187,11 +184,7 @@
   <string name="last_seen_day">en son 1 gün önce görüldü</string>
   <string name="last_seen_days">en son %d gün önce görüldü</string>
   <string name="install_openkeychain">Şifreli ileti. Deşifre etmek için lütfen OpenKeychain kurun.</string>
-  <string name="unknown_otr_fingerprint">Bilinmeyen OTR parmak izi</string>
   <string name="openpgp_messages_found">OpenPGP ile şifrelenmiş iletiler bulundu</string>
-  <string name="your_fingerprint">Parmak iziniz</string>
-  <string name="otr_fingerprint">OTR parmak izi</string>
-  <string name="otr_fingerprint_selected_message">İletinin OTR parmak izi</string>
   <string name="openpgp_key_id">OpenPGP Anahtar ID</string>
   <string name="omemo_fingerprint">OMEMO parmak izi</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO parmak izi</string>
@@ -201,7 +194,6 @@
   <string name="trust_omemo_fingerprints">OMEMO parmak izlerine güven</string>
   <string name="fetching_keys">Anahtarları alıyor…</string>
   <string name="done">Tamam</string>
-  <string name="verify">Doğrula</string>
   <string name="decrypt">Şifreyi çöz</string>
   <string name="search">Ara</string>
   <string name="enter_contact">Kişi Girin</string>
@@ -239,11 +231,8 @@
   <string name="disable_notifications">Bildirimleri kapat</string>
   <string name="enable">Etkinleştir</string>
   <string name="enter_password">Parolayı gir</string>
-  <string name="missing_presence_subscription">Durum bildirimi aboneliği eksik.</string>
   <string name="request_presence_updates">Lütfen öncelikle kişiden çevrim içi durum güncellemelerini isteyin.\n\n<small>Bu bilgi kişinin kullandığı istemcinin belirlenmesinde kullanılacaktır.</small></string>
   <string name="request_now">Şimdi iste</string>
-  <string name="delete_fingerprint">Parmak izini sil</string>
-  <string name="sure_delete_fingerprint">Bu parmak izini silmek istediğinizden emin misiniz?</string>
   <string name="ignore">Yok say</string>
   <string name="without_mutual_presence_updates"><b>Uyarı:</b> Karşılıklı çevrim içi durum bildirimi güncellemeleri olmaksızın bunu göndermeniz beklenmedik sorunlara neden olabilir.\n\n\n\n<small>Çevrim içi durum bildirimi aboneliklerinizi denetlemek için kişi bilgilerine gidin.</small></string>
   <string name="pref_security_settings">Güvenlik</string>
@@ -263,7 +252,6 @@
   <string name="pref_use_indicate_received_summary">Alınan iletiler, eğer destekleniyorsa, yeşil bir tikle işaretlenecektir.</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Gönder butonunu kişinin durumuna göre renklendir</string>
   <string name="pref_expert_options_other">Diğer</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="using_account">%s hesabını kullanarak</string>
   <string name="checking_x">HTTP sunucusundaki %s denetleniyor</string>
@@ -280,19 +268,8 @@
   <string name="show_qr_code">2B Barkod Göster</string>
   <string name="show_block_list">Engellenenler listesini göster</string>
   <string name="account_details">Hesap bilgileri</string>
-  <string name="verify_otr">OTR doğrula</string>
-  <string name="remote_fingerprint">Uzak parmak izi</string>
-  <string name="shared_secret_hint">İpucu ya da Soru</string>
-  <string name="shared_secret_secret">Paylaşılan Gizli Bilgi</string>
   <string name="confirm">Doğrula</string>
-  <string name="in_progress">İşleniyor</string>
-  <string name="respond">Yanıt</string>
-  <string name="secrets_do_not_match">Gizli bilgiler eşleşmiyor</string>
   <string name="try_again">Yeniden deneyin</string>
-  <string name="finish">Bitti</string>
-  <string name="verified">Doğrulandı!</string>
-  <string name="smp_requested">Kişi SMP doğrulaması istedi</string>
-  <string name="no_otr_session_found">Geçerli bir OTR oturumu bulunamadı!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Ön planda çalışmaya devam etsin</string>
   <string name="pref_keep_foreground_service_summary">İşletim sisteminin bağlantınızı koparmasına engel olur</string>
@@ -312,31 +289,18 @@
   <string name="file_transmission_failed">dosya aktarma başarısız oldu</string>
   <string name="file_deleted">Dosya silindi</string>
   <string name="no_application_found_to_open_file">Dosyayı açacak bir uygulama bulunamadı</string>
-  <string name="could_not_verify_fingerprint">Parmak izi doğrulanamadı</string>
-  <string name="manually_verify">Bizzat doğrula</string>
-  <string name="are_you_sure_verify_fingerprint">Kişinizin OTR parmak izini doğrulamak istediğinize emin misiniz?</string>
-  <string name="pref_show_dynamic_tags">Canlı etiketleri göster</string>
   <string name="pref_show_dynamic_tags_summary">Kişilerin görünmeyen salt okunur etiketlerini göster</string>
   <string name="enable_notifications">Bildirimleri etkinleştir</string>
   <string name="account_image_description">Hesap avatarı</string>
-  <string name="copy_otr_clipboard_description">OTR parmak izini panoya kopyala</string>
   <string name="copy_omemo_clipboard_description">OMEMO parmak izini panoya kopyala</string>
   <string name="regenerate_omemo_key">OMEMO anahtarını yeniden oluştur</string>
   <string name="clear_other_devices">Aygıtları sil</string>
   <string name="clear_other_devices_desc">OMEMO bildirimindeki diğer aygıtların hepsini silmek istediğinizden emin misiniz? Aygıtlarınız yeniden bağlandıklarında kendilerini yeniden bildirecekler ama bu süre zarfındaki iletileri alamayabilirler.</string>
-  <string name="error_no_keys_to_trust">Bu kişi için kullanılabilecek bir anahtar bulunmuyor. Eğer anahtarlarını sildiyseniz, yeni anahtar oluşturmaları gerekiyor.</string>
   <string name="fetching_history_from_server">Sunucudan geçmiş alınıyor</string>
   <string name="no_more_history_on_server">Sunucuda başka geçmiş kalmadı</string>
   <string name="updating">Güncelleniyor…</string>
   <string name="password_changed">Parola değişti!</string>
   <string name="could_not_change_password">Parola değiştirilemedi</string>
-  <string name="otr_session_not_started">Şifreli bir konuşma başlatmak için ileti gönder</string>
-  <string name="ask_question">Soru sor</string>
-  <string name="smp_explain_question">Karşınızdaki kişiyle, ikinizden başka kimsenin bilmediği ortak bir sırrınız varsa (aranızdaki bir şaka ya da yalnızca en son buluştuğunuzda ne yediğiniz gibi) bunu birbirinizin parmak izlerini doğrulamak için kullanabilirsiniz. \n\n Karşınızdaki kişiye bir ipucu veya soru sorabilirsiniz. Yanıtın harf duyarlı olması gerekmektedir.</string>
-  <string name="smp_explain_answer">Kişi parmak izinizi onaylamak için yalnızca ikinizin bildiği bir şeyi sormak istiyor. Kişi sırrınız hakkında aşağıdaki ipucu veya soruyu gönderdi.</string>
-  <string name="shared_secret_hint_should_not_be_empty">İpucunuz boş kalamaz</string>
-  <string name="shared_secret_can_not_be_empty">Sırrınız boş kalamaz</string>
-  <string name="manual_verification_explanation">Aşağıdaki parmak izini, karşınızdaki kişinin parmak iziyle dikkatlice karşılaştırın. \n\nŞifreli eposta veya telefon gibi güvenilir bir iletişim kanalı üzerinden bilgi alışverişi yapabilirsiniz.</string>
   <string name="change_password">Parolayı değiştirin</string>
   <string name="current_password">Mevcut parola</string>
   <string name="new_password">Yeni parola</string>
@@ -374,7 +338,6 @@
   <string name="apk">Android uygulaması</string>
   <string name="vcard">Kişi</string>
   <string name="received_x_file">%s alındı</string>
-  <string name="disable_foreground_service">Ön planda çalışmasını devre dışı bırak</string>
   <string name="touch_to_open_conversations">Conversations’ı başlatmak için dokunun</string>
   <string name="avatar_has_been_published">Avatar yayımlandı!</string>
   <string name="sending_x_file">%s gönderiliyor</string>
@@ -467,14 +430,6 @@
   <string name="shared_text_with_x">%s ile paylaşılan metin</string>
   <string name="sync_with_contacts">Kişilerle senkronize et</string>
   <string name="sync_with_contacts_long">Conversations XMPP listenizi telefon rehberinizle eşleştirerek kişilerin tam adlarını ve avatarlarını göstermek istiyor.\n\nConversations telefon rehberinizi yalnızca okuyacak ve onları sunucunuza yüklemeden eşleştirecek.\n\nŞimdi telefon rehberinize erişilmesine izin vermeniz istenecek.</string>
-  <string name="certificate_information">Sertifika Bilgisi</string>
-  <string name="certificate_subject">Konu</string>
-  <string name="certificate_issuer">Veren</string>
-  <string name="certificate_cn">Ortak ad</string>
-  <string name="certificate_o">Organizasyon</string>
-  <string name="certificate_sha1">SHA-1</string>
-  <string name="certicate_info_not_available">(mevcut değil)</string>
-  <string name="certificate_not_found">Sertifika bulunamadı</string>
   <string name="notify_on_all_messages">Tüm iletilerde uyar</string>
   <string name="notify_never">Uyarılar devre dışı</string>
   <string name="notify_paused">Uyarılar geçici olarak durduruldu</string>
@@ -501,9 +456,7 @@
   <string name="create_account">Hesap Oluştur</string>
   <string name="use_own_provider">Kendi sağlayıcımı kullan</string>
   <string name="pick_your_username">Kullanıcı adınızı seçin</string>
-  <string name="change_presence">Durum Değiştir</string>
   <string name="status_message">Durum iletisi</string>
-  <string name="all_accounts_on_this_device">Bu aygıttaki tüm hesaplara uygula</string>
   <string name="presence_chat">Konuşmak için uygun</string>
   <string name="presence_online">Çevrim içi</string>
   <string name="presence_away">Uzakta</string>
@@ -511,10 +464,8 @@
   <string name="presence_dnd">Meşgul</string>
   <string name="secure_password_generated">Güvenli bir parola oluşturuldu</string>
   <string name="device_does_not_support_battery_op">Aygıtınız pil iyileştirmesini devre dışı bırakmayı desteklemiyor</string>
-  <string name="show_password">Parola göster</string>
   <string name="registration_please_wait">Hesap oluşturulamadı: Sonra yeniden deneyin</string>
   <string name="registration_password_too_weak">Kayıt Başarısız: Parola çok zayıf</string>
-  <string name="conference_subject">Konu</string>
   <string name="choose_participants">Katılımcıları seç</string>
   <string name="invite_again">Yeniden davet et</string>
   <string name="gp_short">Kısa</string>
@@ -544,9 +495,6 @@
   <string name="no_permission_to_access_x">%s e erişim hakkınız yok</string>
   <string name="remote_server_not_found">Uzak sunucu bulunamadı</string>
   <string name="unable_to_update_account">Hesap güncellenemiyor</string>
-  <string name="missing_presence_subscription_with_x">%s ile durum bildirimi aboneliği eksik.</string>
-  <string name="missing_keys_from_x">%s den eksik OMEMO anahtarları var.</string>
-  <string name="missing_omemo_keys">Eksik OMEMO anahtarları var.</string>
   <string name="report_jid_as_spammer">Bu kişiyi istenmeyen ileti gönderen olarak rapor et.</string>
   <string name="pref_delete_omemo_identities">OMEMO kimliğini sil</string>
   <string name="pref_delete_omemo_identities_summary">OMEMO anahtarını yeniden oluştur. Tüm kişilerinizin sizi yeniden doğrulaması gerekecek. Bunu yalnızca son çare olarak kullanın.</string>

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

@@ -75,7 +75,6 @@
   <string name="send_unencrypted_message">Відправити незашифроване повідомлення</string>
   <string name="send_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">Відправити повідомлення, зашифроване v\\OMEMO</string>
   <string name="send_pgp_message">Відправити повідомлення, зашифроване OpenPGP</string>
@@ -164,9 +163,7 @@
   <string name="attach_record_voice">Записати голос</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">Заблокувати Jabber ID</string>
-  <string name="account_settings_password">Пароль</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Підтвердіть пароль</string>
   <string name="password">Пароль</string>
   <string name="invalid_jid">Це не є дійсним Jabber ID</string>
   <string name="error_out_of_memory">Пам\'ять вичерпано. Завелике зображення.</string>
@@ -192,11 +189,7 @@
   <string name="last_seen_day">востаннє бачили 1 день тому</string>
   <string name="last_seen_days">востаннє бачили %d днів тому</string>
   <string name="install_openkeychain">Зашифроване повідомлення. Будь ласка, встановіть OpenKeychain, щоб розшифрувати.</string>
-  <string name="unknown_otr_fingerprint">Незнайомий відбиток OTR</string>
   <string name="openpgp_messages_found">Знайдено повідомлення, зашифроване OpenPGP</string>
-  <string name="your_fingerprint">Ваш відбиток</string>
-  <string name="otr_fingerprint">Відбиток OTR</string>
-  <string name="otr_fingerprint_selected_message">OTR-відбиток повідомлення</string>
   <string name="openpgp_key_id">Ідентифікатор ключа OpenPGP</string>
   <string name="omemo_fingerprint">Відбиток OMEMO</string>
   <string name="omemo_fingerprint_x509">Відбиток v\\OMEMO</string>
@@ -206,7 +199,6 @@
   <string name="trust_omemo_fingerprints">Довіряти відбиткам OMEMO</string>
   <string name="fetching_keys">Отримую ключі…</string>
   <string name="done">Зроблено</string>
-  <string name="verify">Перевірити</string>
   <string name="decrypt">Розшифрувати</string>
   <string name="search">Пошук</string>
   <string name="enter_contact">Увести контакт</string>
@@ -244,11 +236,8 @@
   <string name="disable_notifications">Відключити сповіщення</string>
   <string name="enable">Задіяти</string>
   <string name="enter_password">Уведіть пароль</string>
-  <string name="missing_presence_subscription">Немає підписки на присутність</string>
   <string name="request_presence_updates">Будь ласка, спершу надішліть запит на оновлення пристуності від Вашого контакта.\n\n<small>Оновлення буде використано, щоб визначити, яку програму-клієнт (які програми-клієнти) він використовує.</small></string>
   <string name="request_now">Надіслати запит зараз</string>
-  <string name="delete_fingerprint">Видалити відбиток</string>
-  <string name="sure_delete_fingerprint">Впевнені, що бажаєте видалити цей відбиток?</string>
   <string name="ignore">Ігнорувати</string>
   <string name="without_mutual_presence_updates"><b>Попередження:</b> Відправлення цього без взаємної підписки на оновлення пристуності може спричинити неочікувані проблеми.\n\n<small>Зазирність до деталей контакту та перевірте Вашу підписку на присутність.</small></string>
   <string name="pref_security_settings">Безпека</string>
@@ -268,7 +257,6 @@
   <string name="pref_use_indicate_received_summary">Отримані повідомлення будуть позначені зеленою галочкою, якщо ця функція підтримується</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Змінювати колір кнопки відправлення на позначення статусу контакта</string>
   <string name="pref_expert_options_other">Інше</string>
-  <string name="toast_message_otr_fingerprint">Відбиток OTR скопійовано до комірки обміну!</string>
   <string name="toast_message_omemo_fingerprint">Відбиток OMEMO скопійовано до комірки обміну!</string>
   <string name="using_account">використовується обліковий запис %s</string>
   <string name="checking_x">Перевіряю %s на хості HTTP</string>
@@ -285,19 +273,8 @@
   <string name="show_qr_code">Показати QR-код</string>
   <string name="show_block_list">Показати список блокування</string>
   <string name="account_details">Деталі облікового запису</string>
-  <string name="verify_otr">Перевірити OTR</string>
-  <string name="remote_fingerprint">Віддалені відбитки</string>
-  <string name="shared_secret_hint">Підказка або запитання</string>
-  <string name="shared_secret_secret">Спільний секрет</string>
   <string name="confirm">Підтвердити</string>
-  <string name="in_progress">У процесі</string>
-  <string name="respond">Відповісти</string>
-  <string name="secrets_do_not_match">Секрети не збігаються</string>
   <string name="try_again">Спробуйте ще</string>
-  <string name="finish">Завершити</string>
-  <string name="verified">Перевірено!</string>
-  <string name="smp_requested">Контакт запитує верифікацію за протоколом соціалістичного мільйонера</string>
-  <string name="no_otr_session_found">Не знайдено дійсної OTR сесії!</string>
   <string name="conversations_foreground_service">Розмови</string>
   <string name="pref_keep_foreground_service">Підтримувати сервіс на першому плані</string>
   <string name="pref_keep_foreground_service_summary">Не дає операційній системі припиняти Ваш зв\'язок</string>
@@ -317,32 +294,19 @@
   <string name="file_transmission_failed">передача файла не вдалася</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>
-  <string name="are_you_sure_verify_fingerprint">Ви впевнені, що хочете підтвердити відбиток OTR вашого контакту?</string>
-  <string name="pref_show_dynamic_tags">Показати динамічні мітки</string>
   <string name="pref_show_dynamic_tags_summary">Показувати мітки \"лише для читання\" під контактами</string>
   <string name="enable_notifications">Увікнути сповіщення</string>
   <string name="account_image_description">Аватар облікового запису</string>
-  <string name="copy_otr_clipboard_description">Скопіювати OTR відбиток до комірки обміну</string>
   <string name="copy_omemo_clipboard_description">Скопіювати OMEMO відбиток до комірки обліку</string>
   <string name="regenerate_omemo_key">Згенерувати ключ OMEMO</string>
   <string name="clear_other_devices">Стерти пристрої</string>
   <string name="clear_other_devices_desc">Ви певні, що хочете стерти всі інші пристрої з OMEMO-оголошення? Наступного разу, коли Ваші пристрої приєднаються, вони знову оголосять про себе, але вони можуть не отримати повідомлення, які можуть бути надіслані тим часом. </string>
   <string name="error_no_keys_to_trust_presence">Немає ключів для цього контакту.\nПеревірте, що ви взаємно підписані на присутність.</string>
-  <string name="error_no_keys_to_trust">Немає ключів, які би можна було використати для цього контакта. Якщо ви очистили які-небудь з їх ключів, їм потрібно згенерувати нові.</string>
   <string name="fetching_history_from_server">Отримую історію з сервера</string>
   <string name="no_more_history_on_server">Більше немає історії на сервері</string>
   <string name="updating">Оновлюю…</string>
   <string name="password_changed">Пароль змінено!</string>
   <string name="could_not_change_password">Не зміг змінити пароль</string>
-  <string name="otr_session_not_started">Відправте повідомлення, щоб розпочати зашифрований чат</string>
-  <string name="ask_question">Задати запитання</string>
-  <string name="smp_explain_question">Якщо Ви та Ваш контакт маєте спільний секрет, який ніхто більше не знає (наприклад, приватний жарт або просто, що Ви мали на обід останнього разу, коли зустрічалися), Ви можете використати цей секрет, щоб перевірити відбиток одне одного.\n\nВи даєте підказку або запитання Вашому контакту, а він відповідає; регістр враховується.</string>
-  <string name="smp_explain_answer">Ваш контакт хоче перевірити Ваш відбиток, перевіривши Ваш спільний секрет. Ваш контакт надав наступну підказку або запитання щодо секрету. </string>
-  <string name="shared_secret_hint_should_not_be_empty">Ваша підказка не може бути порожньою</string>
-  <string name="shared_secret_can_not_be_empty">Ваш спільний секрет не може бути порожнім</string>
-  <string name="manual_verification_explanation">Обережно порівняльте відбиток, показаний нижче, з відбитком Вашого контакта.\nВи можете використати будь-яку форму комунікації, таку як зашифрований лист або телефонний дзвінок, щоб обмінятися відбитками.</string>
   <string name="change_password">Змінити пароль</string>
   <string name="current_password">Поточний пароль</string>
   <string name="new_password">Новий пароль</string>
@@ -380,7 +344,6 @@
   <string name="apk">програма Android</string>
   <string name="vcard">Контакт</string>
   <string name="received_x_file">Отримано %s</string>
-  <string name="disable_foreground_service">Відключити сервіс на передньому плані</string>
   <string name="touch_to_open_conversations">Торкніться, щоб відкрити Розмови</string>
   <string name="avatar_has_been_published">Аватар опубліковано!</string>
   <string name="sending_x_file">Відправка %s</string>
@@ -479,14 +442,6 @@
   <string name="shared_text_with_x">Поділився текстом з %s</string>
   <string name="sync_with_contacts">Синхронізувати контакти</string>
   <string name="sync_with_contacts_long">Програма хоче співставити Ваш список XMPP розмов з вашою книгою контактів, щоб показати повні імена та аватари контактів.\n\nПрограма лише прочитає Ваші контакти і співставить їх локально без завантаження їх до Вашого сервера.\n\nЗараз Вас попросять надати дозвіл для доступу до Ваших контактів.</string>
-  <string name="certificate_information">Інформація про сертифікат</string>
-  <string name="certificate_subject">Тема</string>
-  <string name="certificate_issuer">Видавник</string>
-  <string name="certificate_cn">Загальне ім\'я</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_only_when_highlighted">Повідомляти, лише якщо згадують</string>
   <string name="notify_never">Сповіщення вимкнено</string>
@@ -514,9 +469,7 @@
   <string name="create_account">Створити обліковий запис</string>
   <string name="use_own_provider">Використати мого власного провайдера</string>
   <string name="pick_your_username">Оберіть Ваше ім\'я користувача</string>
-  <string name="change_presence">Змінити присутність</string>
   <string name="status_message">Повідомлення статусу</string>
-  <string name="all_accounts_on_this_device">Задати для всіх облікових записі на цьому пристрої</string>
   <string name="presence_chat">Вільний для розмови</string>
   <string name="presence_online">У мережі</string>
   <string name="presence_away">Відійшов</string>
@@ -524,10 +477,8 @@
   <string name="presence_dnd">Зайняти</string>
   <string name="secure_password_generated">Згенеровано надійний пароль</string>
   <string name="device_does_not_support_battery_op">Ваш пристрій не підтримує відключення оптимізації батареї</string>
-  <string name="show_password">Показати пароль</string>
   <string name="registration_please_wait">Реєстрація не вдалася: Спробуйте ще раз пізніше</string>
   <string name="registration_password_too_weak">Реєстрація не відбулася: пароль занадто слабкий.</string>
-  <string name="conference_subject">Тема</string>
   <string name="choose_participants">Вибрати учасників</string>
   <string name="invite_again">Запросити знову</string>
   <string name="gp_short">Короткий</string>
@@ -557,9 +508,6 @@
   <string name="no_permission_to_access_x">Немає дозволу на доступ до %s</string>
   <string name="remote_server_not_found">Віддалений сервер не знайдено</string>
   <string name="unable_to_update_account">Неможливо оновити обліковий запис</string>
-  <string name="missing_presence_subscription_with_x">Немає підписки на присутність %s.</string>
-  <string name="missing_keys_from_x">Немає OMEMO ключів %s.</string>
-  <string name="missing_omemo_keys">Немає OMEMO ключів</string>
   <string name="report_jid_as_spammer">Відзвітувати, що цей Jabber ID розсилає спам.</string>
   <string name="pref_delete_omemo_identities">Видалити ідентифікаційні дані OMEMO</string>
   <string name="pref_delete_omemo_identities_summary">Стоврити наново ваші ключі OMEMO. Усі ваші контакти будуть змушені підтвердити вас знову. Використовуйте це, лише якщо немає іншого вибору.</string>

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

@@ -74,7 +74,6 @@
   <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>
   <string name="send_pgp_message">Gửi tin nhắn mã hoá OpenPGP</string>
@@ -158,9 +157,7 @@
   <string name="mgmt_account_are_you_sure">Bạn chắc chứ?</string>
   <string name="attach_record_voice">Ghi âm</string>
   <string name="account_settings_jabber_id">ID Jabber</string>
-  <string name="account_settings_password">Mật khẩu</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">Xác nhận mật khẩu</string>
   <string name="password">Mật khẩu</string>
   <string name="invalid_jid">ID Jabber này không hợp lệ</string>
   <string name="error_out_of_memory">Hết bộ nhớ. Ảnh quá lớn</string>
@@ -186,11 +183,7 @@
   <string name="last_seen_day">thấy lần cuối 1 ngày trước</string>
   <string name="last_seen_days">thấy lần cuối %d ngày trước</string>
   <string name="install_openkeychain">Tin nhắn được mã hoá. Xin cài đặt OpenKeychain để giải mã.</string>
-  <string name="unknown_otr_fingerprint">Dấu vân tay OTR lạ</string>
   <string name="openpgp_messages_found">Đã tìm thấy các tin nhắn mã hoá OpenPGP</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>
@@ -200,7 +193,6 @@
   <string name="trust_omemo_fingerprints">Tin tưởng các dấu vân tay OMEMO</string>
   <string name="fetching_keys">Đang nhận khoá...</string>
   <string name="done">Xong</string>
-  <string name="verify">Xác minh</string>
   <string name="decrypt">Giải mã</string>
   <string name="search">Tìm kiếm</string>
   <string name="enter_contact">Nhập liên hệ</string>
@@ -240,8 +232,6 @@
   <string name="enter_password">Nhập mật khẩu</string>
   <string name="request_presence_updates">Xin yêu cầu cập nhật hiện diện từ liên hệ của bạn trước.\n\n<small>Nó sẽ được dùng để xác định (các) liên hệ hiện đang sử dụng máy trạm nào.</small></string>
   <string name="request_now">Yêu cầu ngay</string>
-  <string name="delete_fingerprint">Xoá dấu vân tay</string>
-  <string name="sure_delete_fingerprint">Có chắc là bạn muốn xoá dấu vân tay này?</string>
   <string name="ignore">Bỏ qua</string>
   <string name="without_mutual_presence_updates"><b>Cảnh báo:</b> Gửi mà không có cập nhật hiện diện của nhau có thể gây ra vấn đề khó lường.\n\n<small>Vào chi tiết liên hệ để xác minh đăng ký hiện diện của bạn.</small></string>
   <string name="pref_expert_options_summary">Xin hãy cẩn trọng với chúng</string>
@@ -257,7 +247,6 @@
   <string name="pref_use_indicate_received_summary">Các tin nhắn đã nhận sẽ được đánh dấu kiểm màu xanh lá nếu được hỗ trợ</string>
   <string name="pref_use_send_button_to_indicate_status_summary">Tô màu nút gửi để biểu thị trạng thái của liên hệ</string>
   <string name="pref_expert_options_other">Khác</string>
-  <string name="toast_message_otr_fingerprint">Đã chép dấu vân tay OTR vào clipboard!</string>
   <string name="toast_message_omemo_fingerprint">Đã chép dấu vân tay OMEMO vào clipboard!</string>
   <string name="using_account">đang dùng tài khoản %s</string>
   <string name="checking_x">Đang kiểm tra %s trên máy chủ HTTTP</string>
@@ -270,19 +259,8 @@
   <string name="url_copied_to_clipboard">Đã chép URL vào clipboard</string>
   <string name="show_block_list">Quét danh sách chặn</string>
   <string name="account_details">Chi tiết tài khoản</string>
-  <string name="verify_otr">Xác minh OTR</string>
-  <string name="remote_fingerprint">Dấu vân tay từ xa</string>
-  <string name="shared_secret_hint">Gợi ý hoặc Câu hỏi</string>
-  <string name="shared_secret_secret">Bí mật đã chia sẻ</string>
   <string name="confirm">Xác nhận</string>
-  <string name="in_progress">Đang diễn ra</string>
-  <string name="respond">Hồi đáp</string>
-  <string name="secrets_do_not_match">Bí mật không trùng khớp</string>
   <string name="try_again">Thử lại</string>
-  <string name="finish">Kết thúc</string>
-  <string name="verified">Đã xác minh!</string>
-  <string name="smp_requested">Liên hệ đã yêu cầu xác minh SMP</string>
-  <string name="no_otr_session_found">Không tìm thấy phiên OTR hợp lệ nào!</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">Giữ dịch vụ luôn chạy</string>
   <string name="pref_keep_foreground_service_summary">Ngăn hệ điều hành ngắt kết nối của bạn</string>
@@ -299,30 +277,18 @@
   <string name="file_transmission_failed">chuyển tập tin đã thất bại</string>
   <string name="file_deleted">Đã xoá tập tin</string>
   <string name="no_application_found_to_open_file">Không tìm thấy ứng dụng nào để mở tập tin</string>
-  <string name="could_not_verify_fingerprint">Không thể xác minh dấu vân tay</string>
-  <string name="manually_verify">Xác minh thủ công</string>
-  <string name="pref_show_dynamic_tags">Hiện các nhãn động</string>
   <string name="pref_show_dynamic_tags_summary">Hiện nhãn chỉ đọc bên dưới các liên hệ</string>
   <string name="enable_notifications">Bật thông báo</string>
   <string name="account_image_description">Ảnh đại diện tài khoản</string>
-  <string name="copy_otr_clipboard_description">Sao chép dấu vân tay OTR vào clipboard</string>
   <string name="copy_omemo_clipboard_description">Sao chép dấu vân tay OMEMO vào clipboard</string>
   <string name="regenerate_omemo_key">Tạo lại khoá OMEMO</string>
   <string name="clear_other_devices">Xoá các thiết bị</string>
   <string name="clear_other_devices_desc">Có chắc là bạn muốn xoá toàn bộ các thiết bị khác khỏi thông báo OMEMO? Lần sau khi kết nối, các thiết bị sẽ tự thông báo lại nhưng có khả năng chúng sẽ không nhận được tin nhắn đã gửi trong khoảng thời gian đó.</string>
-  <string name="error_no_keys_to_trust">Không còn khoá nào sẵn có cho liên hệ này. Nếu bạn đã xoá bất kỳ khoá nào, họ phải tạo khoá mới.</string>
   <string name="fetching_history_from_server">Đang nhận lịch sử từ máy chủ</string>
   <string name="no_more_history_on_server">Không còn lịch sử nào trên máy chủ</string>
   <string name="updating">Đang cập nhật...</string>
   <string name="password_changed">Đã đổi mật khẩu!</string>
   <string name="could_not_change_password">Không thể đổi mật khẩu</string>
-  <string name="otr_session_not_started">Gửi tin nhắn để bắt đầu chat có mã hoá</string>
-  <string name="ask_question">Đưa câu hỏi</string>
-  <string name="smp_explain_question">Nếu bạn và liên hệ có một bí mật chung mà không ai khác biết (như là một câu nói đùa hoặc chỉ đơn giản là bữa trưa trong lần gặp gần đây nhất), bạn có thể dùng bí mật đó để xác minh dấu vân tay của nhau.\n\nBạn đưa ra gợi ý hoặc câu hỏi cho liên hệ và họ sẽ phải nhập câu trả lời có tính cả viết hoa viết thường.</string>
-  <string name="smp_explain_answer">Liên hệ muốn xác minh dấu vân tay của bạn bằng một bí mật đã chia sẻ. Liên hệ đã cung cấp gợi ý hoặc câu hỏi cho bí mật sau đây.</string>
-  <string name="shared_secret_hint_should_not_be_empty">Không được để trống gợi ý</string>
-  <string name="shared_secret_can_not_be_empty">Không được để trống bí mật đã chia sẻ</string>
-  <string name="manual_verification_explanation">So sánh cẩn thận dấu vân tay dưới đây với dấu của liên hệ.\nBạn có thể dùng bất kỳ phương tiện giao tiếp đáng tin cậy nào như email được mã hoá hoặc điện thoại để trao đổi vân tay.</string>
   <string name="change_password">Đổi mật khẩu</string>
   <string name="current_password">Mật khẩu hiện tại</string>
   <string name="new_password">Mật khẩu mới</string>
@@ -358,7 +324,6 @@
   <string name="apk">Ứng dụng Android</string>
   <string name="vcard">Liên hệ</string>
   <string name="received_x_file">Đã nhận %s</string>
-  <string name="disable_foreground_service">Tắt dịch vụ luôn chạy</string>
   <string name="touch_to_open_conversations">Chạm để mở Conversations</string>
   <string name="avatar_has_been_published">Đã đăng tải ảnh đại diện!</string>
   <string name="sending_x_file">Đang gửi %s</string>
@@ -429,13 +394,6 @@
   <string name="shared_image_with_x">Chia sẻ hình với %s</string>
   <string name="sync_with_contacts">Đồng bộ với danh bạ</string>
   <string name="sync_with_contacts_long">Conversations muốn so sánh danh sách bạn bè XMPP với danh bạ của bạn để hiện tên đầy đủ và ảnh đại diện của họ.\n\nConversations sẽ chỉ đọc danh bạ và so sánh trên thiết bị chứ không tải lên máy chủ.\n\nBây giờ, bạn sẽ được hỏi trao quyền truy cập danh bạ.</string>
-  <string name="certificate_information">Thông tin chứng nhận</string>
-  <string name="certificate_subject">Tiêu đề</string>
-  <string name="certificate_issuer">Nhà phát hành</string>
-  <string name="certificate_cn">Tên thường</string>
-  <string name="certificate_o">Tổ chức</string>
-  <string name="certicate_info_not_available">(Không sẵn sàng)</string>
-  <string name="certificate_not_found">Không thấy chứng nhận nào</string>
   <string name="notify_on_all_messages">Thông báo tất cả tin nhắn</string>
   <string name="notify_never">Đã tắt thông báo</string>
   <string name="notify_paused">Đã dừng thông báo</string>

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

@@ -37,7 +37,7 @@
   <string name="participant">参与者</string>
   <string name="visitor">访客</string>
   <string name="remove_contact_text">将 %s 从列表中移除? 与该联系人的会话消息不会清除.</string>
-  <string name="block_contact_text">你想屏蔽 %s 吗， ta不能发送信息给你？</string>
+  <string name="block_contact_text">您想阻止%s向您发送消息吗？</string>
   <string name="unblock_contact_text">你想解除对 %s 的屏蔽吗，他们将可以发送信息给你？</string>
   <string name="block_domain_text">屏蔽 %s 中的所有联系人？</string>
   <string name="unblock_domain_text">解除对 %s 中所有联系人的屏蔽？</string>
@@ -47,8 +47,9 @@
   <string name="change_password_on_server">在服务器上改变密码</string>
   <string name="share_with">分享</string>
   <string name="start_conversation">开始会话</string>
-  <string name="invite_contact">邀请好友</string>
+  <string name="invite_contact">邀请联系人</string>
   <string name="contacts">联系人</string>
+  <string name="contact">联系人</string>
   <string name="cancel">取消</string>
   <string name="set">设置</string>
   <string name="add">添加</string>
@@ -58,7 +59,7 @@
   <string name="unblock">解除屏蔽</string>
   <string name="save">保存</string>
   <string name="ok">完成</string>
-  <string name="crash_report_title">Conversations 崩溃</string>
+  <string name="crash_report_title">Conversations已崩溃</string>
   <string name="crash_report_message">发送堆栈跟踪信息到 Conversations 的开发人员\n<b>警告:</b> 该操作将用您的 XMPP 账户发送堆栈跟踪给开发人员。</string>
   <string name="send_now">现在发送</string>
   <string name="send_never">不再询问</string>
@@ -81,7 +82,6 @@
   <string name="send_unencrypted_message">发送未加密的信息</string>
   <string name="send_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">发送 v\\OMEMO 加密信息</string>
   <string name="send_pgp_message">发送 OpenPGP 加密信息</string>
@@ -170,9 +170,7 @@
   <string name="attach_record_voice">录音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">屏蔽 Jabber ID</string>
-  <string name="account_settings_password">密码</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">确认密码</string>
   <string name="password">密码</string>
   <string name="invalid_jid">该 Jabber ID 无效</string>
   <string name="error_out_of_memory">空间不足。图片过大</string>
@@ -198,11 +196,7 @@
   <string name="last_seen_day">1 天前查看过</string>
   <string name="last_seen_days">%d 天前查看过</string>
   <string name="install_openkeychain">加密信息. 请安装 OpenKeychain 以解密。</string>
-  <string name="unknown_otr_fingerprint">未知 OTR 指纹</string>
   <string name="openpgp_messages_found">发现 OpenPGP 加密信息</string>
-  <string name="your_fingerprint">你的指纹</string>
-  <string name="otr_fingerprint">OTR 指纹</string>
-  <string name="otr_fingerprint_selected_message">消息的 OTR 指纹</string>
   <string name="openpgp_key_id">OpenPGP 密钥 ID</string>
   <string name="omemo_fingerprint">OMEMO 指纹</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO 指纹</string>
@@ -212,11 +206,9 @@
   <string name="trust_omemo_fingerprints">信任的 OMEMO 指纹</string>
   <string name="fetching_keys">获取密钥中</string>
   <string name="done">完成</string>
-  <string name="verify">验证</string>
   <string name="decrypt">解密</string>
   <string name="conferences">群聊</string>
   <string name="search">查找</string>
-  <string name="create_contact">新建联系人</string>
   <string name="dialog_title_create_contact">新建联系人</string>
   <string name="enter_contact">输入联系人</string>
   <string name="join_conference">加入群聊</string>
@@ -263,11 +255,8 @@
   <string name="enable">打开通知</string>
   <string name="conference_requires_password">需要密码才能进入该群聊</string>
   <string name="enter_password">输入密码</string>
-  <string name="missing_presence_subscription">缺少在线订阅</string>
   <string name="request_presence_updates">请先发送更新在线联系人的请求。\n\n<small>以判断您的联系人所用的客户端类型。</small></string>
   <string name="request_now">现在发送请求</string>
-  <string name="delete_fingerprint">删除指纹</string>
-  <string name="sure_delete_fingerprint">是否确定删除该指纹?</string>
   <string name="ignore">忽略</string>
   <string name="without_mutual_presence_updates"><b>警告:</b>在没有相互更新在线联系人的情况下发送将会出现未知问题。\n\n<small>前往联系人详情以验证您订阅的在线联系人。</small></string>
   <string name="pref_security_settings">安全</string>
@@ -291,7 +280,6 @@
   <string name="pref_conference_name_summary">显示群聊主题</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>
   <string name="conference_members_only">这个群组只允许群组成员聊天</string>
@@ -313,19 +301,8 @@
   <string name="show_qr_code">显示二维码</string>
   <string name="show_block_list">显示屏蔽列表</string>
   <string name="account_details">账户详情</string>
-  <string name="verify_otr">验证 OTR</string>
-  <string name="remote_fingerprint">远程指纹</string>
-  <string name="shared_secret_hint">提示或问题</string>
-  <string name="shared_secret_secret">共享的密钥</string>
   <string name="confirm">确认</string>
-  <string name="in_progress">处理中</string>
-  <string name="respond">回应</string>
-  <string name="secrets_do_not_match">秘密不符</string>
   <string name="try_again">再试一遍</string>
-  <string name="finish">完成</string>
-  <string name="verified">验证通过！</string>
-  <string name="smp_requested">联系人请求 SMP 验证</string>
-  <string name="no_otr_session_found">没有找到 OTR 会话</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">保持前台服务</string>
   <string name="pref_keep_foreground_service_summary">防止操作系统中断你的连接</string>
@@ -346,36 +323,24 @@
   <string name="file_deleted">文件已经删除</string>
   <string name="no_application_found_to_open_file">没有可以打开此文件的应用</string>
   <string name="no_application_found_to_open_link">没有可以打开此链接的应用</string>
-  <string name="could_not_verify_fingerprint">不能验证指纹</string>
-  <string name="manually_verify">手工验证</string>
-  <string name="are_you_sure_verify_fingerprint">是否确定要验证你的联系人的 OTR 指纹？</string>
-  <string name="pref_show_dynamic_tags">显示动态标签</string>
+  <string name="pref_show_dynamic_tags">动态标签</string>
   <string name="pref_show_dynamic_tags_summary">在联系人下方显示只读标签</string>
   <string name="enable_notifications">启用通知</string>
   <string name="no_conference_server_found">未找到该群聊的服务器</string>
   <string name="conference_creation_failed">群聊创建失败</string>
   <string name="account_image_description">账户头像</string>
-  <string name="copy_otr_clipboard_description">拷贝 OTR 指纹到剪贴板</string>
   <string name="copy_omemo_clipboard_description">拷贝 OMEMO 指纹到剪贴板</string>
   <string name="regenerate_omemo_key">重新生成 OMEMO 密钥</string>
   <string name="clear_other_devices">清除设备</string>
   <string name="clear_other_devices_desc">你想清除所有其他设备的 OMEMO 通告？下次你的设备连接，将会重新收到通告，但也许将不会收到当时你发送的消息。</string>
   <string name="error_no_keys_to_trust_server_error">没有找到可以的密钥。\n服务器似乎发生错误，无法获取新的密钥。 </string>
   <string name="error_no_keys_to_trust_presence">没有可以用于这个账户的密钥。请确保你有相互的在线状态的订阅。</string>
-  <string name="error_no_keys_to_trust">此联系人没有可用的密钥。如果你曾经清除过他们的密钥，那么需要他们生成新的密钥。</string>
   <string name="error_trustkeys_title">出错了</string>
   <string name="fetching_history_from_server">从服务器获取历史记录</string>
   <string name="no_more_history_on_server">服务器上没有更多历史记录</string>
   <string name="updating">更新中…</string>
   <string name="password_changed">密码已修改！</string>
   <string name="could_not_change_password">不能修改密码</string>
-  <string name="otr_session_not_started">发送消息来开始加密聊天</string>
-  <string name="ask_question">提出问题</string>
-  <string name="smp_explain_question">如果你和你的联系人有一个共知的秘密(比如一个内部笑话或者仅仅只是上次见面时吃的午餐) 你可以使用这个秘密来验证彼此的指纹。\n\n你的联系人将以大小写敏感的方式给出答案，你可以给出提示或问题。</string>
-  <string name="smp_explain_answer">你的联系人可以通过一个你们共知的秘密来验证指纹。你的联系人给出了如下的提示或问题。</string>
-  <string name="shared_secret_hint_should_not_be_empty">你的提示不能为空</string>
-  <string name="shared_secret_can_not_be_empty">你共知的秘密不能为空</string>
-  <string name="manual_verification_explanation">请仔细核对下面显示出来的你的联系人的指纹。\n你可以使用任何可信赖的联系方式，比如加密邮件或电话，来交换这些指纹信息。</string>
   <string name="change_password">修改密码</string>
   <string name="current_password">当前密码</string>
   <string name="new_password">新密码</string>
@@ -424,7 +389,6 @@
   <string name="apk">Android App</string>
   <string name="vcard">联系人</string>
   <string name="received_x_file">已经收到 %s</string>
-  <string name="disable_foreground_service">禁用前台服务</string>
   <string name="touch_to_open_conversations">轻触打开 Conversations</string>
   <string name="avatar_has_been_published">头像已经发布！</string>
   <string name="sending_x_file">发送中 %s</string>
@@ -441,7 +405,7 @@
   <string name="no_application_found_to_display_location">无法找到显示位置的应用</string>
   <string name="location">位置</string>
   <string name="received_location">位置已收到</string>
-  <string name="title_undo_swipe_out_conversation">Conversation 已关闭</string>
+  <string name="title_undo_swipe_out_conversation">会话已关闭</string>
   <string name="title_undo_swipe_out_muc">离开群聊</string>
   <string name="pref_dont_trust_system_cas_title">不相信系统 CA</string>
   <string name="pref_dont_trust_system_cas_summary">所有证书必须人工通过</string>
@@ -457,11 +421,11 @@
   <plurals name="select_contact">
     <item quantity="other">选择 %d 个联系人</item>
   </plurals>
-  <string name="pref_quick_action_summary">以快速动作替代发送按钮</string>
-  <string name="pref_quick_action">快速动作</string>
+  <string name="pref_quick_action_summary">以快捷操作替代发送按钮</string>
+  <string name="pref_quick_action">快捷操作</string>
   <string name="none">无</string>
   <string name="recently_used">最近常用</string>
-  <string name="choose_quick_action">选择快速动作</string>
+  <string name="choose_quick_action">选择快捷操作</string>
   <string name="search_for_contacts_or_groups">搜索联系人或群组</string>
   <string name="send_private_message">发送私密消息</string>
   <string name="user_has_left_conference">%1$s 离开了群聊！</string>
@@ -522,14 +486,6 @@
   <string name="no_camera_permission">Conversations 需要摄像头权限</string>
   <string name="sync_with_contacts">同步联系人</string>
   <string name="sync_with_contacts_long">Conversations 会匹配你的 XMPP 花名册与你的联系人，以显示他们的全名和头像。\n\nConversations 只会读取你的联系人并在本地匹配，不会上传到你的服务器。\n\n现在将要询问你是否给予访问你联系人的权限。</string>
-  <string name="certificate_information">证书详情</string>
-  <string name="certificate_subject">主题</string>
-  <string name="certificate_issuer">发行人</string>
-  <string name="certificate_cn">通用名称</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_only_when_highlighted">只在被提到时通知</string>
   <string name="notify_never">禁用通知</string>
@@ -563,9 +519,7 @@
   <string name="pick_your_username">输入您的用户名</string>
   <string name="pref_manually_change_presence">手动更改状态</string>
   <string name="pref_manually_change_presence_summary">编辑状态信息时，您的状态</string>
-  <string name="change_presence">变更状态</string>
   <string name="status_message">状态信息</string>
-  <string name="all_accounts_on_this_device">为本设备上的所有帐户设置</string>
   <string name="presence_chat">免费聊天室</string>
   <string name="presence_online">在线</string>
   <string name="presence_away">离开</string>
@@ -573,13 +527,9 @@
   <string name="presence_dnd">忙碌</string>
   <string name="secure_password_generated">安全密码已生成</string>
   <string name="device_does_not_support_battery_op">该设备不支持禁用电池优化</string>
-  <string name="show_password">显示密码</string>
   <string name="registration_please_wait">注册失败：请稍后重试</string>
   <string name="registration_password_too_weak">注册失败：密码太弱</string>
-  <string name="create_conference">创建群聊</string>
   <string name="dialog_title_create_conference">创建群聊</string>
-  <string name="join_or_create_conference">加入或者创建群聊</string>
-  <string name="conference_subject">主题</string>
   <string name="choose_participants">选择成员</string>
   <string name="creating_conference">正在创建群聊…</string>
   <string name="invite_again">重新邀请</string>
@@ -610,11 +560,6 @@
   <string name="no_permission_to_access_x">没有访问 %s 的许可</string>
   <string name="remote_server_not_found">找不到远程服务器</string>
   <string name="unable_to_update_account">无法更新账户</string>
-  <string name="missing_presence_subscription_with_x">缺少与 %s 的在线订阅。</string>
-  <string name="missing_keys_from_x">缺少来自 %s 的 OMEMO 密钥。</string>
-  <string name="missing_omemo_keys">缺少 OMEMO 密钥</string>
-  <string name="wrong_conference_configuration">这不是一个私密的非匿名的群组。</string>
-  <string name="this_conference_has_no_members">这个群组没有成员。</string>
   <string name="report_jid_as_spammer">报告这个 JID 发送不想要的消息。</string>
   <string name="pref_delete_omemo_identities">删除 OMEMO 身份</string>
   <string name="pref_delete_omemo_identities_summary">重新生成你的 OMEMO 密钥。你的所有联系人不得不对你进行再认证。请将此作为最后的办法。</string>
@@ -707,12 +652,10 @@
   <string name="huawei_protected_apps_summary">为了在屏幕关闭时也可收到消息提醒，您需要将 Conversations 加入受保护的应用列表。</string>
   <string name="mtm_accept_cert">接受未知的证书？</string>
   <string name="mtm_trust_anchor">服务器证书未经已知证书机构签发。</string>
-  <string name="mtm_cert_expired">服务器证书已失效。</string>
   <string name="mtm_accept_servername">接受不匹配的服务器名称？</string>
   <string name="mtm_hostname_mismatch">由于 “%s”，服务器无法验证。证书仅对此有效：</string>
   <string name="mtm_connect_anyway">您仍希望连接吗？</string>
   <string name="mtm_cert_details">证书详情:</string>
-  <string name="mtm_notification">证书验证</string>
   <string name="once">仅一次</string>
   <string name="qr_code_scanner_needs_access_to_camera">二维码扫描器需要摄像头权限</string>
   <string name="pref_scroll_to_bottom">滚动到底部</string>
@@ -726,4 +669,18 @@
   <string name="error_trustkey_hint_mutual">提示：某些情况下，可以将对方加入联系人列表，以解决此问题。</string>
   <string name="disable_encryption_message">确认要禁用此会话的 OMEMO 加密吗？\n这会允许您的服务器管理员阅读你们的消息，但这可能是和使用过时客户端的人会话的唯一方式。</string>
   <string name="disable_now">现在禁用</string>
+  <string name="draft">草案：</string>
+  <string name="pref_omemo_setting">OMEMO加密</string>
+  <string name="pref_omemo_setting_summary_always">OMEMO将始终用于一对一和私人群组聊天。</string>
+  <string name="pref_omemo_setting_summary_default_on">OMEMO将默认用于新对话。</string>
+  <string name="pref_omemo_setting_summary_default_off">OMEMO将明确地被用于新对话。</string>
+  <string name="create_shortcut">创建快捷方式</string>
+  <string name="pref_font_size">字体大小</string>
+  <string name="pref_font_size_summary">应用内使用的相对字体大小。</string>
+  <string name="default_on">默认开启</string>
+  <string name="default_off">默认关闭</string>
+  <string name="small">小</string>
+  <string name="medium">中</string>
+  <string name="large">大</string>
+  <string name="not_encrypted_for_this_device">该设备的消息未加密。</string>
 </resources>

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

@@ -75,7 +75,6 @@
   <string name="send_unencrypted_message">發送未加密的資訊</string>
   <string name="send_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">發送 v\\OMEMO 加密資訊</string>
   <string name="send_pgp_message">發送 OpenPGP 加密資訊</string>
@@ -163,9 +162,7 @@
   <string name="attach_record_voice">錄音</string>
   <string name="account_settings_jabber_id">Jabber ID</string>
   <string name="block_jabber_id">封鎖 Jabber 識別碼</string>
-  <string name="account_settings_password">密碼</string>
   <string name="account_settings_example_jabber_id">username@example.com</string>
-  <string name="account_settings_confirm_password">確認密碼</string>
   <string name="password">密碼</string>
   <string name="invalid_jid">該 Jabber ID 無效</string>
   <string name="error_out_of_memory">空間不足。圖片過大</string>
@@ -191,11 +188,7 @@
   <string name="last_seen_day">1 天前查看過</string>
   <string name="last_seen_days">%d 天前查看過</string>
   <string name="install_openkeychain">加密信息. 請安裝 OpenKeychain 以解密。</string>
-  <string name="unknown_otr_fingerprint">未知 OTR 指紋</string>
   <string name="openpgp_messages_found">發現 OpenPGP 加密資訊</string>
-  <string name="your_fingerprint">你的指紋</string>
-  <string name="otr_fingerprint">OTR 指紋</string>
-  <string name="otr_fingerprint_selected_message">消息的 OTR 指紋</string>
   <string name="openpgp_key_id">OpenPGP 金鑰 ID</string>
   <string name="omemo_fingerprint">OMEMO 指紋</string>
   <string name="omemo_fingerprint_x509">v\\OMEMO 指紋</string>
@@ -205,7 +198,6 @@
   <string name="trust_omemo_fingerprints">信任的 OMEMO 指紋</string>
   <string name="fetching_keys">獲取金鑰中</string>
   <string name="done">完成</string>
-  <string name="verify">驗證</string>
   <string name="decrypt">解密</string>
   <string name="search">查找</string>
   <string name="enter_contact">輸入連絡人</string>
@@ -243,11 +235,8 @@
   <string name="disable_notifications">關閉通知</string>
   <string name="enable">打開通知</string>
   <string name="enter_password">輸入密碼</string>
-  <string name="missing_presence_subscription">缺少線上訂閱</string>
   <string name="request_presence_updates">請先發送更新線上連絡人的請求。\n\n<small>以判斷您的連絡人所用的用戶端類型。</small></string>
   <string name="request_now">現在發送請求</string>
-  <string name="delete_fingerprint">刪除指紋</string>
-  <string name="sure_delete_fingerprint">是否確定刪除該指紋?</string>
   <string name="ignore">忽略</string>
   <string name="without_mutual_presence_updates"><b>警告:</b>在沒有相互更新線上連絡人的情況下發送將會出現未知問題。\n\n<small>前往連絡人詳情以驗證您訂閱的線上連絡人。</small></string>
   <string name="pref_security_settings">安全</string>
@@ -267,7 +256,6 @@
   <string name="pref_use_indicate_received_summary">如果支援消息將會以綠色對勾標識</string>
   <string name="pref_use_send_button_to_indicate_status_summary">發送按鈕採用其他顏色以示發送狀態的區別</string>
   <string name="pref_expert_options_other">其他</string>
-  <string name="toast_message_otr_fingerprint">OTR 指紋已拷貝到剪貼板！</string>
   <string name="toast_message_omemo_fingerprint">OMEMO 指紋已拷貝到剪貼板！</string>
   <string name="using_account">用帳戶  %s</string>
   <string name="checking_x">正在 HTTP 伺服器中檢查 %s</string>
@@ -284,19 +272,8 @@
   <string name="show_qr_code">顯示二維條碼</string>
   <string name="show_block_list">顯示封鎖清單</string>
   <string name="account_details">帳戶詳情</string>
-  <string name="verify_otr">驗證 OTR</string>
-  <string name="remote_fingerprint">遠程指紋</string>
-  <string name="shared_secret_hint">提示或問題</string>
-  <string name="shared_secret_secret">共知的秘密</string>
   <string name="confirm">確認</string>
-  <string name="in_progress">處理中</string>
-  <string name="respond">回應</string>
-  <string name="secrets_do_not_match">秘密不符</string>
   <string name="try_again">再試一遍</string>
-  <string name="finish">完成</string>
-  <string name="verified">驗證通過！</string>
-  <string name="smp_requested">連絡人請求 SMP 驗證</string>
-  <string name="no_otr_session_found">找不到有效的 OTR 通訊對話！</string>
   <string name="conversations_foreground_service">Conversations</string>
   <string name="pref_keep_foreground_service">保持前臺服務</string>
   <string name="pref_keep_foreground_service_summary">防止作業系統中斷你的連接</string>
@@ -316,31 +293,18 @@
   <string name="file_transmission_failed">檔案傳送失敗</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>
-  <string name="are_you_sure_verify_fingerprint">確定想要驗證聯絡人的 OTR 指紋嗎？</string>
-  <string name="pref_show_dynamic_tags">顯示動態標籤</string>
   <string name="pref_show_dynamic_tags_summary">在連絡人下方顯示唯讀標籤</string>
   <string name="enable_notifications">啟用通知</string>
   <string name="account_image_description">帳戶頭像</string>
-  <string name="copy_otr_clipboard_description">拷貝 OTR 指紋到剪貼板</string>
   <string name="copy_omemo_clipboard_description">拷貝 OMEMO 指紋到剪貼板</string>
   <string name="regenerate_omemo_key">重新生成 OMEMO 金鑰</string>
   <string name="clear_other_devices">清除設備</string>
   <string name="clear_other_devices_desc">你想清除所有其他設備的 OMEMO 通告？下次你的設備連接，將會重新收到通告，但也許將不會收到當時你發送的消息。</string>
-  <string name="error_no_keys_to_trust">此連絡人沒有可用的金鑰。如果你曾經清除過他們的金鑰，那麼需要他們生成新的金鑰。</string>
   <string name="fetching_history_from_server">從伺服器獲取歷史記錄</string>
   <string name="no_more_history_on_server">伺服器上沒有更多歷史記錄</string>
   <string name="updating">更新中…</string>
   <string name="password_changed">密碼已修改！</string>
   <string name="could_not_change_password">不能修改密碼</string>
-  <string name="otr_session_not_started">發送消息來開始加密聊天</string>
-  <string name="ask_question">提出問題</string>
-  <string name="smp_explain_question">如果你和你的連絡人有一個共知的秘密(比如一個內部笑話或者僅僅只是上次見面時吃的午餐) 你可以使用這個秘密來驗證彼此的指紋。\n\n你的連絡人將以大小寫敏感的方式給出答案，你可以給出提示或問題。</string>
-  <string name="smp_explain_answer">你的連絡人可以通過一個你們共知的秘密來驗證指紋。你的連絡人給出了如下的提示或問題。</string>
-  <string name="shared_secret_hint_should_not_be_empty">你的提示不能為空</string>
-  <string name="shared_secret_can_not_be_empty">你共知的秘密不能為空</string>
-  <string name="manual_verification_explanation">請仔細核對下面顯示出來的你的連絡人的指紋。\n你可以使用任何可信賴的聯繫方式，比如加密郵件或電話，來交換這些指紋資訊。</string>
   <string name="change_password">修改密碼</string>
   <string name="current_password">當前密碼</string>
   <string name="new_password">新密碼</string>
@@ -378,7 +342,6 @@
   <string name="apk">Android App</string>
   <string name="vcard">連絡人</string>
   <string name="received_x_file">已經收到 %s</string>
-  <string name="disable_foreground_service">禁用前臺服務</string>
   <string name="touch_to_open_conversations">輕觸打開 Conversations</string>
   <string name="avatar_has_been_published">頭像已經發佈！</string>
   <string name="sending_x_file">發送中 %s</string>
@@ -468,14 +431,6 @@
   <string name="shared_text_with_x">跟 %s 分享的文字資料</string>
   <string name="sync_with_contacts">與連絡人同步</string>
   <string name="sync_with_contacts_long">Conversations 會匹配你的 XMPP 花名冊與你的連絡人，以顯示他們的全名和頭像。\n\nConversations 只會讀取你的連絡人並在本地匹配，不會上傳到你的伺服器。\n\n現在將要詢問你是否給予訪問你連絡人的許可權。</string>
-  <string name="certificate_information">證書詳情</string>
-  <string name="certificate_subject">主題</string>
-  <string name="certificate_issuer">發行人</string>
-  <string name="certificate_cn">通用名稱</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="notify_paused">暫停通知</string>
@@ -504,9 +459,7 @@
   <string name="create_account">創建帳戶</string>
   <string name="use_own_provider">使用我自己的服務端</string>
   <string name="pick_your_username">輸入您的用戶名</string>
-  <string name="change_presence">變更狀態</string>
   <string name="status_message">狀態資訊</string>
-  <string name="all_accounts_on_this_device">為本設備上的所有帳戶設置</string>
   <string name="presence_chat">免費聊天室</string>
   <string name="presence_online">線上</string>
   <string name="presence_away">離開</string>
@@ -514,10 +467,8 @@
   <string name="presence_dnd">忙碌</string>
   <string name="secure_password_generated">安全密碼已生成</string>
   <string name="device_does_not_support_battery_op">該設備不支援禁用電池優化</string>
-  <string name="show_password">顯示密碼</string>
   <string name="registration_please_wait">註冊失敗：請重試</string>
   <string name="registration_password_too_weak">註冊失敗：密碼太弱</string>
-  <string name="conference_subject">主題</string>
   <string name="choose_participants">選擇成員</string>
   <string name="invite_again">重新邀請</string>
   <string name="gp_short">短</string>
@@ -547,9 +498,6 @@
   <string name="no_permission_to_access_x">沒有訪問 %s 的許可</string>
   <string name="remote_server_not_found">找不到遠端伺服器</string>
   <string name="unable_to_update_account">無法更新帳戶</string>
-  <string name="missing_presence_subscription_with_x">缺少與 %s 的線上訂閱。</string>
-  <string name="missing_keys_from_x">缺少來自 %s 的 OMEMO 金鑰。</string>
-  <string name="missing_omemo_keys">缺少 OMEMO 金鑰</string>
   <string name="report_jid_as_spammer">報告這個 JID 發送不想要的消息。</string>
   <string name="pref_delete_omemo_identities">刪除 OMEMO 身份</string>
   <string name="pref_delete_omemo_identities_summary">重新生成你的 OMEMO 金鑰。你的所有連絡人不得不對你進行再認證。請將此作為最後的辦法。</string>