From 91785e55900965fe2957120befb52bae7e82b143 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 23 Oct 2015 11:36:07 -0700
Subject: [PATCH] Updated language translations

// FREEBIE
---
 res/values-ar/strings.xml |  97 +++++++++++++++++++++++-
 res/values-cs/strings.xml |  26 +++----
 res/values-de/strings.xml |  30 ++++----
 res/values-fr/strings.xml |  75 ++++++++++---------
 res/values-hu/strings.xml |  10 +--
 res/values-in/strings.xml | 153 ++++++++++++++++++++------------------
 res/values-ko/strings.xml |   2 +-
 res/values-ro/strings.xml |  11 +++
 res/values-ru/strings.xml |  85 +++++++++++++++++++++
 res/values-vi/strings.xml | 101 +++++++++++++++++++++++++
 10 files changed, 448 insertions(+), 142 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 695f27be8..efbdb5521 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -68,11 +68,13 @@
   <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_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>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">بدء التشفير مع %s؟</string>
+  <string name="ConversationActivity_reset_secure_session_confirmation">تأكيد إعادة ضبط الجلسة الآمنة</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_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>
@@ -108,6 +110,7 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">تأكيد إلغاء حظر جهة الاتصال؟</string>
   <string name="ConversationActivity_unblock">إلغاء الحظر</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">حجم المرفق تجاوز الحد المسموح بهذا النوع من الرسائل.</string>
+  <string name="ConversationActivity_quick_camera_unavailable">الكاميرا غير موجودة</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">تفاصيل الرسالة</string>
   <string name="ConversationFragment_transport_s_sent_received_s">نقل: %1$s\nSent/Received: %2$s</string>
@@ -182,6 +185,7 @@
   <string name="GroupCreateActivity_group_name_hint">أسم المجموعة</string>
   <string name="GroupCreateActivity_actionbar_mms_title">مجموعة وسائط متعددة جديدة</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">قمت باختيار شخص لا يدعم مجوعات سيجنال وبالتالي ستكون مجموعة وسائط متعددة.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">أنت غير مسجل لاستخدام بيانات شبكة الجوال لذلك فإن مجموعات سيجنال معطلة.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">خطأ غير متوقع تسبب في تعذر إنشاء المجموعة.</string>
   <string name="GroupCreateActivity_contacts_no_members">تحتاج إلى شخص واحد على الأقل في المجموعة!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">لا يمكن قراءة رقم أحد أعضاء المجموعة بشكل صحيح. رجاء تصحيح أو حذف هذا العضو والمحاولة مرة أخرى.</string>
@@ -189,6 +193,7 @@
   <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">لا يمكن إضافة غير المستخدمين لسيجنال إلي مجموعة سيجنال حالية.</string>
   <string name="GroupCreateActivity_loading_group_details">تحميل بيانات المجموعة...</string>
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">أنا</string>
@@ -197,12 +202,12 @@
   <string name="ImportExportActivity_export">تصدير</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">استيراد قاعدة بيانات الرسائل من النظام؟</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">سوف يتم استيراد الرسائل النصية من النظام إلى سيجنال. إذا قمت بهذا من قبل، فأن الاستيراد مرة أخرى سيتسبب في تكرار الرسائل.</string>
+  <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_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
- استرجاع نسخة احتياطية مشفرة سوف يقوم باستبدال المفاتيح حالية والإعدادات والرسائل. ستفقد المعلومات الموجودة الآن في سيجنال وغير موجودة في النسخة الاحتياطية.</string>
+ استرجاع نسخة احتياطية مشفرة يقوم باستبدال المفاتيح حالية والإعدادات والرسائل. المعلومات الموجودة الآن في سيجنال وغير موجودة في النسخة الاحتياطية سوف تفقد.</string>
   <string name="ImportFragment_restore">استعادة</string>
   <string name="ImportFragment_import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة؟</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">سيتم استيراد رسائل غير مشفرة من نسخة احتياطية. إذا قمت سابقا باستيراد هذا الملف فسوف يؤدي الاستيراد مرة أخرى إلى تكرار الرسائل.</string>
@@ -227,12 +232,18 @@
   <string name="MmsDownloader_error_connecting_to_mms_provider">خطأ في الاتصال مع مزود خدمة رسالة الوسائط المتعددة...</string>
   <string name="MmsDownloader_error_reading_mms_settings">خطأ في قراءة إعدادات مزود خدمة رسائل الوسائط المتعددة...</string>
   <!--- NotificationBarManager-->
+  <string name="NotificationBarManager_signal_call_in_progress">مكالمة سيجنال</string>
+  <string name="NotificationBarManager_missed_call_from_s">مكالمة فائتة من %s</string>
+  <string name="NotificationBarManager_missed_signal_call">مكالمة سيجنال فائتة</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">رسالة وسائط متعددة</string>
   <!--MessageRecord-->
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">لقد استلمت رسالة مشفرة من إصدارة سيجنال قديمة وتوقف دعمها. من فضلك اطلب من الراسل الترقية إلي أحدث إصدار وإعادة إرسال الرسالة.</string>
   <string name="MessageRecord_left_group">لقد تركت المجموعة.</string>
   <string name="MessageRecord_updated_group">تم تحديث المجموعة.</string>
+  <string name="MessageRecord_s_called_you">%s قام بالاتصال</string>
+  <string name="MessageRecord_called_s">%s قام بالاتصال</string>
+  <string name="MessageRecord_missed_call_from">مكالمة فائتة من %s</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">العبارات السرية غير متطابقة!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">العبارة السرية القديمة غير صحيحة!</string>
@@ -255,6 +266,7 @@
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">عذرا، لديك أجهزة عديدة مقترنة حاليا. حاول إلغاء إقران بعضهم...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
+  <string name="PassphrasePromptActivity_watermark_content_description">أيقونة سيجنال</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">عبارة سرية غير صحيحة!</string>
   <!--PlayServicesProblemFragment-->
@@ -275,7 +287,28 @@
   <string name="RecipientPreferenceActivity_enabled">مفعل</string>
   <string name="RecipientPreferenceActivity_disabled">معطل</string>
   <!--RedPhone-->
+  <string name="RedPhone_answering">جارٍ الرد</string>
+  <string name="RedPhone_ending_call">جارٍ إنهاء المكالمة</string>
+  <string name="RedPhone_dialing">جارٍ الاتصال</string>
+  <string name="RedPhone_canceling_call">إلغاء المكالمة</string>
+  <string name="RedPhone_call_rejected">المكالمة رفضت</string>
+  <string name="RedPhone_ringing">رنين</string>
+  <string name="RedPhone_busy">مشغول</string>
+  <string name="RedPhone_connected">متصل</string>
+  <string name="RedPhone_connecting">جارٍ الاتصال</string>
+  <string name="RedPhone_handshake_failed">تأكيد الاتصال فشل!</string>
+  <string name="RedPhone_recipient_unavailable">المتلقي غير متاح</string>
+  <string name="RedPhone_performing_handshake">جارٍ تاكيد الاتصال</string>
+  <string name="RedPhone_network_failed">فشل في الشبكة!</string>
+  <string name="RedPhone_client_failed">فشل العميل</string>
+  <string name="RedPhone_fatal_error">خطأ فادح</string>
+  <string name="RedPhone_login_failed">تسجيل الدخول فشل!</string>
+  <string name="RedPhone_message_from_the_server">رسالة من الخادم</string>
+  <string name="RedPhone_number_not_registered">الرقم غير مسجل!</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">الرقم المطلوب لا يدعم مكالمات صوتية مشفرة!</string>
+  <string name="RedPhone_got_it">عُلم</string>
   <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_signal">سجل مع سيجنال</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">يجب عليك تحديد
@@ -310,9 +343,12 @@
   <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">الرقم مسجل بالفعل مع سيجنال (ربما سيانوجين مود؟). يجب إلغاء التسجيل هناك قبل التسجيل هنا.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">انتهى التسجيل</string>
+  <string name="RegistrationService_signal_registration_has_successfully_completed">عملية التسجيل في سيجنال تمت بنجاح.</string>
   <string name="RegistrationService_registration_error">خطأ في التسجيل</string>
+  <string name="RegistrationService_signal_registration_has_encountered_a_problem">عملية التسجيل في سيجنال واجهة مشكلة.</string>
   <!--Slide-->
   <string name="Slide_image">صورة</string>
   <string name="Slide_audio">صوت</string>
@@ -324,10 +360,15 @@
   <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_reset">إعادة ضبط جلسة آمنة.</string>
   <string name="SmsMessageRecord_duplicate_message">رسالة مكررة.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">ترك المجموعة...</string>
+  <string name="ThreadRecord_secure_session_reset">إعادة ضبط جلسة آمنة.</string>
   <string name="ThreadRecord_draft">مسودة:</string>
+  <string name="ThreadRecord_called">مكالمات صاردة</string>
+  <string name="ThreadRecord_called_you">مكالمات واردة</string>
+  <string name="ThreadRecord_missed_call">مكالمة فائتة</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">لا يوجد لديك مفتاح تعريفي.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">لا يوجد لدى الطرف الاخر مفتاح تعريفي.</string>
@@ -377,6 +418,9 @@
   <string name="ApplicationMigrationService_import_in_progress">جاري الاستيراد...</string>
   <string name="ApplicationMigrationService_importing_text_messages">استيراد رسائل نصية</string>
   <!--KeyCachingService-->
+  <string name="KeyCachingService_signal_passphrase_cached">المس للفتح.</string>
+  <string name="KeyCachingService_signal_passphrase_cached_with_lock">المس للفتح أو المس رمز القفل للإغلاق.</string>
+  <string name="KeyCachingService_passphrase_cached">سيجنال غير مقفول</string>
   <string name="KeyCachingService_lock">أقفل بالعبارة السرية</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d رسائل جديدة في %2$d محادثات</string>
@@ -392,8 +436,10 @@
   <string name="MessageNotifier_media_message">رسالة وسائط متعددة</string>
   <string name="MessageNotifier_reply">رَدّ</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">الردود السريعة غير متاحة عند قفل سيجنال!</string>
   <string name="QuickResponseService_problem_sending_message">مشكلة في الإرسال!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_signal_message">رسالة سيجنال جديدة.</string>
   <string name="SingleRecipientNotificationBuilder_contents_hidden">المحتويات مخفية</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">العبارة السرية القديمة:</string>
@@ -415,6 +461,7 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">إخطارات المحادثة مكتومة</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">أرسل رسالة سيجنال.</string>
   <string name="conversation_activity__type_message_sms_insecure">أرسل رسالة نصية غير آمنة</string>
   <string name="conversation_activity__type_message_mms_insecure">أرسل رسالة وسائط متعددة غير آمنة</string>
   <string name="conversation_activity__send">أرسل</string>
@@ -423,6 +470,7 @@
   <string name="conversation_activity__compose_description">تكوين الرسالة</string>
   <string name="conversation_activity__emoji_toggle_description">تبديل لوحة مفاتيح الرموز التعبيرية</string>
   <string name="conversation_activity__attachment_thumbnail">المصغّرة للمرفق</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">فتح درج المرفقات</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">جارٍ تنزيل رسالة الوسائط</string>
   <string name="conversation_item__mms_image_description">رسالة وسائط متعددة</string>
@@ -446,12 +494,14 @@
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">لا توجد أجهزة مقترنة...</string>
   <!--experience_upgrade_activity-->
+  <string name="experience_upgrade_activity__continue">استمر</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">هل تود استيراد الرسائل النصية الموجودة إلى قاعدة بيانات سيجنال المشفرة؟</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>
@@ -466,6 +516,8 @@
   <string name="import_fragment__import_the_database_from_the_default_system">استيراد قاعدة البيانات
 من تطبيق الرسائل الافتراضي لنظام التشغيل</string>
   <string name="import_fragment__import_encrypted_backup">استيراد نسخة احتياطية مشفرة</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">
+ استعادة نسخة احتياطية مشفرة من سيجنال.</string>
   <string name="import_fragment__import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 استيراد نسخة احتياطية غير مشفرة، متوافقة مع \"SMSBackup And Restore\".</string>
@@ -488,18 +540,28 @@
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">فتح القفل</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">يتطلب سيجنال إعدادات خدمة الوسائط المتعددة من أجل تسليم رسائل الوسائط المتعددة والمجموعات عبر شبكة الجوال. في بعض الأحوال لا تتاح هذه المعلومات مع الهواتف المقفولة أو ذات الإعدادات المقيدة.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">من اجل إرسال وسائط متعددة ورسائل إلى مجموعات أضغط على \"تم\" وأكمل الإعدادات المطلوبة. يمكن العثور على إعدادات رسائل الوسائط المتعددة الخاصة بمشغل شبكة الجوال الخاصة بك بالبحث عن \"أسم المشغل APN\". سوف تحتاج إلى القيام  بهذه الخطوة مرة واحدة.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">جهة الاتصال محظورة</string>
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">كتم المحادثة</string>
   <string name="recipient_preferences__disable_notifications_for_this_conversation">تعطيل الإشعارات لهذه المحادثة</string>
+  <string name="recipient_preferences__notification_tone">صوت التنبيه</string>
   <string name="recipient_preferences__vibrate">الاهتزاز</string>
   <string name="recipient_preferences__block">حظر</string>
   <string name="recipient_preferences__color">اللون</string>
   <string name="recipient_preferences__color_for_this_contact">اللون المخصص لجهة الاتصال</string>
+  <string name="recipient_preferences__verify_identity">تحقق من الهوية</string>
   <!--- redphone_call_controls-->
+  <string name="redphone_call_card__signal_call">مكالمة سيجنال</string>
+  <string name="redphone_call_controls__end_call">إنهاء المكالمة</string>
+  <string name="redphone_call_controls__audio">الصوت</string>
+  <string name="redphone_call_controls__mute">صامت</string>
+  <string name="redphone_call_controls__signal_call">مكالمة سيجنال</string>
   <!--registration_activity-->
+  <string name="registration_activity__verify_your_number_to_connect_with_signal">
+ تحقق من رقم تليفونك للاتصال بسيجنال</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>
@@ -510,23 +572,38 @@
   <string name="registration_problems__some_possible_problems_include">بعض المشاكل المحتملة
 وتتضمن:</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>
   <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__signal_will_not_work_with_google_voice_numbers">
