Update language translations

// FREEBIE

res/values-ar/strings.xml

@@ -22,19 +22,15 @@
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 هذا سيقوم بتعطيل دفع الوصول إلى الرسائل من خلال إلغاء تسجيلك في الخادم. سيتوجب عليك إعادة تسجيل رقم هاتفك المحمول لاستخدام دفع وصول الرسائل في المستقبل.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطأ في الاتصال بالخادم!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">تفعيل ورود الرسائل</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">الرسائل النصية مفعلة</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">أضغط لتغيير التطبيق الافتراضي للرسائل</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">تعطيل ورود الرسائل</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">الرسائل النصية معطلة</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">أضغط لجعل تيكست سيكيورالتطبيق الافتراضي للرسائل</string>
   <string name="ApplicationPreferencesActivity_on">يعمل</string>
   <string name="ApplicationPreferencesActivity_On">يعمل</string>
   <string name="ApplicationPreferencesActivity_off">مغلق</string>
   <string name="ApplicationPreferencesActivity_Off">مغلق</string>
-  <string name="ApplicationPreferencesActivity_partial">جزئي</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">رسائل نصية %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">رسالة نصية قصيرة</string>
-  <string name="ApplicationPreferencesActivity_mms">رسالة وسائط متعددة</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">وارد %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">صادر %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d دقائق</string>
   <!--DraftDatabase-->
@@ -50,7 +46,7 @@
   <string name="AttachmentTypeSelectorAdapter_contact">بيانات الاتصال</string>
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">لقد تغير المفتاح التعريفي الخاص بـ%1$s. وهذا يعني أن شخص ما يحاول اعتراض المحادثة أو %2$s  قام بإعادة تثبيت تيكست سيكيور وأصبح لديه مفتاح تعريفي جديد.</string>
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال هذه.</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال.</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">حجم الرسالة: %d كيلوبايت</string>
   <string name="ConversationItem_expires_s">تاريخ الانتهاء: %s</string>
@@ -64,6 +60,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted">أنقر من أجل استعاضة غير آمنة</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">الاستعاضة برسالة غير مشفرة؟</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">الاستعاضة برسالة وسائط متعددة غير مشفرة؟</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">هذه الرسالة <b>لن تكون</b> مشفرة لأن المستلم لم يعد مستخدم تيكست سيكيور. .\n\nهل ترغب في إرسال رسالة غير مشفرة؟</string>
   <string name="ConversationItem_unable_to_open_media">لم يتم العثور على تطبيق قادر على فتح الملف.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">بدء محادثة آمنة؟</string>
@@ -110,9 +107,10 @@
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">تعذر الإضافة إلى الذاكرة!</string>
   <string name="ConversationFragment_saving_attachment">حفظ المرفق</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">جارٍ حفظ المرفق في الذاكرة...</string>
+  <string name="ConversationFragment_pending">معلق...</string>
   <string name="ConversationFragment_push">بيانات (تيكست سيكيور)</string>
   <string name="ConversationFragment_mms">رسالة وسائط متعددة</string>
-  <string name="ConversationFragment_sms">رسالة نصية قصيرة</string>
+  <string name="ConversationFragment_sms">رسالة نصية</string>
   <string name="ConversationFragment_deleting">الحذف جارٍ...</string>
   <string name="ConversationFragment_deleting_messages">حذف الرسائل جارٍ...</string>
   <!--ConversationListFragment-->
@@ -170,7 +168,7 @@
   <string name="ImportFragment_this_will_import_messages_from_the_system">هذه الخاصية ستستورد الرسائل النصية من النظام إلى تيكست سيكيور. إذا قمت بهذا من قبل، فأن الاستيراد مرة أخرى سيتسبب في تكرار الرسائل.</string>
   <string name="ImportFragment_import">استيراد</string>
   <string name="ImportFragment_cancel">إلغاء</string>
-  <string name="ImportFragment_restore_encrypted_backup">استعادة نسخة احيتاطية مشفرة؟</string>
+  <string name="ImportFragment_restore_encrypted_backup">استرداد نسخة احيتاطية مشفرة؟</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
 استرجاع نسخة احتياطية مشفرة سيستبدل بالكامل المفاتيح حالية والإعدادات والرسائل. ستفقد المعلومات الموجودة الآن في تيكست سيكيور وغير موجودة في النسخة الاحتياطية.</string>
   <string name="ImportFragment_restore">استعادة</string>
@@ -340,6 +338,7 @@
   <string name="MessageNotifier_d_new_messages">(%d) رسائل جديدة</string>
   <string name="MessageNotifier_most_recent_from_s">آخر رسالة من: %s</string>
   <string name="MessageNotifier_encrypted_message">رسالة مشفرة...</string>
+  <string name="MessageNotifier_media_message_with_text">رسالة وسائط متعددة: %s</string>
   <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
   <string name="MessageNotifier_message_delivery_failed">فشل توصيل الرسالة.</string>
   <string name="MessageNotifier_failed_to_deliver_message">فشل توصيل الرسالة.</string>
@@ -368,9 +367,7 @@
   <string name="contact_selection_recent_activity__no_recent_calls">لا توجد مكالمات حديثة.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">أرسل رسالة تيكست سيكيور</string>
-  <string name="conversation_activity__type_message_sms_secure">أرسل رسالة آمنة</string>
   <string name="conversation_activity__type_message_sms_insecure">أرسل رسالة نصية غير آمنة</string>
-  <string name="conversation_activity__type_message_mms_secure">أرسل رسالة وسائط متعددة آمنة</string>
   <string name="conversation_activity__type_message_mms_insecure">أرسل رسالة وسائط متعددة غير آمنة</string>
   <string name="conversation_activity__send">أرسل</string>
   <string name="conversation_activity__remove">إزالة</string>
@@ -379,6 +376,7 @@
   <string name="conversation_activity__emoji_toggle_description">تبديل لوحة مفاتيح إيموجي</string>
   <string name="conversation_activity__attachment_thumbnail"> المرفق</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">جارٍ تنزيل رسالة الوسائط</string>
   <string name="conversation_item__mms_image_description">رسالة وسائط متعددة</string>
   <string name="conversation_item__play_button_description">زر التشغيل</string>
   <string name="conversation_item__secure_message_description">رسالة آمنة</string>
@@ -447,6 +445,8 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">انتهاء</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+تحقق من رقم تليفونك للاتصال بتيكست سيكيور</string>
   <string name="registration_activity__your_country">بلدك</string>
   <string name="registration_activity__your_country_code_and_phone_number">رمز دولتك ورقم هاتفك</string>
   <string name="registration_activity__phone_number">رقم الهاتف</string>
@@ -455,7 +455,7 @@
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">بعض المشاكل المحتملة
 وتتضمن:</string>
-  <string name="registration_problems__sms_interceptors">القائمون باعتراض الرسائل النصية القصيرة</string>
+  <string name="registration_problems__sms_interceptors">القائمون باعتراض الرسائل النصية.</string>
   <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
 بعض عملاء التراسل اللحظي العاملة بواسطة طرف ثالث، مثل Handcent أو GoSMS، تتصرف بشكل سيء وتعترض الرسائل النصية القصيرة الواردة. تحقق من استلامك رسالة نصية تبدأ  بـ\"كود تحقق تيكست سيكيور الخاص بك:\". في حالة عدم تلقيها سوف تحتاج إلي ضبط عميل التراسل اللحظي الخاص بالطرف الثالث للسماح بمرور الرسائل النصية.</string>
   <string name="registration_problems__incorrect_number"> رقم غير صحيح.</string>
@@ -482,7 +482,7 @@
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 إذا كنت متصل ببواسطة Wi-Fi من المحتمل وجود جدار ناري يمنع النفاذ إلى خادم تيكست سيكيور. قم بتجربة شبكة أخرى أو بيانات شبكة الجوال.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-سيتم الآن التحقق من رقم هاتفك آليا بواسطة رسالة نصية قصيرة.</string>
+سيتم الآن التحقق من رقم هاتفك آليا بواسطة رسالة نصية.</string>
   <string name="registration_progress_activity__connecting">الاتصال جارِ...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">انتظار رسالة التحقق...</string>
   <string name="registration_progress_activity__registering_with_server">التسجيل مع الخادم جارِ...</string>
@@ -544,12 +544,11 @@
   </plurals>
   <!--preferences.xml-->
   <string name="preferences__general">عام</string>
-  <string name="preferences__sms_mms">رسالة نصية قصيرة ورسالة وسائط متعددة</string>
+  <string name="preferences__sms_mms">رسالة نصية ورسالة وسائط متعددة</string>
-  <string name="preferences__push_sms_category">خدمة دفع الرسائل والرسائل النصية القصيرة</string>
+  <string name="preferences__pref_all_sms_title">اإستقبال كل الرسائل النصية</string>
-  <string name="preferences__pref_all_sms_title">اإستقبال كل الرسائل النصية القصيرة</string>
   <string name="preferences__pref_all_mms_title">استقبال كل رسائل الوسائط المتعددة</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">استخدم تيكست سيكيور لعرض وحفظ كل الرسائل القصيرة الواردة</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">استخدم تيكست سيكيور لجميع الرسائل النصية الواردة</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">استخدم تيكست سيكيور لعرض وحفظ كل رسائل الوسائط المتعددة الواردة</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">استخدم تيكست سيكيور لجميع رسائل الوسائط المتعددة الواردة</string>
   <string name="preferences__input_settings">خيارات الإدخال</string>
   <string name="preferences__enable_enter_key_title">تفعيل مفتاح الإدخال</string>
   <string name="preferences__replace_smiley_with_enter_key">استبدال مفتاح الابتسامة بمفتاح الدخول</string>
@@ -632,21 +631,10 @@
   <string name="preferences__default">افتراضي</string>
   <string name="preferences__language">اللغة</string>
   <string name="preferences__language_summary">اللغة %s</string>
-  <string name="preferences__make_default_sms_app">ضبط تيكست سيكيور كتطبيق الرسائل الافتراضي</string>
+  <string name="preferences__textsecure_messages">رسائل تيكست سيكيور</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">اجعل تيكست سيكيور التطبيق الافتراضي للرسائل القصيرة ورسائل الوسائط المتعددة.</string>
-  <string name="preferences__use_data_channel">دفع وصول الرسائل</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-زيادة الخصوصية وتجنب رسوم الرسائل القصيرة مع مستخدمين تيكست سيكيور آخرين باستخدام الاتصال ببيانات شبكة الجوال</string>
+رسائل مجانية وآمنة مع مستخدمي تيكست سيكيور وسيجنال</string>
-  <string name="preferences__sms_fallback">رسالة نصية\وسائط متعددة صادرة</string>
   <string name="preferences__submit_debug_log">إرسال سجل التصحيح</string>
-  <string name="preferences__sms_outgoing_push_users">مستخدمين تيكست سيكيور</string>
-  <string name="preferences__sms_fallback_push_users_ask">أسئل أولا</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">لا يوجد رسالة وسائط متعددة</string>
-  <string name="preferences__sms_outgoing_push_users_description">أرسل رسالة مؤمنة في حال فقدان الاتصال ببيانات شبكة الجوال</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">أسئل قبل إرسال رسالة نصية\وسائط متعددة</string>
-  <string name="preferences__sms_fallback_never_send_mms">عدم إرسال رسالة وسائط متعددة أبدأ</string>
-  <string name="preferences__sms_fallback_non_push_users">غير مستخدمين تيكست سيكيور</string>
-  <string name="preferences__sms_fallback_nobody">لا أحد</string>
   <string name="preferences__support_wifi_calling">وضع التوافق مع \'مكالمات الواي فاي\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">مكن في حال كان جهازك يستخدم خاصية الرسالة القصيرة أو الرسائل الوسائط المتعددة بإستخدام الواي-فاي (مكن فقط في حال تفعيل خاصية \'مكالمات الواي-فاي\' في جهزك)</string>
   <!--****************************************-->

res/values-be/strings.xml

@@ -0,0 +1,734 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">TextSecure</string>
+  <string name="yes">Так</string>
+  <string name="no">Не</string>
+  <string name="delete">Выдаліць</string>
+  <string name="please_wait">Пачакайце калі ласка</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Цяпер: %s</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Вы яшчэ не ўсталявалі пароль</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s паведамленняў у гутарцы</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Выдаліць усе старыя паведамленні зараз?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы ўпэўненыя, што хочаце адразу абрэзаць усе гутаркі у %s самых апошніх паведамленняў?</string>
+  <string name="ApplicationPreferencesActivity_delete">Выдаліць</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Адключыць шыфраванне захаванай інфармацыі?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Увага, гэта адключыць шыфраванне захаванай інфармацыі для ўсіх паведамленняў ды ключоў. Шыфраванне вашых дадзеных пры перадачы будзе працягвацца, але любы хто атрымае фізічны доступ да вашага смартфона, будзе мець доступ і да перапіскі.
+    </string>
+  <string name="ApplicationPreferencesActivity_disable">Выключыць</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Працэс адмены рэгістрацыі...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Адмена рэгістрацыі для дадзеных сувязі</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Адключыць імгненныя паведамленні?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+Гэта адключыць функцыю імгненных паведамленняў, вы згубіце рэгістрацыю на серверы.
+Вам трэба будзе перарэгістраваць свой нумар тэлефона, каб выкарыстоўваць паслугу паведамленняў ізноў.</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Памылка падлучэння да сервера!</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS уключаны</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Націсніце, каб змяніць стандартную праграму для SMS</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS выключаны</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Націсніце, каб зрабіць TextSecure вашай стандартнай праграмай для SMS</string>
+  <string name="ApplicationPreferencesActivity_on">Укл</string>
+  <string name="ApplicationPreferencesActivity_On">Укл</string>
+  <string name="ApplicationPreferencesActivity_off">Выкл</string>
+  <string name="ApplicationPreferencesActivity_Off">Выкл</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
+  <!--AppProtectionPreferenceFragment-->
+  <string name="AppProtectionPreferenceFragment_minutes">%d хвілін</string>
+  <!--DraftDatabase-->
+  <string name="DraftDatabase_Draft_image_snippet">(малюнак)</string>
+  <string name="DraftDatabase_Draft_audio_snippet">(аўдыё)</string>
+  <string name="DraftDatabase_Draft_video_snippet">(відэа)</string>
+  <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">Не атрымліваецца знайсці праграму для выбара медыя.</string>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">Карцінка </string>
+  <string name="AttachmentTypeSelectorAdapter_video">Відэа</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Аўдыё</string>
+  <string name="AttachmentTypeSelectorAdapter_contact">Кантактная інфармацыя</string>
+  <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Ідэнтыфікацыйны ключ для %1$s быў зменены. Гэта можа вызначаць, што нехта спрабуе перахапіць вашыя паведамленні, альбо проста %2$s пераўсталяваў па-новай TextSecure і зараз мае новы ідэнтыфікацыйны ключ.
+    </string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Магчыма Вы жадаеце верыфікаваць гэты кантакт?</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">Аб\'ём паведамлення: %d KB</string>
+  <string name="ConversationItem_expires_s">Заканчваецца: %s</string>
+  <string name="ConversationItem_error_not_delivered">Не было дастаўлена</string>
+  <string name="ConversationItem_view_secure_media_question">Паказаць бяспечнае медыя?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Гэты кантэнт быў захаваны ў зашыфраванай базе дадзеных. На жаль, для яго прагляду ў знешняй праграме спатрэбіцца часова расшыфраваць дадзеныя і запісаць іх на дыск. Вы ўпэўненыя, што хочаце гэта зрабіць?</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Памылка, атрымана неактуальнае паведамленне абмену ключамі.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Паведамленне абмену ключамі атрымана, дакраніцеся, каб працягнуць.</string>
+  <string name="ConversationItem_group_action_left">%1$s пакінуў групавую гутарку.</string>
+  <string name="ConversationItem_click_for_details">Націсніце каб пабачыць дэталі</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Націсніце для небяспечнага паўтора</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Паўтарыць у небяспечным SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Паўтарыць у небяспечным MMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Гэтае паведамленне <b>ня</b> будзе зашыфравана, бо атрымальнік ўжо не з\'яўляецца карыстальнікам TextSecure. \n\n Даслаць простае паведамленне?</string>
+  <string name="ConversationItem_unable_to_open_media">Немагчыма знайсці праграму, якая б адкрывала гэты кантэнт.</string>
+  <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Пачаць бяспечную сэсію?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Пачаць бяспечную сэсію з %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Пацверджанне заканчэння бяспечнай сэсіі</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Вы ўпэўнены, што хочаце скончыць гэтую бяспечную сэсію?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Пацверджанне выдалення гутаркі</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Вы ўпэўнены, што хочаце пастаянна выдаляць гэтую гутарку?</string>
+  <string name="ConversationActivity_add_attachment">Прыкласці дадатак</string>
+  <string name="ConversationActivity_select_contact_info">Абярыце кантактную інфармацыю</string>
+  <string name="ConversationActivity_compose_message">Напісаць паведамленне</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">На жаль, але усталёўка вашага дадатку ідзе з памылкай.</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">На жаль, абранае відэа перавышае максімальны памеру паведамлення (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">На жаль, абранае аўдыё перавышае максімальны памеру паведамлення (%1$skB).</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Атрымальнік ня ёсць дзейсным для адпраўкі SMS або email адрасам!</string>
+  <string name="ConversationActivity_message_is_empty_exclamation">Паведамленне пустое!</string>
+  <string name="ConversationActivity_group_conversation_recipients">Атрымальнікі групавой гутаркі</string>
+  <string name="ConversationActivity_group_conversation">Групавая гутарка</string>
+  <string name="ConversationActivity_unnamed_group">Неназваная група</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d удзельнікаў</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 ўдзельнік</string>
+  <string name="ConversationActivity_saved_draft">Захаваны чарнавік</string>
+  <string name="ConversationActivity_invalid_recipient">Няправільны атрымальнік!</string>
+  <string name="ConversationActivity_calls_not_supported">Званкі не падтрымліваюцца</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Гэты апарат ня можа падтрымліваць набор нумару.</string>
+  <string name="ConversationActivity_leave_group">Пакінуць групу?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Вы ўпэўнены, што хочаце пакінуць групу?</string>
+  <string name="ConversationActivity_transport_insecure_sms">Небяспечная SMS</string>
+  <string name="ConversationActivity_transport_insecure_mms">Небяспечная MMS</string>
+  <string name="ConversationActivity_transport_textsecure">TextSecure</string>
+  <string name="ConversationActivity_get_with_it">Атрымай з гэтым: %s</string>
+  <string name="ConversationActivity_install_textsecure">Усталяваць TextSecure: %s</string>
+  <string name="ConversationActivity_error_leaving_group">Памылка выхаду з групы...</string>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">Дэталі паведамлення</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Транспарт: %1$s\nДаслана/Атрымана: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Адпраўшчык: %1$s\nТранспарт: %2$s\nДаслана: %3$s\nАтрымана: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Пацверджанне выдалення паведамлення</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Вы ўпэўнены, што хочаце пастаянна выдаляць усе абраныя паведамленні?</string>
+  <string name="ConversationFragment_save_to_sd_card">Захаваць на дыск?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Захаваўшы гэты кантэнт на дыск, вы дазваляеце ўсім іншым праграмам на вашым смартфоне атрымаць да яго доступ.\n\nПрацягнуць?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Памылка пры захаванні дадатку на дыск!</string>
+  <string name="ConversationFragment_success_exclamation">Паспяхова!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Немагчыма запісаць на дыск!</string>
+  <string name="ConversationFragment_saving_attachment">Захаванне дадатку</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Захаванне дадатку на дыск...</string>
+  <string name="ConversationFragment_pending">У працэсе...</string>
+  <string name="ConversationFragment_push">Дадзеныя (TextSecure)</string>
+  <string name="ConversationFragment_mms">MMS</string>
+  <string name="ConversationFragment_sms">SMS</string>
+  <string name="ConversationFragment_deleting">Выдаленне...</string>
+  <string name="ConversationFragment_deleting_messages">Выдаленне паведамлення...</string>
+  <!--ConversationListFragment-->
+  <string name="ConversationListFragment_delete_threads_question">Выдаліць гутарку?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Вы ўпэўнены, што хочаце выдаліць УСЕ абраныя гутаркі?</string>
+  <string name="ConversationListFragment_deleting">Выдаленне</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Выдаленне абраных гутарак...</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Паведамленне абмену ключамі...</string>
+  <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Выкарыстоўваць кастомны: %s</string>
+  <string name="CustomDefaultPreference_using_default">Выкарыстоўваць стандартны: %s</string>
+  <string name="CustomDefaultPreference_none">Не</string>
+  <!--DateUtils-->
+  <string name="DateUtils_now">Зараз</string>
+  <!--ShareActivity-->
+  <string name="ShareActivity_share_with">Падзяліцца з</string>
+  <!--ExportFragment-->
+  <string name="ExportFragment_export">Экспарт</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Экспартаваць простым тэкстам на SD картку?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Увага,
+ гэта прывядзе да экспарту вашых паведамленняў з TextSecure  ў выглядзе простага тэкстку на SD картку.</string>
+  <string name="ExportFragment_cancel">Адмена</string>
+  <string name="ExportFragment_exporting">Экспарт</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Экспарт простым тэкстам на SD картку...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Памылка, немагчыма запісаць на SD картку!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Памылк падчас запісу на SD картку.</string>
+  <string name="ExportFragment_success">Паспяхова!</string>
+  <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Збой пастаяннай камунікацыі TextSecure!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure ня можа зарэгістравацца з дапамогай сервісаў Google Play. Камунікацыя праз каналы сувязі была адключана, калі ласка паспрабуйце перарэгістравацца па-новай з меню наладаў TextSecure.</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Новая група</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Абнавіць групу</string>
+  <string name="GroupCreateActivity_group_name_hint">Імя групы</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Новая MMS група</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Вы абралі кантакт, які не падтрымлівае групы TextSecure, таму група будзе MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Вы не зарэгістраваны для выкарыстання каналаў сувязі, таму групы TextSecure недасяжны.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">З прычыны раптоўнай памылкі, стварэнне групы не атрымалася.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Для вашай групы неабходны як мінімум адзін ўдзельнік!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Адзін з удзельнікаў вашай групы мае некарэтна напісаны нумар. Калі ласка выправіце напісанне гэтага нумару, альбо выдаліце яго ды паспрабуйце паўтарыць ізноў.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Групавы аватар</string>
+  <string name="GroupCreateActivity_menu_create_title">Стварыць групу</string>
+  <string name="GroupCreateActivity_creating_group">Стварэнне %1$s…</string>
+  <string name="GroupCreateActivity_updating_group">Абнаўленне %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Немагчыма дадаць не-TextSecure кантакт да існуючай TextSecure групы</string>
+  <string name="GroupCreateActivity_loading_group_details">Загрузка дэталяў групы...</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Я</string>
+  <string name="GroupMembersDialog_members">Удзельнікі...</string>
+  <!--ImportExportActivity-->
+  <string name="ImportExportActivity_import">Імпарт</string>
+  <string name="ImportExportActivity_export">Экспарт</string>
+  <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">Імпартаваць сістэмную базу SMS паведамленняў?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Гэты працэс прывядзе да імпарта сістэмнай базы SMS паведамленняў у TextSecure.
+Калі раней Вы ўжо рабілі гэта, цяперашні імпарт можа прывесці да з\'яўлення SMS дублікатаў.</string>
+  <string name="ImportFragment_import">Імпарт</string>
+  <string name="ImportFragment_cancel">Адмена</string>
+  <string name="ImportFragment_restore_encrypted_backup">Аднавіць зашыфраваную рэзервную копію?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Аднаўленне з зашыфраванай рэзервнай копіі поўнасцю перапіша ўжо існуючыя ключы, налады і паведамленні.
+Вы згубіце ўсю інфармацыю з цяперашняй інсталяцыі TextSecure, але не з рэзервнай копіі.</string>
+  <string name="ImportFragment_restore">Аднавіць</string>
+  <string name="ImportFragment_import_plaintext_backup">Імпартаваць рэзервную копію простым тэкстам?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Гэты працэс прывядзе да імпарта паведамленняў простым тэкстам з рэзервнай копіі.
+Калі раней Вы ўжо рабілі гэта, цяперашні імпарт можа прывесці да з\'яўлення SMS дублікатаў.</string>
+  <string name="ImportFragment_importing">Імпартаванне</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Імпартаванне рэзервнай копіі простым тэкстам...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Ня знойдзена рэзервных копій простым тэкстам!</string>
+  <string name="ImportFragment_error_importing_backup">Памылка імпарта рэзервнай копіі!</string>
+  <string name="ImportFragment_import_complete">Імпарт выкананы!</string>
+  <string name="ImportFragment_restoring">Аднаўленне</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Аднаўленне зашыфраванай рэзервнай копіі...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Ня знойдзена зашыфраваных рэзервных копій!</string>
+  <string name="ImportFragment_restore_complete">Аднаўленне выканана!</string>
+  <!--KeyScanningActivity-->
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Ня знойдзена адсканаваных ключоў!</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">Усталяваць сканэр штрыхкодаў?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure неабходны сканэр штрыхкодаў для працы з QR кодамі.</string>
+  <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">Не атрымалася даслаць</string>
+  <string name="MessageDetailsRecipient_new_identity">Новая асоба</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_error_storing_mms">Памылка захавання MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Памылка злучэння з MMS правайдэрам...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Памылка счытвання параметраў бесправаднога MMS правайдэра...</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Мультымедыя паведамленне</string>
+  <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Было атрымана паведамленне, зашыфраванае састарэлай версійя TextSecure, якая ўжо не падтрымліваецца. Папрасіце адпраўшчыка абнавіць TextSecure да апошняй версіі і выслаць паведамленне ізноў.</string>
+  <string name="MessageRecord_left_group">Вы пакінулі групу</string>
+  <string name="MessageRecord_updated_group">Абноўленая група.</string>
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Паролі не супадаюць!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Няправільны стары пароль!</string>
+  <!--DeviceProvisioningActivity-->
+  <string name="DeviceProvisioningActivity_link_this_device">Прывязаць гэты дэвайс?</string>
+  <string name="DeviceProvisioningActivity_cancel">АДМЕНА</string>
+  <string name="DeviceProvisioningActivity_continue">ПРАЦЯГНУЦЬ</string>
+  <string name="DeviceProvisioningActivity_title">Прывязаць гэты дэвайс?</string>
+  <string name="DeviceProvisioningActivity_content_intro">Гэта будзе магчыма</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+        - Прачытаць усе вашыя паведамленні
+        \n- Даслаць паведамленне на Ваша імя
+    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Дабаўленне дэвайса...</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Дабаўленне новага дэвайса...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Дэвайс дададзены!</string>
+  <string name="DeviceProvisioningActivity_content_progress_no_device">Ня знойдзена дэвайсаў.</string>
+  <string name="DeviceProvisioningActivity_content_progress_network_error">Памылка сеткі.</string>
+  <string name="DeviceProvisioningActivity_content_progress_key_error">Няправільны QR код.</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_enter_passphrase">Увядзіце пароль</string>
+  <string name="PassphrasePromptActivity_watermark_content_description">Іконка TextSecure</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">Адправіць пароль</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Няправільны пароль!</string>
+  <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Подпіс падчас цяперашняга абмене ключамі адрозніваецца ад таго, які быў атрыманы ад гэтага кантакта мінулым разам. Гэта можа вызначаць, што нехта спрабуе перахапіць вашыя паведамленні, альбо гэты кантакт проста пераўсталяваў па-новай TextSecure і зараз мае новы ідэнтыфікацыйны ключ.
+    </string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Магчыма Вы жадаеце верыфікаваць гэты кантакт?</string>
+  <string name="ReceiveKeyActivity_processing">У працэсе</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Працэс абмена ключамі...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Падключыць да TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Абярыце вашу краіну</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Вы мусіце ўказаць код краіны</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Вы мусіце ўказаць ваш нумар тэлефона</string>
+  <string name="RegistrationActivity_invalid_number">Няправільны нумар</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Вы ўказалі няправільны нумар (%s) </string>
+  <string name="RegistrationActivity_unsupported">Не падтрымліваецца</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Нажаль гэты дэвайс не падтрымлівае дадзеныя паведамленні. Смартфон з версіяй Android ранейшай за 4.0 мусіць мець зарэгістраваны ўліковы запіс Google. Смартфон з версіяй Android пазней за 4.0 не патрабуе ўліковы запіс Google , але мусіць мець усталяваны Play Store.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">Праверці ці гэта сапраўды Ваш нумар. Ён будзе правярацца з дапамогай SMS.</string>
+  <string name="RegistrationActivity_continue">Працягнуць</string>
+  <string name="RegistrationActivity_edit">Рэдагаваць</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Магчымыя праблемы</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Праверка нумару</string>
+  <string name="RegistrationProgressActivity_edit_s">Рэдагаваць %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Рэгістрацыя выканана!</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Вы мусіце ўвесці код, які атрымалі...</string>
+  <string name="RegistrationProgressActivity_connecting">Падлучэнне</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Падлучэнне для праверкі...</string>
+  <string name="RegistrationProgressActivity_network_error">Памылка сеткі!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Немагчыма падлучыцца. Калі ласка праверце вашае падлучэнне і паспрабуйце па-новай.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Памылка верыфікацыі!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Код праверкі, які вы ўвялі няправільны. Калі ласка паспрабуйце яшчэ раз.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Зашмат спробаў</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Вы ўвялі няправільны праверачны код зашмат разоў. Калі ласка паспрабуйце пачакаць хвіліну перад наступнай спробай.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Запыт званка</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Запыт уваходзячага праверачнага званка...</string>
+  <string name="RegistrationProgressActivity_server_error">Памылка сервера</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Памылка сервера. Калі ласка паспрабуйце яшчэ.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Зашмат запытаў!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Нядаўна вы ўжо запытвалі галасавы выклік. Вы можаце запытаць новы галасавы выклік праз 20 хвілін.</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Канфлікт рэгістрацыі</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Гэты нумар ужо зарэгістраваны на іншым серверы TextSecure (магчыма CyanogenMod?). Вы мусіць разрэгістравацца там перад тым, як зрабіць гэта тут.</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Рэгістрацыя ваканана</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Рэгістрацыя TextSecure выканана паспяхова.</string>
+  <string name="RegistrationService_registration_error">Памылка рэгістрацыі</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Падчас рэгістрацыі TextSecure узнікла праблема.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Атрыманы пашкоджаны ключ абмену паведамленнямі!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Атрыманы ключ абмену паведамленнямі для няправільнай версіі пратакола.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Атрыманае паведамленне з невядомым ідэнтыфікацыйным ключом. Націсніце працягнуць.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Атрыманая інфармацыя абноўленая, але мае невядомую інфармацыю індэнтыфікацыі. Націсніце каб валідзіраваць ідэнтыфікацыю.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Бяспечная сэсія скончана.</string>
+  <string name="SmsMessageRecord_duplicate_message">Дублікат паведамлення.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Пакінуць групу...</string>
+  <string name="TheadRecord_secure_session_ended">Бяспечная сэсія скончаная.</string>
+  <string name="ThreadRecord_draft">Чарнавік:</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">У вас няма індэнтыфікацыйнага ключа.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Атрымальнік ня мае ідэнтыфікацыйнага ключа.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Атрымальнік ня мае ідэнтыфікацыйнага ключа!</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Адскануйце гэты ключ, каб параўнаць</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Атрымаць мой сканаваны ключ</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">УВАГА, адсканаваныя ключы не супадаюць! Калі ласка ўважліва праверце адбіткі.</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">НЕ верыфікавана!</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Іх ключ правільны. Таксама не забудзься верыфікаваць свой ключ з імі.</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">Верыфікавана!</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">У Вас няма ідэнтыфікацыйнага ключа!</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">У Вас няма ідэнтыфікацыйнага ключа.</string>
+  <string name="ViewIdentityActivity_scan_to_compare">Адскануйце каб параўнаць</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Скануюцца для параўнання</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">УВАГА, адсканаваны ключ не супадае!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">Не верыфікавана!</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Адсканаваныя ключ супадае!</string>
+  <string name="ViewIdentityActivity_verified_exclamation">Верыфікавана!</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Адбітак майго ідэнтыфікатара</string>
+  <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Ініцыяваць нягледзячы на існуючы запыт?</string>
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Вы ўжо даслалі запыт на пачатак сэсіі гэтаму атрымальніку. Ці хочаце Вы даслаць яго ізноў? Гэта анулюе першы запыт.</string>
+  <string name="KeyExchangeInitiator_send">Даслаць</string>
+  <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Няправільна зашыфраванае паведамленне...</string>
+  <string name="MessageDisplayHelper_decrypting_please_wait">Расшыфроўка, пачакайце калі ласка...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Паведамленне зашыфравана для ўжо неіснуючай сэсіі...</string>
+  <!--EncryptingSmsDatabase-->
+  <string name="EncryptingSmsDatabase_error_decrypting_message">Памылка расшыфроўкі паведамлення.</string>
+  <!--ThreadDatabase-->
+  <string name="ThreadDatabase_error_decrypting_message">Памылка расшыфроўкі паведамлення.</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">Падлучэнне да MMS сервера...</string>
+  <string name="MmsDatabase_downloading_mms">Запампоўка MMS...</string>
+  <string name="MmsDatabase_mms_download_failed">Памылка запампоўкі MMS!</string>
+  <string name="MmsDatabase_downloading">Запампоўка...</string>
+  <string name="MmsDatabase_mms_pending_download">Націсніце каб змяніць налады MMS і працягнуць запампоўку.</string>
+  <string name="MmsDatabase_error_decrypting_message">Памылка расшыфроўкі паведамлення.</string>
+  <!--MmsMessageRecord-->
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">РасшыфроўкаMMS, пачакайце калі ласка...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Няправільна зашыфраванае MMS паведамленне...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS паведамленне зашыфравана для ўжо неіснуючай сэсіі...</string>
+  <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Імпарт у працэсе</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Імпарт тэкставых паведамленняў</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_textsecure_passphrase_cached">Дакраніцеся каб адкрыць.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Дакраніцеся каб адкрыць, альбо дакраніцеся да замка, каб закрыць.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure разблакіравана</string>
+  <string name="KeyCachingService_lock">Замкнуць гэты пароль</string>
+  <!--MessageNotifier-->
+  <string name="MessageNotifier_d_new_messages">%d новых паведамленняў</string>
+  <string name="MessageNotifier_most_recent_from_s">Самыя апошнія ад: %s</string>
+  <string name="MessageNotifier_encrypted_message">Разшыфраванае паведамленне...</string>
+  <string name="MessageNotifier_media_message_with_text">Мультымедыя паведамленне: %s</string>
+  <string name="MessageNotifier_no_subject">(Няма тэмы)</string>
+  <string name="MessageNotifier_message_delivery_failed">Памылка дастаўкі паведамлення.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Памылка дастаўкі паведамлення.</string>
+  <string name="MessageNotifier_error_delivering_message">Памылка дастаўкі паведамлення.</string>
+  <string name="MessageNotifier_mark_all_as_read">Пазначыць усе як прачытаныя</string>
+  <string name="MessageNotifier_mark_as_read">Пазначыць як прачытанае</string>
+  <string name="MessageNotifier_media_message">Мультымедыя паведамленне</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Нажаль Quick Response больш не падтрымліваецца TextSecure!</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">СТАРЫ ПАРОЛЬ:</string>
+  <string name="change_passphrase_activity__new_passphrase">НОВЫ ПАРОЛЬ:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">ПАЎТАРЫЦЕ НОВЫ ПАРОЛЬ:</string>
+  <!--contact_selection_group_activity-->
+  <!--contact_selection_list_activity-->
+  <string name="contact_selection_group_activity__no_contacts">Няма кантактаў.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Загрузка кантактаў...</string>
+  <!--single_contact_selection_activity-->
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Вы не зарэгістраваны у push сервісе...</string>
+  <string name="SingleContactSelectionActivity_updating_directory">Абнаўленне тэчкі</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">Абнаўленне push тэчкі...</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Фота кантакта</string>
+  <!--ContactSelectionListFragment-->
+  <string name="ContactSelectionlistFragment_select_for">Абраць для</string>
+  <!--contact_selection_recent_activity-->
+  <string name="contact_selection_recent_activity__no_recent_calls">Няма новых выклікаў.</string>
+  <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Даслаць паведамленне TextSecure</string>
+  <string name="conversation_activity__type_message_sms_insecure">Даслаць неабароненую SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Даслаць неабароненую MMS</string>
+  <string name="conversation_activity__send">Даслаць</string>
+  <string name="conversation_activity__remove">Выдаліць</string>
+  <string name="conversation_activity__window_description">Размова з %1$s</string>
+  <string name="conversation_activity__compose_description">Скласці паведамленне</string>
+  <string name="conversation_activity__emoji_toggle_description">Пераключыць emoji клавіятуру</string>
+  <string name="conversation_activity__attachment_thumbnail">Дадатак мініяцюры</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Запампоўка медыя паведамлення</string>
+  <string name="conversation_item__mms_image_description">Медыя паведамленне</string>
+  <string name="conversation_item__play_button_description">Кнопка Play</string>
+  <string name="conversation_item__secure_message_description">Бяспечнае паведамленне</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">Запампаваць</string>
+  <string name="conversation_item_sent__downloading">Запампоўка</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Не атрымалася адправіць</string>
+  <string name="conversation_item_sent__pending_approval_description">Чакаецца пацверджанне</string>
+  <string name="conversation_item_sent__delivered_description">Дастаўлена</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Запампаваць</string>
+  <string name="conversation_item_received__contact_photo_description">Фота кантакта</string>
+  <string name="conversation_item_received__downloading">Запампоўка...</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Пакетны рэжым выбару</string>
+  <string name="conversation_fragment_cab__batch_selection_amount">%s абрана</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Загрузка краінаў...</string>
+  <string name="country_selection_fragment__search">Пошук</string>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__log_fetch_failed">Не атрымалася ўзяць логі з вашай прылады. Вы па-ранейшаму можаце выкарыстоўваць ADB, каб атрымаць логі замест гэтага.</string>
+  <string name="log_submit_activity__thanks">Дзякуй за вашу дапамогу!</string>
+  <string name="log_submit_activity__submitting">Падпіска</string>
+  <string name="log_submit_activity__posting_logs">Публікацыя логаў у gist...</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Ці жадаеце вы імпартаваць вашыя ўжо існуючыя паведамленні ў зашыфраваную базу TextSecure?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Сістэмная база паведамленняў ня будзе зменена ніякім чынам.</string>
+  <string name="database_migration_activity__skip">Прапусціць</string>
+  <string name="database_migration_activity__import">Імпарт</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Гэта можа заняць пэўны час. Калі ласка пацярпіце, мы паведамім вам, калі імпарт будзе скончаны.</string>
+  <string name="database_migration_activity__importing">ІМПАРТУЕЦЦА</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Абнаўленне базы дадзеных...</string>
+  <string name="export_fragment__export_plaintext_backup">Экспарт рэзервнай копіі простым тэкстам</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+Экспарт простым тэкстам рэзервнай копіі сумяшчальны з \'SMSBackup And Restore\' на SD картку.</string>
+  <string name="import_fragment__import_system_sms_database">Імпартаваць сістэмную базу SMS</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Імпарт базы дадзеных
+са стандартнай сістэмнай праграмы для SMS.</string>
+  <string name="import_fragment__import_encrypted_backup">Імпарт зашыфраванай рэзервнай копіі</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Аднавіць папярэдне экспартавануаю зашыфраваную рэзервную копію TextSecure.</string>
+  <string name="import_fragment__import_plaintext_backup">Імпартаваць рэзервную копію простым тэкстам</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Імпартаваць простым тэкстам рэзервную копію з файла. Сумяшчальна з \'SMSBackup And Restore.\'</string>
+  <!--media_overview_activity-->
+  <string name="media_overview_activity__no_images">Няма выявы</string>
+  <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">ВЕРЫФІКАВАЦЬ</string>
+  <string name="message_recipients_list_item__resend">ДАСЛАЦЬ ПАЎТОРНА</string>
+  <!--MmsPreferencesFragment-->
+  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Для вашага тэлефона патрэбныя ручныя налады SMS</string>
+  <string name="MmsPreferencesFragment__enabled">Уключана</string>
+  <string name="MmsPreferencesFragment__disabled">Выключана</string>
+  <string name="MmsPreferencesFragment__not_set">Не ўсталявана</string>
+  <string name="MmsPreferencesFragment__invalid_uri">Уведзены тэкст ня быў сапраўдным URI</string>
+  <string name="MmsPreferencesFragment__invalid_host">Уведзены тэкст ня быў сапраўдным хастом</string>
+  <!--GroupUtil-->
+  <string name="GroupUtil_joined_the_group">%1$s далучыўся да групы.</string>
+  <string name="GroupUtil_group_updated">Група абноўлена.</string>
+  <string name="GroupUtil_title_is_now">Зараз назва заменена на \'%1$s\'.</string>
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__unlock">Разблакіраваць</string>
+  <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure патрэбныя налады MMS для дастаўкі медыя і групавых паведамленняў праз аператара мабільнай сувязі. Ваша прылада не дазваляе атрымаць гэтыя налады.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Каб даслаць медыя ці групавыя паведамленні, націсніце \'OK\' і задайце неабходныя налады. Налады MMS для вашага аператара могуць быць атрыманыя праз пошук у \'APN вашага аператара\'. Вы можаце зрабіць гэта толькі адзін раз. </string>
+  <!--receive_key_activity-->
+  <string name="receive_key_activity__complete">Зроблена</string>
+  <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Праверце ваш тэлефонны нумар каб падлучыцца да TextSecure.</string>
+  <string name="registration_activity__your_country">ВАША КРАІНА</string>
+  <string name="registration_activity__your_country_code_and_phone_number">КОД ВАШАЙ КРАІНЫ І
+НУМАР ТЭЛЕФОНА</string>
+  <string name="registration_activity__phone_number">НУМАР ТЭЛЕФОНА</string>
+  <string name="registration_activity__register">Зарэгістравацца</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Працэс рэгістрацыі перадасць некаторую кантактную інфармацыю на сервер. Яна ня будзе захавана.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Неаторыя верагодныя праблемы
+уключаюць:</string>
+  <string name="registration_problems__sms_interceptors">SMS перахопнікі.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">Некаторыя іншыя праграмы для працы з тэкставымі паведамленнямі, такія як Handcent альбо GoSMS, спрацавалі некарэктна і перахопліваюць ўсе ўваходзячыя SMS паведамленні. Праверце, ці атрымалі вы SMS, якое пачынаецца з \'Your TextSecure verification code:\'. Калі гэта так, то вам неабходна наладзіць гэтую праграму такім чынам, каб яна прапускала далей гэтыя SMS.</string>
+  <string name="registration_problems__incorrect_number">Няправільны нумар</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+Калі ласка праверце правільнасць уводу вашага тэлефоннага нумару. Ён мусіць быць ўведзены па правілах вашага рэгіёну.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure ня будзе працаваць з Google Voice нумарамі.
+    </string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Галасавая верыфікацыя</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+TextSecure таксама можа набраць вам для праверкі тэлефоннага нумару. Націсніце \'Набраць мне\' і ўвядзіце 6ці значны код, які пачуеце.</string>
+  <string name="registration_progress_activity__verify">Праверыць</string>
+  <string name="registration_progress_activity__call_me">Набраць мне</string>
+  <string name="registration_progress_activity__edit_number">Рэдагаваць нумар</string>
+  <string name="registration_progress_activity__connectivity_error">Памылка злучэння.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
+TextSecure ня можа злучыцца з push сервісам.
+    </string>
+  <string name="registration_progress_activity__some_possible_problems_include">Некаторыя магчымыя праблемы, уключна:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Няма сеткавага злучэння.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Вашай прыладзе неабходна сеткавае злучэнне, каб выкарыстоўваць гэтыя функцыі TextSecure. Праверце ці падлучаны вы да сеткі праз 3G альбо Wi-Fi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Амбежавальны сеткавы экран.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">Калі вы падлучаны да інтэрнэта праз Wi-Fi, то верагодна што сеткавы экран блакіруе доступ да сервероў TextSecure. Паспрабуйце іншую сетку альбо мабільны інтэрнэт.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+Зараз TextSecure будзе аўматачна правяраць ваш тэлефонны нумар з дапамогай SMS.</string>
+  <string name="registration_progress_activity__connecting">Падлучэнне...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Чакаем на праверачную SMS...</string>
+  <string name="registration_progress_activity__registering_with_server">Рэгістрацыя на серверы...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Гэта можа заняць пэўны час. Калі ласка пацярпіце, мы паведамім, як толькі праверка будзе выканана.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+TextSecure не дачакаўся параверачная SMS.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Не атрымалася прайсці праверку праз SMS.</string>
+  <string name="registration_progress_activity__generating_keys">Генерацыя ключоў...</string>
+  <string name="registration_progress_activity__alert">Папярэджванне</string>
+  <string name="registration_progress_activity__telephone">Тэлефон</string>
+  <string name="registration_progress_activity__check">Праверыць</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to"><small>Увядзіце імя альбо нумар тэлефона</small></string>
+  <string name="recipients_panel__add_member">Дадаць удзельніка</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">Іх ідэнтыфікатар (яны чытаюць):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Ваш ідэнтыфікатар (вы чытаеце):</string>
+  <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Некаторыя акалічнасці патрабуюць вашай увагі.</string>
+  <string name="message_details_header__sent">Адпраўлена</string>
+  <string name="message_details_header__received">Атрымана</string>
+  <string name="message_details_header__via">Праз</string>
+  <string name="message_details_header__to">Каму:</string>
+  <string name="message_details_header__from">Ад каго:</string>
+  <string name="message_details_header__with">З:</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Стварыць пароль</string>
+  <string name="AndroidManifest__enter_passphrase">Увядзіце пароль</string>
+  <string name="AndroidManifest__select_contacts">Абраць кантакты</string>
+  <string name="AndroidManifest__textsecure_detected">Выяўлена TextSecure</string>
+  <string name="AndroidManifest__public_identity_key">Публічны ідэнтыфікацыйны ключ</string>
+  <string name="AndroidManifest__change_passphrase">Змяніць пароль</string>
+  <string name="AndroidManifest__verify_identity">Праверыць ідэнтыфікатар</string>
+  <string name="AndroidManifest__log_submit">Даслаць логі</string>
+  <string name="AndroidManifest__media_preview">Папярэдні прагляд медыя</string>
+  <string name="AndroidManifest__media_overview">Усе выявы</string>
+  <string name="AndroidManifest__media_overview_named">Усе выявы з %1$s</string>
+  <!--arrays.xml-->
+  <string name="arrays__import_export">Імпарт / экспарт</string>
+  <string name="arrays__my_identity_key">Мой ідэнтыфікацыйны ключ</string>
+  <string name="arrays__use_default">Выкарыстоўваць стандартны</string>
+  <string name="arrays__use_custom">Выкарыстоўваць кастамны</string>
+  <!--plurals.xml-->
+  <plurals name="minutes_ago">
+    <item quantity="one">%d хвіліна</item>
+    <item quantity="few">%d хвілін</item>
+    <item quantity="many">%d хвілін</item>
+    <item quantity="other">%d хвілін</item>
+  </plurals>
+  <plurals name="hours_ago">
+    <item quantity="one">%d гадзіна</item>
+    <item quantity="few">%d гадзін</item>
+    <item quantity="many">%d гадзін</item>
+    <item quantity="other">%d гадзін</item>
+  </plurals>
+  <!--preferences.xml-->
+  <string name="preferences__general">Агулам</string>
+  <string name="preferences__sms_mms">SMS і MMS</string>
+  <string name="preferences__pref_all_sms_title">Атрымаць усе SMS</string>
+  <string name="preferences__pref_all_mms_title">Атрымаць усе MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Выкарыстоўваць TextSecure для ўсіх уваходных SMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Выкарыстоўваць TextSecure для ўсіх уваходных MMS</string>
+  <string name="preferences__input_settings">Налады ўводу</string>
+  <string name="preferences__enable_enter_key_title">Уключыць клавішу Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Замяніць ключ смайліка на клавішу Enter</string>
+  <string name="preferences__pref_enter_sends_title">Дасылаць клавішай Enter</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Націск на клавішу Enter будзе дасылаць паведамленне</string>
+  <string name="preferences__display_settings">Налады адлюстравання</string>
+  <string name="preferences__choose_identity">Абярыце ідэнтыфікатар</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Абярыце кантакт са спісу.</string>
+  <string name="preferences__change_passphrase">Змяніць пароль.</string>
+  <string name="preferences__change_my_passphrase">Змяніць мой пароль</string>
+  <string name="preferences__enable_passphrase">Уключыць пароль</string>
+  <string name="preferences__passphrase_summary">Пароль %s</string>
+  <string name="preferences__enable_local_encryption_of_messages_and_keys">Уключыць лакальнае шыфраванне паведамленняў і ключоў</string>
+  <string name="preferences__screen_security">Бяспека экрана</string>
+  <string name="preferences__screen_security_summary">Бяспека экрана %s</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Блакіраваць магчымасць рабіць скрыншоты ўнутры праграмы</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Выдаляць пароль з памяці праз пэўны інтэрвал часу</string>
+  <string name="preferences__timeout_passphrase">Час запамінання пароля</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Абярыце час запамінання пароля</string>
+  <string name="preferences__pref_timeout_interval_title">Інтэрвал часу запамінання</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Значэнне часу, праз які пароль будзе выдалены з памяці</string>
+  <string name="preferences__notifications">Апавяшчэнні</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Адлюстроўваць апавяшчэнні пра паведамленні на статуснай панэлі</string>
+  <string name="preferences__led_color">колер святлодыёда</string>
+  <string name="preferences__led_color_unknown">Невядома</string>
+  <string name="preferences__pref_led_blink_title">Узор міргацення светладыёда</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Усталяваць пэўны ўзор міргацення светладыёда</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Уключаны для:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Выключаны для:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">Пэўны ўзор міргацення светладыёда усталяваны!</string>
+  <string name="preferences__sound">Гук</string>
+  <string name="preferences__change_notification_sound">Змяніць гук апавяшчэння</string>
+  <string name="preferences__inthread_notifications">Апавяшчэнне ў гутарцы</string>
+  <string name="preferences__play_inthread_notifications">Граць мелодыю апавяшчэння падчас прагляду актыўнай гутаркі.</string>
+  <string name="preferences__repeat_alerts">Паўтарыць папярэджанні</string>
+  <string name="preferences__never">Ніколі</string>
+  <string name="preferences__one_time">Адзін раз</string>
+  <string name="preferences__two_times">Два разы</string>
+  <string name="preferences__three_times">Тры разы</string>
+  <string name="preferences__five_times">Пяць разоў</string>
+  <string name="preferences__ten_times">Дзесяць разоў</string>
+  <string name="preferences__vibrate">Вібрыраваць</string>
+  <string name="preferences__also_vibrate_when_notified">Вібрацыя пры апавяшчэнні</string>
+  <string name="preferences__minutes">хвілін</string>
+  <string name="preferences__hours">гадзін</string>
+  <string name="preferences__green">Зялёны</string>
+  <string name="preferences__red">Чырвоны</string>
+  <string name="preferences__blue">Сіні</string>
+  <string name="preferences__orange">Памаранчовы</string>
+  <string name="preferences__cyan">Блакітны</string>
+  <string name="preferences__magenta">Пурпурны</string>
+  <string name="preferences__white">Белы</string>
+  <string name="preferences__none">Няма</string>
+  <string name="preferences__fast">Хутка</string>
+  <string name="preferences__normal">Нармальна</string>
+  <string name="preferences__slow">Павольна</string>
+  <string name="preferences__custom">Пэўны</string>
+  <string name="preferences__advanced">Прасунуты</string>
+  <string name="preferences__app_protection">Абарона аплікацыі</string>
+  <string name="preferences__advanced_mms_access_point_names">Ручныя налады MMS</string>
+  <string name="preferences__enable_manual_mms">Выкарыстоўваць ручныя налады MMS</string>
+  <string name="preferences__override_system_mms_settings">Перапісаць сістэмныя налады MMS тымі, якія знаходзяцца ніжэй.</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS Proxy Host</string>
+  <string name="preferences__mms_proxy_port">MMS Proxy Port</string>
+  <string name="preferences__mmsc_username">MMSC Username</string>
+  <string name="preferences__mmsc_password">MMSC Password</string>
+  <string name="preferences__sms_delivery_reports">Пацверджанне дастаўкі SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Патрабаваць пацверджанне дастаўкі для кожнай SMS якую вы даслалі</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Аўтаматычна выдаляць старыя паведамленні, калі размова перавышае зададзеную даўжыню</string>
+  <string name="preferences__delete_old_messages">Выдаляць старыя паведамленні</string>
+  <string name="preferences__conversation_length_limit">Ліміт даўжыні размовы</string>
+  <string name="preferences__trim_all_threads_now">Абрэзаць усе размовы зараз</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Прасканаваць усе размовы і прымяніць абмежаванне на іх даўжыню</string>
+  <string name="preferences__light_theme">Светлы</string>
+  <string name="preferences__dark_theme">Цёмны</string>
+  <string name="preferences__appearance">З\'яўленне</string>
+  <string name="preferences__theme">Тэма</string>
+  <string name="preferences__theme_summary">Тэма %s</string>
+  <string name="preferences__default">Па-змоўчані</string>
+  <string name="preferences__language">Мова</string>
+  <string name="preferences__language_summary">Мова %s</string>
+  <string name="preferences__textsecure_messages">Паведамленне TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Бясплатнае паведамленне для карыстальнікаў TextSecure альбо Signal</string>
+  <string name="preferences__submit_debug_log">Выслаць debug log</string>
+  <string name="preferences__support_wifi_calling">Рэжым сумяшчальнасці \'WiFi выклік\' </string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Уключыце, калі ваша прылада выкарыстоўвае SMS / MMS дастаўка праз WiFi (толькі калі рэжым \' Wi-Fi выклік\'  ўключана на прыладзе).</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">Абраць усё</string>
+  <string name="contact_selection_list__menu_unselect_all">Ачысціць усё</string>
+  <string name="contact_selection_list__header_textsecure_users">КАРЫСТАЛЬНІКІ TEXTSECURE</string>
+  <string name="contact_selection_list__header_other">УСЕ КАНТАКТЫ</string>
+  <string name="contact_selection_list__unknown_contact">Новае паведамленне для...</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">Гатова</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Абнавіць спіс кантактаў</string>
+  <!--conversation_callable-->
+  <string name="conversation_callable__menu_call">Набраць</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">Дэталі паведамлення</string>
+  <string name="conversation_context__menu_copy_text">Капіраваць тэкст</string>
+  <string name="conversation_context__menu_delete_message">Выдаліць паведамленне</string>
+  <string name="conversation_context__menu_forward_message">Перанакіраваць паведамленне</string>
+  <string name="conversation_context__menu_resend_message">Выслаць паведамленне ізноў</string>
+  <!--conversation_context_image-->
+  <string name="conversation_context_image__save_attachment">Захаваць дадатак</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">Запрасіць</string>
+  <!--conversation_insecure_no_push-->
+  <string name="conversation_insecure__menu_start_secure_session">Пачаць бяспечную сэсію</string>
+  <string name="conversation_insecure__security">Бяспека</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Выдаліць абранае</string>
+  <string name="conversation_list_batch__menu_select_all">Выбраць усё</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">Пошук</string>
+  <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">Фота кантакта</string>
+  <string name="conversation_list_item_view__attachment_indicator">Індыкатар дадатку</string>
+  <string name="conversation_list_item_view__error_alert">Папярэджванне пра памылкі</string>
+  <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">Новая размова</string>
+  <!--conversation_secure_verified-->
+  <string name="conversation_secure_verified__menu_security">Бяспка</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Праверыць ідэнтыфікатар</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Скончыць бяспечную сэсію</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">Прыкласці дадатак</string>
+  <string name="conversation__menu_update_group">Абнавіць групу</string>
+  <string name="conversation__menu_leave_group">Пакінуць групу</string>
+  <string name="conversation__menu_delete_thread">Выдаліць ланцужок</string>
+  <string name="conversation__menu_view_media">Усе выявы</string>
+  <!--conversation_callable-->
+  <string name="conversation_add_to_contacts__menu_add_to_contacts">Дадаць да кантактаў</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Спіс атрымальнікаў</string>
+  <string name="conversation_group_options__delivery">Дастаўка</string>
+  <string name="conversation_group_options__conversation">Гутарка</string>
+  <string name="conversation_group_options__broadcast">Трансляцыя</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">Параўнаць</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Скануюцца для параўнання</string>
+  <string name="key_scanning__menu_scan_to_compare">Адскануйце каб параўнаць</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Новае паведамленне</string>
+  <string name="text_secure_normal__menu_new_group">Новая група</string>
+  <string name="text_secure_normal__menu_settings">Налады</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Заблакіраваць</string>
+  <string name="text_secure_normal__mark_all_as_read">Пазначыць усе як прачытаныя</string>
+  <!--reminder_header-->
+  <string name="reminder_header_expired_build">Ваша зборка TextSecure з\'яўляецца старой!</string>
+  <string name="reminder_header_expired_build_details">Паведамленні больш ня будуць высылацца. Калі ласка абнавіцеся да больш новай версіі.</string>
+  <string name="reminder_header_sms_default_title">Выкарыстоўваць як стандартную аплікацыю для SMS?</string>
+  <string name="reminder_header_sms_default_text">Націсніце, каб зрабіць TextSecure вашай стандартнай аплікацыяй для SMS.</string>
+  <string name="reminder_header_sms_import_title">Імпартаваць сістэмныя SMS?</string>
+  <string name="reminder_header_sms_import_text">Націсніце каб скапіраваць вашыя SMS з тэлефона ў зашыфраваную базу.</string>
+  <string name="reminder_header_push_title">Уключыць паведамленні TextSecure?</string>
+  <string name="reminder_header_push_text">Націсніце для імгненнай дастаўкі, якаснай прыватнасці, і адсутнасці збораў за SMS.</string>
+  <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">Вы</string>
+  <string name="MediaPreviewActivity_cant_display">Не атрымліваецца папярэдне праглядзець выяву</string>
+  <string name="MediaPreviewActivity_unssuported_media_type">Гэты медыя тып не падтрымліваецца</string>
+  <!--media_preview-->
+  <string name="media_preview__save_title">Захаваць</string>
+  <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">Перадпрагляд выявы</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">Выдаленне...</string>
+  <string name="trimmer__deleting_old_messages">Выдаленне старых паведамленняў...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Старыя паведамленні паспяхова выдалены</string>
+  <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">Транспартны значок</string>
+  <!--EOF-->
+</resources>

res/values-bg/strings.xml

@@ -26,19 +26,12 @@
 Ще се наложи да регистрираш своя номер повторно, за да използваш интернет съобщения в бъдеще.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка при свързване със сървъра!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Получаване на SMS-и Разрешено</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Натисни, за да зададеш SMS програма по подразбиране</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Получаване на SMS-и Забранено</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Натисни, за да зададеш TextSecure като SMS програма по подразбиране</string>
   <string name="ApplicationPreferencesActivity_on">вкл</string>
   <string name="ApplicationPreferencesActivity_On">Включено</string>
   <string name="ApplicationPreferencesActivity_off">изкл</string>
   <string name="ApplicationPreferencesActivity_Off">Изключено</string>
-  <string name="ApplicationPreferencesActivity_partial">частично</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Входящ %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">изходящ %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d минути</string>
   <!--DraftDatabase-->
@@ -69,6 +62,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted">Натисни, за да разрешиш преминавене към не криптирани съобщения в краен случай</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Разреши преминавене към не шифровани SMS-и?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Разреши преминавене към не шифровани MMS-и?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Това съобщение <b>няма</b> да бъде криптирано, защото получателят вече не е TextSecure потребител.\n\n.Изпрати незащитено съобщение? </string>
   <string name="ConversationItem_unable_to_open_media">Неуспешно откриване на приложение за отваряне на този файл.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Започни сигурна сесия?</string>
@@ -363,6 +357,7 @@ SMS съобщенията от системната базата данни в
   <string name="MessageNotifier_d_new_messages">%d нови съобщения</string>
   <string name="MessageNotifier_most_recent_from_s">Най-скорошното от: %s</string>
   <string name="MessageNotifier_encrypted_message">Шифровано съобщение...</string>
+  <string name="MessageNotifier_media_message_with_text">Медийно съобщение: %s</string>
   <string name="MessageNotifier_no_subject">(Няма зададена тема)</string>
   <string name="MessageNotifier_message_delivery_failed">Изпращането на съобщението неуспешно.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Неуспешно изпращането на съобщението.</string>
@@ -391,9 +386,7 @@ SMS съобщенията от системната базата данни в
   <string name="contact_selection_recent_activity__no_recent_calls">Няма скорошни обаждания.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Изпрати TextSecure съобщение</string>
-  <string name="conversation_activity__type_message_sms_secure">Изпрати сигурен SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Изпрати некриптиран SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Изпрати сигурен MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Изпрати некриптиран MMS</string>
   <string name="conversation_activity__send">Изпрати</string>
   <string name="conversation_activity__remove">Премахни</string>
@@ -402,6 +395,7 @@ SMS съобщенията от системната базата данни в
   <string name="conversation_activity__emoji_toggle_description">Смени emoji клавиатурата</string>
   <string name="conversation_activity__attachment_thumbnail">Изображение на прикачен файл</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Изтегляне на медийно съобщение</string>
   <string name="conversation_item__mms_image_description">Медийно съобщение</string>
   <string name="conversation_item__play_button_description">Бутон за възпроизвеждане</string>
   <string name="conversation_item__secure_message_description">Подсигурено съобщение</string>
@@ -471,6 +465,8 @@ SMS съобщенията от системната базата данни в
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Завършен</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Потвърди своя телфонен номер, за да се свържеш с TextSecure</string>
   <string name="registration_activity__your_country">ТВОЯТА ДЪРЖАВА</string>
   <string name="registration_activity__your_country_code_and_phone_number">КОДА НА ТВОЯТА ДЪРЖАВА И
 ТЕЛЕФОНЕН НОМЕР</string>
@@ -580,11 +576,8 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <!--preferences.xml-->
   <string name="preferences__general">Общо</string>
   <string name="preferences__sms_mms">SMS и MMS</string>
-  <string name="preferences__push_sms_category">Интернет съобщения и SMS</string>
   <string name="preferences__pref_all_sms_title">Използвай за всички SMS-и</string>
   <string name="preferences__pref_all_mms_title">Използвай за всички MMS-и</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Използвай TextSecure за разглеждане и съхраняване на всички входящи текстови съобщения</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Използвай TextSecure за разглеждане и съхраняване на всички входящи мултимедийни съобщения</string>
   <string name="preferences__input_settings">Настройки на въвеждането</string>
   <string name="preferences__enable_enter_key_title">Разреши клавиша Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Замени клавиша за емотикони с клавиша Enter</string>
@@ -667,21 +660,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="preferences__default">По подразбиране</string>
   <string name="preferences__language">Език</string>
   <string name="preferences__language_summary">Език %s</string>
-  <string name="preferences__make_default_sms_app">Задай SMS програма по подразбиране</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Направи TextSecure SMS/MMS програма по подразбиране.</string>
-  <string name="preferences__use_data_channel">Интернет съобщения</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Увеличи сигурността си и избегни SMS таксите като използваш интернет връзката, за да се свържеш с други TextSecure потребители</string>
-  <string name="preferences__sms_fallback">Изходящи SMS/MMS</string>
   <string name="preferences__submit_debug_log">Изпрати доклад</string>
-  <string name="preferences__sms_outgoing_push_users">Потребители използващи TextSecure </string>
-  <string name="preferences__sms_fallback_push_users_ask">първо питай</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">без MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Изпращай сигурни SMS-и ако се изгуби интернет връзката</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Питай преди изпращане на SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Никога не пращай MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Потребители не ползващи TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Никой</string>
   <string name="preferences__support_wifi_calling">Съвместим режим \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включете ако устройството ти използва SMS/MMS през WiFi (използвай само, когато \'WiFi Calling\' e включено на устройството ти).</string>
   <!--****************************************-->

res/values-bo/strings.xml

@@ -178,8 +178,6 @@
   <!--arrays.xml-->
   <!--plurals.xml-->
   <!--preferences.xml-->
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">ནང་ཡོང་འཕྲིན་ཐུང་ཚང་མར་བལྟ་བ་དང་ཉར་བ་ལ་གཡག་འཕྲིན་བེད་སྤྱོད་ཐོངས།</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">ནང་ཡོང་སྣ་མང་འཕྲིན་ཐུང་རིགས་ལ་ཉར་ཚགས་དང་ཞིབ་ལྟའི་ཆེད་དུ་གཡག་འཕྲིན་བེད་སྤྱོད་ཐོངས།</string>
   <string name="preferences__input_settings">ནང་འཇུག་སྒྲིག་བཟོ། </string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">འབྲེལ་ཐོ་ནས་ཁྱེད་ཀྱིས་འབྲེལ་བ་བྱེད་ས་དེ་གདེམས། </string>
   <string name="preferences__change_passphrase">གསང་ཚིག་བརྗེ་བོ་རྒྱོབས།</string>

res/values-ca/strings.xml

@@ -307,8 +307,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <!--plurals.xml-->
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilitza TextSecure per veure i emmagatzemar tots els missatges de text entrants</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilitza TextSecure per veure i emmagatzemar tots els missatges multimèdia entrants</string>
   <string name="preferences__enable_enter_key_title">Habilita la tecla Enter</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Escull el teu contacte de la llista de contactes</string>
   <string name="preferences__change_passphrase">Canvia frase contrasenya</string>
@@ -355,11 +353,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Predeterminat</string>
   <string name="preferences__language">Idioma</string>
-  <string name="preferences__make_default_sms_app">Estableix com a app d\'SMS predeterminada</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Fes TextSecure l\'aplicació d\'SMS/MMS predeterminada del teu sistema.</string>
-  <string name="preferences__use_data_channel">Missatges Push</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Augmenta la privacitat i evita els càrrecs d\'SMS utilitzant el canal de dades per comunicar-se amb altres usuaris de TextSecure</string>
   <string name="preferences__submit_debug_log">Envia un registre de depuració</string>
   <!--****************************************-->
   <!--menus-->

res/values-cs/strings.xml

@@ -3,15 +3,15 @@
   <string name="app_name">TextSecure</string>
   <string name="yes">Ano</string>
   <string name="no">Ne</string>
-  <string name="delete">Vymazat</string>
+  <string name="delete">Smazat</string>
   <string name="please_wait">Prosím čekejte...</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Aktuálně: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Dosud nemáte nastavené heslo!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s zpráv na konverzaci</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Vymazat všechny staré zprávy?</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Smazat všechny staré zprávy?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Opravdu chcete všechny konverzace zkrátit na posledních %s zpráv?</string>
-  <string name="ApplicationPreferencesActivity_delete">Vymazat</string>
+  <string name="ApplicationPreferencesActivity_delete">Smazat</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktivovat šifrování lokálně uložených zpráv?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
 Varování: Tímto znemožníte šifrování všech uložených zpráv a klíčů. Vaše komunikace
@@ -25,19 +25,15 @@ k vašemu zařízení.</string>
 Tímto zakážete TextSecure zprávy odregistrací ze serveru.
 Abyste mohli používat TextSecure zprávy v budoucnosti, budete muset znovu registrovat vaše telefonní číslo.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba při připojování k serveru!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Povolené příchozí SMS</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS povoleny</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotykem nastavte výchozí aplikaci pro SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Příchozí SMS zprávy zakázány</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS zazány</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Dotykem nastavíte TextSecure jako výchozí SMS aplikaci</string>
   <string name="ApplicationPreferencesActivity_on">zap.</string>
   <string name="ApplicationPreferencesActivity_On">Zap.</string>
   <string name="ApplicationPreferencesActivity_off">vyp.</string>
   <string name="ApplicationPreferencesActivity_Off">Vyp.</string>
-  <string name="ApplicationPreferencesActivity_partial">částečně</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Příchozí %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">odchozí %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minut</string>
   <!--DraftDatabase-->
@@ -79,7 +75,7 @@ kontakt</string>
   <string name="ConversationActivity_abort_secure_session_confirmation">Potvrzení ukončení zabezpečené komunikace</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Opravdu chcete ukončit tuto zabezpečenou relaci?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Potvrzení smazání konverzace</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Opravdu chcete zcela vymazat tuto konverzaci?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Opravdu chcete zcela smazat tuto konverzaci?</string>
   <string name="ConversationActivity_add_attachment">Přidat přílohu</string>
   <string name="ConversationActivity_select_contact_info">Vybrat informace o kontaktu</string>
   <string name="ConversationActivity_compose_message">Napište zprávu</string>
@@ -110,7 +106,7 @@ kontakt</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Přenos: %1$s\nOdesláno/Přijato: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Odesílatel: %1$s\nPřenos: %2$s\nOdesláno: %3$s\nPřijato: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Potvrďte smazání zpráv</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Opravdu chcete trvale vymazat všechny vybrané zprávy?</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Opravdu chcete trvale smazat všechny vybrané zprávy?</string>
   <string name="ConversationFragment_save_to_sd_card">Uložit do paměti?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Uložením dat do paměti umožníte přístup k nim kterékoliv aplikaci ve vašem telefonu.\n\nPokračovat?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Chyba při ukládání přílohy!</string>
@@ -383,9 +379,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="contact_selection_recent_activity__no_recent_calls">Žádné nedávné hovory</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Poslat TextSecure zprávu</string>
-  <string name="conversation_activity__type_message_sms_secure">Poslat zabezpečenou SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Poslat nezabezpečenou SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Poslat zabezpečenou MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Poslat nezabezpečenou MMS</string>
   <string name="conversation_activity__send">Odeslat</string>
   <string name="conversation_activity__remove">Odebrat</string>
@@ -575,14 +569,13 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <!--preferences.xml-->
   <string name="preferences__general">Obecné</string>
   <string name="preferences__sms_mms">SMS a MMS</string>
-  <string name="preferences__push_sms_category">TextSecure i SMS</string>
   <string name="preferences__pref_all_sms_title">Přijímat všechny SMS</string>
   <string name="preferences__pref_all_mms_title">Přijímat všechny MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Používat TextSecure k prohlížení a uchování všech SMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Použít TextSecure pro všechny příchozí textové zprávy</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Používat TextSecure k prohlížení a uchování všech MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Použít TextSecure pro všechny příchozí multimediální zprávy</string>
   <string name="preferences__input_settings">Nastavení vstupu</string>
   <string name="preferences__enable_enter_key_title">Používat Enter</string>
-  <string name="preferences__replace_smiley_with_enter_key">Nahradit klávesu emotikon klávesou enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Nahradit klávesu smajlík klávesou enter</string>
   <string name="preferences__pref_enter_sends_title">Klávesa \'Enter\' odesílá</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Stisk tlačítka \'enter\' na klávesnici odešle zprávu</string>
   <string name="preferences__display_settings">Nastavení zobrazení</string>
@@ -607,8 +600,8 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__led_color_unknown">Neznámý</string>
   <string name="preferences__pref_led_blink_title">Schéma blikání LED</string>
   <string name="preferences__pref_led_blink_custom_pattern_title">Změnit způsob blikání LED</string>
-  <string name="preferences__pref_led_blink_custom_pattern_on_for">Zapnout pro: </string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Zapnout po: </string>
-  <string name="preferences__pref_led_blink_custom_pattern_off_for">Vypnout pro:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Vypnout po:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Způsob blikání LED byl nastaven!</string>
   <string name="preferences__sound">Zvuk</string>
   <string name="preferences__change_notification_sound">Změnit zvuk upozornění</string>
@@ -650,9 +643,9 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__sms_delivery_reports">Doručenky SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">U každé odeslané zprávy požadovat potvrzení o doručení</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticky mazat starší zprávy jakmile konverzace přesáhne určitou délku</string>
-  <string name="preferences__delete_old_messages">Vymazat staré zprávy</string>
+  <string name="preferences__delete_old_messages">Smazat staré zprávy</string>
   <string name="preferences__conversation_length_limit">Limit délky konverzací</string>
-  <string name="preferences__trim_all_threads_now">Zastřihnout konverzace</string>
+  <string name="preferences__trim_all_threads_now">Zkrátit konverzace</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Pohledat všechny konverzace a uplatnit limit délky.</string>
   <string name="preferences__light_theme">Světlý</string>
   <string name="preferences__dark_theme">Tmavý</string>
@@ -662,22 +655,10 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="preferences__default">Výchozí</string>
   <string name="preferences__language">Jazyk</string>
   <string name="preferences__language_summary">Jazyk %s</string>
-  <string name="preferences__make_default_sms_app">Nastavit jako výchozí aplikaci pro SMS</string>
+  <string name="preferences__textsecure_messages">TextSecure zprávy</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Učinit TextSecure na tomto systému výchozí aplikací pro SMS a MMS</string>
-  <string name="preferences__use_data_channel">TextSecure zprávy</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-        Zvyšte úroveň soukromí a vyhněte se poplatkům za SMS používáním datového připojení pro komunikaci s ostatními uživateli TextSecure
+Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</string>
-    </string>
+  <string name="preferences__submit_debug_log">Odeslat ladící log</string>
-  <string name="preferences__sms_fallback">Odchozí SMS/MMS</string>
-  <string name="preferences__submit_debug_log">Odeslat debugovací log</string>
-  <string name="preferences__sms_outgoing_push_users">Uživatelé TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">nejprve se zeptat</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">žádné MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Poslat šifrovanoou SMS v případě nedostupnosti datového spojení</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Zeptat se před posláním SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nikdy neposílat MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Ne-TextSecure uživatelé</string>
-  <string name="preferences__sms_fallback_nobody">Nikdo</string>
   <string name="preferences__support_wifi_calling">\'Wifi volání\' kompatibilní mód</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Povolte pokud vaše zařízení používá k doručování SMS/MMS Wifi (povoleno pouze pokud je \'Wifi volání\' povoleno na vašem zařízení).</string>
   <!--****************************************-->
@@ -698,7 +679,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Podrobnosti zprávy</string>
   <string name="conversation_context__menu_copy_text">Kopírovat text</string>
-  <string name="conversation_context__menu_delete_message">Vymazat zprávu</string>
+  <string name="conversation_context__menu_delete_message">Smazat zprávu</string>
   <string name="conversation_context__menu_forward_message">Přeposlat zprávu</string>
   <string name="conversation_context__menu_resend_message">Znovu poslat zprávu</string>
   <!--conversation_context_image-->
@@ -709,7 +690,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="conversation_insecure__menu_start_secure_session">Zahájit šifrovanou konverzaci</string>
   <string name="conversation_insecure__security">Zabezpečení</string>
   <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Vymazat označené</string>
+  <string name="conversation_list_batch__menu_delete_selected">Smazat označené</string>
   <string name="conversation_list_batch__menu_select_all">Označit vše</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Hledat</string>
@@ -727,7 +708,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <string name="conversation__menu_add_attachment">Přidat přílohu</string>
   <string name="conversation__menu_update_group">Upravit skupinu</string>
   <string name="conversation__menu_leave_group">Opustit skupinu</string>
-  <string name="conversation__menu_delete_thread">Vymazt konverzaci</string>
+  <string name="conversation__menu_delete_thread">Smazat konverzaci</string>
   <string name="conversation__menu_view_media">Všechny obrázky</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Přidat do kontaktů</string>
@@ -766,7 +747,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
   <!--Trimmer-->
   <string name="trimmer__deleting">Mazání...</string>
   <string name="trimmer__deleting_old_messages">Mazání starých zpráv...</string>
-  <string name="trimmer__old_messages_successfully_deleted">Staré zprávy byly úspěšně vymazány.</string>
+  <string name="trimmer__old_messages_successfully_deleted">Staré zprávy byly úspěšně smazány.</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona přenosu</string>
   <!--EOF-->

res/values-da/strings.xml

@@ -27,12 +27,8 @@ Dette vil deaktivere \'push\' beskeder, og afregistrerer dig fra tjenesten.
 Du skal registrere dit telefonnummer påny hvis du vil bruge \'push\' beskeder i fremtiden.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kunne ikke oprette forbindelse til serveren!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiveret</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Brug som standard SMS program</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS deaktiveret</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Brug TextSecure som dit standard SMS program</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutter</string>
   <!--DraftDatabase-->
@@ -337,9 +333,7 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="contact_selection_recent_activity__no_recent_calls">Ingen nye samtaler.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Send TextSecure besked</string>
-  <string name="conversation_activity__type_message_sms_secure">Send krypteret SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Send usikker (ikke krypteret) SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Send krypteret MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Send usikker (ikke krypteret) SMS</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slet</string>
@@ -474,11 +468,8 @@ fejlede.
   <!--plurals.xml-->
   <!--preferences.xml-->
   <string name="preferences__general">Generelt</string>
-  <string name="preferences__push_sms_category">\'Push\' og SMS</string>
   <string name="preferences__pref_all_sms_title">Modtag alle SMS</string>
   <string name="preferences__pref_all_mms_title">Modtag alle MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Brug TextSecure til at læse og gemme alle indkommende SMS beskeder.</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Brug TextSecure til at læse og gemme alle indkommende MMS beskeder.</string>
   <string name="preferences__input_settings">Indstillinger</string>
   <string name="preferences__enable_enter_key_title">Slå enter-knap til</string>
   <string name="preferences__replace_smiley_with_enter_key">Erstat \\"Smiley-knap\\" med en \\"Enter-knap\\"</string>
@@ -537,16 +528,7 @@ fejlede.
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Sprog</string>
-  <string name="preferences__make_default_sms_app">Brug som standard SMS-app</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Gør TextSecure til standard SMS/MMS-applikationen for dit system.</string>
-  <string name="preferences__use_data_channel">Push besked</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Styrk sikkerheden af din data kommunikation og undgå SMS gebyrer ved at bruge mobil data når du kommunikerer med andre TextSecure brugere.</string>
   <string name="preferences__submit_debug_log">Indsend fejlfindings log</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure brugere</string>
-  <string name="preferences__sms_outgoing_push_users_description">Send sikker sms, hvis data-forbindelse er tabt</string>
-  <string name="preferences__sms_fallback_non_push_users">Brugere uden TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Ingen</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-de/strings.xml

@@ -23,19 +23,15 @@ Ihre verschlüsselten Unterhaltungen werden weiterhin funktionieren, aber jemand
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 Durch das Deaktivieren von TextSecure-Nachrichten wird Ihre Registrierung bei TextSecure aufgehoben. Um zukünftig wieder TextSecure-Nachrichten nutzen zu können, muss Ihre Rufnummer erneut registriert werden.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden zum Server!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Eingehende SMS aktiviert</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiviert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Standard-SMS-App ändern</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Eingehende SMS deaktiviert</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS deaktiviert</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">TextSecure als Standard-SMS-App verwenden</string>
   <string name="ApplicationPreferencesActivity_on">an</string>
   <string name="ApplicationPreferencesActivity_On">An</string>
   <string name="ApplicationPreferencesActivity_off">aus</string>
   <string name="ApplicationPreferencesActivity_Off">Aus</string>
-  <string name="ApplicationPreferencesActivity_partial">teilweise</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Eingehend %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">ausgehend %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d Minuten</string>
   <!--DraftDatabase-->
@@ -376,9 +372,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Fortfahren antippen.</string
   <string name="contact_selection_recent_activity__no_recent_calls">Keine letzten Anrufe</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">TextSecure-Nachricht senden</string>
-  <string name="conversation_activity__type_message_sms_secure">Sichere SMS senden</string>
   <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS senden</string>
-  <string name="conversation_activity__type_message_mms_secure">Sichere MMS senden</string>
   <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS senden</string>
   <string name="conversation_activity__send">Senden</string>
   <string name="conversation_activity__remove">Löschen</string>
@@ -546,11 +540,10 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Allgemein</string>
   <string name="preferences__sms_mms">SMS und MMS</string>
-  <string name="preferences__push_sms_category">TextSecure-Nachrichten, SMS &amp; MMS</string>
   <string name="preferences__pref_all_sms_title">Für SMS-Empfang benutzen</string>
   <string name="preferences__pref_all_mms_title">Für MMS-Empfang benutzen</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure zur Anzeige und Speicherung aller eingehenden SMS verwenden</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure für alle eingehenden SMS verwenden</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure zur Anzeige und Speicherung aller eingehenden MMS verwenden</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure für alle eingehenden MMS verwenden</string>
   <string name="preferences__input_settings">Eingabe</string>
   <string name="preferences__enable_enter_key_title">Eingabetaste aktivieren</string>
   <string name="preferences__replace_smiley_with_enter_key">Emoji-Taste durch Eingabetaste ersetzen</string>
@@ -587,11 +580,11 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__play_inthread_notifications">Benachrichtigungston während aktiver Unterhaltungen abspielen</string>
   <string name="preferences__repeat_alerts">Benachrichtigungen wiederholen</string>
   <string name="preferences__never">Nie</string>
-  <string name="preferences__one_time">Ein Mal</string>
+  <string name="preferences__one_time">Einmal</string>
-  <string name="preferences__two_times">Zwei Mal</string>
+  <string name="preferences__two_times">Zweimal</string>
-  <string name="preferences__three_times">Drei Mal</string>
+  <string name="preferences__three_times">Dreimal</string>
-  <string name="preferences__five_times">Fünf Mal</string>
+  <string name="preferences__five_times">Fünfmal</string>
-  <string name="preferences__ten_times">Zehn Mal</string>
+  <string name="preferences__ten_times">Zehnmal</string>
   <string name="preferences__vibrate">Vibration</string>
   <string name="preferences__also_vibrate_when_notified">Bei Benachrichtigungen vibrieren</string>
   <string name="preferences__minutes">Minuten</string>
@@ -633,21 +626,10 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Sprache</string>
   <string name="preferences__language_summary">Sprache %s</string>
-  <string name="preferences__make_default_sms_app">Als Standard-SMS-Anwendung einrichten</string>
+  <string name="preferences__textsecure_messages">TextSecure-Nachrichten</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure als Standard-SMS/MMS-Anwendung einrichten.</string>
-  <string name="preferences__use_data_channel">TextSecure-Nachrichten</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Mehr Privatsphäre und keine SMS-Kosten durch Nutzung der Datenverbindung zur Kommunikation mit anderen TextSecure-Nutzern</string>
+Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austauschen</string>
-  <string name="preferences__sms_fallback">Ausgehende SMS/MMS</string>
   <string name="preferences__submit_debug_log">Diagnoseprotokoll übermitteln</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure-Kontakte</string>
-  <string name="preferences__sms_fallback_push_users_ask">vorher fragen</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">keine MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Verschlüsselte SMS senden, falls kein Internetzugriff möglich ist</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Vor dem Senden von SMS/MMS nachfragen</string>
-  <string name="preferences__sms_fallback_never_send_mms">Niemals MMS senden</string>
-  <string name="preferences__sms_fallback_non_push_users">Kontakte ohne TextSecure-Registrierung</string>
-  <string name="preferences__sms_fallback_nobody">Niemand</string>
   <string name="preferences__support_wifi_calling">Kompatibilität WLAN-Telefonie</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivieren, falls das Gerät SMS/MMS über WLAN nutzt (nur bei aktivierter WLAN-Telefonie)</string>
   <!--****************************************-->

res/values-el/strings.xml

@@ -7,37 +7,33 @@
   <string name="please_wait">Παρακαλώ περιμένετε...</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Αυτή τη στιγμή: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχετε ορίσει συνθηματική φράση!</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχετε ορίσει συνθηματικό!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s μηνύματα ανά συζήτηση</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Διαγραφή όλων των παλιών μηνυμάτων τώρα;</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Είστε σίγουροι πως θέλετε να μειωθούν όλες οι συζητήσεις στα %s πιο πρόσφατα μηνύματα;</string>
   <string name="ApplicationPreferencesActivity_delete">Διαγραφή</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Απενεργοποίηση κρυπτογράφησης αποθήκευσης;</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-        Προσοχή, αυτό θα απενεργοποιήσει τη κρυπτογράφηση αποθήκευσης για όλα τα μηνύματα και τα κλειδιά σας.
+Προσοχή, αυτό θα απενεργοποιήσει τη κρυπτογράφηση αποθήκευσης για όλα τα
-        Οι κρυπτογραφημένες συζητήσεις σας θα συνεχίσουν να λειτουργούν, αλλά όποιος έχει φυσική πρόσβαση στη συσκευή σας θα
+μηνύματα και τα κλειδιά σας.
-        μπορεί να τις διαβάσει.
+Οι κρυπτογραφημένες συζητήσεις σας θα συνεχίσουν να λειτουργούν, αλλά όποιος έχει
+φυσική πρόσβαση στη συσκευή σας θα μπορεί να τις διαβάσει.
     </string>
   <string name="ApplicationPreferencesActivity_disable">Απενεργοποίηση</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Διαγραφή...</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Κατάργηση Εγγραφής...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Μη εγγεγραμένος για μεταφορά δεδομένων</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Κατάργηση εγγραφής για την επικοινωνία μέσω δεδομένων</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Απενεργοποίηση μηνυμάτων push (μέσω Internet);</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-Αυτή η επιλογή θα απενεργοποιήσει τα μηνύματα push (μέσω Internet).
+Αυτή η επιλογή θα απενεργοποιήσει τα μηνύματα push, καταργώντας την εγγραφή σας στον διακομιστή.
 Αν θελήσετε να χρησιμοποιήσετε μηνύματα push στο μέλλον, θα πρέπει να επανεγγραφείτε.
  </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Σφάλμα κατά τη σύνδεση με τον διακομιστή!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Ενεργοποίηση των εισερχομένων μηνύματων</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Πιέστε για να αλλάξετε την προεπιλεγμένη εφαρμογή για SMS</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Προεπιλεγμένη εφαρμογή για SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Πιέστε για να κάνετε το TextSecure την προεπιλεγμένη εφαρμογή για μηνύματα SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Απενεργοποίηση εισερχομένων </string>
+  <string name="ApplicationPreferencesActivity_on">ενεργοποίηση</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Προεπιλεγμένη εφαρμογή για SMS</string>
+  <string name="ApplicationPreferencesActivity_On">Ενεργοποίηση</string>
-  <string name="ApplicationPreferencesActivity_on">Ενεργοποιηση</string>
+  <string name="ApplicationPreferencesActivity_off">απενεργοποίηση</string>
-  <string name="ApplicationPreferencesActivity_On">Ενεργοποιηση</string>
+  <string name="ApplicationPreferencesActivity_Off">Απενεργοποίηση</string>
-  <string name="ApplicationPreferencesActivity_off">Απενεργοποιηση</string>
-  <string name="ApplicationPreferencesActivity_Off">Απενεργοποιηση</string>
-  <string name="ApplicationPreferencesActivity_partial">μερικό</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d λεπτά</string>
   <!--DraftDatabase-->
@@ -53,30 +49,31 @@
   <string name="AttachmentTypeSelectorAdapter_contact">Πληροφοριες επαφής</string>
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Το
-        αποτύπωμα αυτής της ανταλλαγής κλειδιών %1$s είναι διαφορετικό από αυτό που λάβαμε πρωτύτερα από αυτή την
+αποτύπωμα αυτής της ανταλλαγής κλειδιών για τον/την %1$s είναι διαφορετικό από αυτό που λάβαμε πρωτύτερα από αυτή την
-        επαφή. Αυτό σημαίνει είτε ότι κάποιος προσπαθεί να υποκλέψει τη συνομιλία σας, ή
+επαφή. Αυτό σημαίνει είτε ότι κάποιος προσπαθεί να υποκλέψει τη συνομιλία σας, ή
-        ότι αυτή η επαφή απλά %2$s  επανεγκτέστησε το TextSecure και τώρα έχει νέο κλειδί ταυτότητας.
+ότι ο/η %2$s απλά επανεγκτέστησε το TextSecure και τώρα έχει νέο κλειδί ταυτότητας.
     </string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Προτείνεται να επιβεβαιώσετε
         αυτήν την επαφή.
     </string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Μέγεθος μηνύματος: %d KB</string>
-  <string name="ConversationItem_expires_s">Παύει να ισχύει: %s</string>
+  <string name="ConversationItem_expires_s">Λήγει: %s</string>
   <string name="ConversationItem_error_not_delivered">Δεν παραδόθηκε</string>
   <string name="ConversationItem_view_secure_media_question">Προβολή ασφαλών πολυμέσων;</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Αυτό το αρχείο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Δυστυχώς, για να το ανοίξετε με κάποιο εξωτερικό πρόγραμμα, είναι απαραίτητο να αποκρυπτογραφηθεί και να εγγραφεί στον δίσκο. Είστε σίγουροι πως το θέλετε αυτό;</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Σφάλμα, λάβαμε παλιό μήνυμα ανταλλαγής κλειδιών.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, κάνετε κλικ για να επεξεργαστεί.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, κάνετε κλικ για επεξεργασία.</string>
-  <string name="ConversationItem_group_action_left">%1$s έφυγαν απο την ομάδα.</string>
+  <string name="ConversationItem_group_action_left">Ο/Η %1$s έφυγε απο την ομάδα.</string>
   <string name="ConversationItem_click_for_details">Πατήστε για λεπτομέρειες</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Πατήστε για ακάλυπτη εναλλακτική</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Πατήστε για απροστάτευτη εναλλακτική</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Να γίνει αποστολή ΜΗ κρυπτογραφημενου μηνύματος?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Χρήση απροστάτευτου MMS ως εναλλακτικό κανάλι?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Χρήση μη κρυπτογραφημένου MMS ως εναλλακτική;</string>
-  <string name="ConversationItem_unable_to_open_media">Δεν μπορεί να βρεθεί μια εφαρμογή που είναι σε θέση να ανοίξει αυτό το μέσο.</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Αυτό το μήνυμα <b>δεν</b> θα κρυπτογραφηθεί, επειδή ο παραλήπτης δεν είναι πλέον χρήστης του TextSecure.\n\nΝα σταλεί το μήνυμα μη κρυπτογραφημένο;</string>
+  <string name="ConversationItem_unable_to_open_media">Δεν μπορεί να βρεθεί κατάλληλη εφαρμογή για το άνοιγμα αυτού του.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Εκκίνηση ασφαλούς συνεδρίας;</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Έναρξη ασφαλούς συζήτησης με %s;</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Έναρξη ασφαλούς συζήτησης με τον/την %s;</string>
   <string name="ConversationActivity_abort_secure_session_confirmation">Επιβεβαίωση τερματισμού ασφαλής συνεδρίας</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Είστε σίγουροι πως θέλετε να τελειώσετε αυτήν την συνέδρια ασφαλούς συζήτησης;</string>
   <string name="ConversationActivity_delete_thread_confirmation">Επιβεβαίωση διαγραφής συζήτησης</string>
@@ -84,13 +81,13 @@
   <string name="ConversationActivity_add_attachment">Προσθήκη συνημμένου</string>
   <string name="ConversationActivity_select_contact_info">Επιλέξτε πληροφορίες επαφής</string>
   <string name="ConversationActivity_compose_message">Νέο μήνυμα</string>
-  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Συγγνώμη, σφάλμα κατά τη σύναψη αρχείου.</string>
+  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Συγγνώμη, υπήρξε σφάλμα κατά τη σύναψη αρχείου.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Συγγνώμη, το επιλεγμένο βίντεο υπερβαίνει το μέγιστο μέγεθος μηνύματος  (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Συγγνώμη, το επιλεγμένο αρχείο ήχου υπερβαίνει το μέγιστο μέγεθος μηνύματος (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ο παραλήπτης δεν είναι έγκυρη διεύθυνση SMS ή email!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Το μήνυμα είναι κενό!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Παραλήπτες Ομαδικής Συζήτησης</string>
+  <string name="ConversationActivity_group_conversation_recipients">Παραλήπτες ομαδικής συζήτησης</string>
-  <string name="ConversationActivity_group_conversation">Ομαδική Συζήτηση</string>
+  <string name="ConversationActivity_group_conversation">Ομαδική συζήτηση</string>
   <string name="ConversationActivity_unnamed_group">Ανώνυμη ομάδα</string>
   <string name="ConversationActivity_d_recipients_in_group">%d μέλη</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 μέλος</string>
@@ -98,14 +95,14 @@
   <string name="ConversationActivity_invalid_recipient">Άκυρος παραλήπτης!</string>
   <string name="ConversationActivity_calls_not_supported">Δεν Υποστηρίζονται Κλήσεις</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Αυτή η συσκευή δε φαίνεται να υποστηρίζει ενέργειες κλήσης.</string>
-  <string name="ConversationActivity_leave_group">Αποχωρείτε απο την ομάδα;</string>
+  <string name="ConversationActivity_leave_group">Αποχώρηση από την ομάδα;</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Είστε σίγουροι πως θέλετε να αποχωρήσετε απο την ομάδα;</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Είστε σίγουροι πως θέλετε να αποχωρήσετε από την ομάδα;</string>
   <string name="ConversationActivity_transport_insecure_sms">Μη ασφαλές SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Μη ασφαλές MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Αποκτήστε το με αυτό: %s</string>
   <string name="ConversationActivity_install_textsecure">Εγκατάσταση του TextSecure: %s</string>
-  <string name="ConversationActivity_error_leaving_group">Σφάλμα κατα την αποχωρηση απο την ομαδα...</string>
+  <string name="ConversationActivity_error_leaving_group">Σφάλμα κατα την αποχώρηση από την ομάδα...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Στοιχεία μηνύματος</string>
   <string name="ConversationFragment_transport_s_sent_received_s"> Μέσο μεταφοράς:  %1$s
@@ -114,15 +111,15 @@
 Μέσο μεταφοράς: %2$s
 Απεστάλησαν: %3$s
 Παραλήφθηκαν:%4$s</string>
-  <string name="ConversationFragment_confirm_message_delete">Επιβεβαίωση Διαγραφής Μηνύματος</string>
+  <string name="ConversationFragment_confirm_message_delete">Επιβεβαίωση διαγραφής μηνύματος</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Είστε σίγουροι πως θέλετε να διαγράψετε αυτα τα μήνυματα για πάντα;</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Είστε σίγουροι πως θέλετε να διαγράψετε αυτά τα μήνυματα για πάντα;</string>
-  <string name="ConversationFragment_save_to_sd_card">Να αποθηκευτεί στην κάρτα μνήμης;</string>
+  <string name="ConversationFragment_save_to_sd_card">Να αποθηκευτεί στην μνήμη;</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Αποθηκευντας αυτό το μέσο θα επιτρέψει σε άλλες εφαρμογές στο τηλέφωνό σας να έχουν πρόσβαση σε αυτο.\N\nΘέλετε να συνεχίσετε;</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Σφάλμα κατά την αποθήκευση συνημμένου στην αποθήκευση!</string>
   <string name="ConversationFragment_success_exclamation">Επιτυχία!</string>
-  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Αδύνατη η εγγραφή στην αποθήκευση</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Αδύνατη η εγγραφή στην μνήμη!</string>
   <string name="ConversationFragment_saving_attachment">Αποθήκευση συνημμένου</string>
-  <string name="ConversationFragment_saving_attachment_to_sd_card">Αποθήκευση συνημμένου...</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Αποθήκευση συνημμένου στην μνήμη...</string>
   <string name="ConversationFragment_pending">Εν αναμονή...</string>
   <string name="ConversationFragment_push">Δεδομένα (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -137,6 +134,8 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Μήνυμα ανταλλαγής κλειδιών...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Χρησιμοποιείται το προσαρμοσμένο: %s</string>
+  <string name="CustomDefaultPreference_using_default">Χρησιμοποιείται το προκαθορισμένο: %s</string>
   <string name="CustomDefaultPreference_none">Κανένα</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Τώρα</string>
@@ -144,20 +143,18 @@
   <string name="ShareActivity_share_with">Διαμοιρασμός με</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Εξαγωγή</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Εξαγωγή αποκρυπτογραφημένου κειμένου στην κάρτα μνήμης;
+  <string name="ExportFragment_export_plaintext_to_sd_card">Εξαγωγή αποκρυπτογραφημένου κειμένου στην κάρτα μνήμης;</string>
-</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Προσοχή, αυτό θα
-        εξάγει τα αποκρυπτογραφημένα περιεχόμενα των μηνυμάτων σας στη κάρτα μνήμης.
+εξάγει τα αποκρυπτογραφημένα περιεχόμενα των μηνυμάτων σας στη κάρτα μνήμης.</string>
-    </string>
   <string name="ExportFragment_cancel">Ακύρωση</string>
   <string name="ExportFragment_exporting">Εξαγωγή</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Εξαγωγή απλού κειμένου στην κάρτα SD...</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Εξαγωγή αποκρυπτογραφημένου κειμένου στην κάρτα SD...</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Σφάλμα, δεν μπορεί να γράφθει στην κάρτα SD!</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Σφάλμα, αδύνατη η εγγραφή στην κάρτα μνήμης!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Σφάλμα κατά την εγγραφή στην κάρτα μνήμης.</string>
   <string name="ExportFragment_success">Επιτυχία!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Μόνιμη αποτυχία επικοινωνίας του TextSecure!</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure δεν ήταν σε θέση για εγγραφή με το Google Play Services. Ανακοίνωση μέσω του καναλιού δεδομένων έχει απενεργοποιηθεί, παρακαλούμε δοκιμάστε εκ νέου εγγραφή από το μενού ρυθμίσεων τουTextSecure.</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">Το TextSecure δεν μπόρεσε να εγγραφτεί με το Google Play Services. Η επικοινωνία μέσω του καναλιού δεδομένων έχει απενεργοποιηθεί, παρακαλούμε δοκιμάστε εκ νέου εγγραφή από το μενού ρυθμίσεων τουTextSecure.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Νέα ομάδα</string>
   <string name="GroupCreateActivity_actionbar_update_title">Ενημέρωση ομάδας</string>
@@ -167,38 +164,39 @@
   <string name="GroupCreateActivity_you_dont_support_push">Είστε εγγεγραμένος για χρήση του καναλιού δεδομένων, γι αυτό το οι ομάδες TextSecure είναι απενεργοποιημένες. </string>
   <string name="GroupCreateActivity_contacts_mms_exception">Προέκυψε ένα απρόσμενο σφάλμα και η δημιουργία ομάδας απέτυχε.</string>
   <string name="GroupCreateActivity_contacts_no_members">Χρειάζεστε έστω ένα άτομο στην ομάδα σας!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Έχετε ένα μέλος στην ομάδα σας που ο αριθμός του δεν μπορεί να διαβαστεί σωστά. Παρακαλώ διορθώστε το ή διαγράψτε την επαφή και δοκιμάστε ξανά. </string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Έχετε ένα μέλος στην ομάδα σας που ο αριθμός του δεν μπορεί να διαβαστεί σωστά. Παρακαλώ διορθώστε το ή αφαιρέστε την επαφή και δοκιμάστε ξανά. </string>
   <string name="GroupCreateActivity_avatar_content_description">Εικόνα ομάδας</string>
   <string name="GroupCreateActivity_menu_create_title">Δημιουργήστε ομάδα</string>
   <string name="GroupCreateActivity_creating_group">Δημιουργία %1$s…</string>
   <string name="GroupCreateActivity_updating_group">Ενημέρωση %1$s...</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Αδυναμία προσθήκης ενός μη χρήστη Textsecure στην υπάρχουσα ΤextSecure ομάδα </string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Δεν μπορεί να προστεθεί κάποιος μη χρήστης του Textsecure σε υπάρχουσα ομάδα ΤextSecure</string>
-  <string name="GroupCreateActivity_loading_group_details">Γίνεται φόρτωση Λεπτομέρειων...</string>
+  <string name="GroupCreateActivity_loading_group_details">Φόρτωση λεπτομέρειων ομάδας...</string>
   <!--GroupMembersDialog-->
-  <string name="GroupMembersDialog_me">Me</string>
+  <string name="GroupMembersDialog_me">Εγώ</string>
   <string name="GroupMembersDialog_members">Μέλη...</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Εισαγωγή</string>
   <string name="ImportExportActivity_export">Εξαγωγή</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Να εισαγχθούν όλα τα προϋπάρχοντα SMS;</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Θα γίνει εισαγωγή όλων των
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Θα γίνει εισαγωγή όλων των μηνυμάτων από το προκαθορισμένο αρχείο μηνυμάτων
-        μηνυμάτων από το προκαθορισμένο αρχείο μηνυμάτων SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη εισάγει
+SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη εισάγει το αρχείο μηνυμάτων της
-        το αρχείο μηνυμάτων της συσκευής σας, η επανα-εισαγωγή θα έχει ως αποτέλεσμα διπλά μηνύματα.
+συσκευής σας, η επανεισαγωγή θα έχει ως αποτέλεσμα διπλά μηνύματα.
     </string>
   <string name="ImportFragment_import">Εισαγωγή</string>
   <string name="ImportFragment_cancel">Ακύρωση</string>
-  <string name="ImportFragment_restore_encrypted_backup">Επαναφορά Του Κρυπτογραφημένου Αντιγράφου Ασφαλείας;</string>
+  <string name="ImportFragment_restore_encrypted_backup">Επαναφορά του κρυπτογραφημένου αντιγράφου ασφαλείας;</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-        Η επαναφορά του κρυπτογραφημένου αντιγράφου ασφαλείας θα αντικαταστήσει πλήρως τα υπάρχοντα κλειδιά, τις ρυθμίσεις και τα
+Η επαναφορά του κρυπτογραφημένου αντιγράφου ασφαλείας θα αντικαταστήσει
-        μηνύματά σας. Θα χάσετε όλα τα δεδομένα της υπάρχουσας εγκατάστασης του TextSecure, αλλά όχι
+πλήρως τα υπάρχοντα κλειδιά, τις ρυθμίσεις και τα μηνύματά σας. Θα χάσετε όλα τα
-        του αντίγραφου ασφαλείας.
+δεδομένα της υπάρχουσας εγκατάστασης του TextSecure, αλλά όχι του αντίγραφου
-    </string>
+ασφαλείας.</string>
   <string name="ImportFragment_restore">Επαναφορά</string>
-  <string name="ImportFragment_import_plaintext_backup">Εισαγωγή Μη Κρυπτογραφημένου Αντιγράφου Ασφαλείας;</string>
+  <string name="ImportFragment_import_plaintext_backup">Εισαγωγή μη κρυπτογραφημένου αντιγράφου ασφαλείας;</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Αυτό θα εισάγει
-        μηνύματα από ένα μη κρυπτογραφημένο αντίγραφο ασφαλείας. Αν έχετε ήδη πρωτύτερα εισάγει το αρχείο μηνυμάτων SMS του συστήματος,
+μηνύματα από ένα μη κρυπτογραφημένο αντίγραφο ασφαλείας. Αν έχετε ήδη εισάγει το
-        η επανα-εισαγωγή θα έχει ως αποτέλεσμα διπλά μηνύματα.
+αρχείο μηνυμάτων SMS του συστήματος, η επανεισαγωγή θα έχει ως αποτέλεσμα διπλά
+μηνύματα.
     </string>
   <string name="ImportFragment_importing">Γίνεται εισαγωγή</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Εισαγωγή μη κρυπτογραφημένου αντιγράφου ασφαλείας...</string>
@@ -208,27 +206,27 @@
   <string name="ImportFragment_restoring">Επαναφορά</string>
   <string name="ImportFragment_restoring_encrypted_backup">Επαναφορά κρυπτογραφημένου αντιγράφου ασφαλείας...</string>
   <string name="ImportFragment_no_encrypted_backup_found">Δε βρέθηκε κρυπτογραφημένο αντίγραφο ασφαλείας!</string>
-  <string name="ImportFragment_restore_complete">Επαναφορά ολοκληρώθηκε!</string>
+  <string name="ImportFragment_restore_complete">Η επαναφορά ολοκληρώθηκε!</string>
   <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Δε βρέθηκε κλειδί!</string>
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Δε βρέθηκε σαρωμένο κλειδί!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">Θέλετε να εγκαταστήσετε το Barcode Scanner?</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">Θέλετε να εγκαταστήσετε το Barcode Scanner;</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Το TextSecure χρειάζεται σαρωτή γραμμωτών κωδίκων για τους QR κωδικούς.</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Το TextSecure χρειάζεται σαρωτή barcode για τους QR κωδικούς.</string>
   <!--MessageDetailsRecipient-->
-  <string name="MessageDetailsRecipient_failed_to_send">Απέτυχε η αποστολή</string>
+  <string name="MessageDetailsRecipient_failed_to_send">Αποτυχία αποστολής</string>
   <string name="MessageDetailsRecipient_new_identity">Νέα ταυτότητα</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Σφάλμα κατά την αποθήκευση MMS! </string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Σφάλμα κατά στη σύνδεση με τον πάροχο MMS...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Σφάλμα κατά την διάβαση των ρυθμίσεων MMS του παροχέα...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Σφάλμα κατά την διάβαση των ρυθμίσεων MMS του παρόχου...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Μήνυμα Πολυμέσων</string>
   <!--MessageRecord-->
-  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Λάβαμε ένα μήνυμα κρυπτογραφημένο με μια παλιά έκδοση του TextSecure που δεν υποστηρίζεται πλέον. Παρακαλώ ζητήστε από τον αποστολέα να αναβαθμίσει στη τελευταία έκδοση και να ξαναστείλει το μήνυμα.</string>
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Λήφθηκε ένα μήνυμα κρυπτογραφημένο με μια παλιά έκδοση του TextSecure, που δεν υποστηρίζεται πλέον. Παρακαλώ ζητήστε από τον αποστολέα να αναβαθμίσει στη τελευταία έκδοση και να ξαναστείλει το μήνυμα.</string>
-  <string name="MessageRecord_left_group">Έχετε αφήσει την ομάδα.</string>
+  <string name="MessageRecord_left_group">Αποχωρήσατε από την ομάδα.</string>
-  <string name="MessageRecord_updated_group">Ενημερώθηκε η ομάδα.</string>
+  <string name="MessageRecord_updated_group">Η ομάδα ενημερώθηκε.</string>
   <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Οι συνθηματικές φράσεις δε ταιριάζουν!</string>
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Τα συνθηματικά δε ταιριάζουν!</string>
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Λανθασμένη παλιά συνθηματική φράση!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Λανθασμένο, παλιό συνθηματικό!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Σύνδεση αυτής της συσκευής;</string>
   <string name="DeviceProvisioningActivity_cancel">ΑΚΥΡΩΣΗ</string>
@@ -236,20 +234,19 @@
   <string name="DeviceProvisioningActivity_title">Σύνδεση αυτής της συσκευής;</string>
   <string name="DeviceProvisioningActivity_content_intro">Θα είναι σε θέση να</string>
   <string name="DeviceProvisioningActivity_content_bullets">
-
+Διαβάσει όλα τα μηνύματά σας
-Θα διαβάστουν όλα τα μυνηματα σας
+\n- Στείλει μηνύματα με το όνομά σας</string>
-\n- Αποστολή μηνυμάτων στο ονομα σας</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Προσθήκη συσκευής...</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Προσθήκη συσκευής...</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Προσθήκη νέας συσκευής...</string>
-  <string name="DeviceProvisioningActivity_content_progress_success">Η Συσκευή προστεθηκε!</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Η συσκευή προστεθηκε!</string>
-  <string name="DeviceProvisioningActivity_content_progress_no_device">Καμία συσκευή δεν βρέθηκε </string>
+  <string name="DeviceProvisioningActivity_content_progress_no_device">Δεν βρέθηκε συσκευή.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Σφάλμα δικτύου</string>
-  <string name="DeviceProvisioningActivity_content_progress_key_error">Άκυρος QR αριθμός</string>
+  <string name="DeviceProvisioningActivity_content_progress_key_error">Άκυρος QR κωδικός.</string>
   <!--PassphrasePromptActivity-->
-  <string name="PassphrasePromptActivity_enter_passphrase">Εισάγετε συνθηματική φράση</string>
+  <string name="PassphrasePromptActivity_enter_passphrase">Εισάγετε συνθηματικό</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Εικονίδιο TextSecure</string>
-  <string name="PassphrasePromptActivity_ok_button_content_description">Εισάγετε συνθηματική φράση</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">Καταχώρηση συνθηματικού</string>
-  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Άκυρη συνθηματική φράση!</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Άκυρο συνθηματικό!</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Το
         αποτύπωμα αυτής της ανταλλαγής κλειδιών είναι διαφορετικό από αυτό που λάβαμε πρωτύτερα από αυτή την
@@ -260,28 +257,22 @@
         αυτήν την επαφή.
     </string>
   <string name="ReceiveKeyActivity_processing">Γίνεται επεξεργασία</string>
-  <string name="ReceiveKeyActivity_processing_key_exchange">Επεξεργάζεται η ανταλλαγή κλειδιών...</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Γίνεται επεξεργασία της ανταλλαγής κλειδιών...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Σύνδεση Με TextSecure</string>
-  <string name="RegistrationActivity_select_your_country">Επιλέξτε Χώρα</string>
+  <string name="RegistrationActivity_select_your_country">Επιλέξτε χώρα</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Πρέπει να καθορίσετε
-τον κώδικα της χώρας σας
+τον κώδικα της χώρας σας</string>
-</string>
   <string name="RegistrationActivity_you_must_specify_your_phone_number">Πρέπει να καθορίσετε
-τον αριθμό του κινητού σας
+τον αριθμό του κινητού σας</string>
-</string>
   <string name="RegistrationActivity_invalid_number">Άκυρος αριθμός</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Ο αριθμός που καθορίσατε (%s)
-δεν είναι έγκυρος.
+δεν είναι έγκυρος.</string>
-</string>
   <string name="RegistrationActivity_unsupported">Δεν υποστηρίζεται</string>
   <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Συγγνώμη,
 αυτή η συσκευή δεν υποστηρίζεται για μηνύματα δεδομένων. Οι συσκευές που τρέχουν εκδόσεις Android παλαιότερες από 4.0 πρέπει να έχουν λογαριασμό Google. Συσκευές που τρέχουν Android 4.0 ή νεότερο δε χρειάζονται λογαριασμό Google, αλλά θα πρέπει να έχουν εγκατεστημένο το Play Store.</string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
-
+Ελέγξτε ξανά ότι αυτός είναι ο αριθμός σας! Είμαστε έτοιμοι να τον επιβεβαιώσουμε με SMS.</string>
-
-
-Ελέγξτε ξανά ότι αυτός είναι ο αριθμός σας! Είμαστε έτοιμοι να το ελέγξουμε με SMS.</string>
   <string name="RegistrationActivity_continue">Συνέχεια</string>
   <string name="RegistrationActivity_edit">Επεξεργασία</string>
   <!--RegistrationProblemsActivity-->
@@ -290,23 +281,23 @@
   <string name="RegistrationProgressActivity_verifying_number">Γίνεται επιβεβαίωση αριθμού</string>
   <string name="RegistrationProgressActivity_edit_s">Επεξεργασία %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Η εγγραφή ολοκληρώθηκε!</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Πρέπει πρώτα να εισάγετε τον κωδικό που παραλήφθηκε...</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Πρέπει πρώτα να εισάγετε τον κωδικό λάβατε...</string>
   <string name="RegistrationProgressActivity_connecting">Γίνεται σύνδεση</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Γίνεται σύνδεση για επιβεβαίωση...</string>
   <string name="RegistrationProgressActivity_network_error">Σφάλμα δικτύου!</string>
-  <string name="RegistrationProgressActivity_unable_to_connect">Δε μπορέσαμε να συνδεθούμε. Παρακαλώ ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά.</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Δε μπορέσαμε να συνδεθούμε. Παρακαλώ ελέγξτε τη σύνδεση στο δίκτυο και προσπαθήστε ξανά.</string>
-  <string name="RegistrationProgressActivity_verification_failed">Επιβεβαίωση απέτυχε!</string>
+  <string name="RegistrationProgressActivity_verification_failed">Η επιβεβαίωση απέτυχε!</string>
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Ο κωδικός επαλήθευσης δεν ήταν σωστός. Παρακαλώ δοκιμάστε ξανά.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Υπερβολικά πολλές προσπάθειες</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Εισάγατε λάθος κωδικό επαλήθευσης υπερβολικά πολλές φορές. Παρακαλώ περιμένετε λίγο πριν προσπαθήσετε και πάλι.</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Εισάγατε λάθος κωδικό επαλήθευσης υπερβολικά πολλές φορές. Παρακαλώ περιμένετε λίγο πριν να προσπαθήσετε ξανά.</string>
   <string name="RegistrationProgressActivity_requesting_call">Αίτηση για κλήση</string>
   <string name="RegistrationProgressActivity_requesting_incoming_call">Αίτηση εισερχόμενης κλήσης επαλήθευσης...</string>
-  <string name="RegistrationProgressActivity_server_error">Σφάλμα Διακομιστή</string>
+  <string name="RegistrationProgressActivity_server_error">Σφάλμα διακομιστή</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Σφάλμα στο διακομιστή. Παρακαλώ δοκιμάστε ξανά.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Πάρα πολλές αιτήσεις!</string>
-  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Έχετε ζητήσει κλήση επαλήθευσης πρόσφατα. Μπορείτε να ζητήσετε άλλη μία σε 20 λεπτά.</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Έχετε ζητήσει κλήση επαλήθευσης πρόσφατα. Μπορείτε να ζητήσετε ακόμα μια σε 20 λεπτά.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Πρόβλημα με την εγγραφή</string>
-  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Αυτός ο αριθμός ειναι ήδη καταχωρημένος σε έναν άλλο διακομιστή TextSecure (χρησιμοποιούσατε CyanogenMod?). Πρέπει πρώτα να απεγγραφείτε από κει, πριν μπορέσετε να εγγραφείτε από αυτή τη συσκευή.</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Αυτός ο αριθμός ειναι ήδη καταχωρημένος σε έναν άλλο διακομιστή TextSecure (CyanogenMod;). Πρέπει πρώτα να απεγγραφείτε από κει, πριν μπορέσετε να εγγραφείτε από αυτή τη συσκευή.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Η εγγραφή ολοκληρώθηκε</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Η εγγραφή TextSecure ολοκληρώθηκε επιτυχώς.</string>
@@ -314,21 +305,19 @@
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Η εγγραφή TextSecure παρουσίασε ένα πρόβλημα.</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ελήφθη προβληματικό μήνυμα
-        ανταλλαγής κλειδιών!
+ανταλλαγής κλειδιών!
     </string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
-        Ελήφθη μήνυμα ανταλλαγής κλειδιών για άκυρη έκδοση του πρωτόκολου.
+Ελήφθη μήνυμα ανταλλαγής κλειδιών για άκυρη έκδοση του πρωτόκολου.</string>
-    </string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
-        Ελήφθη μήνυμα με άγνωστο κλειδί ταυτότητας. Κλικ για επεξεργασία και προβολή.
+Ελήφθη μήνυμα με άγνωστο κλειδί ταυτότητας. Κλικ για επεξεργασία και προβολή.</string>
-    </string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Λήφθηκε ενημερωμένη αλλά άγνωστη πληροφορία ταυτότητας. Πατήστε για επιβεβαίωση ταυτότητας.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Λήφθηκε ενημερωμένη αλλά αγνωστη πληρογφορία ταυτότητας. Πατήστε για επιβεβαωση ταυτότητας.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Η ασφαλής συνεδρία τερματίστηκε.</string>
-  <string name="SmsMessageRecord_secure_session_ended">Η Ασφαλής συζήτηση τερματίστηκε.</string>
+  <string name="SmsMessageRecord_duplicate_message">Διπλότυπο μήνυμα.</string>
-  <string name="SmsMessageRecord_duplicate_message">Διπλότυπο μήνυμα</string>
   <!--ThreadRecord-->
-  <string name="ThreadRecord_left_the_group">Έφυγε απο την ομάδα...</string>
+  <string name="ThreadRecord_left_the_group">Έφυγε από την ομάδα...</string>
-  <string name="TheadRecord_secure_session_ended">Η ασφαλής συζήτηση τερματίστηκε.</string>
+  <string name="TheadRecord_secure_session_ended">Η ασφαλής συνεδρία τερματίστηκε.</string>
-  <string name="ThreadRecord_draft">Πρόχειρο</string>
+  <string name="ThreadRecord_draft">Πρόχειρο:</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Δεν έχετε κλειδί ταυτότητας.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Ο παραλήπτης δεν έχει κλειδί ταυτότητας.</string>
@@ -336,14 +325,14 @@
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Σαρώστε το κλειδί τους για σύγκριση</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Σάρωση του κλειδιού μου</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ΠΡΟΣΟΧΗ, το σαρωμένο κλειδί ΔΕΝ ταιριάζει! Ελέγξτε προσεκτικά το αποτύπωμα.</string>
-  <string name="VerifyIdentityActivity_not_verified_exclamation">ΔΕΝ Επιβεβαιώθηκε!</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">ΔΕΝ επιβεβαιώθηκε!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Το κλειδί τους είναι σωστό. Είναι επίσης απαραίτητο να επιβεβαιώσουν το κλειδί σας.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Επιβεβαιώθηκε!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Δεν έχετε κλειδί ταυτότητας!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Δεν έχετε κλειδί ταυτότητας.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Σαρώστε για σύγκριση</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Επιτρέψτε να μας σαρώσουν για σύγκριση</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Να μας σαρώσουν για σύγκριση</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ΠΡΟΣΟΧΗ, το σαρωμένο κλειδί ΔΕΝ ταιριάζει!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">ΔΕΝ επιβεβαιώθηκε!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Το σαρωμένο κλειδί ταιριάζει!</string>
@@ -354,53 +343,54 @@
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Έχετε ήδη ζητήσει την έναρξη συζήτησης με αυτόν τον παραλήπτη, είστε σίγουροι πως θέλετε να στείλετε νέα αίτηση; Η πρώτη αίτηση θα ακυρωθεί.</string>
   <string name="KeyExchangeInitiator_send">Αποστολή</string>
   <!--MessageDisplayHelper-->
-  <string name="MessageDisplayHelper_bad_encrypted_message">Προβληματικό κρυπτογραφημένο μήνυμα...</string>
+  <string name="MessageDisplayHelper_bad_encrypted_message">Κακώς κρυπτογραφημένο μήνυμα...</string>
   <string name="MessageDisplayHelper_decrypting_please_wait">Αποκρυπτογράφηση, παρακαλώ περιμένετε...</string>
-  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Το μήνυμα κρυπτογραφήθηκε για ανύπαρκτη συζήτηση...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Το μήνυμα κρυπτογραφήθηκε για ανύπαρκτη συνεδρία...</string>
   <!--EncryptingSmsDatabase-->
   <string name="EncryptingSmsDatabase_error_decrypting_message">Σφάλμα αποκρυπτογράφησης του μηνύματος.</string>
   <!--ThreadDatabase-->
-  <string name="ThreadDatabase_error_decrypting_message">Σφάλμα κρυπτογράφησης του μηνύματος.</string>
+  <string name="ThreadDatabase_error_decrypting_message">Σφάλμα αποκρυπτογράφησης του μηνύματος.</string>
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Σύνδεση στο διακομιστή MMS...</string>
   <string name="MmsDatabase_downloading_mms">Γίνεται λήψη MMS...</string>
-  <string name="MmsDatabase_mms_download_failed">Λήψη MMS απέτυχε!</string>
+  <string name="MmsDatabase_mms_download_failed">Η λήψη MMS απέτυχε!</string>
   <string name="MmsDatabase_downloading">Γίνεται λήψη...</string>
-  <string name="MmsDatabase_mms_pending_download">Πατήστε και ρυθμίσετε το MMS για να συνεχίσετε την λήψη.</string>
+  <string name="MmsDatabase_mms_pending_download">Πατήστε και ρυθμίσετε τα MMS για να συνεχίσετε την λήψη.</string>
-  <string name="MmsDatabase_error_decrypting_message">Σφάλμα κρυπτογράφησης του μηνύματος.</string>
+  <string name="MmsDatabase_error_decrypting_message">Σφάλμα απορυπτογράφησης του μηνύματος.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Γίνεται αποκρυπτογράφηση MMS, παρακαλώ περιμένετε...</string>
-  <string name="MmsMessageRecord_bad_encrypted_mms_message">Κακό κρυπτογραφημένο μήνυμα MMS...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Κακώς κρυπτογραφημένο μήνυμα MMS...</string>
-  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Το μήνυμα MMS κρυπτογραφήθηκε για ανύπαρκτη συζήτηση...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Το μήνυμα MMS κρυπτογραφήθηκε για ανύπαρκτη συνεδρία...</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Εισαγωγή σε εξέλιξη</string>
   <string name="ApplicationMigrationService_importing_text_messages">Εισάγονται τα Μηνύματα Κειμένου</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">Πατήστε για άνοιγμα.</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Πατήστε για άνοιγμα, ή πατήστε τη κλειδαριά για κλείσιμο.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Πατήστε για άνοιγμα, ή πατήστε το λουκέτο για κλείσιμο.</string>
   <string name="KeyCachingService_passphrase_cached">Το TextSecure είναι ξεκλειδωμένο</string>
-  <string name="KeyCachingService_lock">Κλείδωμα με συνθηματική φράση</string>
+  <string name="KeyCachingService_lock">Κλείδωμα με συνθηματικό</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d νέα μηνύματα</string>
-  <string name="MessageNotifier_most_recent_from_s">Τελευταίο μήνυμα από: %s</string>
+  <string name="MessageNotifier_most_recent_from_s">Πιο πρόσφατο μήνυμα από: %s</string>
   <string name="MessageNotifier_encrypted_message">Κρυπτογραφημένο μήνυμα...</string>
+  <string name="MessageNotifier_media_message_with_text">Μήνυμα Πολυμέσων: %s</string>
   <string name="MessageNotifier_no_subject">(Χωρίς Θέμα)</string>
-  <string name="MessageNotifier_message_delivery_failed">Παράδοση μηνύματος απέτυχε.</string>
+  <string name="MessageNotifier_message_delivery_failed">Η παράδοση μηνύματος απέτυχε.</string>
-  <string name="MessageNotifier_failed_to_deliver_message">Αποτύχαμε να παραδώσουμε το μήνυμα.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Αποτυχία παράδοσης του μήνυματος.</string>
-  <string name="MessageNotifier_error_delivering_message">Σφάλμα κατά τη παράδοση του μηνύματος.</string>
+  <string name="MessageNotifier_error_delivering_message">Σφάλμα κατά την παράδοση του μηνύματος.</string>
   <string name="MessageNotifier_mark_all_as_read">Επισήμανση όλων ως αναγνωσμένα</string>
   <string name="MessageNotifier_mark_as_read">Επισήμανση ως αναγνωσμένο</string>
   <string name="MessageNotifier_media_message">Μήνυμα πολυμέσων</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Λυπούμαστε, η Άμεση Απάντηση δεν υποστηρίζεται ακόμα από το TextSecure!</string>
   <!--change_passphrase_activity-->
-  <string name="change_passphrase_activity__old_passphrase">ΠΑΛΙΑ ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ</string>
+  <string name="change_passphrase_activity__old_passphrase">ΠΑΛΙΟ ΣΥΝΘΗΜΑΤΙΚΟ</string>
-  <string name="change_passphrase_activity__new_passphrase">ΝΕΑ ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ:</string>
+  <string name="change_passphrase_activity__new_passphrase">ΝΕΟ ΣΥΝΘΗΜΑΤΙΚΟ:</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">ΕΠΑΝΑΛΗΨΗ ΝΕΑΣ ΣΥΝΘΗΜΑΤΙΚΗΣ ΦΡΑΣΗΣ:</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">ΕΠΑΝΑΛΗΨΗ ΝΕΟΥ ΣΥΝΘΗΜΑΤΙΚΟΥ:</string>
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Δεν υπάρχουν επαφές.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Φόρτωση των επαφών</string>
+  <string name="contact_selection_group_activity__finding_contacts">Φόρτωση των επαφών...</string>
   <!--single_contact_selection_activity-->
   <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">Δεν είστε εγγεγραμμένοι για ειδοποιήσεις push...</string>
   <string name="SingleContactSelectionActivity_updating_directory">Ενημέρωση καταλόγου</string>
@@ -412,17 +402,16 @@
   <string name="contact_selection_recent_activity__no_recent_calls">Δεν υπάρχουν πρόσφατες κλήσεις.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Αποστολή μηνύματος TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Αποστολή ασφαλούς SMS</string>
+  <string name="conversation_activity__type_message_sms_insecure">Αποστολή μη ασφαλούς SMS</string>
-  <string name="conversation_activity__type_message_sms_insecure">Αποστολή μη εξασφαλισμένων SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Αποστολή μη ασφαλούς MMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Αποστολή ασφαλούς MMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Αποστολή μη εξασφαλισμένων MMS</string>
   <string name="conversation_activity__send">Αποστολή</string>
   <string name="conversation_activity__remove">Αφαίρεση</string>
-  <string name="conversation_activity__window_description">Συζήτηση με %1$s</string>
+  <string name="conversation_activity__window_description">Συζήτηση με τον/την %1$s</string>
-  <string name="conversation_activity__compose_description">Δημιουργία μηνύματος</string>
+  <string name="conversation_activity__compose_description">Σύνθεση μηνύματος</string>
-  <string name="conversation_activity__emoji_toggle_description">Εναλλαγή Emoji πληκτρολογίου</string>
+  <string name="conversation_activity__emoji_toggle_description">Εναλλαγή πληκτρολογίου emoji</string>
-  <string name="conversation_activity__attachment_thumbnail">Προσάρτημα μικρογραφίας</string>
+  <string name="conversation_activity__attachment_thumbnail">Μικρογραφία συνημμένου</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Το μήνυμα πολυμέσων κατεβαίνει</string>
   <string name="conversation_item__mms_image_description">Μήνυμα πολυμέσων</string>
   <string name="conversation_item__play_button_description">Κουμπί αναπαραγωγής</string>
   <string name="conversation_item__secure_message_description">Ασφαλές μήνυμα</string>
@@ -430,14 +419,14 @@
   <string name="conversation_item_sent__download">Λήψη</string>
   <string name="conversation_item_sent__downloading">Γίνεται λήψη</string>
   <string name="conversation_item_sent__send_failed_indicator_description">Η αποστολή απέτυχε</string>
-  <string name="conversation_item_sent__pending_approval_description">Eκκρεμής έγκριση</string>
+  <string name="conversation_item_sent__pending_approval_description">Η έγκριση εκκρεμεί</string>
   <string name="conversation_item_sent__delivered_description">Παραδόθηκε</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Λήψη</string>
   <string name="conversation_item_received__contact_photo_description">Φωτογραφία επαφής</string>
   <string name="conversation_item_received__downloading">Γίνεται λήψη</string>
   <!--conversation_fragment_cab-->
-  <string name="conversation_fragment_cab__batch_selection_mode">Λειτουργία Μαζικής Επιλογής</string>
+  <string name="conversation_fragment_cab__batch_selection_mode">Λειτουργία μαζικής επιλογής</string>
   <string name="conversation_fragment_cab__batch_selection_amount">%s επιλέχτηκαν</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Γίνεται φόρτωση χωρών...</string>
@@ -494,6 +483,8 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Ολοκληρώθηκε</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Επιβεβαιώστε τον αριθμό τηλεφώνου σας για να συνδεθείτε με το TextSecure.</string>
   <string name="registration_activity__your_country">Η ΧΩΡΑ ΣΑΣ</string>
   <string name="registration_activity__your_country_code_and_phone_number">Ο ΚΩΔΙΚΟΣ ΧΩΡΑΣ ΣΑΣ
 ΚΑΙ ΑΡΙΘΜΟΣ ΚΙΝΗΤΟΥ ΤΗΛΕΦΩΝΟΥ</string>
@@ -571,12 +562,12 @@
   <string name="message_details_header__from">Από:</string>
   <string name="message_details_header__with">Με:</string>
   <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__create_passphrase">Δημιουργία Συνθηματικής Φράσης</string>
+  <string name="AndroidManifest__create_passphrase">Δημιουργία Συνθηματικού</string>
-  <string name="AndroidManifest__enter_passphrase">Εισάγετε Συνθηματική Φράση</string>
+  <string name="AndroidManifest__enter_passphrase">Εισάγετε Συνθηματικό</string>
   <string name="AndroidManifest__select_contacts">Επιλέξτε Επαφές</string>
   <string name="AndroidManifest__textsecure_detected">Εντοπίστηκε TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Δημόσιο Κλειδί Ταυτότητας</string>
-  <string name="AndroidManifest__change_passphrase">Αλλαγή συνθηματικής φράσης</string>
+  <string name="AndroidManifest__change_passphrase">Αλλαγή συνθηματικού</string>
   <string name="AndroidManifest__verify_identity">Επιβεβαίωση Ταυτότητας</string>
   <string name="AndroidManifest__log_submit">Υποβολή διαγνωστικού αρχείου.</string>
   <string name="AndroidManifest__media_preview">Προεπισκόπηση  Πολυμέσων</string>
@@ -585,6 +576,8 @@
   <!--arrays.xml-->
   <string name="arrays__import_export">Εισαγωγή / εξαγωγή</string>
   <string name="arrays__my_identity_key">Το Κλειδί Ταυτότητάς Μου</string>
+  <string name="arrays__use_default">Χρήση προκαθορισμένου</string>
+  <string name="arrays__use_custom">Χρήση προσαρμοσμένου</string>
   <!--plurals.xml-->
   <plurals name="minutes_ago">
     <item quantity="one">%d λεπτο</item>
@@ -597,11 +590,8 @@
   <!--preferences.xml-->
   <string name="preferences__general">Γενικά</string>
   <string name="preferences__sms_mms">SMS και MMS</string>
-  <string name="preferences__push_sms_category">Push (μέσω Internet) και SMS</string>
   <string name="preferences__pref_all_sms_title">Λήψη όλων των μηνυμάτων</string>
   <string name="preferences__pref_all_mms_title">Λήψη όλων των μηνυμάτων MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Χρήση TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων SMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Χρήση TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων MMS</string>
   <string name="preferences__input_settings">Ρυθμίσεις εισαγωγής</string>
   <string name="preferences__enable_enter_key_title">Ενεργοποίηση πλήκτρου Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Αντικαθιστά το πλήκτρο smiley με το πλήκτρο Enter</string>
@@ -610,17 +600,19 @@
   <string name="preferences__display_settings">Ρυθμίσεις Προβολής</string>
   <string name="preferences__choose_identity">Επιλέξτε Ταυτότητα</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Επιλέξτε την επαφή σας από τη λίστα επαφών.</string>
-  <string name="preferences__change_passphrase">Αλλαγή συνθηματικής φράσης</string>
+  <string name="preferences__change_passphrase">Αλλαγή συνθηματικού</string>
-  <string name="preferences__change_my_passphrase">Άλλαξε τη συνθηματική φράση μου</string>
+  <string name="preferences__change_my_passphrase">Άλλαξε το συνθηματικό μου</string>
-  <string name="preferences__enable_passphrase">Ενεργοποίηση συνθηματικής φράσης</string>
+  <string name="preferences__enable_passphrase">Ενεργοποίηση συνθηματικού</string>
+  <string name="preferences__passphrase_summary">Συνθηματικό %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Ενεργοποίηση τοπικής κρυπτογράφησης όλων των μηνυμάτων και κλειδιών</string>
   <string name="preferences__screen_security">Ασφάλεια οθόνης</string>
+  <string name="preferences__screen_security_summary">Ασφάλεια οθόνης %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Να επιτρέπεται η καταγραφή της οθόνης (screenshots)</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Να σβήνεται η συνθηματική φράση από τη μνήμη μετά από κάποιο διάστημα</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Να σβήνεται το συνθηματικό από τη μνήμη μετά από κάποιο διάστημα</string>
-  <string name="preferences__timeout_passphrase">Χρονικό όριο συνθηματικής φράσης</string>
+  <string name="preferences__timeout_passphrase">Χρονικό όριο συνθηματικού</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Επιλέξτε Χρονικό Όριο Συνθηματικής Φράσης</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Επιλέξτε χρονικό όριο συνθηματικού</string>
   <string name="preferences__pref_timeout_interval_title">Χρονικό όριο</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Πόση ώρα θα περιμένουμε πριν σβήσουμε τη συνθηματική φράση από τη μνήμη</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Πόση ώρα θα περιμένουμε πριν σβήσουμε το συνθηματικό από τη μνήμη</string>
   <string name="preferences__notifications">Ειδοποιήσεις</string>
   <string name="preferences__display_message_notifications_in_status_bar">Προβολή ειδοποιήσεων για νέα μηνύματα στη γραμμή κατάστασης</string>
   <string name="preferences__led_color">Χρώμα LED</string>
@@ -662,6 +654,11 @@
   <string name="preferences__advanced_mms_access_point_names">Ρυθμίσεις MMS</string>
   <string name="preferences__enable_manual_mms">Χρήση μη αυτόματων ρυθμίσεων MMS</string>
   <string name="preferences__override_system_mms_settings">Να χρησιμοποιηθούν οι παρακάτω ρυθμίσεις MMS ασχέτως των ρυθμίσεων του συστήματος.</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS Διακομιστής Διαμεσολάβησης</string>
+  <string name="preferences__mms_proxy_port">Θύρα Διακομιστή Μεσολάβησης MMS</string>
+  <string name="preferences__mmsc_username">MMSC Όνομα Χρήστη</string>
+  <string name="preferences__mmsc_password">MMSC Κωδικός`</string>
   <string name="preferences__sms_delivery_reports">Αναφορές παράδοσης SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Αίτημα αναφοράς παράδοσης για κάθε SMS που στέλνετε</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Αυτόματη διαγραφή παλιών μηνυμάτων όταν μια συζήτηση ξεπεράσει ένα προκαθορισμένο όριο μηνυμάτων</string>
@@ -673,23 +670,11 @@
   <string name="preferences__dark_theme">Σκοτάδι</string>
   <string name="preferences__appearance">Εμφάνιση</string>
   <string name="preferences__theme">Θέμα</string>
+  <string name="preferences__theme_summary">Θέμα %s</string>
   <string name="preferences__default">Προκαθορισμένη</string>
   <string name="preferences__language">Γλώσσα</string>
-  <string name="preferences__make_default_sms_app">Ανάθεση ως προεπιλεγμένη εφαρμογή για SMS</string>
+  <string name="preferences__language_summary">Γλώσσα %s</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Το TextSecure να είναι η προεπιλεγμένη εφαρμογή για SMS/MMS.</string>
-  <string name="preferences__use_data_channel">ΕΙδοποιήσεις Push</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Αυξήστε την ανωνυμία και αποφύγετε το κόστος του SMS χρησιμοποιώντας το κανάλι δεδομένων για επικοινωνία με τους άλλους χρήστες του TextSecure.</string>
-  <string name="preferences__sms_fallback">Εξερχόμενα SMS / MMS</string>
   <string name="preferences__submit_debug_log">Αποστολή αρχείων καταγραφής αποσφαλμάτωσης</string>
-  <string name="preferences__sms_outgoing_push_users">Χρήστες TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">ρωτήστε πρώτα</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">Όχι MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Αποστολή ασφαλούς μηνύματος εαν χαθεί η σύνδεση</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Να ερωτηθώ πριν γίνει η αποστολή μηνύματος SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Ποτέ αποστολη MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Μη χρήστες TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">κανένας</string>
   <string name="preferences__support_wifi_calling">Λειτουργία συμβατότητας \"WiFi Calling\' </string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ενεργοποίηση αν η συσκευή σας χρησιμοποιεί SMS/MMS παροχής μέσω WiFi (μόνο επιτρέπτο αν το «Calling WiFi» είναι ενεργοποιημένο στην συσκευή σας).</string>
   <!--****************************************-->

res/values-es/strings.xml

@@ -25,19 +25,15 @@
 Esto deshabilitará los mensajes push al eliminar su registro del servidor.
 Tendrá que volver a registrarse con su número de teléfono si quiere volver a usar los mensajes push en un futuro.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Error conectando al servidor!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS entrantes habilitados</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS habilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pulse para cambiar la aplicación de SMS predeterminada</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS entrantes deshabilitados</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS deshabilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pulse para que TextSecure sea su aplicación de SMS predeterminada</string>
   <string name="ApplicationPreferencesActivity_on">activo</string>
   <string name="ApplicationPreferencesActivity_On">Activo</string>
   <string name="ApplicationPreferencesActivity_off">inactivo</string>
   <string name="ApplicationPreferencesActivity_Off">Inactivo</string>
-  <string name="ApplicationPreferencesActivity_partial">parcial</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Entrante %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">saliente %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutos</string>
   <!--DraftDatabase-->
@@ -72,7 +68,7 @@ este contacto.
   <string name="ConversationItem_click_to_approve_unencrypted">Pulse para cambiar a no cifrado</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">¿Recurrir a SMS no cifrado?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">¿Recurrir a MMS cifrado?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque el receptor en adelante ya no es un usuario de TextSecure.\n\n¿Enviar mensaje no seguro?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque el receptor ya no es usuario de TextSecure.\n\n¿Enviar mensaje de manera no segura?</string>
   <string name="ConversationItem_unable_to_open_media">No se pudo encontrar una aplicación capaz de abrir este contenido.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">¿Iniciar sesión segura?</string>
@@ -379,19 +375,19 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="KeyCachingService_textsecure_passphrase_cached">Pulse para abrir.</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Pulse para abrir, o pulse el candado para cerrar.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure está desbloqueado</string>
-  <string name="KeyCachingService_lock">Bloqueado con clave de acceso</string>
+  <string name="KeyCachingService_lock">Bloquear con clave de acceso</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) nuevos mensajes</string>
   <string name="MessageNotifier_most_recent_from_s">Mensaje más reciente de: %s</string>
   <string name="MessageNotifier_encrypted_message">Mensaje cifrado...</string>
-  <string name="MessageNotifier_media_message_with_text">Mensaje audiovisual: %s</string>
+  <string name="MessageNotifier_media_message_with_text">Mensaje multimedia: %s</string>
   <string name="MessageNotifier_no_subject">(Sin asunto)</string>
   <string name="MessageNotifier_message_delivery_failed">Entrega de mensaje fallida.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Fallo al entregar mensaje.</string>
   <string name="MessageNotifier_error_delivering_message">Error entregando mensaje.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todos como leídos</string>
   <string name="MessageNotifier_mark_as_read">Marcar como leídos</string>
-  <string name="MessageNotifier_media_message">Mensaje audiovisual</string>
+  <string name="MessageNotifier_media_message">Mensaje multimedia</string>
   <!--QuickResponseService-->
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Lo sentimos, ¡la Respuesta Rápida aún no está soportada por TextSecure!</string>
   <!--change_passphrase_activity-->
@@ -413,9 +409,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="contact_selection_recent_activity__no_recent_calls">No hay llamadas recientes.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Enviar mensaje de TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Enviar SMS seguro</string>
   <string name="conversation_activity__type_message_sms_insecure">Enviar SMS no seguro</string>
-  <string name="conversation_activity__type_message_mms_secure">Enviar MMS seguro</string>
   <string name="conversation_activity__type_message_mms_insecure">Enviar MMS no seguro</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Eliminar</string>
@@ -424,7 +418,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="conversation_activity__emoji_toggle_description">Cambiar a teclado emoji</string>
   <string name="conversation_activity__attachment_thumbnail">Miniatura del adjunto</string>
   <!--conversation_item-->
-  <string name="conversation_item__mms_downloading_description">Descargando mensaje audiovisual</string>
+  <string name="conversation_item__mms_downloading_description">Descargando mensaje multimedia</string>
   <string name="conversation_item__mms_image_description">Mensaje multimedia</string>
   <string name="conversation_item__play_button_description">Botón de reproducción</string>
   <string name="conversation_item__secure_message_description">Asegurar mensaje</string>
@@ -623,11 +617,10 @@ por SMS.
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
   <string name="preferences__sms_mms">SMS y MMS</string>
-  <string name="preferences__push_sms_category">Push y SMS</string>
   <string name="preferences__pref_all_sms_title">Recibir todos los SMS</string>
   <string name="preferences__pref_all_mms_title">Recibir todos los MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usar TextSecure para ver y guardar todos los mensajes de texto entrantes</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usar TextSecure para todos los mensajes entrantes</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usar TextSecure para ver y guardar todos los mensajes multimedia entrantes</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usar TextSecure para todos los mensajes multimedia entrantes</string>
   <string name="preferences__input_settings">Preferencias de escritura</string>
   <string name="preferences__enable_enter_key_title">Habilitar tecla Intro</string>
   <string name="preferences__replace_smiley_with_enter_key">Reemplazar la tecla de emoticono con una tecla Intro</string>
@@ -639,7 +632,7 @@ por SMS.
   <string name="preferences__change_passphrase">Cambiar clave de acceso</string>
   <string name="preferences__change_my_passphrase">Cambiar mi clave de acceso</string>
   <string name="preferences__enable_passphrase">Habilitar clave de acceso</string>
-  <string name="preferences__passphrase_summary">Frase-contraseña %s</string>
+  <string name="preferences__passphrase_summary">Clave de acceso %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Habilitar cifrado local de mensajes y claves</string>
   <string name="preferences__screen_security">Seguridad de la pantalla</string>
   <string name="preferences__screen_security_summary">Seguridad de la pantalla %s</string>
@@ -710,22 +703,10 @@ por SMS.
   <string name="preferences__default">Por defecto</string>
   <string name="preferences__language">Idioma</string>
   <string name="preferences__language_summary">Idioma %s</string>
-  <string name="preferences__make_default_sms_app">Establecer como la aplicación SMS predeterminada</string>
+  <string name="preferences__textsecure_messages">Mensajes de TextSecure</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Establece a TextSecure como la aplicación SMS/MMS predeterminada de su sistema.</string>
-  <string name="preferences__use_data_channel">Mensajes push</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Incremente la privacidad y evite tarifas SMS al usar el canal de datos para comunicarse con otros usuarios de TextSecure
+Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
-</string>
-  <string name="preferences__sms_fallback">SMS/MMS saliente</string>
   <string name="preferences__submit_debug_log">Enviar registro de depuración</string>
-  <string name="preferences__sms_outgoing_push_users">Usuarios de TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">preguntar primero</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">sin MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Enviar SMS seguros si se perdió la conectividad de datos</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Preguntar antes de enviar SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nunca enviar MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Usuarios que no son de TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Nadie</string>
   <string name="preferences__support_wifi_calling">Modo de compatibilidad \'Llamada por WiFi\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Habilítelo si su dispositivo utiliza entrega de SMS/MMS vía WiFi (actívelo sólo cuando \'Llamada por WiFi\' esté activada en su dispositivo).</string>
   <!--****************************************-->

res/values-eu/strings.xml

@@ -26,17 +26,12 @@ Honek push mezuak desgaituko du zu zerbitzaritik deserregistratuz.
 Zure telefono zenbakia bererregistratu beharko duzu push mezuak berriro erabili ahal izateko.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errorea zerbitzariarekin konektatzerakoan!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Sarrerako SMSak Gaituta</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Ukitu zure SMS aplikazio lehenetsia aldatzeko</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Sarrerako SMSak Desgaituta</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Ukitu TextSecure zure SMS aplikazio lehenetsia bihurtzeko</string>
   <string name="ApplicationPreferencesActivity_on">piztuta</string>
   <string name="ApplicationPreferencesActivity_On">Aktibatuta</string>
   <string name="ApplicationPreferencesActivity_off">desaktibatuta</string>
   <string name="ApplicationPreferencesActivity_Off">Desaktibatuta</string>
-  <string name="ApplicationPreferencesActivity_partial">partziala</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutu</string>
   <!--DraftDatabase-->
@@ -369,9 +364,7 @@ Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakust
   <string name="contact_selection_recent_activity__no_recent_calls">Ez dago azken deirik.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Bidali TextSecure-eko mezua</string>
-  <string name="conversation_activity__type_message_sms_secure">SMS mezu segurua bidali</string>
   <string name="conversation_activity__type_message_sms_insecure">SMS ez segurua bidali</string>
-  <string name="conversation_activity__type_message_mms_secure">MMS mezu segurua bidali</string>
   <string name="conversation_activity__type_message_mms_insecure">MMS ez segurua bidali</string>
   <string name="conversation_activity__send">Bidali</string>
   <string name="conversation_activity__remove">Ezabatu</string>
@@ -526,11 +519,8 @@ huts egin du.
   <!--preferences.xml-->
   <string name="preferences__general">Orokorra</string>
   <string name="preferences__sms_mms">SMS eta MMS</string>
-  <string name="preferences__push_sms_category">Push eta SMS</string>
   <string name="preferences__pref_all_sms_title">Jaso SMS guztiak</string>
   <string name="preferences__pref_all_mms_title">Jaso MMS guztiak</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure erabili etorriko diren testu mezu guztiak ikusi eta gordetzeko</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure erabili etorriko diren multimedia mezu guztiak ikusi eta gordetzeko</string>
   <string name="preferences__input_settings">Sarreraren Ezarpenak</string>
   <string name="preferences__enable_enter_key_title">Enter tekla gaitu</string>
   <string name="preferences__replace_smiley_with_enter_key">Smiley tekla Enter teklaren bidez ordezkatu</string>
@@ -597,21 +587,7 @@ huts egin du.
   <string name="preferences__theme">Gaia</string>
   <string name="preferences__default">Lehenetsia</string>
   <string name="preferences__language">Hizkuntza</string>
-  <string name="preferences__make_default_sms_app">Lehenetsitako SMS aplikazio gisa ezarri</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure zure sistemaren lehenetsitako SMS/MMS aplikazioa bihurtu.</string>
-  <string name="preferences__use_data_channel">Push mezuak</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Hobetu zure pribatutasuna eta ekidin SMS tasak datu kanala erabiliz TextSecure-eko beste erabiltzaile batzuekin komunikatzeko </string>
-  <string name="preferences__sms_fallback">Irteerako SMS/MMS</string>
   <string name="preferences__submit_debug_log">Arazketaren log-a bidali</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure-eko erabiltzaileak</string>
-  <string name="preferences__sms_fallback_push_users_ask">galdetu lehenago</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">MMSrik ez</string>
-  <string name="preferences__sms_outgoing_push_users_description">SMS segurua bidali konexioa galtzen bada</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Galdetu SMS/MMS bidali baino lehenago</string>
-  <string name="preferences__sms_fallback_never_send_mms">Ez bidali MMSrik inoiz.</string>
-  <string name="preferences__sms_fallback_non_push_users">Ez dira TextSecure-eko erabiltzaileak</string>
-  <string name="preferences__sms_fallback_nobody">Inor ez</string>
   <string name="preferences__support_wifi_calling">\'\"WiFi Calling\' modu bateragarria</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Gaitu zure gailuak WiFi bidezko SMS/MMS banaketa erabiltzen badu (bakarrik gaitu \'WiFi Calling\' gaituta badago zure gailuan).</string>
   <!--****************************************-->

res/values-fi/strings.xml

@@ -24,19 +24,15 @@ jatkavat toimintaansa, mutta kuka tahansa, jolla on fyysinen pääsy laitteesees
 Tämä tulee lopettamaan pikaviestipalvelun poistamalla tietosi palvelimelta.
 Käyttääksesi pikaviestipalvelua tulevaisuudessa sinun täytyy rekisteröityä uudelleen.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Virhe yhdistettäessä palvelimeen!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Saapuvat tekstiviestit sallittu</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">Tekstiviestit käytössä</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa muuttaaksesi oletus tekstiviestisovellustasi</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Saapuvat tekstiviestit kielletty</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">Tekstiviestit poissa käytöstä</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Kosketa asettaaksesi TextSecuren oletus tekstiviestisovellukseksi</string>
   <string name="ApplicationPreferencesActivity_on">päällä</string>
   <string name="ApplicationPreferencesActivity_On">Päällä</string>
   <string name="ApplicationPreferencesActivity_off">pois</string>
   <string name="ApplicationPreferencesActivity_Off">Pois</string>
-  <string name="ApplicationPreferencesActivity_partial">osittain</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Saapuva %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">lähtevä %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuuttia</string>
   <!--DraftDatabase-->
@@ -63,7 +59,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Virhe. Vastaanotettiin vanhentunut avaintenvaihtoviesti.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Avaintenvaihtoviesti vastaanotettu, napsauta aloittaaksesi käsittelyn.</string>
   <string name="ConversationItem_group_action_left">%1$s on lähtenyt ryhmästä.</string>
-  <string name="ConversationItem_click_for_details">Lisätietoja näpäyttämällä</string>
+  <string name="ConversationItem_click_for_details">Lisätietoja napsauttamalla</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Napsauta lähettääksesi viestin salaamattomana</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Käytä salaamattomia tekstiviestejä?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Käytä salaamattomia MMS-viestejä?</string>
@@ -84,7 +80,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Pahoittelemme, mutta valittu audio ylittää kokorajoituksemme (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Annettu numero tai sähköpostiosoite ei ole kelvollinen!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Viesti on tyhjä!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Ryhmäkeskustelun vastaanottajat</string>
+  <string name="ConversationActivity_group_conversation_recipients">Ryhmäkeskustelun osanottajat</string>
   <string name="ConversationActivity_group_conversation">Ryhmäkeskustelu</string>
   <string name="ConversationActivity_unnamed_group">Nimeämätön ryhmä</string>
   <string name="ConversationActivity_d_recipients_in_group">%d jäsentä</string>
@@ -114,12 +110,12 @@ Vastaanotettu: %4$s</string>
   <string name="ConversationFragment_save_to_sd_card">Tallenna muistiin?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Jos tallennat tämän tiedoston muistiin, kaikki muutkin sovellukset voivat käyttää sitä.\n\nHaluatko jatkaa?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Tiedoston tallennuksessa tapahtui virhe!</string>
-  <string name="ConversationFragment_success_exclamation">Onnistuimme!</string>
+  <string name="ConversationFragment_success_exclamation">Onnistui!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Muistiin tallentaminen epäonnistui!</string>
   <string name="ConversationFragment_saving_attachment">Liitettä tallennetaan</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Liitettä tallennetaan muistiin...</string>
   <string name="ConversationFragment_pending">Käsiteltävänä...</string>
-  <string name="ConversationFragment_push">Mobiilitiedonsiirto (TextSecure)</string>
+  <string name="ConversationFragment_push">Tietoverkko (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Poistetaan...</string>
@@ -134,7 +130,7 @@ Vastaanotettu: %4$s</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Käyttäen mukautettua: %s</string>
   <string name="CustomDefaultPreference_using_default">Käyttäen oletusta: %s</string>
-  <string name="CustomDefaultPreference_none">Ei yhtäkään</string>
+  <string name="CustomDefaultPreference_none">Ei asetettu</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Nyt</string>
   <!--ShareActivity-->
@@ -149,10 +145,10 @@ Tämä toiminto vie TextSecure-viestiesi salaamattoman sisällön SD-muistikorti
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Viedään salaamaton viesti SD-kortille...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Virhe, SD-kortille kirjoittaminen epäonnistui!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">SD-kortille kirjoittaessa sattui virhe.</string>
-  <string name="ExportFragment_success">Onnistuimme!</string>
+  <string name="ExportFragment_success">Onnistui!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Pysyvä TextSecure-yhteysvirhe!</string>
-  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure ei voinut rekisteröityä Google Play Services -palveluun. Viestintä mobiilitiedonsiirron kautta on poistettu käytöstä. Ole hyvä ja rekisteröidy uudelleen TextSecuren asetuksista.</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure ei voinut rekisteröityä Google Play Services -palveluun, minkä vuoksi viestintä tietoverkon kautta on nyt otettu pois käytöstä. Ole hyvä ja kokeile rekisteröityä uudelleen TextSecuren asetuksista.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Uusi ryhmä</string>
   <string name="GroupCreateActivity_actionbar_update_title">Päivitä ryhmää</string>
@@ -202,7 +198,7 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Skannattuja avaimia ei löytynyt!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">Asenna viivakoodinlukija?</string>
-  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure tarvitsee viivakoodinlukijan QR-koodeja varten.</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure tarvitsee \"Barcode Scanner\" -ohjelman QR-koodeja varten.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Lähetys epäonnistui</string>
   <string name="MessageDetailsRecipient_new_identity">Uusi identiteetti</string>
@@ -241,7 +237,7 @@ aiemmin, seuraa niiden uudelleen tuonnista viestien kaksoiskappaleita.</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Salalause ei kelpaa!</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Tämän
-avaintenvaihdon sormenjälki eroaa tältä yhteystiedolta aiemmin saaduista sormenjäljistä.
+avaintenvaihdon sormenjälki eroaa tältä yhteystiedolta aiemmin saadusta sormenjäljestä.
 Tämä voi tarkoittaa että joku yrittää kaapata viestiliikennettäsi tai että yhteystietosi on
 uudelleenasentanut TextSecuren, ja käyttää nyt uutta tunnisteavainta.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Saatat haluta varmentaa
@@ -303,7 +299,7 @@ Vastaanotettu avainvaihtolähetys kuuluu väärälle protokollan versiolle.</str
 Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäksesi ja käsitelläksesi</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Vastaanotettiin päivitetty, mutta tuntematon identiteetti. Napsauta tarkistaaksesi.</string>
   <string name="SmsMessageRecord_secure_session_ended">Salattu istunto päättyi</string>
-  <string name="SmsMessageRecord_duplicate_message">Monistettu viesti.</string>
+  <string name="SmsMessageRecord_duplicate_message">Viestin kaksoiskappale.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Poistui ryhmästä...</string>
   <string name="TheadRecord_secure_session_ended">Salattu istunto päättyi</string>
@@ -313,7 +309,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäks
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Vastaanottajalla ei ole identiteettiavainta.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Vastaanottajalla ei ole identiteettiavainta!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skannaa vastapuolen avaimen QR-koodi</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Näytä oma avaimeni QR-koodina</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Näytä oman avaimeni QR-koodi</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROITUS, skannattu avain EI TÄSMÄÄ! Tarkastakaa sormenjälki huolella.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">Ei vahvistettu!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Vastaanottajan avain on oikea. Tarkistuta myös sinun avain vastaanottajalla.</string>
@@ -322,7 +318,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäks
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sinulla ei ole identiteettiavainta.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skannaa vastapuolen avaimen QR-koodi</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Näytä oma avaimeni QR-koodina</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Näytä oman avaimeni QR-koodi</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">VAROITUS: Skannattu avain EI TÄSMÄÄ!</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">EI vahvistettu!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Skannattu avain täsmää!</string>
@@ -392,9 +388,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Napsauta nähdäks
   <string name="contact_selection_recent_activity__no_recent_calls">Ei uusia soittoja.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Lähetä TextSecure-viesti</string>
-  <string name="conversation_activity__type_message_sms_secure">Lähetä salattu tekstiviesti</string>
   <string name="conversation_activity__type_message_sms_insecure">Lähetä salaamaton tekstiviesti</string>
-  <string name="conversation_activity__type_message_mms_secure">Lähetä salattu MMS-viesti</string>
   <string name="conversation_activity__type_message_mms_insecure">Lähetä salaamaton MMS-viesti</string>
   <string name="conversation_activity__send">Lähetä</string>
   <string name="conversation_activity__remove">Poista</string>
@@ -499,7 +493,7 @@ TextSecure ei toimi Google Voice -numeroiden kanssa.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Puhevahvistus</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
-TextSecure voi myös soittaa sinulle numerosi varmistamiseksi. Napsauta \"Soita minulle\" ja syötä kuulemasi kuusinumeroinen koodi alla olevaan kenttään. </string>
+TextSecure voi myös soittaa sinulle numerosi vahvistamiseksi. Napsauta \"Soita minulle\" ja syötä kuulemasi kuusinumeroinen koodi alla olevaan kenttään. </string>
   <string name="registration_progress_activity__verify">Vahvista</string>
   <string name="registration_progress_activity__call_me">Soita minulle</string>
   <string name="registration_progress_activity__edit_number">Muokkaa numeroa</string>
@@ -514,7 +508,7 @@ sisältyvät:</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Jos olet yhdistänyt WiFi-verkkoon, on mahdollista että palomuuri estää pääsyn TextSecuren palvelimelle. Kokeille toista verkkoa tai mobiiliverkkoa.</string>
   <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-TextSecure varmistaa nyt puhelinnumerosi automaattisesti tekstiviestillä.</string>
+TextSecure vahvistaa nyt puhelinnumerosi automaattisesti tekstiviestillä.</string>
   <string name="registration_progress_activity__connecting">Yhdistetään...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Odotetaan vahvistustekstiviestiä...</string>
   <string name="registration_progress_activity__registering_with_server">Rekisteröidytään palvelimelle...</string>
@@ -531,13 +525,13 @@ epäonnistui.</string>
   <string name="recipients_panel__to"><small>Syötä nimi tai numero</small></string>
   <string name="recipients_panel__add_member">Lisää jäsen</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Vastaanottajan identiteetti (he lukevat):</string>
+  <string name="verify_identity_activity__their_identity_they_read">Vastapuolen identiteetti (he lukevat):</string>
   <string name="verify_identity_activity__your_identity_you_read">Oma identiteettisi (sinä luet):</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">Jotkin asiat kaipaavat huomiotasi.</string>
-  <string name="message_details_header__sent">Lähetetyt</string>
+  <string name="message_details_header__sent">Lähetetty</string>
-  <string name="message_details_header__received">Vastaanotetut</string>
+  <string name="message_details_header__received">Vastaanotettu</string>
-  <string name="message_details_header__via">Kautta</string>
+  <string name="message_details_header__via">Tyyppi</string>
   <string name="message_details_header__to">Vast.ott:</string>
   <string name="message_details_header__from">Lähettäjä:</string>
   <string name="message_details_header__with">Avulla:</string>
@@ -570,11 +564,10 @@ epäonnistui.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Yleistä</string>
   <string name="preferences__sms_mms">SMS ja MMS</string>
-  <string name="preferences__push_sms_category">Pika- ja tekstiviestit</string>
   <string name="preferences__pref_all_sms_title">Vastaanota kaikki tekstiviestit</string>
   <string name="preferences__pref_all_mms_title">Vastaanota kaikki multimediaviestit</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Käytä TextSecurea kaikkien saapuvien tekstiviestien katselemiseen ja tallentamiseen</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Käytä TextSecurea kaikkiin saapuviin tekstiviesteihin</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Käytä TextSecurea kaikkien saapuvien multimediaviestien katselemiseen ja tallentamiseen</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Käytä TextSecurea kaikkiin saapuviin multimediaviesteihin</string>
   <string name="preferences__input_settings">Syöttöasetukset</string>
   <string name="preferences__enable_enter_key_title">Ota rivinvaihto käyttöön</string>
   <string name="preferences__replace_smiley_with_enter_key">Korvaa hymiönäppäin rivinvaihtonäppäimellä</string>
@@ -583,14 +576,14 @@ epäonnistui.</string>
   <string name="preferences__display_settings">Näytön asetukset</string>
   <string name="preferences__choose_identity">Valitse identiteetti</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Valitse yhteystieto osoitekirjasta.</string>
-  <string name="preferences__change_passphrase">Vaihda salalause</string>
+  <string name="preferences__change_passphrase">Salalauseen vaihto</string>
   <string name="preferences__change_my_passphrase">Vaihda salalauseeni</string>
   <string name="preferences__enable_passphrase">Aseta salalause</string>
   <string name="preferences__passphrase_summary">Salalause %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Ota käyttöön paikallisten viestien ja avainten salaus</string>
   <string name="preferences__screen_security">Näytön suojaus</string>
   <string name="preferences__screen_security_summary">Näytön suojaus %s</string>
-  <string name="preferences__disable_screen_security_to_allow_screen_shots">Estä kuvakaappaukset \'viimeksi käytetyt sovellukset\' näkymästä sekä sovelluksen sisältä</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">Estä kuvakaappaukset \"viimeksi käytetyt sovellukset\" -näkymästä sekä sovelluksen sisältä</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Unohda salalause muistista tietyn ajan kuluttua</string>
   <string name="preferences__timeout_passphrase">Ajasta salalause</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Valitse salalauseen ajastimen pituus</string>
@@ -600,7 +593,7 @@ epäonnistui.</string>
   <string name="preferences__display_message_notifications_in_status_bar">Näytä ilmoitukset palkissa</string>
   <string name="preferences__led_color">LED:in väri</string>
   <string name="preferences__led_color_unknown">Tuntematon</string>
-  <string name="preferences__pref_led_blink_title">LED:in vilkkumiskuvio</string>
+  <string name="preferences__pref_led_blink_title">LED:in vilkkumistahti</string>
   <string name="preferences__pref_led_blink_custom_pattern_title">Aseta mukautettu LED:in vilkkumiskuvio</string>
   <string name="preferences__pref_led_blink_custom_pattern_on_for">Päällä:</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Pois päältä:</string>
@@ -617,7 +610,7 @@ epäonnistui.</string>
   <string name="preferences__five_times">Neljästi</string>
   <string name="preferences__ten_times">10 kertaa</string>
   <string name="preferences__vibrate">Värinä</string>
-  <string name="preferences__also_vibrate_when_notified">Värinöi myös ilmoituksista</string>
+  <string name="preferences__also_vibrate_when_notified">Värise myös ilmoituksista</string>
   <string name="preferences__minutes">minuuttia</string>
   <string name="preferences__hours">tuntia</string>
   <string name="preferences__green">Vihreä</string>
@@ -627,7 +620,7 @@ epäonnistui.</string>
   <string name="preferences__cyan">Syaani</string>
   <string name="preferences__magenta">Magenta</string>
   <string name="preferences__white">Valkoinen</string>
-  <string name="preferences__none">Ei yhtäkään</string>
+  <string name="preferences__none">Pois päältä</string>
   <string name="preferences__fast">Nopea</string>
   <string name="preferences__normal">Normaali</string>
   <string name="preferences__slow">Hidas</string>
@@ -642,14 +635,14 @@ epäonnistui.</string>
   <string name="preferences__mms_proxy_port">MMS välityspalvelimen portti</string>
   <string name="preferences__mmsc_username">MMSC käyttäjänimi</string>
   <string name="preferences__mmsc_password">MMSC salasana</string>
-  <string name="preferences__sms_delivery_reports">SMS toimitusvarmistukset</string>
+  <string name="preferences__sms_delivery_reports">SMS toimitusvahvistukset</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä varmistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä vahvistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Poista vanhemmat viestit automaattisesti, kun ketju ylittää määritetyn pituuden</string>
   <string name="preferences__delete_old_messages">Poista vanhat viestit</string>
   <string name="preferences__conversation_length_limit">Keskustelun pituuden raja</string>
   <string name="preferences__trim_all_threads_now">Karsi kaikki viestiketjut nyt</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Käy läpi kaikki viestiketjut ja pakota ketjuihin pituusrajat</string>
-  <string name="preferences__light_theme">Kirkas</string>
+  <string name="preferences__light_theme">Vaalea</string>
   <string name="preferences__dark_theme">Tumma</string>
   <string name="preferences__appearance">Ulkonäkö</string>
   <string name="preferences__theme">Teema</string>
@@ -657,21 +650,10 @@ epäonnistui.</string>
   <string name="preferences__default">Oletus</string>
   <string name="preferences__language">Kieli</string>
   <string name="preferences__language_summary">Kieli %s</string>
-  <string name="preferences__make_default_sms_app">Aseta oletus tekstiviestisovellukseksi</string>
+  <string name="preferences__textsecure_messages">TextSecure-viestit</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Tee TextSecuresta järjestelmäsi oletus SMS/MMS-sovellus.</string>
-  <string name="preferences__use_data_channel">Pikaviestit</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsiirtokanavaa muiden TextSecuren käyttäjien kanssa.</string>
+Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
-  <string name="preferences__sms_fallback">Lähtevät SMS/MMS-viestit</string>
   <string name="preferences__submit_debug_log">Lähetä virheenkorjausloki</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecuren käyttäjille</string>
-  <string name="preferences__sms_fallback_push_users_ask">kysy ensin</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">ei MMS-viestejä</string>
-  <string name="preferences__sms_outgoing_push_users_description">Lähetä salattuja tekstiviestejä jos verkkoyhteys katkeaa</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Kysy ennen kuin lähetät SMS/MMS-viestejä</string>
-  <string name="preferences__sms_fallback_never_send_mms">Älä koskaan lähetä MMS-viestejä</string>
-  <string name="preferences__sms_fallback_non_push_users">Muille</string>
-  <string name="preferences__sms_fallback_nobody">Ei kenellekkään</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' -yhteensopiva tila</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ota käyttöön jos laitteesi lähettää SMS/MMS-viestit WiFi-yhteyden kautta (ota käyttöön vain kun \'WiFi Calling\' on käytössä laitteessasi).</string>
   <!--****************************************-->
@@ -724,7 +706,7 @@ Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsi
   <string name="conversation__menu_delete_thread">Poista viestiketju</string>
   <string name="conversation__menu_view_media">Kaikki kuvat</string>
   <!--conversation_callable-->
-  <string name="conversation_add_to_contacts__menu_add_to_contacts">Lisää yhteystietoluetteloon</string>
+  <string name="conversation_add_to_contacts__menu_add_to_contacts">Lisää yhteystietoihin</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Vastaanottajalista</string>
   <string name="conversation_group_options__delivery">Toimitus</string>
@@ -732,7 +714,7 @@ Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsi
   <string name="conversation_group_options__broadcast">Lähetä</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Vertaile</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Näytä oma avaimeni QR-koodina</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Näytä oman avaimeni QR-koodi</string>
   <string name="key_scanning__menu_scan_to_compare">Skannaa vastapuolen avaimen QR-koodi</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Uusi viesti</string>
@@ -742,13 +724,13 @@ Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsi
   <string name="text_secure_normal__mark_all_as_read">Merkitse kaikki luetuiksi</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Käyttämäsi TextSecure on vanhentunut!</string>
-  <string name="reminder_header_expired_build_details">Viestejä ei enää lähetetä onnistuneesti. Ole hyvä ja päivitä viimeisimpään versioon.</string>
+  <string name="reminder_header_expired_build_details">Viestejä ei enää voida lähettää onnistuneesti. Ole hyvä ja päivitä viimeisimpään versioon.</string>
   <string name="reminder_header_sms_default_title">Käytä oletus tekstiviestisovelluksena?</string>
-  <string name="reminder_header_sms_default_text">Kosketa tehdäksesi TextSecuresta oletus tekstiviestisovelluksesi.</string>
+  <string name="reminder_header_sms_default_text">Napsauta tehdäksesi TextSecuresta oletus tekstiviestisovelluksesi.</string>
   <string name="reminder_header_sms_import_title">Tuo järjestelmän tekstiviestit TextSecureen?</string>
-  <string name="reminder_header_sms_import_text">Näpäytä kopioidaksesi puhelimesi tekstiviestit sen salattuun tietokantaan</string>
+  <string name="reminder_header_sms_import_text">Napsauta kopioidaksesi puhelimesi tekstiviestit sen salattuun tietokantaan</string>
   <string name="reminder_header_push_title">Ota käyttöön TextSecure pikaviestipalvelu?</string>
-  <string name="reminder_header_push_text">Näpäytä </string>
+  <string name="reminder_header_push_text">Napsauta, jos haluat nopeaa viestittelyä ja vahvempaa yksityisyyttä sekä heittää hyvästit tekstiviestimaksuille.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Sinä</string>
   <string name="MediaPreviewActivity_cant_display">Kuvan esikatselu epäonnistui</string>
@@ -759,7 +741,7 @@ Paranna yksityisyyttäsi ja vältä tekstiviestilaskuja käyttämällä tiedonsi
   <string name="media_preview_activity__image_content_description">Kuvan esikatselu</string>
   <!--Trimmer-->
   <string name="trimmer__deleting">Poistetaan...</string>
-  <string name="trimmer__deleting_old_messages">Vanhat viestit poistetaan...</string>
+  <string name="trimmer__deleting_old_messages">Vanhoja viestejä poistetaan...</string>
   <string name="trimmer__old_messages_successfully_deleted">Vanhojen viestien poisto onnistui</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Tyypin kuvake</string>

res/values-fr/strings.xml

@@ -25,19 +25,15 @@ en mesure d’y accéder.</string>
 Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages push dans le futur.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur distant!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS entrants activés</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Activé</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Appuyez pour modifier votre application SMS par défaut</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS entrants désactivés</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Désactivé</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Appuyez pour faire de TextSecure votre application SMS par défaut</string>
   <string name="ApplicationPreferencesActivity_on">on</string>
   <string name="ApplicationPreferencesActivity_On">On</string>
   <string name="ApplicationPreferencesActivity_off">off</string>
   <string name="ApplicationPreferencesActivity_Off">Off</string>
-  <string name="ApplicationPreferencesActivity_partial">partiel</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Entrant %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">sortant %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutes</string>
   <!--DraftDatabase-->
@@ -132,6 +128,8 @@ vérifier ce contact.</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Message d’échange des clés…</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Personnalisé : %s</string>
+  <string name="CustomDefaultPreference_using_default">Par défaut : %s</string>
   <string name="CustomDefaultPreference_none">Aucun</string>
   <!--DateUtils-->
   <string name="DateUtils_now">À l\'instant</string>
@@ -366,6 +364,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="MessageNotifier_d_new_messages">%d nouveaux messages</string>
   <string name="MessageNotifier_most_recent_from_s">Dernier de : %s</string>
   <string name="MessageNotifier_encrypted_message">Message chiffré…</string>
+  <string name="MessageNotifier_media_message_with_text">Message média : %s</string>
   <string name="MessageNotifier_no_subject">(Aucun sujet)</string>
   <string name="MessageNotifier_message_delivery_failed">La distribution du message a échoué.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Échec de distribution du message.</string>
@@ -394,9 +393,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="contact_selection_recent_activity__no_recent_calls">Aucun appel récent.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Envoyer le message TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Envoyer SMS chiffré</string>
   <string name="conversation_activity__type_message_sms_insecure">Envoyer un SMS non-sécurisé</string>
-  <string name="conversation_activity__type_message_mms_secure">Envoyer un SMS sécurisé</string>
   <string name="conversation_activity__type_message_mms_insecure">Envoyer un MMS non-sécurisé</string>
   <string name="conversation_activity__send">Envoyer</string>
   <string name="conversation_activity__remove">Supprimer</string>
@@ -405,6 +402,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="conversation_activity__emoji_toggle_description">Activer le clavier emoji</string>
   <string name="conversation_activity__attachment_thumbnail">Vignette de pièce jointe</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Téléchargement du message média</string>
   <string name="conversation_item__mms_image_description">Message média</string>
   <string name="conversation_item__play_button_description">Bouton play</string>
   <string name="conversation_item__secure_message_description">Message sécurisé</string>
@@ -564,6 +562,8 @@ par SMS.</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
+  <string name="arrays__use_default">Par défaut</string>
+  <string name="arrays__use_custom">Personnalisé</string>
   <!--plurals.xml-->
   <plurals name="minutes_ago">
     <item quantity="one">%d minute</item>
@@ -576,11 +576,10 @@ par SMS.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Général</string>
   <string name="preferences__sms_mms">SMS et MMS</string>
-  <string name="preferences__push_sms_category">Push et SMS</string>
   <string name="preferences__pref_all_sms_title">Recevoir tous les SMS</string>
   <string name="preferences__pref_all_mms_title">Recevoir tous les MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour consulter et stocker tous les messages textes entrants</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour tous messages entrants</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour consulter et stocker tous les messages multimédia entrants</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour tous les messages média</string>
   <string name="preferences__input_settings">Paramètres de saisie</string>
   <string name="preferences__enable_enter_key_title">Activer la touche Entrée</string>
   <string name="preferences__replace_smiley_with_enter_key">Remplacer la touche smiley par une touche Entrée</string>
@@ -663,21 +662,11 @@ par SMS.</string>
   <string name="preferences__default">Par défaut</string>
   <string name="preferences__language">Langue</string>
   <string name="preferences__language_summary">Langue %s</string>
-  <string name="preferences__make_default_sms_app">Définir comme application SMS par défaut</string>
+  <string name="preferences__textsecure_messages">Messages TextSecure</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Faire de TextSecure l’application SMS/MMS par défaut de votre système.</string>
-  <string name="preferences__use_data_channel">Messages PUSH</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Augmenter la confidentialité et éviter les frais de SMS en utilisant le canal de données pour les communications avec d’autres utilisateurs de TextSecure</string>
+Messages privés gratuits vers les utilisateurs TextSecure et Signal
-  <string name="preferences__sms_fallback">SMS/MMS sortants</string>
+</string>
   <string name="preferences__submit_debug_log">Envoyer un rapport de débogage</string>
-  <string name="preferences__sms_outgoing_push_users">Utilisateurs de TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">demander d\'abord</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">pas de MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Envoyer des SMS sécurisés si aucune connexion de données n\'est disponible</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Demander avant d\'envoyer des SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Ne jamais envoyer de MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Utilisateurs sans TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Personne</string>
   <string name="preferences__support_wifi_calling">Mode de compatibilité \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activer si votre appareil délivre les SMS/MMS à l\'aide du WiFI (N\'activer que lorsque \'WiFi Calling\' est activé sur votre appareil).</string>
   <!--****************************************-->

res/values-hr/strings.xml

@@ -25,19 +25,15 @@ im moći pristupiti.</string>
 Ovo će onemogućiti instant poruke na način da će ukinuti registraciju na poslužitelju.
 Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili instant poruke u budućnosti.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Greška prilikom povezivanja na poslužitelj!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Dolazne SMS poruke omogućene</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS omogućen</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pritisnite za promjenu zadane SMS aplikacije</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Dolazne SMS poruke onemogućene</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS onemogućen</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pritisnite kako biste postavili TextSecure kao zadanu SMS aplikaciju</string>
   <string name="ApplicationPreferencesActivity_on">uključeno</string>
   <string name="ApplicationPreferencesActivity_On">Uključeno</string>
   <string name="ApplicationPreferencesActivity_off">isključeno</string>
   <string name="ApplicationPreferencesActivity_Off">Isključeno</string>
-  <string name="ApplicationPreferencesActivity_partial">djelomično</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Dolazne %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">odlazne %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuta</string>
   <!--DraftDatabase-->
@@ -69,6 +65,7 @@ ovaj kontakt.</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Pritisnite za nesigurnu rezervu</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Nekriptirani SMS kao rezerva?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Nekriptirani MMS kao rezerva?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ova poruka <b>neće</b> biti kriptirana zato što primatelj više nije TextSecure korisnik.\n\nPošalji nesigurnu poruku?</string>
   <string name="ConversationItem_unable_to_open_media">Nije moguće pronaći aplikaciju za otvaranje ovog medija.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Započmi sigurnu sesiju?</string>
@@ -362,6 +359,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="MessageNotifier_d_new_messages">%d novih poruka</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovija od: %s</string>
   <string name="MessageNotifier_encrypted_message">Kriptirana poruka...</string>
+  <string name="MessageNotifier_media_message_with_text">Media poruka: %s</string>
   <string name="MessageNotifier_no_subject">(Bez naslova)</string>
   <string name="MessageNotifier_message_delivery_failed">Neuspješna isporuka poruke.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Isporuka poruke nije uspjela.</string>
@@ -390,9 +388,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="contact_selection_recent_activity__no_recent_calls">Nema nedavnih poziva.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Pošalji TextSecure poruku</string>
-  <string name="conversation_activity__type_message_sms_secure">Pošalji sigurni SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Pošalji nesigurni SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Pošalji sigurni MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Pošalji nesigurni MMS</string>
   <string name="conversation_activity__send">Pošalji</string>
   <string name="conversation_activity__remove">Ukloni</string>
@@ -401,6 +397,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="conversation_activity__emoji_toggle_description">Uključi/isključi emoji tipkovnicu</string>
   <string name="conversation_activity__attachment_thumbnail">Priložena sličica</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Preuzimanje media poruke</string>
   <string name="conversation_item__mms_image_description">Multimedijalna poruka</string>
   <string name="conversation_item__play_button_description">Tipka za pokretanje</string>
   <string name="conversation_item__secure_message_description">Sigurna poruka</string>
@@ -470,6 +467,8 @@ Uvezi nekriptiranu kopiju kompatibilnu s \'SMSBackup And Restore\'.</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Završeno</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Potvrdite svoj broj telefona kako biste se povezali sa TextSecure.</string>
   <string name="registration_activity__your_country">VAŠA ZEMLJA</string>
   <string name="registration_activity__your_country_code_and_phone_number">POZIVNI BROJ ZEMLJE I
 TELEFONSKI BROJ</string>
@@ -573,11 +572,10 @@ neuspješno.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Općenito</string>
   <string name="preferences__sms_mms">SMS i MMS</string>
-  <string name="preferences__push_sms_category">Instant i SMS</string>
   <string name="preferences__pref_all_sms_title">Primi sve SMS</string>
   <string name="preferences__pref_all_mms_title">Primi sve MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Koristi TextSecure za prikaz i pohranu svih dolaznih tekstualnih poruka</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Koristi TextSecure za sve dolazne tekst poruke</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Koristi TextSecure za prikaz i pohranu svih dolaznih multimedijalnih poruka</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Koristi TextSecure za sve dolazne multimedija poruke</string>
   <string name="preferences__input_settings">Postavke unosa</string>
   <string name="preferences__enable_enter_key_title">Omogući Enter tipku</string>
   <string name="preferences__replace_smiley_with_enter_key">Zamijeni tipku smješka sa Enter tipkom</string>
@@ -660,21 +658,10 @@ neuspješno.</string>
   <string name="preferences__default">Zadano</string>
   <string name="preferences__language">Jezik</string>
   <string name="preferences__language_summary">Jezik %s</string>
-  <string name="preferences__make_default_sms_app">Postavi kao zadanu SMS aplikaciju</string>
+  <string name="preferences__textsecure_messages">TextSecure poruke</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Postavi TextSecure kao zadanu SMS/MMS aplikaciju za svoj sistem.</string>
-  <string name="preferences__use_data_channel">Instant poruke</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Povećajte privatnost i izbjegnite SMS troškove koristeći podatkovni kanal za komunikaciju sa drugim TextSecure korisnicima</string>
+Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
-  <string name="preferences__sms_fallback">Odlazni SMS/MMS</string>
   <string name="preferences__submit_debug_log">Pošalji debug zapis</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure korisnici</string>
-  <string name="preferences__sms_fallback_push_users_ask">prvo pitaj</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">bez MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Pošalji sigurni SMS ukoliko je podatkovna veza izgubljena</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Pitaj prije slanja SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nikad ne šalji MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Korisnici bez TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Nitko</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' način kompatibilnosti</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Omogućite ukoliko vaš uređaj koristi WiFi isporuku SMS/MMS poruka (omogućeno jedino kada je \'WiFi Calling\' omogućen na vašem uređaju).</string>
   <!--****************************************-->

res/values-hu/strings.xml

@@ -27,19 +27,12 @@ Ez letiltja az azonnali üzeneteket a regisztrációd törlésével a kiszolgál
 A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli használatához.
  </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Hiba a kiszolgálóhoz való kapcsolódáskor!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Bejövő SMS engedélyezve</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Érintsd meg az alapértelmezett SMS alkalmazás megváltoztatásához</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Bejövő SMS tiltva</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Érintsd meg a TextSecure alapértelmezett SMS alkalmzássá tételéhez</string>
   <string name="ApplicationPreferencesActivity_on">be</string>
   <string name="ApplicationPreferencesActivity_On">Be</string>
   <string name="ApplicationPreferencesActivity_off">ki</string>
   <string name="ApplicationPreferencesActivity_Off">Ki</string>
-  <string name="ApplicationPreferencesActivity_partial">részleges</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Bejövő %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">kimenő %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d perc</string>
   <!--DraftDatabase-->
@@ -73,6 +66,9 @@ ezt a névjegyet.
   <string name="ConversationItem_click_to_approve_unencrypted">Koppints a nem biztonságos tartalék mód aktiválásához</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Legyen tartalék mód a nem biztonságos SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Legyen tartalék mód a nem biztonságos MMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ez az üzenet &lt;b&gt;nem&lt;b&gt; kerül titkosításra mivel a fogadó fél már nem TextSecure felhasználó.
+
+Elküldöd a titkosítatlan üzenetet?</string>
   <string name="ConversationItem_unable_to_open_media">Nem található alkalmazás ezen médiafájl megnyitásához.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Biztonságos üzenetváltás indítása?</string>
@@ -379,6 +375,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="MessageNotifier_d_new_messages">%d új üzenet</string>
   <string name="MessageNotifier_most_recent_from_s">Legutóbbi tőle: %s</string>
   <string name="MessageNotifier_encrypted_message">Biztonságos üzenet...</string>
+  <string name="MessageNotifier_media_message_with_text">Média üzenet: %s</string>
   <string name="MessageNotifier_no_subject">(Nincs tárgy)</string>
   <string name="MessageNotifier_message_delivery_failed">Üzenet kézbesítése sikertelen!</string>
   <string name="MessageNotifier_failed_to_deliver_message">Nem sikerült az üzenet kézbesítése!</string>
@@ -407,9 +404,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="contact_selection_recent_activity__no_recent_calls">A híváslista üres.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">TextSecure üzenet küldése</string>
-  <string name="conversation_activity__type_message_sms_secure">Biztonságos SMS küldése</string>
   <string name="conversation_activity__type_message_sms_insecure">Nem biztonságos SMS küldése</string>
-  <string name="conversation_activity__type_message_mms_secure">Biztonságos MMS küldése</string>
   <string name="conversation_activity__type_message_mms_insecure">Nem biztonságos MMS küldése</string>
   <string name="conversation_activity__send">Küldés</string>
   <string name="conversation_activity__remove">Törlés</string>
@@ -418,6 +413,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="conversation_activity__emoji_toggle_description">Váltás a hangulatjelek beviteléhez</string>
   <string name="conversation_activity__attachment_thumbnail">Melléklet előnézet</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Média üzenet letöltése</string>
   <string name="conversation_item__mms_image_description">Média üzenet</string>
   <string name="conversation_item__play_button_description">Lejátszás gomb</string>
   <string name="conversation_item__secure_message_description">Biztonságos üzenet</string>
@@ -489,6 +485,8 @@ Egy titkosítatlan biztonsági mentés fájl importálása. \"SMS biztonsági me
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Befejezés</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Ellenőrizd a telefonszámodat a TextSecure alkalmazással történő kapcsolódáshoz.</string>
   <string name="registration_activity__your_country">SAJÁT ORSZÁGOD</string>
   <string name="registration_activity__your_country_code_and_phone_number">SAJÁT ORSZÁG HÍVÓSZÁM
 TELEFONSZÁM
@@ -608,11 +606,8 @@ sikertelen.
   <!--preferences.xml-->
   <string name="preferences__general">Általános</string>
   <string name="preferences__sms_mms">SMS és MMS</string>
-  <string name="preferences__push_sms_category">Azonnali és SMS üzenet</string>
   <string name="preferences__pref_all_sms_title">Minden SMS fogadása</string>
   <string name="preferences__pref_all_mms_title">Minden MMS fogadása</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure használata minden bejövő SMS üzenet megtekintéséhez és tárolásához</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure használata minden bejövő MMS üzenet megtekintéséhez és tárolásához</string>
   <string name="preferences__input_settings">Beviteli beállítások</string>
   <string name="preferences__enable_enter_key_title">Enter gomb engedélyezése</string>
   <string name="preferences__replace_smiley_with_enter_key">A mosoly emotikon gomb helyettesítése egy Enter gombbal</string>
@@ -695,22 +690,7 @@ sikertelen.
   <string name="preferences__default">Alapértelmezett</string>
   <string name="preferences__language">Nyelv</string>
   <string name="preferences__language_summary">Nyelv %s</string>
-  <string name="preferences__make_default_sms_app">Beállítás alapértelmezett SMS alkalmazásként</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Legyen a TextSecure az alapértelmezett SMS/MMS alkalmazás a rendszerben.</string>
-  <string name="preferences__use_data_channel">Azonnali üzenetek</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Növeld a biztonságodat és kerüld el az SMS díjak fizetését azzal, hogy adat csatornát használsz más TextSecure felhasználókkal való kommunikációhoz.
- </string>
-  <string name="preferences__sms_fallback">Kimenő SMS/MMS</string>
   <string name="preferences__submit_debug_log">Hibakeresési napló küldése</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure felhasználók</string>
-  <string name="preferences__sms_fallback_push_users_ask">először kérdezzen meg</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">nincs MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Biztonságos SMS küldése, ha a kapcsolat megszakad</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">SMS/MMS küldése előtt rákérdezés</string>
-  <string name="preferences__sms_fallback_never_send_mms">Soha ne küldjön MMS-t</string>
-  <string name="preferences__sms_fallback_non_push_users">Nem TextSecure felhasználók</string>
-  <string name="preferences__sms_fallback_nobody">Senki</string>
   <string name="preferences__support_wifi_calling">\'WiFi hívás\' kompatibilitási mód</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Engedélyezd, ha az eszköz SMS/MMS kézbesítése WiFi-n keresztül végzi (csak akkor engedélyezd ha a \'WiFi hívás\' opció engedélyezve van az eszközön).</string>
   <!--****************************************-->

res/values-in/strings.xml

@@ -21,9 +21,7 @@ dapat mengaksesnya</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Keluar dari komunikasi berbasis data</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Jangan gunakan push message</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kesalahan dalam menghubungkan ke server!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Terima Aktif</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Sentuh untuk mengubah aplikasi SMS default</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Terima Non Aktif</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Sentuh untuk membuat TextSecure sebagai aplikasi SMS default</string>
   <!--AppProtectionPreferenceFragment-->
   <!--DraftDatabase-->
@@ -362,8 +360,6 @@ Telah gagal
   <string name="preferences__general">Umum</string>
   <string name="preferences__pref_all_sms_title">Terima semua SMS</string>
   <string name="preferences__pref_all_mms_title">Terima semua MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gunakan TextSecure untuk melihat dan menyimpan semua pesan teks yang masuk</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gunakan TextSecure untuk melihat dan menyimpan semua pesan multimedia yang masuk</string>
   <string name="preferences__input_settings">Seting Masukan</string>
   <string name="preferences__enable_enter_key_title">Gunakan tombol Enter</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Pilih kontak anda dari daftar kontak yang ada.</string>
@@ -412,13 +408,7 @@ Telah gagal
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Default</string>
   <string name="preferences__language">Bahasa</string>
-  <string name="preferences__make_default_sms_app">Jadikan sebagai aplikasi SMS default</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Jadikan TextSecure sebagai palikasi default untuk SMS/MMS.</string>
-  <string name="preferences__use_data_channel">Pesan Push</string>
   <string name="preferences__submit_debug_log">Kirim debug log</string>
-  <string name="preferences__sms_outgoing_push_users">Pengguna TextSecure</string>
-  <string name="preferences__sms_fallback_non_push_users">Bukan pengguna TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Tak seorangpun</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-it/strings.xml

@@ -24,19 +24,12 @@ Questo disabiliterà i messaggi push e annullerà la tua registrazione sul serve
 Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messaggi push in futuro.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS in entrata abilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Premi per cambiare l\'applicazione predefinita per gli SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS in entrata disabilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tocca per rendere TextSecure l\'applicazione predefinita per gli SMS</string>
   <string name="ApplicationPreferencesActivity_on">on</string>
   <string name="ApplicationPreferencesActivity_On">On</string>
   <string name="ApplicationPreferencesActivity_off">off</string>
   <string name="ApplicationPreferencesActivity_Off">Off</string>
-  <string name="ApplicationPreferencesActivity_partial">parziale</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">In arrivo %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">in uscita %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuti</string>
   <!--DraftDatabase-->
@@ -67,6 +60,7 @@ questo contatto.</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Selezione per tornare alla comunicazione non sicura</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Ripiegare su SMS non cifrati?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Ripiegare su MMS non cifrati?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Questo messaggio <b>non</b> sarà criptato perché il destinatario non usa più TextSecure.\n\nInvio un messaggio non sicuro?</string>
   <string name="ConversationItem_unable_to_open_media">Impossibile trovare un\'app per aprire questo file.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniziare sessione sicura?</string>
@@ -364,6 +358,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="MessageNotifier_d_new_messages">(%d) nuovi messaggi</string>
   <string name="MessageNotifier_most_recent_from_s">Più recente da: %s</string>
   <string name="MessageNotifier_encrypted_message">Messaggio cifrato...</string>
+  <string name="MessageNotifier_media_message_with_text">Messaggio multimediale: %s</string>
   <string name="MessageNotifier_no_subject">(Nessun oggetto)</string>
   <string name="MessageNotifier_message_delivery_failed">Non è riuscito l\'invio del messaggio</string>
   <string name="MessageNotifier_failed_to_deliver_message">Non è riuscito l\'invio del messaggio</string>
@@ -392,9 +387,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="contact_selection_recent_activity__no_recent_calls">Nessuna chiamata recente.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Invia messaggio TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Manda SMS sicuro</string>
   <string name="conversation_activity__type_message_sms_insecure">Invia SMS non cifrato</string>
-  <string name="conversation_activity__type_message_mms_secure">Manda MMS sicuro</string>
   <string name="conversation_activity__type_message_mms_insecure">Invia MMS non cifrato</string>
   <string name="conversation_activity__send">Invia</string>
   <string name="conversation_activity__remove">Elimina</string>
@@ -403,6 +396,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="conversation_activity__emoji_toggle_description">Dis/attiva la tastiera emoji</string>
   <string name="conversation_activity__attachment_thumbnail">Anteprima allegato</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Sto scaricando un messaggio multimediale</string>
   <string name="conversation_item__mms_image_description">Messaggio multimediale</string>
   <string name="conversation_item__play_button_description">Pulsante Play</string>
   <string name="conversation_item__secure_message_description">Messaggio sicuro</string>
@@ -472,6 +466,9 @@ Importo una copia in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completato</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+        Verifica il tuo numero di telefono per connetterti a TextSecure.
+    </string>
   <string name="registration_activity__your_country">PAESE</string>
   <string name="registration_activity__your_country_code_and_phone_number">CODICE DEL PAESE E
 NUMERO DI TELEFONO</string>
@@ -586,11 +583,8 @@ non riuscita.
   <!--preferences.xml-->
   <string name="preferences__general">Generale</string>
   <string name="preferences__sms_mms">SMS e MMS</string>
-  <string name="preferences__push_sms_category">Push e SMS</string>
   <string name="preferences__pref_all_sms_title">Utilizza per tutti gli SMS</string>
   <string name="preferences__pref_all_mms_title">Utilizza per tutti gli MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usa TextSecure per vedere e salvare tutti i messaggi in arrivo</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usa TextSecure per vedere e salvare tutti gli MMS in arrivo</string>
   <string name="preferences__input_settings">Impostazioni di Input</string>
   <string name="preferences__enable_enter_key_title">Abilita il tasto Invio</string>
   <string name="preferences__replace_smiley_with_enter_key">Sostituisci il tasto smiley con il tasto Inivio</string>
@@ -673,22 +667,7 @@ non riuscita.
   <string name="preferences__default">Predefinito</string>
   <string name="preferences__language">Lingua</string>
   <string name="preferences__language_summary">Lingua %s</string>
-  <string name="preferences__make_default_sms_app">Imposta come applicazione SMS predefinita.</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Rendi TextSecure l\'applicazione predefinita per SMS/MMS.</string>
-  <string name="preferences__use_data_channel">Messaggi push</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Aumenta la privacy ed evita i costi degli SMS usando la connettività dati per comunicare con altri utenti TextSecure
-</string>
-  <string name="preferences__sms_fallback">SMS/MMS in uscita</string>
   <string name="preferences__submit_debug_log">Invia log di debug</string>
-  <string name="preferences__sms_outgoing_push_users">Utenti TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">chiedi prima</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">no MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Manda SMS sicuri se la connettività dati è assente</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Chiedi prima di inviare SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Non inviare mai MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Utenti Non-TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Nessuno</string>
   <string name="preferences__support_wifi_calling">Modalità di compatibilità \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Attiva questa opzione se il tuo dispositivo invia SMS/MMS tramite WiFi (attiva solo quando \'WiFi Calling\' è attivo sul tuo dispositivo).</string>
   <!--****************************************-->

res/values-iw/strings.xml

@@ -243,8 +243,6 @@
   <!--plurals.xml-->
   <!--preferences.xml-->
   <string name="preferences__general">כללי</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">השתמש ב-TextSecure לצפייה ואחסון של כל הודעות הטקסט</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">השתמש ב-TextSecure לצפייה ואחסון של כל הודעות המולטימדיה</string>
   <string name="preferences__input_settings">הכנס הגדרות</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">בחר איש קשר מאנשי הקשר.</string>
   <string name="preferences__change_passphrase">שנה סיסמה</string>

res/values-ja/strings.xml

@@ -24,19 +24,15 @@
 サーバーから登録を取消し、プッシュメッセージを無効化します。
 再びプッシュメッセージを使用するには、</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">サーバー接続中にエラーが発生しました！</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMSの受信が有効</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS 有効</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">タッチしてデフォルトSMSアプリを変更</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS受信が無効です</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS 無効</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">タッチしてTextSecureをデフォルトSMSアプリにできます</string>
   <string name="ApplicationPreferencesActivity_on">オン</string>
   <string name="ApplicationPreferencesActivity_On">オン</string>
   <string name="ApplicationPreferencesActivity_off">オフ</string>
   <string name="ApplicationPreferencesActivity_Off">オフ</string>
-  <string name="ApplicationPreferencesActivity_partial">一部</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">受信 %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">送信 %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d 分</string>
   <!--DraftDatabase-->
@@ -70,6 +66,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted">タップしてセキュアでない通信を行う</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">代替として暗号化されていないSMSに切り替わりますか？</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">代替として暗号化されていないMMSに切り替わりますか？</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">このメッセージは暗号化されて<b>いません</b>、なぜなら受信者はTextSecureユーザーではなくなったためです。\n\n安全ではないメッセージの送信を行いますか?</string>
   <string name="ConversationItem_unable_to_open_media">このメディアを開くことができるアプリが見つかりません。</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">セキュア・セッションを開始しますか？</string>
@@ -352,6 +349,7 @@
   <string name="MessageNotifier_d_new_messages">%d 新しいメッセージ</string>
   <string name="MessageNotifier_most_recent_from_s">最新の送信者： %s</string>
   <string name="MessageNotifier_encrypted_message">暗号化されたメッセージ…</string>
+  <string name="MessageNotifier_media_message_with_text">メディアメッセージ: %s</string>
   <string name="MessageNotifier_no_subject">（無題）</string>
   <string name="MessageNotifier_message_delivery_failed">メッセージの配信に失敗しました。</string>
   <string name="MessageNotifier_failed_to_deliver_message">メッセージの配信に失敗しました。</string>
@@ -380,9 +378,7 @@
   <string name="contact_selection_recent_activity__no_recent_calls">最近の通話はありません。</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">TextSecureメッセージを送信</string>
-  <string name="conversation_activity__type_message_sms_secure">暗号化されているSMSを送信</string>
   <string name="conversation_activity__type_message_sms_insecure">セキュアではないSMSを送信</string>
-  <string name="conversation_activity__type_message_mms_secure">暗号化されているMMSを送信</string>
   <string name="conversation_activity__type_message_mms_insecure">セキュアではないMMSを送信</string>
   <string name="conversation_activity__send">送信</string>
   <string name="conversation_activity__remove">削除</string>
@@ -391,6 +387,7 @@
   <string name="conversation_activity__emoji_toggle_description">絵文字キーボードを切り替え</string>
   <string name="conversation_activity__attachment_thumbnail">添付のサムネイル</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">メディアメッセージダウンロード</string>
   <string name="conversation_item__mms_image_description">メディアーメッセージ</string>
   <string name="conversation_item__play_button_description">再生ボタン</string>
   <string name="conversation_item__secure_message_description">暗号化されたメッセージ</string>
@@ -460,6 +457,9 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">完了</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+        あなたの電話番号をTextSecureに接続するための検証。
+    </string>
   <string name="registration_activity__your_country">あなたの国</string>
   <string name="registration_activity__your_country_code_and_phone_number">あなたの国番号と電話番号</string>
   <string name="registration_activity__phone_number">電話番号</string>
@@ -549,11 +549,10 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <!--preferences.xml-->
   <string name="preferences__general">一般設定</string>
   <string name="preferences__sms_mms">SMSとMMS</string>
-  <string name="preferences__push_sms_category">プッシュとSMS</string>
   <string name="preferences__pref_all_sms_title">全てのSMSを受信</string>
   <string name="preferences__pref_all_mms_title">全てのMMSを受信</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">受信する全てのSMS（テキストメッセージ）の表示、及び保存にTextSecureを使用します</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">受信する全てのSMS（テキスト・メッセージ）にTextSecureを使用します</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">受信する全てのMMS（ファイル付きメッセージ）の表示、及び保存にTextSecureを使用します</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">受信する全てのMMS（ファイル付きメッセージ）にTextSecureを使用します</string>
   <string name="preferences__input_settings">設定入力</string>
   <string name="preferences__enable_enter_key_title">エンターキーを使えるようにする</string>
   <string name="preferences__replace_smiley_with_enter_key">顔文字キーをエンターキーに変える</string>
@@ -637,21 +636,11 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="preferences__default">初期設定の言語</string>
   <string name="preferences__language">言語</string>
   <string name="preferences__language_summary">言語 %s</string>
-  <string name="preferences__make_default_sms_app">標準のSMSアプリに設定する</string>
+  <string name="preferences__textsecure_messages">TextSecureメッセージ</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">お使いの端末で、TextSecureをSMS／MMSの標準アプリにする</string>
-  <string name="preferences__use_data_channel">プッシュメッセージ</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-他のTextSecureユーザと会話する時、安全性を高めつつSMS料金がかからないようにデータチャンネルを使いますか?</string>
+        TextSecureとSignalユーザへのフリーのプライベートメッセージ
-  <string name="preferences__sms_fallback">SMS/MMS送信</string>
+    </string>
   <string name="preferences__submit_debug_log">デバッグログを提出</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecureユーザ</string>
-  <string name="preferences__sms_fallback_push_users_ask">送信前に確認</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">MMSなし</string>
-  <string name="preferences__sms_outgoing_push_users_description">データチャンネルが使用不可能の時、暗号化されたSMSを送る</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">SMS/MMSを送信する前に尋ねる</string>
-  <string name="preferences__sms_fallback_never_send_mms">MMSを送信しない</string>
-  <string name="preferences__sms_fallback_non_push_users">TextSecureを使用しない方</string>
-  <string name="preferences__sms_fallback_nobody">無人</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' 互換モード</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">あなたのデバイスで  WiFi (ただし \'WiFi Calling\' があなたのデバイスで有効になっている場合のみ)での SMS/MMS の配送を有効にする。</string>
   <!--****************************************-->

res/values-kn-rIN/strings.xml

@@ -26,17 +26,15 @@
 
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">ಸರ್ವರ್ಗೆ ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">ಒಳಬರುವ ಎಸ್.ಎಮ್.ಎಸನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">ಎಸ್.ಎಮ್.ಎಸನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">ನಿಮ್ಮ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್.ಎಮ್.ಎಸ್ ಅಪ್ಲಿಕೇಶನ್ನು ಬದಲಾಯಿಸಲು ಸ್ಪರ್ಶಿಸಿ</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">ಒಳಬರುವ ಎಸ್.ಎಮ್.ಎಸನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">ಎಸ್.ಎಮ್.ಎಸನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರನ್ನು ನಿಮ್ಮ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್.ಎಮ್.ಎಸ್ ಅಪ್ಲಿಕೇಶನ್ನಾಗಿ ಬದಲಾಯಿಸಲು ಸ್ಪರ್ಶಿಸಿ</string>
   <string name="ApplicationPreferencesActivity_on">ಆನ್ </string>
   <string name="ApplicationPreferencesActivity_On">ಆನ್</string>
   <string name="ApplicationPreferencesActivity_off">ಆಫ಼್</string>
   <string name="ApplicationPreferencesActivity_Off">ಆಫ಼್</string>
-  <string name="ApplicationPreferencesActivity_partial">ಅಪೂರ್ಣ</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">ಎಸ್.ಎಮ್.ಎಎಸ್ %1$s, ಎಮ್.ಎಮ್.ಎಸ್ %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">ಎಸ್ಎಂಎಸ್</string>
-  <string name="ApplicationPreferencesActivity_mms">ಎಮ್ ಎಮ್ ಎಸ್ </string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d ನಿಮಿಷಗಳು</string>
   <!--DraftDatabase-->
@@ -56,11 +54,13 @@
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">ಸಂದೇಶದ ಗಾತ್ರ: %d ಕೆ.ಬಿ</string>
   <string name="ConversationItem_expires_s">ಮುಕ್ತಾಯದ ಅವಧಿ: %s</string>
+  <string name="ConversationItem_error_not_delivered">ತಲುಪಿಸಲು ಆಗಲಿಲ್ಲ</string>
   <string name="ConversationItem_view_secure_media_question">ಸುರಕ್ಷಿತ ಮಾಧ್ಯಮವನ್ನು ವೀಕ್ಷಿಸಬೇಕೆ?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">ಈ ಕಡತವನ್ನು ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ದತ್ತಾಂಶದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ. ದುರದೃಷ್ಟವಶಾತ್, ಬಾಹ್ಯ ವೀಕ್ಷಕದಲ್ಲಿ ಇದನ್ನು ವೀಕ್ಷಿಸಲು ತಾತ್ಕಾಲಿಕವಾಗಿ ಇದನ್ನು ಅಸಂಕೇತಿಕರಿಸಿ ಡಿಸ್ಕಿಗೆ ಬರೆಯಲಾಗುತ್ತದೆ. ನೀವು ಇದನ್ನು ಮಾಡಲು ಬಯಸುತ್ತೀರ?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">ದೋಷ, ಹಳತಾದ ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶ ಸ್ವೀಕರಿಸಲಾಗಿದೆ, ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ.</string>
   <string name="ConversationItem_group_action_left">%1$s ಸಮೂಹವನ್ನು ಬಿಟ್ಟಿದ್ದಾರೆ</string>
+  <string name="ConversationItem_click_for_details">ವಿವರಗಳಿಗೆ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
   <string name="ConversationItem_click_to_approve_unencrypted">ಅಸುರಕ್ಷಿತ ಸಂವಾದದ ಹಿಮ್ಮರಳಿಕೆ ಟ್ಯಾಪ್ ಮಾಡಿ</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">ಅಸುರಕ್ಶಿತ ಎಸ್.ಎಮ್.ಎಸ್ ಹಿಮ್ಮರಳಿ ?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">ಅಸುರಕ್ಶಿತ ಎಮ್.ಎಮ್.ಎಸ್ ಹಿಮ್ಮರಳಿ ?</string>
@@ -110,6 +110,8 @@
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">ಸಂಗ್ರಹಕ್ಕೆ ಬರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ!</string>
   <string name="ConversationFragment_saving_attachment">ಲಗತ್ತು ಉಳಿಸಲಾಗುತ್ತಿದೆ</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">ಸಂಗ್ರಹಕ್ಕೆ ಲಗತ್ತನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ...</string>
+  <string name="ConversationFragment_pending">ಬಾಕಿ ಉಳಿದಿರುವುದು...</string>
+  <string name="ConversationFragment_push">ದತ್ತಾಂಶ (ಟೆಕ್ಸ್ಟ್  ಸೆಕ್ಯೂರ್)</string>
   <string name="ConversationFragment_mms">ಎಮ್ ಎಮ್ ಎಸ್</string>
   <string name="ConversationFragment_sms">ಎಸ್ ಎಮ್ ಎಸ್</string>
   <string name="ConversationFragment_deleting">ಅಳಿಸಲಾಗುತ್ತಿದೆ...</string>
@@ -373,9 +375,7 @@
   <string name="contact_selection_recent_activity__no_recent_calls">ಯಾವುದೇ ಇತ್ತೀಚಿನ ಕರೆಗಳಿಲ್ಲ.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಿ</string>
-  <string name="conversation_activity__type_message_sms_secure">ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿ</string>
   <string name="conversation_activity__type_message_sms_insecure">ಅಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿ</string>
-  <string name="conversation_activity__type_message_mms_secure">ಸುರಕ್ಷಿತ ಎಂಎಂಎಸ್ ಕಳುಹಿಸಿ</string>
   <string name="conversation_activity__type_message_mms_insecure">ಅಸುರಕ್ಷಿತ ಎಂಎಂಎಸ್ ಕಳುಹಿಸಿ</string>
   <string name="conversation_activity__send">ಕಳುಹಿಸು</string>
   <string name="conversation_activity__remove">ತೆಗೆದುಹಾಕಿ</string>
@@ -501,6 +501,8 @@
   <string name="registration_progress_activity__sms_verification_failed">ಎಸ್ ಎಂ ಎಸ್ ಪರಿಶೀಲನೆ 
 ವಿಫಲವಾಗಿದೆ. </string>
   <string name="registration_progress_activity__generating_keys">ಕೀಲಿಗಳನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ ...</string>
+  <string name="registration_progress_activity__telephone">ದೂರವಾಣಿ</string>
+  <string name="registration_progress_activity__check">ಪರಿಶೀಲಿಸು</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>ಹೆಸರು ಅಥವಾ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</small></string>
   <string name="recipients_panel__add_member">ಸದಸ್ಯರನ್ನು ಸೇರಿಸಿ </string>
@@ -508,6 +510,10 @@
   <string name="verify_identity_activity__their_identity_they_read">ಅವರ ಗುರುತು (ಅವರು ಓದುವುದು):</string>
   <string name="verify_identity_activity__your_identity_you_read">ನಿಮ್ಮ ಗುರುತು (ನೀವು ಓದುವುದು):</string>
   <!--message_details_header-->
+  <string name="message_details_header__sent">ಕಳುಹಿಸಲಾಗಿದೆ</string>
+  <string name="message_details_header__to">ಗೆ:</string>
+  <string name="message_details_header__from">ಇಂದ:</string>
+  <string name="message_details_header__with">ಜೋತೆಗೆ:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">ಗುಪ್ತಪದ ರಚಿಸಿ</string>
   <string name="AndroidManifest__enter_passphrase">ಗುಪ್ತಪದ ನಮೂದಿಸಿ</string>
@@ -533,11 +539,8 @@
   <!--preferences.xml-->
   <string name="preferences__general">ಸಾಮಾನ್ಯ</string>
   <string name="preferences__sms_mms">ಎಸ್ಎಮ್ಎಸ್ ಮತ್ತು ಎಮ್ಎಮ್ಎಸ್</string>
-  <string name="preferences__push_sms_category">ಪುಶ್ ಮತ್ತು ಎಸ್ಎಮ್ಎಸ್</string>
   <string name="preferences__pref_all_sms_title">ಎಲ್ಲಾ ಎಸ್ ಎಂ ಎಸ್ ಪಡೆಯುವಿರಿ</string>
   <string name="preferences__pref_all_mms_title">ಎಲ್ಲಾ ಎಸ್ ಎಂ ಎಸ್ ಪಡೆಯುವಿರಿ</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">ಎಲ್ಲಾ ಒಳಬರುವ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಮತ್ತು ಸಂಗ್ರಹಿಸಲು ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬಳಸಿ</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">ಎಲ್ಲಾ ಒಳಬರುವ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ವೀಕ್ಷಿಸಲು ಮತ್ತು ಸಂಗ್ರಹಿಸಲು ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬಳಸಿ</string>
   <string name="preferences__input_settings">ಇನ್ಪುಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳು</string>
   <string name="preferences__enable_enter_key_title">ಎಂಟರ್ ಕೀಲಿಯನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
   <string name="preferences__replace_smiley_with_enter_key">ಸ್ಮೈಲಿ ಕೀಲಿ ಬದಲಿಗೆ ಎಂಟರ್ ಕೀಲಿ ಹಾಕಿ</string>
@@ -604,20 +607,7 @@
   <string name="preferences__theme">ವಿನ್ಯಾಸ</string>
   <string name="preferences__default">ಪೂರ್ವನಿಯೋಜಿತ</string>
   <string name="preferences__language">ಭಾಷೆ</string>
-  <string name="preferences__make_default_sms_app">ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್ಎಂಎಸ್ ಅಪ್ಲಿಕೇಶನ್ ಆಗಿ ಹೊಂದಿಸಿ</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">ನಿಮ್ಮ ವ್ಯವಸ್ಥೆಯ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್ಎಂಎಸ್ / ಎಂಎಂಎಸ್ ಅಪ್ಲಿಕೇಶನ್ ಆಗಿ ಮಾಡಿ.</string>
-  <string name="preferences__use_data_channel">ಪುಷ್ ಸಂದೇಶಗಳು</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">ಖಾಸಗಿತನವನ್ನು ಹೆಚ್ಚಿಸಲು ಹಾಗು ಎಸ್ಎಂಎಸ್ ಶುಲ್ಕ ತಪ್ಪಿಸಲು ಇತರೆ ಟೆಕ್ಸ್ಟ್-ಸೆಕ್ಯೂರ್ ಬಳಕೆದಾರರ ಜೋತೆ ಮಾಹಿತಿ ಕಾಲುವೆ ಬಳಸಿ</string>
-  <string name="preferences__sms_fallback">ಹೊರಹೋಗುವ  ಎಸ್ಎಂಎಸ್/ಎಂಎಂಎಸ್</string>
   <string name="preferences__submit_debug_log">ಡೀಬಗ್ ಲಾಗ್ ಸಲ್ಲಿಸಿ</string>
-  <string name="preferences__sms_outgoing_push_users">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬಳಕೆದಾರರು</string>
-  <string name="preferences__sms_fallback_push_users_ask">ಮೊದಲು ಕೇಳಿ</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">ಎಮ್ ಎಮ್ ಎಸ್ ಇಲ್ಲ </string>
-  <string name="preferences__sms_outgoing_push_users_description">ಡೇಟಾ ಸಂಪರ್ಕ ಕಳೆದುಹೋದ ಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿ</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">ಎಸ್ಎಂಎಸ್/ಎಂಎಂಎಸ್ ಕಳುಹಿಸುವ ಮೊದಲು ಕೇಳಿ</string>
-  <string name="preferences__sms_fallback_never_send_mms">ಎಂಎಂಎಸ್ ಎಂದಿಗೂ ಕಳುಹಿಸಬೇಡಿ</string>
-  <string name="preferences__sms_fallback_non_push_users">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬಳಕೆದಾರರಲ್ಲದವರು </string>
-  <string name="preferences__sms_fallback_nobody">ಅಗಣ್ಯ</string>
   <string name="preferences__support_wifi_calling">\'ವೈಫೈ ಕಾಲಿಂಗ್\' ಹೊಂದಾಣಿಕೆ ಮೋಡ್</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">ನಿಮ್ಮ ಸಾಧನ ಎಸ್ಎಂಎಸ್ / ಎಂಎಂಎಸ್ನ್ನು ವೈಫೈ ಮೇಲೆ ಬಳಸಿದರೆ ಇದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ (\'ವೈಫೈ ಕಾಲಿಂಗ್\' ನಿಮ್ಮ ಸಾಧನದಲ್ಲಿ ಸಕ್ರಿಯಗೊಳಿಸಿದ್ದಾಗ ಮಾತ್ರ) </string>
   <!--****************************************-->

res/values-my/strings.xml

@@ -175,8 +175,6 @@
   <!--arrays.xml-->
   <!--plurals.xml-->
   <!--preferences.xml-->
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">textsecure ကိုဝင်လာသောစာတိုများကိုကြည့်ရန်/သိမ်းရန်အတွက်သုံးပါ</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">textsecure ကိုဝင်လာသောမာတီမီဒီယာစာတိုများကိုကြည့်ရန်/သိမ်းရန်အတွက်သုံးပါ</string>
   <string name="preferences__input_settings">ကီးဘုတ်ပုံစံသတ်မှတ်ချက်များ</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">အဆက်အသွယ်ကို အဆက်အသွယ်စာရင်းမှ ရွေးယူပါ</string>
   <string name="preferences__change_my_passphrase">ကျွန်ုပ်စကားဝှက်ကိုပြောင်းပါ</string>

res/values-nl/strings.xml

@@ -21,19 +21,17 @@ Let op, dit schakelt opslagversleuteling uit voor alle berichten en sleutels. Je
   <string name="ApplicationPreferencesActivity_disable_push_messages">Pushberichten uitschakelen?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 Dit zal push berichten uitzetten door uw registratie bij de server ongedaan te maken.
-U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wilt gebruiken.</string>
+Je zal je telefoonnummer opnieuw moeten registreren als je pushberichten weer wilt gebruiken.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fout bij verbinden met de server!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Inkomende SMS geactiveerd</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS ingeschakeld</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Aanraken om je standaard SMS-applicatie te veranderen</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Inkomende SMS uitgeschakeld</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS uitgeschakeld</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Raak aan om TextSecure je standaard SMS-applicatie te maken</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Aanraken om TextSecure je standaard SMS-applicatie te maken</string>
   <string name="ApplicationPreferencesActivity_on">aan</string>
   <string name="ApplicationPreferencesActivity_On">Aan</string>
   <string name="ApplicationPreferencesActivity_off">uit</string>
   <string name="ApplicationPreferencesActivity_Off">Uit</string>
-  <string name="ApplicationPreferencesActivity_partial">gedeeltelijk</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuten</string>
   <!--DraftDatabase-->
@@ -48,24 +46,28 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Contact info</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">U kunt wensen dit contact te verifiëren.</string>
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">De identificerende sleutel van %1$s is veranderd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen of dat %2$s simpelweg TextSecure opnieuw geïnstalleerd heeft en nu een nieuwe identiteit heeft.</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Je wilt wellicht dit contact verifiëren.</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Berichtgrootte: %d KB</string>
   <string name="ConversationItem_expires_s">Verloopt: %s</string>
+  <string name="ConversationItem_error_not_delivered">Niet bezorgd</string>
   <string name="ConversationItem_view_secure_media_question">Bekijk beveiligde media?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Deze media is opgeslagen in een versleutelde database. Om het weer te geven, zal het tijdelijk moeten worden ontsleuteld en naar het opslaggeheugen worden weggeschreven. Weet u zeker dat u dit wil doen?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fout, verouderd sleuteluitwisselingsbericht ontvangen.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Sleuteluitwisselingsbericht ontvangen, klik hier om te verwerken.</string>
   <string name="ConversationItem_group_action_left">%1$s heeft de groep verlaten.</string>
+  <string name="ConversationItem_click_for_details">Aanraken voor details</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Tik voor terugvallen naar onbeveiligd</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Terugvallen naar onversleutelde SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Terugvallen naar onversleutelde MMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Dit bericht zal <b>niet</b> versleuteld worden om de ontvanger geen TextSecure meer gebruikt.\n\nOnbeveiligd bericht verzenden?</string>
   <string name="ConversationItem_unable_to_open_media">Geen app gevonden om dit bestand te openen.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Veilige sessie initiëren?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initieer beveiligde sessie met %s?</string>
   <string name="ConversationActivity_abort_secure_session_confirmation">Beëindigen beveiligde sessie bevestigen</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Weet u zeker dat u deze beveiligde sessie wilt beëindigen?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Weet je zeker dat je deze beveiligde sessie wilt beëindigen?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Verwijderen gesprek bevestigen</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Weet je zeker dat je dit gesprek permanent wilt verwijderen?</string>
   <string name="ConversationActivity_add_attachment">Voeg bijlage toe</string>
@@ -86,7 +88,7 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <string name="ConversationActivity_calls_not_supported">Bellen niet ondersteund</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dit apparaat lijkt dial-acties niet te ondersteunen.</string>
   <string name="ConversationActivity_leave_group">Groep verlaten?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Weet u zeker dat u deze groep wil verlaten?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Weet je zeker dat je deze groep wil verlaten?</string>
   <string name="ConversationActivity_transport_insecure_sms">Onveilige SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Onveilige MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
@@ -106,6 +108,8 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Opslag niet beschrijfbaar!</string>
   <string name="ConversationFragment_saving_attachment">Bijlage opslaan</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Bijlage aan het opslaan...</string>
+  <string name="ConversationFragment_pending">In afwachting...</string>
+  <string name="ConversationFragment_push">Data (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Verwijderen...</string>
@@ -118,6 +122,8 @@ U zal uw telefoonnummer opnieuw moeten registreren als u push berichten weer wil
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Sleuteluitwisselingsbericht...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Handmatig gebruiken: %s</string>
+  <string name="CustomDefaultPreference_using_default">Standaard gebruiken: %s</string>
   <string name="CustomDefaultPreference_none">Niets</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Nu</string>
@@ -183,6 +189,8 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
   <string name="KeyScanningActivity_install_barcode_Scanner">Installeer Barcode Scanner?</string>
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure heeft Barcode Scanner nodig voor QR codes.</string>
   <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">Verzenden mislukt</string>
+  <string name="MessageDetailsRecipient_new_identity">Nieuwe identiteit</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">MMS opslaan mislukt!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fout bij verbinden met MMS provider...</string>
@@ -219,7 +227,7 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ongeldig wachtwoord!</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">De handtekening op deze sleuteluitwisseling is anders dan wat u eerder ontvangen heeft van dit contact. Dit kan betekenen dat iemand probeert uw communicatie the onderscheppen, of dat dit contact gewoon TextSecure opnieuw geïnstalleerd heeft en nu een nieuwe identiteitssleutel heeft.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">U kunt wensen dit contact te verifiëren.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Je wilt wellicht dit contact verifiëren.</string>
   <string name="ReceiveKeyActivity_processing">Aan het verwerken</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Sleuteluitwisseling verwerken...</string>
   <!--RegistrationActivity-->
@@ -274,7 +282,7 @@ ontvangen!</string>
 Sleuteluitwisselingsbericht ontvangen voor een verkeerde protocol-versie.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en weer te geven.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Bijgewerkte maar onbekende identiteitsgegevens ontvangen. Raak aan om identiteit te bevestigen.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Bijgewerkte maar onbekende identiteitsgegevens ontvangen. Aanraken om identiteit te bevestigen.</string>
   <string name="SmsMessageRecord_secure_session_ended">Beveiligde sessie beëindigd.</string>
   <string name="SmsMessageRecord_duplicate_message">Dupliceer bericht.</string>
   <!--ThreadRecord-->
@@ -282,7 +290,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="TheadRecord_secure_session_ended">Beveiligde sessie beëindigd.</string>
   <string name="ThreadRecord_draft">Concept:</string>
   <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">U heeft geen identiteitssleutel.</string>
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Je hebt geen identiteitssleutel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">De ontvanger heeft geen identiteitssleutel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">De ontvanger heeft geen identiteitssleutel!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Scan zijn/haar sleutel om te vergelijken</string>
@@ -328,14 +336,15 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="ApplicationMigrationService_import_in_progress">Bezig met importeren</string>
   <string name="ApplicationMigrationService_importing_text_messages">Tekstberichten aan het importeren</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Raak aan om te openen.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Aanraken om te openen.</string>
-  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Raak aan om te openen, of raak het slot aan om te sluiten.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Aanraken om te openen of slot aanraken om te sluiten.</string>
   <string name="KeyCachingService_passphrase_cached">TextSecure is ontgrendeld</string>
   <string name="KeyCachingService_lock">Vergrendel met wachtwoord</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nieuwe berichten</string>
   <string name="MessageNotifier_most_recent_from_s">Meest recente van: %s</string>
   <string name="MessageNotifier_encrypted_message">Versleuteld bericht...</string>
+  <string name="MessageNotifier_media_message_with_text">Mediabericht: %s</string>
   <string name="MessageNotifier_no_subject">(Geen onderwerp)</string>
   <string name="MessageNotifier_message_delivery_failed">Berichtaflevering mislukt.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Het bericht afleveren is mislukt.</string>
@@ -364,16 +373,16 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="contact_selection_recent_activity__no_recent_calls">Geen recente gesprekken.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">TextSecure bericht versturen</string>
-  <string name="conversation_activity__type_message_sms_secure">Verstuur beveiligde SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Verstuur onbeveiligde SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Verstuur beveiligde MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Verstuur onbeveiligde MMS</string>
   <string name="conversation_activity__send">Verstuur</string>
   <string name="conversation_activity__remove">Verwijder</string>
   <string name="conversation_activity__window_description">Gesprek met %1$s</string>
   <string name="conversation_activity__compose_description">Bericht samenstelling</string>
   <string name="conversation_activity__emoji_toggle_description">Wissel emoji toetsenbord</string>
+  <string name="conversation_activity__attachment_thumbnail">Bijlage Miniatuur</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Mediabericht aan het downloaden</string>
   <string name="conversation_item__mms_image_description">Mediabericht</string>
   <string name="conversation_item__play_button_description">Afspeelknop</string>
   <string name="conversation_item__secure_message_description">Beveiligd bericht</string>
@@ -421,6 +430,8 @@ Importeer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\'.</str
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">Geen afbeeldingen</string>
   <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">VERIFIËREN</string>
+  <string name="message_recipients_list_item__resend">OPNIEUW VERZENDEN</string>
   <!--MmsPreferencesFragment-->
   <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Voor jouw telefoon zijn handmatige MMS-instellingen noodzakelijk.</string>
   <string name="MmsPreferencesFragment__enabled">Ingeschakeld</string>
@@ -435,13 +446,16 @@ Importeer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\'.</str
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Ontgrendel</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure heeft MMS-instellingen nodig om mediaberichten te kunnen versturen via uw telefoonprovider. Uw toestel heeft deze informatie niet beschikbaar. Dit komt vaker voor bij gelockte toestellen en andere beperkende configuraties.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure heeft MMS-instellingen nodig om mediaberichten te kunnen versturen via uw telefoonprovider. Je toestel heeft deze informatie niet beschikbaar. Dit komt vaker voor bij gelockte toestellen en andere beperkende configuraties.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Om mediaberichten en groepsberichten te versturen, drukt u op \'OK\' en voert u de gevraagde gegevens in. De MMS-instellingen voor uw provider kunnen meestal gevonden worden door te zoeken naar \'&amp;lt;uw provider&amp;gt; APN\'. U hoeft dit maar eenmaal te doen.</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Voltooid</string>
   <!--registration_activity-->
-  <string name="registration_activity__your_country">UW LAND</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-  <string name="registration_activity__your_country_code_and_phone_number">UW LANDCODE EN
+        Verifieer je telefoonnummer om met TextSecure verbinding te maken.
+    </string>
+  <string name="registration_activity__your_country">JE LAND</string>
+  <string name="registration_activity__your_country_code_and_phone_number">JE LANDCODE EN
 TELEFOONNUMMER</string>
   <string name="registration_activity__phone_number">TELEFOONNUMMER</string>
   <string name="registration_activity__register">Registreren</string>
@@ -467,7 +481,7 @@ TextSecure werkt niet met nummers van Google Voice.</string>
   <string name="registration_progress_activity__voice_verification">Spraakverificatie</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
 TextSecure kan je ook bellen om je nummer te verifiëren. Raak \'Bel Me\' aan en voer hieronder de 6-cijferige code code in die wordt voorgelezen.</string>
-  <string name="registration_progress_activity__verify">Verifieer</string>
+  <string name="registration_progress_activity__verify">Verifiëren</string>
   <string name="registration_progress_activity__call_me">Bel me</string>
   <string name="registration_progress_activity__edit_number">Nummer bewerken</string>
   <string name="registration_progress_activity__connectivity_error">Verbindingsfout.</string>
@@ -492,6 +506,9 @@ SMS-verificatie...</string>
 TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</string>
   <string name="registration_progress_activity__sms_verification_failed">SMS-verificatie mislukt.</string>
   <string name="registration_progress_activity__generating_keys">Sleutels genereren...</string>
+  <string name="registration_progress_activity__alert">Melding</string>
+  <string name="registration_progress_activity__telephone">Telefoon</string>
+  <string name="registration_progress_activity__check">Check</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Typ een naam of nummer</small></string>
   <string name="recipients_panel__add_member">Voeg groepslid toe</string>
@@ -499,6 +516,13 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="verify_identity_activity__their_identity_they_read">Identiteit partner (partner leest):</string>
   <string name="verify_identity_activity__your_identity_you_read">Jouw identiteit (jij leest):</string>
   <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Wat zaken vergen je aandacht.</string>
+  <string name="message_details_header__sent">Verzonden</string>
+  <string name="message_details_header__received">Ontvangen</string>
+  <string name="message_details_header__via">Via</string>
+  <string name="message_details_header__to">Naar:</string>
+  <string name="message_details_header__from">Van:</string>
+  <string name="message_details_header__with">Met:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Wachtwoord creëren</string>
   <string name="AndroidManifest__enter_passphrase">Wachtwoord invoeren</string>
@@ -514,6 +538,8 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <!--arrays.xml-->
   <string name="arrays__import_export">Importeer / exporteer </string>
   <string name="arrays__my_identity_key">Mijn identiteitssleutel</string>
+  <string name="arrays__use_default">Gebruik standaard</string>
+  <string name="arrays__use_custom">Gebruik handmatig</string>
   <!--plurals.xml-->
   <plurals name="minutes_ago">
     <item quantity="one">%d minuut</item>
@@ -526,11 +552,10 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <!--preferences.xml-->
   <string name="preferences__general">Algemeen</string>
   <string name="preferences__sms_mms">SMS en MMS</string>
-  <string name="preferences__push_sms_category">Push en SMS</string>
   <string name="preferences__pref_all_sms_title">Ontvang alle SMS</string>
   <string name="preferences__pref_all_mms_title">Ontvang alle MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure gebruiken voor het bekijken en opslaan van alle inkomende tekstberichten</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure gebruiken voor alle inkomende tekstberichten</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure gebruiken voor het bekijken en opslaan van alle inkomende multimediaberichten</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure gebruiken voor alle inkomende multimediaberichten</string>
   <string name="preferences__input_settings">Invoer Instellingen</string>
   <string name="preferences__enable_enter_key_title">Activeer Enter-toets</string>
   <string name="preferences__replace_smiley_with_enter_key">De smiley-toets vervangen door een Enter-toets</string>
@@ -538,12 +563,14 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">De \'Enter\' toets gebruiken voor versturen tekstberichten</string>
   <string name="preferences__display_settings">Beeldscherminstellingen</string>
   <string name="preferences__choose_identity">Identiteit kiezen</string>
-  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Kies uw contactinformatie uit de contactpersonenlijst.</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Kies je contactgegevens uit de contactpersonenlijst.</string>
   <string name="preferences__change_passphrase">Wachtwoord veranderen</string>
   <string name="preferences__change_my_passphrase">Mijn wachtwoord veranderen</string>
   <string name="preferences__enable_passphrase">Wachtwoord inschakelen</string>
+  <string name="preferences__passphrase_summary">Wachtwoord %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Lokale versleuteling van berichten en sleutels inschakelen</string>
   <string name="preferences__screen_security">Schermbeveiliging</string>
+  <string name="preferences__screen_security_summary">Schermbeveiliging %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Screenshots onmogelijk maken in deze app en de recente lijst</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Wachtwoord na een bepaalde tijd uit het geheugen vergeten</string>
   <string name="preferences__timeout_passphrase">Time-out wachtwoord</string>
@@ -591,6 +618,11 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__advanced_mms_access_point_names">Handmatige MMS instellingen</string>
   <string name="preferences__enable_manual_mms">Gebruik handmatige MMS instellingen</string>
   <string name="preferences__override_system_mms_settings">Gebruik onderstaande gegevens in plaats van de MMS instellingen van het systeem.</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS Proxy Server</string>
+  <string name="preferences__mms_proxy_port">MMS Proxy Poort</string>
+  <string name="preferences__mmsc_username">MMSC Gebruikersnaam</string>
+  <string name="preferences__mmsc_password">MMSC Wachtwoord</string>
   <string name="preferences__sms_delivery_reports">SMS ontvangstbevestigingen</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Verzoeken om een ontvangstbevestiging voor ieder verzonden SMS bericht</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatisch oudere berichten verwijderen wanneer een gesprek meer dan een bepaald aantal berichten bevat</string>
@@ -602,23 +634,15 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="preferences__dark_theme">Donker</string>
   <string name="preferences__appearance">Uiterlijk</string>
   <string name="preferences__theme">Thema</string>
+  <string name="preferences__theme_summary">Thema %s</string>
   <string name="preferences__default">Standaard</string>
   <string name="preferences__language">Taal</string>
-  <string name="preferences__make_default_sms_app">Stel in als standaard SMS-app</string>
+  <string name="preferences__language_summary">Taal %s</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Stel TextSecure in als standaard SMS/MMS-applicatie voor uw systeem.</string>
+  <string name="preferences__textsecure_messages">TextSecure berichten</string>
-  <string name="preferences__use_data_channel">Pushberichten</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor communicatie met andere TextSecure gebruikers</string>
+        Gratis privéberichten versturen aan TextSecure en Signal gebruikers
-  <string name="preferences__sms_fallback">Uitgaande SMS/MMS</string>
+    </string>
   <string name="preferences__submit_debug_log">Dien debug log in</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure gebruikers</string>
-  <string name="preferences__sms_fallback_push_users_ask">eerst vragen</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">geen MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Stuur een veilige SMS als de dataverbinding niet beschikbaar is</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Vragen voor het versturen van SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nooit MMS versturen</string>
-  <string name="preferences__sms_fallback_non_push_users">Niet-TextSecure gebruikers</string>
-  <string name="preferences__sms_fallback_nobody">Niemand</string>
   <string name="preferences__support_wifi_calling">\'Bellen via WiFi\' compatibiliteitsmodus</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aanzetten als je toestel SMS/MMS ontvangst via WiFi gebruikt (enkel aanzetten als \'Bellen via WiFi\' aan staat).</string>
   <!--****************************************-->
@@ -645,6 +669,7 @@ Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Bijlage opslaan</string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">Uitnodigen</string>
   <!--conversation_insecure_no_push-->
   <string name="conversation_insecure__menu_start_secure_session">Beveiligde sessie beginnen</string>
   <string name="conversation_insecure__security">Beveiliging</string>
@@ -654,7 +679,11 @@ Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Zoeken</string>
   <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">Foto Contact</string>
+  <string name="conversation_list_item_view__attachment_indicator">Bijlage Indicator</string>
+  <string name="conversation_list_item_view__error_alert">Foutmelding</string>
   <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">Nieuw gesprek</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Beveiliging</string>
   <string name="conversation_secure_verified__menu_verify_identity">Identiteit verifiëren</string>
@@ -686,11 +715,11 @@ Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor
   <string name="reminder_header_expired_build">Je build van TextSecure is verlopen!</string>
   <string name="reminder_header_expired_build_details">Berichten zullen niet langer verzonden worden, gelieve te updaten naar de recentste versie.</string>
   <string name="reminder_header_sms_default_title">Als standaard SMS-app gebruiken?</string>
-  <string name="reminder_header_sms_default_text">Raak aan om van TextSecure je standaard SMS applicatie te maken.</string>
+  <string name="reminder_header_sms_default_text">Aanraken om van TextSecure je standaard SMS applicatie te maken.</string>
   <string name="reminder_header_sms_import_title">SMS importeren uit systeem?</string>
-  <string name="reminder_header_sms_import_text">Raak aan om de SMS berichten in je telefoon te kopiëren naar een versleutelde database.</string>
+  <string name="reminder_header_sms_import_text">Aanraken om de SMS berichten in je telefoon te kopiëren naar een versleutelde database.</string>
   <string name="reminder_header_push_title">Activeer TextSecure berichten</string>
-  <string name="reminder_header_push_text">Raak aan voor directe aflevering, sterkere privacy, en geen SMS kosten.</string>
+  <string name="reminder_header_push_text">Aanraken voor directe aflevering, sterkere privacy, en geen SMS kosten.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Jij</string>
   <string name="MediaPreviewActivity_cant_display">Weergeven van deze afbeelding is mislukt</string>
@@ -704,5 +733,6 @@ Privacy verbeteren en SMS-kosten vermijden door het datakanaal te gebruiken voor
   <string name="trimmer__deleting_old_messages">Oude berichten verwijderen...</string>
   <string name="trimmer__old_messages_successfully_deleted">Oude berichten succesvol verwijderd</string>
   <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">Transportkanaal icoon</string>
   <!--EOF-->
 </resources>

res/values-no/strings.xml

@@ -23,19 +23,15 @@ Advarsel! Dette vil deaktivere kryptert lagring av alle meldinger og nøkler. Di
 Dette vil deaktivere \'push\' meldinger ved å avregistrere deg fra tjenesten.
 Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'push\' meldinger i fremtiden.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Feil ved tilkobling til meldingstjener!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Innkommende SMS aktivert</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktivert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Klikk for å endre standard SMS applikasjon</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Innkommende SMS deaktivert</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS deaktivert</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Klikk for å la TextSecure være din standard SMS applikasjon</string>
   <string name="ApplicationPreferencesActivity_on">på</string>
   <string name="ApplicationPreferencesActivity_On">På</string>
   <string name="ApplicationPreferencesActivity_off">av</string>
   <string name="ApplicationPreferencesActivity_Off">Av</string>
-  <string name="ApplicationPreferencesActivity_partial">delvis</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Innkommende %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">utgående %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutter</string>
   <!--DraftDatabase-->
@@ -380,9 +376,7 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="contact_selection_recent_activity__no_recent_calls">Ingen nye samtaler.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Send TextSecure melding</string>
-  <string name="conversation_activity__type_message_sms_secure">Send sikker SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Send usikret SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Send sikker MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Send usikret MMS</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slett</string>
@@ -556,11 +550,10 @@ feilet.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generelt</string>
   <string name="preferences__sms_mms">SMS og MMS</string>
-  <string name="preferences__push_sms_category">\'Push\' og SMS</string>
   <string name="preferences__pref_all_sms_title">Motta alle SMS</string>
   <string name="preferences__pref_all_mms_title">Motta alle MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Benytt TextSecure for å lese og lagre alle innkommende SMS meldinger.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Benytt TextSecure for alle innkommende tekstmeldinger.</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Benytt TextSecure for å lese og lagre alle innkommende MMS meldinger.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Benytt TextSecure for alle innkommende multimediameldinger.</string>
   <string name="preferences__input_settings">Innstillinger for inndata</string>
   <string name="preferences__enable_enter_key_title">Aktiver \"Enter\" tasten</string>
   <string name="preferences__replace_smiley_with_enter_key">Bytt ut \"Smiley\" tasten med en \"Enter\" tast</string>
@@ -643,21 +636,11 @@ feilet.</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Språk</string>
   <string name="preferences__language_summary">Språk %s</string>
-  <string name="preferences__make_default_sms_app">Sett som standard SMS applikasjon</string>
+  <string name="preferences__textsecure_messages">TextSecure meldinger</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">La TextSecure være enhetens standard SMS/MMS applikasjon.</string>
-  <string name="preferences__use_data_channel">\'Push\' meldinger</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Styrk personvernet ditt og unngå SMS kostnader ved å benytte mobil data når du kommuniserer med andre TextSecure brukere.</string>
+Gratis og private meldinger til TextSecure og Signal brukere
-  <string name="preferences__sms_fallback">Utgående SMS/MMS</string>
+ </string>
   <string name="preferences__submit_debug_log">Send debug logg</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure brukere</string>
-  <string name="preferences__sms_fallback_push_users_ask">spør først</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">ingen MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Send sikker SMS dersom mobil data er utilgjengelig</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Spør før utsendelse av SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Aldri send MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Brukere uten TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Ingen</string>
   <string name="preferences__support_wifi_calling">\'WiFi anrop\' kompatibilititetsmodus</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktiver dersom din enhet benytter WiFi for å levere SMS/MMS  (velges kun dersom \'WiFi anrop\' er aktivert).</string>
   <!--****************************************-->

res/values-pl/strings.xml

@@ -23,19 +23,15 @@ Uwaga, szyfrowanie wszystkich Twoich wiadomości i kluczy zostanie wyłączone.
 Wiadomości push zostaną wyłączone poprzez wyrejestrowanie Ciebie z serwera.
 Będziesz musiał ponownie zarejestrować swój numer, aby w przyszłości ponownie używać wiadomości push.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Błąd połączenia z serwerem!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Otrzymywanie SMSów włączone</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Włączone</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotknij aby zmienić swoją domyślną aplikację SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Otrzymywanie SMS wyłączone</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Wyłączone</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Dotknij aby TextSecure był Twoją domyślną aplikacją SMS</string>
   <string name="ApplicationPreferencesActivity_on">włączone</string>
   <string name="ApplicationPreferencesActivity_On">Włączone</string>
   <string name="ApplicationPreferencesActivity_off">wyłączone</string>
   <string name="ApplicationPreferencesActivity_Off">Wyłączone</string>
-  <string name="ApplicationPreferencesActivity_partial">częściowo</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Przychodzące %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">wychodzące %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuty</string>
   <!--DraftDatabase-->
@@ -67,6 +63,7 @@ ten kontakt.
   <string name="ConversationItem_click_to_approve_unencrypted">Dotknij w celu użycia niezabezpieczonej alternatywy</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Fallback do nieszyfrowanej wiadomości SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Fallback do nieszyfrowanych wiadomości MMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ta wiadomość <b>nie będzie</b> szyfrowana, ponieważ odbiorca wiadomości nie jest już użytkownikiem TextSecure. \n\n\Wysłać nieszyfrowaną wiadomość?</string>
   <string name="ConversationItem_unable_to_open_media">Nie można znaleźć aplikacji, aby otworzyć te media.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Rozpocząć bezpieczną sesję?</string>
@@ -353,6 +350,7 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="MessageNotifier_d_new_messages">%d nowych wiadomości</string>
   <string name="MessageNotifier_most_recent_from_s">Najnowsze zaczynając od: %s</string>
   <string name="MessageNotifier_encrypted_message">Szyfrowana wiadomość...</string>
+  <string name="MessageNotifier_media_message_with_text">Wiadomość multimedialna: %s</string>
   <string name="MessageNotifier_no_subject">(Brak tematu)</string>
   <string name="MessageNotifier_message_delivery_failed">Nie udało się dostarczyć wiadomości.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Dostarczenie wiadomości nie powiodło się.</string>
@@ -381,9 +379,7 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="contact_selection_recent_activity__no_recent_calls">Brak ostatnich połączeń.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Wyślij wiadomość TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Wyślij szyfrowany SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Wyślij nieszyfrowany SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Wyślij szyfrowany MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Wyślij nieszyfrowany MMS</string>
   <string name="conversation_activity__send">Wyślij</string>
   <string name="conversation_activity__remove">Usuń</string>
@@ -392,6 +388,7 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="conversation_activity__emoji_toggle_description">Przełącz do emoji klawiatury</string>
   <string name="conversation_activity__attachment_thumbnail">Minaturka załącznika</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Trwa pobieranie wiadomości multimedialnej</string>
   <string name="conversation_item__mms_image_description">Wiadomość multimedialna</string>
   <string name="conversation_item__play_button_description">Przycisk Play</string>
   <string name="conversation_item__secure_message_description">Bezpieczna wiadomość</string>
@@ -461,6 +458,8 @@ Importuj niezaszyfrowany plik kopii zapasowej, kompatybilny z \'SMSBackup And Re
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Zakończono</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Weryfikuj swój numer telefonu, aby połączyć się z TextSecure.</string>
   <string name="registration_activity__your_country">TWÓJ KRAJ</string>
   <string name="registration_activity__your_country_code_and_phone_number">KOD TWOJEGO KRAJU I 
 NUMER TELEFONU</string>
@@ -552,11 +551,10 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Ogólne</string>
   <string name="preferences__sms_mms">SMS i MMS</string>
-  <string name="preferences__push_sms_category">Push i SMS</string>
   <string name="preferences__pref_all_sms_title">Otrzymuj wszystkie SMSy</string>
   <string name="preferences__pref_all_mms_title">Otrzymuj wszystkie MMSy</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Użyj TextSecure do przeglądania i przechowywania wszystkich wiadomości tekstowych.</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Używaj TextSecure dla wszystkich przychodzących wiadomości</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Użyj TextSecure do przeglądania i przechowywania wszystkich wiadomości multimedialnych</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Używaj TextSecure dla wszystkich przychodzących wiadomości multimedialnych</string>
   <string name="preferences__input_settings">Ustawienia wprowadzania</string>
   <string name="preferences__enable_enter_key_title">Włącz klawisz Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Zastąp przycisk emotikon klawiszem Enter</string>
@@ -639,21 +637,10 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__default">Domyślne</string>
   <string name="preferences__language">Język</string>
   <string name="preferences__language_summary">Język %s</string>
-  <string name="preferences__make_default_sms_app">Ustaw jako domyślną aplikację SMS</string>
+  <string name="preferences__textsecure_messages">Wiadomości TextSecure</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Ustaw TextSecure jako domyślną aplikację SMS/MMS.</string>
-  <string name="preferences__use_data_channel">Wiadomości Push</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Zwiększ swoją prywatność i unikaj opłat za SMS używając transmisji danych do komunikacji z innymi użytkownikami TextSecure.</string>
+Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
-  <string name="preferences__sms_fallback">Wychodzący SMS/MMS</string>
   <string name="preferences__submit_debug_log">Wyślij logi debugowania</string>
-  <string name="preferences__sms_outgoing_push_users">Użytkowników TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">najpierw pytaj</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">nie MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Wysyłaj bezpieczne SMSy jeśli połączenie jest utracone</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Pytaj przed wysłaniem SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nigdy nie wysyłaj MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Użytkowników bez-TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Nikt</string>
   <string name="preferences__support_wifi_calling">Tryb zgodności \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Włącz jeśli Twoje urządzenie używa dostarczanie SMS/MMS przez WiFi (włącz tylko wtedy gdy \'WiFi Calling\' jest włączone na Twoim urządzeniu).</string>
   <!--****************************************-->

res/values-pt-rBR/strings.xml

@@ -27,19 +27,15 @@
         Você precisará recadastrar seu número telefônico para usar mensagens push futuramente.
     </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Recebimento de SMS habilitado</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS habilitado</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Toque para mudar seu app padrão de SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Recebimento de SMS desabilitado</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS desabilitado</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Toque para tornar o TextSecure o seu app padrão de SMS</string>
   <string name="ApplicationPreferencesActivity_on">ligado</string>
   <string name="ApplicationPreferencesActivity_On">Ligado</string>
   <string name="ApplicationPreferencesActivity_off">desligado</string>
   <string name="ApplicationPreferencesActivity_Off">Desligado</string>
-  <string name="ApplicationPreferencesActivity_partial">parcial</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Recebidas %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">enviadas %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutos</string>
   <!--DraftDatabase-->
@@ -415,9 +411,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="contact_selection_recent_activity__no_recent_calls">Sem chamadas recentes.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Enviar mensagem TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Enviar SMS seguro</string>
   <string name="conversation_activity__type_message_sms_insecure">Enviar SMS inseguro</string>
-  <string name="conversation_activity__type_message_mms_secure">Enviar MMS seguro</string>
   <string name="conversation_activity__type_message_mms_insecure">Enviar MMS inseguro</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
@@ -614,11 +608,10 @@ falhou.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Geral</string>
   <string name="preferences__sms_mms">SMS e MMS</string>
-  <string name="preferences__push_sms_category">Push e SMS</string>
   <string name="preferences__pref_all_sms_title">Receber todos os SMS</string>
   <string name="preferences__pref_all_mms_title">Receber todos os MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens de texto recebidas</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar o TextSecure para todas as mensagens de texto recebidas</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens multimídia recebidas</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar o TextSecure para todas as mensagens multimídia recebidas</string>
   <string name="preferences__input_settings">Configurações de introdução</string>
   <string name="preferences__enable_enter_key_title">Habilitar tecla Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Trocar a tecla smiley por uma tecla Enter</string>
@@ -701,22 +694,11 @@ falhou.</string>
   <string name="preferences__default">Padrão</string>
   <string name="preferences__language">Idioma</string>
   <string name="preferences__language_summary">Idioma %s</string>
-  <string name="preferences__make_default_sms_app">Definir como app SMS padrão</string>
+  <string name="preferences__textsecure_messages">Mensagens TextSecure</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Tornar o TextSecure o aplicativo SMS/MMS padrão do sistema.</string>
-  <string name="preferences__use_data_channel">Mensagens push</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-        Aumente a privacidade e evite cobranças SMS usando o canal de dados para comunicação com outros usuários TextSecure
+        Mensagens privadas gratuitas para usuários de TextSecure e Signal
     </string>
-  <string name="preferences__sms_fallback">SMS/MMS enviados</string>
   <string name="preferences__submit_debug_log">Enviar log de depuração</string>
-  <string name="preferences__sms_outgoing_push_users">Usuários do TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">perguntar antes</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">sem MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Enviar SMS seguro se a conectividade de dados for perdida</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Perguntar antes de enviar SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nunca enviar MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Não-usuários do TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Ninguém</string>
   <string name="preferences__support_wifi_calling">Modo de compatibilidade \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Habilite se o seu dispositivo usa entrega de SMS/MMS via WiFi (somente habilite quando \'WiFi Calling\' estiver habilitado no seu dispositivo).</string>
   <!--****************************************-->

res/values-pt/strings.xml

@@ -26,17 +26,12 @@ Isto vai desactivar as mensagens push, eliminando o seu registo do servidor.
 Vai necessitar de re-registar o seu número de telefone se pretender utilizar esta funcionalidade novamente.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Recepção de SMS activa</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Definir como aplicação SMS por omissão</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Recepção de SMS desactivada</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Pressione para tornar TextSecure a sua applicação SMS por omissão</string>
   <string name="ApplicationPreferencesActivity_on">ligado</string>
   <string name="ApplicationPreferencesActivity_On">Ligado</string>
   <string name="ApplicationPreferencesActivity_off">desligado</string>
   <string name="ApplicationPreferencesActivity_Off">Desligado</string>
-  <string name="ApplicationPreferencesActivity_partial">parcial</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutos</string>
   <!--DraftDatabase-->
@@ -384,9 +379,7 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="contact_selection_recent_activity__no_recent_calls">Sem chamadas recentes.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Enviar mensagem TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Enviar SMS segura</string>
   <string name="conversation_activity__type_message_sms_insecure">Enviar SMS insegura</string>
-  <string name="conversation_activity__type_message_mms_secure">Enviar MMS segura</string>
   <string name="conversation_activity__type_message_mms_insecure">Enviar MMS insegura</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
@@ -555,11 +548,8 @@ falhou.
   <!--preferences.xml-->
   <string name="preferences__general">Geral</string>
   <string name="preferences__sms_mms">SMS e MMS</string>
-  <string name="preferences__push_sms_category">Push e SMS</string>
   <string name="preferences__pref_all_sms_title">Receber todas as SMS</string>
   <string name="preferences__pref_all_mms_title">Receber todas as MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens de texto recebidas</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens multimédia recebidas</string>
   <string name="preferences__input_settings">Configurações de introdução</string>
   <string name="preferences__enable_enter_key_title">Habilitar a tecla Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Substituir a tecla \'smiley\' por uma tecla \'Enter\'</string>
@@ -626,22 +616,7 @@ falhou.
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Opção por omissão</string>
   <string name="preferences__language">Língua</string>
-  <string name="preferences__make_default_sms_app">Definir como aplicação SMS por omissão</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Tornar o TextSecure a aplicação de SMS/MMS padrão do sistema.</string>
-  <string name="preferences__use_data_channel">Mensagens Push</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Aumente a privacidade e evite custos de SMS ao utilizar o canal de dados para comunicar com outros utilizadores TextSecure.
-</string>
-  <string name="preferences__sms_fallback">SMS/MMS de saída</string>
   <string name="preferences__submit_debug_log">Submeter registo de depuração</string>
-  <string name="preferences__sms_outgoing_push_users">Utilizadores TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">perguntar primeiro</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">Sem MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Enviar SMS seguro em caso de perda de ligação de dados</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Perguntar antes de enviar SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nunca enviar MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Utilizadores que não usam TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Ninguém</string>
   <string name="preferences__support_wifi_calling">Modo de compatibilidade \"Chamada WiFi\"</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activar se o seu dispositivo utiliza entrega SMS/MMS via WiFi (apenas active se \"Chamada WiFi\" está activa no seu dispositivo).</string>
   <!--****************************************-->

res/values-ro/strings.xml

@@ -24,17 +24,12 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
         Numărul tău de telefon va trebui înregistrat din nou pentru a utiliza mesajele de tip push pe viitor.
     </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Eroare de conectare cu serverul!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Primire SMS activă</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Atingeţi pentru a schimba aplicaţia SMS implicită</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS-uri primite dezactivate</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Atingeţi pentru a seta TextSecure ca şi aplicaţie SMS implicită</string>
   <string name="ApplicationPreferencesActivity_on">activat</string>
   <string name="ApplicationPreferencesActivity_On">Activat</string>
   <string name="ApplicationPreferencesActivity_off">dezactivat</string>
   <string name="ApplicationPreferencesActivity_Off">Dezactivat</string>
-  <string name="ApplicationPreferencesActivity_partial">parțial</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minute</string>
   <!--DraftDatabase-->
@@ -58,6 +53,8 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationItem_error_received_stale_key_exchange_message">Eroare, mesajul pentru schimbul de chei este vechi.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Am recepționat un mesaj \"schimb de cheie\", tastați pentru a-l procesa.</string>
   <string name="ConversationItem_group_action_left">%1$s a ieșit din grup.</string>
+  <string name="ConversationItem_click_for_details">Apasă pentru detalii</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Apasă pentru revenirea la soluția ne-securizată</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Reveniţi la SMS necriptat ca soluţie de rezervă?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Reveniţi la MMS necriptat ca soluţie de rezervă?</string>
   <string name="ConversationItem_unable_to_open_media">Nu a fost găsită o aplicație pentru a deschide acest tip media.</string>
@@ -105,6 +102,8 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nu se poate scrie pe spațiul de stocare!</string>
   <string name="ConversationFragment_saving_attachment">Ataşamentul se salvează</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Atașamentul se salvează pe spațiul de stocare...</string>
+  <string name="ConversationFragment_pending">În curs...</string>
+  <string name="ConversationFragment_push">Date (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Se șterge...</string>
@@ -117,8 +116,11 @@ Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mesaj pentru schimb de chei...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Specific %s</string>
+  <string name="CustomDefaultPreference_using_default">Implicit: %s</string>
   <string name="CustomDefaultPreference_none">Niciuna</string>
   <!--DateUtils-->
+  <string name="DateUtils_now">Acum</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partajează cu</string>
   <!--ExportFragment-->
@@ -179,6 +181,7 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
   <string name="KeyScanningActivity_install_barcode_Scanner">Instalez scannerul de coduri de bare?</string>
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure are nevoie de Barcode Scanner pentru codurile QR.</string>
   <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_new_identity">Identitate nouă</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Eroare la stocarea MMS-ului!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Eroare de conectare la furnizorul MMS...</string>
@@ -195,6 +198,10 @@ Restaurarea unui backup criptat va înlocui complet cheile existente, setările
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_cancel">ANULEAZĂ</string>
   <string name="DeviceProvisioningActivity_continue">CONTINUĂ</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+        - Citirea tuturor mesajelor
+        \n- Trimiterea mesajelor în numele tău
+    </string>
   <string name="DeviceProvisioningActivity_content_progress_title">Se adaugă dispozitivul...</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Se adaugă un dispozitiv nou...</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Dispozitiv adăugat!</string>
@@ -324,6 +331,7 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="MessageNotifier_d_new_messages">%d mesaje noi</string>
   <string name="MessageNotifier_most_recent_from_s">Cel mai recent de la: %s</string>
   <string name="MessageNotifier_encrypted_message">Mesaj criptat...</string>
+  <string name="MessageNotifier_media_message_with_text">Mesaje media: %s</string>
   <string name="MessageNotifier_no_subject">(Fără subiect)</string>
   <string name="MessageNotifier_message_delivery_failed">Trimiterea mesajului a esuat.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Mesajul nu a putut fi trimis.</string>
@@ -352,16 +360,16 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="contact_selection_recent_activity__no_recent_calls">Nu exista apeluri recente.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Trimite mesaj TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Trimite SMS securizat</string>
   <string name="conversation_activity__type_message_sms_insecure">Trimite SMS nesecurizat</string>
-  <string name="conversation_activity__type_message_mms_secure">Trimite MMS securizat</string>
   <string name="conversation_activity__type_message_mms_insecure">Trimite SMS nesecurizat</string>
   <string name="conversation_activity__send">Trimite</string>
   <string name="conversation_activity__remove">Șterge</string>
   <string name="conversation_activity__window_description">Conversaţie cu %1$s</string>
   <string name="conversation_activity__compose_description">Compunere mesaj</string>
   <string name="conversation_activity__emoji_toggle_description">Comutare tastatură emoji</string>
+  <string name="conversation_activity__attachment_thumbnail">Pictogramă atașament</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Mesajul media se descarcă</string>
   <string name="conversation_item__mms_image_description">Mesaj media</string>
   <string name="conversation_item__play_button_description">Buton redare</string>
   <string name="conversation_item__secure_message_description">Mesaj securizat</string>
@@ -408,7 +416,10 @@ Restaurează un backup criptat exportat anterior din TextSecure.</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Importă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</string>
   <!--media_overview_activity-->
+  <string name="media_overview_activity__no_images">Nici o imagine</string>
   <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">VERIFICĂ</string>
+  <string name="message_recipients_list_item__resend">RE-TRIMITE</string>
   <!--MmsPreferencesFragment-->
   <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Pentru telefonul tău sunt necesare setări MMS manuale.</string>
   <string name="MmsPreferencesFragment__enabled">Activat</string>
@@ -428,6 +439,9 @@ Importă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</st
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complet</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+        Verifică numărul tău de telefon pentru a te conecta la TextSecure.
+    </string>
   <string name="registration_activity__your_country">TARA DVS.</string>
   <string name="registration_activity__your_country_code_and_phone_number">CODUL ŢĂRII DVS. ŞI 
 NUMĂRUL DE TELEFON</string>
@@ -477,6 +491,9 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
 Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii mesajului SMS de verificare.</string>
   <string name="registration_progress_activity__sms_verification_failed">Verificarea prin SMS a esuat.</string>
   <string name="registration_progress_activity__generating_keys">Generarea cheilor...</string>
+  <string name="registration_progress_activity__alert">Alertă</string>
+  <string name="registration_progress_activity__telephone">Telefon</string>
+  <string name="registration_progress_activity__check">Verifică</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Introduceţi un nume sau un număr</small></string>
   <string name="recipients_panel__add_member">Adăugare membru</string>
@@ -484,6 +501,13 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="verify_identity_activity__their_identity_they_read">Identitatea partenerului (cum apare el):</string>
   <string name="verify_identity_activity__your_identity_you_read">Identitatea ta (cum apari tu):</string>
   <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Anumite probleme au nevoie de atenția ta.</string>
+  <string name="message_details_header__sent">Trimis</string>
+  <string name="message_details_header__received">Primit</string>
+  <string name="message_details_header__via">Via</string>
+  <string name="message_details_header__to">Către:</string>
+  <string name="message_details_header__from">De la:</string>
+  <string name="message_details_header__with">Cu:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Creează parolă</string>
   <string name="AndroidManifest__enter_passphrase">Introduceţi parola</string>
@@ -494,9 +518,13 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="AndroidManifest__verify_identity">Verifică identitatea</string>
   <string name="AndroidManifest__log_submit">Trimite log-urile de depanare</string>
   <string name="AndroidManifest__media_preview">Previzualizare media</string>
+  <string name="AndroidManifest__media_overview">Toate imaginile</string>
+  <string name="AndroidManifest__media_overview_named">Toate imaginile cu %1$s</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importă / Exportă</string>
   <string name="arrays__my_identity_key">Cheia mea de identitate</string>
+  <string name="arrays__use_default">Implicit</string>
+  <string name="arrays__use_custom">Specific</string>
   <!--plurals.xml-->
   <plurals name="minutes_ago">
     <item quantity="one">%d min</item>
@@ -511,11 +539,8 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
   <string name="preferences__sms_mms">SMS și MMS</string>
-  <string name="preferences__push_sms_category">Push și SMS</string>
   <string name="preferences__pref_all_sms_title">Recepționează toate SMS-urile</string>
   <string name="preferences__pref_all_mms_title">Recepționează toate MMS-urile</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Folosește TextSecure pentru vizualizarea și salvarea tuturor mesajelor text primite</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Folosește TextSecure pentru vizualizarea și salvarea tuturor mesajelor multimedia primite</string>
   <string name="preferences__input_settings">Setări de introducere</string>
   <string name="preferences__enable_enter_key_title">Activează tasta Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Inlocuiți tasta smiley cu tasta Enter</string>
@@ -527,8 +552,10 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__change_passphrase">Schimbă parola</string>
   <string name="preferences__change_my_passphrase">Schimbă parola</string>
   <string name="preferences__enable_passphrase">Activează parola</string>
+  <string name="preferences__passphrase_summary">Parola %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Activează criptarea locală a mesajelor și a cheilor</string>
   <string name="preferences__screen_security">Securitate ecran</string>
+  <string name="preferences__screen_security_summary">Securitate ecran %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blochează screenshot-urile în lista cu aplicaţii recente şi în interiorul applicaţiei</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Şterge parolele din memorie după un interval de timp</string>
   <string name="preferences__timeout_passphrase">Expiră parola</string>
@@ -548,6 +575,13 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__change_notification_sound">Schimbă sunetul de notificare</string>
   <string name="preferences__inthread_notifications">Notificări în conversație</string>
   <string name="preferences__play_inthread_notifications">Redare sunet de notificare în timp ce vizualizați o conversație activă.</string>
+  <string name="preferences__repeat_alerts">Repetă alerte</string>
+  <string name="preferences__never">Niciodată</string>
+  <string name="preferences__one_time">O dată</string>
+  <string name="preferences__two_times">De două ori</string>
+  <string name="preferences__three_times">De trei ori</string>
+  <string name="preferences__five_times">De cinci ori</string>
+  <string name="preferences__ten_times">De 10 ori</string>
   <string name="preferences__vibrate">Vibrează</string>
   <string name="preferences__also_vibrate_when_notified">Vibrează și când ești notificat</string>
   <string name="preferences__minutes">minute</string>
@@ -569,6 +603,11 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__advanced_mms_access_point_names">Setări MMS manuale</string>
   <string name="preferences__enable_manual_mms">Utilizează setări MMS manuale</string>
   <string name="preferences__override_system_mms_settings">Suprascrie setările MMS de sistem cu informațiile de mai jos.</string>
+  <string name="preferences__mmsc_url">URL MMSC</string>
+  <string name="preferences__mms_proxy_host">Gazdă Proxy MMS</string>
+  <string name="preferences__mms_proxy_port">Port Proxy MMS</string>
+  <string name="preferences__mmsc_username">Nume utilizator MMSC</string>
+  <string name="preferences__mmsc_password">Parolă MMSC</string>
   <string name="preferences__sms_delivery_reports">Confirmari de livrare SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Cere o confirmare de livrare pentru fiecare SMS trimis</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Șterge automat mesajele vechi când conversația depășește mărimea specificată</string>
@@ -580,22 +619,11 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="preferences__dark_theme">Închisă</string>
   <string name="preferences__appearance">Aspect</string>
   <string name="preferences__theme">Tema</string>
+  <string name="preferences__theme_summary">Tema %s</string>
   <string name="preferences__default">Implicit</string>
   <string name="preferences__language">Limba</string>
-  <string name="preferences__make_default_sms_app">Setează ca aplicație implicită SMS</string>
+  <string name="preferences__language_summary">Limba %s</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Alege TextSecure ca aplicație SMS/MMS implicită pentru sistemul tău.</string>
-  <string name="preferences__use_data_channel">Mesaje push</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Sporește intimitatea și evită costurile de SMS folosind comunicarea prin canalul de date cu alți utilizatori TextSecure</string>
-  <string name="preferences__sms_fallback">Trimitere SMS/MMS</string>
   <string name="preferences__submit_debug_log">Trimite log-urile de depanare</string>
-  <string name="preferences__sms_outgoing_push_users">Utilizatori TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">întreabă mai întâi</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">no MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Trimite SMS securizat dacă conexiunea de dată este pierdută</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Întreabă înainte de a trimite SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nu trimite MMS niciodată</string>
-  <string name="preferences__sms_fallback_non_push_users">Utilizatori Non-TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Nimeni</string>
   <string name="preferences__support_wifi_calling">Mod compatibilitate \"Apelare WiFi\"</string>
   <!--****************************************-->
   <!--menus-->
@@ -621,6 +649,7 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Salvează ataşamentul</string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">Invită</string>
   <!--conversation_insecure_no_push-->
   <string name="conversation_insecure__menu_start_secure_session">Iniţializează Sesiune Securizată</string>
   <string name="conversation_insecure__security">Securitate</string>
@@ -630,7 +659,10 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Caută</string>
   <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">Poză contact</string>
+  <string name="conversation_list_item_view__attachment_indicator">Indicator atașament</string>
   <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">Conversație nouă</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Securitate</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verifică identitatea</string>
@@ -640,6 +672,7 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="conversation__menu_update_group">Actualizează grup</string>
   <string name="conversation__menu_leave_group">Părăseşte grupul</string>
   <string name="conversation__menu_delete_thread">Șterge conversația</string>
+  <string name="conversation__menu_view_media">Toate imaginile</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Adaugă la contacte</string>
   <!--conversation_group_options-->
@@ -678,5 +711,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="trimmer__deleting_old_messages">Se șterg mesajele vechi...</string>
   <string name="trimmer__old_messages_successfully_deleted">Mesajele vechi au fost șterse cu succes</string>
   <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">Icoană transport</string>
   <!--EOF-->
 </resources>

res/values-ru/strings.xml

@@ -23,19 +23,12 @@
 Это отключит push-сообщения, отменив вашу регистрацию на сервере.
 Чтобы в будущем включить push-сообщения, вам нужно будет зарегистрироваться вновь.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ошибка при соединении с сервером!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Входящие SMS включены</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Нажмите для выбора SMS-приложения по умолчанию</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Входящие SMS отключены</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Нажмите, чтобы использовать TextSecure для всех SMS</string>
   <string name="ApplicationPreferencesActivity_on">включено</string>
   <string name="ApplicationPreferencesActivity_On">Включено</string>
   <string name="ApplicationPreferencesActivity_off">выключено</string>
   <string name="ApplicationPreferencesActivity_Off">Выключено</string>
-  <string name="ApplicationPreferencesActivity_partial">частично</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Входящее %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">исходящее %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d минут</string>
   <!--DraftDatabase-->
@@ -50,6 +43,7 @@
   <string name="AttachmentTypeSelectorAdapter_audio">Аудио</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Контактная информация</string>
   <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Ключ идентификации для %1$s изменился. Это могло произойти потому что кто-то пытается перехватить Вашу беседу, либо же %2$s просто переустановил TextSecure и теперь у него новый ключ идентификации. </string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Вы можете хотеть проверить 
 этот контакт.</string>
   <!--ConversationItem-->
@@ -65,6 +59,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted">Отправить незащищённым</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Отправить как незашифрованное SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Отправить как незашифрованное MMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Это сообщение <b>не будет</b> зашифровано, потому что получатель больше не является пользователем TextSecure.\n\nОтправить небезопасное сообщение?</string>
   <string name="ConversationItem_unable_to_open_media">Не найдено приложение, которое может открыть этот медиа-файл.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Начать защищённый сеанс?</string>
@@ -112,6 +107,7 @@
   <string name="ConversationFragment_saving_attachment">Сохранение вложения</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Сохраняем вложение на SD-карту...</string>
   <string name="ConversationFragment_pending">В ожидании...</string>
+  <string name="ConversationFragment_push">Данные (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Удаление...</string>
@@ -124,6 +120,8 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Сообщениe обмена ключами...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Использовать пользовательское: %s</string>
+  <string name="CustomDefaultPreference_using_default">Использовать по-умолчанию: %s</string>
   <string name="CustomDefaultPreference_none">Нет</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Только что</string>
@@ -190,6 +188,7 @@
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Приложению TextSecure необходим сканер штрих-кодов, чтобы читать QR-коды.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Отправка не удалась</string>
+  <string name="MessageDetailsRecipient_new_identity">Новая личность</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Ошибка при сохранении MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Ошибка подключения к провайдеру MMS...</string>
@@ -341,6 +340,7 @@
   <string name="MessageNotifier_d_new_messages">Новых сообщений: %d</string>
   <string name="MessageNotifier_most_recent_from_s">Последнее — от %s</string>
   <string name="MessageNotifier_encrypted_message">Зашифрованное сообщение...</string>
+  <string name="MessageNotifier_media_message_with_text">MMS-сообщение: %s</string>
   <string name="MessageNotifier_no_subject">(Нет темы)</string>
   <string name="MessageNotifier_message_delivery_failed">Сбой доставки сообщения.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Не удалось доставить сообщение.</string>
@@ -369,9 +369,7 @@
   <string name="contact_selection_recent_activity__no_recent_calls">Нет недавних звонков.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Отправить сообщение TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Отправить защищённое SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Отправить незащищённое SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Отправить защищённое MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Отправить незащищённое MMS</string>
   <string name="conversation_activity__send">Отправить</string>
   <string name="conversation_activity__remove">Удалить</string>
@@ -380,6 +378,7 @@
   <string name="conversation_activity__emoji_toggle_description">Клавиатура смайликов</string>
   <string name="conversation_activity__attachment_thumbnail">Миниатюра вложения</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Загрузка MMS-сообщения</string>
   <string name="conversation_item__mms_image_description">MMS-сообщение</string>
   <string name="conversation_item__play_button_description">Воспроизведение</string>
   <string name="conversation_item__secure_message_description">Защищённое сообщение</string>
@@ -448,6 +447,8 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Выполнить</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Проверьте свой номер телефона, для того, чтобы подключиться к TextSecure</string>
   <string name="registration_activity__your_country">ВАША СТРАНА</string>
   <string name="registration_activity__your_country_code_and_phone_number">КОД ВАШЕЙ СТРАНЫ
 И НОМЕР ТЕЛЕФОНА</string>
@@ -515,10 +516,13 @@ SMS-подтверждения...
   <string name="verify_identity_activity__their_identity_they_read">Личность собеседника (он читает):</string>
   <string name="verify_identity_activity__your_identity_you_read">Ваша личность (вы читаете):</string>
   <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Некоторые проблемы требуют Вашего внимания.</string>
   <string name="message_details_header__sent">Отправлено</string>
   <string name="message_details_header__received">Получено</string>
+  <string name="message_details_header__via">Через</string>
   <string name="message_details_header__to">Кому:</string>
   <string name="message_details_header__from">От кого:</string>
+  <string name="message_details_header__with">С:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Создать парольную фразу</string>
   <string name="AndroidManifest__enter_passphrase">Введите парольную фразу</string>
@@ -535,6 +539,7 @@ SMS-подтверждения...
   <string name="arrays__import_export">Импорт / экспорт</string>
   <string name="arrays__my_identity_key">Мой личный ключ</string>
   <string name="arrays__use_default">Использовать по-умолчанию</string>
+  <string name="arrays__use_custom">Использовать пользовательское</string>
   <!--plurals.xml-->
   <plurals name="minutes_ago">
     <item quantity="one">%d минута</item>
@@ -549,11 +554,8 @@ SMS-подтверждения...
   <!--preferences.xml-->
   <string name="preferences__general">Общие</string>
   <string name="preferences__sms_mms">SMS и MMS</string>
-  <string name="preferences__push_sms_category">Push и SMS</string>
   <string name="preferences__pref_all_sms_title">Получать все SMS</string>
   <string name="preferences__pref_all_mms_title">Получать все MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Использовать TextSecure для просмотра и хранения всех входящих текстовых сообщений</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Использовать TextSecure для просмотра и хранения всех входящих мультимедийных сообщений</string>
   <string name="preferences__input_settings">Настройки ввода</string>
   <string name="preferences__enable_enter_key_title">Включить клавишу «Ввод»</string>
   <string name="preferences__replace_smiley_with_enter_key">Заменить клавишу смайликов на «Ввод»</string>
@@ -565,8 +567,10 @@ SMS-подтверждения...
   <string name="preferences__change_passphrase">Изменить парольную фразу</string>
   <string name="preferences__change_my_passphrase">Изменить мою парольную фразу</string>
   <string name="preferences__enable_passphrase">Включить парольную фразу</string>
+  <string name="preferences__passphrase_summary">Парольная фраза %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Включить шифрование при хранении сообщений и ключей</string>
   <string name="preferences__screen_security">Защита экрана</string>
+  <string name="preferences__screen_security_summary">Безопасность экрана %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Блокировать снимки экрана внутри приложения</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Стирать из памяти парольную фразу через некоторое время</string>
   <string name="preferences__timeout_passphrase">Забывать парольную фразу</string>
@@ -614,6 +618,11 @@ SMS-подтверждения...
   <string name="preferences__advanced_mms_access_point_names">Ручные настройки MMS</string>
   <string name="preferences__enable_manual_mms">Использовать ручные настройки MMS</string>
   <string name="preferences__override_system_mms_settings">Использовать вместо системных настроек MMS указанную ниже информацию.</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS Прокси Хост</string>
+  <string name="preferences__mms_proxy_port">MMS Прокси Порт</string>
+  <string name="preferences__mmsc_username">MMSC Имя Пользователя</string>
+  <string name="preferences__mmsc_password">MMSC Пароль</string>
   <string name="preferences__sms_delivery_reports">Отчеты о доставке SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запрашивать отчёт о доставке каждого отправленного SMS-сообщения</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматически удалять старые сообщения, когда длина разговора превышает заданную</string>
@@ -629,21 +638,7 @@ SMS-подтверждения...
   <string name="preferences__default">По умолчанию</string>
   <string name="preferences__language">Язык (Language)</string>
   <string name="preferences__language_summary">Язык %s</string>
-  <string name="preferences__make_default_sms_app">SMS-приложение по умолчанию</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Сделать TextSecure приложением по умолчанию для SMS и MMS.</string>
-  <string name="preferences__use_data_channel">Push-сообщения</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Повысить безопасность и снизить расходы на SMS, используя передачу данных при общении с другими пользователями TextSecure</string>
-  <string name="preferences__sms_fallback">Исходящие SMS/MMS</string>
   <string name="preferences__submit_debug_log">Отправлять лог отладки</string>
-  <string name="preferences__sms_outgoing_push_users">Пользователи TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">сначала спросить</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">кроме MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Отправлять защищённые SMS, если нет интернета</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Спросить перед отправкой SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Никогда не отправлять MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Пользователи без TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Никто</string>
   <string name="preferences__support_wifi_calling">Режим совместимости с WiFi-звонками</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включите, если ваше устройство отправляет и принимает SMS/MMS через WiFi (и если WiFi-звонки включены)</string>
   <!--****************************************-->
@@ -681,6 +676,7 @@ SMS-подтверждения...
   <string name="conversation_list__menu_search">Поиск</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Фотография контакта</string>
+  <string name="conversation_list_item_view__attachment_indicator">Индикатор вложения</string>
   <string name="conversation_list_item_view__error_alert">Предупреждение об ошибке</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Новый разговор</string>

res/values-sk/strings.xml

@@ -4,47 +4,80 @@
   <string name="yes">Áno</string>
   <string name="no">Nie</string>
   <string name="delete">Zmaž</string>
+  <string name="please_wait">Čakajte prosím...</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Aktuálne: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ešte ste si nenastavili heslo!</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s správ v jednom rozhovore</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Zmazať všetky staré správy?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste si istí, že chcete skrátiť všetky vlákna konverzácií na %s najnovších správ?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste si istí, že chcete skrátiť všetky rozhovory %s najnovších správ?</string>
   <string name="ApplicationPreferencesActivity_delete">Zmaž</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Vypnúť kryptovanie úložiska?</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Vypnúť šifrovanie úložiska?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpečné sessions budú naďalej fungovať, ale hocikto s fyzickým prístupom k zariadeniu ich bude schopný čítať.</string>
+Varovanie: týmto vypnete šifrovanie úložiska správ a šifrovacích kľúčov.
+Zabezpečenie Vášich propojení bude naďalej fungovať,
+ale hocikto s fyzickým prístupom k Vášmu zariadeniu
+získa aj prístup k týmto odosieaným informáciám.
+</string>
   <string name="ApplicationPreferencesActivity_disable">Vypnúť</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Neregistrovanie...</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Prebieha odhlasovanie...</string>
-  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Neregistrovanie pre dátovú komunikáciu</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Vypína sa prenos dát</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba spojenia na server!</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">Vypnúť správy \"push\"?</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Prichádzajúce SMS povolené</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
-  <string name="ApplicationPreferencesActivity_sms_disabled">Prichádzajúce SMS zakazané </string>
+Týmto sa odhlásite zo serveru a vypnete príjem správ typu \"push\".
+Ak budete v budúcnosti chcieť dostávať upozornenia zo serveru,
+budete musieť znovu zaregistrovať vaše telefónne číslo.</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba pripojenia na server!</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotykom sem môžete zmeniť Vašu predvolenú aplikáciu pre SMS.</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Dotykom sem môžete nastaviť TextSecure ako Vašu predvolenú aplikáciu pre SMS.</string>
   <!--AppProtectionPreferenceFragment-->
+  <string name="AppProtectionPreferenceFragment_minutes">%d minút</string>
   <!--DraftDatabase-->
+  <string name="DraftDatabase_Draft_image_snippet">(obrázok)</string>
+  <string name="DraftDatabase_Draft_audio_snippet">(zvuk)</string>
+  <string name="DraftDatabase_Draft_video_snippet">(video)</string>
   <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">Nepodarilo sa nájsť aplikáciu pre výber médií.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Obrázok</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
+  <string name="AttachmentTypeSelectorAdapter_contact">Kontaktné informácie</string>
   <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Identifikačné údaje pre %1$s sa zmenili.
+To môže znamenať buď to, že niekto sa snaží odpočúvať Vašu komunikáciu,
+alebo že %2$s jednoducho preinštaloval TextSecure a teraz má
+nové identifikačné údaje.</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Možno by ste mali overiť
+identitu tohto kontaktu.
+</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Veľkosť správy: %d KB</string>
-  <string name="ConversationItem_expires_s">Vyprší: %s</string>
+  <string name="ConversationItem_expires_s">Expirácia: %s</string>
-  <string name="ConversationItem_view_secure_media_question">Zobraziť kryptované údaje?</string>
+  <string name="ConversationItem_error_not_delivered">Nedoručené</string>
-  <string name="ConversationItem_error_received_stale_key_exchange_message">Chyba, prijal som zaseknutú správu vzájomnej výmeny kľúčov.</string>
+  <string name="ConversationItem_view_secure_media_question">Zobraziť zašifrované média?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tento súbor bol uložený v zašifrovanej databáze. Bohužiaľ, pre otvorenie tohto súboru externým programom musí byť súbor dočasne zapísaný na disk v dešifrovanej podobe. Ste si naozaj istý, že si prajete pokračovať?</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">Chyba, bola prijatá správa zaseknutej výmeny kľúčov.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Prijal som správu vzájomnej výmeny kľúčov, kliknite pre spracovanie.</string>
   <string name="ConversationItem_group_action_left">%1$s opustil/a skupinu.</string>
+  <string name="ConversationItem_click_for_details">Dotykom sem zobrazíte detaily.</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Dotykom sem povolíte nezabezpečenú alternatívu.</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Prepnúť na nezabezpečené SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Prepnúť na nezabezpečené MMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Táto správa <b>nebude</b> zašifrovaná, pretože príjemca už nepoužíva TextSecure.\n\nPrajete si odoslať nešifrovanú správu?</string>
+  <string name="ConversationItem_unable_to_open_media">Nepodarilo sa nájst aplikáciu schopnú otvoriť tento typ súboru.</string>
   <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_question">Vytvoriť bezpečnú reláciu?</string>
+  <string name="ConversationActivity_initiate_secure_session_question">Vytvoriť zabezpečé spojenie?</string>
-  <string name="ConversationActivity_initiate_secure_session_with_s_question">Vytvoriť bezpečnú session s %s?</string>
+  <string name="ConversationActivity_initiate_secure_session_with_s_question">Vytvoriť zabezpečenú spojenie s %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Potvrdenie ukončenia bezpečnej relácie</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Potvrdenie ukončenia zabezpečeného spojenia</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ste si istí že chcete zrušiť bezpečnú reláciu?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ste si naozaj istí, že chcete ukončiť zabezpečné spojenie?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Potvrdenie zmazania vlákna</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ste si istí, že chcete natrvalo zmazať túto konveráciu?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ste si naozaj istí, že chcete natrvalo zmazať túto konveráciu?</string>
   <string name="ConversationActivity_add_attachment">Pridať prílohu</string>
-  <string name="ConversationActivity_select_contact_info">Vyber kontaktné informácie </string>
+  <string name="ConversationActivity_select_contact_info">Vyberte kontaktné informácie </string>
   <string name="ConversationActivity_compose_message">Vytvoriť správu</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Nastala chyba pri vytváraní prílohy.</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Bohužiaľ, vybraná nahrávka presahuje maximálnu veľkosť správy (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Príjemca nie je platná SMS alebo emailová adresa!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Správa je prázdna!</string>
   <string name="ConversationActivity_group_conversation_recipients">Príjemcovia skupinovej konverzácie</string>
@@ -53,26 +86,47 @@ Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpeč
   <string name="ConversationActivity_d_recipients_in_group">%d členovia</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 člen</string>
   <string name="ConversationActivity_saved_draft">Uložený koncept</string>
-  <string name="ConversationActivity_invalid_recipient">Nesprávny príjemca</string>
+  <string name="ConversationActivity_invalid_recipient">Neplatný príjemca</string>
   <string name="ConversationActivity_calls_not_supported">Hovory nie sú podporované</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Zdá sa, že toto zariadenie nedokáže vytočiť telefónne číslo.</string>
   <string name="ConversationActivity_leave_group">Opustiť skupinu?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Ste si istí že chcete opustiť túto skupinu?</string>
+  <string name="ConversationActivity_transport_insecure_sms">Nezašifrovaná SMS</string>
+  <string name="ConversationActivity_transport_insecure_mms">Nezašifrovaná MMS</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
+  <string name="ConversationActivity_error_leaving_group">Chyba pri opúšťaní skupiny...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detaily správy</string>
-  <string name="ConversationFragment_confirm_message_delete">Potvrď zmazanie správy</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Prenos: %1$s\nodoslané/prijaté: %2$s</string>
-  <string name="ConversationFragment_success_exclamation">Úspech!</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Odosielateľ: %1$s\nPrenos: %2$s\nOdoslané: %3$s\nPrijaté: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Potvrďťe zmazanie správy</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Ste si naozaj istý, že chcete natrvalo zmazať vybrané správy?</string>
+  <string name="ConversationFragment_save_to_sd_card">Vytvoriť súbor?</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Súbory zapísané na dátovom úložisku zariadenia budú prístupne pre všetky ostatné aplikácie vo vašom telefóne\n\nPrajete si pokračovať?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Nastala chyba pri ukladaní prílohy na dátové úložisko zariadenia!</string>
+  <string name="ConversationFragment_success_exclamation">Operácia úspešne dokončená!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Aplikácia nedokázala zapísať informácie na dátové úložisko zariadenia!</string>
   <string name="ConversationFragment_saving_attachment">Ukladám prílohu</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Ukladám prílohu na dátove úložisko zariadenia...</string>
+  <string name="ConversationFragment_pending">Čaká na spracovanie...</string>
+  <string name="ConversationFragment_push">Dáta (TextSecure)</string>
+  <string name="ConversationFragment_mms">MMS</string>
+  <string name="ConversationFragment_sms">SMS</string>
+  <string name="ConversationFragment_deleting">Maže sa...</string>
+  <string name="ConversationFragment_deleting_messages">Mažú sa správy...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Zmazať vlákna?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ste si istí, že chcete zmazať VŠETKY označené vlákna konverzácií?</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Ste si istí, že chcete naozaj zmazať VŠETKY označené vlákna konverzácií?</string>
-  <string name="ConversationListFragment_deleting">Mažem</string>
+  <string name="ConversationListFragment_deleting">Vymazanie</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Mažem vybrané konverzácie...</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Mažú sa vybrané konverzácie...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Správa vzájomnej výmeny kľúčov...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Používa sa upravené: %s</string>
+  <string name="CustomDefaultPreference_using_default">Používa sa predvolené: %s</string>
   <string name="CustomDefaultPreference_none">Žiadna</string>
   <!--DateUtils-->
+  <string name="DateUtils_now">Teraz</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Zdieľaj s</string>
   <!--ExportFragment-->
@@ -81,20 +135,33 @@ Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpeč
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Upozornenie, toto
 exportuje nekryptovaný obsah TextSecure správy na SD kartu.</string>
   <string name="ExportFragment_cancel">Zrušiť</string>
-  <string name="ExportFragment_exporting">Exportujem</string>
+  <string name="ExportFragment_exporting">Export</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportujem čistý text na SD kartu...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Chyba, nepodarilo sa zapísať dáta na SD kartu!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Nastala chyba pri zápise údajov na SD kartu.</string>
   <string name="ExportFragment_success">Úspech!</string>
   <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_TextSecure_communication_failure">Trvalá chyba pri komunikácii pomocou TextSecure!</string>
+  <string name="GcmRefreshJob_TextSecure_was_unable_to_register_with_Google_Play_Services">TextSecure sa nedokázal zaregistrovať s Google Play Services. Komunikácia cez dátové spojenie bola vypnutá. Skúste znovu spustiť  registráciu z menu TextSecure, prosím.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
   <string name="GroupCreateActivity_actionbar_update_title">Aktualizuj skupinu</string>
   <string name="GroupCreateActivity_group_name_hint">Názov skupiny</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nová MMS skupina</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Vybrali ste kontakt, ktorý nepodporuje skupiny TextSecure, a preto táto skupina bude MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Nie ste registrovaný na používanie dátového kanálu, Textsecure skupiny nie sú povolené.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Vytvorenie skupiny zlyhalo pre nečakanú chybu.</string>
   <string name="GroupCreateActivity_contacts_no_members">Potrebuješ najmenej jednu osobu v tvojej skupine!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Jeden z členov Vašej skupiny má číslo, ktoré sa nepodarilo správne prečítať. Prosím, upravte tento kontakt a skúste to znovu.</string>
   <string name="GroupCreateActivity_avatar_content_description">Obrázok skupiny</string>
   <string name="GroupCreateActivity_menu_create_title">Vytvoriť skupinu</string>
   <string name="GroupCreateActivity_creating_group">Vytváranie %1$s…</string>
+  <string name="GroupCreateActivity_updating_group">Aktualizácia %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Do skupiny TextSecure nie je možné pridávať kontakty, ktoré nepodporujú TextSecure.</string>
+  <string name="GroupCreateActivity_loading_group_details">Načítavajú sa údaje o skupine...</string>
   <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">Ja</string>
+  <string name="GroupMembersDialog_members">Členovia...</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Import</string>
   <string name="ImportExportActivity_export">Export</string>
@@ -109,34 +176,69 @@ importovali systémovú databázu SMS, opakovaný import zduplikuje správy.</st
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
 Obnovenie zakryptovanej zálohy prepíše všetky existujúce kryptovacie kľúče, nastavenia a správy. Všetky informácie v aktuálnej inštalácii TextSecure budú prepísané. Záloha zostane zachovaná.</string>
   <string name="ImportFragment_restore">Obnovenie</string>
-  <string name="ImportFragment_import_plaintext_backup">Importovať nezašifrovanú zálohu?</string>
+  <string name="ImportFragment_import_plaintext_backup">Importovať nešifrovanú zálohu?</string>
-  <string name="ImportFragment_importing">Importujem</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Týmto naimportujete
-  <string name="ImportFragment_import_plaintext_backup_elipse">Importujem nekryptovanú zálohu...</string>
+správy z nešifrovanej zálohy. Ak ste predtým imprtovali túto zalohu,
-  <string name="ImportFragment_no_plaintext_backup_found">Nenašiel som nekryptovanú zálohu!</string>
+opätovným importom zduplikujete správy.
+</string>
+  <string name="ImportFragment_importing">Import</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importujem nešifrovanú zálohu...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Nenašiel som nešifrovanú zálohu!</string>
   <string name="ImportFragment_error_importing_backup">Chyba pri importovaní zálohy!</string>
   <string name="ImportFragment_import_complete">Import dokončený!</string>
-  <string name="ImportFragment_restoring">Obnovujem</string>
+  <string name="ImportFragment_restoring">Obnovenie</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Obnovujem kryptovanú zálohu...</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Obnovujem šifrovanú zálohu...</string>
-  <string name="ImportFragment_no_encrypted_backup_found">Nenašiel som kryptovanú zálohu!</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Nenašiel som šifrovanú zálohu!</string>
   <string name="ImportFragment_restore_complete">Obnova dokončená!</string>
   <!--KeyScanningActivity-->
-  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nenašiel som scannovaný kľúč!</string>
+  <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nenašiel som skenovaný kľúč!</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">Nainštalovať čítačku čiarových kódov?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Na čítanie QR kódov TextSecure potrebuje príslušnú aplikáciu.</string>
   <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">Nepodarilo sa odoslať</string>
+  <string name="MessageDetailsRecipient_new_identity">Nová identita</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Chyba pri ukladaní MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Chyba spojenia s poskytovateľom MMS...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Chyba pri čítaní MMS nastavení operátora...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimediálna správa</string>
   <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Prijatá správa bola zašifrovaná s použitím staršej verzie TextSecure, ktorá už nie je podporovaná. Prosím, požiadajte odosielateľa, aby aktualizoval na najnovšiu verziu a odoslal správu znova.</string>
+  <string name="MessageRecord_left_group">Opustili ste skupinu.</string>
+  <string name="MessageRecord_updated_group">Skupina bola aktualizovaná.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Heslá sa nezhodujú!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Nesprávne staré heslo!</string>
   <!--DeviceProvisioningActivity-->
+  <string name="DeviceProvisioningActivity_link_this_device">Pridať toto zariadenie?</string>
+  <string name="DeviceProvisioningActivity_cancel">ZRUŠIŤ</string>
+  <string name="DeviceProvisioningActivity_continue">POKRAČOVAŤ</string>
+  <string name="DeviceProvisioningActivity_title">Pridať toto zariadenie?</string>
+  <string name="DeviceProvisioningActivity_content_intro">Bude môcť </string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+- Čítať všetky Vaše správy\n
+- Odosielať správy vo Vašom mene
+</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Pridáva sa zariadenie...</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Pridáva sa nové zariadenie...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Zariadenie bolo pridané!</string>
+  <string name="DeviceProvisioningActivity_content_progress_no_device">Nebolo nájdené žiadne zariadenie!</string>
+  <string name="DeviceProvisioningActivity_content_progress_network_error">Chyba siete.</string>
+  <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
   <!--PassphrasePromptActivity-->
-  <string name="PassphrasePromptActivity_enter_passphrase">Zadaj heslo</string>
+  <string name="PassphrasePromptActivity_enter_passphrase">Zadajte heslo</string>
-  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikonka</string>
+  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikona</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">Odošli heslo</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nesprávne heslo!</string>
   <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Elektronický podpis použítý pri tejto výmene šifrovacích kľúčov sa líši od podpisu,
+ktorý bol v minulosti použitý týmto kontaktom. To môže znamenať buď to,
+že sa niekto snaží odpočúvať Vašu komunikáciu, alebo to,
+že tento kontakt jednoducho preinštaloval TextSecure a teraz má nový elektronický podpis.
+</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Možno by ste mali overiť
+identitu tohto kontaktu.</string>
   <string name="ReceiveKeyActivity_processing">Spracováva sa</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Spracovávajú sa kľúče vymeny</string>
   <!--RegistrationActivity-->
@@ -150,7 +252,15 @@ kód krajiny
 
 telefónne číslo</string>
   <string name="RegistrationActivity_invalid_number">Neplatné číslo</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Vami zadané telefónne číslo
+(%s) je nesprávne.</string>
   <string name="RegistrationActivity_unsupported">Nepodporované</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Bohužiaľ,
+toto zariadenie nepodporuje dátove prenosy. Zariadenia s verziou OS Android staršou než 4.0
+musia mať zaregistrovaný účet Google. Zariadenia s verziou OS novšou než 4.0
+nepotrebujú účet Google, ale musia mať nainštalovanú aplikáciu Play Store.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+Skontrolujte pre istotu znovu, že ste správne zadali Vaše telefónne číslo! Prebehne overenie pomocou SMS.</string>
   <string name="RegistrationActivity_continue">Pokračovať</string>
   <string name="RegistrationActivity_edit">Upraviť </string>
   <!--RegistrationProblemsActivity-->
@@ -159,22 +269,36 @@ telefónne číslo</string>
   <string name="RegistrationProgressActivity_verifying_number">Overovanie čísla </string>
   <string name="RegistrationProgressActivity_edit_s">Upraviť %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Registrácia dokončená.</string>
-  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Musíš zadať kód ktorý si dostal prvý...</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Musíte zadať kód, ktorý ste dostali ako prvý...</string>
   <string name="RegistrationProgressActivity_connecting">Pripájanie</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Pripájanie kvôli overovaniu...</string>
   <string name="RegistrationProgressActivity_network_error">Chyba siete! </string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Nepodarilo sa pripojiť. Prosím, overte Vaše sieťové pripojenie a skúste to znovu.</string>
   <string name="RegistrationProgressActivity_verification_failed">Overovanie zlyhalo!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Verifikačný kód ktorý ste zadali nie je správny. Prosím, skúste to znovu.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Príliš veľa pokusov</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Zatali ste nesprávny verifikačný kód príliš mnoho krát. Musíte chvíľu počkať predtým, než sa opäť pokusíte zadať kód.</string>
   <string name="RegistrationProgressActivity_requesting_call">Vyžadovanie hovoru</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Vyžaduje sa verifikačný hovor...</string>
   <string name="RegistrationProgressActivity_server_error">Chyba servera</string>
-  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Na serveri sa vyskytol problém. Prosím skús to zas.</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Na serveri sa vyskytol problém. Prosím, skúste to znovu.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Príliš veľa požiadaviek!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Nedávno ste si už vyžiadali hlasový hovor. Ďalší si môžete vyžiadať až za 20 minút.</string>
+  <string name="RegistrationProgressActivity_registration_conflict">Konflikt pri registrácii</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Toto číslo je už zaregistrované na inom TextSecure serveri (CyanogenMod?). Musíte sa odregistrovať tam, predtým než sa zaregistrujete tu.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Registrácia dokončená.</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registrácia bola úspešne dokončená.</string>
   <string name="RegistrationService_registration_error">Chyba pri registrácii</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pri TextSecure registrácii sa vyskytol problém.</string>
   <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Bola prijatá poškodená správa
+vzájomnej výmeny kľúčov.</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Bola prijatá správa vzájomnej výmeny kľúčov s neplatnou verziou protokolu.
+</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie.</string>
   <string name="SmsMessageRecord_secure_session_ended">Bezpečné spojenie ukončené.</string>
   <string name="SmsMessageRecord_duplicate_message">Zduplikuj správu.</string>
   <!--ThreadRecord-->
@@ -251,8 +375,6 @@ telefónne číslo</string>
   <string name="contact_selection_recent_activity__no_recent_calls">Žiadne nedávne hovory.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Pošli TextSecure správu </string>
-  <string name="conversation_activity__type_message_sms_secure">Pošli šifrovanú SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Pošli šifrovanú MMS</string>
   <string name="conversation_activity__send">Odoslať</string>
   <string name="conversation_activity__remove">Odstrániť</string>
   <!--conversation_item-->
@@ -361,8 +483,6 @@ zlyhalo.
   <string name="preferences__general">Všeobecné</string>
   <string name="preferences__pref_all_sms_title">Príjmy všetky SMS</string>
   <string name="preferences__pref_all_mms_title">Príjmy všetky MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Použi TextSecure na zobrazenie a uloženie všetkých prichádzajúcich správ</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Použi TextSecure na zobrazenie a uloženie všetkých prichádzajúcich miltimediálnych správ</string>
   <string name="preferences__input_settings">Nastavenia vstupu</string>
   <string name="preferences__replace_smiley_with_enter_key">Náhrad smajlíkov s klasickými znakmi</string>
   <string name="preferences__display_settings">Nastavenia zobrazenia</string>
@@ -413,12 +533,7 @@ zlyhalo.
   <string name="preferences__theme">Téma</string>
   <string name="preferences__default">Pôvodné</string>
   <string name="preferences__language">Jazyk</string>
-  <string name="preferences__make_default_sms_app">Nastav ako predvolebnú SMS aplikáciu</string>
   <string name="preferences__submit_debug_log">Odošli ladiaci log</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure používatelia</string>
-  <string name="preferences__sms_outgoing_push_users_description">Pošli bezpečnú SMS pokiaľ pripojenie je nedostupné </string>
-  <string name="preferences__sms_fallback_non_push_users">Nie-TextSecure používatelia </string>
-  <string name="preferences__sms_fallback_nobody">Nikto</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -463,6 +578,7 @@ zlyhalo.
   <string name="conversation__menu_leave_group">Opusti skupinu</string>
   <string name="conversation__menu_delete_thread">Zmaž vlákno</string>
   <!--conversation_callable-->
+  <string name="conversation_add_to_contacts__menu_add_to_contacts">Pridať do kontaktov</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Zoznam príjemcov</string>
   <string name="conversation_group_options__delivery">Doručenie</string>
@@ -479,10 +595,27 @@ zlyhalo.
   <string name="text_secure_normal__menu_clear_passphrase">Zamkni</string>
   <string name="text_secure_normal__mark_all_as_read">Označ všetky prečítané</string>
   <!--reminder_header-->
+  <string name="reminder_header_expired_build">Vaša verzia TextSecure je príliš stará!</string>
+  <string name="reminder_header_expired_build_details">Nie je možné ďalej úspešne odosielať správy. Prosím, aktualizujte na najnovšiu verziu.</string>
+  <string name="reminder_header_sms_default_title">Nastaviť ako predvolenú SMS aplikáciu?</string>
+  <string name="reminder_header_sms_default_text">Dotykom sem môžete nastaviť TextSecure ako predvolenú aplikáciu pre SMS správy.</string>
+  <string name="reminder_header_sms_import_title">Načítať systémove SMS správy?</string>
+  <string name="reminder_header_sms_import_text">Dotykom sem môžete skopírovať SMS správy z Vašeho telefónu do zašifrovanej databázy.</string>
+  <string name="reminder_header_push_title">Povoliť správy TextSecure?</string>
+  <string name="reminder_header_push_text">Dotykom sem môžete zapnúť funkciu, vďaka ktorej získate okamžité doručovanie vašich správ a väčšie súkromie bez poplatkov za SMS.</string>
   <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">Vy</string>
+  <string name="MediaPreviewActivity_cant_display">Nepodarilo sa zobraziť náhľad pre tento obrázok</string>
+  <string name="MediaPreviewActivity_unssuported_media_type">Nepodporovaný typ súboru</string>
   <!--media_preview-->
+  <string name="media_preview__save_title">Uložiť</string>
   <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">Náhľad obrázku</string>
   <!--Trimmer-->
+  <string name="trimmer__deleting">Vymazávanie...</string>
+  <string name="trimmer__deleting_old_messages">Mažú sa staré správy...</string>
+  <string name="trimmer__old_messages_successfully_deleted">Staré správy úspešne vymazané</string>
   <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">Ikona prenosu</string>
   <!--EOF-->
 </resources>

res/values-sl/strings.xml

@@ -22,19 +22,15 @@ Pozor, s tem boste onemogočili šifriranje sporočil in ključev v pomnilniku n
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">S tem boste izključili potisna sporočila in se odjavili s strežnika.
 Za ponovno uporabo potisnih sporočil se boste morali zopet prijaviti s svojo telefonsko številko.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Napaka pri povezavi s strežnikom!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Dohodna SMS sporočila vklopljena</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Omogočeno</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotaknite se za spremembo privzete aplikacije za sporočila SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Dohodna SMS sporočila izklopljena</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Izklopljeno</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Z dotikom nastavi TexteScure za privzeto aplikacijo SMS</string>
   <string name="ApplicationPreferencesActivity_on">Vključeno</string>
   <string name="ApplicationPreferencesActivity_On">Vključeno</string>
   <string name="ApplicationPreferencesActivity_off">Izključeno</string>
   <string name="ApplicationPreferencesActivity_Off">Izključeno</string>
-  <string name="ApplicationPreferencesActivity_partial">Delno</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Dohodna %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">Odhodna %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minut</string>
   <!--DraftDatabase-->
@@ -372,9 +368,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="contact_selection_recent_activity__no_recent_calls">Ni zadnjih klicev.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Pošlji sporočilo TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Pošlji zavarovan SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Pošlji nezavarovan SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Pošlji zavarovan MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Pošlji nezavarovan MMS</string>
   <string name="conversation_activity__send">Pošlji</string>
   <string name="conversation_activity__remove">Odstrani</string>
@@ -515,9 +509,9 @@ bila uspešna.</string>
   <string name="verify_identity_activity__your_identity_you_read">Moja istovetnost (preberem jaz):</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">Prišlo je do težav, ki zahtevajo vašo pozornost.</string>
-  <string name="message_details_header__sent">Poslano</string>
+  <string name="message_details_header__sent">Poslano:</string>
-  <string name="message_details_header__received">Prejeto</string>
+  <string name="message_details_header__received">Prejeto:</string>
-  <string name="message_details_header__via">Preko</string>
+  <string name="message_details_header__via">Način:</string>
   <string name="message_details_header__to">Za:</string>
   <string name="message_details_header__from">Od:</string>
   <string name="message_details_header__with">Z:</string>
@@ -554,16 +548,15 @@ bila uspešna.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Splošno</string>
   <string name="preferences__sms_mms">SMS in MMS</string>
-  <string name="preferences__push_sms_category">Pošiljanje in prejemanje</string>
   <string name="preferences__pref_all_sms_title">Prejemaj sporočila SMS</string>
   <string name="preferences__pref_all_mms_title">Prejemaj sporočila MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Uporabljaj TextSecure za ogled in shranjevanje vseh dohodnih sporočil SMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Uporabljaj TextSecure za vsa dohodna tekstovna sporočila</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Uporabljaj TextSecure za ogled in shranjevanje vseh dohodnih sporočil MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Uporabljaj TextSecure za vsa dohodna multimedijska sporočila</string>
   <string name="preferences__input_settings">Vnos besedila</string>
-  <string name="preferences__enable_enter_key_title">Vklopi tipko \'pošlji\'</string>
+  <string name="preferences__enable_enter_key_title">Vklopi tipko \'Naprej\'</string>
-  <string name="preferences__replace_smiley_with_enter_key">Zamenjaj tipko \'smeško\' s tipko \'pošlji\'</string>
+  <string name="preferences__replace_smiley_with_enter_key">Zamenjaj tipko \'Smeško\' s tipko \'Naprej\'</string>
-  <string name="preferences__pref_enter_sends_title">Naprej/Enter pošlje</string>
+  <string name="preferences__pref_enter_sends_title">Tipka \'Naprej\' pošlje</string>
-  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pritisk na tipko naprej/enter pošlje sporočilo</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pritisk na tipko \'Naprej\' pošlje sporočilo</string>
   <string name="preferences__display_settings">Nastavitve prikaza</string>
   <string name="preferences__choose_identity">Izberi identiteto</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Na sezmanu stikov izberite svojo lastno vizitko.</string>
@@ -641,21 +634,10 @@ bila uspešna.</string>
   <string name="preferences__default">Privzeto</string>
   <string name="preferences__language">Jezik</string>
   <string name="preferences__language_summary">Jezik %s</string>
-  <string name="preferences__make_default_sms_app">Nastavi za privzeto aplikacijo SMS</string>
+  <string name="preferences__textsecure_messages">Sporočila TextSecure</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Nastavi TextSecure za privzeto aplikacijo SMS/MMS na napravi.</string>
-  <string name="preferences__use_data_channel">Potisna sporočila</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Izboljšajte stopnjo zasebnosti in se izognite stroškom sporočil SMS z uporabo podatkovnega kanala pri komunikaciji z drugimi uporabniki TextSecure</string>
+Brezplačno zasebno sporočanje za TextSecure in Signal</string>
-  <string name="preferences__sms_fallback">Odhodna sporočila SMS/MMS</string>
   <string name="preferences__submit_debug_log">Oddaj sistemsko zabeležbo</string>
-  <string name="preferences__sms_outgoing_push_users">Uporabniki TextSecure</string>
-  <string name="preferences__sms_fallback_push_users_ask">prej vprašaj</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">brez MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Kadar ni podatkovne povezave pošiljaj zaščitena SMS sporočila</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Vprašaj preden pošlješ SMS/MMS</string>
-  <string name="preferences__sms_fallback_never_send_mms">Nikoli ne pošiljaj sporočil MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Neuporabniki TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Nikogar</string>
   <string name="preferences__support_wifi_calling">\'WiFi klicanje/WiFi Calling\' združljivostni način</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivirajte, če vaša naprava dostalja sporočila SMS/MMS preko povezave WiFi (samo, če imate vklopljeno WiFi klicanje/WiFi Calling)</string>
   <!--****************************************-->

res/values-sr/strings.xml

@@ -25,19 +25,15 @@
 Ово ће да онемогући сигурне поруке одјављујући вас са сервера.
 Мораћете поново да пријавите ваш број телефона да бисте опет користили сигурне поруке.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Грешка повезивања на сервер!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Долазни СМС омогућен</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">СМС омогућен</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Додирните да бисте променили подразумевану апликацију за СМС</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Долазни СМС онемогућен</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">СМС онемогућен</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Додирните да бисте поставили Сигурне поруке као подразумевану апликацију за СМС</string>
   <string name="ApplicationPreferencesActivity_on">укључена</string>
   <string name="ApplicationPreferencesActivity_On">Укључена</string>
   <string name="ApplicationPreferencesActivity_off">искључена</string>
   <string name="ApplicationPreferencesActivity_Off">Искључена</string>
-  <string name="ApplicationPreferencesActivity_partial">делимично</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">СМС %1$s, ММС %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">СМС</string>
-  <string name="ApplicationPreferencesActivity_mms">ММС</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Долазна %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">одлазна %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d минута</string>
   <!--DraftDatabase-->
@@ -396,9 +392,7 @@
   <string name="contact_selection_recent_activity__no_recent_calls">Нема недавних позива.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Пошаљи сигурну поруку</string>
-  <string name="conversation_activity__type_message_sms_secure">Пошаљи обезбеђени СМС</string>
   <string name="conversation_activity__type_message_sms_insecure">Пошаљи необезбеђени СМС</string>
-  <string name="conversation_activity__type_message_mms_secure">Пошаљи обезбеђени ММС</string>
   <string name="conversation_activity__type_message_mms_insecure">Пошаљи необезбеђени ММС</string>
   <string name="conversation_activity__send">Пошаљи</string>
   <string name="conversation_activity__remove">Уклони</string>
@@ -583,11 +577,10 @@
   <!--preferences.xml-->
   <string name="preferences__general">Опште</string>
   <string name="preferences__sms_mms">СМС и ММС</string>
-  <string name="preferences__push_sms_category">Сигурне и СМС поруке</string>
   <string name="preferences__pref_all_sms_title">Примај све СМС</string>
   <string name="preferences__pref_all_mms_title">Примај све ММС</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Користи Сигурне поруке за приказ и складиштење свих долазних текстуалних порука</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Користи Сигурне поруке за све долазне текстуалне поруке</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Користи Сигурне поруке за приказ и складиштење свих долазних мултимедијалних порука</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Користи Сигурне поруке за све долазне мултимедијалне поруке</string>
   <string name="preferences__input_settings">Поставке уноса</string>
   <string name="preferences__enable_enter_key_title">Омогући Ентер тастер</string>
   <string name="preferences__replace_smiley_with_enter_key">Замени тастер емотикона Ентер тастером</string>
@@ -670,21 +663,10 @@
   <string name="preferences__default">Подразумеван</string>
   <string name="preferences__language">Језик</string>
   <string name="preferences__language_summary">Језик %s</string>
-  <string name="preferences__make_default_sms_app">Постави подразумевано за СМС</string>
+  <string name="preferences__textsecure_messages">Сигурне поруке</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Поставите Сигурне поруке за подразумевану СМС/ММС апликацију на вашем систему.</string>
-  <string name="preferences__use_data_channel">Сигурне поруке</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Повећајте приватност и избегните трошак СМС порука користећи интернет за комуникацију са осталим корисницима Сигурних порука</string>
+Бесплатне приватне поруке корисницима Сигурних порука и Сигнала</string>
-  <string name="preferences__sms_fallback">Одлазни СМС/ММС</string>
   <string name="preferences__submit_debug_log">Пошаљи дневник исправљања грешака</string>
-  <string name="preferences__sms_outgoing_push_users">корисницима Сигурних порука</string>
-  <string name="preferences__sms_fallback_push_users_ask">прво питај</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">без ММС-а</string>
-  <string name="preferences__sms_outgoing_push_users_description">Пошаљи обезбеђени СМС ако нема мрежне везе</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Питај пре слања СМС/ММС поруке</string>
-  <string name="preferences__sms_fallback_never_send_mms">Никад не шаљи ММС</string>
-  <string name="preferences__sms_fallback_non_push_users">осталим контактима</string>
-  <string name="preferences__sms_fallback_nobody">никога</string>
   <string name="preferences__support_wifi_calling">Компатибилност са „бежичним позивањем“</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Омогућите ако ваш уређај доставља СМС/ММС преко бежичне мреже (омогућите само ако је омогућено на вашем уређају).</string>
   <!--****************************************-->

res/values-sv/strings.xml

@@ -25,19 +25,12 @@ kommer kunna komma åt dem.</string>
 Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern. Du kommer behöva återregistrera ditt telefonnummer för att använda pushmeddelanden igen i framtiden.
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fel vid anslutning till server!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Inkommande SMS påslaget</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tryck för att ändra din standardapp för SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Inkommande SMS avslaget</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tryck för att göra TextSecure till din standardapp för SMS</string>
   <string name="ApplicationPreferencesActivity_on">på</string>
   <string name="ApplicationPreferencesActivity_On">På</string>
   <string name="ApplicationPreferencesActivity_off">av</string>
   <string name="ApplicationPreferencesActivity_Off">Av</string>
-  <string name="ApplicationPreferencesActivity_partial">ofullständig</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Inkommande %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">utgående %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minuter</string>
   <!--DraftDatabase-->
@@ -382,9 +375,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="contact_selection_recent_activity__no_recent_calls">Inga nyliga samtal.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Skicka TextSecure-meddelande</string>
-  <string name="conversation_activity__type_message_sms_secure">Skicka säkert SMS</string>
   <string name="conversation_activity__type_message_sms_insecure">Skicka okrypterat SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Skicka säkert MMS</string>
   <string name="conversation_activity__type_message_mms_insecure">Skicka okrypterat MMS</string>
   <string name="conversation_activity__send">Skicka</string>
   <string name="conversation_activity__remove">Ta bort</string>
@@ -552,11 +543,8 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Allmänt</string>
   <string name="preferences__sms_mms">SMS och MMS</string>
-  <string name="preferences__push_sms_category">Push och SMS</string>
   <string name="preferences__pref_all_sms_title">Använd för alla SMS</string>
   <string name="preferences__pref_all_mms_title">Använd för alla MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Använd TextSecure för att läsa och lagra alla inkommande text meddelanden</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Använd TextSecure för att se och lagra alla inkommande multimedia meddelanden</string>
   <string name="preferences__input_settings">Inputinställningar</string>
   <string name="preferences__enable_enter_key_title">Aktivera returtagenten</string>
   <string name="preferences__replace_smiley_with_enter_key">Ersätt tangenten för uttryckssymboler med Retur</string>
@@ -639,21 +627,7 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Språk</string>
   <string name="preferences__language_summary">Språk %s</string>
-  <string name="preferences__make_default_sms_app">Använd som standardapp för SMS</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Gör TextSecure till standardapp för SMS/MMS på din enhet.</string>
-  <string name="preferences__use_data_channel">Push-meddelanden</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Utöka sekretessen och undvik SMS-kostnader genom att använda datakanalen för att kommunicera med andra TextSecure-användare</string>
-  <string name="preferences__sms_fallback">Utgående SMS/MMS</string>
   <string name="preferences__submit_debug_log">Skicka in loggfilen för felsökning</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure användare</string>
-  <string name="preferences__sms_fallback_push_users_ask">fråga först</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">inga MMS</string>
-  <string name="preferences__sms_outgoing_push_users_description">Skicka säkert SMS om dataanslutningen är nere</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">Fråga innan SMS/MMS skickas</string>
-  <string name="preferences__sms_fallback_never_send_mms">Skicka aldrig MMS</string>
-  <string name="preferences__sms_fallback_non_push_users">Icke-TextSecure användare</string>
-  <string name="preferences__sms_fallback_nobody">Ingen</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' kompatibilitetsläge</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivera om din enhet skickar SMS/MMS över WiFi (aktivera endast när \'WiFi Calling\' är aktiverat på din enhet).</string>
   <!--****************************************-->

res/values-ta/strings.xml

@@ -25,17 +25,12 @@
 இது சர்வரில் இருந்து பதிவுநீக்கப்படுவது மூலம் Push செய்திகளை முடக்கும்.
 நீங்கள் எதிர்காலத்தில் மீண்டும் Push செய்திகளை பயன்படுத்த, உங்கள் தொலைபேசி எண்ணை மீண்டும் பதிவு செய்ய வேண்டும்.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">சர்வருடன் இணைவதில் பிழை!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">உள்வரும் SMS செயல்பாட்டில் உள்ளது</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">இதை உங்கள் இயல்புநிலை SMS மென்பொருளாக்க தொடவும் </string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">உள்வரும் SMS செயல்பாட்டில் இல்லை</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">TextSecure-ஐ உங்கள் இயல்புநிலை SMS மென்பொருளாக்க தொடவும்</string>
   <string name="ApplicationPreferencesActivity_on">இயக்க</string>
   <string name="ApplicationPreferencesActivity_On">இயக்க</string>
   <string name="ApplicationPreferencesActivity_off">அணை</string>
   <string name="ApplicationPreferencesActivity_Off">அணை</string>
-  <string name="ApplicationPreferencesActivity_partial">முழுமையற்ற</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d நிமிடங்கள்</string>
   <!--DraftDatabase-->
@@ -70,6 +65,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted">பாதுகாப்பற்ற குறைவடைந்த வழிக்கு தொடவும்</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">மறையாக்கபடாத SMS-ஆக அனுப்பலாமா?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">மறையாக்கபடாத MMS-ஆக அனுப்பலாமா?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">இந்த செய்தியை மறையாக்கம் செய்து அனுப்ப <b>முடியாது</b>, ஏனெனில் பெறுநர் இனி TextSecure பயனர் அல்ல.\n\nபாதுகாப்பில்லாத செய்தியாக அனுப்பலாமா?</string>
   <string name="ConversationItem_unable_to_open_media">இந்த ஊடகத்தை திறக்க முடியும் ஒரு பயன்பாட்டை கண்டுபிடிக்க முடியவில்லை.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">பாதுகாப்பான அமர்வை தொடங்களாமா?</string>
@@ -130,6 +126,8 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">சாவி பரிமாற்றச் செய்தி...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">பயன்படுத்தப்படும் விருப்பம்: %s</string>
+  <string name="CustomDefaultPreference_using_default">பயன்படுத்தப்படும் இயல்புநிலை: %s</string>
   <string name="CustomDefaultPreference_none">எதுவும் இல்லை</string>
   <!--DateUtils-->
   <string name="DateUtils_now">இப்போது</string>
@@ -361,6 +359,7 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <string name="MessageNotifier_d_new_messages">%d புதிய செய்திகள்</string>
   <string name="MessageNotifier_most_recent_from_s">மிக அண்மையில் இவரிடமிருந்து: %s</string>
   <string name="MessageNotifier_encrypted_message">மறையாக்கப்பட செய்தி...</string>
+  <string name="MessageNotifier_media_message_with_text">மீடியா செய்தி: %s</string>
   <string name="MessageNotifier_no_subject">(தலைப்பு இல்லை)</string>
   <string name="MessageNotifier_message_delivery_failed">செய்தி விநியோகிப்பது தோல்வியடைந்தது.</string>
   <string name="MessageNotifier_failed_to_deliver_message">செய்தி விநியோகிப்பது தோல்வியடைந்தது.</string>
@@ -389,16 +388,16 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <string name="contact_selection_recent_activity__no_recent_calls">சமீபத்திய அழைப்புகள் இல்லை.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">TextSecure செய்தி அனுப்பு</string>
-  <string name="conversation_activity__type_message_sms_secure">பாதுகாப்பான SMS அனுப்பு </string>
   <string name="conversation_activity__type_message_sms_insecure">பாதுகாப்பில்லாத SMS அனுப்பு </string>
-  <string name="conversation_activity__type_message_mms_secure">பாதுகாப்பான MMS அனுப்பு </string>
   <string name="conversation_activity__type_message_mms_insecure">பாதுகாப்பில்லாத MMS அனுப்பு </string>
   <string name="conversation_activity__send">அனுப்பு</string>
   <string name="conversation_activity__remove">நீக்கு</string>
   <string name="conversation_activity__window_description">%1$s உடன் உரையாடல்</string>
   <string name="conversation_activity__compose_description">செய்தி தொகுப்பு</string>
   <string name="conversation_activity__emoji_toggle_description">உணர்ச்சித்திர விசைப்பலகைக்கு மாற்று</string>
+  <string name="conversation_activity__attachment_thumbnail">இணைப்பின் சிறுபடம்</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">மீடியா செய்தி பதிவிறக்கப்படுகிறது</string>
   <string name="conversation_item__mms_image_description">மீடியா செய்தி</string>
   <string name="conversation_item__play_button_description">ஓட்டு பொத்தான்</string>
   <string name="conversation_item__secure_message_description">பாதுகாப்பான செய்தி</string>
@@ -469,6 +468,8 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">முடிந்தது</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+TextSecure-உடன் இணைய உங்கள் எண்ணைச் சரிபார்க்கவும்.</string>
   <string name="registration_activity__your_country">உங்கள் நாடு</string>
   <string name="registration_activity__your_country_code_and_phone_number">உங்கள் நாட்டின் குறியீடு மற்றும்
 உங்கள் தொலைபேசி எண்</string>
@@ -529,6 +530,9 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
 தோல்வியடைந்தது.
     </string>
   <string name="registration_progress_activity__generating_keys">சாவிகள் உருவாக்கப்படுகிறது...</string>
+  <string name="registration_progress_activity__alert">எச்சரிக்கை</string>
+  <string name="registration_progress_activity__telephone">தொலைபேசி</string>
+  <string name="registration_progress_activity__check">பார்க்க</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>ஒரு பெயர் அல்லது எண்ணை உள்ளிடவும்</small></string>
   <string name="recipients_panel__add_member">குழுஉறுப்பினர் சேர்க்</string>
@@ -558,6 +562,8 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <!--arrays.xml-->
   <string name="arrays__import_export">இறக்குமதி / ஏற்றுமதி</string>
   <string name="arrays__my_identity_key">என் அடையாளச் சாவி</string>
+  <string name="arrays__use_default">இயல்புநிலை பயன்படுத்தவும்</string>
+  <string name="arrays__use_custom">விருப்பம் பயன்படுத்தவும்</string>
   <!--plurals.xml-->
   <plurals name="minutes_ago">
     <item quantity="one">%d நிமிடம்</item>
@@ -570,11 +576,8 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <!--preferences.xml-->
   <string name="preferences__general">பொதுவான</string>
   <string name="preferences__sms_mms">SMS மற்றும் MMS</string>
-  <string name="preferences__push_sms_category">Push மற்றும் SMS</string>
   <string name="preferences__pref_all_sms_title">அனைத்து SMSகளையும் பெறுக</string>
   <string name="preferences__pref_all_mms_title">அனைத்து MMSகளையும் பெறுக</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">அனைத்து உள்வரும் குறுஞ்செய்திகளையும் பார்க்கவும் சேமிப்பதற்கும் TextSecure பயன்படுத்தவும்</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">அனைத்து உள்வரும் MMS செய்திகளையும் பார்க்கவும் சேமிப்பதற்கும் TextSecure பயன்படுத்தவும்</string>
   <string name="preferences__input_settings">உள்ளீட்டு அமைப்புகள்</string>
   <string name="preferences__enable_enter_key_title">பதிவு விசையை செயல்படுத்து</string>
   <string name="preferences__replace_smiley_with_enter_key"> உணர்ச்சித்திர விசைக்கு பதிலாக உள்ளீட்டு விசையை காட்டவும் </string>
@@ -587,8 +590,10 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <string name="preferences__change_passphrase">கடவுச்சொல்லை மாற்று</string>
   <string name="preferences__change_my_passphrase">என் கடவுச்சொல்லை மாற்று</string>
   <string name="preferences__enable_passphrase">கடவுச்சொல்லை செயல்படுத்து</string>
+  <string name="preferences__passphrase_summary">கடவுச்சொல் %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">சாவிகள் மற்றும் செய்திகளின் கோப்பை மறையாக்கம் செய்வதை செயல்படுத்து</string>
   <string name="preferences__screen_security">திரை பாதுகாப்பு</string>
+  <string name="preferences__screen_security_summary">திரை பாதுகாப்பு %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">அண்மை பட்டியல் மற்றும் மென்பொருளுக்கு உள்ளே திரையை படம் எடுப்பதை தடுக்கவும்</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">கொஞ்சம் கால இடைவெளிக்குபிறகு நினைவகத்‌தில் இருந்து கடவுச்சொல்லை மறக்கச்செய்யவும்</string>
   <string name="preferences__timeout_passphrase">கடவுச்சொல்லின் காலாவதி</string>
@@ -636,6 +641,11 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <string name="preferences__advanced_mms_access_point_names">நீங்கள் செய்யவேண்டிய MMS அமைப்புகள்</string>
   <string name="preferences__enable_manual_mms">நீங்கள் செய்த MMS அமைப்புகளை பயன்படுத்தவும்</string>
   <string name="preferences__override_system_mms_settings">தொலைபேசியின் MMS அமைப்புகளை கீழே உள்ள தகவல்களை பயன்படுத்துவதன் மூலம்  புறக்கணிக்க.</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS Proxy Host</string>
+  <string name="preferences__mms_proxy_port">MMS Proxy Port</string>
+  <string name="preferences__mmsc_username">MMSC Username</string>
+  <string name="preferences__mmsc_password">MMSC Password</string>
   <string name="preferences__sms_delivery_reports">SMS விநியோக அறிக்கைகள்</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">நீங்கள் அனுப்பும் அனைத்து SMS-களுக்கும் விநியோக அறிக்கைகளை வேண்டவும்</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">ஒரு உரையாடல் நூல் குறிப்பிட்ட நீளத்தைவிட அதிகமானவுடன் தானாக பழைய செய்திகளை நீக்கவும் </string>
@@ -646,24 +656,12 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <string name="preferences__light_theme">வெளிச்சமிக்க</string>
   <string name="preferences__dark_theme">இருள்கொண்ட </string>
   <string name="preferences__appearance">தோற்றம்</string>
-  <string name="preferences__theme">வடிவமைப்பு</string>
+  <string name="preferences__theme">நிறவடிவமைப்பு</string>
+  <string name="preferences__theme_summary">நிறவடிவமைப்பு %s</string>
   <string name="preferences__default">இயல்புநிலை</string>
   <string name="preferences__language">மொழி</string>
-  <string name="preferences__make_default_sms_app">இயல்புநிலை SMS மென்பொருளாக அமைக்க</string>
+  <string name="preferences__language_summary">மொழி %s</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure-ஐ தொலைபேசியின் இயல்புநிலை SMS மென்பொருளாக அமை.</string>
-  <string name="preferences__use_data_channel">Push செய்திகள்</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-தனியுரிமையை அதிகரிக்கவும் மற்றும் SMS கட்டணங்களை தவிர்க்கவும்  இணைய தொடர்பை  பயன்படுத்துவதன் மூலம் மற்ற TextSecure பயனர்களுடன் தொடர்புகொள்ளலாம்.</string>
-  <string name="preferences__sms_fallback">வெளிச்செல்லும் SMS/MMS</string>
   <string name="preferences__submit_debug_log">பிழைத்திருத்த பதிவுகளை சமர்ப்பி</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure பயனர்கள்</string>
-  <string name="preferences__sms_fallback_push_users_ask">முதலில் கேட்க</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">MMS இல்லை</string>
-  <string name="preferences__sms_outgoing_push_users_description">இணையத் தொடர்பு துண்டிக்கப்பட்டதென்றால், பாதுகாப்பான SMS அனுப்ப</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">SMS/MMS அனுப்பும் முன் கேட்க</string>
-  <string name="preferences__sms_fallback_never_send_mms">ஒருபோதும் MMS அனுப்பக்கூடாது </string>
-  <string name="preferences__sms_fallback_non_push_users">TextSecure பயன்படுத்தாதவர்கள்</string>
-  <string name="preferences__sms_fallback_nobody">ஒருவருமில்லை</string>
   <string name="preferences__support_wifi_calling">\'WiFi அழைப்புகள்\' பொருந்தக்கூடிய முறை</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">உங்கள் சாதனம் SMS/MMS விநியோகத்தை WiFi வழியில் பயன்படுத்துகிறது என்றால் இதை செயல்படுத்தவும் (உங்கள் சாதனத்தில் \'Wifi அழைப்புகள்\' செயல்படுத்தப்படும் போது மட்டுமே செயல்படுத்தவும்).</string>
   <!--****************************************-->
@@ -690,6 +688,7 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">இணைப்பைச் சேமி</string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">அழை</string>
   <!--conversation_insecure_no_push-->
   <string name="conversation_insecure__menu_start_secure_session">பாதுகாப்பான அமர்வு தொடங்கு</string>
   <string name="conversation_insecure__security">பாதுகாப்பு</string>
@@ -699,6 +698,9 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <!--conversation_list-->
   <string name="conversation_list__menu_search">தேடல்</string>
   <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">தொடர்பின் புகைப்படம்</string>
+  <string name="conversation_list_item_view__attachment_indicator">இணைப்பு காட்டி</string>
+  <string name="conversation_list_item_view__error_alert">பிழை எச்சரிக்கை</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">புதிய உரையாடல்</string>
   <!--conversation_secure_verified-->
@@ -750,5 +752,6 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <string name="trimmer__deleting_old_messages">நான் பழையசெய்திகள் நீக்கப்படுகிறது...</string>
   <string name="trimmer__old_messages_successfully_deleted">பழையசெய்திகள் நீக்கப்பட்டது</string>
   <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">போக்குவரத்து குறும்படம்</string>
   <!--EOF-->
 </resources>

res/values-tr/strings.xml

@@ -24,19 +24,15 @@ erişebilir.</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 Bu işlem sunucudan kaydınızı silerek itilen mesajları etkisizleştirir. Gelecekte anında mesajlaşmayı kullanmak isterseniz telefon numaranızı yeniden kaydettirmeniz gerekir.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Sunucu bağlantı hatası!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Gelen SMS Etkinleştirildi</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS Etkinleştirildi</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Varsayılan SMS uygulamanızı değiştirmek için dokunun</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Gelen SMS Etkisizleştirildi</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Etkisizleştirildi.</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">TextSecure\'u varsayılan SMS uygulamanız yapmak için dokunun</string>
   <string name="ApplicationPreferencesActivity_on">açık</string>
   <string name="ApplicationPreferencesActivity_On">Açık</string>
   <string name="ApplicationPreferencesActivity_off">kapalı</string>
   <string name="ApplicationPreferencesActivity_Off">Kapalı</string>
-  <string name="ApplicationPreferencesActivity_partial">yarı</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
-  <string name="ApplicationPreferencesActivity_sms">SMS</string>
-  <string name="ApplicationPreferencesActivity_mms">MMS</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">Gelen %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">giden %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d dakika</string>
   <!--DraftDatabase-->
@@ -51,6 +47,7 @@ Bu işlem sunucudan kaydınızı silerek itilen mesajları etkisizleştirir. Gel
   <string name="AttachmentTypeSelectorAdapter_audio">Ses</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Kişi bilgisi</string>
   <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">%1$s için tanımlayan anahtar bilgileri değişmiş. Bu başka birinin iletişiminizi dinlemeye çalıştığı veya basitçe %2$s \'nin TextSecure\'u yeniden kurduğu ve yeni kimlik anahtarı aldığı anlamına gelebilir. </string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Bu kişiyi doğrulamak 
 isteyebilirsiniz.</string>
   <!--ConversationItem-->
@@ -62,9 +59,11 @@ isteyebilirsiniz.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Hata, bozuk anahtar takas mesajı alındı.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Anahtar takas mesajı alındı, işlemek için tıklayın.</string>
   <string name="ConversationItem_group_action_left">%1$s gruptan ayrıldı.</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Teminatsız geri düşme için hafifçe vur</string>
+  <string name="ConversationItem_click_for_details">Detaylar için hafifçe vur</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Güvensize geri düşmek için hafifçe vur</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Şifrelenmemiş SMS geri düşülmesi?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Şifrelenmemiş MMS geri düşülmesi?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Bu mesaj alıcının artık TextSecure kullanıcısı olmaması nedeni ile şifrelenmiş olarak <b>gönderilemez</b>. Güvensiz mesaj gönderilsin mi?</string>
   <string name="ConversationItem_unable_to_open_media">Bu medyayı açabilen bir uygulama bulunamadı.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Güvenli oturum başlatılsın mı?</string>
@@ -111,6 +110,8 @@ isteyebilirsiniz.</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Depolama alanına yazılamıyor!</string>
   <string name="ConversationFragment_saving_attachment">Ek kaydediliyor</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Depolama alanına ek kaydediliyor...</string>
+  <string name="ConversationFragment_pending">Bekleyen...</string>
+  <string name="ConversationFragment_push">Veri (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Siliniyor...</string>
@@ -123,6 +124,8 @@ isteyebilirsiniz.</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Anahtar takas mesajı...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Kullanılan özelleştirilmiş: %s</string>
+  <string name="CustomDefaultPreference_using_default">Kullanılan varsayılan: %s</string>
   <string name="CustomDefaultPreference_none">Hiçbiri</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Şimdi</string>
@@ -192,6 +195,8 @@ kurulumunuzda bulunan ancak yüklenecek yedekte bulunmayan tüm bilgiler kaybolu
   <string name="KeyScanningActivity_install_barcode_Scanner">Barcode Scanner kurulsun mu?</string>
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TexSecure QR kodlarını taramak için Barcode Scanner gerektirir.</string>
   <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">Başarısız gönderme</string>
+  <string name="MessageDetailsRecipient_new_identity">Yeni kimlik</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">MMS depolama hatası!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">MMS sağlayıcısına bağlanma hatası...</string>
@@ -347,6 +352,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="MessageNotifier_d_new_messages">%d yeni mesaj</string>
   <string name="MessageNotifier_most_recent_from_s">En yeni mesaj: %s</string>
   <string name="MessageNotifier_encrypted_message">Şifrelenmiş mesaj...</string>
+  <string name="MessageNotifier_media_message_with_text">Medya mesajı: %s</string>
   <string name="MessageNotifier_no_subject">(Konusuz)</string>
   <string name="MessageNotifier_message_delivery_failed">Mesaj iletimi başarısız.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Mesaj iletimi başarısız oldu.</string>
@@ -375,16 +381,16 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="contact_selection_recent_activity__no_recent_calls">Yakın zamanda arama yok.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">TextSecure mesajı gönder</string>
-  <string name="conversation_activity__type_message_sms_secure">Güvenli SMS gönder</string>
+  <string name="conversation_activity__type_message_sms_insecure">Güvensiz SMS gönder</string>
-  <string name="conversation_activity__type_message_sms_insecure">Teminatsız SMS gönder</string>
+  <string name="conversation_activity__type_message_mms_insecure">Güvensiz MMS gönder</string>
-  <string name="conversation_activity__type_message_mms_secure">Güvenli MMS gönder</string>
-  <string name="conversation_activity__type_message_mms_insecure">Teminatsız MMS gönder</string>
   <string name="conversation_activity__send">Gönder</string>
   <string name="conversation_activity__remove">Kaldır</string>
   <string name="conversation_activity__window_description">%1$s ile sohbet</string>
   <string name="conversation_activity__compose_description">Mesaj yazma</string>
   <string name="conversation_activity__emoji_toggle_description">Emoji klavyesini göster/gizle</string>
+  <string name="conversation_activity__attachment_thumbnail">Ek Küçük Resmi</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">Medya mesajı indiriliyor</string>
   <string name="conversation_item__mms_image_description">Medya mesajı</string>
   <string name="conversation_item__play_button_description">Oynat butonu</string>
   <string name="conversation_item__secure_message_description">Güvenli mesaj</string>
@@ -433,6 +439,8 @@ Daha önce dışa aktarılmış bir şifrelenmiş TextSecure yedeğini yeniden y
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">Resim yok</string>
   <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">DOĞRULAMA</string>
+  <string name="message_recipients_list_item__resend">YENİDEN GÖNDER</string>
   <!--MmsPreferencesFragment-->
   <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Telefonunuz için manuel MMS ayarları gerekmektedir.</string>
   <string name="MmsPreferencesFragment__enabled">Etkinleştirildi</string>
@@ -452,6 +460,8 @@ Daha önce dışa aktarılmış bir şifrelenmiş TextSecure yedeğini yeniden y
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Tamamlandı</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+TextSecure\'a bağlanmak için telefon numaranızı doğrulayın</string>
   <string name="registration_activity__your_country">ÜLKENİZ</string>
   <string name="registration_activity__your_country_code_and_phone_number">ÜLKE KODUNUZ VE
         TELEFON NUMARANIZ
@@ -506,7 +516,9 @@ SMS doğrulaması için verilen süre aşılarak TestSecure zaman aşımına uğ
   <string name="registration_progress_activity__sms_verification_failed">SMS doğrulaması
 başarısız.</string>
   <string name="registration_progress_activity__generating_keys">Anahtarlar üretiliyor...</string>
+  <string name="registration_progress_activity__alert">Uyar</string>
   <string name="registration_progress_activity__telephone">Telefon</string>
+  <string name="registration_progress_activity__check">Kontrol et</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Bir ad veya numara girin</small></string>
   <string name="recipients_panel__add_member">Üye ekle</string>
@@ -514,8 +526,13 @@ başarısız.</string>
   <string name="verify_identity_activity__their_identity_they_read">Onların kimliği (onların okuduğu):</string>
   <string name="verify_identity_activity__your_identity_you_read">Sizin kimliğiniz (sizin okuduğunuz):</string>
   <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Bazı sonular ilginizi gerektiriyor.</string>
+  <string name="message_details_header__sent">Gönderildi</string>
+  <string name="message_details_header__received">Alındı</string>
+  <string name="message_details_header__via">Eliyle</string>
   <string name="message_details_header__to">Alıcı:</string>
   <string name="message_details_header__from">Gönderici:</string>
+  <string name="message_details_header__with">İle:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Anahtar parolası oluştur</string>
   <string name="AndroidManifest__enter_passphrase">Parola Girin</string>
@@ -531,6 +548,8 @@ başarısız.</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">İçeri / Dışarı Aktar</string>
   <string name="arrays__my_identity_key">Kimlik anahtarım</string>
+  <string name="arrays__use_default">Varsayılanı kullan</string>
+  <string name="arrays__use_custom">Özelleştirilmiş kullan</string>
   <!--plurals.xml-->
   <plurals name="minutes_ago">
     <item quantity="other">%d dakika</item>
@@ -541,11 +560,10 @@ başarısız.</string>
   <!--preferences.xml-->
   <string name="preferences__general">Genel</string>
   <string name="preferences__sms_mms">SMS ve MMS</string>
-  <string name="preferences__push_sms_category">İtme ve SMS</string>
   <string name="preferences__pref_all_sms_title">Tüm SMS\'leri al</string>
   <string name="preferences__pref_all_mms_title">Tüm MMS\'leri al</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gelen tüm mesajların gösterimi ve saklanması için TextSecure kullan</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gelen tüm metin mesajları için TextSecure kullan</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gelen tüm multimedya mesajların gösterimi ve saklanması için TextSecure kullan</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gelen tüm medya mesajları için TextSecure kullan</string>
   <string name="preferences__input_settings">Girdi Ayarları</string>
   <string name="preferences__enable_enter_key_title">Enter tuşunu etkinleştir</string>
   <string name="preferences__replace_smiley_with_enter_key">Smiley tuşunu bir Enter tuşu ile değiştir</string>
@@ -557,8 +575,10 @@ başarısız.</string>
   <string name="preferences__change_passphrase">Parola Değiştir</string>
   <string name="preferences__change_my_passphrase">Parolamı değiştir</string>
   <string name="preferences__enable_passphrase">Parola etkinleştir</string>
+  <string name="preferences__passphrase_summary">Parola %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Mesaj ve anahtarların lokal şifrelenmesini etkinleştirr</string>
   <string name="preferences__screen_security">Ekran güvenliği</string>
+  <string name="preferences__screen_security_summary">Ekran güvenliği %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">En son listelerde ve uygulama içinde ekran görüntüsü alınmasını engelle</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Hafızadaki parolayı bir süre sonra unut</string>
   <string name="preferences__timeout_passphrase">Parola zaman aşımı</string>
@@ -606,6 +626,11 @@ başarısız.</string>
   <string name="preferences__advanced_mms_access_point_names">Manüel MMS ayarları</string>
   <string name="preferences__enable_manual_mms">Manüel MMS ayarlarını kullan</string>
   <string name="preferences__override_system_mms_settings">Sistem MMS ayarları yerine aşağıda bilgileri olanları kullan.</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">MMS Vekil Sunucu</string>
+  <string name="preferences__mms_proxy_port">MMS Vekil Bağlantı Noktası</string>
+  <string name="preferences__mmsc_username">MMSC Kullanıcı Adı</string>
+  <string name="preferences__mmsc_password">MMSC Şifresi</string>
   <string name="preferences__sms_delivery_reports">SMS iletim raporları</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Gönderdiğiniz her SMS için iletim raporu iste</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Bir konuşma konu başlığı belirlenmiş bir uzunluğu aşınca eski mesajları otomatik olarak sil</string>
@@ -621,21 +646,10 @@ başarısız.</string>
   <string name="preferences__default">Varsayılan</string>
   <string name="preferences__language">Dil</string>
   <string name="preferences__language_summary">Dil %s</string>
-  <string name="preferences__make_default_sms_app">Varsayılan SMS uygulaması olarak ayarla</string>
+  <string name="preferences__textsecure_messages">TextSecure mesajları</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure\'u varsayılan sisteem SMS/MMS uygulaması yap.</string>
-  <string name="preferences__use_data_channel">İtilen mesajlar</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını kullanarak gizliliğinizi artırın ve SMS ücretlerinden kaçının </string>
+TextSecure ve Signal kullanıcıları ile ücretsiz gizli mesajlaşma</string>
-  <string name="preferences__sms_fallback">Giden SMS/MMS</string>
   <string name="preferences__submit_debug_log">Hata ayıklama kaydı gönder</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure kullanıcıları</string>
-  <string name="preferences__sms_fallback_push_users_ask">önce sor</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">MMS yok</string>
-  <string name="preferences__sms_outgoing_push_users_description">Eğer veri bağlantısı kaybolursa güvenli SMS gönder</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">SMS/MMS göndermeden önce sor</string>
-  <string name="preferences__sms_fallback_never_send_mms">Hiçbir zaman MMS gönderme</string>
-  <string name="preferences__sms_fallback_non_push_users">TextSecure kullanıcısı olmayanlar</string>
-  <string name="preferences__sms_fallback_nobody">Hiç kimse</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' uyumluluk modu</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Eğer cihazınız WiFi üzerinden SMS/MMS iletimi kullanıyorsa etkinleştir (sadece cihazınızda \'WiFi Calling\' etkinleştirildiğinde etkinleştirin)</string>
   <!--****************************************-->
@@ -662,6 +676,7 @@ Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını ku
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Eki kaydet</string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">Davet et</string>
   <!--conversation_insecure_no_push-->
   <string name="conversation_insecure__menu_start_secure_session">Güvenli oturum başlat</string>
   <string name="conversation_insecure__security">Güvenlik</string>
@@ -671,6 +686,9 @@ Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını ku
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Ara</string>
   <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">Kişi Fotosu Resmi</string>
+  <string name="conversation_list_item_view__attachment_indicator">Ek Göstergesi</string>
+  <string name="conversation_list_item_view__error_alert">Hata uyarısı</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Yeni sohbet</string>
   <!--conversation_secure_verified-->
@@ -722,5 +740,6 @@ Diğer TextSecure kullanıcıları ile iletişiminiz için veri kanallarını ku
   <string name="trimmer__deleting_old_messages">Eski mesajlar siliniyor...</string>
   <string name="trimmer__old_messages_successfully_deleted">Eski mesajlar silindi</string>
   <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">Taşıma simgesi</string>
   <!--EOF-->
 </resources>

res/values-uk/strings.xml

@@ -292,8 +292,6 @@
   <!--plurals.xml-->
   <!--preferences.xml-->
   <string name="preferences__general">Загальні</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Використовувати TextSecure для перегляду та зберігання всіх вхідних текстових повідомлень</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Використовувати TextSecure для перегляду та зберігання всіх вхідних мультимедійних повідомлень</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Виберіть себе із списку контактів.</string>
   <string name="preferences__change_passphrase">Змінити фразу-ключ</string>
   <string name="preferences__change_my_passphrase">Змінити мою фразу-ключ</string>
@@ -337,10 +335,6 @@
   <string name="preferences__theme">Тема</string>
   <string name="preferences__default">Типово</string>
   <string name="preferences__language">Мова</string>
-  <string name="preferences__make_default_sms_app">Встановити типовою програмою для SMS</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Зробити TextSecure типовою програмою SMS/MMS вашої системи.</string>
-  <string name="preferences__use_data_channel">Використовувати передачу даних</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Використовувати мобільний інтернет для зв’язку з іншими користувачами TextSecure</string>
   <string name="preferences__submit_debug_log">Відіслати журнал відлагодження</string>
   <!--****************************************-->
   <!--menus-->

res/values-vi/strings.xml

@@ -20,9 +20,7 @@ Cảnh báo, điều này tắt mã hóa lưu trữ cho tất cả tin nhắn v
   <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
 Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn ra khỏi máy chủ. Bạn sẽ cần đăng ký lại số điện thoại để dùng tin nhắn đẩy trong tương lai.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Có lỗi kết nối vào máy chủ!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">Cho Phép SMS Gửi Vào</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Chạm vào để đổi ứng dụng SMS mặc định</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">Không Cho SMS Gửi Vào</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Chạm vào để chọn TextSecure làm ứng dụng SMS mặc định</string>
   <!--AppProtectionPreferenceFragment-->
   <!--DraftDatabase-->
@@ -374,11 +372,8 @@ TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</stri
   <!--plurals.xml-->
   <!--preferences.xml-->
   <string name="preferences__general">Tổng quát</string>
-  <string name="preferences__push_sms_category">Đẩy và SMS</string>
   <string name="preferences__pref_all_sms_title">Nhận tất cả SMS</string>
   <string name="preferences__pref_all_mms_title">Nhận tất cả MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Dùng TextScure để xem và lưu trữ tất cả tin nhắn gửi vào</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Dùng TextSecure để xem và lưu trữ tất cả tin nhắn đa phương tiện gửi vào</string>
   <string name="preferences__input_settings">Thiết Đặt Cách Nhập</string>
   <string name="preferences__enable_enter_key_title">Mở phím Enter</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Chọn khoản mục liên lạc của bạn trong danh sách liên lạc.</string>
@@ -427,16 +422,7 @@ TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</stri
   <string name="preferences__theme">Hình nền</string>
   <string name="preferences__default">Mặc định</string>
   <string name="preferences__language">Ngôn ngữ</string>
-  <string name="preferences__make_default_sms_app">Chọn làm ứng dụng SMS mặc định</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Chọn TextSecure làm ứng dụng SMS/MMS mặc định của hệ thống.</string>
-  <string name="preferences__use_data_channel">Tin nhắn đẩy</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-Tăng độ riêng tư và tránh cước SMS bằng cách dùng đường truyền internet để liên lạc với những người dùng TextSecure khác</string>
   <string name="preferences__submit_debug_log">Nạp ký sự gỡ lỗi</string>
-  <string name="preferences__sms_outgoing_push_users">Người dùng TextSecure</string>
-  <string name="preferences__sms_outgoing_push_users_description">Gửi qua SMS an toàn nếu đường truyền mạng bị đứt</string>
-  <string name="preferences__sms_fallback_non_push_users">Người không dùng TextSecure</string>
-  <string name="preferences__sms_fallback_nobody">Không ai</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-zh-rCN/strings.xml

@@ -23,19 +23,12 @@
 这将在服务器上注销您的号码以禁用推送信息。
 将来如果想再次使用推送信息您需要重新注册电话号码。</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">连接服务器错误！</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">已开启接收短信</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">点击来改变默认的短信应用</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">已停用接收短信</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">点击将TextSecure设定为默认的短信应用</string>
   <string name="ApplicationPreferencesActivity_on">开</string>
   <string name="ApplicationPreferencesActivity_On">开</string>
   <string name="ApplicationPreferencesActivity_off">关</string>
   <string name="ApplicationPreferencesActivity_Off">关</string>
-  <string name="ApplicationPreferencesActivity_partial">部分</string>
-  <string name="ApplicationPreferencesActivity_sms">短信</string>
-  <string name="ApplicationPreferencesActivity_mms">彩信</string>
-  <string name="ApplicationPreferencesActivity_incoming_sms_summary">已接收 %s</string>
-  <string name="ApplicationPreferencesActivity_outgoing_sms_summary">已发出 %s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d 分钟</string>
   <!--DraftDatabase-->
@@ -377,9 +370,7 @@
   <string name="contact_selection_recent_activity__no_recent_calls">没有最近呼叫。</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">发送 TextSecure 信息</string>
-  <string name="conversation_activity__type_message_sms_secure">发送安全短信</string>
   <string name="conversation_activity__type_message_sms_insecure">发送未加密的短信</string>
-  <string name="conversation_activity__type_message_mms_secure">发送安全彩信</string>
   <string name="conversation_activity__type_message_mms_insecure">发送未加密的彩信</string>
   <string name="conversation_activity__send">发送</string>
   <string name="conversation_activity__remove">删除</string>
@@ -557,11 +548,8 @@ TextSecure 在等待短信验证时超时。</string>
   <!--preferences.xml-->
   <string name="preferences__general">通用</string>
   <string name="preferences__sms_mms">短信和彩信</string>
-  <string name="preferences__push_sms_category">推送和短信</string>
   <string name="preferences__pref_all_sms_title">获得所有的短信</string>
   <string name="preferences__pref_all_mms_title">获得所有的彩信</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">使用 TextSecure 查看和存储接收到的所有文本消息</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">使用 TextSecure 查看和存储接收到的所有多媒体消息</string>
   <string name="preferences__input_settings">输入设置</string>
   <string name="preferences__enable_enter_key_title">开启进入密钥</string>
   <string name="preferences__replace_smiley_with_enter_key">使用输入的密钥替换相似的密钥</string>
@@ -644,21 +632,7 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="preferences__default">默认</string>
   <string name="preferences__language">语言</string>
   <string name="preferences__language_summary">语言 %s</string>
-  <string name="preferences__make_default_sms_app">设置为默认的短信应用</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">将TextSecure设置为默认的短信／彩信应用程序。</string>
-  <string name="preferences__use_data_channel">推送信息</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-与其他TextSecure用户通讯时使用数据链接以提高私密性并避免短信费用</string>
-  <string name="preferences__sms_fallback">正在导出短信/彩信</string>
   <string name="preferences__submit_debug_log">提交调试日志</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure 用户</string>
-  <string name="preferences__sms_fallback_push_users_ask">先询问</string>
-  <string name="preferences__sms_fallback_push_users_no_mms">没有彩信</string>
-  <string name="preferences__sms_outgoing_push_users_description">如果通讯中断，则以加密方式发送短信</string>
-  <string name="preferences__sms_fallback_ask_before_sending_sms_mms">发送短信/彩信前先询问</string>
-  <string name="preferences__sms_fallback_never_send_mms">永不发送彩信</string>
-  <string name="preferences__sms_fallback_non_push_users">非 TextSecure  用户</string>
-  <string name="preferences__sms_fallback_nobody">没有人</string>
   <string name="preferences__support_wifi_calling">“Wifi呼叫”兼容模式</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">如果您的设备使用 WiFi 来接受或发送短信，请启用此选项（仅当您的设备启用WiFi呼叫时启用）。</string>
   <!--****************************************-->

res/values-zh-rTW/strings.xml

@@ -25,9 +25,7 @@
         將來您若欲重新使用即時訊息，則須把您的手機號碼再重新註冊一次。
     </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">與伺服器的連線發生錯誤！</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">已開啟手機簡訊接收功能</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">按這裡來變更您預設的手機簡訊APP</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">已關閉手機簡按這裡來變更您預設的手機簡訊APP訊接收功能</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">按這裡將 TextSecure 設為預設的手機簡訊APP</string>
   <!--AppProtectionPreferenceFragment-->
   <!--DraftDatabase-->
@@ -333,8 +331,6 @@
   <string name="contact_selection_recent_activity__no_recent_calls">沒有最近通話。</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">傳送 TextSecure 加密訊息</string>
-  <string name="conversation_activity__type_message_sms_secure">傳送加密的手機簡訊</string>
-  <string name="conversation_activity__type_message_mms_secure">傳送加密的 MMS多媒體簡訊</string>
   <string name="conversation_activity__send">送出</string>
   <string name="conversation_activity__remove">移除</string>
   <string name="conversation_activity__window_description">與 %1$s 聊天</string>
@@ -477,11 +473,8 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <!--plurals.xml-->
   <!--preferences.xml-->
   <string name="preferences__general">一般</string>
-  <string name="preferences__push_sms_category">即時訊息與手機簡訊</string>
   <string name="preferences__pref_all_sms_title">接收所有手機簡訊</string>
   <string name="preferences__pref_all_mms_title">接收所有MMS多媒體簡訊</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">使用 TextSecure 來檢視與儲存所有接收到的文字簡訊</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">使用 TextSecure 來檢視與儲存所有接收到的多媒體簡訊</string>
   <string name="preferences__input_settings">輸入設定</string>
   <string name="preferences__enable_enter_key_title">啟用 Enter 鍵</string>
   <string name="preferences__replace_smiley_with_enter_key">把介面上的表情符號按鈕，換成 Enter 按鈕</string>
@@ -540,16 +533,7 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="preferences__theme">主題</string>
   <string name="preferences__default">預設</string>
   <string name="preferences__language">語言選項</string>
-  <string name="preferences__make_default_sms_app">設定為預設的手機簡訊 APP</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">將 TextSecure 設定為您系統預設的 SMS/MMS 應用程式。</string>
-  <string name="preferences__use_data_channel">即時訊息</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
-可提升隱私性，並且藉由與其他也使用 TextSecure 的使用這透過加密的連線通訊來節約手機簡訊費用。</string>
   <string name="preferences__submit_debug_log">送出偵錯紀錄</string>
-  <string name="preferences__sms_outgoing_push_users">TextSecure 使用者</string>
-  <string name="preferences__sms_outgoing_push_users_description">如果網路斷線，改送出付費的加密手機簡訊</string>
-  <string name="preferences__sms_fallback_non_push_users">非 TextSecure 使用者</string>
-  <string name="preferences__sms_fallback_nobody">無人</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->