+سيجنال لن يعمل مع أرقام Google Voice.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">التحقق الصوتي</string>
+  <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
+ يمكن لسيجنال الاتصال بك للتحقق من رقمك. أضغط \"أتصل بي\" وقم بكتابة الكود الذي سوف تسمعه والمكون من 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__signal_was_unable_to_connect_to_the_push_service">
+سيجنال غير قادر على الاتصال بخدمة دفع الوصول إلى الرسائل.</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">الجهاز في حاجة إلى اتصال بالشبكة من أجل استخدام هذه الخاصية من سيجنال. تأكد من الاتصال ببيانات شبكة الجوال أو 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 من المحتمل وجود جدار ناري يمنع النفاذ إلى خادم سيجنال. قم بتجربة شبكة أخرى أو بيانات شبكة الجوال.</string>
+  <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+ سيقوم سيجنال الآن بالتحقق من رقم هاتفك آليا بواسطة رسالة نصية.</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>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">هذا قد يستغرق لحظات. الرجاء التحلي بالصبر وسنقوم بإخطارك عند إتمام التحقق.</string>
+  <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">
+ انتهت مهلة سيجنال لانتظار رسالة التحقق.</string>
   <string name="registration_progress_activity__sms_verification_failed">فشل التحقق بواسطة رسالة.</string>
   <string name="registration_progress_activity__generating_keys">توليد المفتاح جارِ...</string>
   <string name="registration_progress_activity__alert">تنبيه</string>
@@ -550,6 +627,7 @@
   <string name="AndroidManifest__create_passphrase">إنشاء عبارة سرية</string>
   <string name="AndroidManifest__enter_passphrase">أدخل العبارة السرية</string>
   <string name="AndroidManifest__select_contacts">اخر جهات الاتصال</string>
+  <string name="AndroidManifest__signal_detected">تم العثور على سيجنال</string>
   <string name="AndroidManifest__public_identity_key">مفتاح الهوية العلني</string>
   <string name="AndroidManifest__change_passphrase">غير العبارة السرية</string>
   <string name="AndroidManifest__verify_identity">تحقق من الهوية</string>
@@ -591,6 +669,8 @@
   <string name="preferences__sms_mms">رسالة نصية ورسالة وسائط متعددة</string>
   <string name="preferences__pref_all_sms_title">اإستقبال كل الرسائل النصية</string>
   <string name="preferences__pref_all_mms_title">استقبال كل رسائل الوسائط المتعددة</string>
+  <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages">استخدم سيجنال لجميع الرسائل النصية الواردة</string>
+  <string name="preferences__use_signal_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>
@@ -676,6 +756,8 @@
   <string name="preferences__language">اللغة</string>
   <string name="preferences__language_summary">اللغة %s</string>
   <string name="preferences__signal">سيجنال</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_signal_users">
+ رسائل ومكالمات مجانية وآمنة مع مستخدمي سيجنال</string>
   <string name="preferences__submit_debug_log">إرسال سجل التصحيح</string>
   <string name="preferences__support_wifi_calling">وضع التوافق مع \'مكالمات الواي فاي\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">يمكنك تفعيل الخاصية إذا كان هاتفك يدعم خاصية WiFi Calling لتسليم الرسائل النصية والوسائط المتعددة ( قم بالتفعيل فقط في حال تفعيل WiFi Calling بهاتفك)</string>
@@ -687,12 +769,14 @@
   <string name="preferences_chats__media_auto_download">تنزلي تلقائي للوسائط</string>
   <string name="preferences_chats__message_trimming">تقليم الرسالة</string>
   <string name="preferences_advanced__use_system_emoji">استخدام الرموز التعبيرية بالنظام</string>
+  <string name="preferences_advanced__disable_signal_built_in_emoji_support">تعطيل الرموز التعبيرية المدمجة في سيجنال</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_signal_users">مستخدمي سيجنال</string>
   <string name="contact_selection_list__header_other">جهات الاتصال</string>
   <string name="contact_selection_list__unknown_contact">رسالة جديدة إلى...</string>
   <!--contact_selection-->
@@ -727,6 +811,7 @@
   <!--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_reset_secure_session">إعادة ضبط جلسة آمنة</string>
   <!--conversation_muted-->
   <string name="conversation_muted__unmute">إلغاء الكتم.</string>
   <!--conversation_unmuted-->
@@ -758,10 +843,13 @@
   <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">لقد انتهت صلاحية هذه النسخة من سيجنال!</string>
   <string name="reminder_header_expired_build_details">رجاء التحديث لآخر إصداره من التطبيق. لن ترسل الرسائل بنجاح بعد الآن.</string>
   <string name="reminder_header_sms_default_title">اجعله التطبيق الافتراضي المستخدم للرسائل؟</string>
+  <string name="reminder_header_sms_default_text">المس لجعل سيجنال التطبيق الافتراضي للرسائل.</string>
   <string name="reminder_header_sms_import_title">استيراد رسائل النظام؟</string>
   <string name="reminder_header_sms_import_text">أضغط لنسخ الرسائل النصية القصيرة على الهاتف إلى قاعدة البيانات المشفرة.</string>
+  <string name="reminder_header_push_title">تفعيل رسائل سيجنال؟</string>
   <string name="reminder_header_push_text">أنقر من أجل تراسل لحظي،  خصوصية أقوي، وبدون رسوم الرسائل النصية.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">أنت</string>
@@ -772,6 +860,9 @@
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">معاينة الصورة</string>
   <!--redphone_audio_popup_menu-->
+  <string name="redphone_audio_popup_menu__handset">سماعة هاتف</string>
+  <string name="redphone_audio_popup_menu__headset">سماعة رأس</string>
+  <string name="redphone_audio_popup_menu__speaker">مكبر صوت</string>
   <!--Trimmer-->
   <string name="trimmer__deleting">جارٍ الحذف</string>
   <string name="trimmer__deleting_old_messages">جار حذف الرسائل القديمة...</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 036310928..1e616ea60 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -19,11 +19,11 @@ Zakázat uzamčení obrazovky zpráv?</string>
   <string name="ApplicationPreferencesActivity_unregistering">Rušení registrace</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Odregistrace Signal zpráv...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages">Zakázat Signal zprávy?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">Tímto zakážete Signal zprávy odregistrací ze serveru. Abyste mohli používat Signal zprávy v budoucnosti, budete muset znovu registrovat vaše telefonní číslo.</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">Tímto zakážete Signal zprávy odregistrací ze serveru. Abyste mohli používat Signal zprávy v budoucnosti, budete muset znovu registrovat svoje telefonní číslo.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba při připojování k serveru!</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">SMS zazány</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS zakázány</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Dotykem nastavíte Signal jako výchozí SMS aplikaci</string>
   <string name="ApplicationPreferencesActivity_on">zap.</string>
   <string name="ApplicationPreferencesActivity_On">Zap.</string>
@@ -37,7 +37,7 @@ Zakázat uzamčení obrazovky zpráv?</string>
   <string name="DraftDatabase_Draft_audio_snippet">(audio)</string>
   <string name="DraftDatabase_Draft_video_snippet">(video)</string>
   <!--AttchmentManager-->
-  <string name="AttachmentManager_cant_open_media_selection">Nemohu nalézt aplikaci pro vybraný typ dat</string>
+  <string name="AttachmentManager_cant_open_media_selection">Nemohu nalézt aplikaci pro vybraný typ dat.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Foto</string>
@@ -53,7 +53,7 @@ Zakázat uzamčení obrazovky zpráv?</string>
  klíč %1$s se změnil. To může být způsobeno tím že se někdo snaží odpolechnout vaši komunikaci, nebo %2$s přeinstaloval aplikaci Signal a nyní má nový klíč.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Možná budete chtít ověřit tento
 kontakt</string>
-  <string name="ConfirmIdentityDialog_accept">Akceptovat</string>
+  <string name="ConfirmIdentityDialog_accept">Přijmout</string>
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Zpráva %s</string>
   <!--ConversationItem-->
@@ -63,14 +63,14 @@ kontakt</string>
   <string name="ConversationItem_view_secure_media_question">Zobrazit zabezpečená média?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tato média byla uložena v zašifrované databázi. Aby bylo možné je zobrazit v jiném programu, musí být dočasně dešifrována a v dešifrované podobě uložena. Opravdu to chcete udělat?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Chyba při předávání klíčů.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Byl vám doručen klíč, klepněte pro jeho přijetí</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Byl vám doručen klíč, klepněte pro jeho přijetí.</string>
   <string name="ConversationItem_group_action_left">%1$s opustil(a) skupinu.</string>
   <string name="ConversationItem_click_for_details">Klikněte pro detail</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Kliněte pro nešifrovaný záložní způsob</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Použít záložní způsob přes nešifrovanou SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Použít záložní způsob přes nešifrovanou MMS?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tato zpráva <b>není</b> šifrována protože příjemce již není uživatelem Signal.\n\nOdeslat nešifrovanou zprávu?</string>
-  <string name="ConversationItem_unable_to_open_media">Nemohu nalézt aplikaci pro otevření tohoto typu dat</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tato zpráva <b>není</b> šifrována, protože příjemce již není uživatelem Signal.\n\nOdeslat nešifrovanou zprávu?</string>
+  <string name="ConversationItem_unable_to_open_media">Nemohu nalézt aplikaci pro otevření tohoto typu dat.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Zahájit šifrovanou komunikaci?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Zahájit šifrovanou komunikaci s %s?</string>
@@ -83,8 +83,8 @@ kontakt</string>
   <string name="ConversationActivity_compose_message">Napište zprávu</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Omlouváme se, ale došlo k chybě při zpracování přílohy</string>
   <string name="ConversationActivity_the_gif_you_selected_was_too_big">Vybraný gif je příliš velký!</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Omlouvám se, vybrané video překračuje maximální povolenou velikost (%1$skB)</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Omlouvám se, vybrané audio překračuje maximální povolenou velikost (%1$skB)</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Omlouvám se, vybrané video překračuje maximální povolenou velikost (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Omlouvám se, vybrané audio překračuje maximální povolenou velikost (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Adresa příjemce není ve správném tvaru! (sms či email)</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Zpráva je prázdná!</string>
   <string name="ConversationActivity_group_members">Členové skupiny</string>
@@ -105,7 +105,7 @@ kontakt</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Použít pro rozhovor: %s</string>
   <string name="ConversationActivity_error_leaving_group">Chyba při opouštění skupiny.</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS nejsou podporovány</string>
-  <string name="ConversationActivity_mms_not_supported_message">Zpráva nemůže být odeslána protože váš operátor nepodporuje MMS.</string>
+  <string name="ConversationActivity_mms_not_supported_message">Zpráva nemůže být odeslána, protože váš operátor nepodporuje MMS.</string>
   <string name="ConversationActivity_specify_recipient">Vyberte prosím kontakt</string>
   <string name="ConversationActivity_unblock_question">Odblokovat?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Opravdu chcete odblokovat tento kontakt?</string>
@@ -119,7 +119,7 @@ kontakt</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 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_this_media_has_been_stored_in_an_encrypted_database_warning">Uložením dat do paměti k nim umožníte přístup kterékoliv aplikaci ve svém telefonu.\n\nPokračovat?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Chyba při ukládání přílohy!</string>
   <string name="ConversationFragment_success_exclamation">Úspěšně dokončeno!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nelze uložit data do paměti.</string>
@@ -633,7 +633,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="verify_identity_activity__their_identity_they_read">Jejich identita (čtou)</string>
   <string name="verify_identity_activity__your_identity_you_read">Vaše identita (čtete):</string>
   <!--message_details_header-->
-  <string name="message_details_header__issues_need_your_attention">Některé problémy vyžadujíé vaši pozornost</string>
+  <string name="message_details_header__issues_need_your_attention">Některé problémy vyžadují vaši pozornost</string>
   <string name="message_details_header__sent">Odesláno</string>
   <string name="message_details_header__received">Přijato</string>
   <string name="message_details_header__via">Přes</string>
@@ -657,7 +657,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__my_identity_key">Můj identifikační klíč</string>
-  <string name="arrays__use_default">Použít defualtní</string>
+  <string name="arrays__use_default">Použít výchozí</string>
   <string name="arrays__use_custom">Použít vlastní</string>
   <string name="arrays__mute_for_one_hour">Ztišit na 1 hodinu</string>
   <string name="arrays__mute_for_two_hours">Ztišit na 2 hodiny</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 12353c10f..b70560cb0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,7 +14,7 @@
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
-TextSecure und Benachrichtigungen dauerhaft entsperren.</string>
+Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <string name="ApplicationPreferencesActivity_unregistering">Registrierung löschen</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Signal-Registrierung wird gelöscht …</string>
@@ -75,7 +75,7 @@ Sie werden Ihre Rufnummer erneut registrieren müssen, um Signal-Nachrichten zuk
   <string name="ConversationActivity_initiate_secure_session_question">Sichere Sitzung starten?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Sichere Sitzung mit %s starten?</string>
   <string name="ConversationActivity_reset_secure_session_confirmation">Verschlüsselung neu starten?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question">Die Verschlüsselung neu starten.</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question">Derzeit bestehende sichere Sitzung beenden und anlässlich der nächsten Nachricht eine neue aufbauen. Hilfreich bei Problemen mit der Verschlüsselung.</string>
   <string name="ConversationActivity_delete_thread_confirmation">Unterhaltung löschen?</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Diese Unterhaltung unwiderruflich löschen.</string>
   <string name="ConversationActivity_add_attachment">Anhang hinzufügen</string>
@@ -135,7 +135,7 @@ Sie werden Ihre Rufnummer erneut registrieren müssen, um Signal-Nachrichten zuk
   <string name="ConversationListActivity_search">Suchen …</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Unterhaltungen löschen?</string>
-  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ALLE ausgewählten Unterhaltungen werden unwiderruflich gelöscht.</string>
+  <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">ALLE ausgewählten Unterhaltungen unwiderruflich löschen.</string>
   <string name="ConversationListFragment_deleting">Löschen</string>
   <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht …</string>
   <!--ConversationListItem-->
@@ -203,14 +203,14 @@ Sie werden Ihre Rufnummer erneut registrieren müssen, um Signal-Nachrichten zuk
   <string name="ImportExportActivity_export">Exportieren</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">System-SMS importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Importiert Nachrichten aus der Standard-SMS-Datenbank in Signal. Falls Sie dies schon einmal gemacht haben, wird es zu doppelten Nachrichten kommen.</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Nachrichten aus der Standard-SMS-Datenbank in Signal importieren. Falls Sie dies schon einmal gemacht haben, wird es zu doppelten Nachrichten kommen.</string>
   <string name="ImportFragment_import">Importieren</string>
   <string name="ImportFragment_cancel">Abbruch</string>
   <string name="ImportFragment_restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen?</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt Ihre bestehenden Schlüssel, Einstellungen und Nachrichten. Sie werden jegliche Informationen Ihrer jetzigen Signal-Installation verlieren, die nicht in dieser Datensicherung enthalten sind.</string>
   <string name="ImportFragment_restore">Wiederherstellen</string>
   <string name="ImportFragment_import_plaintext_backup">Klartextsicherung importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Importiert Nachrichten aus einer Klartext-Datensicherung in TextSecure. Falls Sie bereits zuvor diese Datensicherung importiert haben, wird es zu doppelten Nachrichten kommen.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Nachrichten aus einer Klartext-Datensicherung in Signal importieren. Falls Sie bereits zuvor diese Datensicherung importiert haben, wird es zu doppelten Nachrichten kommen.</string>
   <string name="ImportFragment_importing">Importieren</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Klartextsicherung wird importiert …</string>
   <string name="ImportFragment_no_plaintext_backup_found">Keine Klartextsicherung gefunden!</string>
@@ -236,7 +236,7 @@ Sie werden Ihre Rufnummer erneut registrieren müssen, um Signal-Nachrichten zuk
   <string name="NotificationBarManager_missed_call_from_s">Verpasster Anruf von %s</string>
   <string name="NotificationBarManager_missed_signal_call">Verpasster Signal-Anruf</string>
   <!--NotificationMmsMessageRecord-->
-  <string name="NotificationMmsMessageRecord_multimedia_message">Mediennachricht</string>
+  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedianachricht</string>
   <!--MessageRecord-->
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Die empfangene Nachricht wurde mit einer veralteten Version von Signal verschlüsselt, die nicht mehr unterstützt wird. Bitten Sie den Kontakt, Signal zu aktualisieren und die Nachricht erneut zu senden.</string>
   <string name="MessageRecord_left_group">Sie haben die Gruppe verlassen.</string>
@@ -426,7 +426,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="MessageNotifier_most_recent_from_s">Neueste von: %1$s</string>
   <string name="MessageNotifier_locked_message">Gesperrte Nachricht …</string>
   <string name="MessageNotifier_media_message_with_text">Mediennachricht: %s</string>
-  <string name="MessageNotifier_no_subject">(Kein Betreff)</string>
+  <string name="MessageNotifier_no_subject">(ohne Text)</string>
   <string name="MessageNotifier_message_delivery_failed">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_error_delivering_message">Nachrichtenübermittlung fehlgeschlagen.</string>
@@ -464,7 +464,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS schreiben</string>
   <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS schreiben</string>
   <string name="conversation_activity__send">Senden</string>
-  <string name="conversation_activity__remove">Löschen</string>
+  <string name="conversation_activity__remove">Entfernen</string>
   <string name="conversation_activity__window_description">Unterhaltung mit %1$s</string>
   <string name="conversation_activity__compose_description">Nachricht verfassen</string>
   <string name="conversation_activity__emoji_toggle_description">Emoji-Tastatur aktivieren</string>
@@ -479,7 +479,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="conversation_item_sent__downloading">Herunterladen</string>
   <string name="conversation_item_sent__send_failed_indicator_description">Senden fehlgeschlagen</string>
   <string name="conversation_item_sent__pending_approval_description">Bestätigung ausstehend</string>
-  <string name="conversation_item_sent__delivered_description">Übermittelt</string>
+  <string name="conversation_item_sent__delivered_description">Zugestellt</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Herunterladen</string>
   <string name="conversation_item_received__contact_photo_description">Kontaktbild</string>
@@ -495,9 +495,9 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">Fortsetzen</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Entweder konnte kein Diagnoseprotokoll vom Gerät gelesen werden oder es gab Probleme dieses an den Server zu senden. Wenn Sie sicher sind, dass das Gerät mit dem Internet verbunden ist, können Sie versuchen das Protokoll mit ADB auszulesen.</string>
+  <string name="log_submit_activity__log_fetch_failed">Entweder konnte kein Diagnoseprotokoll vom Gerät gelesen werden oder es gab Probleme, dieses an den Server zu senden. Wenn Sie sicher sind, dass das Gerät mit dem Internet verbunden ist, können Sie versuchen, das Protokoll mit ADB auszulesen.</string>
   <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
-  <string name="log_submit_activity__submitting">Versenden</string>
+  <string name="log_submit_activity__submitting">Übermitteln</string>
   <string name="log_submit_activity__posting_logs">Diagnoseprotokoll wird übermittelt …</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Möchten Sie Ihre vorhandenen Nachrichten in Signals verschlüsselte Datenbank importieren?</string>
@@ -581,7 +581,7 @@ Signal funktioniert nicht mit Google Voice-Rufnummern.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Überprüfung durch Anruf</string>
   <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
-Signal kann Sie zur Überprüfung Ihrer Rufnummer auch anrufen. Tippen Sie auf „Anrufen“ und geben Sie die sechs gehörten Ziffern ein.</string>
+Signal kann Sie zur Überprüfung Ihrer Rufnummer auch anrufen. Tippen Sie auf „Anrufen“ und geben Sie unten den gehörten sechsstelligen Code ein.</string>
   <string name="registration_progress_activity__verify">Überprüfen</string>
   <string name="registration_progress_activity__call_me">Mich anrufen</string>
   <string name="registration_progress_activity__edit_number">Rufnummer bearbeiten</string>
@@ -677,7 +677,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__change_my_passphrase">Ihr Passwort ändern</string>
   <string name="preferences__enable_passphrase">Passwort aktivieren</string>
   <string name="preferences__passphrase_summary">Passwort %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">TextSecure und Benachrichtigungen mit Passwort sperren</string>
+  <string name="preferences__enable_lock_screen_for_messages">Signal und Benachrichtigungen mit Passwort sperren</string>
   <string name="preferences__screen_security">Bildschirmschutz</string>
   <string name="preferences__screen_security_summary">Bildschirmschutz %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bildschirmfotos in der Anwendung und der Liste der letzten Anwendungen blockieren</string>
@@ -834,11 +834,11 @@ Kostenlos und verschlüsselt mit Signal-Nutzern Nachrichten austauschen und tele
   <string name="text_secure_normal__menu_new_message">Neue Unterhaltung</string>
   <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
   <string name="text_secure_normal__menu_settings">Einstellungen</string>
-  <string name="text_secure_normal__menu_clear_passphrase">TextSecure sperren</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Signal sperren</string>
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Ihre Version von Signal ist veraltet!</string>
-  <string name="reminder_header_expired_build_details">Das Versenden von Nachrichten ist nicht mehr möglich. Bitte TextSecure auf die neueste Version aktualisieren.</string>
+  <string name="reminder_header_expired_build_details">Das Versenden von Nachrichten ist nicht mehr möglich. Bitte Signal auf die neueste Version aktualisieren.</string>
   <string name="reminder_header_sms_default_title">Als Standard-SMS-App verwenden?</string>
   <string name="reminder_header_sms_default_text">Antippen, um Signal als Standard-SMS-App zu verwenden.</string>
   <string name="reminder_header_sms_import_title">SMS des Telefons importieren?</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b2b798896..51c99d75b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -10,22 +10,24 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Vous n’avez pas encore défini de phrase de passe !</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s messages par conversation</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Supprimer tous les anciens messages maintenant ?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sûr de vouloir réduire toutes les conversations aux %s messages les plus récents ?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sûr de ne vouloir garder que les %s messages les plus récents de chaque conversation ?</string>
   <string name="ApplicationPreferencesActivity_delete">Supprimer</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Désactiver la phrase de passe ?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
 Désactiver l\'écran de protection des messages ?
 </string>
   <string name="ApplicationPreferencesActivity_disable">Désactiver</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Annulation de l\'enregistrement</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Annulation de l\'enregistrement aux messages Signal...</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Annulation de l\'inscription</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Annulation de l\'inscription aux messages Signal...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages">Désactiver les messages Signal ?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">Ceci va désactiver les messages Signal en vous désinscrivant du serveur. Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages Signal dans le futur.</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur distant!</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 Désactivé</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Appuyez pour faire de Signal votre application SMS par défaut</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">
+Ceci va désactiver les messages Signal en vous désinscrivant du serveur.
+Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages Signal.</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur !</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS activés</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Modifier votre application SMS par défaut</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS désactivés</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Faire de Signal 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>
@@ -48,8 +50,9 @@ Désactiver l\'écran de protection des messages ?
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Contacts bloqués</string>
   <!--CallScreen-->
+  <string name="CallScreen_Incoming_call">Appel entrant</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">La signature de %1$s a changée. Cela peut signifier que quelqu’un essaye d\'intercepter vos communications, ou simplement que %2$s a réinstalle Signal et possède maintenant une nouvelle clé.</string>
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">La signature de %1$s a changée. Cela peut signifier que quelqu’un essaye d\'intercepter vos communications, ou simplement que %2$s a réinstallé Signal et possède maintenant une nouvelle clé.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Vous devriez
 vérifier ce contact.</string>
   <string name="ConfirmIdentityDialog_accept">Accepter</string>
@@ -68,11 +71,13 @@ vérifier ce contact.</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Appuyez pour utiliser la solution de repli non sécurisée</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Utiliser la solution de repli sur les SMS non chiffrés ?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Utiliser la solution de repli sur les MMS non chiffrés ?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ce message ne peut <b>pas</b> être encrypte par ce que le récepteur n\'a plus Signal. \n\nEnvoyer un message non sécurisé?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ce message ne sera <b>pas</b> être chiffré, car le récepteur n\'a plus Signal. \n\nEnvoyer un message non sécurisé?</string>
   <string name="ConversationItem_unable_to_open_media">Impossible de trouver une application pour ouvrir le média.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Initier une session sécurisée ?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initier une session sécurisée avec %s ?</string>
+  <string name="ConversationActivity_reset_secure_session_confirmation">Confirmation de la réinitialisation de la session sécurisée</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question">Êtes-vous sûr de vouloir réinitialiser cette session sécurisée ?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirmation de la suppression du fil de discussion</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Êtes-vous sûr de vouloir supprimer définitivement cette conversation ?</string>
   <string name="ConversationActivity_add_attachment">Ajouter une pièce jointe</string>
@@ -107,19 +112,19 @@ vérifier ce contact.</string>
   <string name="ConversationActivity_unblock_question">Débloquer ?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Êtes-vous sur de vouloir débloquer ce contact ?</string>
   <string name="ConversationActivity_unblock">Débloquer</string>
-  <string name="ConversationActivity_attachment_exceeds_size_limits">La taille du fichier dépasse la limite pour le type de message que vous avez sélectionné.</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Le fichier dépasse la limite de taille pour le type de message que vous avez sélectionné.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Appareil photo non disponible</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Détails du message</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nEnvoyé/Reçu: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Émetteur: %1$s\nTransport: %2$s\nEnvoyé: %3$s\nReçu: %4$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Émetteur : %1$s\nTransport : %2$s\nEnvoyé : %3$s\nReçu : %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmer la suppression du message</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Êtes-vous sûr de vouloir supprimer de façon permanente les messages sélectionnés ?</string>
   <string name="ConversationFragment_save_to_sd_card">Enregistrer dans l\'espace de stockage ?</string>
-  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">La sauvegarde de média dans l\'espace de stockage autorisera d\'autres applications à y accéder.\n\n Continuer ?</string>
-  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Erreur lors de l\'enregistrement de la pièce jointe sur l\'espace de stockage!</string>
+  <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">La sauvegarde du média dans l\'espace de stockage autorisera d\'autres applications à y accéder.\n\nContinuer ?</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Erreur lors de l\'enregistrement de la pièce jointe sur l\'espace de stockage !</string>
   <string name="ConversationFragment_success_exclamation">Réussite !</string>
-  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Impossible d’écrire dans l\'espace de stockage!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Impossible d’écrire dans l\'espace de stockage !</string>
   <string name="ConversationFragment_saving_attachment">Enregistrement de la pièce jointe</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Enregistrement de la pièce jointe dans l\'espace de stockage…</string>
   <string name="ConversationFragment_pending">En attente…</string>
@@ -161,13 +166,13 @@ vérifier ce contact.</string>
   <!--ExperienceUpgradeActivity-->
   <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Bienvenue sur Signal.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">TextSecure et RedPhone forment maintenant une seule application de messagerie privée pour toutes les situations : Signal.</string>
-  <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Bienvenue sur Signal!</string>
+  <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Bienvenue sur Signal !</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">TextSecure devient Signal.</string>
-  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure et RedPhone forment maintenant une seule application : Signal. Tapez pour découvrir.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure et RedPhone forment maintenant une seule application : Signal. Appuyez pour découvrir.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exporter</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exporter en clair vers la carte SD ?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attention, cela exportera en clair tout le contenu de vos messages Signal vers la carte SD.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attention, ceci exportera en clair tout le contenu de vos messages Signal vers la carte SD.</string>
   <string name="ExportFragment_cancel">Annuler</string>
   <string name="ExportFragment_exporting">Exportation</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportation en clair vers la carte SD...</string>
@@ -175,8 +180,8 @@ vérifier ce contact.</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Erreur durant l\'écriture sur la carte SD.</string>
   <string name="ExportFragment_success">Réussite !</string>
   <!--GcmRefreshJob-->
-  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Échec de communication Signal permanente !</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">La communication via le canal de données a été désactivée car Signal n\'a pas pu s\'enregistrer aurpès de Google Play Services. Veuillez essayer de vous enregistrer à nouveau à partir du menu Paramètres de Signal.</string>
+  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Échec de communication Signal permanent !</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">La communication via le canal de données a été désactivée car Signal n\'a pas pu s\'enregistrer auprès de Google Play Services. Veuillez essayer de vous enregistrer à nouveau à partir du menu Paramètres de Signal.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nouveau groupe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Mettre à jour le groupe</string>
@@ -240,7 +245,7 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Le message reçu a été chiffré via une ancienne version de Signal, qui n\'est plus prise en charge. Merci de demander à l’expéditeur de mettre à jour Signal dans sa version la plus récente et de renvoyer le message.</string>
   <string name="MessageRecord_left_group">Vous avez quitté le groupe.</string>
   <string name="MessageRecord_updated_group">Groupe mis à jour.</string>
-  <string name="MessageRecord_s_called_you">%s a appelé</string>
+  <string name="MessageRecord_s_called_you">%s vous a appelé</string>
   <string name="MessageRecord_called_s">Appelé %s</string>
   <string name="MessageRecord_missed_call_from">Apple manqué de %s</string>
   <!--PassphraseChangeActivity-->
@@ -295,7 +300,7 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="RedPhone_ringing">Sonnerie</string>
   <string name="RedPhone_busy">Occupé</string>
   <string name="RedPhone_connected">Connecté</string>
-  <string name="RedPhone_connecting">Connection</string>
+  <string name="RedPhone_connecting">Connexion</string>
   <string name="RedPhone_handshake_failed">La négociation de la connexion a échoué !</string>
   <string name="RedPhone_recipient_unavailable">Destinataire indisponible</string>
   <string name="RedPhone_performing_handshake">Exécution de la négociation de la connexion</string>
@@ -358,7 +363,7 @@ cet appareil n\'est pas supporté pour la messagerie sur le canal de données. L
   <!--Slide-->
   <string name="Slide_image">Image</string>
   <string name="Slide_audio">Audio</string>
-  <string name="Slide_video">Video</string>
+  <string name="Slide_video">Vidéo</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Une clé corrompue a été reçue
 Message d\'échange!</string>
@@ -367,9 +372,11 @@ Réception d\'un message d\'échange de clés pour une version invalide du proto
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'accepter et l\'afficher.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Nouvelle information d\'identité mise à jour mais inconnue reçue. Appuyez pour valider l\'identité.</string>
+  <string name="SmsMessageRecord_secure_session_reset">Session sécurisée réinitialisée.</string>
   <string name="SmsMessageRecord_duplicate_message">Message doublon.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Groupe quitté…</string>
+  <string name="ThreadRecord_secure_session_reset">Session sécurisée réinitialisée.</string>
   <string name="ThreadRecord_draft">Brouillon:</string>
   <string name="ThreadRecord_called">Vous avez appelé</string>
   <string name="ThreadRecord_called_you">Vous a appelé</string>
@@ -441,7 +448,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="MessageNotifier_media_message">Message média</string>
   <string name="MessageNotifier_reply">Répondre</string>
   <!--QuickResponseService-->
-  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La réponse rapide n\'est pas disponible lorsque Signal est verrouillé!</string>
+  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La réponse rapide n\'est pas disponible lorsque Signal est verrouillé !</string>
   <string name="QuickResponseService_problem_sending_message">Erreur lors de l\'envoi du message !</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_new_signal_message">Nouveau message Signal</string>
@@ -544,7 +551,7 @@ Importer un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup An
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Déverrouiller</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal requiert que vos paramètres MMS envoient les contenus médias et les messages de groupe à l\'aide de votre opérateur mobile. Votre appareil ne met pas cette information à disposition, ce qui est parfois vrai pour les appareils verrouillés et/ou autres configurations restrictives.</string>
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal requiert que vos paramètres MMS envoient les contenus média et les messages de groupe à l\'aide de votre opérateur mobile. Votre appareil ne met pas cette information à disposition, ce qui est parfois vrai pour les appareils verrouillés et/ou autres configurations restrictives.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pour envoyer des médias et messages groupés, cliquez « OK » et renseignez les paramètres demandés. Les paramètres MMS de votre fournisseur peuvent en général être trouvés en recherchant « APN votre fournisseur ». Vous aurez besoin de faire cela seulement une fois.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BLOQUÉ</string>
@@ -580,7 +587,7 @@ sont:</string>
   <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
 Certains clients de messagerie texte de tierce partie, comme Handcent ou GoSMS se comportent mal
 et interceptent tous les messages SMS entrants. Vérifiez si vous avez reçu un SMS qui commence par
-\"Votre code de vérification Signal:\". Dans ce cas, vous devrez configurer votre
+\"Your Signal verification code:\". Dans ce cas, vous devrez configurer votre
 client de messagerie de tierce partie pour qu\'il laisse passer les messages.</string>
   <string name="registration_problems__incorrect_number">Numéro incorrect</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
@@ -756,7 +763,7 @@ par SMS.</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatiquement les anciens messages lorsque la conversation dépasse un certaine taille.</string>
   <string name="preferences__delete_old_messages">Supprimer les anciens messages</string>
-  <string name="preferences__chats">Chats et médias</string>
+  <string name="preferences__chats">Chats et média</string>
   <string name="preferences__conversation_length_limit">Limite de taille de la conversation</string>
   <string name="preferences__trim_all_threads_now">Réduire toutes les conversations maintenant</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Parcourir toutes les conversations et appliquer la limite de taille de conversation</string>
@@ -776,13 +783,13 @@ Appels et messages privés et gratuits vers les utilisateurs de Signal</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 si \"WiFi Calling\" est activé sur votre appareil).</string>
   <string name="preferences_app_protection__blocked_contacts">Contacts bloqués</string>
   <string name="preferences_notifications__display_in_notifications">Afficher dans les notifications</string>
-  <string name="preferences_chats__when_using_mobile_data">Avec les donnes mobiles</string>
+  <string name="preferences_chats__when_using_mobile_data">Avec les données mobiles</string>
   <string name="preferences_chats__when_using_wifi">Avec le WI-FI</string>
-  <string name="preferences_chats__when_roaming">Avec l’itinérance</string>
-  <string name="preferences_chats__media_auto_download">Auto-télécharger les contenus médias</string>
-  <string name="preferences_chats__message_trimming">Découpage des messages</string>
-  <string name="preferences_advanced__use_system_emoji">Utiliser les Émoji du système</string>
-  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Désactiver le support des émojis inclus dans Signal</string>
+  <string name="preferences_chats__when_roaming">Avec l’itinérance des données</string>
+  <string name="preferences_chats__media_auto_download">Téléchargement automatique  des contenus médias</string>
+  <string name="preferences_chats__message_trimming">Élagage des messages</string>
+  <string name="preferences_advanced__use_system_emoji">Utiliser les Emoji du système</string>
+  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Désactiver le support des emojis inclus dans Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 38b9364fc..dc29a0100 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -14,10 +14,10 @@
   <string name="ApplicationPreferencesActivity_delete">Törlés</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Jelszó tiltása?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
-Tárolt képernyő engedélyezése az üzeneteknek?</string>
+Képernyő zárolásának tiltása az üzeneteknél?</string>
   <string name="ApplicationPreferencesActivity_disable">Tiltás</string>
-  <string name="ApplicationPreferencesActivity_unregistering">Leregisztrálás</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Leregisztrálás Signal üzenetekről...</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Regisztráció megszüntetése...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Regisztráció törlése a Signal üzenetekről...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages">Signal üzenetek letiltása?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">
         Ez letiltja a Signal üzeneteket a kiszolgálóról való leregisztrálásoddal.
@@ -172,7 +172,7 @@ ezt a névjegyet.
   <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Üdvözöl a Signal.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">A TextSecure és a RedPhone most egy privát üzenetküldő minden helyzetre: Signal.</string>
   <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Üdvözöl a Signal!</string>
-  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">A TextSecure most Signal.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">A TextSecure mostantól Signal.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">A TextSecure és a RedPhone most egy alkalmazás: Signal. Koppints a felfedezéshez.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exportálás</string>
@@ -187,7 +187,7 @@ ezt a névjegyet.
   <string name="ExportFragment_error_while_writing_to_sd_card">Hiba történt az SD kártya írása közben.</string>
   <string name="ExportFragment_success">Sikerült!</string>
   <!--GcmRefreshJob-->
-  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Tartós Signal kommunikációs hiba!</string>
+  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Elhúzódó Signal kommunikációs hiba!</string>
   <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">A Signal képtelen volt regisztrálni Google Play Szolgáltatásokkal. Az adatcsatornán keresztüli kommunikáció le van tiltva, kérlek próbálj meg újra regisztrálni a Signal beállítások menüből.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Új csoport</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 22fe35a96..d51972d0d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -12,16 +12,21 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Hapus seluruh pesan lama?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Apakah anda yakin untuk memangkas seluruh rangkaian percakapan hingga ke %s pesan terakhir?</string>
   <string name="ApplicationPreferencesActivity_delete">Hapus</string>
-  <string name="ApplicationPreferencesActivity_disable_passphrase">Nonfungsikan frasa sandi?</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Nonaktifkan frasa sandi?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
-        Nonfungsikan gembok layar untuk pesan?
+        Nonaktifkan gembok layar untuk pesan?
+    </string>
+  <string name="ApplicationPreferencesActivity_disable">Nonaktif</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages">Nonaktifkan perpesanan Signal?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">
+        Ini akan menonaktifkan perpesanan Signal dengan cara menghapus pendaftaran Anda dari server.
+        Anda perlu mendaftarkan ulang nomor telepon Anda untuk menggunakan perpesanan Signal di kemudian hari.
     </string>
-  <string name="ApplicationPreferencesActivity_disable">non aktif</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kesalahan dalam menghubungkan ke server!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS digunakan</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS 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 tidak diaktifkan</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Sentuh untuk menetapkan Signal sebagai aplikasi SMS baku anda</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">SMS Nonaktif</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Sentuh untuk menetapkan Signal sebagai aplikasi SMS baku Anda</string>
   <string name="ApplicationPreferencesActivity_on">nyala</string>
   <string name="ApplicationPreferencesActivity_On">Nyala</string>
   <string name="ApplicationPreferencesActivity_off">mati</string>
@@ -48,7 +53,7 @@
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Kunci
         identifikasi untuk %1$s telah berubah. Hal ini dapat berarti bahwa seseorang sedang mencoba untuk
-        menyadap komunikasi anda, atau %2$s telah memasang ulang Signal dan sekarang memiliki kunci identitas
+        menyadap komunikasi Anda, atau %2$s telah memasang ulang Signal dan sekarang memiliki kunci identitas
         yang baru.
     </string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Anda mungkin ingin memverifikasi
@@ -73,14 +78,14 @@ kontak ini.
   <string name="ConversationActivity_initiate_secure_session_question">Inisiasi sesi aman?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Inisiasi sesi aman dengan %s?</string>
   <string name="ConversationActivity_reset_secure_session_confirmation">Konfirmasi penyetelan ulang sesi aman</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question">Apakah anda yakin ingin menyetel ulang sesi aman ini?</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question">Apakah Anda yakin ingin menyetel ulang sesi aman ini?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Konfirmasi penghapusan percakapan</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Apa anda yakin ingin menghapus percakapan ini secara permanen?</string>
   <string name="ConversationActivity_add_attachment">Tambahkan lampiran</string>
   <string name="ConversationActivity_select_contact_info">Pilih info kontak</string>
   <string name="ConversationActivity_compose_message">Tulis pesan</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Maaf, terjadi kesalahan pada pengaturan lampiran anda.</string>
-  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Gif yang anda pilih terlalu besar!</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Gif yang Anda pilih terlalu besar!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Maaf, video terpilih melebihi batasan ukuran pesan (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Maaf, audio terpilih melebihi batasan ukuran pesan (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Alamat penerima SMS atau email tidak benar!</string>
@@ -95,7 +100,7 @@ kontak ini.
   <string name="ConversationActivity_calls_not_supported">Panggilan tidak didukung</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Perangkat ini sepertinya tidak mendukung untuk panggilan.</string>
   <string name="ConversationActivity_leave_group">Tinggalkan grup?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Anda yakin ingin meninggalkan grup ini?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Apakah Anda yakin ingin meninggalkan grup ini?</string>
   <string name="ConversationActivity_transport_insecure_sms">SMS tidak aman</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS tidak aman</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
@@ -103,24 +108,26 @@ kontak ini.
   <string name="ConversationActivity_lets_use_this_to_chat">Gunakan Signal untuk mengobrol: %s</string>
   <string name="ConversationActivity_error_leaving_group">Galat saat keluar dari grup...</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS tidak didukung</string>
-  <string name="ConversationActivity_mms_not_supported_message">Pesan ini tidak bisa dikirimkan karena penyedia layanan seluler anda tidak mendukung MMS.</string>
+  <string name="ConversationActivity_mms_not_supported_message">Pesan ini tidak bisa dikirimkan karena penyedia layanan seluler Anda tidak mendukung MMS.</string>
   <string name="ConversationActivity_specify_recipient">Silahkan pilih kontak</string>
   <string name="ConversationActivity_unblock_question">Buka blokir?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Apakah anda yakin ingin membuka blokir kontak ini?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Apakah Anda yakin ingin membuka blokir kontak ini?</string>
   <string name="ConversationActivity_unblock">Buka blokir</string>
-  <string name="ConversationActivity_attachment_exceeds_size_limits">Lampiran melebihi batas ukuran untuk tipe pesan yang anda kirimkan.</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Lampiran melebihi batas ukuran untuk tipe pesan yang Anda kirimkan.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Kamera tidak tersedia</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Rincian pesan</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nKirim/Terima: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Pengirim: %1$s\nTransport: %2$s\nKirim: %3$s\nTerima: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Konfirmasi penghapusan pesan</string>
-  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Apakah anda yakin ingin secara permanen menghapus semua pesan terpilih?</string>
+  <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_all_selected_messages">Apakah Anda yakin ingin secara permanen menghapus semua pesan terpilih?</string>
   <string name="ConversationFragment_save_to_sd_card">Simpan ke penyimpanan?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Menyimpan media ini ke penyimpanan membuat aplikasi lain dapat mengaksesnya.\n\nLanjutkan?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Galat saat menyimpan lampiran ke penyimpanan!</string>
   <string name="ConversationFragment_success_exclamation">Sukses!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Tidak bisa menyimpan ke penyimpanan!</string>
   <string name="ConversationFragment_saving_attachment">Menyimpan lampiran</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">Menyimpan lampiran ke penyimpanan...</string>
   <string name="ConversationFragment_pending">Tertunda...</string>
   <string name="ConversationFragment_push">Data (Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
@@ -172,16 +179,17 @@ kontak ini.
   <string name="ExportFragment_success">Sukses!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kegagalan permanen komunikasi Signal!</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal tidak bisa mendaftar dengan Layanan Google Play. Komunikasi melalui saluran data dinonaktifkan, silahkan coba mendaftar ulang dari menu pengaturan Signal.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup baru</string>
   <string name="GroupCreateActivity_actionbar_update_title">Perbarui grup</string>
   <string name="GroupCreateActivity_group_name_hint">Nama grup</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Grup MMS baru</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Anda telah memilih kontak yang tidak mendukung grup Signal, maka grup ini akan menjadi grup MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Anda tidak terdaftar untuk menggunakan saluran data, grup Signal dinonfungsikan.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Anda tidak terdaftar untuk menggunakan saluran data, jadi grup Signal dinonaktifkan.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Terjadi kesalahan tidak terduga yang menggagalkan pembuatan grup.</string>
-  <string name="GroupCreateActivity_contacts_no_members">Anda butuh minimal satu orang dalam grup anda!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Salah satu anggota grup anda memiliki nomor yang tidak dapat dibaca, silakan perbaiki atau keluarkan kontak tersebut dan coba lagi.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Anda butuh minimal satu orang tergabung dalam grup Anda!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Salah satu anggota grup Anda memiliki nomor yang tidak dapat dibaca, silakan perbaiki atau keluarkan kontak tersebut dan coba lagi.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar grup</string>
   <string name="GroupCreateActivity_menu_create_title">Buat grup</string>
   <string name="GroupCreateActivity_creating_group">Membuat %1$s…</string>
@@ -196,7 +204,7 @@ kontak ini.
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Impor basis data SMS sistem?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Ini akan mengimpor
-        pesan dari basis data SMS bawaan sistem ke Signal. Jika anda sebelumnya telah
+        pesan dari basis data SMS bawaan sistem ke Signal. Jika Anda sebelumnya telah
         mengimpor basis data SMS sistem, mengimpornya lagi akan mengakibatkan duplikasi pesan.
     </string>
   <string name="ImportFragment_import">Import</string>
@@ -240,7 +248,7 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Menerima pesan terenkripsi menggunakan Signal versi lama tidak lagi didukung. Minta pengirim untuk memutakhirkan Signal ke versi terbaru dan kirim ulang pesannya.</string>
   <string name="MessageRecord_left_group">Anda telah keluar dari grup.</string>
   <string name="MessageRecord_updated_group">Grup diperbarui.</string>
-  <string name="MessageRecord_s_called_you">%s menelpon anda.</string>
+  <string name="MessageRecord_s_called_you">%s menelpon Anda.</string>
   <string name="MessageRecord_called_s">Memanggil %s</string>
   <string name="MessageRecord_missed_call_from">Panggilan tak terjawab dari %s</string>
   <!--PassphraseChangeActivity-->
@@ -253,8 +261,8 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="DeviceProvisioningActivity_continue">LANJUTKAN</string>
   <string name="DeviceProvisioningActivity_title">Kaitkan perangkat ini?</string>
   <string name="DeviceProvisioningActivity_content_bullets">
-        - Membaca semua pesan anda
-        \n- Mengirim pesan atas nama anda
+        - Membaca semua pesan Anda
+        \n- Mengirim pesan atas nama Anda
     </string>
   <string name="DeviceProvisioningActivity_content_progress_title">Mengaitkan perangkat</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Mengaitkan perangkat baru...</string>
@@ -262,17 +270,17 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="DeviceProvisioningActivity_content_progress_no_device">Perangkat tidak ditemukan.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Galat jaringan.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Kode QR tidak valid.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Maaf, sudah terlalu banyak perangkat yang anda kaitkan, coba untuk membuang beberapa...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Maaf, sudah terlalu banyak perangkat yang Anda kaitkan, coba untuk membuang beberapa...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Masukkan frasa sandi</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikon Signal</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Kirim frasa sandi</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Frasa sandi tidak valid!</string>
   <!--PlayServicesProblemFragment-->
-  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Versi dari Layanan Google Play yang anda pasang tidak berfungsi dengan benar. Mohon pasang ulang Layanan Google Play dan coba lagi.</string>
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Versi dari Layanan Google Play yang Anda pasang tidak berfungsi dengan benar. Mohon pasang ulang Layanan Google Play dan coba lagi.</string>
   <!--RatingManager-->
   <string name="RatingManager_rate_this_app">Nilai aplikasi ini</string>
-  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Jika anda suka menggunakan aplikasi ini, luangkan waktu sejenak untuk membantu kami dengan memberikan nilai pada aplikasi.</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Jika Anda suka menggunakan aplikasi ini, luangkan waktu sejenak untuk membantu kami dengan memberikan nilai pada aplikasi.</string>
   <string name="RatingManager_rate_now">Nilai sekarang!</string>
   <string name="RatingManager_no_thanks">Tidak, terima kasih</string>
   <string name="RatingManager_later">Nanti</string>
@@ -281,10 +289,10 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Anda tidak akan melihat lagi pesan yang dikirimkan dari pengguna ini.</string>
   <string name="RecipientPreferenceActivity_block">Blokir</string>
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Buka blokir kontak ini?</string>
-  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Apakah anda yakin ingin membuka blokir kontak ini?</string>
+  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Apakah Anda yakin ingin membuka blokir kontak ini?</string>
   <string name="RecipientPreferenceActivity_unblock">Buka blokir</string>
-  <string name="RecipientPreferenceActivity_enabled">Fungsikan</string>
-  <string name="RecipientPreferenceActivity_disabled">Nonfungsikan</string>
+  <string name="RecipientPreferenceActivity_enabled">Aktif</string>
+  <string name="RecipientPreferenceActivity_disabled">Nonaktif</string>
   <!--RedPhone-->
   <string name="RedPhone_answering">Menjawab</string>
   <string name="RedPhone_ending_call">Mengakhiri panggilan</string>
@@ -300,17 +308,17 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="RedPhone_login_failed">Gagal masuk!</string>
   <string name="RedPhone_message_from_the_server">Pesan dari server</string>
   <string name="RedPhone_number_not_registered">Nomor tidak terdaftar!</string>
-  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Nomor yang anda panggil tidak mendukung panggilan aman!</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Nomor yang Anda panggil tidak mendukung panggilan aman!</string>
   <string name="RedPhone_got_it">Paham</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_signal">Sambung Menggunakan Signal</string>
-  <string name="RegistrationActivity_select_your_country">Pilih negara anda</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Anda harus menetapkan kode
-Negara anda
-</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Anda harus mengisi nomor
-telefon anda
-</string>
+  <string name="RegistrationActivity_select_your_country">Pilih negara Anda</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Anda harus mengisi
+        kode negara Anda
+    </string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Anda harus mengisi
+        nomor telepon Anda
+    </string>
   <string name="RegistrationActivity_invalid_number">Nomor tidak benar</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nomor yang anda
 isikan (%s) tidak tepat.
@@ -322,7 +330,7 @@ isikan (%s) tidak tepat.
         akun Google, tetapi harus memiliki dan memasang aplikasi Play Store.
     </string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
-        Periksa lagi bahwa ini adalah nomor anda! Kami akan memverifikasinya dengan SMS.
+        Periksa lagi bahwa ini adalah nomor Anda! Kami akan memverifikasinya dengan SMS.
     </string>
   <string name="RegistrationActivity_continue">Lanjutkan</string>
   <string name="RegistrationActivity_edit">Edit</string>
@@ -374,7 +382,7 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="ThreadRecord_secure_session_reset">Sesi aman disetel ulang.</string>
   <string name="ThreadRecord_draft">Draf:</string>
   <string name="ThreadRecord_called">Anda memanggil</string>
-  <string name="ThreadRecord_called_you">Memanggil anda</string>
+  <string name="ThreadRecord_called_you">Memanggil Anda</string>
   <string name="ThreadRecord_missed_call">Panggilan tak terjawab</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Anda tidak memiliki kunci identitas.</string>
@@ -502,12 +510,12 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">lanjutkan</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Tidak dapat mengambil catatan log dari perangkat anda. Anda masih dapat menggunakan ADB untuk mendapat catatan debug.</string>
-  <string name="log_submit_activity__thanks">Terima kasih atas bantuan anda</string>
+  <string name="log_submit_activity__log_fetch_failed">Tidak dapat mengambil catatan log dari perangkat Anda. Anda masih dapat menggunakan ADB untuk mendapat catatan debug.</string>
+  <string name="log_submit_activity__thanks">Terima kasih atas bantuan Anda!</string>
   <string name="log_submit_activity__submitting">Mengirimkan</string>
   <string name="log_submit_activity__posting_logs">Kirim catatan log gist…</string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Apakah anda ingin mengimpor pesan teks yang ada ke basis data Signal terenkripsi?</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Apakah Anda ingin mengimpor pesan teks yang ada ke basis data Signal yang terenkripsi?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Basis data sistem standar tidak akan diubah atau dimodifikasi</string>
   <string name="database_migration_activity__skip">Lewati</string>
   <string name="database_migration_activity__import">Import</string>
@@ -533,9 +541,9 @@ Import cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Re
   <string name="message_recipients_list_item__verify">VERIFIKASI</string>
   <string name="message_recipients_list_item__resend">KIRIM ULANG</string>
   <!--MmsPreferencesFragment-->
-  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Telepon anda membutuhkan pengaturan MMS secara manual.</string>
-  <string name="MmsPreferencesFragment__enabled">Fungsikan</string>
-  <string name="MmsPreferencesFragment__disabled">Nonfungsikan</string>
+  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">Telepon Anda membutuhkan pengaturan MMS secara manual.</string>
+  <string name="MmsPreferencesFragment__enabled">Aktif</string>
+  <string name="MmsPreferencesFragment__disabled">Nonaktif</string>
   <string name="MmsPreferencesFragment__not_set">Belum ditetapkan</string>
   <string name="MmsPreferencesFragment__invalid_uri">Teks yang dimasukkan bukan URI yang valid</string>
   <string name="MmsPreferencesFragment__invalid_host">Teks yang dimasukkan bukan host yang valid</string>
@@ -546,13 +554,13 @@ Import cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Re
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Buka Kunci</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal membutuhkan pengaturan MMS untuk mengirimkan media dan pesan grup melalui penyedia layanan wireless anda. Perangkat anda tidak menyediakan informasi tersebut, dan terkadang benar untuk perangkat terkunci dan konfigurasi terbatas lainnya.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Untuk mengirim pesan dan media grup klik \'OK\' dan selesaikan pengaturan yang diminta. Pengaturan MMS untuk operator anda biasanya dapat ditemukan dengan mencari \'APN operator anda\'. Hal ini hanya diperlukan sekali saja.</string>
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal membutuhkan pengaturan MMS untuk mengirimkan media dan pesan grup melalui penyedia layanan wireless Anda. Perangkat Anda tidak menyediakan informasi tersebut, dan terkadang benar untuk perangkat terkunci dan konfigurasi terbatas lainnya.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Untuk mengirim pesan dan media grup klik \'OK\' dan selesaikan pengaturan yang diminta. Pengaturan MMS untuk operator Anda biasanya dapat ditemukan dengan mencari \'APN operator Anda\'. Hal ini hanya diperlukan sekali saja.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">DIBLOKIR</string>
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">Bisukan percakapan</string>
-  <string name="recipient_preferences__disable_notifications_for_this_conversation">Nonfungsikan pemberitahuan untuk percapakan ini</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">Nonaktifkan pemberitahuan untuk percapakan ini</string>
   <string name="recipient_preferences__notification_tone">Suara pemberitahuan</string>
   <string name="recipient_preferences__vibrate">Bergetar</string>
   <string name="recipient_preferences__block">Blokir</string>
@@ -567,7 +575,7 @@ Import cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Re
   <string name="redphone_call_controls__signal_call">Panggilan Signal</string>
   <!--registration_activity-->
   <string name="registration_activity__verify_your_number_to_connect_with_signal">
-        Verifikasi nomor telepon anda untuk tersambung dengan Signal.
+        Verifikasi nomor telepon Anda untuk tersambung dengan Signal.
     </string>
   <string name="registration_activity__your_country">NEGARA ANDA</string>
   <string name="registration_activity__your_country_code_and_phone_number">KODE NEGARA ANDA DAN
@@ -583,14 +591,14 @@ termasuk:
   <string name="registration_problems__sms_interceptors">Penyadap SMS.</string>
   <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
         Beberapa aplikasi perpesanan teks pihak ketiga, seperti Handcent atau GoSMS, bekerja dengan sangat buruk dan
-        mencegat semua pesan SMS yang masuk. Periksa apakah anda menerima pesan teks yang dimulai
-        dengan \'Kode verifikasi Signal anda:\', yang dalam kasus tersebut anda harus mengkonfigurasi
-        aplikasi perpesanan teks pihak ketiga yang anda miliki untuk memperbolehkan pesan diterima.
+        mencegat semua pesan SMS yang masuk. Periksa apakah Anda menerima pesan teks yang dimulai
+        dengan \'Kode verifikasi Signal Anda:\', yang dalam kasus tersebut Anda harus mengkonfigurasi
+        aplikasi perpesanan teks pihak ketiga yang Anda miliki untuk memperbolehkan pesan diterima.
     </string>
   <string name="registration_problems__incorrect_number">nomor salah.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
-        Mohon pastikan anda memasukkan nomor anda dengan benar, dan dengan format yang sesuai dengan
-        wilayah anda.
+        Mohon pastikan Anda memasukkan nomor Anda dengan benar, dan dengan format yang sesuai dengan
+        wilayah Anda.
     </string>
   <string name="registration_problems__google_voice">Google Voice.</string>
   <string name="registration_problems__signal_will_not_work_with_google_voice_numbers">
@@ -599,8 +607,8 @@ termasuk:
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Verifikasi suara</string>
   <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
-        Signal juga bisa menelpon anda untuk memverifikasi nomor anda. Ketuk \'Panggil Saya\' dan masukkan enam digit
-        yang anda dengar.
+        Signal juga bisa menelpon Anda untuk memverifikasi nomor Anda. Ketuk \'Panggil Saya\' dan masukkan enam digit
+        yang Anda dengar.
     </string>
   <string name="registration_progress_activity__verify">Verifikasi</string>
   <string name="registration_progress_activity__call_me">Panggil saya</string>
@@ -616,8 +624,8 @@ termasuk:
 jaringan.
 </string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Perangkat
-        anda membutuhkan konektivitas jaringan agar bisa menggunkaan fitur Signal. Periksa untuk memastikan
-        perangkat anda tersambung ke jaringan 3G tau Wi-Fi.
+        Anda membutuhkan konektivitas jaringan agar bisa menggunkaan fitur Signal. Periksa untuk memastikan
+        perangkat Anda tersambung ke jaringan 3G tau Wi-Fi.
     </string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall yang ketat.
 </string>
@@ -626,14 +634,14 @@ jaringan.
         server Signal. Coba jaringan lain atau data seluler.
     </string>
   <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-        Signal akan secara otomatis memverifikasi nomor anda menggunakan konfirmasi pesan SMS.
+        Signal akan secara otomatis memverifikasi nomor Anda menggunakan konfirmasi pesan SMS.
     </string>
   <string name="registration_progress_activity__connecting">Menghubungkan...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Menunggu Verifikasi
 SMS...</string>
   <string name="registration_progress_activity__registering_with_server">Mendaftarkan ke server...</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Ini
-        akan memakan waktu sejenak. Mohon sabar, kami akan beritahu anda ketika verifikasi telah berhasil.
+        akan memakan waktu sejenak. Mohon sabar, kami akan beritahu Anda ketika verifikasi telah berhasil.
     </string>
   <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">
         Signal kehabisan waktu saat menunggu pesan verifikasi SMS.
@@ -652,7 +660,7 @@ Telah gagal
   <string name="verify_identity_activity__their_identity_they_read">Identitas mereka (terbaca):</string>
   <string name="verify_identity_activity__your_identity_you_read">Identitas anda (terbaca):</string>
   <!--message_details_header-->
-  <string name="message_details_header__issues_need_your_attention">Beberapa masalah membutuhkan perhatian anda.</string>
+  <string name="message_details_header__issues_need_your_attention">Beberapa masalah membutuhkan perhatian Anda.</string>
   <string name="message_details_header__sent">Terkirim</string>
   <string name="message_details_header__received">Diterima</string>
   <string name="message_details_header__via">Via</string>
@@ -683,8 +691,8 @@ Telah gagal
   <string name="arrays__mute_for_one_day">Bisukan selama 1 hari</string>
   <string name="arrays__mute_for_seven_days">Bisukan selama 7 hari</string>
   <string name="arrays__settings_default">Pengaturan bawaan</string>
-  <string name="arrays__enabled">Fungsikan</string>
-  <string name="arrays__disabled">Nonfungsikan</string>
+  <string name="arrays__enabled">Aktif</string>
+  <string name="arrays__disabled">Nonaktif</string>
   <string name="arrays__name_and_message">Nama dan pesan</string>
   <string name="arrays__name_only">Nama saja</string>
   <string name="arrays__images">Gambar</string>
@@ -702,15 +710,18 @@ Telah gagal
   <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages">Gunakan Signal untuk semua pesan teks yang masuk</string>
   <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_multimedia_messages">Gunakan Signal untuk 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__enable_enter_key_title">Aktifkan tombol Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Ganti tombol smiley dengan tombol Enter</string>
+  <string name="preferences__pref_enter_sends_title">Enter untuk mengirim</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Menekan tombol Enter akan mengirimkan pesan teks</string>
   <string name="preferences__display_settings">Pengaturan tampilan</string>
   <string name="preferences__choose_identity">Pilih identitas</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Pilih kontak anda dari daftar kontak yang ada.</string>
   <string name="preferences__change_passphrase">Ganti Kata Kunci</string>
   <string name="preferences__change_my_passphrase">Ganti kata kunci saya</string>
-  <string name="preferences__enable_passphrase">Fungsikan frasa sandi</string>
+  <string name="preferences__enable_passphrase">Aktifkan frasa sandi</string>
   <string name="preferences__passphrase_summary">Frasa sandi %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">Fungsikan gembok layar untuk pesan</string>
+  <string name="preferences__enable_lock_screen_for_messages">Aktifkan gembok layar untuk pesan</string>
   <string name="preferences__screen_security">Keamanan Layar</string>
   <string name="preferences__screen_security_summary">Keamanan layar %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokir tangkapan layar di daftar baru-baru saja dan di dalam aplikasi</string>
@@ -720,7 +731,7 @@ Telah gagal
   <string name="preferences__pref_timeout_interval_title">Interval Kadaluarsa</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Waktu tunggu sebelum melupakan kata kunci dari memori</string>
   <string name="preferences__notifications">Pemberitahuan</string>
-  <string name="preferences__enable_message_notifications">Fungsikan pemberitahuan pesan</string>
+  <string name="preferences__enable_message_notifications">Aktifkan pemberitahuan pesan</string>
   <string name="preferences__led_color">Warna LED</string>
   <string name="preferences__led_color_unknown">Tidak dikenal</string>
   <string name="preferences__pref_led_blink_title">Pola kedip LED</string>
@@ -788,7 +799,7 @@ Telah gagal
     </string>
   <string name="preferences__submit_debug_log">Kirim debug log</string>
   <string name="preferences__support_wifi_calling">Mode kompatibilitas \'Panggilan WiFi\'</string>
-  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Fungsikan jika perangkat anda menggunakan pengiriman SMS/MMS melalui WiFi (hanya berfungsi ketika \'Panggilan WiFi\' aktif di perangkat anda)</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktifkan jika perangkat Anda menggunakan pengiriman SMS/MMS melalui WiFi (hanya berfungsi ketika \'Panggilan WiFi\' aktif di perangkat anda)</string>
   <string name="preferences_app_protection__blocked_contacts">Kontak yang diblokir</string>
   <string name="preferences_notifications__display_in_notifications">Tampilkan di pemberitahuan</string>
   <string name="preferences_chats__when_using_mobile_data">Ketika menggunakan data seluler</string>
@@ -797,7 +808,7 @@ Telah gagal
   <string name="preferences_chats__media_auto_download">Otomatis unduh media</string>
   <string name="preferences_chats__message_trimming">Penyingkatan pesan</string>
   <string name="preferences_advanced__use_system_emoji">Gunakan emoji sistem</string>
-  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Nonfungsikan dukungan emoji Signal bawaan</string>
+  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Nonaktifkan dukungan emoji Signal bawaan</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -871,13 +882,13 @@ Telah gagal
   <string name="text_secure_normal__menu_clear_passphrase">Kunci</string>
   <string name="text_secure_normal__mark_all_as_read">Tandai semua dibaca</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build">Versi Signal anda telah usang!</string>
+  <string name="reminder_header_expired_build">Versi Signal Anda telah usang!</string>
   <string name="reminder_header_expired_build_details">Pesan tidak akan bisa lagi terkirim dengan sukses, mohon mutakhirkan ke versi terbaru.</string>
   <string name="reminder_header_sms_default_title">Gunakan sebagai aplikasi SMS baku?</string>
-  <string name="reminder_header_sms_default_text">Ketuk untuk membuat Signal menjadi aplikasi SMS baku anda.</string>
+  <string name="reminder_header_sms_default_text">Ketuk untuk membuat Signal menjadi aplikasi SMS baku Anda.</string>
   <string name="reminder_header_sms_import_title">Impor SMS sistem?</string>
-  <string name="reminder_header_sms_import_text">Ketuk untuk menyalin pesan SMS telepon anda ke dalam basis data terenkripsi.</string>
-  <string name="reminder_header_push_title">Fungsikan pesan Signal?</string>
+  <string name="reminder_header_sms_import_text">Ketuk untuk menyalin pesan SMS telepon Anda ke dalam basis data terenkripsi.</string>
+  <string name="reminder_header_push_title">Aktifkan perpesanan Signal?</string>
   <string name="reminder_header_push_text">Ketuk untuk pengiriman instan, privasi yang lebih baik, dan gratis.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Anda</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8e5b51134..54f2272cc 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -296,7 +296,7 @@
   <string name="RedPhone_recipient_unavailable">응답 없음</string>
   <string name="RedPhone_performing_handshake">핸드셰이크 중</string>
   <string name="RedPhone_network_failed">네트워크에 연결되지 않음</string>
-  <string name="RedPhone_client_failed">클라이언트 실패</string>
+  <string name="RedPhone_client_failed">내부 오류</string>
   <string name="RedPhone_fatal_error">치명적인 오류</string>
   <string name="RedPhone_login_failed">로그인 되지 않음</string>
   <string name="RedPhone_message_from_the_server">서버로 부터의 메시지</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index ace87ac19..657c95a60 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -45,6 +45,7 @@
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Contacte blocate</string>
   <!--CallScreen-->
+  <string name="CallScreen_Incoming_call">Apel de intrare</string>
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Probabil ca doresti sa verifici aceasta persoana.</string>
   <string name="ConfirmIdentityDialog_accept">Acceptă</string>
@@ -102,6 +103,7 @@
   <string name="ConversationActivity_unblock_question">Deblochez ?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Sunteți sigur că doriți deblocarea acestui contact?</string>
   <string name="ConversationActivity_unblock">Deblochează</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Atașamentul depășește limita de mărime pentru tipul de mesaj pe care vrei să-l trimiți.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Cameră indisponibilă</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalii mesaj</string>
@@ -217,6 +219,9 @@
   <!--MessageRecord-->
   <string name="MessageRecord_left_group">Ai parăsit grupul.</string>
   <string name="MessageRecord_updated_group">Grupul a fost actualizat.</string>
+  <string name="MessageRecord_s_called_you">%s te-a sunat</string>
+  <string name="MessageRecord_called_s">Apel %s</string>
+  <string name="MessageRecord_missed_call_from">Apel ratat de la %s</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Parolele nu se potrivesc!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Parola veche este incorectă!</string>
@@ -264,6 +269,7 @@
   <string name="RedPhone_handshake_failed">Handshake eşuat!</string>
   <string name="RedPhone_recipient_unavailable">Destinatar indisponibil</string>
   <string name="RedPhone_performing_handshake">Se execută handshake-ul</string>
+  <string name="RedPhone_network_failed">Eroare de reţea!</string>
   <string name="RedPhone_client_failed">Eroare de client</string>
   <string name="RedPhone_fatal_error">Eroare fatală</string>
   <string name="RedPhone_login_failed">Autentificare eşuată!</string>
@@ -311,6 +317,7 @@ Verifică din nou dacă acesta este numărul tău! Suntem pe cale să-l verific
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Înregistrarea este completă</string>
   <string name="RegistrationService_registration_error">Eroare de inregistrare</string>
+  <string name="RegistrationService_signal_registration_has_encountered_a_problem">Înregistrarea Signal a întampinat o problemă.</string>
   <!--Slide-->
   <string name="Slide_image">Imagine</string>
   <string name="Slide_audio">Audio</string>
@@ -327,6 +334,9 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">A ieșit din grup...</string>
   <string name="ThreadRecord_draft">Ciornă:</string>
+  <string name="ThreadRecord_called">Ai sunat</string>
+  <string name="ThreadRecord_called_you">Te-a sunat</string>
+  <string name="ThreadRecord_missed_call">Apel ratat</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nu ai o cheie de identitate.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Destinatarul nu are o cheie de identitate.</string>
@@ -779,6 +789,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="text_secure_normal__menu_clear_passphrase">Blocare</string>
   <string name="text_secure_normal__mark_all_as_read">Marchează tot ca citit</string>
   <!--reminder_header-->
+  <string name="reminder_header_expired_build">Versiunea ta de Signal a expirat!</string>
   <string name="reminder_header_expired_build_details">Mesajele nu vor mai putea fi trimise cu succes, vă rog actualizați aplicația la versiunea cea mai recentă.</string>
   <string name="reminder_header_sms_default_title">Seteaz ca aplicație implicită SMS?</string>
   <string name="reminder_header_sms_default_text">Atingeți pentru a seta Signal ca și aplicație SMS implicită.</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5e76493f2..af4efe0b8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,5 +1,6 @@
 <?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>
@@ -18,6 +19,9 @@
   <string name="ApplicationPreferencesActivity_unregistering">Отмена регистрации</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages">Отменяем регистрацию в TextSecure...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages">Выключить общение через TextSecure?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_signal_messages">
+Это отключит Signal-сообщения и отменит Вашу регистрацию на сервере.
+Для того, чтобы использовать Signal-сообщения в будущем - Вам потребуется зарегистрировать Ваш номер телефона еще раз.</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>
@@ -45,6 +49,7 @@
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Заблокированные контакты</string>
   <!--CallScreen-->
+  <string name="CallScreen_Incoming_call">Входящий звонок</string>
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Возможно, этого собеседника
 стоит перепроверить.</string>
@@ -64,10 +69,13 @@
   <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> зашифровано, поскольку получатель больше не использует Signal.\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_reset_secure_session_confirmation">Подтверждение сброса защищенного сеанса</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_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>
@@ -92,6 +100,7 @@
   <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_signal">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Получить: %s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Давайте использовать для чата %s</string>
   <string name="ConversationActivity_error_leaving_group">Ошибка при выходе из группы...</string>
@@ -101,6 +110,8 @@
   <string name="ConversationActivity_unblock_question">Разблокировать?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Вы уверены, что хотите разблокировать этот контакт?</string>
   <string name="ConversationActivity_unblock">Разблокировать</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Вложение превышает допустимый размер для отправляемого Вами типа сообщения.</string>
+  <string name="ConversationActivity_quick_camera_unavailable">Камера недоступна</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Подробности</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Транспорт: %1$s\nОтправлено/Получено: %2$s</string>
@@ -115,6 +126,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">Данные (Signal)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Удаление</string>
@@ -136,8 +148,12 @@
   <string name="DateUtils_now">Только что</string>
   <string name="DateUtils_minutes_ago">%d мин</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Удалить \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">После удаления устройства, оно больше не сможет отправлять и получать сообщения.</string>
   <string name="DeviceListActivity_network_connection_failed">Ошибка соединения...</string>
   <string name="DeviceListActivity_try_again">Повторить</string>
+  <string name="DeviceListActivity_unlinking_device">Удаление устройства...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Удаление устройства</string>
   <string name="DeviceListActivity_network_failed">Ошибка сети!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Устройство без названия</string>
@@ -145,9 +161,15 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Поделиться с</string>
   <!--ExperienceUpgradeActivity-->
+  <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Добро пожаловать в Signal.</string>
+  <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Добро пожаловать в Signal!</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">TextSecure теперь Signal.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure и RedPhone теперь одно приложение: Signal. Нажмите, чтобы изучить.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Экспорт</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Экспортировать открытым текстом?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Внимание, Ваши сообщения
+будут экспортированы на карту памяти в открытом виде.</string>
   <string name="ExportFragment_cancel">Отмена</string>
   <string name="ExportFragment_exporting">Экспорт</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Экспортируем открытым текстом на SD-карту...</string>
@@ -160,6 +182,7 @@
   <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_you_dont_support_push">Вы не зарегистрированы для использования канала данных, поэтому Signal-группы отключены.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Непредвиденная ошибка не позволила создать группу.</string>
   <string name="GroupCreateActivity_contacts_no_members">Нужен как минимум один участник в группе!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Один из участников имеет неправильный номер. Пожалуйста, исправьте или удалите этот контакт и попробуйте снова.</string>
@@ -167,6 +190,7 @@
   <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">Невозможно добавить обычный контакт к существующей Signal-группе</string>
   <string name="GroupCreateActivity_loading_group_details">Загружаем подробности о группе...</string>
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">Я</string>
@@ -193,6 +217,7 @@
   <!--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">Signal требуется Barcode Scanner для распознавания QR-кодов.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Не удалось отправить</string>
   <string name="MessageDetailsRecipient_new_identity">Новая личность</string>
@@ -201,11 +226,17 @@
   <string name="MmsDownloader_error_connecting_to_mms_provider">Ошибка подключения к провайдеру MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Ошибка при чтении настроек MMS...</string>
   <!--- NotificationBarManager-->
+  <string name="NotificationBarManager_signal_call_in_progress">Выполняется Signal-вызов</string>
+  <string name="NotificationBarManager_missed_call_from_s">Пропущенный вызов от %s</string>
+  <string name="NotificationBarManager_missed_signal_call">Пропущенный Signal-вызов</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">MMS-сообщение</string>
   <!--MessageRecord-->
   <string name="MessageRecord_left_group">Вы покинули группу.</string>
   <string name="MessageRecord_updated_group">Группа обновлена.</string>
+  <string name="MessageRecord_s_called_you">%s вызывает Вас</string>
+  <string name="MessageRecord_called_s">Вызов %s</string>
+  <string name="MessageRecord_missed_call_from">Пропущенный вызов от %s</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Парольные фразы не совпадают!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Неверная старая парольная фраза!</string>
@@ -219,6 +250,9 @@
   <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>
@@ -244,7 +278,28 @@
   <string name="RecipientPreferenceActivity_enabled">Включено</string>
   <string name="RecipientPreferenceActivity_disabled">Выключено</string>
   <!--RedPhone-->
+  <string name="RedPhone_answering">отвечает</string>
+  <string name="RedPhone_ending_call">Завершение вызова</string>
+  <string name="RedPhone_dialing">Звоним</string>
+  <string name="RedPhone_canceling_call">Отмена вызова</string>
+  <string name="RedPhone_call_rejected">Вызов сброшен</string>
+  <string name="RedPhone_ringing">Звоним</string>
+  <string name="RedPhone_busy">Занято</string>
+  <string name="RedPhone_connected">Соединено</string>
+  <string name="RedPhone_connecting">Соединение</string>
+  <string name="RedPhone_handshake_failed">Ошибка при обмене ключами!</string>
+  <string name="RedPhone_recipient_unavailable">Получатель недоступен</string>
+  <string name="RedPhone_performing_handshake">Выполняется обмен ключами</string>
+  <string name="RedPhone_network_failed">Ошибка сети!</string>
+  <string name="RedPhone_client_failed">Ошибка клиента</string>
+  <string name="RedPhone_fatal_error">Фатальная Ошибка</string>
+  <string name="RedPhone_login_failed">Не удалось войти!</string>
+  <string name="RedPhone_message_from_the_server">Сообщение с сервера</string>
+  <string name="RedPhone_number_not_registered">Номер не зарегистрирован!</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Вызываемый номер не поддерживает защищенные звонки!</string>
+  <string name="RedPhone_got_it">Получить</string>
   <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_signal">Связаться через Signal</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>
@@ -281,8 +336,13 @@
   <string name="RegistrationProgressActivity_registration_conflict">Конфликт регистрации</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Регистрация завершена</string>
+  <string name="RegistrationService_signal_registration_has_successfully_completed">Регистрация в Signal успешно завершена.</string>
   <string name="RegistrationService_registration_error">Ошибка регистрации</string>
+  <string name="RegistrationService_signal_registration_has_encountered_a_problem">Возникла проблема в процессе регистрации в Signal.</string>
   <!--Slide-->
+  <string name="Slide_image">Изображение</string>
+  <string name="Slide_audio">Аудио</string>
+  <string name="Slide_video">Видео</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Получено повреждённое
 сообщение обмена ключами!
@@ -297,6 +357,9 @@
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Вы покинули группу...</string>
   <string name="ThreadRecord_draft">Черновик:</string>
+  <string name="ThreadRecord_called">Вы звонили</string>
+  <string name="ThreadRecord_called_you">Вызывали вас</string>
+  <string name="ThreadRecord_missed_call">Пропущенный вызов</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">У вас нет личного ключа.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">У получателя нет личного ключа.</string>
@@ -346,10 +409,12 @@
   <string name="ApplicationMigrationService_import_in_progress">Идёт импорт</string>
   <string name="ApplicationMigrationService_importing_text_messages">Импорт текстовых сообщений</string>
   <!--KeyCachingService-->
+  <string name="KeyCachingService_signal_passphrase_cached">Дотроньтесь, чтобы открыть.</string>
   <string name="KeyCachingService_lock">Заблокировать парольной фразой</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d новых сообщений в %2$d разговорах</string>
   <string name="MessageNotifier_most_recent_from_s">Последнее от %1$s</string>
+  <string name="MessageNotifier_locked_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>
@@ -360,8 +425,10 @@
   <string name="MessageNotifier_media_message">Медиа-сообщение</string>
   <string name="MessageNotifier_reply">Ответить</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда TextSecure заблокирован!</string>
   <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_signal_message">Новое сообщение Signal</string>
   <string name="SingleRecipientNotificationBuilder_contents_hidden">Содержимое скрыто</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
@@ -383,6 +450,7 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Звуки разговора выключены</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Отправить сообщение Signal</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>
@@ -391,6 +459,7 @@
   <string name="conversation_activity__compose_description">Написание сообщения</string>
   <string name="conversation_activity__emoji_toggle_description">Клавиатура смайликов</string>
   <string name="conversation_activity__attachment_thumbnail">Миниатюра вложения</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">переключить рисовальщик вложений</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">MMS-сообщение загружается</string>
   <string name="conversation_item__mms_image_description">MMS-сообщение</string>
@@ -412,13 +481,16 @@
   <string name="country_selection_fragment__loading_countries">Загружаем страны...</string>
   <string name="country_selection_fragment__search">Поиск</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Нет добавленных устройств...</string>
   <!--experience_upgrade_activity-->
+  <string name="experience_upgrade_activity__continue">продолжить</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">Вы хотите скопировать SMS из вашего телефона в зашифрованную базу TextSecure?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Cистемная база данных изменена не будет.</string>
   <string name="database_migration_activity__skip">Пропустить</string>
   <string name="database_migration_activity__import">Импортировать</string>
@@ -460,11 +532,16 @@
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">Выключить звуки разговора</string>
   <string name="recipient_preferences__disable_notifications_for_this_conversation">Отключить уведомления для этого разговора</string>
+  <string name="recipient_preferences__notification_tone">Звук уведомления</string>
   <string name="recipient_preferences__vibrate">Вибрация</string>
   <string name="recipient_preferences__block">Заблокировать</string>
   <string name="recipient_preferences__color">Цвет</string>
   <string name="recipient_preferences__color_for_this_contact">Цвет для этого контакта</string>
+  <string name="recipient_preferences__verify_identity">Подтвердить личность</string>
   <!--- redphone_call_controls-->
+  <string name="redphone_call_controls__end_call">завершить вызов</string>
+  <string name="redphone_call_controls__audio">Аудио</string>
+  <string name="redphone_call_controls__mute">Отключить звук</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">ВАША СТРАНА</string>
   <string name="registration_activity__your_country_code_and_phone_number">КОД ВАШЕЙ СТРАНЫ
@@ -566,6 +643,8 @@ SMS-подтверждения...
   <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_signal_for_viewing_and_storing_all_incoming_text_messages">Использовать TextSecure для всех входящих текстовых сообщений</string>
+  <string name="preferences__use_signal_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>
@@ -650,6 +729,9 @@ SMS-подтверждения...
   <string name="preferences__default">По умолчанию</string>
   <string name="preferences__language">Язык (Language)</string>
   <string name="preferences__language_summary">Язык %s</string>
+  <string name="preferences__signal">TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_signal_users">
+Бесплатные приватные сообщения пользователям TextSecure и Signal</string>
   <string name="preferences__submit_debug_log">Отправить лог отладки</string>
   <string name="preferences__support_wifi_calling">Совместимость с Wi-Fi звонками</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включите, если ваше устройство отправляет и принимает SMS и MMS через Wi-Fi (и если Wi-Fi звонки включены)</string>
@@ -660,6 +742,8 @@ SMS-подтверждения...
   <string name="preferences_chats__when_roaming">В роуминге</string>
   <string name="preferences_chats__media_auto_download">Автозагрузка медиа</string>
   <string name="preferences_chats__message_trimming">Обрезка сообщений</string>
+  <string name="preferences_advanced__use_system_emoji">Использовать системные смайлы</string>
+  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Отключить встроенные смайлы Textsecure</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -700,6 +784,7 @@ SMS-подтверждения...
   <!--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_reset_secure_session">Сбросить защищённый сеанс</string>
   <!--conversation_muted-->
   <string name="conversation_muted__unmute">Вкл. звук</string>
   <!--conversation_unmuted-->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ffd128f4c..7886adcdd 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -53,6 +53,11 @@ Bạn sẽ phải đăng ký lại số điện thoại để dùng tin nhắn S
   <!--CallScreen-->
   <string name="CallScreen_Incoming_call">Cuộc gọi đến</string>
   <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">
+nguyên liệu xác minh khoá cho %1$s đã thay đổi. Điều này có nghĩa là ai đó đang cố tình
+chặn cuộc hội thoại của bạn hoặc chỉ đơn giản là %2$s đã cài đặt lại Signal và bây giờ có một khoá xác minh mới.
+
+</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Bạn có thể muốn kiểm chứng
 địa chỉ liên lạc này.
     </string>
@@ -72,10 +77,13 @@ Bạn sẽ phải đăng ký lại số điện thoại để dùng tin nhắn S
   <string name="ConversationItem_click_to_approve_unencrypted">Nhấn để trở lại dạng không bảo mật</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Trở lại SMS không mã hóa?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Trở lại MMS không mã hóa?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tin nhắn này sẽ <b>không</b> được mã khoá bởi vì người nhận không còn sử dụng Signal.\n\ngSẽ gửi tin nhắn không bảo mật chứ?</string>
   <string name="ConversationItem_unable_to_open_media">Không tìm thấy ứng dụng để mở dữ liệu truyền thông này.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Khởi động phiên mã hóa?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Khởi động phiên mã hóa với %s?</string>
+  <string name="ConversationActivity_reset_secure_session_confirmation">Tái thiết lập việc xác nhận phiên bảo mật</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question">Có chắc là bạn muốn tái thiết lập phiên bảo mật này?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Xác nhận xóa chuỗi</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Bạn có chắc là muốn xóa vĩnh viễn cuộc chuyện trò này?</string>
   <string name="ConversationActivity_add_attachment">Thêm tập tin đính kèm</string>
@@ -110,6 +118,8 @@ Bạn sẽ phải đăng ký lại số điện thoại để dùng tin nhắn S
   <string name="ConversationActivity_unblock_question">Không chặn?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Bạn có chắc là không chặn liên lạc này nữa?</string>
   <string name="ConversationActivity_unblock">Không chặn</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Văn bản đính kèm vượt quá giới hạn kích cỡ cho loại tin nhắn mà bạn đang gửi.</string>
+  <string name="ConversationActivity_quick_camera_unavailable">Máy ảnh không khả dụng</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Chi tiết tin nhắn</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Chuyển tải: %1$s\nGửi/Nhận: %2$s</string>
@@ -161,12 +171,15 @@ Bạn sẽ phải đăng ký lại số điện thoại để dùng tin nhắn S
   <string name="ShareActivity_share_with">Chia sẻ với</string>
   <!--ExperienceUpgradeActivity-->
   <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Chào mừng bạn đến với Signal.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">TextSecure và RedPhone giờ đây đã được nhập chung thành ứng dụng nhắn tin riêng tư: Signal.</string>
   <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Chào mừng bạn đến với Signal!</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">TextSecure bây giờ là Signal.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure và RedPhone hiện giờ đã nhập làm một: Signal. Chạm để khám phá.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Xuất</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Xuất văn bản thường ra thẻ nhớ?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Cảnh báo, thao tác này sẽ
+xuất nội dung tin nhắn Signal của bạn vào thẻ SD dưới dạng không được mã khoá.</string>
   <string name="ExportFragment_cancel">Hủy</string>
   <string name="ExportFragment_exporting">Đang xuất</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Đang xuất văn bản thường ra thẻ nhớ...</string>
@@ -174,11 +187,15 @@ Bạn sẽ phải đăng ký lại số điện thoại để dùng tin nhắn S
   <string name="ExportFragment_error_while_writing_to_sd_card">Có lỗi trong lúc viết ra thẻ nhớ.</string>
   <string name="ExportFragment_success">Thành công!</string>
   <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Lỗi thường trực khi giao tiếp qua Signal!</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal không thể đăng ký với Google Play Services. Giao tiếp thông qua kênh dữ liệu đã ngưng hoạt động, hãy thử đăng ký lại từ trình đơn cài đặt của Signal.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Tạo nhóm mới</string>
   <string name="GroupCreateActivity_actionbar_update_title">Cập nhật nhóm</string>
   <string name="GroupCreateActivity_group_name_hint">Tên nhóm</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Tạo nhóm MMS mới</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Bạn đã chọn một liên hệ không hỗ trợ nhóm Signal, vậy nên nhóm này sẽ dùng MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Bạn chưa đăng ký để sử dụng kênh dữ liệu, vậy nên nhóm Signal sẽ không hoạt động.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Có lỗi bất ngờ xảy ra do đó không lập nhóm được.</string>
   <string name="GroupCreateActivity_contacts_no_members">Cần có ít nhất một người trong nhóm!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Một người trong nhóm có số điện thoại không đọc được. Xin điều chỉnh hoặc xóa đi và thử lại.</string>
@@ -186,6 +203,7 @@ Bạn sẽ phải đăng ký lại số điện thoại để dùng tin nhắn S
   <string name="GroupCreateActivity_menu_create_title">Tạo nhóm</string>
   <string name="GroupCreateActivity_creating_group">Tạo %1$s...</string>
   <string name="GroupCreateActivity_updating_group">Cập nhật %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Không thể thêm liên hệ ngoài Signal vào nhóm Signal hiện tại</string>
   <string name="GroupCreateActivity_loading_group_details">Nạp chi tiết nhóm...</string>
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">Tôi</string>
@@ -194,9 +212,17 @@ Bạn sẽ phải đăng ký lại số điện thoại để dùng tin nhắn S
   <string name="ImportExportActivity_export">Xuất</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Nhập cơ sở dữ liệu SMS của hệ thống?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Thao tác này sẽ nhập
+tin nhắn từ cơ sở dữ liệu SMS mặc định của hệ thống vào Signal. Nếu trước đó bạn đã
+nhập cơ sở dữ liệu SMS của hệ thống, việc này sẽ tạo ra các tin nhắn bị trùng lặp.
+</string>
   <string name="ImportFragment_import">Nhập</string>
   <string name="ImportFragment_cancel">Hủy</string>
   <string name="ImportFragment_restore_encrypted_backup">Phục hồi phần sao lưu mã hóa?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Khôi phục sao lưu đã mã khoá sẽ thay thế hoàn toàn các khoá, tinh chỉnh và tin nhắn hiện hữu của bạn. Bạn cũng sẽ mất tất cả thông tin trong bản cài đặt Signal hiện tại ngoại trừ
+trong bản sao lưu.
+</string>
   <string name="ImportFragment_restore">Phục hồi</string>
   <string name="ImportFragment_import_plaintext_backup">Nhập sao lưu văn bản thường?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Thao tác này
@@ -214,6 +240,7 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Không dò tìm thấy chìa khóa nào!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">Cài đặt Ứng Dụng Quét Mã Vạch?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Signal cần Barcode Scanner cho mã QR.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Gửi đi không được</string>
   <string name="MessageDetailsRecipient_new_identity">Danh tính mới</string>
@@ -222,11 +249,13 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <string name="MmsDownloader_error_connecting_to_mms_provider">Có lỗi kết nối vào nhà dịch vụ MMS</string>
   <string name="MmsDownloader_error_reading_mms_settings">Có lỗi khi đọc thiết đặt MMS của dịch vụ di động...</string>
   <!--- NotificationBarManager-->
+  <string name="NotificationBarManager_signal_call_in_progress">Cuộc gọi Signal đang tiến hành</string>
   <string name="NotificationBarManager_missed_call_from_s">Cuộc gọi nhỡ từ %s</string>
   <string name="NotificationBarManager_missed_signal_call">Cuộc gọi Signal nhỡ</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Tin nhắn đa phương tiện</string>
   <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Đã nhận một tin nhắn được mã khoá với phiên bản Signal cũ và không còn được hỗ trợ. Hãy yêu cầu người gửi nâng cấp phiên bản mới nhất và gửi lại tin nhắn.</string>
   <string name="MessageRecord_left_group">Bạn đã rời nhóm.</string>
   <string name="MessageRecord_updated_group">Cập nhật nhóm.</string>
   <string name="MessageRecord_s_called_you">%s đã gọi cho bạn</string>
@@ -285,10 +314,17 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <string name="RedPhone_busy">Bận</string>
   <string name="RedPhone_connected">Đã kết nối</string>
   <string name="RedPhone_connecting">Đang kết nối</string>
+  <string name="RedPhone_handshake_failed">Truyền tín hiệu handshake thất bại!</string>
+  <string name="RedPhone_recipient_unavailable">Người nhận hiện không thể kết nối</string>
+  <string name="RedPhone_performing_handshake">Đang truyền tín hiệu handshake</string>
+  <string name="RedPhone_network_failed">Lỗi mạng!</string>
+  <string name="RedPhone_client_failed">Lỗi phía đối phương</string>
   <string name="RedPhone_fatal_error">Lỗi nghiêm trọng</string>
   <string name="RedPhone_login_failed">Đăng nhập thất bại!</string>
   <string name="RedPhone_message_from_the_server">Thông điệp từ máy chủ</string>
   <string name="RedPhone_number_not_registered">Số điện thoại chưa đăng ký!</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Số điện thoại vừa rồi không hỗ trợ cuộc gọi bảo mật!</string>
+  <string name="RedPhone_got_it">Đã nhận được</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_signal">Kết nối với Signal</string>
   <string name="RegistrationActivity_select_your_country">Chọn quốc gia bạn</string>
@@ -331,11 +367,16 @@ mã số quốc gia bạn</string>
   <string name="RegistrationProgressActivity_too_many_requests">Quá nhiều yêu cầu!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Bạn đã yêu cầu cú gọi gần đây. Bạn có thể yêu cầu lần nữa trong vòng 20 phút.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Đăng ký gặp va chạm</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Số điện thoại này đã đăng ký trên máy chủ Signal khác rồi (CyanogenMod?). Bạn phải huỷ đăng ký đó trước khi đăng ký tại đây.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Đăng ký hoàn tất</string>
+  <string name="RegistrationService_signal_registration_has_successfully_completed">Đăng ký Signal thành công.</string>
   <string name="RegistrationService_registration_error">Có lỗi đăng ký</string>
+  <string name="RegistrationService_signal_registration_has_encountered_a_problem">Có lỗi khi đăng ký Signal.</string>
   <!--Slide-->
   <string name="Slide_image">Ảnh</string>
+  <string name="Slide_audio">Đoạn nhạc</string>
+  <string name="Slide_video">Đoạn phim</string>
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Nhận được thông tin
 trao đổi chìa khóa bị hỏng!</string>
@@ -344,9 +385,11 @@ Nhận thông tin trao đổi chìa khóa về phiên bản giao thức không h
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý và hiển thị.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Nhận được cập nhật nhưng không rõ thông tin danh tính. Nhấn vào để kiểm nhận danh tính.</string>
+  <string name="SmsMessageRecord_secure_session_reset">Đã tái thiết lập phiên bảo mật.</string>
   <string name="SmsMessageRecord_duplicate_message">Tin nhắn trùng lập.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Rời nhóm...</string>
+  <string name="ThreadRecord_secure_session_reset">Đã tái thiết lập phiên bảo mật.</string>
   <string name="ThreadRecord_draft">Nháp:</string>
   <string name="ThreadRecord_called">Bạn đã gọi</string>
   <string name="ThreadRecord_called_you">Đã gọi cho bạn</string>
@@ -418,6 +461,7 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="MessageNotifier_media_message">Tin nhắn đa phương tiện</string>
   <string name="MessageNotifier_reply">Hồi âm</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Trả lời nhanh không khả thi khi Signal bị khoá!</string>
   <string name="QuickResponseService_problem_sending_message">Có vấn đề khi gửi tin nhắn!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_new_signal_message">Thông điệp Signal mới</string>
@@ -482,6 +526,7 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="log_submit_activity__submitting">Đang nộp</string>
   <string name="log_submit_activity__posting_logs">Gửi ký sự lên gist...</string>
   <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Bạn có muốn nhập các tin nhắn hiện hữu vào cơ sở dữ liệu đã mã khoá của Signal?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Cơ sở dữ liệu mặc định của hệ thống sẽ không bị sửa hay bị thay đổi gì cả.</string>
   <string name="database_migration_activity__skip">Bỏ qua</string>
   <string name="database_migration_activity__import">Nhập</string>
@@ -496,6 +541,9 @@ Xuất sao lưu văn bản thường tương thích với ứng dụng \'SMSBack
   <string name="import_fragment__import_the_database_from_the_default_system">Nhập cơ sở dữ liệu
 của ứng dụng tin nhắn mặc định của hệ thống.</string>
   <string name="import_fragment__import_encrypted_backup">Nhập sao lưu có mã hóa</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">
+Khôi phục bản sao lưu Signal được mã khoá đã xuất từ trước.
+</string>
   <string name="import_fragment__import_plaintext_backup">Nhập sao lưu văn bản thường</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Nhập tập tin sao lưu thường-không mã hóa. Tương thích với ứng dụng \'SMSBackup And Restore\'.</string>
@@ -518,6 +566,7 @@ Nhập tập tin sao lưu thường-không mã hóa. Tương thích với ứng
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Mở khóa</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal cần cài đặt MMS để chuyển dữ liệu truyền thông và các tin nhắn nhóm thông qua nhà mạng không dây. Thiết bị của bạn không cung cấp đầy đủ các thông tin này, đôi khi là do thiết bị đã bị khoá và các quy định nghiêm ngặt khác.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Để gửi tin nhắn đa phương tiện hoặc tin nhắn nhóm, bấm \'OK\' và hoàn tất các thiết đặt cần thiết. Thiết đặt MMS cho nhà mạng di động có thể tìm thấy bằng cách tìm \'your carrier APN\'. Bạn chỉ cần làm bước này một lần.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BỊ CHẶN</string>
@@ -533,8 +582,13 @@ Nhập tập tin sao lưu thường-không mã hóa. Tương thích với ứng
   <!--- redphone_call_controls-->
   <string name="redphone_call_card__signal_call">Cuộc gọi Signal</string>
   <string name="redphone_call_controls__end_call">kết thúc cuộc gọi</string>
+  <string name="redphone_call_controls__audio">Nhạc</string>
+  <string name="redphone_call_controls__mute">Im lặng</string>
   <string name="redphone_call_controls__signal_call">Cuộc gọi Signal</string>
   <!--registration_activity-->
+  <string name="registration_activity__verify_your_number_to_connect_with_signal">
+Xác minh số điện thoại của bạn để kết nối với Signal.
+</string>
   <string name="registration_activity__your_country">QUỐC GIA BẠN</string>
   <string name="registration_activity__your_country_code_and_phone_number">MÃ SỐ QUỐC GIA VÀ
 SỐ ĐIỆN THOẠI BẠN</string>
@@ -546,28 +600,56 @@ SỐ ĐIỆN THOẠI BẠN</string>
   <string name="registration_problems__some_possible_problems_include">Một số vấn đề có thể gặp
 bao gồm:</string>
   <string name="registration_problems__sms_interceptors">Chặn bắt SMS.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Một vài ứng dụng tin nhắn bên thứ ba như là Handcent hoặc GoSMS thường gây khó khăn khi nhận hay thậm chí
+chặn tất cả SMS đến. Hãy kiểm tra xem bạn có nhận được tin nhắn bắt đầu
+với \'Mã xác minh Signal của bạn\'. Trong trường hợp này, bạn sẽ phải tuỳ chỉnh lại
+ứng dụng bên thứ ba để có thể nhận được tin nhắn.
+</string>
   <string name="registration_problems__incorrect_number">Số không đúng.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
 Xin xem lại số điền vào có đúng không, 
 và dạng số phù hợp với vùng bạn cư ngụ. </string>
   <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__signal_will_not_work_with_google_voice_numbers">
+Signal sẽ không hoạt động với các số điện thoại Google Voice.
+</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Kiểm chứng giọng nói</string>
+  <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
+Signal cũng có thể gọi cho bạn để xác minh số điện thoại. Chạm vào \"Gọi Tôi\" và nhập 6 ký tự mã mà bạn nghe được vào bên dưới.
+</string>
   <string name="registration_progress_activity__verify">Kiểm chứng</string>
   <string name="registration_progress_activity__call_me">Gọi tôi</string>
   <string name="registration_progress_activity__edit_number">Sửa số</string>
   <string name="registration_progress_activity__connectivity_error">Có lỗi kết nối.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
+Signal không thể kết nối đến dịch vụ push.
+</string>
   <string name="registration_progress_activity__some_possible_problems_include">Một số vấn đề có
 thể gặp bao gồm:</string>
   <string name="registration_progress_activity__no_network_connectivity">Không có đường
 truyền mạng.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Thiết bị
+của bạn cần kết nối mạng để có thể sử dụng tính năng Signal này. Hãy kiểm tra để chắc rằng
+bạn có kết nối 3G hoặc Wi-Fi.
+</string>
   <string name="registration_progress_activity__restrictive_firewall">Tường lửa ngăn chận.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Nếu bạn đang kết nối Wi-Fi, có khả năng là tường lửa đã chặn đường
+đến máy chủ Signal. Hãy thử dùng mạng khác hoặc dữ liệu di động.
+</string>
+  <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+Bây giờ, Signal sẽ tự động xác minh số điện thoại của bạn với một tin nhắn SMS.
+</string>
   <string name="registration_progress_activity__connecting">Đang kết nối...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">Chờ kiểm
 chứng SMS...</string>
   <string name="registration_progress_activity__registering_with_server">Đăng ký với máy chủ...</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Việc này
 có thể mất chút thời gian. Xin kiên nhãn chờ, chúng tôi sẽ báo cho bạn biết khi kiểm chứng xong.
+</string>
+  <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">Quá thời gian quy định khi Signal chờ tin nhắn SMS xác minh.
 </string>
   <string name="registration_progress_activity__sms_verification_failed">Kiểm chứng
 SMS thất bại.
@@ -594,6 +676,7 @@ SMS thất bại.
   <string name="AndroidManifest__create_passphrase">Tạo cụm từ mật khẩu</string>
   <string name="AndroidManifest__enter_passphrase">Điền vào cụm từ mật khẩu</string>
   <string name="AndroidManifest__select_contacts">Chọn liên lạc</string>
+  <string name="AndroidManifest__signal_detected">Đã phát hiện Signal</string>
   <string name="AndroidManifest__public_identity_key">Chìa khóa danh tính công cộng</string>
   <string name="AndroidManifest__change_passphrase">Đổi cụm từ mật khẩu</string>
   <string name="AndroidManifest__verify_identity">Kiểm chứng danh tính</string>
@@ -618,6 +701,9 @@ SMS thất bại.
   <string name="arrays__name_and_message">Tên và tin nhắn</string>
   <string name="arrays__name_only">Tên thôi</string>
   <string name="arrays__neither">Không cái nào cả</string>
+  <string name="arrays__images">Hình ảnh</string>
+  <string name="arrays__audio">Nhạc</string>
+  <string name="arrays__video">Đoạn phim</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d tiếng</item>
@@ -627,6 +713,8 @@ SMS thất bại.
   <string name="preferences__sms_mms">SMS và MMS</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_signal_for_viewing_and_storing_all_incoming_text_messages">Dùng Signal cho tất cả tin nhắn đến</string>
+  <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_multimedia_messages">Dùng Signal cho tất cả tin nhắn đa phương tiện</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__replace_smiley_with_enter_key">Thay phím mặt cười với phím Enter</string>
@@ -699,6 +787,7 @@ SMS thất bại.
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Yêu cầu có báo cáo phân phối cho từng tin nhắn SMS gửi đi</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Tự động xóa các tin nhắn cũ một khi chuỗi chuyện trò vượt quá độ dài đã ấn định</string>
   <string name="preferences__delete_old_messages">Xóa tin nhắn cũ</string>
+  <string name="preferences__chats">Các cuộc trò chuyện và dữ liệu truyền thông</string>
   <string name="preferences__conversation_length_limit">Giới hạn độ dài cuộc chuyện trò</string>
   <string name="preferences__trim_all_threads_now">Rút ngắn mọi chuỗi ngay bây giờ</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Xem xét các chuỗi chuyện trò và buộc tuân theo giới hạn độ dài</string>
@@ -711,6 +800,9 @@ SMS thất bại.
   <string name="preferences__language">Ngôn ngữ</string>
   <string name="preferences__language_summary">Ngôn ngữ %s</string>
   <string name="preferences__signal">Signal</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_signal_users">
+Miễn phí nhắn tin và gọi điện riêng tư đến người dùng Signal
+</string>
   <string name="preferences__submit_debug_log">Nộp ký sự dò lỗi</string>
   <string name="preferences__support_wifi_calling">Dạng tương thích \"Gọi qua WiFi\"</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Mở nếu thiết bị bạn dùng SMS/MMS qua WiFi (chỉ mở lên khi \'Gọi qua WiFi\' được mở lên trong thiết bị) </string>
@@ -718,6 +810,11 @@ SMS thất bại.
   <string name="preferences_notifications__display_in_notifications">Hiển thị trong phần thông báo</string>
   <string name="preferences_chats__when_using_mobile_data">Khi dùng dữ liệu di động</string>
   <string name="preferences_chats__when_using_wifi">Khi dùng Wi-Fi</string>
+  <string name="preferences_chats__when_roaming">Khi mượn mạng nước ngoài</string>
+  <string name="preferences_chats__media_auto_download">Tự động tải dữ liệu truyền thông</string>
+  <string name="preferences_chats__message_trimming">Thu gọn tin nhắn</string>
+  <string name="preferences_advanced__use_system_emoji">Sử dụng ký tự biểu cảm hệ thống</string>
+  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Tắt hỗ trợ ký tự biểu cảm mặc định của Signal</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -759,6 +856,7 @@ SMS thất bại.
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">An Ninh</string>
   <string name="conversation_secure_verified__menu_verify_identity">Kiểm chứng danh tính</string>
+  <string name="conversation_secure_verified__menu_reset_secure_session">Tái thiết lập phiên bảo mật</string>
   <!--conversation_muted-->
   <string name="conversation_muted__unmute">Tắt tạm im</string>
   <!--conversation_unmuted-->
@@ -790,10 +888,13 @@ SMS thất bại.
   <string name="text_secure_normal__menu_clear_passphrase">Khóa</string>
   <string name="text_secure_normal__mark_all_as_read">Đánh dấu tất cả đã đọc</string>
   <!--reminder_header-->
+  <string name="reminder_header_expired_build">Bản dựng Signal này đã hết hạn!</string>
   <string name="reminder_header_expired_build_details">Tin nhắn không còn gửi đi được nữa, xin vui lòng cập nhật lên phiên bản mới nhất.</string>
   <string name="reminder_header_sms_default_title">Dùng làm ứng dụng SMS mặc định?</string>
+  <string name="reminder_header_sms_default_text">Chạm để đặt Signal làm ứng dụng SMS mặc định.</string>
   <string name="reminder_header_sms_import_title">Nhập SMS của hệ thống?</string>
   <string name="reminder_header_sms_import_text">Nhấn để sao chép tin nhắn SMS trong điện thoại vào cơ sở dữ liệu mã hóa.</string>
+  <string name="reminder_header_push_title">Bật tin nhắn Signal?</string>
   <string name="reminder_header_push_text">Nhấn để có nhắn tin nhanh, bảo mật chắc và không tốn phí SMS.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Bạn</string>