From 2c8c6a410cc7bcb62344e67c62a75bee2bb6244f Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 13 Oct 2014 18:11:20 -0700
Subject: [PATCH] Updated language translations.

// FREEBIE
---
 res/values-ar/strings.xml     | 287 ++++++++++++++++++++++++++++++++--
 res/values-bo/strings.xml     |   2 -
 res/values-ca/strings.xml     |  22 +--
 res/values-da/strings.xml     |  77 ++++++---
 res/values-es/strings.xml     | 215 +++++++++++++++++++------
 res/values-fr/strings.xml     | 183 +++++++++++++++-------
 res/values-he/strings.xml     |  87 ++++++++---
 res/values-hu/strings.xml     | 224 ++++++++++++++++++++------
 res/values-id/strings.xml     | 147 ++++++++++++-----
 res/values-it/strings.xml     |  16 +-
 res/values-ja/strings.xml     |  51 +++---
 res/values-kn-rIN/strings.xml | 113 ++++++++-----
 res/values-my/strings.xml     |   2 -
 res/values-no/strings.xml     |   1 +
 res/values-pt-rBR/strings.xml |   6 +-
 res/values-ro/strings.xml     | 224 ++++++++++++++++++++++----
 res/values-ru/strings.xml     | 129 ++++++++-------
 res/values-sk/strings.xml     |  72 ++++++---
 res/values-sv/strings.xml     |  10 ++
 res/values-uk/strings.xml     |  15 +-
 res/values-vi/strings.xml     |  83 ++++++----
 21 files changed, 1482 insertions(+), 484 deletions(-)

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index fb0b03ea68..8a23615601 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -14,9 +14,22 @@
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <string name="ApplicationPreferencesActivity_my">أنا</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">ايقاف تشفير التخزين؟</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+تحذير: سيتم إلغاء التخزين المشفر لجميع الرسائل والمفاتيح. ستسمر محادثاتك المشفرة في العمل، ولكن سيكون أي شخص قادر على النفاذ إليهم إذا تمكن من الوصول إلي الهاتف.</string>
   <string name="ApplicationPreferencesActivity_disable">تعطيل</string>
   <string name="ApplicationPreferencesActivity_unregistering">جاري إلغاء التسجيل...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">إلغاء التسجيل للاتصال ببيانات شبكة الجوال</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">تعطيل دفع الوصول إلى الرسائل؟</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+هذا سيقوم بتعطيل دفع الوصول إلى الرسائل من خلال إلغاء تسجيلك في الخادم. سيتوجب عليك إعادة تسجيل رقم هاتفك المحمول لاستخدام دفع وصول الرسائل في المستقبل.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">خطأ في الاتصال مع مزود الخدمة...</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">أنت غير مسجل في خدمة دفع الوصول إلى الرسائل...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">تحديث القائمة</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">تحديث قائمة دفع وصول الرسائل</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">تفعيل ورود الرسائل</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">أضغط لتغيير التطبيق الافتراضي للرسائل</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">تعطيل ورود الرسائل</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">أضغط لجعل تيكست سيكيورالتطبيق الافتراضي للرسئل</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">صورة</string>
   <string name="AttachmentTypeSelectorAdapter_video">فيديو</string>
@@ -29,32 +42,57 @@
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">تم حفظ هذا المحتوى بقاعدة بينات مشفرة، يتطلب عرضها فى تطبيق خارجى لفك تشفيرها و تخزينها مؤقتاً بالذاكرة، هل ترغب فى الاستمرار؟</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">تم استقبال و معالجة رسالة تبادل المفاتيح</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">خطأ، تم استقبال رسالة تبادل مفاتيح غير صالحة</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">تم استلام رسالة تبادل المفاتيح، أنقر للمتابعة</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">تم استلام رسالة عادية في حين وجود محادثة مشفرة مفتوحة لديك. إذا لم يكن لديهم محادثة مفتوحة فإن الرسائل التي سترسلها ستظهر مشوهه. أضغط لإنهاء المحادثة المشفرة.</string>
   <string name="ConversationItem_group_action_left">%1$s تَرك المجموعة.</string>
   <string name="ConversationItem_group_action_joined">%1$s دخَل الفريق.</string>
   <string name="ConversationItem_group_action_modify">%1$s حَدث الفريق.</string>
+  <string name="ConversationItem_click_to_approve_sms">أنقر لاستعاضة الرسالة</string>
+  <string name="ConversationItem_click_to_approve_mms">أنقر لاستعاضة رسالة وسائط متعددة</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">أنقر من أجل استعاضة غير آمنة</string>
+  <string name="ConversationItem_click_to_approve_sms_dialog_title">الاستعاضة برسالة؟</string>
+  <string name="ConversationItem_click_to_approve_mms_dialog_title">الاستعاضة برسالة وسائط متعددة؟</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>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">بدء محادثة آمنة؟</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">فتح قناة تشفير مع %s ؟</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">تأكيد إنهاء محادثة آمنة</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">هل انت متأكد من انك تريد انهاء قناة التشفير؟</string>
+  <string name="ConversationActivity_delete_thread_confirmation">احذف محادثة التأكيد</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">هل تريد حقاَ حذف هذه المحادثة نهائياً؟</string>
   <string name="ConversationActivity_add_attachment">إضافات</string>
   <string name="ConversationActivity_select_contact_info">اختيار تفاصيل جهة الاتصال</string>
+  <string name="ConversationActivity_compose_message">إنشاء رسالة</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">عذراً، حصل خطأ أثناء رفع إضافتك</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">عذراً، حجم هذا الفيديو يزيد عن الحد المسموح بالرسالة.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">عذراً، حجم هذا التسجيل يزيد عن الحد المسموح بالرسالة.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">الطرف الآخر ليس رقم هاتف أو عنوان بريد الكتروني صحيح!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">الرسالة فارغة</string>
+  <string name="ConversationActivity_group_conversation_recipients">المستلمون في مجموعة المحادثة</string>
+  <string name="ConversationActivity_group_conversation">دردشة جماعية</string>
+  <string name="ConversationActivity_unnamed_group">مجموعة غير مسماه</string>
   <string name="ConversationActivity_d_recipients_in_group">أعضاء %d </string>
   <string name="ConversationActivity_d_recipients_in_group_singular">عضو 1</string>
+  <string name="ConversationActivity_saved_draft">مسودة محفوظة</string>
   <string name="ConversationActivity_invalid_recipient">جهة اتصال غير صحيحة!</string>
+  <string name="ConversationActivity_calls_not_supported">المكالمات غير مدعمة</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">هذا الجهاز لا يدعم خاصية الاتصال.</string>
   <string name="ConversationActivity_leave_group">اترك المجموعة؟</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">هل أنت متأكد من ترك المجموعة؟</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">تفاصيل الرسالة</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">نقل: %1$s\nSent/Received: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">الراسل: %1$s\nنقل: %2$s\nمرسل: %3$s\nوارد: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">تاكيد حذف الرسال</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">هل أنت متأكد من حذف هذه الرسالة نهائياً؟</string>
+  <string name="ConversationFragment_save_to_sd_card">أحفظ في بطاقة الذاكرة الخارجية؟</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">تم حفظ هذه الوسائط بقاعدة بيانات مشفرة. النسخة التي تريد حفظها بكرت الذاكرة لن تكون مشفرة.هل تريد الاستمرار؟</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">خطأ أثناء حفظ الاضافات على كرت الذاكرة!</string>
   <string name="ConversationFragment_success_exclamation">نجحت!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">تعذر الكتابة على بطاقة الذاكرة الخارجية!</string>
+  <string name="ConversationFragment_saving_attachment">حفظ المرفق</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">حفظ الإضافة على كرت الذاكرة</string>
   <!--ConversationListAdapter-->
   <string name="ConversationListAdapter_key_exchange_message">رسالة تبادل المفاتيح</string>
@@ -66,9 +104,12 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">رسالة تبادل المفاتيح</string>
   <!--ShareActivity-->
+  <string name="ShareActivity_share_with">شارك مع</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">التصدير إلي بطاقة الذاكرة الخارجية؟</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">هذه الخاصية تصدر مفاتيحك المشفرة و إعداداتك و رسائلك لكرت الذاكرة.</string>
   <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>
@@ -78,16 +119,34 @@
   <string name="ExportFragment_success">نجحت!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">جاري تصدير مفاتيحك المشفرة و إعداداتك و رسائلك</string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">مجموعة جديدة</string>
+  <string name="GroupCreateActivity_actionbar_update_title">تحديث المجموعة</string>
+  <string name="GroupCreateActivity_group_name_hint">أسم المجموعة</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">مجموعة وسائط متعددة جديدة</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>
+  <string name="GroupCreateActivity_file_io_exception">خطأ في وحدة إدخال\إخراج الملف. تعذر إنشاء صورة ملف مؤقتة</string>
+  <string name="GroupCreateActivity_avatar_content_description">الصورة الرمزية للمجموعة</string>
+  <string name="GroupCreateActivity_menu_create_title">إنشاء مجموعة</string>
   <string name="GroupCreateActivity_creating_group">انشاء %1$s…</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">لا يمكن إضافة غير المستخدمين لتيكست سيكيور إلي مجموعة تيكست سيكيور حالية</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">استيراد</string>
   <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_import">استيراد</string>
   <string name="ImportFragment_cancel">الغاء</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nاسترجاع نسخة احتياطية مشفرة سيمسح بالكامل أي مفاتيح حالية أو اعدادات أو رسائل. ستفقد أي معلومات موجودة الآن في تكست سيكيور ولكن غير موجودة في النسخة الاحتياطية.</string>
+  <string name="ImportFragment_restore_encrypted_backup">استعادة نسخة احيتاطية مشفرة؟</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+استرجاع نسخة احتياطية مشفرة سيمسح بالكامل أي مفاتيح حالية أو اعدادات أو رسائل. ستفقد أي معلومات موجودة الآن في تكست سيكيور ولكن غير موجودة في النسخة الاحتياطية.</string>
   <string name="ImportFragment_restore">استعادة</string>
+  <string name="ImportFragment_import_plaintext_backup">استيارد نسخة احتياطية غير مشفرة؟</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">سيتم استيراد رسائل ظاهرة من نسخة احتياطية. إذا قمت سابقا باستيراد هذه النسخة الاحتياطية فسوف يؤدي اسيترادها مرة أخرى إلى تكرار الرسائل.</string>
   <string name="ImportFragment_importing">جاري الاستيراد...</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">استيراد النسخ الاحتياطية الغير المشفرة</string>
   <string name="ImportFragment_no_plaintext_backup_found">لم يتم العثور على نسح احتياطية غير مشفرة!</string>
@@ -105,24 +164,44 @@
   <string name="MmsDownloader_error_connecting_to_mms_provider">خطأ في الاتصال مع مزود خدمة رسالة الوسائط المتعددة...</string>
   <string name="MmsDownloader_error_reading_mms_settings">خطأ بقراءة اعدادات مزود خدمة رسائل الوسائط المتعددة...</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>
   <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">العبارات السرية غير متطابقة!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">العبارة السرية القديمة غير صحيحة!</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>
   <!--PromptMmsActivity-->
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">يجب أن تحدد عنوان أو رابط لمركز رسائل الوسائط المتعددة.</string>
+  <string name="PromptMmsActivity_mms_settings_updated">تم تحديث إعدادات رسائل الوسائط المتعددة</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">يمكنك تعديل هذه البيانات من اعدادات تكست سكيور بأي وقت.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">المفتاح لجهة الاتصال هذه مختلف عن المرة السابقة. هذا قد يعني ان هناك محاولة لاعتراض اتصالاتك، أو ان جهة الاتصال قام\قامت بإعادة تنصيب تكست سيكيور لديهم.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال هذه</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">التوقيع لجهة الاتصال هذه معتمد لديك، لكنك قمت بتعطيل خاصية اكمال تبادل المفاتيح اوتوماتيكياً</string>
+  <string name="ReceiveKeyActivity_processing">جاري العمل</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">جاري عمل تبادل المفاتيح...</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">يجب عليك تحديد\nرقم الهاتف الخاص بك</string>
+  <string name="RegistrationActivity_connect_with_textsecure">الاتصال بتيكست سيكيور</string>
+  <string name="RegistrationActivity_select_your_country">اختر بلدك</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">يجب عليك تحديد رمز دولتك</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">يجب عليك تحديد
+رقم الهاتف الخاص بك</string>
   <string name="RegistrationActivity_invalid_number">رقم غير صالح</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">الرقم الذي حددته (%s) غير صحيح.</string>
   <string name="RegistrationActivity_unsupported">غير مسنود </string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">عذرا، هذا المحمول لا يدعم المراسلات عبر بيانات شبكة الجوال. الهواتف العاملة بأنظمة أقدم من أندرويد 4.0 يجب أن يكون لديها حساب جوجل مسجل. الهواتف العاملة بنظام أندرويد 4.0 أو الأحدث لا تطلب حساب جوجل ولكن يجب أن يكون مثبت بها تطبيق سوق بلاي.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+سنقوم الآن بالتحقق من أن الرقم التالى مرتبط بهذا الهاتف:\n\n%s\n\n.
+هل الرقم صحيح أم تود في تحريره قبل الاستمرار؟</string>
   <string name="RegistrationActivity_continue">متابعة</string>
   <string name="RegistrationActivity_edit">تحرير</string>
   <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">مشاكل محتملة</string>
   <!--RegistrationProgressActivity-->
   <string name="RegistrationProgressActivity_verifying_number">جاري التحقٌق من الرقم</string>
   <string name="RegistrationProgressActivity_edit_s">تعديل %s</string>
@@ -131,13 +210,35 @@
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">يجب عليك إدخال الرمز الذي تلقيته اولاً...</string>
   <string name="RegistrationProgressActivity_connecting">جاري الاتصال</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">جاري الإتصال للتحقٌق...</string>
+  <string name="RegistrationProgressActivity_network_error">خطأ في الشبكة!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">تعذر الاتصال. برجاء فحص شبكة الاتصال والمحاولة مرة أخرى.</string>
+  <string name="RegistrationProgressActivity_verification_failed">فشل التحقق!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">كود التحقق الذي أدخلته غير صحيح.حاول مرة أخرى.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">محاولات كثيرة</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">لقد أدخلت كود التحقق مرات كثيرة. برجاء الانتظار دقيقة قبل المحاولة مرة أخرى.</string>
+  <string name="RegistrationProgressActivity_requesting_call">طلب مكالمة</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">طلب ورود مكالمة تحقق...</string>
+  <string name="RegistrationProgressActivity_server_error">خطأ في الخادم</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">لقد واجه الخادم خطأ. الرجاء المحاولة مرة أخرى.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">طلبات كثيرة جدا!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">لقد طلبت مؤخرا بآجراء مكالمة صوتية. يمكنك طلب مكالمة آخرى في 20 دقيقة. </string>
   <string name="RegistrationProgressActivity_verifying_voice_code">التحقق من رمز الصوت...</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_textsecure_registration_has_successfully_completed">تسجيل تيكست سيكيور تم بنجاح.</string>
+  <string name="RegistrationService_registration_error">خطأ في التسجيل</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">تسجيل تيكست سيكيور واجه مشكلة.</string>
   <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">تم استلام رسالة تبادل مفاتيح تالفة.</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+تم استلام رسالة تبادل مفاتيح لإصدارة بروتوكول غير صحيحة.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+تم استلام رسالة مع مفتاح هوية مجهول. أنقر للمتابعة والإظهار</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">تم استلام تحديث ولكن معلومات الهوية مجهولة. أنقر للتحقق من الهوية.</string>
   <string name="SmsMessageRecord_secure_session_ended">قناة التشفير انتهت.</string>
+  <string name="SmsMessageRecord_duplicate_message">رسالة مكررة.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">ترك الفريق...</string>
   <string name="TheadRecord_secure_session_ended">قناة التشفير انتهت.</string>
@@ -156,6 +257,7 @@
   <string name="VerifyKeysActivity_get_my_fingerprint_scanned">قم بالمسح الضوئي لبصمة مفتاحي</string>
   <string name="VerifyKeysActivity_scan_their_fingerprint">قم بالمسح الضوئي لبصمة مفتاحهم</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">تحذير: المفتاح الذي تم مسحه ضوئياً لا يتطابق! تأكد من بصمة المفتاح بحذر.</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">لم يتم التحقق!</string>
   <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">مفتاحهم صحيح. يجب أيضاً أن تقوم بالمسح الضوئي لبصمة مفتاحك.</string>
   <string name="VerifyKeysActivity_verified_exclamation">تم التحقق!</string>
   <!--ViewIdentityActivity-->
@@ -163,9 +265,13 @@
   <string name="ViewIdentityActivity_scan_to_compare">قم بالمسح الضوئي للمقارنة</string>
   <string name="ViewIdentityActivity_get_scanned_to_compare">قم بالمسح الضوئي للمقارنة</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">تحذير: المفتاح الذي تم مسحه ضوئياً لا يتطابق!</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">لم يتم التحقق!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">المفتاح الذي تم مسحه ضوئياً متطابق!</string>
   <string name="ViewIdentityActivity_verified_exclamation">تم التحقق!</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">بصمة الهوية</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">بصمة هويتي</string>
   <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">ابدأ على الرغم من الطلب الحالي؟</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">لقد قمت بارسال طلب انشاء قناة اتصال مسبقاً لجهة الاتصال هذه، هل تريد ارسال طلب آخر؟ هذه العملية ستلغي الطلب السابق.</string>
   <string name="KeyExchangeInitiator_send">ارسال</string>
   <!--MessageDisplayHelper-->
@@ -175,7 +281,9 @@
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server"> الاتصال مع مزود خدمة رسالة الوسائط المتعددة...</string>
   <string name="MmsDatabase_downloading_mms">تحميل رسالة الوسائط المتعددة...</string>
+  <string name="MmsDatabase_mms_download_failed">تنزيل رسالة الوسائط المتعددة فشلت!</string>
   <string name="MmsDatabase_downloading">تحميل...</string>
+  <string name="MmsDatabase_mms_pending_download">أنقر وقم بضبط إعدادات رسائل الوسائط المتعددة ثم تابع التنزيل</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">انتظر، يتم فك تشفير رسالة الوسائط المتعددة...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">خطأ بالرسالة المشفرة...</string>
@@ -184,14 +292,17 @@
   <string name="MmsSender_currently_unable_to_send_your_mms_message">غير قادر على ارسال الرسالة حاليا.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">جاري الاستيراد...</string>
+  <string name="ApplicationMigrationService_importing_text_messages">استيراد رسائل نصية</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">المس للفتح</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">أنقر للفتح أو أنقر رمز القفل للإغلاق</string>
   <string name="KeyCachingService_passphrase_cached">انفتح تكست سيكيور </string>
   <string name="KeyCachingService_lock">أقفل بعبارة سرية</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) رسائل جديدة</string>
   <string name="MessageNotifier_most_recent_from_s">آخر رسالة من: %s</string>
   <string name="MessageNotifier_encrypted_message">رسالة مشفرة</string>
+  <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
   <string name="MessageNotifier_message_delivery_failed">خطأ بإيصال الرسالة</string>
   <string name="MessageNotifier_failed_to_deliver_message">فشل في توصيل الرسالة</string>
   <string name="MessageNotifier_error_delivering_message">خطأ بالارسال</string>
@@ -201,13 +312,18 @@
   <string name="ViewLocalIdentityActivity_regenerating">إعادة الانشاء...</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">إعادة إنشاء مفتاح الهوية...</string>
   <string name="ViewLocalIdentityActivity_regenerated">تم إعادة الانشاء!</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">إعادة ضبط مفتاح الهوية؟</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+احذر! بإعادة ضبط مفتاح الهوية سيتم فقدان مفتاح هويتك الحالي بشكل دائم، وستتلقى قوائم اتصالاتك رسالة تحذير عند بداية محادثة آمنة معك. هل أنت متأكد من رغبتك في المتابعة؟</string>
   <string name="ViewLocalIdentityActivity_cancel">الغاء</string>
   <string name="ViewLocalIdentityActivity_continue">متابعة</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">غير قادر على ارسال الرسالة حاليا. سيتم ارسالها عندما تتوفر الخدمة مرة أخرى.</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">عذرا، الاستجابة السريعة ليست مدعمة من تيكست سيكيور حتى الآن!</string>
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">وصلتك رسالة من شخص لديه القدرة على بدء قناة تشفير. هل تريد بدء قناة تشفير حتى يكون الاتصال سري و آمن؟</string>
+  <string name="auto_initiate_activity__initiate_exchange">أبدا التبادل</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">العبارة السرية القديمة:</string>
   <string name="change_passphrase_activity__new_passphrase">العبارة السرية الجديدة:</string>
@@ -215,22 +331,45 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">لا توجد جهات اتصال.</string>
+  <string name="contact_selection_group_activity__finding_contacts">تحميل جهات الاتصالات...</string>
   <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">البحث باسم</string>
+  <string name="SingleContactSelectionActivity_you_are_not_registered_with_the_push_service">أنت غير مسجل في خدمة دفع الوصول إلى الرسائل...</string>
+  <string name="SingleContactSelectionActivity_updating_directory">تحديث القائمة</string>
+  <string name="SingleContactSelectionActivity_updating_push_directory">تحديث قائمة دفع وصول الرسائل</string>
+  <string name="SingleContactSelectionActivity_contact_photo">صورة جهة الاتصال</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">اختيار من أجل</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">لا توجد مكالمات حديثة.</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">أرسل رسالة تيكست سيكيور</string>
+  <string name="conversation_activity__type_message_sms_secure">إرسال رسالة آمنة</string>
+  <string name="conversation_activity__type_message_sms_insecure">إرسال رسالة غير آمنة</string>
+  <string name="conversation_activity__type_message_mms_secure">إرسال رسالة وسائط متعددة آمنة</string>
+  <string name="conversation_activity__type_message_mms_insecure">إرسال رسالة وسائط متعددة غير آمنة</string>
   <string name="conversation_activity__send">ارسال</string>
   <string name="conversation_activity__remove">إزالة</string>
+  <string name="conversation_activity__window_description">محادثة مع %1$s</string>
+  <string name="conversation_activity__compose_description">تكوين الرسالة</string>
+  <string name="conversation_activity__emoji_toggle_description">تبديل لوحة مفاتيح إيموجي</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">رسالة وسائط متعددة</string>
+  <string name="conversation_item__play_button_description">زر التشغيل</string>
+  <string name="conversation_item__secure_message_description">رسالة آمنة</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">تحميل</string>
   <string name="conversation_item_sent__downloading">تحميل</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">الإرسال فشل</string>
+  <string name="conversation_item_sent__pending_approval_description">في انتظار الموافقة</string>
+  <string name="conversation_item_sent__delivered_description">تم تسليم الرسالة</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">تحميل</string>
+  <string name="conversation_item_received__contact_photo_description">صورة جهة الاتصال</string>
   <string name="conversation_item_received__downloading">تحميل</string>
   <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">,وضع اختيار الدفعات</string>
+  <string name="conversation_fragment_cab__batch_selection_amount">%s اختيار</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">جاري تحميل البلدان...</string>
   <string name="country_selection_fragment__search">بحث</string>
@@ -243,11 +382,18 @@
   <string name="create_passphrase_activity__skip">تجاهل</string>
   <string name="create_passphrase_activity__create">إنشاء</string>
   <!--log_submit_activity-->
+  <string name="log_submit_activity__confirmation">سيتم نشر هذا السجل علانية على الانترنت للمطالعة بواسطة المساهمين في تيكست سيكيور. لا تتردد في فحص وتحرير السجلات أدناه قبل النقر على الإرسال.</string>
   <string name="log_submit_activity__button_cancel">لا تقدم</string>
   <string name="log_submit_activity__button_ok">قدَم</string>
+  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط سجلات التصحيح من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
   <string name="log_submit_activity__log_submit_success_title">نجحت!</string>
+  <string name="log_submit_activity__log_got_it">عُلم</string>
+  <string name="log_submit_activity__your_pastebin_url">الرجاء نسخ هذا الرابط ووضعه مع مشكلته (نقرة طويلة للنسخ في الحافظة الوسيطة):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">نسخ إلى الحافظة</string>
+  <string name="log_submit_activity__loading_logcat">تحميل سجلات المنظام…</string>
   <string name="log_submit_activity__thanks">شكرا لمساعدتك!</string>
+  <string name="log_submit_activity__submitting">إرسال</string>
+  <string name="log_submit_activity__posting_logs">نشر السجلات على pastebin...</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>
@@ -256,39 +402,82 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">قد تستغرق العملية عدة دقائق. يرجى الانتظار. سيتم تنبيهك عند انتهاء العملية.</string>
   <string name="database_migration_activity__importing">مهم!</string>
   <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">تحديث قاعدة البيانات...</string>
+  <string name="export_fragment__export_encrypted_backup">تصدير نسخة احتياطية مشفرة</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">تصدير نسخة احتياطية غير مشفرة لكرت الذاكرة...</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nتصدير نسخة غير مشفرة لكرت الذاكرة SD Card  بصيغة متوافقة مع SMSBackup And Restore</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">استيراد قاعدة البيانات\nمن تطبيق الرسائل الافتراضي لنظام التشغيل</string>
+  <string name="export_fragment__export_plaintext_backup">تصدير نسخة احتياطية غير مشفرة</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+تصدير نسخة غير مشفرة لكرت الذاكرة SD Card  بصيغة متوافقة مع SMSBackup And Restore</string>
+  <string name="import_fragment__import_system_sms_database">استيراد قاعدة بيانات الرسائل بالنظام</string>
+  <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_textsecure_backup">
+استعادة نسخة احتياطية مشفرة من تيكست سيكيور.</string>
+  <string name="import_fragment__import_plaintext_backup">استيراد نسخة احتياطية غير مشفرة</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">استيراد نسخة احتياطية غير مشفرة إلى ملف متوافق مع \"نسخ احتياطي واستعادة الرسائل\"</string>
+  <string name="local_identity__regenerate_key">إعادة توليد المفتاح</string>
   <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">إعدادات يدوية لرسائل الوسائط المتعددة مطلوبة لهاتفك.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">العبارة السرية لتكست سيكيور</string>
   <string name="prompt_passphrase_activity__unlock">فتح القفل</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">تيكست سيكيور يتطلب إعدادات رسائل الوسائط المتعددة من أجل تسليم الوسائط متعددة ورسائل المجموعات عبر المشغل اللاسلكي. هاتفك لا يتيح هذه المعلومة، كما هو الحال في بعض الأحيان مع الهواتف المقفولة أو هواتف ذات إعدادات مقيدة.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">من اجل إرسال وسائط متعددة ورسائل إلى مجموعات أضغط على \"تم\" وأكمل الإعدادات المطلوبة. يمكن العثور على إعدادات رسائل الوسائط المتعددة الخاصة بمشغل شبكة الجوال الخاصة بك بالبحث عن \"أسم المشغل APN\". سوف تحتاج إلى القيام  بهذه الخطوة مرة واحدة.</string>
   <string name="prompt_mms_activity__mmsc_url_required">عنوان مركز رسائل الوسائط المتعددة (الزامي)</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">عنوان بروكسي مركز رسائل الوسائط المتعددة (اختياري):</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">منفذ بروكسي مركز رسائل الوسائط المتعددة (اختياري):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">انتهاء</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+يمكن لتيكست سيكيور من استخدام التراسل اللحظي لزيادة الخصوصية وتجنب رسوم الرسائل النصية القصيرة أثناء الاتصال مع مستخدمين تيكست سيكيور آخرين. لتفعيل هذه الميزة يرجى التحقق من رمز دولتك ورقم الهاتف.</string>
   <string name="registration_activity__your_country">بلدك</string>
+  <string name="registration_activity__your_country_code_and_phone_number">رمز دولتك ورقم هاتفك</string>
   <string name="registration_activity__phone_number">رقم الهاتف</string>
   <string name="registration_activity__register">سجل</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">عملية التسجيل ستقوم بنقل بعض بيانات الاتصال إلى الخادم مؤقتا.</string>
   <string name="registration_activity__skip">تجاهل</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">بعض المشاكل المحتملة\nوتشمل:</string>
+  <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__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure لن يعمل مع أرقام Google Voice</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure لن يعمل مع أرقام Google Voice</string>
   <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">التحقق الصوتي</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+يمكن أيضا أن يقوم تيكست سيكيور بالاتصال بك للتحقق من رقمك. أضغط \"أتصل بي\" وقم بكتابة الكود الذي سوف تسمعه والمكون من 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__some_possible_problems_include">بعض المشاكل \nالمحتملة وتشمل:</string>
-  <string name="registration_progress_activity__no_network_connectivity">لا يوجد شبكة\nتوصيل.</string>
+  <string name="registration_progress_activity__textsecure_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__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nسيتم الآن التحقق من رقم هاتفك تلقائيا بواسطة رسالة تأكيد SMS.</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__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+سيتم الآن التحقق من رقم هاتفك تلقائيا بواسطة رسالة تأكيد SMS.</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__textsecure_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>
   <!--recipients_panel-->
   <string name="recipients_panel__to">ادخل اسم او رقم</string>
@@ -299,34 +488,55 @@
   <string name="verify_identity_activity__their_identity_they_read">هويتهم (كما يقرؤونها هم):</string>
   <string name="verify_identity_activity__your_identity_you_read">هويتك (كما تقرأها أنت):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">اسم الهوية:\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">الهوية المستوردة:\n</string>
+  <string name="verify_import_identity_activity__identity_name_n">اسم الهوية:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">هوية مستوردة:\\n</string>
   <string name="verify_import_identity_activity__verified">تم التحقق!</string>
   <string name="verify_import_identity_activity__compare">قارن</string>
   <!--verify_keys_activity-->
   <string name="verify_keys_activity__they_read_this">هم يقرؤون:</string>
   <string name="verify_keys_activity__you_read_this">أنت تقرأ:</string>
   <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">إنشاء عبارة سرية</string>
+  <string name="AndroidManifest__enter_passphrase">أدخل العبارة السرية</string>
+  <string name="AndroidManifest__select_contacts">اخر جهات الاتصال</string>
+  <string name="AndroidManifest__select_contact">اختر جهة الاتصال</string>
+  <string name="AndroidManifest__textsecure_detected">العثور على تيكست سيكيور </string>
+  <string name="AndroidManifest__public_identity_key">مفتاح الهوية العام</string>
   <string name="AndroidManifest__change_passphrase">غير العبارة السرية</string>
+  <string name="AndroidManifest__verify_session">تحقق من المحادثة</string>
+  <string name="AndroidManifest__verify_identity">تحقق من الهوية</string>
   <string name="AndroidManifest__manage_identity_keys">إدارة مفاتيح الهوية</string>
+  <string name="AndroidManifest__complete_key_exchange">أكمل تبادل المفاتيح</string>
+  <string name="AndroidManifest__log_submit">أرسل سجلات التصحيح</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">استيراد \ تصدير</string>
+  <string name="arrays__my_identity_key">مفتاح هويتي</string>
   <!--preferences.xml-->
   <string name="preferences__general">عام</string>
+  <string name="preferences__push_sms_category">خدمة دفع الرسائل والرسائل النصية القصيرة</string>
   <string name="preferences__pref_all_sms_title">إستخدم لإستقبال كل الرسائل النصية القصيرة</string>
   <string name="preferences__pref_all_mms_title">إستخدم لإستقبال كل الرسائل المتعددة الوسائط</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">استخدم تكست سيكيور لمشاهدة و حفظ كل الرسائل القصيرة الواردة</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">استخدم تكست سيكيور لمشاهدة وحفظ كل رسائل الوسائط المتعددة الواردة</string>
   <string name="preferences__input_settings">خيارات الادخال</string>
   <string name="preferences__enable_enter_key_title">تفعيل مفتاح الرجوع</string>
+  <string name="preferences__replace_smiley_with_enter_key">استبدال مفتاح الابتسامة بمفتاح الدخول</string>
+  <string name="preferences__pref_enter_sends_title">مفتاح الدخول يقوم بالإرسال</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">الضغط على مفتاح الدخول سيقوم بالإرسال الرسالة</string>
+  <string name="preferences__display_settings">إعدادات العرض</string>
+  <string name="preferences__choose_identity">اختيار الهوية</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">اختر جهة الاتصال من القائمة</string>
   <string name="preferences__change_passphrase">غير العبارة السرية</string>
   <string name="preferences__change_my_passphrase">غير عبارتي السرية</string>
   <string name="preferences__complete_key_exchanges">اكمال تبادل المفاتيح</string>
   <string name="preferences__disable_passphrase">تعطيل العبارة السرية</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">إيقاف تشفير الرسائل المفوظة و المفاتيح</string>
+  <string name="preferences__screen_security">أمان الشاشة</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">أكمل تبادل المفاتيح اوتوماتيكياً لمحادثات جديدة او قديمة بنفس مفتاح الهوية</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">امنع لقطات الشاشة داخل التطبيق وفي قائمة Recents</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">انسى العبارة السرية من ذاكرة الجهاز بعد فترة</string>
   <string name="preferences__timeout_passphrase">نسيان العبارة السرية بعد فترة</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">تحديد مهلة العبارة السرية</string>
   <string name="preferences__pref_timeout_interval_title">مدة الصلاحية</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">الوقت اللازم ليتم مسح العبارة السرية من الذاكرة</string>
   <string name="preferences__identity_key_settings">مفاتيح الهوية</string>
@@ -337,6 +547,10 @@
   <string name="preferences__display_message_notifications_in_status_bar">عرض تنبيهات الرسائل بشريط التنبيهات</string>
   <string name="preferences__led_color">لون ضوء التنبيه LED</string>
   <string name="preferences__pref_led_blink_title">اسلوب وميض LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">إعداد أسولب وميض LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">مضاءة لأجل:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">مطفأة:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">تمإعداد أسولب وميض LED!</string>
   <string name="preferences__sound">صوت</string>
   <string name="preferences__change_notification_sound">تغيير صوت التنبيه</string>
   <string name="preferences__inthread_notifications">تنبيهات داخل المحادثة</string>
@@ -352,12 +566,16 @@
   <string name="preferences__cyan">سماوي</string>
   <string name="preferences__magenta">وردي</string>
   <string name="preferences__white">أبيض</string>
+  <string name="preferences__none">لا شيء </string>
   <string name="preferences__fast">سريع</string>
   <string name="preferences__normal">طبيعي</string>
   <string name="preferences__slow">بطىء</string>
   <string name="preferences__custom">مخصص</string>
   <string name="preferences__advanced">متقدم</string>
   <string name="preferences__passphrase">العبارة السرية</string>
+  <string name="preferences__advanced_mms_access_point_names">تفضيلات رسائل الوسائط المتعددة</string>
+  <string name="preferences__enable_manual_mms">السماح برسائل وسائط متعددة يدوي</string>
+  <string name="preferences__override_system_mms_settings">تغيير إعدادات رسائل الوسائط المتعددة للنظام بالمعلومات أدناه.</string>
   <string name="preferences__mmsc_url_required">عنوان مركز رسائل الوسائط المتعددة (الزامي)</string>
   <string name="preferences__mms_proxy_host_optional">عنوان بروكسي رسائل الوسائط المتعددة (غير الزامي)</string>
   <string name="preferences__mms_proxy_port_optional">منفذ او بورت بروكسي  الرسائل الوسائط المتعددة (غير الزامي)</string>
@@ -369,19 +587,46 @@
   <string name="preferences__conversation_length_limit">حد طول المحادثة</string>
   <string name="preferences__trim_all_threads_now">نظف كل المحادثات الآن</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">افحص كل المحادثات وافرض حد الطول لكل محادثة</string>
+  <string name="preferences__light_theme">قالب فاتح</string>
+  <string name="preferences__dark_theme">قالب داكن</string>
   <string name="preferences__appearance">المظهر</string>
   <string name="preferences__theme">قالب</string>
   <string name="preferences__default">التلقائي</string>
   <string name="preferences__language">اللغة</string>
   <string name="preferences__make_default_sms_app">ضبط تكست سكيور كتطبيق الرسائل الافتراضي</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">اجعل تيكست سيكيور التطبيق الافتراضي للرسائل القصيرة ورسائل الوسائط المتعددة.</string>
+  <string name="preferences__use_data_channel">دفع وصول الرسائل</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+زيادة الخصوصية وتجنب رسوم الرسائل القصيرة مع مستخدمين تيكست سيكيور آخرين باستخدام الاتصال ببيانات شبكة الجوال</string>
+  <string name="preferences__allow_sms_fallback">السماح بالرسائل النصية إلى:</string>
+  <string name="preferences__allow_sms_fallback_disabled_reason"> تيكست سيكيور حاليا التطبيق الافتراضي للرسائل القصيرة. الرجاء اختيار تطبيق افتراضي آخر للرسائل القصيرة أولا لتغيير هذا التفضيل.</string>
+  <string name="preferences__refresh_push_directory">تحديث قائمة دفع وصول الرسائل</string>
+  <string name="preferences__submit_debug_log">إرسال سجل التصحيح</string>
+  <string name="preferences__sms_outgoing_push_users">مستخدمين تيكست سيكيور</string>
+  <string name="preferences__sms_fallback_push_users_ask">(أسال أولا)</string>
+  <string name="preferences__sms_outgoing_push_users_description">أرسل رسالة مؤمنة في حال فقدان الاتصال ببيانات شبكة الجوال</string>
+  <string name="preferences__sms_fallback_ask_fallback">أسأل قبل إرسال الرسالة</string>
+  <string name="preferences__sms_fallback_non_push_users">غير مستخدمين تيكست سيكيور</string>
+  <string name="preferences__sms_fallback_nobody">لا أحد</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">حدد الكل</string>
+  <string name="contact_selection_list__menu_unselect_all">إلغاء التحديد</string>
+  <string name="contact_selection_list__header_textsecure_users">مستخدمين تيكست سيكيور</string>
+  <string name="contact_selection_list__header_other">جهات الاتصال</string>
+  <string name="contact_selection_list__unknown_contact">رسالة جديدة إلى...</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">تم الانتهاء</string>
   <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">تحيدث قائمة الاتصال</string>
   <!--conversation_button_context-->
+  <string name="conversation_button_context__send_textsecure_message">أرسل رسالة تيكست سيكيور</string>
+  <string name="conversation_button_context__send_secure_sms">إرسال رسالة آمنة</string>
+  <string name="conversation_button_context__send_insecure_sms">إرسال رسالة غير آمنة</string>
+  <string name="conversation_button_context__send_secure_mms">إرسال رسالة وسائط متعددة آمنة</string>
+  <string name="conversation_button_context__send_insecure_mms">إرسال رسالة وسائط متعددة غير آمنة</string>
   <!--conversation_callable-->
   <string name="conversation_callable__menu_call">اتصال</string>
   <!--conversation_context-->
@@ -391,14 +636,25 @@
   <string name="conversation_context__menu_forward_message">إعادة ارسال الرسالة</string>
   <string name="conversation_context__menu_resend_message">إعادة إرسال الرسالة</string>
   <!--conversation_context_image-->
+  <string name="conversation_context_image__save_attachment">حفظ المرفق</string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">أبدا محادثة آمنة</string>
   <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">احذف المختار</string>
+  <string name="conversation_list_batch__menu_select_all">اختر الكل</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">بحث</string>
+  <string name="conversation_list__drawer_open">فتح نافذة الإبحار</string>
+  <string name="conversation_list__drawer_close">غلق نافذة الإبحار</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">الأمن</string>
+  <string name="conversation_secure_verified__menu_no_identity">الهوية غير متوفرة</string>
+  <string name="conversation_secure_verified__menu_verify_identity">تحقق من الهوية</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">إنهاء المحادثة الآمنة</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">إضافات</string>
+  <string name="conversation__menu_update_group">تحديث المجموعة</string>
+  <string name="conversation__menu_leave_group">أترك المجموعة</string>
   <string name="conversation__menu_add_contact_info">إضافة معلومات الاتصال</string>
   <string name="conversation__menu_delete_thread">مسح المحاذفة</string>
   <!--conversation_group_options-->
@@ -413,10 +669,19 @@
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">فتح القفل</string>
   <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">رسالة جديدة</string>
+  <string name="text_secure_normal__menu_new_group">مجموعة جديدة</string>
   <string name="text_secure_normal__menu_settings">الاعدادات</string>
   <string name="text_secure_normal__menu_clear_passphrase">أقفل</string>
+  <string name="text_secure_normal__mark_all_as_read">اعتبارها رسائل مقروءة</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">تم التحقق!</string>
   <!--reminder_header-->
+  <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>
   <!--EOF-->
 </resources>
diff --git a/res/values-bo/strings.xml b/res/values-bo/strings.xml
index 78b420958e..378b184812 100644
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@@ -200,8 +200,6 @@
   <string name="verify_identity_activity__their_identity_they_read">གཞན་གྱི་ངོས་འཛིན། (ཁོང་ཚོས་ཀློགས)</string>
   <string name="verify_identity_activity__your_identity_you_read">ཁྱེད་ཀྱི་ངོས་འཛིན། (ཁྱེད་ཀྱིས་ཀློགས)</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">ངོས་འཛིན་གྱི་མིང་། </string>
-  <string name="verify_import_identity_activity__imported_identity_n">ནང་འཇུག་བྱས་པའི་ངོས་འཛིན།</string>
   <string name="verify_import_identity_activity__verified">ར་སྤྲོད་བྱས་ཟིན།</string>
   <string name="verify_import_identity_activity__compare">ཞིབ་བསྡུར་བྱོས།  </string>
   <!--verify_keys_activity-->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8cbc0a475f..8fb1bf8ccb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -19,7 +19,9 @@
   <string name="ApplicationPreferencesActivity_unregistering">Des-registrant...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Des-registrant per les comunicacions basades en dades</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Desactivar els missatges push?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nAixò desactivarà els missatges push des-registran-te del servidor.\nNecessitaràs tornar a registrar el teu número de telèfon per utilitzar els missatges push una altra vegada.</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+Això desactivarà els missatges push des-registran-te del servidor.
+Necessitaràs tornar a registrar el teu número de telèfon per utilitzar els missatges push una altra vegada.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Error connectant amb el servidor!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">No estàs registrat al servei push...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Actualitzant directori</string>
@@ -62,8 +64,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Estàs segur que vols deixar aquest grup?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalls del missatge</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nEnviat/Rebut:%2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Remitent: %1$s\nTransport: %2$s\nEnviat: %3$s\nRebut:%4$s</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Estàs segur que vols esborrar permanentment aquest missatge?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Aquest contingut ha estat emmagatzemant en una base de dades encriptada. La versió que desis a la targeta SD ja no estarà encriptada. Vols continuar?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Error mentre es desava l\'adjunt a la targeta SD!</string>
@@ -145,7 +145,6 @@
   <string name="RegistrationActivity_invalid_number">Número invàlid</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">El número que has especificat (%s) és invàlid.</string>
   <string name="RegistrationActivity_unsupported">No suportat</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">Ara verificarem que el número següent està associat amb aquest dispositiu:\n\n%s\n\nÉs aquest el número correcte, o vols editar-lo abans de continuar?</string>
   <string name="RegistrationActivity_continue">Continua</string>
   <string name="RegistrationActivity_edit">Edita</string>
   <!--RegistrationProblemsActivity-->
@@ -292,7 +291,6 @@
   <string name="log_submit_activity__log_fetch_failed">No s\'han pogut recollir els registres del teu dispositiu. Encara pots utilitzar ADB per aconseguir els registres de depuració.</string>
   <string name="log_submit_activity__log_submit_success_title">Èxit!</string>
   <string name="log_submit_activity__log_got_it">Ho tinc</string>
-  <string name="log_submit_activity__your_pastebin_url">Si us plau copia aquesta URL i afegeix el teu problema (apretada llarga per posar-ho al portapapers):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Copiat al portapapers</string>
   <string name="log_submit_activity__loading_logcat">Carregant logcat...</string>
   <string name="log_submit_activity__thanks">Gràcies per la teva ajuda!</string>
@@ -304,9 +302,11 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Això pot tardar una mica. Si us plau sigues pacient, et notificarem quan la importació estigui completa.</string>
   <string name="database_migration_activity__importing">IMPORTANT</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporta una còpia de seguretat\nencriptada a la targeta SD.</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporta una còpia de seguretat
+encriptada a la targeta SD.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporta una còpia de seguretat en text pla compatible amb \'Còpia de seguretat i restauració d\'SMS\' a la targeta SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importa la base de dades\ndes de l\'app de missatgeria predeterminada del sistema.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importa la base de dades
+des de l\'app de missatgeria predeterminada del sistema.</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Restaura una còpia de seguretat encriptada de TextSecure prèviament exportada.</string>
   <string name="import_fragment__import_a_plaintext_backup_file">Importa un arxiu de còpia de seguretat en text pla. Compatible amb \'Còpia de seguretat i restauració d\'SMS\'.</string>
   <!--mms_preferences_activity-->
@@ -323,7 +323,8 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complet</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure pot utilitzar missatges instantanis per incrementar la privacitat i evitar càrrecs d\'SMS quan es comuniqui amb altres usuaris de TextSecure. Per habilitar aquesta característica, si us plau verifica el teu codi de país i el teu número de telèfon.</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+TextSecure pot utilitzar missatges instantanis per incrementar la privacitat i evitar càrrecs d\'SMS quan es comuniqui amb altres usuaris de TextSecure. Per habilitar aquesta característica, si us plau verifica el teu codi de país i el teu número de telèfon.</string>
   <string name="registration_activity__your_country">EL TEU PAÍS</string>
   <string name="registration_activity__your_country_code_and_phone_number">EL TEU CODI DE PAÍS I NÚMERO DE TELÈFON</string>
   <string name="registration_activity__phone_number">NÚMERO DE TELÈFON</string>
@@ -362,8 +363,6 @@
   <string name="verify_identity_activity__their_identity_they_read">La seva identitat (ells llegeixen):</string>
   <string name="verify_identity_activity__your_identity_you_read">La teva identitat (tu llegeixes):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nom de l\'identitat:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identitat importada:\\n</string>
   <string name="verify_import_identity_activity__verified">Verificat!</string>
   <string name="verify_import_identity_activity__compare">Compara</string>
   <!--verify_keys_activity-->
@@ -439,7 +438,8 @@
   <string name="preferences__make_default_sms_app">Estableix com a app d\'SMS predeterminada</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Fes TextSecure l\'aplicació d\'SMS/MMS predeterminada del teu sistema.</string>
   <string name="preferences__use_data_channel">Missatges Push</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAugmenta la privacitat i evita els càrrecs d\'SMS utilitzant el canal de dades per comunicar-se amb altres usuaris de TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Augmenta la privacitat i evita els càrrecs d\'SMS utilitzant el canal de dades per comunicar-se amb altres usuaris de TextSecure</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure és actualment la teva app d\'SMS predeterminada. Si us plau estableix una altra app d\'SMS abans de canviar aquesta preferència.</string>
   <string name="preferences__submit_debug_log">Envia un registre de depuració</string>
   <!--****************************************-->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index d67398010a..f72f78a1b1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -14,7 +14,11 @@
   <string name="ApplicationPreferencesActivity_delete">Slet</string>
   <string name="ApplicationPreferencesActivity_my">Min</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktiverer kryptering af lager?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n Advarsel! Dette vil deaktiverer kryptering af lager for alle beskeder og nøgler.\n Dine krypterede sessioner vil fortsætte med at fungere,\n men alle med fysisk adgang til din enhed kan få adgang til dem.\n</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+ Advarsel! Dette vil deaktiverer kryptering af lager for alle beskeder og nøgler.
+ Dine krypterede sessioner vil fortsætte med at fungere,
+ men alle med fysisk adgang til din enhed kan få adgang til dem.
+</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivere</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kunne ikke forbinde til serveren!</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -49,7 +53,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Er du sikker at du vil forlade denne gruppe?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Besked detaljer</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Sender: %1$s\nTransport: %2$s\nSendt: %3$s\nModtaget: %4$s</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Er du sikker på at du ønsker at slette denne besked?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Data er gemt i en krypteret database. Versionen du gemmer på SD-kortet vil ikke længere være krypteret. Vil du fortsætte?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Kunne ikke gemme vedhæftning på SD-kort!</string>
@@ -86,7 +89,8 @@
   <string name="ImportFragment_this_will_import_messages_from_the_system">Dette vil importere beskeder fra systemets standard SMS database til TextSecure.</string>
   <string name="ImportFragment_import">Importer</string>
   <string name="ImportFragment_cancel">Afbryd</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nGenoprettelse af en krypteret backup vil overskrive eksisterende nøgler, indstillinger og beskeder. Du vil miste de informationer i TextSecure som ikke findes i din backup.</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Genoprettelse af en krypteret backup vil overskrive eksisterende nøgler, indstillinger og beskeder. Du vil miste de informationer i TextSecure som ikke findes i din backup.</string>
   <string name="ImportFragment_restore">Genopret</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dette vil importere beskeder fra en klartekst backup. Hvis du tidligere har importeret den samme backup, vil det resultere i dupletter.</string>
   <string name="ImportFragment_importing">Importerer</string>
@@ -114,19 +118,26 @@
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Du skal specificere en MMSC URL for din operatør.</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Du kan ændre disse værdier når som helst i konfigurationsmenuen for TextSecure.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne udvekslingsnøgle er ikke ens med den som du tidligere modtog fra denne\nkontakt. Det kan enten betyde, at der er nogle som prøver på at kompromitterer din kommunikation eller\nat din kontakt har installeret TextSecure på ny og dermed fået en ny udvekslingsnøgle.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Du bør verificere\ndenne kontakt.</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Signaturen på denne udvekslingsnøgle er til at stole på, men du har deaktiveret indstillingen\n\'fuldfør udvekslingsnøgler automatisk\'.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne udvekslingsnøgle er ikke ens med den som du tidligere modtog fra denne
+kontakt. Det kan enten betyde, at der er nogle som prøver på at kompromitterer din kommunikation eller
+at din kontakt har installeret TextSecure på ny og dermed fået en ny udvekslingsnøgle.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Du bør verificere
+denne kontakt.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Signaturen på denne udvekslingsnøgle er til at stole på, men du har deaktiveret indstillingen
+\'fuldfør udvekslingsnøgler automatisk\'.</string>
   <string name="ReceiveKeyActivity_processing">Arbejder</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Arbejder på nøgleudvekling...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Forbind med TextSecure</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Du skal vælge din\nlandekode</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Du skal skrive dit\ntelefonnummer</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Du skal vælge din
+landekode</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Du skal skrive dit
+telefonnummer</string>
   <string name="RegistrationActivity_invalid_number">Ikke gyldigt nummer</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Det nummer som du\nindtastede (%s) er ugyldigt.\n    </string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Det nummer som du
+indtastede (%s) er ugyldigt.
+    </string>
   <string name="RegistrationActivity_unsupported">Ikke understøttet</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\n        Kontrollerer at det følgende nummer hører til denne enhed:\n\n%s\n\n\n        Er dette nummer korrekt eller vil du redigere det før du fortsætter?\n    </string>
   <string name="RegistrationActivity_continue">Fortsæt</string>
   <string name="RegistrationActivity_edit">Rediger</string>
   <!--RegistrationProblemsActivity-->
@@ -151,9 +162,12 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure er blevet registreret.</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Der opstod en fejl under registreringen af TextSecure.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Modtog en ugyldig\nnøgle-besked!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nModtog en nøgle-besked for en ugyldig protokol-version.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nModtog en besked med en ukendt identitetsnøgle. Klik for se og behandle den.</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Modtog en ugyldig
+nøgle-besked!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Modtog en nøgle-besked for en ugyldig protokol-version.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Modtog en besked med en ukendt identitetsnøgle. Klik for se og behandle den.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sikker session afsluttet.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Forlod gruppen...</string>
@@ -220,7 +234,10 @@
   <string name="ViewLocalIdentityActivity_regenerating">Regenererer...</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenererer ID-nøgle...</string>
   <string name="ViewLocalIdentityActivity_regenerated">Regenereret!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nADVARSEL! Ved at regenerere din ID-nøgle vil din nuværende ID-nøgle gå tabt, og dine eksisterende kontakter vil modtage en advarsel når de forsøger at oprette sikre sessioner med dig.\n\nEr du sikker på at du vil fortsætte?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+ADVARSEL! Ved at regenerere din ID-nøgle vil din nuværende ID-nøgle gå tabt, og dine eksisterende kontakter vil modtage en advarsel når de forsøger at oprette sikre sessioner med dig.
+
+Er du sikker på at du vil fortsætte?</string>
   <string name="ViewLocalIdentityActivity_cancel">Afbryd</string>
   <string name="ViewLocalIdentityActivity_continue">Fortsæt</string>
   <!--SmsReceiver-->
@@ -277,8 +294,10 @@
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksporter en krypteret backup til SD-kort.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Eksporter en klartekst backup kompatibel med \'SMSBackup And Restore\' til SD-kort.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importer databasen fra systemets standard SMS applikation.</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nGenopret en tidligere eksporteret krypteret TextSecure backup.</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nImporter en klartekst backup fil. Kompatibel med \'SMSBackup And Restore\'.</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Genopret en tidligere eksporteret krypteret TextSecure backup.</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Importer en klartekst backup fil. Kompatibel med \'SMSBackup And Restore\'.</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Din telefon kræver manuel indtastning af MMS-indstillinger.</string>
   <!--prompt_passphrase_activity-->
@@ -294,25 +313,37 @@
   <string name="receive_key_activity__complete">Udført</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">DIT LAND</string>
-  <string name="registration_activity__your_country_code_and_phone_number">DIT LANDE KODE OG\nTELEFONNUMMER</string>
+  <string name="registration_activity__your_country_code_and_phone_number">DIT LANDE KODE OG
+TELEFONNUMMER</string>
   <string name="registration_activity__phone_number">TELEFONNUMMER</string>
   <string name="registration_activity__register">Register</string>
   <string name="registration_activity__skip">Spring over</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Mulige problemer:</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nVisse tredjeparts SMS-apps som f.eks. Handcent og GoSMS overtager alle modtagne SMSer.\nSe om du har modtaget en SMS som starter med \"Your TextSecure verification code:\". \nHvis dette er tilfældet skal du konfigurere din tredjeparts SMS-app til at lade tekst-beskeder slippe igennem.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Visse tredjeparts SMS-apps som f.eks. Handcent og GoSMS overtager alle modtagne SMSer.
+Se om du har modtaget en SMS som starter med \"Your TextSecure verification code:\". 
+Hvis dette er tilfældet skal du konfigurere din tredjeparts SMS-app til at lade tekst-beskeder slippe igennem.</string>
   <string name="registration_problems__incorrect_number">Forkert nummer.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure virker ikke med Google Voice numre.\n</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure virker ikke med Google Voice numre.
+</string>
   <!--registration_progress_activity-->
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure kan også ringe dig op for at kontrollere dit nummer. Klik \"Ring mig op\" og\nindtast det sekscifrede nummer du hører.</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+TextSecure kan også ringe dig op for at kontrollere dit nummer. Klik \"Ring mig op\" og
+indtast det sekscifrede nummer du hører.</string>
   <string name="registration_progress_activity__verify">Godkend</string>
   <string name="registration_progress_activity__edit_number">Rediger nummer</string>
   <string name="registration_progress_activity__connectivity_error">Forbindelse fejl.</string>
   <string name="registration_progress_activity__connecting">Forbinder...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Venter på SMS\ngodkendelse...\n</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Venter på SMS
+godkendelse...
+</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dette kan vare et øjeblik. Hav tålmodighed - vi siger til når verifikationen er afsluttet.</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS godkendelse\nfejlede.\n</string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS godkendelse
+fejlede.
+</string>
   <string name="registration_progress_activity__generating_keys">Genererer nøgler...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Indtast navn eller nummer</small></string>
@@ -323,8 +354,6 @@
   <string name="verify_identity_activity__their_identity_they_read">Deres identitet (de læser):</string>
   <string name="verify_identity_activity__your_identity_you_read">Din identitet (du læser):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Identitets navn:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importeret identitet:\\n</string>
   <string name="verify_import_identity_activity__verified">Bekræftet!</string>
   <string name="verify_import_identity_activity__compare">Sammenlign</string>
   <!--verify_keys_activity-->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 097093736b..d09a5d4089 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,12 +14,18 @@
   <string name="ApplicationPreferencesActivity_delete">Eliminar</string>
   <string name="ApplicationPreferencesActivity_my">Mi</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">¿Deshabilitar cifrado del almacenamiento?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n        Atención, esto deshabilitará el cifrado del almacenamiento para todos los mensajes y claves. Sus sesiones cifradas\n        funcionarán pero cualquiera con acceso físico a su dispositivo podrá acceder a ellas.\n    </string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+        Atención, esto deshabilitará el cifrado del almacenamiento para todos los mensajes y claves. Sus sesiones cifradas
+        funcionarán pero cualquiera con acceso físico a su dispositivo podrá acceder a ellas.
+    </string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Cancelando registro...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Cancelando registro para comunicación basada en datos</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">¿Deshabilitar mensajes activos?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nEsto deshabilitará los mensajes activos (\'push\') desregistrándole del servidor \nNecesitará volver a registrar su número de teléfono para usar los mensajes activos de nuevo en el futuro.\n    </string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+Esto deshabilitará los mensajes activos (\'push\') desregistrándole del servidor 
+Necesitará volver a registrar su número de teléfono para usar los mensajes activos de nuevo en el futuro.
+    </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Error conectando al servidor!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">No está registrado con el servicio de mensajería activa...,</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Actualizando directorio</string>
@@ -52,7 +58,7 @@
   <string name="ConversationItem_click_to_approve_mms_dialog_title">¿Recurrir al MMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">¿Recurrir a SMS no cifrado?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">¿Recurir al MMS cifrado?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque no pudo establecerse una sesión segura.\n\n¿Enviar mensaje no seguro?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Este mensaje <b>no</b> se cifrará porque no se pudo establecer una conexión segura.\n\n¿Enviar mensaje no seguro?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">¿Iniciar sesión segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">¿Iniciar sesión segura con %s?</string>
@@ -81,8 +87,12 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">¿Está seguro de que quiere dejar este grupo?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviado/Recibido: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Emisor: %1$s\nTransporte: %2$s\nEnviado: %3$s\nRecibido:%4$s</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s
+Enviado/Recibido: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Emisor: %1$s
+Transporte: %2$s
+Enviado: %3$s
+Recibido:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmar borrado de mensaje</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">¿Está seguro que desea borrar permanentemente este mensaje?</string>
   <string name="ConversationFragment_save_to_sd_card">¿Guardar en la tarjeta SD?</string>
@@ -105,17 +115,27 @@
   <string name="ShareActivity_share_with">Compartir con</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">¿Exportar a tarjeta SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Esto\n        exportará sus claves cifradas, configuración y mensajes a la tarjeta SD.\n    </string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Esto
+        exportará sus claves cifradas, configuración y mensajes a la tarjeta SD.
+    </string>
   <string name="ExportFragment_export">Exportar</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">¿Exportar texto simple a la tarjeta SD?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atención, esto\n        exportará sus mensajes en claro desde TextSecure a la tarjeta SD.\n    </string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atención, esto
+        exportará sus mensajes en claro desde TextSecure a la tarjeta SD.
+    </string>
   <string name="ExportFragment_cancel">Cancelar</string>
   <string name="ExportFragment_exporting">Exportando</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportando mensajes en claro a la tarjeta SD...\n    </string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Error, ¡no se puede escribir en la tarjeta SD!\n     \n    </string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Se produjo un error mientras se escribía la tarjeta SD.\n    </string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportando mensajes en claro a la tarjeta SD...
+    </string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Error, ¡no se puede escribir en la tarjeta SD!
+     
+    </string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Se produjo un error mientras se escribía la tarjeta SD.
+    </string>
   <string name="ExportFragment_success">¡Éxito!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportando claves cifradas,\n        configuración y mensajes...\n    </string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportando claves cifradas,
+        configuración y mensajes...
+    </string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuevo grupo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizar grupo</string>
@@ -136,14 +156,23 @@
   <string name="ImportExportActivity_export">Exportar</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">¿Importar base de datos de SMS del sistema?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Esto importará\n        los mensajes desde la base de datos de SMS del sistema a TextSecure. Si la ha importado\n        anteriormente, obtendrá mensajes duplicados.\n    </string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Esto importará
+        los mensajes desde la base de datos de SMS del sistema a TextSecure. Si la ha importado
+        anteriormente, obtendrá mensajes duplicados.
+    </string>
   <string name="ImportFragment_import">Importar</string>
   <string name="ImportFragment_cancel">Cancelar</string>
   <string name="ImportFragment_restore_encrypted_backup">¿Restaurar copia de seguridad cifrada?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n        Restaurar una copia de seguridad cifrada reemplazará completamente sus claves, preferencias y\n        mensajes. Perderá cualquier información que se encuentre en su instalación actual de TextSecure pero no\n       en la copia de seguridad.\n    </string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+        Restaurar una copia de seguridad cifrada reemplazará completamente sus claves, preferencias y
+        mensajes. Perderá cualquier información que se encuentre en su instalación actual de TextSecure pero no
+       en la copia de seguridad.
+    </string>
   <string name="ImportFragment_restore">Restaurar</string>
   <string name="ImportFragment_import_plaintext_backup">¿Importar copia de seguridad en texto simple?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Esto importará\nmensajes desde una copia de respaldo en texto plano. Si ha importado previamente esta copia de respaldo,\nimportarla de nuevo dará como resultado mensajes duplicados.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Esto importará
+mensajes desde una copia de respaldo en texto plano. Si ha importado previamente esta copia de respaldo,
+importarla de nuevo dará como resultado mensajes duplicados.</string>
   <string name="ImportFragment_importing">Importando</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importando copia de seguridad de mensajes en claro...</string>
   <string name="ImportFragment_no_plaintext_backup_found">¡No se encontró una copia de seguridad de los mensajes en claro!</string>
@@ -163,7 +192,8 @@
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Mensaje multimedia</string>
   <!--MessageRecord-->
-  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Se recibió un mensaje cifrado con una versión antigua de TextSecure que ya no está soportada.\nPor favor pida al remitente que actualice a la versión más reciente y reenvíe el mensaje.</string>
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Se recibió un mensaje cifrado con una versión antigua de TextSecure que ya no está soportada.
+Por favor pida al remitente que actualice a la versión más reciente y reenvíe el mensaje.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">¡Las frases contraseña no coinciden!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">¡Frase de contraseña anterior incorrecta!</string>
@@ -178,20 +208,38 @@
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Puedes modificar estos valores en el menú de configuración de TextSecure en cualquier momento.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La firma en este intercambio de claves es diferente de lo que previamente ha recibido de este contacto. Esto podría significar que alguien está intentando interceptar las comunicaciones o que este contacto simplemente reinstaló TextSecure y ahora tiene una nueva clave de identidad.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Puede que desees verificar⏎\neste contacto.⏎</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Puede que desees verificar⏎
+este contacto.⏎</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">La firma en este intercambio de claves está verificada, pero pero tiene la opción \'intercambio de clave completa automático\', desactivada.</string>
   <string name="ReceiveKeyActivity_processing">Procesando</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Procesando intercambio de claves...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectar con TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Seleccione su país</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Debe especificar su\ncódigo de país\n</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Debe especificar su\nnúmero de teléfono\n</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Debe especificar su
+código de país
+</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Debe especificar su
+número de teléfono
+</string>
   <string name="RegistrationActivity_invalid_number">Número inválido</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">El número que especificó\n(%s) no es válido.\n</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">El número que especificó
+(%s) no es válido.
+</string>
   <string name="RegistrationActivity_unsupported">No soportado</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Lo sentimos,\neste dispositivo no está soportado para mensajería de datos. Los dispositivos que ejecutan versiones de Android más antiguas\nque la 4.0, deben tener registrada una cuenta de Google. Los dispositivos que ejecutan Android 4.0 o más reciente no\nrequieren una cuenta de Google, pero deben tener la aplicación de la Play Store instalada.\n </string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nAhora verificaremos que el siguiente número esté asociado con este dispositivo:\n\n%s\n\n\n¿Es correcto este número, o preferiría editarlo antes de continuar?\n</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Lo sentimos,
+este dispositivo no está soportado para mensajería de datos. Los dispositivos que ejecutan versiones de Android más antiguas
+que la 4.0, deben tener registrada una cuenta de Google. Los dispositivos que ejecutan Android 4.0 o más reciente no
+requieren una cuenta de Google, pero deben tener la aplicación de la Play Store instalada.
+ </string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+        Ahora verificaremos que el siguiente número esté asociado con este dispositivo:
+
+%s
+
+
+        ¿Es correcto este número, o preferiría cambiarlo antes de continuar?
+    </string>
   <string name="RegistrationActivity_continue">Continuar</string>
   <string name="RegistrationActivity_edit">Editar</string>
   <!--RegistrationProblemsActivity-->
@@ -225,9 +273,15 @@
   <string name="RegistrationService_registration_error">Error al registrarse</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">El proceso de registro de TextSecure ha encontrado un problema.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">¡Se recibió un mensaje corrupto\nde intercambio de claves!\n</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nSe recibió un mensaje de intercambio de claves para una versión no válida del protocolo.\n</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nSe recibió un mensaje con una clave de identidad desconocida. Haga clic para procesar y mostrar.\n</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">¡Se recibió un mensaje corrupto
+de intercambio de claves!
+</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Se recibió un mensaje de intercambio de claves para una versión no válida del protocolo.
+</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Se recibió un mensaje con una clave de identidad desconocida. Haga clic para procesar y mostrar.
+</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Recibí actualizado pero con información de identidad desconocida. Pulse para validar identidad.</string>
   <string name="SmsMessageRecord_secure_session_ended">La sesión segura finalizó.</string>
   <string name="SmsMessageRecord_duplicate_message">Duplicar mensaje.</string>
@@ -302,10 +356,16 @@
   <string name="MessageNotifier_mark_as_read">Marcar como leídos</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Regenerando...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenerando clave de\n        identidad...\n    </string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Regenerando clave de
+        identidad...
+    </string>
   <string name="ViewLocalIdentityActivity_regenerated">¡Clave regenerada!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">¿Reinicializar clave de identidad?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\n        Atención: Regenerando su clave de identidad, ésta se perderá de manera permanente,\n        y sus contactos recibirán alertas cuando intenten establecer nuevas sesiones seguras con usted.\n       ¿Está seguro de querer continuar?\n    </string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+        Atención: Regenerando su clave de identidad, ésta se perderá de manera permanente,
+        y sus contactos recibirán alertas cuando intenten establecer nuevas sesiones seguras con usted.
+       ¿Está seguro de querer continuar?
+    </string>
   <string name="ViewLocalIdentityActivity_cancel">Cancelar</string>
   <string name="ViewLocalIdentityActivity_continue">Continuar</string>
   <!--SmsReceiver-->
@@ -379,7 +439,9 @@
   <string name="log_submit_activity__log_fetch_failed">No pudieron tomarse los registros de actividad (logs) de su dispositivo. Aún puede usar ADB (Android debug bridge) para obtener los registros de depuración en su lugar.</string>
   <string name="log_submit_activity__log_submit_success_title">¡Completado!</string>
   <string name="log_submit_activity__log_got_it">Lo tengo</string>
-  <string name="log_submit_activity__your_pastebin_url">Por favor copie esta URL y añádala a su informe (mantenga pulsado para llevarla al portapapeles):\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__your_pastebin_url">Por favor copie esta URL y añádalo a su informe (mantenga pulsado para llevarla al portapapeles):
+
+<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Copiado al portapapeles</string>
   <string name="log_submit_activity__loading_logcat">Cargando registro...</string>
   <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
@@ -395,15 +457,23 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Actualizando base de datos...</string>
   <string name="export_fragment__export_encrypted_backup">Exportar copia de seguridad cifrada</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar copia de seguridad\n        cifrada a la tarjeta SD.\n    </string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar copia de seguridad
+        cifrada a la tarjeta SD.
+    </string>
   <string name="export_fragment__export_plaintext_backup">Exportar copia de seguridad en texto simple</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n        Exportar una copia de seguridad de los mensajes en claro compatible con \'SMSBackup And Restore\'  a la tarjeta SD.</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+        Exportar una copia de seguridad de los mensajes en claro compatible con \'SMSBackup And Restore\'  a la tarjeta SD.</string>
   <string name="import_fragment__import_system_sms_database">Importar base de datos de SMS del sistema</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importar la base de datos\n        desde la aplicación de mensajería del sistema por defecto.\n    </string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importar la base de datos
+        desde la aplicación de mensajería del sistema por defecto.
+    </string>
   <string name="import_fragment__import_encrypted_backup">Importar copia de seguridad cifrada</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\n       Restaurar una copia de seguridad cifrada previamente exportada desde TextSecure.\n    </string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+       Restaurar una copia de seguridad cifrada previamente exportada desde TextSecure.
+    </string>
   <string name="import_fragment__import_plaintext_backup">Importar copia de seguridad en texto simple</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\n        Importar una copia de seguridad de mensajes en claro compatible con \'SMSBackup And Restore.\'</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+        Importar una copia de seguridad de mensajes en claro compatible con \'SMSBackup And Restore.\'</string>
   <string name="local_identity__regenerate_key">Regenerar clave</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Se requiere configuración manual de MMS para su teléfono.</string>
@@ -419,41 +489,82 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completo</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure puede usar mensajes instantáneos para incrementar la privacidad y evitar cargos por SMS al comunicarse con otros\nusuarios de TextSecure. Para habilitar esta característica, por favor verifique su código de país y número de teléfono.\n</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+TextSecure puede usar mensajes instantáneos para incrementar la privacidad y evitar cargos por SMS al comunicarse con otros
+usuarios de TextSecure. Para habilitar esta característica, por favor verifique su código de país y número de teléfono.
+</string>
   <string name="registration_activity__your_country">SU PAÍS</string>
-  <string name="registration_activity__your_country_code_and_phone_number">SU CÓDIGO DE PAÍS Y\nNÚMERO DE TELÉFONO\n</string>
+  <string name="registration_activity__your_country_code_and_phone_number">SU CÓDIGO DE PAÍS Y
+NÚMERO DE TELÉFONO
+</string>
   <string name="registration_activity__phone_number">NÚMERO DE TELÉFONO</string>
   <string name="registration_activity__register">Registro</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">El registro transmitirá temporalmente cierta información de contacto al servidor.</string>
   <string name="registration_activity__skip">Saltar</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Algunos posibles problemas\nincluyen:\n</string>
+  <string name="registration_problems__some_possible_problems_include">Algunos posibles problemas
+incluyen:
+</string>
   <string name="registration_problems__sms_interceptors">Interceptores de SMS.</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nAlgunos clientes de mensajería de texto de terceras partes, tales como Handcent o GoSMS, tienen un pobre comportamiento\ne interceptan todos los mensajes SMS entrantes. Compruebe si no recibió un mensaje de texto que comience con\n\'Your TextSecure verification code:\' (su mensaje de código de verificación), en cuyo caso necesitará configurar\nsu aplicación de mensajería de texto de tercera parte para permitir que los mensajes pasen a través de ella.\n</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Algunos clientes de mensajería de texto de terceras partes, tales como Handcent o GoSMS, tienen un pobre comportamiento
+e interceptan todos los mensajes SMS entrantes. Compruebe si no recibió un mensaje de texto que comience con
+\'Your TextSecure verification code:\' (su mensaje de código de verificación), en cuyo caso necesitará configurar
+su aplicación de mensajería de texto de tercera parte para permitir que los mensajes pasen a través de ella.
+</string>
   <string name="registration_problems__incorrect_number">Número incorrecto.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\n        Por favor asegúrese de que introdujo su número de teléfono correctamente, y de que tiene el formato\n        correcto para su región.\n    </string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+        Por favor asegúrese de que introdujo su número de teléfono correctamente, y de que tiene el formato
+        correcto para su región.
+    </string>
   <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\n        TextSecure no funcionará con números de Google Voice.\n    </string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+        TextSecure no funcionará con números de Google Voice.
+    </string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Verificación de voz</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\n        TextSecure también puede llamarle para verificar su número. Pulse \"Llamarme\' e introduzca\n        debajo el código de seis dígitos que escuche.\n    </string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+        TextSecure también puede llamarle para verificar su número. Pulse \"Llamarme\' e introduzca
+        debajo el código de seis dígitos que escuche.
+    </string>
   <string name="registration_progress_activity__verify">Verificar</string>
   <string name="registration_progress_activity__call_me">Llamarme</string>
   <string name="registration_progress_activity__edit_number">Editar número</string>
   <string name="registration_progress_activity__connectivity_error">Fallo de conectividad.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\n        TextSecure no se pudo conectar al servicio push (de actualización en vivo).\n    </string>
-  <string name="registration_progress_activity__some_possible_problems_include">Algunos problemas\n        posibles incluyen:\n    </string>
-  <string name="registration_progress_activity__no_network_connectivity">Sin conectividad\n        a la red.\n    </string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Su\ndispositivo necesita conectividad de red para usar esta característica de TextSecure. Compruébelo para asegurarse de que está conectado a 3G o Wi-Fi.\n</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
+        TextSecure no se pudo conectar al servicio push (de actualización en vivo).
+    </string>
+  <string name="registration_progress_activity__some_possible_problems_include">Algunos problemas
+        posibles incluyen:
+    </string>
+  <string name="registration_progress_activity__no_network_connectivity">Sin conectividad
+        a la red.
+    </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Su
+dispositivo necesita conectividad de red para usar esta característica de TextSecure. Compruébelo para asegurarse de que está conectado a 3G o Wi-Fi.
+</string>
   <string name="registration_progress_activity__restrictive_firewall">Cortafuegos (firewall) restrictivo.</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nSi está conectado vía Wi-Fi, es posible que haya un cortafuegos (firewall) bloqueando el acceso al\nservidor de TextSecure. Pruebe con otra red o transporte de datos móvil/celular.\n</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\n        TextSecure ahora verificará automáticamente su número de teléfono con un mensaje SMS de confirmación.\n    </string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Si está conectado vía Wi-Fi, es posible que haya un cortafuegos (firewall) bloqueando el acceso al
+servidor de TextSecure. Pruebe con otra red o transporte de datos móvil/celular.
+</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+        TextSecure ahora verificará automáticamente su número de teléfono con un mensaje SMS de confirmación.
+    </string>
   <string name="registration_progress_activity__connecting">Conectando...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Esperando al SMS\n        de verificación...\n    </string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Esperando al SMS
+        de verificación...
+    </string>
   <string name="registration_progress_activity__registering_with_server">Registrándose con el servidor...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Esto\n        puede llevar un rato. Por favor tenga paciencia, cuando se complete la verificación se lo notificaremos.\n    </string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\n        El proceso de registro de TextSecure expiró mientras esperaba un mensaje SMS de verificación.\n    </string>
-  <string name="registration_progress_activity__sms_verification_failed">Fallo de la\n        verificación SMS.\n    </string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Esto
+        puede llevar un rato. Por favor tenga paciencia, cuando se complete la verificación se lo notificaremos.
+    </string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+        El proceso de registro de TextSecure expiró mientras esperaba un mensaje SMS de verificación.
+    </string>
+  <string name="registration_progress_activity__sms_verification_failed">Fallo de la
+        verificación SMS.
+    </string>
   <string name="registration_progress_activity__generating_keys">Generando claves...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Introduzca un nombre o número</small></string>
@@ -464,7 +575,7 @@
   <string name="verify_identity_activity__their_identity_they_read">Identidad de ellos (ellos leen):</string>
   <string name="verify_identity_activity__your_identity_you_read">Su identidad (usted lee):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nombre de la identidad:\\n</string>
+  <string name="verify_import_identity_activity__identity_name_n">Identidad:</string>
   <string name="verify_import_identity_activity__imported_identity_n">Identidad importada:\\n</string>
   <string name="verify_import_identity_activity__verified">¡Verificado!</string>
   <string name="verify_import_identity_activity__compare">Comparar</string>
@@ -572,7 +683,9 @@
   <string name="preferences__make_default_sms_app">Establecer como la aplicación SMS predeterminada</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Hace de TextSecure la aplicación SMS/MMS predeterminada para su sistema.</string>
   <string name="preferences__use_data_channel">Mensajes activos (\'push\')</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nIncremente la privacidad y evite tarifas SMS al usar el canal de datos para la comunicación con otros usuarios de TextSecure\n</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Incremente la privacidad y evite tarifas SMS al usar el canal de datos para la comunicación con otros usuarios de TextSecure
+</string>
   <string name="preferences__allow_sms_fallback">Permitir SMS salientes hacia</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure es actualmente su aplicación SMS por defecto. Por favor configure primero otra aplicación SMS por defecto antes de cambiar esta preferencia.</string>
   <string name="preferences__refresh_push_directory">Refrescar directorio push (de actualización activa)</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8bf36eb139..bf055bfae1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,12 +14,17 @@
   <string name="ApplicationPreferencesActivity_delete">Supprimer</string>
   <string name="ApplicationPreferencesActivity_my">Mon</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Désactiver le chiffrement du stockage ?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAttention, ceci désactivera le chiffrement de stockage pour tous les messages et toutes les clés. Vos sessions chiffrées\ncontinueront de fonctionner mais une personne ayant un accès physique à votre appareil sera\nen mesure d’y accéder.</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Attention, ceci désactivera le chiffrement de stockage pour tous les messages et toutes les clés. Vos sessions chiffrées
+continueront de fonctionner mais une personne ayant un accès physique à votre appareil sera
+en mesure d’y accéder.</string>
   <string name="ApplicationPreferencesActivity_disable">Désactiver</string>
   <string name="ApplicationPreferencesActivity_unregistering">Déconnexion</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Déconnexion de la communication par données</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Désactiver les messages push ?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nCeci va désactiver les messages push en vous désinscrivant du serveur. Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages push dans le futur.\n</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+Ceci va désactiver les messages push en vous désinscrivant du serveur. Vous devrez réenregistrer votre numéro de téléphone pour utiliser à nouveau les messages push dans le futur.
+</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erreur de connexion au serveur distant!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Vous n’êtes pas abonné au service push…</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Mise à jour du répertoire</string>
@@ -52,7 +57,7 @@
   <string name="ConversationItem_click_to_approve_mms_dialog_title">Utiliser la solution de repli MMS ?</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 <b>ne</b> sera <b>pas</b> chiffré, car une session sécurisée n\'a pas pu être établie.\n\nEnvoyer un message non sécurisé ?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ce message <b>ne</b> sera pas chiffré car une session sécurisé n\'a pu être établie.\n\n Envoyer un message non sécurisé ?</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>
@@ -81,8 +86,8 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Êtes-vous sûr de vouloir quitter ce groupe ?</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">Expéditeur : %1$s\nTransport : %2$s\nEnvoyé : %3$s\nReçu : %4$s</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_confirm_message_delete">Confirmer la suppression du message</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Êtes-vous sûr de vouloir supprimer définitivement ce message ?</string>
   <string name="ConversationFragment_save_to_sd_card">Enregistrer sur la carte SD ?</string>
@@ -105,17 +110,20 @@
   <string name="ShareActivity_share_with">Partager avec</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exporter vers la carte SD ?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ceci ⏎\nexportera vos clés chiffrées, les paramètres et les messages sur la carte SD.</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ceci ⏎
+exportera vos clés chiffrées, les paramètres et les messages sur la carte SD.</string>
   <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, ceci\nexportera le contenu de vos messages TextSecure en clair sur la carte SD.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attention, ceci
+exportera le contenu de vos messages TextSecure en clair sur 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 du contenu en clair sur la carte SD...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Erreur, impossible d’écrire sur la carte SD !</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Erreur lors de l\'écriture sur la carte SD !</string>
   <string name="ExportFragment_success">Réussite !</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportation des clés chiffrées, \nparamètres et messages ... </string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportation des clés chiffrées, 
+paramètres et messages ... </string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nouveau groupe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Mettre à jour le groupe</string>
@@ -130,20 +138,26 @@
   <string name="GroupCreateActivity_avatar_content_description">Avatar de groupe</string>
   <string name="GroupCreateActivity_menu_create_title">Créer un groupe</string>
   <string name="GroupCreateActivity_creating_group">Création de %1$s en cours…</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Impossible d’ajouter des contacts hors TextSecure à un groupe TextSecure existant</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Impossible d’ajouter des contacts n\'utilisant pas TextSecure à un groupe TextSecure existant</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importer</string>
   <string name="ImportExportActivity_export">Exporter</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importer la base de données SMS du système ?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Cela importera ⏎\nles messages à partir de la base de données SMS par défaut du système vers TextSecure. Si vous avez déjà ⏎\nimporté la base de données SMS du système, l\'importer à nouveau se traduira par des messages dupliqués. ⏎</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Cela importera ⏎
+les messages à partir de la base de données SMS par défaut du système vers TextSecure. Si vous avez déjà ⏎
+importé la base de données SMS du système, l\'importer à nouveau se traduira par des messages dupliqués. ⏎</string>
   <string name="ImportFragment_import">Importer</string>
   <string name="ImportFragment_cancel">Annuler</string>
   <string name="ImportFragment_restore_encrypted_backup">Restaurer une sauvegarde chiffrée ?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">La restauration d\'une sauvegarde chiffrée va remplacer complètement vos clés existantes, les préférences et ⏎\nles messages. Vous perdrez toutes les informations qui se trouvent dans votre installation TextSecure actuelle mais pas ⏎\ndans la sauvegarde. ⏎</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">La restauration d\'une sauvegarde chiffrée va remplacer complètement vos clés existantes, les préférences et ⏎
+les messages. Vous perdrez toutes les informations qui se trouvent dans votre installation TextSecure actuelle mais pas ⏎
+dans la sauvegarde. ⏎</string>
   <string name="ImportFragment_restore">Restaurer</string>
   <string name="ImportFragment_import_plaintext_backup">Importer une sauvegarde en clair ?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Cela importera\nles messages provenant d\'une sauvegarde en clair. Si vous avez déjà importé la base de données SMS du système,\nl\'importer à nouveau se traduira par des messages dupliqués.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Cela importera
+les messages provenant d\'une sauvegarde en clair. Si vous avez déjà importé la base de données SMS du système,
+l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="ImportFragment_importing">Importation</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importer la sauvegarde en texte clair ...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Aucune sauvegarde en texte clair trouvée !</string>
@@ -163,7 +177,8 @@
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Message multimédia</string>
   <!--MessageRecord-->
-  <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 TextSecure, qui n\'est plus prise en charge. \nMerci de demander à l’expéditeur de mettre à jour TextSecure dans sa version la plus récente et de renvoyer le message.</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 TextSecure, qui n\'est plus prise en charge. 
+Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa version la plus récente et de renvoyer le message.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Les phrases de passe ne correspondent pas !</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Ancienne phrase de passe incorrecte !</string>
@@ -177,21 +192,35 @@
   <string name="PromptMmsActivity_mms_settings_updated">Paramètres MMS mis à jour</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vous pouvez modifier ces valeurs depuis le menu des paramètres de TextSecure à tout moment.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La\nsignature de cet échange de clé est différente de celle que vous avez précédemment reçue de ce\ncontact. Cela peut signifier que quelqu’un essaie d’intercepter votre communication ou\nque ce contact a simplement réinstallé TextSecure et possède maintenant une nouvelle clé d’identité.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Vous devriez\nvérifier ce contact.</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">La\nsignature de cet échange de clé est digne de confiance, mais vous avez le paramètre\n« finaliser automatiquement les échanges de clés » désactivé.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La
+signature de cet échange de clé est différente de celle que vous avez précédemment reçue de ce
+contact. Cela peut signifier que quelqu’un essaie d’intercepter votre communication ou
+que ce contact a simplement réinstallé TextSecure et possède maintenant une nouvelle clé d’identité.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Vous devriez
+vérifier ce contact.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">La
+signature de cet échange de clé est digne de confiance, mais vous avez le paramètre
+« finaliser automatiquement les échanges de clés » désactivé.</string>
   <string name="ReceiveKeyActivity_processing">Traitement</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Traitement de l\'échange de clés...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Se connecter avec TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Sélectionner votre pays</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Vous devez indiquer votre \ncode de pays</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Vous devez introduire\nvotre numéro de téléphone</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Vous devez indiquer votre 
+code de pays</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Vous devez introduire
+votre numéro de téléphone</string>
   <string name="RegistrationActivity_invalid_number">Numéro non valide</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Le numéro que vous avez\nintroduit (%s) n\'est pas valide.</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Le numéro que vous avez
+introduit (%s) n\'est pas valide.</string>
   <string name="RegistrationActivity_unsupported">Incompatible</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Désolé,\ncet appareil n\'est pas supporté pour la messagerie sur le canal de données. Les appareils ayant une version d\'Android plus vieille\n que 4.0 doivent avoir un compte Google. Les appareils ayant Android 4.0 ou plus ne sont\n pas obligés d\'avoir un compte Google, mais doivent avoir l\'application Play Store installée.</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nNous allons maintenant vérifier que le numéro qui suit est associé à cet appareil:\n\n%s\n\n\nEst-ce que ce numéro est correct, ou aimeriez-vous le modifier avant de continuer?\n</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Désolé,
+cet appareil n\'est pas supporté pour la messagerie sur le canal de données. Les appareils ayant une version d\'Android plus vieille
+ que 4.0 doivent avoir un compte Google. Les appareils ayant Android 4.0 ou plus ne sont
+ pas obligés d\'avoir un compte Google, mais doivent avoir l\'application Play Store installée.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+Nous allons maintenant vérifier que le numéro suivant est associé à cet appareil:\n\n%s\n\n
+Ce numéro est-il correct, ou souhaitez-vous le modifier avant de continuer ?</string>
   <string name="RegistrationActivity_continue">Continuer</string>
   <string name="RegistrationActivity_edit">Modifier</string>
   <!--RegistrationProblemsActivity-->
@@ -225,9 +254,12 @@
   <string name="RegistrationService_registration_error">Erreur lors de l\'enregistrement</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">L\'enregistrement de TextSecure a rencontré un problème.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Une clé corrompue a été reçue\nMessage d\'échange!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nRéception d\'un message d\'échange de clés pour une version invalide du protocole.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nUn message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'accepter et l\'afficher.</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Une clé corrompue a été reçue
+Message d\'échange!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Réception d\'un message d\'échange de clés pour une version invalide du protocole.</string>
+  <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_ended">La session sécurisée s’est terminée.</string>
   <string name="SmsMessageRecord_duplicate_message">Message doublon.</string>
@@ -302,10 +334,14 @@
   <string name="MessageNotifier_mark_as_read">Marquer comme lu</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Renouvellement…</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Renouvellement de la clé\nd’identité…</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Renouvellement de la clé
+d’identité…</string>
   <string name="ViewLocalIdentityActivity_regenerated">Renouvelée !</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Réinitialiser la clé d\'identité ?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nAttention ! En renouvelant votre clé d’identité, votre clé d’identité actuelle sera définitivement perdue,\net vos contacts existant recevront des avertissements en établissant de nouvelles sessions sécurisées avec vous.\nÊtes-vous sûr de vouloir continuer ?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+Attention ! En renouvelant votre clé d’identité, votre clé d’identité actuelle sera définitivement perdue,
+et vos contacts existant recevront des avertissements en établissant de nouvelles sessions sécurisées avec vous.
+Êtes-vous sûr de vouloir continuer ?</string>
   <string name="ViewLocalIdentityActivity_cancel">Annuler</string>
   <string name="ViewLocalIdentityActivity_continue">Continuer</string>
   <!--SmsReceiver-->
@@ -341,15 +377,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Envoyer un MMS non-sécurisé</string>
   <string name="conversation_activity__send">Envoyer</string>
   <string name="conversation_activity__remove">Supprimer</string>
+  <string name="conversation_activity__window_description">Conversation avec %1$s</string>
+  <string name="conversation_activity__compose_description">Composition du message</string>
+  <string name="conversation_activity__emoji_toggle_description">Activer le clavier emoji</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Message média</string>
   <string name="conversation_item__play_button_description">Bouton play</string>
+  <string name="conversation_item__secure_message_description">Message sécurisé</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Télécharger</string>
   <string name="conversation_item_sent__downloading">Téléchargement</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Échec de l\'envoi</string>
   <string name="conversation_item_sent__pending_approval_description">En Attente d’Acceptation</string>
+  <string name="conversation_item_sent__delivered_description">Délivré</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Télécharger</string>
+  <string name="conversation_item_received__contact_photo_description">Photo de contact</string>
   <string name="conversation_item_received__downloading">Téléchargement</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mode de sélection par lot</string>
@@ -372,7 +415,7 @@
   <string name="log_submit_activity__log_fetch_failed">TextSecure n\'a pas pu obtenir les logs de votre téléphone. Vous pouvez utiliser ADB pour récupérer les logs de debug.</string>
   <string name="log_submit_activity__log_submit_success_title">Réussite !</string>
   <string name="log_submit_activity__log_got_it">J’ai compris</string>
-  <string name="log_submit_activity__your_pastebin_url">Veuillez copier cette URL et l’ajouter à votre rapport (appui long pour mettre dans le presse-papiers) :\n\n<b>%1$s</b></string>
+  <string name="log_submit_activity__your_pastebin_url">S\'il vous plaît copiez cette URL et ajoutez-la à votre issue (appui long pour copier):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Copié dans le presse-papier</string>
   <string name="log_submit_activity__loading_logcat">Chargement de logcat…</string>
   <string name="log_submit_activity__thanks">Merci pour votre aide !</string>
@@ -388,15 +431,19 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Mise à jour de la base de donnée...</string>
   <string name="export_fragment__export_encrypted_backup">Exporter une sauvegarde chiffrée</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporter une sauvegarde \nchiffrée sur la carte SD.</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exporter une sauvegarde 
+chiffrée sur la carte SD.</string>
   <string name="export_fragment__export_plaintext_backup">Exporter une sauvegarde en clair</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporter une sauvegarde en texte clair compatible avec «SMS Backup And Restore» sur la carte SD.</string>
   <string name="import_fragment__import_system_sms_database">Importer la base de données SMS du système</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importer la base de données\ndepuis l\'application SMS par défaut.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importer la base de données
+depuis l\'application SMS par défaut.</string>
   <string name="import_fragment__import_encrypted_backup">Importer une sauvegarde chiffrée</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nRestaurer une sauvegarde TextSecure chiffrée précédemment exportée.</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Restaurer une sauvegarde TextSecure chiffrée précédemment exportée.</string>
   <string name="import_fragment__import_plaintext_backup">Importer la sauvegarde en clair</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nImporter un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup And Restore».</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Importer un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup And Restore».</string>
   <string name="local_identity__regenerate_key">Régénérer la clé</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Des paramètres MMS manuels sont nécessaires pour votre téléphone.</string>
@@ -412,41 +459,65 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Compléter</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure peut utiliser les messages instantanés pour augmenter la confidentialité et éviter des frais de SMS lors de communications avec d’autres\nutilisateurs de TextSecure. Pour activer cette fonctionnalité, veuillez procéder à la vérification de l’indicatif de votre pays et votre numéro de téléphone.</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+TextSecure peut utiliser les messages instantanés pour augmenter la confidentialité et éviter des frais de SMS lors de communications avec d’autres
+utilisateurs de TextSecure. Pour activer cette fonctionnalité, veuillez procéder à la vérification de l’indicatif de votre pays et votre numéro de téléphone.</string>
   <string name="registration_activity__your_country">VOTRE PAYS</string>
-  <string name="registration_activity__your_country_code_and_phone_number">VOTRE CODE PAYS ET\nVOTRE NUMÉRO DE TÉLÉPHONE</string>
+  <string name="registration_activity__your_country_code_and_phone_number">VOTRE CODE PAYS ET
+VOTRE NUMÉRO DE TÉLÉPHONE</string>
   <string name="registration_activity__phone_number">NUMÉRO DE TÉLÉPHONE</string>
   <string name="registration_activity__register">S\'enregistrer</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">L\'enregistrement transmettra temporairement des informations de contact au serveur.</string>
   <string name="registration_activity__skip">Passer</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Certains des problèmes possibles\nsont:</string>
+  <string name="registration_problems__some_possible_problems_include">Certains des problèmes possibles
+sont:</string>
   <string name="registration_problems__sms_interceptors">Intercepteurs SMS.</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nCertains clients de messagerie texte de tierce partie, comme Handcent ou GoSMS se comportent mal et\ninterceptent tous les messages SMS entrants. Vérifiez si vous avez reçu un texto qui commence\npar \"Votre code de vérification TextSecure:\". Dans ce cas, vous devrez configurer votre\nclient de messagerie de tierce partie pour qu\'il laisse passer les messages.</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 texto qui commence
+par \"Votre code de vérification TextSecure:\". 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">\nMerci de vérifier que vous avez entré votre numéro correctement, et que son format est correct pour\nvotre région.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+Merci de vérifier que vous avez entré votre numéro correctement, et que son format est correct pour
+votre région.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure ne peut pas fonctionner avec des numéros Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure ne peut pas fonctionner avec des numéros Google Voice.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Vérification vocale</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure peut aussi vous appeler pour vérifier votre numéro. Après avoir appuyé sur \'Appelez-Moi\',\nentrez ci-dessous le code à six chiffres que vous entendrez.</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+TextSecure peut aussi vous appeler pour vérifier votre numéro. Après avoir appuyé sur \'Appelez-Moi\',
+entrez ci-dessous le code à six chiffres que vous entendrez.</string>
   <string name="registration_progress_activity__verify">Vérifier</string>
   <string name="registration_progress_activity__call_me">Appelez-Moi</string>
   <string name="registration_progress_activity__edit_number">Modifier le numéro</string>
   <string name="registration_progress_activity__connectivity_error">Erreur de connectivité.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure n\'a pas pu se connecter au service push.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Certains des problèmes\npossibles sont:</string>
-  <string name="registration_progress_activity__no_network_connectivity">Pas de connexion\nau réseau.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Votre\nappareil a besoin de connectivité réseau pour pouvoir utiliser cette fonctionnalité TextSecure. Vérifiez\nqu\'il soit connecté à la 3G ou au Wi-Fi.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
+TextSecure n\'a pas pu se connecter au service push.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Certains des problèmes
+possibles sont:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Pas de connexion
+au réseau.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Votre
+appareil a besoin d\'une connectivité réseau pour pouvoir utiliser cette fonctionnalité TextSecure. Vérifiez
+qu\'il soit connecté à la 3G ou au Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Pare-feu restrictif.</string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nSi vous êtes connectés au Wi-Fi, Il est possible qu\'un pare-feu bloque l\'accès au serveur TextSecure, essayez un autre réseau ou les données mobiles.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure va maintenant automatiquement vérifier votre numéro par un SMS de confirmation.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Si vous êtes connectés au Wi-Fi, Il est possible qu\'un pare-feu bloque l\'accès au serveur TextSecure. Essayez un autre réseau ou les données mobiles.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+TextSecure va maintenant automatiquement vérifier votre numéro par un SMS de confirmation.</string>
   <string name="registration_progress_activity__connecting">Connexion...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Attente du SMS\nvérification...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Attente du SMS
+vérification...</string>
   <string name="registration_progress_activity__registering_with_server">Enregistrement sur le serveur distant...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Ceci pourrait prendre un moment.\nMerci d\'être patient, nous vous préviendrons lorsque la vérification sera terminée.</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nLa connexion de TextSecure s\'est interrompue en attendant un SMS de vérification.</string>
-  <string name="registration_progress_activity__sms_verification_failed">Échec de la vérification\npar SMS.</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Ceci pourrait prendre un moment.
+Merci d\'être patient, nous vous préviendrons lorsque la vérification sera terminée.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+La connexion de TextSecure s\'est interrompue en attendant un SMS de vérification.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Échec de la vérification
+par SMS.</string>
   <string name="registration_progress_activity__generating_keys">Création des clés...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Entrez un nom ou un numéro</small></string>
@@ -457,8 +528,8 @@
   <string name="verify_identity_activity__their_identity_they_read">Leur identité (ce qu\'ils lisent) :</string>
   <string name="verify_identity_activity__your_identity_you_read">Votre identité (ce que vous lisez) :</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nom d\'identité :\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identité importée :\\n</string>
+  <string name="verify_import_identity_activity__identity_name_n">Nom de l\'identité :\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Identité importée : \\n</string>
   <string name="verify_import_identity_activity__verified">Vérifié !</string>
   <string name="verify_import_identity_activity__compare">Comparer</string>
   <!--verify_keys_activity-->
@@ -478,6 +549,7 @@
   <string name="AndroidManifest__complete_key_exchange">Finaliser l’échange de clés</string>
   <string name="AndroidManifest__log_submit">Soumettre un rapport de débogage</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
   <!--preferences.xml-->
   <string name="preferences__general">Général</string>
@@ -564,7 +636,8 @@
   <string name="preferences__make_default_sms_app">Définir comme application SMS par défaut</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Faire de TextSecure l’application SMS/MMS par défaut de votre système.</string>
   <string name="preferences__use_data_channel">Messages PUSH</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAugmenter la confidentialité et éviter les frais de SMS en utilisant le canal de données pour les communications avec d’autres utilisateurs de TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Augmenter la confidentialité et éviter les frais de SMS en utilisant le canal de données pour les communications avec d’autres utilisateurs de TextSecure</string>
   <string name="preferences__allow_sms_fallback">Autoriser les SMS sortants à </string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure est actuellement votre application SMS par défaut. Veuillez d’abord définir une autre application SMS par défaut pour changer cette préférence.</string>
   <string name="preferences__refresh_push_directory">Rafraîchir le dossier PUSH</string>
@@ -644,11 +717,11 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Vérifié</string>
   <!--reminder_header-->
-  <string name="reminder_header_sms_default_title">Définir  TextSecure comme application SMS par défaut? </string>
-  <string name="reminder_header_sms_default_text">TextSecure n\'est pas définis comme application SMS par défaut.</string>
-  <string name="reminder_header_sms_import_title">Désirez-vous importer les SMS du système?</string>
+  <string name="reminder_header_sms_default_title">Définir TextSecure comme application SMS par défaut ? </string>
+  <string name="reminder_header_sms_default_text">TextSecure n\'est pas définie comme application SMS par défaut.</string>
+  <string name="reminder_header_sms_import_title">Désirez-vous importer les SMS du système ?</string>
   <string name="reminder_header_sms_import_text">TextSecure peut copier vos SMS au sein de sa base de donnée chiffrée. </string>
-  <string name="reminder_header_push_title">Activer les messages TextSecure?</string>
+  <string name="reminder_header_push_title">Activer les messages TextSecure ?</string>
   <string name="reminder_header_push_text">Instantané, sans frais SMS et protège votre vie privé.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 1ed9a1d32c..3f599a49e4 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -14,8 +14,13 @@
   <string name="ApplicationPreferencesActivity_delete">מחק</string>
   <string name="ApplicationPreferencesActivity_my">שלי</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">לבטל הצפנת אחסון?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nאזהרה, פעולה זו תבטל הצפנה מקומית לכל ההודעות והמפתחות. החיבורים\nהמאובטחים שלך ימשיכו לתפקד, אבל כל אחד עם גישה פיזית למכשירך יוכל\nלגשת אליהם.\n</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+אזהרה, פעולה זו תבטל הצפנה מקומית לכל ההודעות והמפתחות. החיבורים
+המאובטחים שלך ימשיכו לתפקד, אבל כל אחד עם גישה פיזית למכשירך יוכל
+לגשת אליהם.
+</string>
   <string name="ApplicationPreferencesActivity_disable">בטל</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">אירעה שגיאה בחיבור לשרת!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">תמונה</string>
   <string name="AttachmentTypeSelectorAdapter_video">וידאו</string>
@@ -58,25 +63,41 @@
   <string name="ConversationListItem_key_exchange_message">הודעת החלפת מפתח...</string>
   <!--ShareActivity-->
   <!--ExportFragment-->
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">פעולה זו\nתייצא את המפתחות, ההגדרות וההודעות המוצפנות שלך לכרטיס ה-SD.\n</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">פעולה זו
+תייצא את המפתחות, ההגדרות וההודעות המוצפנות שלך לכרטיס ה-SD.
+</string>
   <string name="ExportFragment_export">יצא</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">אזהרה, פעולה זו\nתייצא את תוכן הודעות ה-TextSecure שלך לכרטיס ה-SD ללא הצפנה.\n</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">אזהרה, פעולה זו
+תייצא את תוכן הודעות ה-TextSecure שלך לכרטיס ה-SD ללא הצפנה.
+</string>
   <string name="ExportFragment_cancel">בטל</string>
   <string name="ExportFragment_exporting">מייצא</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">מייצא טקסט ללא הצפנה לכרטיס ה-SD...\n</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">שגיאה, לא ניתן לכתוב לכרטיס\nה-SD!\n</string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">שגיאה בכתיבה לכרטיס ה-SD.\n</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">מייצא טקסט ללא הצפנה לכרטיס ה-SD...
+</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">שגיאה, לא ניתן לכתוב לכרטיס
+ה-SD!
+</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">שגיאה בכתיבה לכרטיס ה-SD.
+</string>
   <string name="ExportFragment_success">הצליח!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">מייצא מפתחות, הגדרות\nוהודעות מוצפנות...\n</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">מייצא מפתחות, הגדרות
+והודעות מוצפנות...
+</string>
   <!--GroupCreateActivity-->
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">יבא</string>
   <string name="ImportExportActivity_export">יצא</string>
   <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">פעולה זו תייבא\nהודעות מבסיס הנתונים של ה-SMS ברירת המחדל של המערכת ל-TextSecure.\n אם כבר ייבאת מבסיס נתונים זה, ייבוא מחדש יגרום להודעות כפולות.</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">פעולה זו תייבא
+הודעות מבסיס הנתונים של ה-SMS ברירת המחדל של המערכת ל-TextSecure.
+ אם כבר ייבאת מבסיס נתונים זה, ייבוא מחדש יגרום להודעות כפולות.</string>
   <string name="ImportFragment_import">יבא</string>
   <string name="ImportFragment_cancel">בטל</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nשחזור גיבוי מוצפן יחליף לגמרי את המפתחות, ההגדרות וההודעות הקיימות.\nאתה \nתאבד את כל המידע שבהתקנת ה-TextSecure הנוכחית שלך אבל לא שבגיבוי.\n</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+שחזור גיבוי מוצפן יחליף לגמרי את המפתחות, ההגדרות וההודעות הקיימות.
+אתה 
+תאבד את כל המידע שבהתקנת ה-TextSecure הנוכחית שלך אבל לא שבגיבוי.
+</string>
   <string name="ImportFragment_restore">שחזר</string>
   <string name="ImportFragment_importing">מייבא</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">יבא גיבוי לא מוצפן...</string>
@@ -103,9 +124,19 @@
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">אתה חייב לציין כתובת MMSC עבור ספק השירות שלך.</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">אתה יכול לערוך את הערכים האלו מתפריט ההגדרות של TextSecure בכל זמן.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">החתימה\nעל החלפת המפתח הזאת שונה ממה שקיבלת בעבר מאיש הקשר הזה.\nזה יכול להעיד שמישהו מנסה ליירט את התקשורת שלך\nאו\nשאיש הקשר פשוט התקין מחדש את TextSecure ועכשיו יש לו מפתח זהות חדש.\n</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ייתכן שתרצה לאמת\nאת איש הקשר הזה.\n</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">החתימה\nעל החלפת המפתח הזו אמינה, אבל ביטלת את האפשרות של \"השלם החלפת\n מפתח אוטומטית\" בהגדרות.\n</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">החתימה
+על החלפת המפתח הזאת שונה ממה שקיבלת בעבר מאיש הקשר הזה.
+זה יכול להעיד שמישהו מנסה ליירט את התקשורת שלך
+או
+שאיש הקשר פשוט התקין מחדש את TextSecure ועכשיו יש לו מפתח זהות חדש.
+</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ייתכן שתרצה לאמת
+את איש הקשר הזה.
+</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">החתימה
+על החלפת המפתח הזו אמינה, אבל ביטלת את האפשרות של \"השלם החלפת
+ מפתח אוטומטית\" בהגדרות.
+</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_continue">המשך</string>
   <!--RegistrationProblemsActivity-->
@@ -169,9 +200,17 @@
   <string name="MessageNotifier_mark_as_read">סמן כנקרא</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">מייצר מחדש...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">מייצר מפתח זהות\nמחדש...\n</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">מייצר מפתח זהות
+מחדש...
+</string>
   <string name="ViewLocalIdentityActivity_regenerated">יוצר מחדש!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nאזהרה! ייצור מחדש של מפתח הזהות יאבד את מפתח הזהות\nהעכשווי,\nואנשי הקשר הקיימים שלך יקבלו אזהרה כשהם ינסו לבצע חיבור מאובטח\nחדש איתך.\nאתה בטוח שברצונך להמשיך?\n</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+אזהרה! ייצור מחדש של מפתח הזהות יאבד את מפתח הזהות
+העכשווי,
+ואנשי הקשר הקיימים שלך יקבלו אזהרה כשהם ינסו לבצע חיבור מאובטח
+חדש איתך.
+אתה בטוח שברצונך להמשיך?
+</string>
   <string name="ViewLocalIdentityActivity_cancel">בטל</string>
   <string name="ViewLocalIdentityActivity_continue">המשך</string>
   <!--SmsReceiver-->
@@ -220,11 +259,19 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">זה יכול לקחת כמה רגעים. סבלנות בבקשה, אנחנו נודיע לך כשהייבוא הושלם.</string>
   <string name="database_migration_activity__importing">מייבא</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">יצא גיבוי\nמוצפן לכרטיס ה-SD.\n</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nיצא גיבוי לא מוצפן שתואם את האפליקציה \'SMSBackup And Restore\' לכרטיס ה-SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">יבא את בסיס הנתונים\nמאפליקציית ברירת המחדל של המערכת.\n</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nשחזר גיבוי מוצפן של TextSecure שיוצא בעבר.\n</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nיבא קובץ גיבוי לא מוצפן. תואם \'SMSBackup And Restore\'.</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">יצא גיבוי
+מוצפן לכרטיס ה-SD.
+</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+יצא גיבוי לא מוצפן שתואם את האפליקציה \'SMSBackup And Restore\' לכרטיס ה-SD.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">יבא את בסיס הנתונים
+מאפליקציית ברירת המחדל של המערכת.
+</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+שחזר גיבוי מוצפן של TextSecure שיוצא בעבר.
+</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+יבא קובץ גיבוי לא מוצפן. תואם \'SMSBackup And Restore\'.</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">נדרשות הגדרות MMS ידניות עבור מכשירך.</string>
   <!--prompt_passphrase_activity-->
@@ -249,8 +296,6 @@
   <string name="verify_identity_activity__their_identity_they_read">הזהות שלהם (הם קוראים):</string>
   <string name="verify_identity_activity__your_identity_you_read">הזהות שלך (אתה קורא):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">שם הזהות:/\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">זהות מיובאת:/\n</string>
   <string name="verify_import_identity_activity__verified">אומת!</string>
   <string name="verify_import_identity_activity__compare">השווה</string>
   <!--verify_keys_activity-->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index efc5961c71..68ef4cc9cc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -14,12 +14,19 @@
   <string name="ApplicationPreferencesActivity_delete">Törlés</string>
   <string name="ApplicationPreferencesActivity_my">Saját</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Tároló titkosítás tiltása?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nFigyelmeztetés, ez letiltja a titkosított tárolást minden üzenethez és kulcshoz. A titkosított\nüzenetváltásod működni fog, de bárki aki fizikailag hozzáférhet az eszközödhöz\nhozzájuk férhet!\n </string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Figyelmeztetés, ez letiltja a titkosított tárolást minden üzenethez és kulcshoz. A titkosított
+üzenetváltásod működni fog, de bárki aki fizikailag hozzáférhet az eszközödhöz
+hozzájuk férhet!
+ </string>
   <string name="ApplicationPreferencesActivity_disable">Tiltás</string>
   <string name="ApplicationPreferencesActivity_unregistering">Regisztráció megszüntetése...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Az adat alapú kommunikáció regisztráció törlése.</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Letiltod az azonnali üzeneteket?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nEz letiltja az azonnali üzeneteket a regisztrációd törlésével a kiszolgálón.\nA telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli használatához.\n </string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+Ez letiltja az azonnali üzeneteket a regisztrációd törlésével a kiszolgálón.
+A telefonod újra regisztrálása szükséges az azonnali üzenetek jövőbeli használatához.
+ </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Hiba a kiszolgálóhoz kapcsolódáskor!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Nem vagy regisztrálva az azonnali üzenetküldési szolgáltatásra...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Könyvtár frissítése</string>
@@ -52,7 +59,7 @@
   <string name="ConversationItem_click_to_approve_mms_dialog_title">Legyen tartalék mód az MMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Legyen tartalék mód a nem biztonságos SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Legyen tartalék mód a nem biztonságos MMS?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ez az üzenet nem fog titkosításra kerülni, mert a biztonságos üzenetváltás indítása nem volt sikeres.\n\nKüldesz nem biztonságos üzenetet?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ez az üzenet <b>nem lesz titkosítva</b> mert nem lehetséges a biztonságos kapcsolat létrehozása.\n\nKüldesz nem biztonságos üzenetet?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Biztonságos üzenetváltás indítása?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Indítasz biztonságos üzenetváltást vele: %s?</string>
@@ -81,8 +88,8 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Biztosan el akarod hagyni ezt a csoportot?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Üzenet részletei</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">Átvitel: %1$s\n Küldött/Fogadott: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Küldő: %1$s\nÁtvitel: %2$s\nElküldött: %3$s\nFogadott: %4$s</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Átviteli mód: %1$s\nKüldött/fogadott: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Küldő: %1$s\nÁtvitel: %2$s\nKüldött: %3$s\nFogadott: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Üzenettörlés megerősítése</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Biztosan véglegesen törölni akarod ezt az üzenetet?</string>
   <string name="ConversationFragment_save_to_sd_card">Mentés SD kártyára?</string>
@@ -105,17 +112,27 @@
   <string name="ShareActivity_share_with">Megosztás...</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportálás az SD kártyára?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ez\nexportálni fogja a titkosított kulcsaidat, beállításaidat és üzeneteidet az SD kártyára.\n </string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ez
+exportálni fogja a titkosított kulcsaidat, beállításaidat és üzeneteidet az SD kártyára.
+ </string>
   <string name="ExportFragment_export">Exportálás</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Titkosítatlan szöveg exportálása SD kártyára?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Figyelem, ez\nexportálni fogja a TextSecure üzenetek titkosítatlan tartalmait az SD kártyára.\n  </string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Figyelem, ez
+exportálni fogja a TextSecure üzenetek titkosítatlan tartalmait az SD kártyára.
+  </string>
   <string name="ExportFragment_cancel">Mégsem</string>
   <string name="ExportFragment_exporting">Exportálás</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Kódolatlan szöveg exportálása SD kártyára\n </string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Hiba, sikertelen írás az SD\nkártyára!\n </string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Hiba történt az SD kártya írása közben.\n </string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Kódolatlan szöveg exportálása SD kártyára
+ </string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Hiba, sikertelen írás az SD
+kártyára!
+ </string>
+  <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>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Titkosított kulcsok, beállítások\nés üzenek exportálása...\n </string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Titkosított kulcsok, beállítások
+és üzenek exportálása...
+ </string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Új csoport</string>
   <string name="GroupCreateActivity_actionbar_update_title">Csoport frissítése</string>
@@ -136,14 +153,23 @@
   <string name="ImportExportActivity_export">Exportálás</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Rendszer SMS adatbázis importálása?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Ez importálni fogja\naz üzeneteket a rendszer alapértelmezett SMS adatbázisából a TextSecure alkalmazásba. Ha korábban már\nimportáltad a rendszer SMS adatbázisát, akkor az újbóli importálás duplikált üzeneteket eredményez.\n </string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Ez importálni fogja
+az üzeneteket a rendszer alapértelmezett SMS adatbázisából a TextSecure alkalmazásba. Ha korábban már
+importáltad a rendszer SMS adatbázisát, akkor az újbóli importálás duplikált üzeneteket eredményez.
+ </string>
   <string name="ImportFragment_import">Importálás</string>
   <string name="ImportFragment_cancel">Mégsem</string>
   <string name="ImportFragment_restore_encrypted_backup">Titkosított biztonsági másolat visszaállítása?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nEgy titkosított biztonsági mentés visszaállításával minden létező kulcs, beállítás és\nüzenet felülíródik. Minden adat a jelenleg telepített TextSecure alkalmazásban el fog vesződni ami\nnincs a biztonsági mentésben.\n </string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Egy titkosított biztonsági mentés visszaállításával minden létező kulcs, beállítás és
+üzenet felülíródik. Minden adat a jelenleg telepített TextSecure alkalmazásban el fog vesződni ami
+nincs a biztonsági mentésben.
+ </string>
   <string name="ImportFragment_restore">Visszaállítás</string>
   <string name="ImportFragment_import_plaintext_backup">Titkosítatlan biztonsági mentés importálása?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Ez importálni fogja\naz üzeneteket egy titkosítatlan biztonsági mentésből. Ha már korábban importáltad ezt a biztonsági mentést,\nakkor az újbóli importálás duplikált üzeneteket eredményez.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Ez importálni fogja
+az üzeneteket egy titkosítatlan biztonsági mentésből. Ha már korábban importáltad ezt a biztonsági mentést,
+akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="ImportFragment_importing">Importálás</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Titkosítatlan biztonsági mentés importálása</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nem található kódolatlan biztonsági mentés!</string>
@@ -177,21 +203,43 @@
   <string name="PromptMmsActivity_mms_settings_updated">Az MMS beállítások frissültek</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Ezeket az értékeket bármikor módosíthatod a TextSecure beállítások menüjében.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Az\naláírás ezen a csere kulcson különbözik amit korábban kaptál ettől a\nszemélytől. Ez jelentheti, hogy valaki megpróbál betekinteni a kommunikációba, vagy\nazt, hogy ez a személy egyszerűen újra telepítette a TextSecure és így most egy új azonosító kulcsa van.\n </string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Talán érdemes ellenőrizni\nezt a névjegyet.\n </string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Az\naláírás ezen a csere kulcson megbízható, de az \"automatikus teljes kulcs-csere\"\nbeállítás nincs engedélyezve.\n </string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Az
+aláírás ezen a csere kulcson különbözik amit korábban kaptál ettől a
+személytől. Ez jelentheti, hogy valaki megpróbál betekinteni a kommunikációba, vagy
+azt, hogy ez a személy egyszerűen újra telepítette a TextSecure és így most egy új azonosító kulcsa van.
+ </string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Talán érdemes ellenőrizni
+ezt a névjegyet.
+ </string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Az
+aláírás ezen a csere kulcson megbízható, de az \"automatikus teljes kulcs-csere\"
+beállítás nincs engedélyezve.
+ </string>
   <string name="ReceiveKeyActivity_processing">Feldolgozás</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Kulcs csere folyamatban...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Csatlakozás a TextSecure-höz</string>
   <string name="RegistrationActivity_select_your_country">Saját ország kiválasztása </string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Add meg a saját\nország kódot!\n </string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Add meg a saját\ntelefonszámot!\n </string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Add meg a saját
+ország kódot!
+ </string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Add meg a saját
+telefonszámot!
+ </string>
   <string name="RegistrationActivity_invalid_number">Érvénytelen szám</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Az általad megadott\nszám (%s) érvénytelen.\n </string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Az általad megadott
+szám (%s) érvénytelen.
+ </string>
   <string name="RegistrationActivity_unsupported">Nem támogatott</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnáljuk, de a jelen\neszköz nem támogatja az adat alapú üzenetküldést. Az Android 4.0-nál régebbi verziót használó eszközök esetén\nrendelkezniük kell Google fiókkal. Az Android 4.0-t vagy frissebb verziót használó eszközök\nnem igénylik a Google fiók meglétét, de a Play Áruház alkalmazásnak telepítve kell lennie.\n </string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nEllenőrizni fogjuk, hogy a következő szám ehhez az eszközhöz van-e rendelve:\n\n%s\n\n\nEz a szám helyes, vagy szeretnéd módosítani a folytatás előtt?\n </string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnáljuk, de a jelen
+eszköz nem támogatja az adat alapú üzenetküldést. Az Android 4.0-nál régebbi verziót használó eszközök esetén
+rendelkezniük kell Google fiókkal. Az Android 4.0-t vagy frissebb verziót használó eszközök
+nem igénylik a Google fiók meglétét, de a Play Áruház alkalmazásnak telepítve kell lennie.
+ </string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+Ellenőrizni fogjuk, hogy a következő szám ehhez az eszközhöz van-e rendelve:\n\n%s\n\n
+Ez a szám helyes, vagy szeretnéd módosítani a folytatás előtt?
+</string>
   <string name="RegistrationActivity_continue">Folytatás</string>
   <string name="RegistrationActivity_edit">Szerkesztés</string>
   <!--RegistrationProblemsActivity-->
@@ -225,9 +273,15 @@
   <string name="RegistrationService_registration_error">Regisztráció hiba</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">A TextSecure regisztráció közben hiba merült fel.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Elrontott csere kulcs\nüzenet érkezett!\n </string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nÉrvénytelen protokoll verziójú csere kulcs üzenet érkezett.\n </string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nIsmeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz és megjelenítéshez.\n </string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Elrontott csere kulcs
+üzenet érkezett!
+ </string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Érvénytelen protokoll verziójú csere kulcs üzenet érkezett.
+ </string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz és megjelenítéshez.
+ </string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Frissített, de ismeretlen azonosító adatok érkeztek. Koppints az azonosító érvényesítéséhez!</string>
   <string name="SmsMessageRecord_secure_session_ended">A biztonságos üzenetváltás befejeződött.</string>
   <string name="SmsMessageRecord_duplicate_message">Üzenet duplikálása.</string>
@@ -302,10 +356,16 @@
   <string name="MessageNotifier_mark_as_read">Olvasottként való megjelölés</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Létrehozás újra...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Azonosító kulcs\nlétrehozása újra...\n </string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Azonosító kulcs
+létrehozása újra...
+ </string>
   <string name="ViewLocalIdentityActivity_regenerated">Újra létrehozva!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Azonosító kulcs alaphelyzetbe hozása?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nFigyelmeztetés! Az azonosító kulcs újra létrehozásával, a jelenlegi azonosító kulcs végleg el fog veszni,\nés a meglévő kapcsolatban álló személyek figyelmeztetést fognak kapni, amikor új titkosított üzenetváltást kezdeményeznek veled.\nBiztosan szeretnéd folytatni?\n </string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+Figyelmeztetés! Az azonosító kulcs újra létrehozásával, a jelenlegi azonosító kulcs végleg el fog veszni,
+és a meglévő kapcsolatban álló személyek figyelmeztetést fognak kapni, amikor új titkosított üzenetváltást kezdeményeznek veled.
+Biztosan szeretnéd folytatni?
+ </string>
   <string name="ViewLocalIdentityActivity_cancel">Mégsem</string>
   <string name="ViewLocalIdentityActivity_continue">Folytatás</string>
   <!--SmsReceiver-->
@@ -341,15 +401,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Nem biztonságos MMS küldése</string>
   <string name="conversation_activity__send">Küldés</string>
   <string name="conversation_activity__remove">Törlés</string>
+  <string name="conversation_activity__window_description">Beszélgetés vele: %1$s</string>
+  <string name="conversation_activity__compose_description">Üzenet létrehozása</string>
+  <string name="conversation_activity__emoji_toggle_description">Váltás a hangulatjelek beviteléhez</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Média üzenet</string>
   <string name="conversation_item__play_button_description">Lejátszás gomb</string>
+  <string name="conversation_item__secure_message_description">Biztonságos üzenet</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Letölt</string>
   <string name="conversation_item_sent__downloading">Letöltés</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">A küldés sikertelen</string>
   <string name="conversation_item_sent__pending_approval_description">Jóváhagyás függőben</string>
+  <string name="conversation_item_sent__delivered_description">Kézbesítve</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Letölt</string>
+  <string name="conversation_item_received__contact_photo_description">Névjegy fotó</string>
   <string name="conversation_item_received__downloading">Letöltés</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Kötegelt kijelölési mód</string>
@@ -372,7 +439,7 @@
   <string name="log_submit_activity__log_fetch_failed">Nem sikerült a naplóbejegyzések elérése az eszközön. Helyettük az ADB használható a hibakeresési naplóbejegyzésekhez.</string>
   <string name="log_submit_activity__log_submit_success_title">Sikerült!</string>
   <string name="log_submit_activity__log_got_it">Megkapta</string>
-  <string name="log_submit_activity__your_pastebin_url">Kérlek másold le ezt az URL-t és add hozzá a feljegyzésedhez (hosszan nyomva kerül a vágólapra):\n\n%1$s</string>
+  <string name="log_submit_activity__your_pastebin_url">Kérlek másold le ezt az URL-t és add hozzá a feljegyzésedhez (hosszan nyomva kerül a vágólapra):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Vágólapra másolva</string>
   <string name="log_submit_activity__loading_logcat">Logcat betöltése...</string>
   <string name="log_submit_activity__thanks">Köszönjük a segítségedet!</string>
@@ -388,15 +455,23 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Adatbázis frissítés...</string>
   <string name="export_fragment__export_encrypted_backup">Titkosított biztonsági mentés exportálása</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Egy titkosított biztonsági mentés\nexportálása az SD kártyára.\n </string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Egy titkosított biztonsági mentés
+exportálása az SD kártyára.
+ </string>
   <string name="export_fragment__export_plaintext_backup">Titkosítatlan biztonsági mentés exportálása</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nKódolatlan szöveg biztonsági mentés exportja az SD kártyára, mely \"SMS mentése és visszaállítása\" kompatibilis. </string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+Kódolatlan szöveg biztonsági mentés exportja az SD kártyára, mely \"SMS mentése és visszaállítása\" kompatibilis. </string>
   <string name="import_fragment__import_system_sms_database">Rendszer SMS adatbázis importálása</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Az adatbázis importálása\naz alapértelmezett rendszer üzenetküldő alkalmazásból.\n </string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Az adatbázis importálása
+az alapértelmezett rendszer üzenetküldő alkalmazásból.
+ </string>
   <string name="import_fragment__import_encrypted_backup">Titkosított biztonsági mentés importálása</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nEgy korábbi exportált titkosított TextSecure biztonsági mentés visszaállítása.\n </string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Egy korábbi exportált titkosított TextSecure biztonsági mentés visszaállítása.
+ </string>
   <string name="import_fragment__import_plaintext_backup">Titkosítatlan biztonsági mentés importálása</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nEgy titkosítatlan biztonsági mentés fájl importálása. \"SMS biztonsági mentés és visszaállítás\" kompatibilis.</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Egy titkosítatlan biztonsági mentés fájl importálása. \"SMS biztonsági mentés és visszaállítás\" kompatibilis.</string>
   <string name="local_identity__regenerate_key">Kulcs létrehozása újra</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Az MMS beállítások kézi megadása szükséges a telefonodon.</string>
@@ -412,41 +487,83 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Befejezés</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nA TextSecure azonnali üzenetek használatát is lehetővé teszi, így elősegíti a titoktartást és az SMS díjak elkerülését a más\nTextSecure felhasználókkal való kommunikáció során. Ennek a szolgáltatásnak az igénybe vételéhez, kérlek ellenőrizd a saját országhívó számot és a telefonszámot!\n </string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+A TextSecure azonnali üzenetek használatát is lehetővé teszi, így elősegíti a titoktartást és az SMS díjak elkerülését a más
+TextSecure felhasználókkal való kommunikáció során. Ennek a szolgáltatásnak az igénybe vételéhez, kérlek ellenőrizd a saját országhívó számot és a telefonszámot!
+ </string>
   <string name="registration_activity__your_country">SAJÁT ORSZÁGOD</string>
-  <string name="registration_activity__your_country_code_and_phone_number">SAJÁT ORSZÁG HÍVÓSZÁM\nTELEFONSZÁM\n </string>
+  <string name="registration_activity__your_country_code_and_phone_number">SAJÁT ORSZÁG HÍVÓSZÁM
+TELEFONSZÁM
+ </string>
   <string name="registration_activity__phone_number">TELEFONSZÁM</string>
   <string name="registration_activity__register">Regisztrálás</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">A regisztrálás néhány személyes adatot fog küldeni a kiszolgálónak ideiglenesen.</string>
   <string name="registration_activity__skip">Kihagyás</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Néhány lehetséges probléma\nbeleértve:\n </string>
+  <string name="registration_problems__some_possible_problems_include">Néhány lehetséges probléma
+beleértve:
+ </string>
   <string name="registration_problems__sms_interceptors">SMS figyelők</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nNéhány harmadik féltől származó üzenetküldő kliens program, mint pl. a Handcent vagy GoSMS, nem következetesen viselkedik és\nminden bejövő SMS üzenetet elkap. Ellenőrizd, hogy van-e olyan SMS üzenet amely úgy kezdődik, hogy\n\"TextSecure ellenőrző kódod:\", amely esetben állíts be a\na harmadik féltől származó üzenetküldő alkalmazást, hogy engedje át az SMS üzeneteket!\n </string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Néhány harmadik féltől származó üzenetküldő kliens program, mint pl. a Handcent vagy GoSMS, nem következetesen viselkedik és
+minden bejövő SMS üzenetet elkap. Ellenőrizd, hogy van-e olyan SMS üzenet amely úgy kezdődik, hogy
+\"TextSecure ellenőrző kódod:\", amely esetben állíts be a
+a harmadik féltől származó üzenetküldő alkalmazást, hogy engedje át az SMS üzeneteket!
+ </string>
   <string name="registration_problems__incorrect_number">Hibás szám.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nKérlek ellenőrizd, hogy biztosan helyesen adtad-e meg a számodat, és a régiódnak megfelelő\naz alakja!\n </string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+Kérlek ellenőrizd, hogy biztosan helyesen adtad-e meg a számodat, és a régiódnak megfelelő
+az alakja!
+ </string>
   <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nA TextSecure nem működik a Google Voice számokkal.\n </string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+A TextSecure nem működik a Google Voice számokkal.
+ </string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Hang alapú azonosítás</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nA TextSecure felhívhat, hogy így ellenőrizze a számodat. Koppints a \"Hívj fel!\" feliratra és add meg a hat számjegyet\namit fogsz hallani!\n </string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+A TextSecure felhívhat, hogy így ellenőrizze a számodat. Koppints a \"Hívj fel!\" feliratra és add meg a hat számjegyet
+amit fogsz hallani!
+ </string>
   <string name="registration_progress_activity__verify">Ellenőrzés</string>
   <string name="registration_progress_activity__call_me">Hívjon most!</string>
   <string name="registration_progress_activity__edit_number">Szám szerkesztése</string>
   <string name="registration_progress_activity__connectivity_error">Kapcsolati hiba.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nA TextSecure alkalmazás nem tudott az azonnali üzenetküldő szolgáltatáshoz kapcsolódni.\n </string>
-  <string name="registration_progress_activity__some_possible_problems_include">Néhány lehetséges probléma\nbeleértve:\n </string>
-  <string name="registration_progress_activity__no_network_connectivity">Nincs hálózati\nkapcsolat!\n </string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Jelen\neszköz hálózati kapcsolattal kell rendelkezzen, hogy a TextSecure ezen szolgáltatását használhasd! Kérlek biztosítsd, hogy az eszköz a\n3G mobilnetre vagy WiFi-re kapcsolódjon!\n </string>
-  <string name="registration_progress_activity__restrictive_firewall">Korlátozó tűzfal.\n </string>
-  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nHa WiFi-vel kapcsolódsz az internetre, akkor lehetséges, hogy egy tűzfal korlátozza\na TexSecure kiszolgáló elérését. Próbálj másik kapcsolatot, vagy mobilnetet használni!</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nA TextSecure most már automatikusan ellenőrzi a számodat egy ellenőrző SMS üzenettel.\n </string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
+A TextSecure alkalmazás nem tudott az azonnali üzenetküldő szolgáltatáshoz kapcsolódni.
+ </string>
+  <string name="registration_progress_activity__some_possible_problems_include">Néhány lehetséges probléma
+beleértve:
+ </string>
+  <string name="registration_progress_activity__no_network_connectivity">Nincs hálózati
+kapcsolat!
+ </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Jelen
+eszköz hálózati kapcsolattal kell rendelkezzen, hogy a TextSecure ezen szolgáltatását használhasd! Kérlek biztosítsd, hogy az eszköz a
+3G mobilnetre vagy WiFi-re kapcsolódjon!
+ </string>
+  <string name="registration_progress_activity__restrictive_firewall">Korlátozó tűzfal.
+ </string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Ha WiFi-vel kapcsolódsz az internetre, akkor lehetséges, hogy egy tűzfal korlátozza
+a TexSecure kiszolgáló elérését. Próbálj másik kapcsolatot, vagy mobilnetet használni!</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+A TextSecure most már automatikusan ellenőrzi a számodat egy ellenőrző SMS üzenettel.
+ </string>
   <string name="registration_progress_activity__connecting">Kapcsolódás...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Várakozás SMS\nellenőrzésre...\n </string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Várakozás SMS
+ellenőrzésre...
+ </string>
   <string name="registration_progress_activity__registering_with_server">Regisztrálás a kiszolgálón...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Ez\neltarthat egy ideig. Légy türelemmel, értesítést fogsz kapni amikor az ellenőrzés befejeződött.\n </string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nA TextSecure alkalmazás túllépte egy ellenőrző SMS üzenet várakozási idejét.\n </string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS ellenőrzés\nsikertelen.\n </string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Ez
+eltarthat egy ideig. Légy türelemmel, értesítést fogsz kapni amikor az ellenőrzés befejeződött.
+ </string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+A TextSecure alkalmazás túllépte egy ellenőrző SMS üzenet várakozási idejét.
+ </string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS ellenőrzés
+sikertelen.
+ </string>
   <string name="registration_progress_activity__generating_keys">Kulcsok létrehozása...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Írj be egy nevet vagy egy számot!</small></string>
@@ -478,6 +595,7 @@
   <string name="AndroidManifest__complete_key_exchange">Teljes kulcs-csere</string>
   <string name="AndroidManifest__log_submit">Hibakeresési napló küldése</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__my_identity_key">Saját azonosító kulcs</string>
   <!--preferences.xml-->
   <string name="preferences__general">Általános</string>
@@ -564,7 +682,9 @@
   <string name="preferences__make_default_sms_app">Beállítás alapértelmezett SMS alkalmazásként</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Legyen a TextSecure az alapértelmezett SMS/MMS alkalmazás a rendszerben.</string>
   <string name="preferences__use_data_channel">Azonnali üzenetek</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nNöveld a biztonságodat és kerüld el az SMS díjak fizetését azzal, hogy adat csatornát használsz más TextSecure felhasználókkal való kommunikációhoz.\n </string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Növeld a biztonságodat és kerüld el az SMS díjak fizetését azzal, hogy adat csatornát használsz más TextSecure felhasználókkal való kommunikációhoz.
+ </string>
   <string name="preferences__allow_sms_fallback">Kimenő SMS engedélyezése...</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">A TextSecure jelenleg az alapértelmezett SMS alkalmazásod. Először állíts be egy másik alapértelmezett SMS alkalmazást ennek megváltoztatásához.</string>
   <string name="preferences__refresh_push_directory">Azonnali üzenetek könyvtár frissítése</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 997f39fae4..0376c507e8 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -14,7 +14,10 @@
   <string name="ApplicationPreferencesActivity_delete">Hapus</string>
   <string name="ApplicationPreferencesActivity_my">Saya</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Matikan enkripsi media simpan?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nPeringatan, ini akan menonaktifkan penyimpanan terenkripsi untuk semua pesan dan kunci. Sesi enkripsi\nanda selanjutnya akan berfungsi, tapi siapa saja yang mempunyai akses pisik ke perangkat anda\ndapat mengaksesnya</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Peringatan, ini akan menonaktifkan penyimpanan terenkripsi untuk semua pesan dan kunci. Sesi enkripsi
+anda selanjutnya akan berfungsi, tapi siapa saja yang mempunyai akses pisik ke perangkat anda
+dapat mengaksesnya</string>
   <string name="ApplicationPreferencesActivity_disable">Dinon aktifkan</string>
   <string name="ApplicationPreferencesActivity_unregistering">Keluar...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Keluar dari komunikasi berbasis data</string>
@@ -61,8 +64,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Anda yakin ingin meninggalkan grup ini?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Rincian pesan</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">Transpor: %1$s\nTerkirim/Diterima: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Pengirim: %1$s\nTranspor: %2$s\nTerkirim: %3$s\nDiterima: %4$s</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Apakah anda yakin akan menghapus pesan ini secara permanen?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Media ini telah disimpan dalam basis data terenkripsi. Versi yang anda simpan ke kartu SD tidak akan lagi dienkripsi. Apakah anda ingin melanjutkan?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Gagal menyimpan lampiran ke kartu SD!</string>
@@ -79,16 +80,23 @@
   <string name="ConversationListItem_key_exchange_message">Pesan pertukaran kunci...</string>
   <!--ShareActivity-->
   <!--ExportFragment-->
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ini\nakan mengeksport kunci terenkripsi, dan pesan ke kartu SD    </string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Ini
+akan mengeksport kunci terenkripsi, dan pesan ke kartu SD    </string>
   <string name="ExportFragment_export">Eksport</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Peringatan, ini akan\nmengeksport konten pesan teks polos TextSecure anda ke kartu SD</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Peringatan, ini akan
+mengeksport konten pesan teks polos TextSecure anda ke kartu SD</string>
   <string name="ExportFragment_cancel">Batal</string>
   <string name="ExportFragment_exporting">Mengeksport</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Mengeksport teks polos ke kartu SD...\n</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Tidak dapat menyimpan ke kartu\nSD!\n</string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Gagal ketika menyimpan ke kartu SD.\n</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Mengeksport teks polos ke kartu SD...
+</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Tidak dapat menyimpan ke kartu
+SD!
+</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Gagal ketika menyimpan ke kartu SD.
+</string>
   <string name="ExportFragment_success">Sukses!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Mengeksport kunci yang dienkripsi,\npengaturan, dan pesan...</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Mengeksport kunci yang dienkripsi,
+pengaturan, dan pesan...</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_contacts_dont_support_push">Anda telah memilih kontak yang tidak mendukung grup TextSecure, sehingga grup ini akan menggunakan MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Anda tidak terdaftar untuk menggunakan saluran data, sehingga grup TextSecure dimatikan.</string>
@@ -101,12 +109,21 @@
   <string name="ImportExportActivity_import">Import</string>
   <string name="ImportExportActivity_export">Eksport</string>
   <!--ImportFragment-->
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Ini akan mengimport\npesan dari basis data SMS default ke TextSecure. Jika anda sebelumnya\ntelah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.\n</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Ini akan mengimport
+pesan dari basis data SMS default ke TextSecure. Jika anda sebelumnya
+telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.
+</string>
   <string name="ImportFragment_import">Import</string>
   <string name="ImportFragment_cancel">Batal</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nMemulihkan dari cadangan yang enkripsi akan sepenuhnya mengganti kunci, preferensi dan\npesan anda. Anda akan kehilangan informasi yang ada di instalasi TextSecure saat ini tetapi\ncadangan anda tetap aman.\n</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Memulihkan dari cadangan yang enkripsi akan sepenuhnya mengganti kunci, preferensi dan
+pesan anda. Anda akan kehilangan informasi yang ada di instalasi TextSecure saat ini tetapi
+cadangan anda tetap aman.
+</string>
   <string name="ImportFragment_restore">Pulihkan</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Ini akan mengimport\npesan dari basis data SMS standar ke TextSecure. Jika anda sebelumnya\ntelah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Ini akan mengimport
+pesan dari basis data SMS standar ke TextSecure. Jika anda sebelumnya
+telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.</string>
   <string name="ImportFragment_importing">Mengimport</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Mengimport cadangan teks polos...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Cadangan teks polos tidak ditemukan!</string>
@@ -132,19 +149,32 @@
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Anda harus mengisi URL MMSC operator anda.</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Anda dapat memodifikasi nilai ini kapan saja dari pengaturan TextSecure.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Isi\ntanda tangan dalam pertukaran kunci ini berbeda dengan apa yang telah anda terima sebelumnya dari\nkontak ini. Hal ini bisa berarti bahwa seseorang mencoba mencegat komunikasi anda, atau\nkontak ini telah menginstall ulang TextSecure dan sekarang memiliki kunci identitas baru.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Anda mungkin ingin memverifikasi\nkontak ini.\n</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Isi\ntanda tangan pertukaran kunci ini dipercaya, tetapi anda\nmenonaktifkan \'selesaikan perturakan kunci\nsecara otomatis\'</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Isi
+tanda tangan dalam pertukaran kunci ini berbeda dengan apa yang telah anda terima sebelumnya dari
+kontak ini. Hal ini bisa berarti bahwa seseorang mencoba mencegat komunikasi anda, atau
+kontak ini telah menginstall ulang TextSecure dan sekarang memiliki kunci identitas baru.</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Anda mungkin ingin memverifikasi
+kontak ini.
+</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Isi
+tanda tangan pertukaran kunci ini dipercaya, tetapi anda
+menonaktifkan \'selesaikan perturakan kunci
+secara otomatis\'</string>
   <string name="ReceiveKeyActivity_processing">Memproses</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Memproses pertukaran kunci...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Hubungkan dengan TextSecure</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Anda harus menetapkan kode\nNegara anda\n</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Anda harus mengisi nomor\ntelefon anda\n</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_invalid_number">Nomor tidak benar</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nomor yang anda\nisikan (%s) tidak tepat.\n</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nomor yang anda
+isikan (%s) tidak tepat.
+</string>
   <string name="RegistrationActivity_unsupported">Tidak didukung</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nKami sekarang akan memverifikasi bahwa nomor berikut dikaitkan dengan perangkat ini:\n\n%s\n\n\nApakah nomor ini benar, apakah ingin merubahnya sebelum melanjutkan?</string>
   <string name="RegistrationActivity_continue">Lanjutkan</string>
   <string name="RegistrationActivity_edit">Edit</string>
   <!--RegistrationProblemsActivity-->
@@ -169,9 +199,13 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Pendaftaran TextSecure telah berhasil.</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pendaftaran TextSecure mengalami masalah.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Pesan menerima dan \nmemproses pertukaran kunci korupsi.</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nDiterima pesan pertukaran kunci untuk versi protokol yang tidak valid.\n</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nMenerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan menampilkan.</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Pesan menerima dan 
+memproses pertukaran kunci korupsi.</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
+</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan menampilkan.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Menerima pembaharuan atas identitas yang tidak diketahui. Sentuh untuk memvalidasi identitas</string>
   <string name="SmsMessageRecord_secure_session_ended">Sesi aman berakhir.</string>
   <!--ThreadRecord-->
@@ -237,9 +271,15 @@
   <string name="MessageNotifier_mark_as_read">Tandai telah dibaca</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Meregenerasi...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Meregenerasi kunci\nidentitas...\n</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Meregenerasi kunci
+identitas...
+</string>
   <string name="ViewLocalIdentityActivity_regenerated">Teregenerasi!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nPerhatian! Dengan meregenerasi kunci identitas akan menghilangkan kunci identitas saat ini\ndan seluruh kontak anda akan mendapat peringatan ketika membuat sesi aman yang baru dengan Anda.\nApakah Anda yakin untuk melanjutkan?\n</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+Perhatian! Dengan meregenerasi kunci identitas akan menghilangkan kunci identitas saat ini
+dan seluruh kontak anda akan mendapat peringatan ketika membuat sesi aman yang baru dengan Anda.
+Apakah Anda yakin untuk melanjutkan?
+</string>
   <string name="ViewLocalIdentityActivity_cancel">Batal</string>
   <string name="ViewLocalIdentityActivity_continue">Lanjutkan</string>
   <!--SmsReceiver-->
@@ -303,11 +343,18 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Ini bisa sedikit memakan waktu. Harap bersabar, kami akan memberi tahu anda ketika proses import selesai</string>
   <string name="database_migration_activity__importing">MENGIMPORT</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksport cadangan dienkripsi\nke kartu SD.</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExport cadangan ke teks polos yang kompatibel dengan \'SMSBackup And Restore\'  ke kartu SD.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Import database\ndari aplikasi perpesan bawaan\n</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nPulihkan dari cadangan teracak TextSecure.\n</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nImport cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Restore\'.</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Eksport cadangan dienkripsi
+ke kartu SD.</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+Export cadangan ke teks polos yang kompatibel dengan \'SMSBackup And Restore\'  ke kartu SD.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Import database
+dari aplikasi perpesan bawaan
+</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Pulihkan dari cadangan teracak TextSecure.
+</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Import cadangan dalam texks polos. Kompatibel dengan aplikasi \'SMSBackup And Restore\'.</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Telepon Anda membutuhkan pengaturan MMS secara manual.</string>
   <!--prompt_passphrase_activity-->
@@ -323,29 +370,49 @@
   <string name="receive_key_activity__complete">Selesai</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">NEGARA ANDA</string>
-  <string name="registration_activity__your_country_code_and_phone_number">KODE NEGARA ANDA DAN\nNOMOR TELEPON</string>
+  <string name="registration_activity__your_country_code_and_phone_number">KODE NEGARA ANDA DAN
+NOMOR TELEPON</string>
   <string name="registration_activity__phone_number">NOMOR TELEPON</string>
   <string name="registration_activity__register">Daftar</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registrasi akan mengirim beberapa info kontak ke server untuk sementara.</string>
   <string name="registration_activity__skip">Lewati</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Beberapa masalah yang mungkin\ntermasuk:\n</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nBeberapa aplikasi sms pihak ketiga seperti Hancent atau GoSMS bekerja dengan agresif dan\nmenghadang seluruh pesan SMS masuk. Periksa jika anda menerima pesan yg berawalan\n\'Your TextSecure verification code:\', dalam hal ini anda perlu untuk mengkonfigurasi\naplikasi SMS pihak ketiga anda untuk memperbolehkan pesan SMS masuk.\n</string>
+  <string name="registration_problems__some_possible_problems_include">Beberapa masalah yang mungkin
+termasuk:
+</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Beberapa aplikasi sms pihak ketiga seperti Hancent atau GoSMS bekerja dengan agresif dan
+menghadang seluruh pesan SMS masuk. Periksa jika anda menerima pesan yg berawalan
+\'Your TextSecure verification code:\', dalam hal ini anda perlu untuk mengkonfigurasi
+aplikasi SMS pihak ketiga anda untuk memperbolehkan pesan SMS masuk.
+</string>
   <string name="registration_problems__incorrect_number">nomor salah.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure tidak akan berfungsi dengan nomor Google Voice\n</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure tidak akan berfungsi dengan nomor Google Voice
+</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__verify">Verifikasi</string>
   <string name="registration_progress_activity__edit_number">Edit nomor</string>
   <string name="registration_progress_activity__connectivity_error">Kesalahan konektivitas</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Kemungkinan masalah\ntermasuk:\n</string>
-  <string name="registration_progress_activity__no_network_connectivity">Tidak ada konektivitas\njaringan.\n</string>
-  <string name="registration_progress_activity__restrictive_firewall">Firewall yang ketat.\n</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Kemungkinan masalah
+termasuk:
+</string>
+  <string name="registration_progress_activity__no_network_connectivity">Tidak ada konektivitas
+jaringan.
+</string>
+  <string name="registration_progress_activity__restrictive_firewall">Firewall yang ketat.
+</string>
   <string name="registration_progress_activity__connecting">Menghubungkan...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Menunggu Verifikasi\nSMS...</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__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure kehabisan waktu saat menunggu verifikasi pesan SMS.\n</string>
-  <string name="registration_progress_activity__sms_verification_failed">Verifikasi SMS\nTelah gagal\n</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+TextSecure kehabisan waktu saat menunggu verifikasi pesan SMS.
+</string>
+  <string name="registration_progress_activity__sms_verification_failed">Verifikasi SMS
+Telah gagal
+</string>
   <string name="registration_progress_activity__generating_keys">Membuat kunci...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Masukkan nama atau nomor</small></string>
@@ -356,8 +423,6 @@
   <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>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Nama identitas:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identitas yang diimpor:\\n</string>
   <string name="verify_import_identity_activity__verified">Terverifikasi!</string>
   <string name="verify_import_identity_activity__compare">Bandingkan</string>
   <!--verify_keys_activity-->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c0af6bae57..e67c0b528f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -8,9 +8,9 @@
   <string name="ApplicationPreferencesActivity_currently_s">In questo momento: %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Devi inserire la tua password prima di controllare le chiavi...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Non hai ancora impostato una password!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">messagi per conversazione</string>
-  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Elimina tutti i messagi vecchi ora?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Vuoi davvero ridurre tutti i thread delle conversazioni ai %s messaggi più recenti?</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">messaggi per conversazione</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Eliminare tutti i messaggi vecchi ora?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Vuoi davvero ridurre tutte conversazioni ai soli %s messaggi più recenti?</string>
   <string name="ApplicationPreferencesActivity_delete">Elimina</string>
   <string name="ApplicationPreferencesActivity_my">Il mio</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Disabilitare la cifratura dei dati salvati?</string>
@@ -26,10 +26,10 @@ Avrai bisogno di registrare di nuovo il tuo numero di telefono per usare i messa
 </string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Errore durante la connessione al server!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Non sei registrato con il servizio push...</string>
-  <string name="ApplicationPreferencesActivity_updating_directory">Aggiornamento directory</string>
-  <string name="ApplicationPreferencesActivity_updating_push_directory">Aggiornamento directory push...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Aggiornamento cartella</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Aggiornamento cartella push...</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS in entrata abilitati</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tocca per cambiare l\'applicazione predefinita per gli SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Premi per cambiare l\'applicazione predefinita per gli SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS in entrata disabilitati</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Tocca per rendere TextSecure l\'applicazione predefinita per gli SMS</string>
   <!--AttachmentTypeSelectorAdapter-->
@@ -385,6 +385,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="conversation_activity__remove">Elimina</string>
   <string name="conversation_activity__window_description">Conversazione con %1$s</string>
   <string name="conversation_activity__compose_description">Composizione messaggio</string>
+  <string name="conversation_activity__emoji_toggle_description">Dis/attiva la tastiera emoji</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Messaggio multimediale</string>
   <string name="conversation_item__play_button_description">Pulsante Play</string>
@@ -401,7 +402,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="conversation_item_received__downloading">Caricamento in corso</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modalità di selezione di gruppo</string>
-  <string name="conversation_fragment_cab__batch_selection_amount">%s selezionato</string>
+  <string name="conversation_fragment_cab__batch_selection_amount">%s selezionati</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Caricamento dei paese...</string>
   <string name="country_selection_fragment__search">Cerca</string>
@@ -420,6 +421,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="log_submit_activity__log_fetch_failed">Non riesco a recuperare i log dal tuo dispositivo. Puoi sempre utilizzare ADB per ottenere i log di debug.</string>
   <string name="log_submit_activity__log_submit_success_title">Completato!</string>
   <string name="log_submit_activity__log_got_it">Capito</string>
+  <string name="log_submit_activity__your_pastebin_url">Per favore, copia quest\'indirizzo ed aggiungilo alla tua segnalazione (pressione prolungata per copiarlo negli appunti) <b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Aggiunto agli appunti</string>
   <string name="log_submit_activity__loading_logcat">Caricamento logcat...</string>
   <string name="log_submit_activity__thanks">Grazie dell\'aiuto!</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ca522433b2..dd04de2ec3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -14,12 +14,16 @@
   <string name="ApplicationPreferencesActivity_delete">削除</string>
   <string name="ApplicationPreferencesActivity_my">自分のﾌｨﾝｶﾞｰﾌﾟﾘﾝﾄ</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">端末内保存データの暗号化を無効にしますか？</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n警告、この作業によって、携帯端末に保存されるすべてのメッセージと鍵の暗号化が無効になります！\n通信上（セッション）の暗号化は引き続き行われますが、お使いの携帯端末それ自体に、誰かが物理的な接触を試みた場合、メッセージや鍵などの情報が入手されてしまう可能性があります。</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+警告、この作業によって、携帯端末に保存されるすべてのメッセージと鍵の暗号化が無効になります！
+通信上（セッション）の暗号化は引き続き行われますが、お使いの携帯端末それ自体に、誰かが物理的な接触を試みた場合、メッセージや鍵などの情報が入手されてしまう可能性があります。</string>
   <string name="ApplicationPreferencesActivity_disable">無効</string>
   <string name="ApplicationPreferencesActivity_unregistering">登録破棄中…</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">データ通信を行うために登録を取消しています</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">プッシュメッセージを無効化しますか？</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nサーバーから登録を取消し、プッシュメッセージを無効化します。\n再びプッシュメッセージを使用するには、</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+サーバーから登録を取消し、プッシュメッセージを無効化します。
+再びプッシュメッセージを使用するには、</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">サーバー接続中にエラーが発生しました！</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">あなたはプッシュサービスに登録していません。</string>
   <string name="ApplicationPreferencesActivity_updating_directory">ダイレクトリーを更新しています</string>
@@ -52,7 +56,6 @@
   <string name="ConversationItem_click_to_approve_mms_dialog_title">代替としてMMSに切り替わりますか？</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>。\n\n暗号化されていないメッセージを送信しますか?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">セキュア・セッションを開始しますか？</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">%sさんとセキュア・セッションを開始しますか？</string>
@@ -81,8 +84,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">このグループを本当に抜けますか？</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">メッセージの詳細</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">通信: %1$s\n送受信: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">送信者: %1$s\n通信: %2$s\n送信: %3$s\n受信: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">メッセージ削除の確認</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">このメッセージを完全に削除してもよろしいですか？</string>
   <string name="ConversationFragment_save_to_sd_card">SDカードに保存しますか？</string>
@@ -140,7 +141,8 @@
   <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">\n暗号化されたバックアップ・ファイルを復元すると、現在のキー、設定、及びメッセージは完全に上書きされます。現在のTextSecureインストール環境は上書きされますが、バックアップ・ファイルは残ります。</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+暗号化されたバックアップ・ファイルを復元すると、現在のキー、設定、及びメッセージは完全に上書きされます。現在のTextSecureインストール環境は上書きされますが、バックアップ・ファイルは残ります。</string>
   <string name="ImportFragment_restore">復元</string>
   <string name="ImportFragment_import_plaintext_backup">平文のバックアップをインポートしますか？</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">暗号化されていないテキストのバックアップ・ファイルからメッセージをインポートします。以前に同じバックアップ・ファイルをインポートしたことがある場合、メッセージが重複することになります。</string>
@@ -173,9 +175,15 @@
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">お使いの通信事業者のMMSセンター用URLを指定して下さい。</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">TextSecure設定メニューから、これらの値をいつでも変更できます。</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">この\n鍵交換の電子署名は、以前この連絡先から受信したものと違っています。\n誰かがあなたの通信を傍受しようとしているか、もしくは\n単にこの連絡先がTextSecureを再インストールしたため、認証キーが新しくなった可能性があります。</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">この連絡先を\n照合することが推奨されています。</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">この\n鍵交換の電子署名は信用されていますが、「自動で鍵交換を完了する」設定は\n無効になっています。</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">この
+鍵交換の電子署名は、以前この連絡先から受信したものと違っています。
+誰かがあなたの通信を傍受しようとしているか、もしくは
+単にこの連絡先がTextSecureを再インストールしたため、認証キーが新しくなった可能性があります。</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">この連絡先を
+照合することが推奨されています。</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">この
+鍵交換の電子署名は信用されていますが、「自動で鍵交換を完了する」設定は
+無効になっています。</string>
   <string name="ReceiveKeyActivity_processing">処理中</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">鍵交換を処理中...</string>
   <!--RegistrationActivity-->
@@ -260,7 +268,10 @@
   <string name="ViewLocalIdentityActivity_regenerating">再生成中…</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">アイデンティティー鍵を再生成中…</string>
   <string name="ViewLocalIdentityActivity_regenerated">再生成完了！</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\n警告!アイデンティティー鍵を再生成することで、現在の鍵は失われ、\n既存の連絡先はあなたと暗号化されたセッションを開始するときに警告を受けることになります。\n続行しますか？</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+警告!アイデンティティー鍵を再生成することで、現在の鍵は失われ、
+既存の連絡先はあなたと暗号化されたセッションを開始するときに警告を受けることになります。
+続行しますか？</string>
   <string name="ViewLocalIdentityActivity_cancel">中止</string>
   <string name="ViewLocalIdentityActivity_continue">続行</string>
   <!--SmsReceiver-->
@@ -314,11 +325,16 @@
   <string name="database_migration_activity__importing">インポート中</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">データベースを更新中…</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">SDカードへ暗号化された\nバックアップ・ファイルをエクスポートします</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n「SMSバックアップと復元」と互換性のある暗号化されていないテキストのバックアップ・ファイルをSDカードにエクスポートします</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">端末既定のメッセンジャー・アプリから\nデータベースをインポート</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\n前回エクスポートした暗号化されたTextSecureバックアップ・ファイルを復元</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\n暗号化されていないテキストのバックアップ・ファイルをインポートします。「SMSバックアップと復元」と互換可能です。</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">SDカードへ暗号化された
+バックアップ・ファイルをエクスポートします</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+「SMSバックアップと復元」と互換性のある暗号化されていないテキストのバックアップ・ファイルをSDカードにエクスポートします</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">端末既定のメッセンジャー・アプリから
+データベースをインポート</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+前回エクスポートした暗号化されたTextSecureバックアップ・ファイルを復元</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+暗号化されていないテキストのバックアップ・ファイルをインポートします。「SMSバックアップと復元」と互換可能です。</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">この端末は、ご自分でMMS設定をする必要があります。</string>
   <!--prompt_passphrase_activity-->
@@ -356,8 +372,6 @@
   <string name="verify_identity_activity__their_identity_they_read">相手の認証キー（通信相手が読む）:</string>
   <string name="verify_identity_activity__your_identity_you_read">自分の認証キー（自分が読む）:</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">IDネーム:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">インポートした認証キー:\\n</string>
   <string name="verify_import_identity_activity__verified">照合できました。</string>
   <string name="verify_import_identity_activity__compare">比較</string>
   <!--verify_keys_activity-->
@@ -383,7 +397,8 @@
   <string name="preferences__disable_local_encryption_of_messages_and_keys">携帯端末におけるメッセージ及び鍵の暗号化を無効にする</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">同じIDネームとの新しいセッション、又は現在のセッションをするのに鍵交換を自動で完了させる</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">一定時間経過するとメモリからパスワードを消去する</string>
-  <string name="preferences__timeout_passphrase">パスワードの\nタイムアウト</string>
+  <string name="preferences__timeout_passphrase">パスワードの
+タイムアウト</string>
   <string name="preferences__pref_timeout_interval_title">タイムアウトの間隔</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">メモリからパスワードを消去するまでの待ち時間です</string>
   <string name="preferences__identity_key_settings">認証キー</string>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 488018166a..b4aadc34a9 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -14,7 +14,10 @@
   <string name="ApplicationPreferencesActivity_delete">ಅಳಿಸಿಹಾಕು</string>
   <string name="ApplicationPreferencesActivity_my">ನನ್ನ</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">ಶೇಖರಣಾ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nಎಚ್ಚರಿಕೆ, ಇದು ಎಲ್ಲಾ ಸಂದೇಶಗಳ ಮತ್ತು ಕೀಲಿಗಳ ಶೇಖರಣಾ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ.\nಸೆಷನ್ಸ್ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತವೆ, ಆದರೆ ನಿಮ್ಮ ಸಾಧನದ ಭೌತಿಕ ಪ್ರವೇಶದೊಂದಿಗೆ ಯಾರಿಗಾದರೂ ಅವುಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು \nಸಾಧ್ಯವಾಗುತ್ತದೆ.</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+ಎಚ್ಚರಿಕೆ, ಇದು ಎಲ್ಲಾ ಸಂದೇಶಗಳ ಮತ್ತು ಕೀಲಿಗಳ ಶೇಖರಣಾ ಗೂಢಲಿಪೀಕರಣವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ.
+ಸೆಷನ್ಸ್ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತವೆ, ಆದರೆ ನಿಮ್ಮ ಸಾಧನದ ಭೌತಿಕ ಪ್ರವೇಶದೊಂದಿಗೆ ಯಾರಿಗಾದರೂ ಅವುಗಳನ್ನು ನಿಲುಕಿಸಿಕೊಳ್ಳಲು 
+ಸಾಧ್ಯವಾಗುತ್ತದೆ.</string>
   <string name="ApplicationPreferencesActivity_disable">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
   <string name="ApplicationPreferencesActivity_unregistering">ನೋಂದಣಿಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುತ್ತಿದೆ...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">ಮಾಹಿತಿ ಆಧಾರಿತ ಸಂವಹನವನ್ನು ರದ್ದುಗೊಳಿಸಲು</string>
@@ -49,7 +52,6 @@
   <string name="ConversationItem_click_to_approve_mms_dialog_title">ಎಮ್.ಎಮ್.ಎಸ್ ಗೆ ಹಿಮ್ಮರಳಿ ?</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>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">ಸುರಕ್ಷಿತ ಸೆಷನ್ ಪ್ರಾರಂಭಿಸಿ?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">%s ನೊಂದಿಗೆ ಸುರಕ್ಷಿತ ಅಧಿವೇಶನವನ್ನು ಪ್ರಾರಂಭಿಸಲೆ?</string>
@@ -78,8 +80,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">ಈ ಸಮೂಹ ಬಿಡವ ಬಯಕೆಯನ್ನು ನೀವು ಖಚಿತವಾಗಿರುವಿರಾ?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">ಸಂದೇಶದ ವಿವರಗಳು</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">ರವಾನೆ: %1$s\nಕಳುಹಿಸಲಾಗಿದೆ / ಸ್ವೀಕರಿಸಲಾಗಿದೆ:%2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">ಕಳುಹಿಸುವವನು: %1$s\nರವಾನೆ: %2$s\nಕಳುಹಿಸಲಾಗಿದೆ: %3$s\nಸ್ವೀಕರಿಸಿದ್ದೇವೆ:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">ಸಂದೇಶವನ್ನು ಅಳಿಸಿ ಹಾಕಲಾಗುತ್ತದೆ, ಖಚಿತಪಡಿಸಿ</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">ಶಾಶ್ವತವಾಗಿ ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸಲು ನೀವು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
   <string name="ConversationFragment_save_to_sd_card">ಎಸ್. ಡಿ ಕಾರ್ಡ್ಗೆ ಉಳಿಸಲೆ?</string>
@@ -102,7 +102,8 @@
   <string name="ShareActivity_share_with">ಜೊತೆ ಹಂಚಿಕೊಳ್ಳಿ </string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">ಎಸ್.ಡಿ  ಕಾರ್ಡ್ಗೆ ರಫ್ತು ಮಾಡಿ?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">ಇದು\nಏಸ್.ಡಿ ಕಾರ್ಡ್ಗೆ ನಿಮ್ಮ ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಕೀಲಿಗಳನ್ನು, ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮತ್ತು ಸಂದೇಶಗಳ ರಫ್ತು ಮಾಡುತ್ತದೆ.</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">ಇದು
+ಏಸ್.ಡಿ ಕಾರ್ಡ್ಗೆ ನಿಮ್ಮ ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಕೀಲಿಗಳನ್ನು, ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮತ್ತು ಸಂದೇಶಗಳ ರಫ್ತು ಮಾಡುತ್ತದೆ.</string>
   <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>
@@ -112,7 +113,8 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">ದೋಷ ⏎ ಎಸ್ ಡಿ ಕಾರ್ಡ್ಗೆ ಬರೆಯಲು ಸಾಧ್ಯವಾಗುವುತ್ತಿಲ್ಲ! ⏎</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">ಎಸ್.ಡಿ ಕಾರ್ಡ್ಗೆ ಬರೆಯುವಾಗ ದೋಷವಾಗಿದೆ. ⏎</string>
   <string name="ExportFragment_success">ಯಶಸ್ವಿಯಾಗಿದೆ!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಕೀಲಿಗಳನ್ನು,\nಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮತ್ತು ಸಂದೇಶಗಳನ್ನು ರಫ್ತು ಮಾಡಲಾಗುತ್ತಿದೆ ...</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಕೀಲಿಗಳನ್ನು,
+ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಮತ್ತು ಸಂದೇಶಗಳನ್ನು ರಫ್ತು ಮಾಡಲಾಗುತ್ತಿದೆ ...</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">ಹೋಸ ಸಮೂಹ </string>
   <string name="GroupCreateActivity_actionbar_update_title">ಸಮೂಹವನ್ನು ನವೀಕರಿಸಿ</string>
@@ -133,11 +135,15 @@
   <string name="ImportExportActivity_export">ರಫ್ತು ಮಾಡಿ</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">ವ್ಯವಸ್ಥೆಯ ಎಸ್.ಎಮ್.ಎಸ್ ದತ್ತಾಂಶವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">ಇದು ವ್ಯವಸ್ಥೆಯ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್ಎಮ್ಎಸ್ ದತ್ತಸಂಚಯದಿಂದ ಟೆಕ್ಸ್ಟ್ ಸೆಕುರ್  ಗೆ ಸಂದೇಶಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳುತ್ತದೆ. \nನೀವು ಈ ಹಿಂದೆ ವ್ಯವಸ್ಥೆಯ ಸಂಚಿಕೆ ದತ್ತಾಂಶ ಆಮದು ಮಾಡಿಕೊಂಡಿದ್ದರೆ, ಮತ್ತೆ ಆಮದು ನಕಲು ಸಂದೇಶಗಳಿಗೆ ಕಾರಣವಾಗುತ್ತದೆ.</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">\nಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಬ್ಯಾಕ್ಅಪ್ನ ಪುನಃಸ್ಥಾಪಿಸಿದರೆ, ಅದು ನಿಮ್ಮ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕೀಲಿಗಳನ್ನು, ಆಯ್ಕೆಗಳು, ಮತ್ತು \nಸಂದೇಶಗಳನ್ನು ಸಂಪೂರ್ಣವಾಗಿ ಬದಲಾಯಿಸುತ್ತದೆ. ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಅನುಸ್ಥಾಪನೆಯಲ್ಲಿ ಇರುವ ಹಾಗು \nಬ್ಯಾಕ್ಅಪ್ನಲ್ಲಿ ಇರದ ಯಾವುದೇ ಮಾಹಿತಿಯನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ.</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಬ್ಯಾಕ್ಅಪ್ನ ಪುನಃಸ್ಥಾಪಿಸಿದರೆ, ಅದು ನಿಮ್ಮ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕೀಲಿಗಳನ್ನು, ಆಯ್ಕೆಗಳು, ಮತ್ತು 
+ಸಂದೇಶಗಳನ್ನು ಸಂಪೂರ್ಣವಾಗಿ ಬದಲಾಯಿಸುತ್ತದೆ. ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಅನುಸ್ಥಾಪನೆಯಲ್ಲಿ ಇರುವ ಹಾಗು 
+ಬ್ಯಾಕ್ಅಪ್ನಲ್ಲಿ ಇರದ ಯಾವುದೇ ಮಾಹಿತಿಯನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ.</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>
@@ -174,19 +180,22 @@
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">ನೀವು ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಈ ಮೌಲ್ಯಗಳನ್ನು ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಸೆಟ್ಟಿಂಗ್ಗಸ್ ಮೆನುವಿನಲ್ಲಿ ಮಾರ್ಪಡಿಸಬಹುದು.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">ಈ ಕೀಲಿ ವಿನಿಮಯದ ಮೇಲಿನ ಸಹಿ ನೀವು ಹಿಂದೆ ಈ ಸಂಪರ್ಕದಿಂದ ಸ್ವೀಕರಿಸಿದ್ದಕಿಂತ ಭಿನ್ನವಾಗಿದೆ. ಇದು ಯಾರಾದರೂ ನಿಮ್ಮ ಸಂವಹನವನ್ನು ಅಡ್ಡಿಪಡಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರಬಹುದು ಅಥವಾ ಈ ಸಂಪರ್ಕ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಮರು ಸ್ಥಾಪಿಸಿ, ಈಗ ಹೊಸ ಗುರುತನ್ನು ಕೀಲಿ ಹೊಂದಿದೆ ಅರ್ಥ.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ನೀವು ಪರಿಶೀಲಿಸಲು ಇಚ್ಛಿಸಬಹುದಾದ ⏎ \nಸಂಪರ್ಕ. ⏎</string>
+  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">ನೀವು ಪರಿಶೀಲಿಸಲು ಇಚ್ಛಿಸಬಹುದಾದ ⏎ 
+ಸಂಪರ್ಕ. ⏎</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">ಈ ಕೀಲಿ ವಿನಿಮಯದ ಮೇಲಿನ ⏎ ಸಹಿ ನಂಬಲರ್ಹ, ಆದರೆ  \'ಸ್ವಯಂಚಾಲಿತ ಸಂಪೂರ್ಣ ಕೀಲಿ⏎ ವಿನಿಮಯ\' ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ⏎</string>
   <string name="ReceiveKeyActivity_processing">ಸಂಸ್ಕರಿಸಲಾಗುತ್ತಿದೆ</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">ಕೀಲಿ ವಿನಿಮಯ ಸಂಸ್ಕರಿಸಲಾಗುತ್ತಿದೆ...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಜೋತೆಗೆ ಸಂಪರ್ಕ</string>
   <string name="RegistrationActivity_select_your_country">ನಿಮ್ಮ ರಾಷ್ಟ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code"> ನಿಮ್ಮ ದೇಶದ ಸಂಕೇತವನ್ನು \nನೀವು ಸೂಚಿಸಬೇಕು</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">ನಿಮ್ಮ ದೂರವಾಣಿ \nಸಂಖ್ಯೆಯನ್ನು ಸೂಚಿಸಬೇಕು</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code"> ನಿಮ್ಮ ದೇಶದ ಸಂಕೇತವನ್ನು 
+ನೀವು ಸೂಚಿಸಬೇಕು</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">ನಿಮ್ಮ ದೂರವಾಣಿ 
+ಸಂಖ್ಯೆಯನ್ನು ಸೂಚಿಸಬೇಕು</string>
   <string name="RegistrationActivity_invalid_number">ಅಮಾನ್ಯವಾದ ಸಂಖ್ಯೆ</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">ನೀವು ಸೂಚಿಸಿದ \nಸಂಖ್ಯೆ (%s) ಅಮಾನ್ಯವಾಗಿದೆ. </string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">ನೀವು ಸೂಚಿಸಿದ 
+ಸಂಖ್ಯೆ (%s) ಅಮಾನ್ಯವಾಗಿದೆ. </string>
   <string name="RegistrationActivity_unsupported">ಬೆಂಬಲವಿಲ್ಲ</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nನಾವು ಈಗ ಕೆಳಗಿನ ಸಂಖ್ಯೆ ಈ ಸಾಧನದ ಜತೆ ಸಂಬಂಧ ಹೊಂದಿದೆ ಎಂದು ಪರೀಕ್ಷಿಸುತ್ತೇವೆ:\n%s\nಈ ಸಂಖ್ಯೆ ಸರಿಯಾಗಿದೆ,  ಅಥವಾ ನೀವು ಮುಂದುವರೆಯುವ ಮೊದಲು ಅದನ್ನು ಸಂಪಾದಿಸಲು ಬಯಸುತ್ತೀರಿ?</string>
   <string name="RegistrationActivity_continue">ಮುಂದುವರಿಸು</string>
   <string name="RegistrationActivity_edit">ಸಂಪಾದಿಸಿ</string>
   <!--RegistrationProblemsActivity-->
@@ -219,9 +228,12 @@
   <string name="RegistrationService_registration_error">ನೋಂದಣಿ ದೋಷ</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ಗೆ ನೋಂದಾಯಿಸುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">ಭ್ರಷ್ಟಗೊಂಡಿದೆ ಕೀಲಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ\nವಿನಿಮಯ ಸಂದೇಶ!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nಅಮಾನ್ಯವಾದ ಪ್ರೊಟೋಕಾಲ್ ಆವೃತ್ತಿಯ ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nಸ್ವೀಕರಿಸಿದ ಸಂದೇಶ ಅಪರಿಚಿತ ಗುರುತಿನ ಕೀಯನ್ನು ಹೊಂದಿದೆ. ಸಂಸ್ಕರಿಸಲು ಮತ್ತು ಪ್ರದರ್ಶಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ.</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">ಭ್ರಷ್ಟಗೊಂಡಿದೆ ಕೀಲಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ
+ವಿನಿಮಯ ಸಂದೇಶ!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+ಅಮಾನ್ಯವಾದ ಪ್ರೊಟೋಕಾಲ್ ಆವೃತ್ತಿಯ ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+ಸ್ವೀಕರಿಸಿದ ಸಂದೇಶ ಅಪರಿಚಿತ ಗುರುತಿನ ಕೀಯನ್ನು ಹೊಂದಿದೆ. ಸಂಸ್ಕರಿಸಲು ಮತ್ತು ಪ್ರದರ್ಶಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ.</string>
   <string name="SmsMessageRecord_secure_session_ended">ಸುರಕ್ಷಿತ ಸೆಷನ್ ಕೊನೆಗೋಂಡಿದೆ</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">ಗುಂಪನ್ನು ಬಿಟ್ಟಿದ್ದಾರೆ ...</string>
@@ -292,10 +304,15 @@
   <string name="MessageNotifier_mark_as_read">ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">ಪುನರುತ್ಥಾನಗೊಳಿಸಲಾಗುತ್ತಿದೆ</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">ಮರುಸೃಷ್ಟಿಸಲಾಗುತ್ತಿದೆ  ⏎ \nಗುರುತಿನ ಕೀಲಿ ... ⏎</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">ಮರುಸೃಷ್ಟಿಸಲಾಗುತ್ತಿದೆ  ⏎ 
+ಗುರುತಿನ ಕೀಲಿ ... ⏎</string>
   <string name="ViewLocalIdentityActivity_regenerated">ಪುನರುತ್ಥಾನಗೊಳಿಸಲಾಗಿದೆ!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">ಗುರುತಿನ ಕೀಲಿ ಮರುಹೊಂದಿಸಿ?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\n⏎\nಎಚ್ಚರಿಕೆ! ನಿಮ್ಮ ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಮರುಸೃಷ್ಟಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಶಾಶ್ವತವಾಗಿ ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ, ⏎ \nಮತ್ತು ನಿಮ್ಮ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮೊಂದಿಗೆ ಹೊಸ ಸುರಕ್ಷಿತ ಸೆಷನ್ಸ್ ಸ್ಥಾಪಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಎಚ್ಚರಿಕೆಗಳನ್ನು ಸ್ವೀಕರಿಸುತ್ತಾರೆ.  ⏎ \nನೀವು ಮುಂದುವರಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ⏎</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+⏎
+ಎಚ್ಚರಿಕೆ! ನಿಮ್ಮ ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಮರುಸೃಷ್ಟಿಸುವ ಮೂಲಕ, ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಶಾಶ್ವತವಾಗಿ ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ, ⏎ 
+ಮತ್ತು ನಿಮ್ಮ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮೊಂದಿಗೆ ಹೊಸ ಸುರಕ್ಷಿತ ಸೆಷನ್ಸ್ ಸ್ಥಾಪಿಸುವ ಸಂದರ್ಭದಲ್ಲಿ ಎಚ್ಚರಿಕೆಗಳನ್ನು ಸ್ವೀಕರಿಸುತ್ತಾರೆ.  ⏎ 
+ನೀವು ಮುಂದುವರಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ? ⏎</string>
   <string name="ViewLocalIdentityActivity_cancel">ರದ್ದುಮಾಡು</string>
   <string name="ViewLocalIdentityActivity_continue">ಮುಂದುವರಿಸು</string>
   <!--SmsReceiver-->
@@ -359,15 +376,19 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">ದತ್ತಾಂಶ ಆಧುನಿಕಗೊಳಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <string name="export_fragment__export_encrypted_backup">ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">ಎಸ್.ಡಿ  ಕಾರ್ಡ್ಗೆ \nಒಂದು ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ⏎ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ.</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">ಎಸ್.ಡಿ  ಕಾರ್ಡ್ಗೆ 
+ಒಂದು ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ⏎ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ.</string>
   <string name="export_fragment__export_plaintext_backup">ಸರಳಪಠ್ಯದ ಬ್ಯಾಕಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nಏಸ್ ಡಿ  ಕಾರ್ಡ್ಗೆ \'SMSBackup And Restore\' ಹೊಂದಬಲ್ಲ ಒಂದು ಸರಳಪಠ್ಯ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ.</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+ಏಸ್ ಡಿ  ಕಾರ್ಡ್ಗೆ \'SMSBackup And Restore\' ಹೊಂದಬಲ್ಲ ಒಂದು ಸರಳಪಠ್ಯ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ರಫ್ತು ಮಾಡಿ.</string>
   <string name="import_fragment__import_system_sms_database">ವ್ಯವಸ್ಥೆಯ ಎಸ್.ಎಮ್.ಎಸ್ ದತ್ತಾಂಶವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ</string>
   <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_textsecure_backup">\nಹಿಂದೆ ರಫ್ತು ಮಾಡಲಾದ ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ಪುನಃಸ್ಥಾಪಿಸಿ.</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+ಹಿಂದೆ ರಫ್ತು ಮಾಡಲಾದ ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಬ್ಯಾಕ್ಅಪ್ ಅನ್ನು ಪುನಃಸ್ಥಾಪಿಸಿ.</string>
   <string name="import_fragment__import_plaintext_backup">ಸರಳಪಠ್ಯದ  ಬ್ಯಾಕಪ್ ಅನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nಒಂದು ಸರಳಪಠ್ಯ ಬ್ಯಾಕಪ್ ಕಡತವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ . \'SMSBackup And Restore\' ಜೋತೆ ಹೊಂದಿಕೆಯಾಗುತ್ತದೆ.</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+ಒಂದು ಸರಳಪಠ್ಯ ಬ್ಯಾಕಪ್ ಕಡತವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ . \'SMSBackup And Restore\' ಜೋತೆ ಹೊಂದಿಕೆಯಾಗುತ್ತದೆ.</string>
   <string name="local_identity__regenerate_key">ಕೀಲಿ ಮರುರಚಿಸಿ</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">ನಿಮ್ಮ ದೂರವಾಣಿಗೆ ಹಸ್ತಚಾಲಿತ ಎಂ.ಎಂ.ಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳ ಅಗತ್ಯವಿದೆ.</string>
@@ -375,7 +396,8 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಗುಪ್ತಪದ</string>
   <string name="prompt_passphrase_activity__unlock">ಅನ್ಲಾಕ್</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯುರಗೆ  ನಿಮ್ಮ ನಿಸ್ತಂತು ವಾಹಕ ಮೂಲಕ ಮಾಧ್ಯಮ ಮತ್ತು ಗುಂಪು ಸಂದೇಶಗಳನ್ನು ತಲುಪಿಸಲು ಎಂಎಂಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳ ಅಗತ್ಯವಿದೆ.\nನಿಮ್ಮ ಸಾಧನ, ಈ ಮಾಹಿತಿಯನ್ನು ಲಭ್ಯ ಮಾಡುವುದಿಲ್ಲ. ಇದು ಲಾಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳು ಮತ್ತು ಇತರ ನಿರ್ಬಂಧಿತ ಸಂರಚನೆಗಳನ್ನು ಉಳ್ಳ ಸಾಧನಗಳಲ್ಲಿ ಕೆಲವೊಮ್ಮೆ ಆಗುತ್ತದೆ.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯುರಗೆ  ನಿಮ್ಮ ನಿಸ್ತಂತು ವಾಹಕ ಮೂಲಕ ಮಾಧ್ಯಮ ಮತ್ತು ಗುಂಪು ಸಂದೇಶಗಳನ್ನು ತಲುಪಿಸಲು ಎಂಎಂಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳ ಅಗತ್ಯವಿದೆ.
+ನಿಮ್ಮ ಸಾಧನ, ಈ ಮಾಹಿತಿಯನ್ನು ಲಭ್ಯ ಮಾಡುವುದಿಲ್ಲ. ಇದು ಲಾಕ್ ಮಾಡಲಾದ ಸಾಧನಗಳು ಮತ್ತು ಇತರ ನಿರ್ಬಂಧಿತ ಸಂರಚನೆಗಳನ್ನು ಉಳ್ಳ ಸಾಧನಗಳಲ್ಲಿ ಕೆಲವೊಮ್ಮೆ ಆಗುತ್ತದೆ.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">ಮಾಧ್ಯಮ ಮತ್ತು ಗುಂಪು ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲು, \'OK\' ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ ಮತ್ತು ವಿನಂತಿಸಿದ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಪೂರ್ಣಗೊಳಿಸಿ. ನಿಮ್ಮ ವಾಹಕದ   ಎಂಎಂಎಸ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಸಾಮಾನ್ಯ ಹುಡುಕಾಟದ ಮೂಲಕ ಕಂಡುಹಿಡಿಯಬಹುದು. </string>
   <string name="prompt_mms_activity__mmsc_url_required">ಎಂ.ಎಂ.ಎಸ್.ಸಿ ಯು.ಆರ್.ಎಲ್ (ಅಗತ್ಯ):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">ಎಂ.ಎಂ.ಎಸ್ ಪ್ರಾಕ್ಸಿ ಹೋಸ್ಟ್ (ಐಚ್ಛಿಕ):</string>
@@ -384,37 +406,52 @@
   <string name="receive_key_activity__complete">ಪೂರ್ಣಗೊಳಿಸಿ</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">ನಿಮ್ಮ ರಾಷ್ಟ್ರ</string>
-  <string name="registration_activity__your_country_code_and_phone_number">ನಿಮ್ಮ ರಾಷ್ಟ್ರ ಸಂಕೇತ ಹಾಗೂ\nದೂರವಾಣಿ ಸಂಖ್ಯೆ</string>
+  <string name="registration_activity__your_country_code_and_phone_number">ನಿಮ್ಮ ರಾಷ್ಟ್ರ ಸಂಕೇತ ಹಾಗೂ
+ದೂರವಾಣಿ ಸಂಖ್ಯೆ</string>
   <string name="registration_activity__phone_number">ದೂರವಾಣಿ ಸಂಖ್ಯೆ</string>
   <string name="registration_activity__register">ನೋಂದಾಯಿಸು</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">ನೋಂದಣಿಗೆ ತಾತ್ಕಾಲಿಕವಾಗಿ ಸರ್ವರ್ಗೆ ಕೆಲವು ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ರವಾನಿಸಲಾಗುತ್ತದೆ.</string>
   <string name="registration_activity__skip">ಬಿಟ್ಟು ಮುಂದುವರಿ</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">ಕೆಲವು ಸಂಭಾವ್ಯ ಸಮಸ್ಯೆಗಳಲ್ಲಿ \nಇವು ಸೇರಿವೆ: </string>
+  <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">\nಕೆಲವು ತೃತೀಯ ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶದ ಕ್ಲೈಂಟ್ಗಳು, ಉದಾಹರಣೆಗೆ Handcent ಅಥವಾ GoSMS, ಕಳಪೆಯಾಗಿ ವರ್ತಿಸುತ್ತವೆ ಹಾಗೂ ಎಲ್ಲಾ ಒಳಬರುವ ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶಗಳನ್ನು ಅಡ್ಡಗಟ್ಟುತ್ತವೆ. ನೀವು ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಿದ ವೇಳೆಯಲ್ಲಿ, ಆ ಸಂದೇಶ \' Your TextSecure verification code:\'  ಎಂಬುದಾಗಿ  ಆರಂಭವಾಗುತ್ತದೆಯೇ ಎಂದು ಪರಿಶೀಲಿಸಿ. ಆ ಸಂದರ್ಭದಲ್ಲಿ ನಿಮ್ಮ ತೃತೀಯ ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶದ ಅಪ್ಲಿಕೇಶನ್ನನ್ನು  ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶಗಳು ಹಾದು ಹೋಗಲು ಸಾಧ್ಯವಾಗುವಂತೆ  ಕಾನ್ಫಿಗರ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ. </string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+ಕೆಲವು ತೃತೀಯ ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶದ ಕ್ಲೈಂಟ್ಗಳು, ಉದಾಹರಣೆಗೆ Handcent ಅಥವಾ GoSMS, ಕಳಪೆಯಾಗಿ ವರ್ತಿಸುತ್ತವೆ ಹಾಗೂ ಎಲ್ಲಾ ಒಳಬರುವ ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶಗಳನ್ನು ಅಡ್ಡಗಟ್ಟುತ್ತವೆ. ನೀವು ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶವನ್ನು ಸ್ವೀಕರಿಸಿದ ವೇಳೆಯಲ್ಲಿ, ಆ ಸಂದೇಶ \' Your TextSecure verification code:\'  ಎಂಬುದಾಗಿ  ಆರಂಭವಾಗುತ್ತದೆಯೇ ಎಂದು ಪರಿಶೀಲಿಸಿ. ಆ ಸಂದರ್ಭದಲ್ಲಿ ನಿಮ್ಮ ತೃತೀಯ ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶದ ಅಪ್ಲಿಕೇಶನ್ನನ್ನು  ಎಸ್. ಎಮ್. ಎಸ್ ಸಂದೇಶಗಳು ಹಾದು ಹೋಗಲು ಸಾಧ್ಯವಾಗುವಂತೆ  ಕಾನ್ಫಿಗರ್ ಮಾಡಬೇಕಾಗುತ್ತದೆ. </string>
   <string name="registration_problems__incorrect_number">ತಪ್ಪಾದ ಸಂಖ್ಯೆ.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nನೀವು ಸರಿಯಾಗಿ ನಿಮ್ಮ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿರುವಿರಿ ಹಾಗೂ ಇದು ನಿಮ್ಮ ವಲಯಕ್ಕೆ ಸೂಕ್ತವಾಗಿ ಸ್ವರೂಪಗೊಳಿಸಲಾಗಿದೆ ಎಂದು ಪರಿಶೀಲಿಸಿ.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+ನೀವು ಸರಿಯಾಗಿ ನಿಮ್ಮ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿರುವಿರಿ ಹಾಗೂ ಇದು ನಿಮ್ಮ ವಲಯಕ್ಕೆ ಸೂಕ್ತವಾಗಿ ಸ್ವರೂಪಗೊಳಿಸಲಾಗಿದೆ ಎಂದು ಪರಿಶೀಲಿಸಿ.</string>
   <string name="registration_problems__google_voice">ಗೂಗಲ್ ವಾಯ್ಸ್.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nಟೆಕ್ಸ್ಟ-ಸೆಕ್ಯೂರ್ ಗೂಗಲ್ ವಾಯ್ಸ್ ಸಂಖ್ಯೆಯ ಜೋತೆ ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+ಟೆಕ್ಸ್ಟ-ಸೆಕ್ಯೂರ್ ಗೂಗಲ್ ವಾಯ್ಸ್ ಸಂಖ್ಯೆಯ ಜೋತೆ ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">ಧ್ವನಿ ಪರಿಶೀಲನೆ</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nಟೆಕ್ಸ್ಟ-ಸೆಕ್ಯೂರ್ ನಿಮ್ಮ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮಗೆ ಕರೆ ಕೂಡ ಮಾಡಬಲ್ಲದು. \n\'ನನಗೆ ಕರೆ ಮಾಡಿ\' ಟ್ಯಾಪ್ ಮಾಡಿ ಹಾಗೂ ನೀವು ಆಲಿಸಿದ ಆರು ಅಂಕಿಯ ಸಂಕೇತವನ್ನು ಕೆಳಗೆ ನಮೂದಿಸಿ .</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+ಟೆಕ್ಸ್ಟ-ಸೆಕ್ಯೂರ್ ನಿಮ್ಮ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲು ನಿಮಗೆ ಕರೆ ಕೂಡ ಮಾಡಬಲ್ಲದು. 
+\'ನನಗೆ ಕರೆ ಮಾಡಿ\' ಟ್ಯಾಪ್ ಮಾಡಿ ಹಾಗೂ ನೀವು ಆಲಿಸಿದ ಆರು ಅಂಕಿಯ ಸಂಕೇತವನ್ನು ಕೆಳಗೆ ನಮೂದಿಸಿ .</string>
   <string name="registration_progress_activity__verify">ಪರಿಶೀಲಿಸಿ</string>
   <string name="registration_progress_activity__call_me">ನನಗೆ ಕರೆ ಮಾಡಿ </string>
   <string name="registration_progress_activity__edit_number">ಸಂಖ್ಯೆಯನ್ನು ಸಂಪಾದಿಸಿ</string>
   <string name="registration_progress_activity__connectivity_error">ಸಂಪರ್ಕ ದೋಷ.</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nಟೆಕ್ಸ್ಟ್-ಸೆಕ್ಯೂರ್ಗೆ ಪುಶ್ ಸೇವೆಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">ಕೆಲವು ಸಂಭಾವ್ಯ ಸಮಸ್ಯೆಗಳಲ್ಲಿ\nಇವೂ ಸೇರಿವೆ:</string>
-  <string name="registration_progress_activity__no_network_connectivity">ನೆಟ್ವರ್ಕ್ \nಸಂಪರ್ಕ ಇಲ್ಲ. </string>
+  <string name="registration_progress_activity__textsecure_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__restrictive_firewall">ನಿರ್ಬಂಧಿತ ಫೈರ್ವಾಲ್.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nಟೆಕ್ಸ್ಟ್-ಸೆಕ್ಯೂರ್ ಈಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಒಂದು ದೃಢೀಕರಣ ಎಸ್ಎಂಎಸ್ ಸಂದೇಶದ ಮೂಲಕ ನಿಮ್ಮ ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸುತ್ತದೆ.</string>
+  <string name="registration_progress_activity__textsecure_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">ಎಸ್ಎಂಎಸ್ ಪರಿಶೀಲನೆಗಾಗಿ\nನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ ...</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">ಇದು \nಒಂದು ಕ್ಷಣ ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ದಯವಿಟ್ಟು ತಾಳ್ಮೆಯಿಂದಿರಿ, ಪರಿಶೀಲನೆ ಪೂರ್ಣಗೊಂಡಾಗ ನಾವು ನಿಮ್ಮ ಗಮನಕ್ಕೆ ತರುತ್ತೇವೆ. </string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nಟೆಕ್ಸ್ಟ್-ಸೆಕ್ಯೂರ್ ಪರಿಶೀಲನೆ ಎಸ್ಎಂಎಸ್ ಸಂದೇಶಕ್ಕಾಗಿ ಕಾಯುವ ಸಮಯ ಮೀರಿದೆ.</string>
-  <string name="registration_progress_activity__sms_verification_failed">ಎಸ್ ಎಂ ಎಸ್ ಪರಿಶೀಲನೆ \nವಿಫಲವಾಗಿದೆ. </string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">ಇದು 
+ಒಂದು ಕ್ಷಣ ತೆಗೆದುಕೊಳ್ಳಬಹುದು. ದಯವಿಟ್ಟು ತಾಳ್ಮೆಯಿಂದಿರಿ, ಪರಿಶೀಲನೆ ಪೂರ್ಣಗೊಂಡಾಗ ನಾವು ನಿಮ್ಮ ಗಮನಕ್ಕೆ ತರುತ್ತೇವೆ. </string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+ಟೆಕ್ಸ್ಟ್-ಸೆಕ್ಯೂರ್ ಪರಿಶೀಲನೆ ಎಸ್ಎಂಎಸ್ ಸಂದೇಶಕ್ಕಾಗಿ ಕಾಯುವ ಸಮಯ ಮೀರಿದೆ.</string>
+  <string name="registration_progress_activity__sms_verification_failed">ಎಸ್ ಎಂ ಎಸ್ ಪರಿಶೀಲನೆ 
+ವಿಫಲವಾಗಿದೆ. </string>
   <string name="registration_progress_activity__generating_keys">ಕೀಲಿಗಳನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>ಹೆಸರು ಅಥವಾ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿ</small></string>
@@ -425,8 +462,6 @@
   <string name="verify_identity_activity__their_identity_they_read">ಅವರ ಗುರುತು (ಅವರು ಓದುವುದು):</string>
   <string name="verify_identity_activity__your_identity_you_read">ನಿಮ್ಮ ಗುರುತು (ನೀವು ಓದುವುದು):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">ಗುರುತಿನ ಹೆಸರು:\⏎\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">ಆಮದು ಮಾಡಿಕೊಂಡ ಗುರುತು:\⏎\n</string>
   <string name="verify_import_identity_activity__verified">ಪರಿಶೀಲಿಸಲಾಗಿದೆ</string>
   <string name="verify_import_identity_activity__compare">ಹೋಲಿಸಿ</string>
   <!--verify_keys_activity-->
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 4e6e8c0d91..ed6c314a1e 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -197,8 +197,6 @@
   <string name="verify_identity_activity__their_identity_they_read">သူများ အိုင်ဒီ (သူများ အမြင်) - </string>
   <string name="verify_identity_activity__your_identity_you_read">အသင့်အိုင်ဒီ (အသင့်အမြင်) - </string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">အသိအမှတ်ပြုမှုအမည်:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">အသိအမှတ်ပြုမှုသွင်းယူ:\\n</string>
   <string name="verify_import_identity_activity__verified">အတည်ပြုပြီး</string>
   <string name="verify_import_identity_activity__compare">နှိုင်းယှဉ်</string>
   <!--verify_keys_activity-->
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index e67e5af7b2..57feb30ea8 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -84,6 +84,7 @@ Du må registrere telefonnummeret ditt på nytt dersom du ønsker å benytte \'p
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Er du sikker på at du ønsker å forlate denne gruppen?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meldingsdetaljer</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSendt/Mottatt: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Avsender: %1$s\nTransport: %2$s\nSendt: %3$s\nMottatt:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Bekreft sletting av melding</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Er du sikker på at du ønsker å slette denne meldingen?</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a9173d39a4..0c2c9b4c07 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -5,13 +5,13 @@
   <string name="no">Não</string>
   <string name="delete">Apagar</string>
   <!--ApplicationPreferencesActivity-->
-  <string name="ApplicationPreferencesActivity_currently_s">Correntemente: %s</string>
+  <string name="ApplicationPreferencesActivity_currently_s">Atualmente: %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">É necessário digitar a frase-chave antes de gerenciar as chaves...</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Você ainda não definiu uma frase-chave!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">mensagens por conversa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Deletar todas mensagens antigas agora?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
-  <string name="ApplicationPreferencesActivity_delete">Deletar</string>
+  <string name="ApplicationPreferencesActivity_delete">Apagar</string>
   <string name="ApplicationPreferencesActivity_my">Minhas</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desabilitar criptografia de armazenamento?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4c03051dd3..7c55f9b5c2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -14,7 +14,8 @@
   <string name="ApplicationPreferencesActivity_delete">Şterge</string>
   <string name="ApplicationPreferencesActivity_my">A mea</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Dezactivează stocarea criptata?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAtenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor și cheilor. Sesiunile actuale criptate vor continua să funcționeze, dar oricine care are acces la dispozitiv va putea să le acceseze.</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Atenție, acestă acțiune va dezactiva stocarea criptată a tuturor mesajelor și cheilor. Sesiunile actuale criptate vor continua să funcționeze, dar oricine care are acces la dispozitiv va putea să le acceseze.</string>
   <string name="ApplicationPreferencesActivity_disable">Dezactivează</string>
   <string name="ApplicationPreferencesActivity_unregistering">Anulare înregistrării se află în desfășurare...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Anulare inregistrarii comunicatiilor de date</string>
@@ -43,24 +44,36 @@
   <string name="ConversationItem_group_action_joined">%1$s a/au intrat in group.</string>
   <string name="ConversationItem_group_action_modify">%1$s a actualizat grupul.</string>
   <string name="ConversationItem_click_to_approve_sms">Apăsaţi pentru revenirea la SMS ca soluţie de rezervă </string>
+  <string name="ConversationItem_click_to_approve_mms">Apăsaţi pentru revenirea la MMS ca soluţie de rezervă </string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Apăsaţi pentru revenirea la SMS ca soluţie de rezervă </string>
   <string name="ConversationItem_click_to_approve_sms_dialog_title">Reveniţi la SMS ca soluţie de rezervă?</string>
+  <string name="ConversationItem_click_to_approve_mms_dialog_title">Reveniţi la SMS ca soluţie de rezervă?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Reveniţi la SMS necriptat ca soluţie de rezervă?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Reveniţi la MMS necriptat ca soluţie de rezervă?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Acest mesaj <b>nu</b> va fi criptat deoarece nu s-a putut realiza o sesiune securizată.\n\nTrimit mesaj nesecurizat?</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">Initializez Sesiune Securizata?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initializez Sesiune Securizata cu %s?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Se confirmă terminarea sesiunii securizate</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Sunteți sigur că doriți terminarea sesiunii securizate?</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Confirmă ștergerea conversației</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ești sigur că dorești să ștergi permanent această conversație?</string>
   <string name="ConversationActivity_add_attachment">Adauga atasament</string>
   <string name="ConversationActivity_select_contact_info">Selectează informații de contact</string>
+  <string name="ConversationActivity_compose_message">Compune mesaj</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ne pare rău, a apărut o eroare în setarea atașamentului tău.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Ne pare rău, fișierul video selectat depășește restricțiile de mărime pentru mesaje.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Ne pare rău, fișierul audio selectat depășește restricțiile de mărime pentru mesaje.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatarul nu este o adresă validă de SMS sau e-mail.</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Mesajul este gol!</string>
+  <string name="ConversationActivity_group_conversation_recipients">Grupează destinatarii conversaţiei</string>
+  <string name="ConversationActivity_group_conversation">Grupează conversaţia</string>
+  <string name="ConversationActivity_unnamed_group">Grup nedenumit</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membrii</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 membru</string>
   <string name="ConversationActivity_saved_draft">Ciornă salvată</string>
   <string name="ConversationActivity_invalid_recipient">Destinatar invalid!</string>
+  <string name="ConversationActivity_calls_not_supported">Nu există suport pentru apeluri</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Acest dispozitiv nu pare să ofere acţiuni pentru formarea numărului de telefon.</string>
   <string name="ConversationActivity_leave_group">Doriți să părăsiți grupul?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Sunteți sigur că doriți să părăsiți acest grup?</string>
@@ -68,10 +81,14 @@
   <string name="ConversationFragment_message_details">Detalii mesaj</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nTrimis/Primit: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Expeditor: %1$s\nTransport: %2$s\nTrimis: %3$s\nPrimit: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">Confirmă ştergerea mesajului</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Eşti sigur că doreşti să ştergi permanent acest mesaj?</string>
+  <string name="ConversationFragment_save_to_sd_card">Salvez pe SD Card?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Aceste date au fost stocate într-o baza de date criptată. Versiunea pe care o salvezi pe SD card nu va mai fi criptată. Dorești să continui?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">A apărut o eroare în timpul salvării pe SD card!</string>
   <string name="ConversationFragment_success_exclamation">Succes!</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nu pot scrie pe SD Card!</string>
+  <string name="ConversationFragment_saving_attachment">Ataşamentul se salvează</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Atasamentul se salveaza pe SD card...</string>
   <!--ConversationListAdapter-->
   <string name="ConversationListAdapter_key_exchange_message">Mesaj pentru schimb de chei...</string>
@@ -85,8 +102,10 @@
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partajează cu</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">Export pe SD card?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Această acțiune va exporta cheile criptate, setările și mesajele pe SD card.</string>
   <string name="ExportFragment_export">Exportă</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Export în format text pe SD card?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenție, această acțiune va exporta conținutul text al mesajelor TextSecure pe SD card.</string>
   <string name="ExportFragment_cancel">Anulează</string>
   <string name="ExportFragment_exporting">Se exportă</string>
@@ -94,25 +113,36 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Eroare, nu am putut scrie pe SD card!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Eroare in timpul scrierii pe SD card.</string>
   <string name="ExportFragment_success">Succes!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Se exportă cheile criptate, \nsetările și mesajele...</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Se exportă cheile criptate, 
+setările și mesajele...</string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Grup nou</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Actualizează grup</string>
+  <string name="GroupCreateActivity_group_name_hint">Numele grupului</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Grup MMS nou</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Ați selectat un contact care nu acceptă grupuri de tip TextSecure, prin urmare acest grup va fi de tip MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Nu v-ați înregistrat în prealabil pentru folosirea canalului de date, prin urmare grupurile TextSecure sunt dezactivate.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">A apărut o eroare neprevazută care a dus la imposibilitatea creării grupului.</string>
   <string name="GroupCreateActivity_contacts_no_members">Este nevoie de cel putin o persoana in grupul dvs.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Unul dintre membrii grupului dvs. are un număr de telefon ce nu poate fi citit corect. Vă rugăm să remediaţi problema sau să eliminaţi acel contact şi să încercaţi din nou.</string>
   <string name="GroupCreateActivity_file_io_exception">Eroare I/O în fișier, nu s-a putut crea un fișier temporar de imagine.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar de grup</string>
+  <string name="GroupCreateActivity_menu_create_title">Creare grup </string>
   <string name="GroupCreateActivity_creating_group">Se creează %1$s…</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Contactele non-Textsecure nu pot fi adăugate unui grup existent TextSecure</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Importă</string>
   <string name="ImportExportActivity_export">Exportă</string>
   <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">Import baza de date cu SMS-uri?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Această acțiune va importa mesajele din baza de date cu SMS-uri a dispozitivului în TextSecure. Dacă ai importat anterior aceste mesaje, importarea lor din nou va rezulta în mesaje duplicate.</string>
   <string name="ImportFragment_import">Importă</string>
   <string name="ImportFragment_cancel">Anulează</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nRestaurarea unui backup criptat va înlocui complet cheile existente, setările și mesajele. Vei pierde toate informațiile curente din TextSecure, dar nu și cele din backup.</string>
+  <string name="ImportFragment_restore_encrypted_backup">Restaurează backup criptat?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Restaurarea unui backup criptat va înlocui complet cheile existente, setările și mesajele. Vei pierde toate informațiile curente din TextSecure, dar nu și cele din backup.</string>
   <string name="ImportFragment_restore">Restaurează</string>
+  <string name="ImportFragment_import_plaintext_backup">Importă backup necriptat?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Această acțiune va importa mesajele din backup-ul necriptat. Dacă ați mai importat acest backup atunci importarea curentă va crea mesaje duplicate. </string>
   <string name="ImportFragment_importing">Se importă</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importă backup text...</string>
@@ -131,12 +161,20 @@
   <string name="MmsDownloader_error_connecting_to_mms_provider">Eroare de conectare la furnizorul MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Eroare la citirea setărilor MMS ale operatorului wireless...</string>
   <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">Mesaj multimedia</string>
   <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Mesaj criptat cu o versiune veche de protocol care nu mai este suportată. Rugaţi expeditorul să actualizeze TextSecure la cea mai recentă versiune.</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>
   <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_enter_passphrase">Introduceţi parola</string>
+  <string name="PassphrasePromptActivity_watermark_content_description">Icoană TextSecure</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">Trimite parola</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Parolă incorectă!</string>
   <!--PromptMmsActivity-->
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Trebuie sa specifici un URL MMSC pentru operatorul tau.</string>
+  <string name="PromptMmsActivity_mms_settings_updated">Setările MMS au fost actualizate</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Poți modifica aceste valori în orice moment din meniul Setări al TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Semnătura digitală din acest schimb de chei este diferită fața de ce ai primit anterior de la această persoană. Asta poate însemna că cineva încearcă să intercepteze comunicația sau că această persoană a reinstalat TextSecure și acum are o nouă cheie de identitate.</string>
@@ -146,15 +184,19 @@
   <string name="ReceiveKeyActivity_processing_key_exchange">Se proceseaza schimbul de chei...</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectare prin TextSecure</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Trebuie sa specificati\ncodul dvs de tara</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Trebuie să specificaţi\nnumărul dvs. de telefon</string>
+  <string name="RegistrationActivity_select_your_country">Alegeţi ţara dumneavostră</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Trebuie sa specificati
+codul dvs de tara</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Trebuie să specificaţi
+numărul dvs. de telefon</string>
   <string name="RegistrationActivity_invalid_number">Număr invalid</string>
-  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Numărul de telefon\nfurnizat (%s) este invalid.</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Numărul de telefon
+furnizat (%s) este invalid.</string>
   <string name="RegistrationActivity_unsupported">Neacceptat</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nVom verifica acum dacă numărul de telefon de mai jos este asociat cu acest aparat:\n\n%s\n\nEste acest număr de telefon corect, sau doriţi să îl editaţi înainte de a continua?</string>
   <string name="RegistrationActivity_continue">Continuă</string>
   <string name="RegistrationActivity_edit">Editeaza</string>
   <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Probleme posibile</string>
   <!--RegistrationProgressActivity-->
   <string name="RegistrationProgressActivity_verifying_number">Verificarea numărului</string>
   <string name="RegistrationProgressActivity_edit_s">Editeaza %s</string>
@@ -163,22 +205,34 @@
   <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Trebuie sa introduceti codul primit anterior...</string>
   <string name="RegistrationProgressActivity_connecting">Se contecteaza</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Conectare pentru verificare...</string>
+  <string name="RegistrationProgressActivity_network_error">Eroare de reţea!</string>
   <string name="RegistrationProgressActivity_unable_to_connect">Conexiunea nu poate fi realizată. Vă rog să verificați conexiunea la rețea și să încercați din nou.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Verificarea a eşuat!</string>
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Codul de verificare care l-ați introdus este greșit. Vă rog să încercați din nou.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Prea multe incercari</string>
   <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Ați introdus codul de verificare greșit de prea multe ori. Vă rog să așteptați un minut înainte de a încerca din nou.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Solicitare apel</string>
   <string name="RegistrationProgressActivity_requesting_incoming_call">Solicitare de verificare a apelului primit...</string>
+  <string name="RegistrationProgressActivity_server_error">Eroare de server</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">Serverul a intampinat o eroare. Va rugam sa incercati din nou.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Prea multe cereri!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Ati solicitat deja recent un apel vocal. Veti putea solicita un altul dupa 20 de minute.</string>
   <string name="RegistrationProgressActivity_verifying_voice_code">Verificarea codului de voce</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflict înregistrare</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Acest număr este deja înregistrat pe un alt server TextSecure (CyanogenMod?).
+Trebuie să vă scoateţi de acolo înainte de a vă înregistra aici.</string>
   <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Înregistrarea este completă</string>
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Inregistrarea TextSecure a fost finalizata cu succes.</string>
+  <string name="RegistrationService_registration_error">Eroare de inregistrare</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Inregistrarea TextSecure a intampinat o problema.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Primit mesajul conform caruia\nschimbul de chei este corupt </string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nAm primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune de protocol invalidă.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nPrimit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru a-l procesa și afișa.</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Primit mesajul conform caruia
+schimbul de chei este corupt </string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune de protocol invalidă.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru a-l procesa și afișa.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">S-au primit informații de identitate actualizate dar necunoscute. Apăsați pentru a valida identitatea.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sesiune securizată terminată.</string>
   <string name="SmsMessageRecord_duplicate_message">Mesaj duplicat.</string>
@@ -200,6 +254,7 @@
   <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Scanează-mi semnătura digitală</string>
   <string name="VerifyKeysActivity_scan_their_fingerprint">Scanează semnătura digitală a partenerului</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATENȚIE, cheia scanată NU SE POTRIVEȘTE! Verifică semnătura digitală cu atenție.</string>
+  <string name="VerifyKeysActivity_not_verified_exclamation">NU E VERIFICAT!</string>
   <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Cheia partenerului este corectă. Este nevoie ca și semnătura ta digitală să fie scanată.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Verificat!</string>
   <!--ViewIdentityActivity-->
@@ -207,9 +262,13 @@
   <string name="ViewIdentityActivity_scan_to_compare">Scanează pentru a compara</string>
   <string name="ViewIdentityActivity_get_scanned_to_compare">Vei fi scanat pentru comparație</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ATENȚIE, cheia scanată NU SE POTRIVEȘTE !</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">NU E VERIFICAT!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Cheia scanată se potrivește!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verificat!</string>
+  <string name="ViewIdentityActivity_identity_fingerprint">Semnătura digitală</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Amprenta mea de identitate</string>
   <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Iniţializeaz deşi există o cerere?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Ai trimis deja o cerere pentru inițializarea sesiunii către acest destinatar, ești sigur că dorești să trimiți încă una? Această acțiune va invalida cererea deja trimisă.</string>
   <string name="KeyExchangeInitiator_send">Trimite</string>
   <!--MessageDisplayHelper-->
@@ -219,6 +278,7 @@
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Se conecteaza la serverul MMS...</string>
   <string name="MmsDatabase_downloading_mms">Se descarca MMS...</string>
+  <string name="MmsDatabase_mms_download_failed">Descărcare MMS eşuată!</string>
   <string name="MmsDatabase_downloading">Se descarca...</string>
   <string name="MmsDatabase_mms_pending_download">Atingeți și configurați setările MMS pentru a continua descărcarea.</string>
   <!--MmsMessageRecord-->
@@ -229,6 +289,7 @@
   <string name="MmsSender_currently_unable_to_send_your_mms_message">Nu pot trimite mesajul MMS în momentul de față</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Import în curs</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Mesajele text sunt importate</string>
   <!--KeyCachingService-->
   <string name="KeyCachingService_textsecure_passphrase_cached">Atingeți pentru a deschide.</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Atingeți pentru a deschide, sau atingeți lacătul pentru a închide.</string>
@@ -238,6 +299,7 @@
   <string name="MessageNotifier_d_new_messages">%d mesaje noi</string>
   <string name="MessageNotifier_most_recent_from_s">Cel mai recent de la: %s</string>
   <string name="MessageNotifier_encrypted_message">Mesaj criptat...</string>
+  <string name="MessageNotifier_no_subject">(Fără subiect)</string>
   <string name="MessageNotifier_message_delivery_failed">Trimiterea mesajului a esuat.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Mesajul nu a putut fi trimis.</string>
   <string name="MessageNotifier_error_delivering_message">A aparut o eroare la trimiterea mesajului.</string>
@@ -245,9 +307,12 @@
   <string name="MessageNotifier_mark_as_read">Marchează ca citit</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Se regenerează...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Se regenerează cheia\nde identitate...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Se regenerează cheia
+de identitate...</string>
   <string name="ViewLocalIdentityActivity_regenerated">Regenerată!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nAtenție! Prin regenerarea cheii tale de identitate, actuala cheie de identitate va fi pierdută definitiv iar persoanele din lista ta de contacte vor primi o notificare la momentul inițierii unei noi sesiuni securizate cu tine. Ești sigur că vrei să continui?</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Resetare cheie de identitate?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+Atenție! Prin regenerarea cheii tale de identitate, actuala cheie de identitate va fi pierdută definitiv iar persoanele din lista ta de contacte vor primi o notificare la momentul inițierii unei noi sesiuni securizate cu tine. Ești sigur că vrei să continui?</string>
   <string name="ViewLocalIdentityActivity_cancel">Anulează</string>
   <string name="ViewLocalIdentityActivity_continue">Continuă</string>
   <!--SmsReceiver-->
@@ -256,6 +321,7 @@
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Ne pare rău, funcția Răspuns Rapid nu este momentan implementată în TextSecure!</string>
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Ai primit un mesaj de la un dispozitiv care suportă sesiuni criptate TextSecure. Dorești să inițiezi o sesiune securizată?</string>
+  <string name="auto_initiate_activity__initiate_exchange">Iniţializează schimb</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">PAROLA VECHE:</string>
   <string name="change_passphrase_activity__new_passphrase">NOUA PAROLĂ:</string>
@@ -275,17 +341,32 @@
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Nu exista apeluri recente.</string>
   <!--conversation_activity-->
+  <string name="conversation_activity__type_message_push">Trimite mesaj TextSecure</string>
+  <string name="conversation_activity__type_message_sms_secure">Trimite SMS securizat</string>
+  <string name="conversation_activity__type_message_sms_insecure">Trimite SMS nesecurizat</string>
+  <string name="conversation_activity__type_message_mms_secure">Trimite MMS securizat</string>
+  <string name="conversation_activity__type_message_mms_insecure">Trimite MMS nesecurizat</string>
   <string name="conversation_activity__send">Trimite</string>
   <string name="conversation_activity__remove">Șterge</string>
+  <string name="conversation_activity__window_description">Conversaţie cu %1$s</string>
+  <string name="conversation_activity__compose_description">Compunere mesaj</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_image_description">Mesaj media</string>
+  <string name="conversation_item__play_button_description">Buton redare</string>
+  <string name="conversation_item__secure_message_description">Mesaj securizat</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Descarca</string>
   <string name="conversation_item_sent__downloading">Se descarca</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Trimiterea a eşuat</string>
   <string name="conversation_item_sent__pending_approval_description">Aprobare În Curs</string>
+  <string name="conversation_item_sent__delivered_description">Livrat</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Descarca</string>
+  <string name="conversation_item_received__contact_photo_description">Poză contact</string>
   <string name="conversation_item_received__downloading">Se descarca</string>
   <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">Mod selecţie multiplă</string>
+  <string name="conversation_fragment_cab__batch_selection_amount">%s selectate</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Incarcarea tarilor...</string>
   <string name="country_selection_fragment__search">Caută</string>
@@ -317,11 +398,22 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">S-ar putea să dureze câteva momente. Vă rugăm să aveți răbdare, vă vom notifica când importul este complet.</string>
   <string name="database_migration_activity__importing">SE IMPORTĂ</string>
   <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Se actualizează baza de date...</string>
+  <string name="export_fragment__export_encrypted_backup">Exportă backup criptat</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Un backup criptat a fost exportat pe SD card.</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportă un backup necriptat compatibil cu \"SMSBackup And Restore\" pe SD card.</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importă baza de date \ndin aplicația de mesaje a dispozitivului.</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nRestaurează un backup criptat exportat anterior din TextSecure.</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nImportă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</string>
+  <string name="export_fragment__export_plaintext_backup">Exportă backup necriptat</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+Exportă un backup necriptat compatibil cu \"SMSBackup And Restore\" pe SD card.</string>
+  <string name="import_fragment__import_system_sms_database">Import baza de date cu SMS-uri?</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importă baza de date 
+din aplicația de mesaje a dispozitivului.</string>
+  <string name="import_fragment__import_encrypted_backup">Importă backup criptat</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Restaurează un backup criptat exportat anterior din TextSecure.</string>
+  <string name="import_fragment__import_plaintext_backup">Importă backup text</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Importă un fișier de backup text. Compatibil cu \'SMSBackup And Restore.\'</string>
+  <string name="local_identity__regenerate_key">Regenerează cheie</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Pentru telefonul tău sunt necesare setări MMS manuale.</string>
   <!--prompt_passphrase_activity-->
@@ -336,35 +428,57 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complet</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure poate utiliza mesageria instant pentru a proteja intimitatea și pentru a evita costurile asociate cu SMS-urile atunci când comunică\ncu alți utilizatori TextSecure. Pentru a activa această opțiune, vă rugăm să verificați codul de țară și numărul de telefon.</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+TextSecure poate utiliza mesageria instant pentru a proteja intimitatea și pentru a evita costurile asociate cu SMS-urile atunci când comunică
+cu alți utilizatori TextSecure. Pentru a activa această opțiune, vă rugăm să verificați codul de țară și numărul de telefon.</string>
   <string name="registration_activity__your_country">TARA DVS.</string>
-  <string name="registration_activity__your_country_code_and_phone_number">CODUL ŢĂRII DVS. ŞI \nNUMĂRUL DE TELEFON</string>
+  <string name="registration_activity__your_country_code_and_phone_number">CODUL ŢĂRII DVS. ŞI 
+NUMĂRUL DE TELEFON</string>
   <string name="registration_activity__phone_number">NUMĂRUL DE TELEFON</string>
   <string name="registration_activity__register">Inregistrare</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Operațiunea de înregistrare va transmite temporar unele informații de contact către serverul.</string>
   <string name="registration_activity__skip">Treci peste</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Unele probleme posibile\nsunt:</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nExistă alte aplicații de mesagerie text, cum ar fi Handcent sau GoSMS, care se comportă sub standard și\ninterceptează toate mesajele SMS primite. Verificați dacă ați primit un mesaj de tip text \ncare începe cu \"Codul dvs. de verificare TextSecure:\", caz în care va trebui să configurați\ncealaltă aplicație de mesagerie să permită trecerea mesajelor text mai departe către TextSecure.</string>
+  <string name="registration_problems__some_possible_problems_include">Unele probleme posibile
+sunt:</string>
+  <string name="registration_problems__sms_interceptors">Interceptori SMS.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Există alte aplicații de mesagerie text, cum ar fi Handcent sau GoSMS, care se comportă sub standard și
+interceptează toate mesajele SMS primite. Verificați dacă ați primit un mesaj de tip text 
+care începe cu \"Codul dvs. de verificare TextSecure:\", caz în care va trebui să configurați
+cealaltă aplicație de mesagerie să permită trecerea mesajelor text mai departe către TextSecure.</string>
   <string name="registration_problems__incorrect_number">Număr incorect.</string>
-  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nVă rugăm să vă asiguraţi că aţi introdus corect numărul dvs. de telefon şi că acesta este formatat corect pentru\nregiunea dumneavoastră.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+Vă rugăm să vă asiguraţi că aţi introdus corect numărul dvs. de telefon şi că acesta este formatat corect pentru
+regiunea dumneavoastră.</string>
   <string name="registration_problems__google_voice">Google Voice.</string>
-  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure nu functioneaza cu numere Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure nu functioneaza cu numere Google Voice.</string>
   <!--registration_progress_activity-->
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure poate de asemenea să vă apeleze telefonic pentru a verifica numărul dvs.\nApăsați \"Sună-mă\" și introduceți în căsuța de mai jos codul din șase cifre pe care îl veți auzi.</string>
+  <string name="registration_progress_activity__voice_verification">Verificare pe bază de apel vocal</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+TextSecure poate de asemenea să vă apeleze telefonic pentru a verifica numărul dvs.
+Apăsați \"Sună-mă\" și introduceți în căsuța de mai jos codul din șase cifre pe care îl veți auzi.</string>
   <string name="registration_progress_activity__verify">Verifica</string>
+  <string name="registration_progress_activity__call_me">Sună-mă</string>
   <string name="registration_progress_activity__edit_number">Editează număr</string>
   <string name="registration_progress_activity__connectivity_error">Eroare de conectivitate</string>
-  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure nu a putut să se conecteze la serviciul de push.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Probleme posibile\nsunt:</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
+TextSecure nu a putut să se conecteze la serviciul de push.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Probleme posibile
+sunt:</string>
   <string name="registration_progress_activity__no_network_connectivity">Nu exista conexiune la retea</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall restrictiv.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure va verifica acum automat numărul de telefon prin trimiterea unui mesaj SMS de confirmare.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+TextSecure va verifica acum automat numărul de telefon prin trimiterea unui mesaj SMS de confirmare.</string>
   <string name="registration_progress_activity__connecting">Se conecteaza...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Asteptarea verificarii\nprin SMS</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Asteptarea verificarii
+prin SMS</string>
   <string name="registration_progress_activity__registering_with_server">Se inregistreaza cu serverul...</string>
-  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">S-ar putea să dureze câteva momente.\nVă rugăm să aveți răbdare, vă vom notifica când verificarea este completă.</string>
-  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nOperaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii mesajului SMS de verificare.</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">S-ar putea să dureze câteva momente.
+Vă rugăm să aveți răbdare, vă vom notifica când verificarea este completă.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii mesajului SMS de verificare.</string>
   <string name="registration_progress_activity__sms_verification_failed">Verificarea prin SMS a esuat.</string>
   <string name="registration_progress_activity__generating_keys">Generarea cheilor...</string>
   <!--recipients_panel-->
@@ -376,17 +490,29 @@
   <string name="verify_identity_activity__their_identity_they_read">Identitatea partenerului (cum apare el):</string>
   <string name="verify_identity_activity__your_identity_you_read">Identitatea ta (cum apari tu):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Numele identitatii:\⏎\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Identitate importată:\\n\n</string>
+  <string name="verify_import_identity_activity__identity_name_n">Nume identitate:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Identitate importată:\\n</string>
   <string name="verify_import_identity_activity__verified">Verificat!</string>
   <string name="verify_import_identity_activity__compare">Compara</string>
   <!--verify_keys_activity-->
   <string name="verify_keys_activity__they_read_this">Partenerul vede:</string>
   <string name="verify_keys_activity__you_read_this">Tu vezi:</string>
   <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">Creează parolă</string>
+  <string name="AndroidManifest__enter_passphrase">Introduceţi parola</string>
+  <string name="AndroidManifest__select_contacts">Selectează contacte</string>
+  <string name="AndroidManifest__select_contact">Selectează contact</string>
+  <string name="AndroidManifest__textsecure_detected">TextSecure detectat</string>
+  <string name="AndroidManifest__public_identity_key">Cheia de identitate publică</string>
   <string name="AndroidManifest__change_passphrase">Schimbă parola</string>
+  <string name="AndroidManifest__verify_session">Verifică sesiunea</string>
+  <string name="AndroidManifest__verify_identity">Verifică identitatea</string>
   <string name="AndroidManifest__manage_identity_keys">Administrează cheile de identitate</string>
+  <string name="AndroidManifest__complete_key_exchange">Încheie schimburile de chei</string>
+  <string name="AndroidManifest__log_submit">Trimite log-urile de depanare</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Importă / Exportă</string>
+  <string name="arrays__my_identity_key">Cheia mea de identitate</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
   <string name="preferences__push_sms_category">Push și SMS</string>
@@ -396,6 +522,10 @@
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Folosește TextSecure pentru vizualizarea și salvarea tuturor mesajelor multimedia primite</string>
   <string name="preferences__input_settings">Setări de introducere</string>
   <string name="preferences__enable_enter_key_title">Activează tasta Enter</string>
+  <string name="preferences__pref_enter_sends_title">Tasta Enter trimite</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Apăsarea tastei Enter va trimite mesajele text</string>
+  <string name="preferences__display_settings">Afișează setările</string>
+  <string name="preferences__choose_identity">Selectează identitatea</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Selectează persoana din lista de contacte.</string>
   <string name="preferences__change_passphrase">Schimbă parola</string>
   <string name="preferences__change_my_passphrase">Schimbă parola</string>
@@ -406,6 +536,7 @@
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completează în mod automat schimburile de chei pentru sesiunile noi sau existente cu aceeaşi cheie de identitate.</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Şterge parolele din memorie după un interval de timp</string>
   <string name="preferences__timeout_passphrase">Expiră parola</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Selectează expirarea parolei</string>
   <string name="preferences__pref_timeout_interval_title">Interval expirare</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Perioada de timp de așteptare înainte de a șterge parola din memorie</string>
   <string name="preferences__identity_key_settings">Chei de identitate</string>
@@ -416,6 +547,7 @@
   <string name="preferences__display_message_notifications_in_status_bar">Afișează notificările în bara de stare</string>
   <string name="preferences__led_color">Culoare LED</string>
   <string name="preferences__pref_led_blink_title">Tipar de clipire LED</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Setează un şablon personalizat de clipire a LED-ului </string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Şablonul personalizat de clipire a LED-ului a fost setat!</string>
   <string name="preferences__sound">Sunet</string>
   <string name="preferences__change_notification_sound">Schimbă sunetul de notificare</string>
@@ -439,6 +571,8 @@
   <string name="preferences__custom">Specific</string>
   <string name="preferences__advanced">Avansat</string>
   <string name="preferences__passphrase">Parola</string>
+  <string name="preferences__advanced_mms_access_point_names">Preferințe MMS</string>
+  <string name="preferences__enable_manual_mms">Activează MMS manual</string>
   <string name="preferences__override_system_mms_settings">Suprascrie setările MMS de sistem cu informațiile de mai jos.</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Necesar)</string>
   <string name="preferences__mms_proxy_host_optional">Gazdă proxy MMS (Opţional)</string>
@@ -451,6 +585,8 @@
   <string name="preferences__conversation_length_limit">Limita mărime conversație</string>
   <string name="preferences__trim_all_threads_now">Scurtează toate conversaţiile acum</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verifică toate conversațiile și aplică limite de mărime a conversației</string>
+  <string name="preferences__light_theme">Temă deschisă la culoare</string>
+  <string name="preferences__dark_theme">Temă închisă la culoare</string>
   <string name="preferences__appearance">Aspect</string>
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Implicit</string>
@@ -461,6 +597,7 @@
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">Sporește intimitatea și evită costurile de SMS folosind comunicarea prin canalul de date cu alți utilizatori TextSecure</string>
   <string name="preferences__allow_sms_fallback">Permite SMS-uri expediate către</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure este momentan aplicația implicită pentru SMS. Vă rog setați mai întâi altă aplicație implicită de SMS pentru a schimba această preferință.</string>
+  <string name="preferences__refresh_push_directory">Reîmprospătează directorul \"push\"...</string>
   <string name="preferences__submit_debug_log">Trimite log-urile de depanare</string>
   <string name="preferences__sms_outgoing_push_users">Utilizatori TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(întreabă mai întâi)</string>
@@ -472,13 +609,21 @@
   <!--menus-->
   <!--****************************************-->
   <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">Selectează tot</string>
+  <string name="contact_selection_list__menu_unselect_all">Deselectează tot</string>
   <string name="contact_selection_list__header_textsecure_users">UTILIZATORI TEXTSECURE</string>
   <string name="contact_selection_list__header_other">TOATE CONTACTELE</string>
   <string name="contact_selection_list__unknown_contact">Mesajul nou către...</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Terminat</string>
   <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">Actualizează lista de contacte</string>
   <!--conversation_button_context-->
+  <string name="conversation_button_context__send_textsecure_message">Trimite mesaj TextSecure</string>
+  <string name="conversation_button_context__send_secure_sms">Trimite SMS securizat</string>
+  <string name="conversation_button_context__send_insecure_sms">Trimite SMS nesecurizat</string>
+  <string name="conversation_button_context__send_secure_mms">Trimite MMS securizat</string>
+  <string name="conversation_button_context__send_insecure_mms">Trimite MMS nesecurizat</string>
   <!--conversation_callable-->
   <string name="conversation_callable__menu_call">Sună</string>
   <!--conversation_context-->
@@ -488,16 +633,25 @@
   <string name="conversation_context__menu_forward_message">Expediază mesajul</string>
   <string name="conversation_context__menu_resend_message">Retrimite mesaj</string>
   <!--conversation_context_image-->
+  <string name="conversation_context_image__save_attachment">Salvează ataşamentul</string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__menu_start_secure_session">Iniţializează Sesiune Securizată</string>
   <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">Şterge ce este selectat</string>
+  <string name="conversation_list_batch__menu_select_all">Selectează tot</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Caută</string>
   <string name="conversation_list__drawer_open">Deschide sertar de navigare</string>
   <string name="conversation_list__drawer_close">Inchide sertar de navigare</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Securitate</string>
+  <string name="conversation_secure_verified__menu_no_identity">Nu există o identitate disponibilă</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Verifică identitatea</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Încheie Sesiune Securizată</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Adaugă atașament</string>
+  <string name="conversation__menu_update_group">Actualizează grup</string>
+  <string name="conversation__menu_leave_group">Părăseşte grupul</string>
   <string name="conversation__menu_add_contact_info">Adaugă informații de contact</string>
   <string name="conversation__menu_delete_thread">Șterge conversația</string>
   <!--conversation_group_options-->
@@ -512,10 +666,18 @@
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">Deblochează</string>
   <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">Mesaj nou</string>
+  <string name="text_secure_normal__menu_new_group">Grup nou</string>
   <string name="text_secure_normal__menu_settings">Setări</string>
   <string name="text_secure_normal__menu_clear_passphrase">Blocare</string>
+  <string name="text_secure_normal__mark_all_as_read">Marchează tot ca citit</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificat</string>
   <!--reminder_header-->
+  <string name="reminder_header_sms_default_title">Seteaz ca aplicație implicită SMS?</string>
+  <string name="reminder_header_sms_default_text">TextSecure nu este momentan aplicaţia implicită de SMS.</string>
+  <string name="reminder_header_sms_import_title">Import baza de date cu SMS-uri?</string>
+  <string name="reminder_header_sms_import_text">TextSecure poate copia mesajele SMS din telefon în baza de date criptată.</string>
+  <string name="reminder_header_push_title">Activează mesaje TextSecure?</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c277e01d40..f22ac7f22e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -44,23 +44,24 @@
   <string name="ConversationItem_received_and_processed_key_exchange_message">Получено и обработано сообщение обмена ключами.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Ошибка: получено устаревшее сообщение обмена ключами.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Получено сообщение обмена ключами. Нажмите, чтобы его обработать.</string>
-  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Получено простое сообщение в защищённом сеансе. Возможно, у вашего собеседника не открыт сеанс, и он не сможет прочитать ваши сообщения. Нажмите, чтобы завершить этот сеанс.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Получено SMS открытым текстом, хотя у вас открыт защищённый сеанс. Если у вашего собеседника сеанс не открыт, он не сможет прочитать ваши сообщения. Нажмите, чтобы завершить ваш сеанс.</string>
   <string name="ConversationItem_group_action_left">%1$s покинул группу.</string>
   <string name="ConversationItem_group_action_joined">%1$s присоединился к группе.</string>
   <string name="ConversationItem_group_action_modify">%1$s обновил группу.</string>
   <string name="ConversationItem_click_to_approve_sms">Отправить как SMS</string>
-  <string name="ConversationItem_click_to_approve_mms">Нажмите для режима MMS</string>
+  <string name="ConversationItem_click_to_approve_mms">Отправить как MMS</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Отправить незашифрованным</string>
-  <string name="ConversationItem_click_to_approve_sms_dialog_title">Резервный SMS-режим?</string>
-  <string name="ConversationItem_click_to_approve_mms_dialog_title">Использовать MMS?</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_sms_dialog_title">Отправить как SMS?</string>
+  <string name="ConversationItem_click_to_approve_mms_dialog_title">Отправить как MMS?</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> зашифровано, так как не удалось установить защищённый сеанс.\n\nОтправить сообщение открытым текстом?</string>
   <!--ConversationActivity-->
-  <string name="ConversationActivity_initiate_secure_session_question">Включить защищенное соединение?</string>
+  <string name="ConversationActivity_initiate_secure_session_question">Начать защищённый сеанс?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Начать защищённый сеанс связи с %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Завершение защищенного соединения</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Подтвердите завершение сеанса</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Вы уверены, что хотите завершить этот защищённый сеанс связи?</string>
-  <string name="ConversationActivity_delete_thread_confirmation">Подтверждение очистки беседы</string>
+  <string name="ConversationActivity_delete_thread_confirmation">Подтвердите удаление разговора</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Вы уверены, что хотите навсегда удалить этот разговор?</string>
   <string name="ConversationActivity_add_attachment">Добавить вложение</string>
   <string name="ConversationActivity_select_contact_info">Выбрать контакт</string>
@@ -70,8 +71,8 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Извините, выбранный аудио-файл больше максимального размера сообщения.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Адрес получателя не является ни номером телефона, ни адресом электронной почты.</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Пустое сообщение!</string>
-  <string name="ConversationActivity_group_conversation_recipients">Участники конференции</string>
-  <string name="ConversationActivity_group_conversation">Конференця</string>
+  <string name="ConversationActivity_group_conversation_recipients">Члены группы</string>
+  <string name="ConversationActivity_group_conversation">Групповой разговор</string>
   <string name="ConversationActivity_unnamed_group">Группа без названия</string>
   <string name="ConversationActivity_d_recipients_in_group">%d участников</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 участник</string>
@@ -83,6 +84,8 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Вы уверены, что хотите покинуть эту группу?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Подробности</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Транспорт: %1$s\nОтправлено/Получено: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Отправитель: %1$s\nТранспорт: %2$s\nОтправлено: %3$s\nПолучено: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Подтвердите удаление сообщения</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Вы уверены, что хотите навсегда удалить это сообщение?</string>
   <string name="ConversationFragment_save_to_sd_card">Сохранить на SD карту?</string>
@@ -107,7 +110,7 @@
   <string name="ExportFragment_export_to_sd_card">Экспортировать на SD-карту?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Вы собираетесь экспортировать на SD-карту свои зашифрованные ключи, настройки и сообщения.</string>
   <string name="ExportFragment_export">Экспорт</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Экспортировать открытый текст?</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Экспортировать открытым текстом?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Внимание, вы собираетесь экспортировать на SD-карту свои сообщения в незашифрованном виде.</string>
   <string name="ExportFragment_cancel">Отмена</string>
   <string name="ExportFragment_exporting">Экспорт</string>
@@ -120,8 +123,8 @@
   <string name="GroupCreateActivity_actionbar_title">Новая группа</string>
   <string name="GroupCreateActivity_actionbar_update_title">Обновить группу</string>
   <string name="GroupCreateActivity_group_name_hint">Название группы</string>
-  <string name="GroupCreateActivity_actionbar_mms_title">Новая MMS группа</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">Выбранный контакт не поддерживает группы TextSecure. Эта группа будет преобразована в MMS.</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Новая MMS-группа</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Выбранный контакт не поддерживает TextSecure-группы. Эта группа будет преобразована в MMS.</string>
   <string name="GroupCreateActivity_you_dont_support_push">Вы не зарегистрированы для использования канала передачи данных. Группы отключены.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Непредвиденная ошибка не позволила создать группу.</string>
   <string name="GroupCreateActivity_contacts_no_members">Нужен как минимум один участник в группе!</string>
@@ -129,8 +132,8 @@
   <string name="GroupCreateActivity_file_io_exception">Ошибка ввода/вывода. Невозможно создать временный файл.</string>
   <string name="GroupCreateActivity_avatar_content_description">Аватар группы</string>
   <string name="GroupCreateActivity_menu_create_title">Создать группу</string>
-  <string name="GroupCreateActivity_creating_group">Создаётся %1$s…</string>
-  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Нельзя добавить в группу TextSecure собеседников, у которых TextSecure не установлен</string>
+  <string name="GroupCreateActivity_creating_group">Создаём %1$s…</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Нельзя добавить в TextSecure-группу собеседников, у которых TextSecure не установлен</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">Импорт</string>
   <string name="ImportExportActivity_export">Экспорт</string>
@@ -143,7 +146,7 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
 Восстановление из зашифрованной резервной копии полностью заменит существующие ключи, настройки и сообщения. Вы потеряете всю информацию, которая сейчас содержится в TextSecure, но не в резервной копии.</string>
   <string name="ImportFragment_restore">Восстановить</string>
-  <string name="ImportFragment_import_plaintext_backup">Импортировать из незашифрованной резервной копии?</string>
+  <string name="ImportFragment_import_plaintext_backup">Импортировать из простой резервной копии?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Вы собираетесь импортировать сообщения из простой резервной копии. Если вы ранее уже импортировали сообщения из этой копии, повторный импорт приведёт к их дублированию.</string>
   <string name="ImportFragment_importing">Импорт</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Импортируем из простой резервной копии...</string>
@@ -166,7 +169,7 @@
   <!--MessageRecord-->
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Полученное сообщение зашифровано старой версией TextSecure, которая больше не поддерживается. Пожалуйста, попросите отправителя обновиться до последней версии и заново послать сообщение.</string>
   <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Пароли не совпадают!</string>
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Парольные фразы не совпадают!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Неверная старая парольная фраза!</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Введите парольную фразу</string>
@@ -192,7 +195,10 @@
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Указанный вами 
 номер телефона (%s) неверен.</string>
   <string name="RegistrationActivity_unsupported">Устройство не поддерживается</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">К сожалению, на вашем устройстве невозможен обмен сообщениями по каналу данных. На устройствах с Android версии ниже 4.0 должен быть зарегистрирован аккаунт Google. На устройствах с Android 4.0 аккаунт Google необязателен, но должно иметься приложение «Play Маркет».</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">К сожалению, на вашем устройстве невозможен обмен сообщениями по каналу данных. На устройствах с Android версии ниже 4.0 должен быть зарегистрирован аккаунт Google. На устройствах с Android 4.0 или выше аккаунт Google необязателен, но должно иметься приложение «Play Маркет».</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+Сейчас мы проверим, что с этим устройством связан следующий номер телефона:\n\n%s\n\n
+Номер указан верно или вы хотите его изменить?</string>
   <string name="RegistrationActivity_continue">Продолжить</string>
   <string name="RegistrationActivity_edit">Изменить</string>
   <!--RegistrationProblemsActivity-->
@@ -211,7 +217,7 @@
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Код подтверждения, введённый вами, неверен. Пожалуйста, попробуйте ещё раз.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">Слишком много попыток</string>
   <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Вы слишком много раз вводили неверный код подтверждения. Подождите минуту перед следующей попыткой.</string>
-  <string name="RegistrationProgressActivity_requesting_call">Запрос звонка</string>
+  <string name="RegistrationProgressActivity_requesting_call">Запрашиваем звонок</string>
   <string name="RegistrationProgressActivity_requesting_incoming_call">Запрашиваем входящий звонок для подтверждения...</string>
   <string name="RegistrationProgressActivity_server_error">Ошибка сервера</string>
   <string name="RegistrationProgressActivity_the_server_encountered_an_error">На сервере возникла ошибка. Пожалуйста, попробуйте ещё раз.</string>
@@ -269,7 +275,7 @@
   <string name="ViewIdentityActivity_identity_fingerprint">Личный отпечаток</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Мой отпечаток</string>
   <!--KeyExchangeInitiator-->
-  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Инициировать, несмотря на существующий запрос?</string>
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Игнорировать предыдущий запрос?</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Вы уже отправили этому собеседнику запрос на начало сеанса. Вы уверены, что хотите отправить ещё один? Предыдущий будет аннулирован.</string>
   <string name="KeyExchangeInitiator_send">Отправить</string>
   <!--MessageDisplayHelper-->
@@ -279,7 +285,7 @@
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Соединяемся с MMS-сервером...</string>
   <string name="MmsDatabase_downloading_mms">Скачиваем MMS-сообщение...</string>
-  <string name="MmsDatabase_mms_download_failed">Сбой загрузки MMS</string>
+  <string name="MmsDatabase_mms_download_failed">Не удалось скачать MMS-сообщение!</string>
   <string name="MmsDatabase_downloading">Скачиваем...</string>
   <string name="MmsDatabase_mms_pending_download">Чтобы продолжить скачивание, нажмите сюда и настройте MMS.</string>
   <!--MmsMessageRecord-->
@@ -310,7 +316,7 @@
   <string name="ViewLocalIdentityActivity_regenerating">Регенерация...</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Генерируем новый личный ключ...</string>
   <string name="ViewLocalIdentityActivity_regenerated">Регенерация завершена!</string>
-  <string name="ViewLocalIdentityActivity_reset_identity_key">Сбросить персональный ключ?</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Сбросить личный ключ?</string>
   <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
 Осторожно! Если вы заново сгенерируете свой личный ключ, текущий будет утрачен навсегда, и ваши собеседники получат предупреждения при начале новых защищённых сеансов с вами. Вы уверены, что хотите продолжить?</string>
   <string name="ViewLocalIdentityActivity_cancel">Отмена</string>
@@ -321,7 +327,7 @@
   <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Извините, TextSecure пока не поддерживает быстрые ответы.</string>
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Вы получили сообщение от собеседника, поддерживающего зашифрованное общение при помощи TextSecure. Хотите начать защищённый сеанс?</string>
-  <string name="auto_initiate_activity__initiate_exchange">Выполнить обмен</string>
+  <string name="auto_initiate_activity__initiate_exchange">Начать обмен</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
   <string name="change_passphrase_activity__new_passphrase">НОВАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
@@ -342,24 +348,31 @@
   <string name="contact_selection_recent_activity__no_recent_calls">Нет недавних звонков.</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Отправить сообщение TextSecure</string>
-  <string name="conversation_activity__type_message_sms_secure">Отправить защищенную SMS</string>
-  <string name="conversation_activity__type_message_sms_insecure">Отправить незащищенную SMS</string>
-  <string name="conversation_activity__type_message_mms_secure">Отправить защищенную MMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Отправить незащищенную MMS</string>
+  <string name="conversation_activity__type_message_sms_secure">Отправить защищённое SMS</string>
+  <string name="conversation_activity__type_message_sms_insecure">Отправить незащищённое SMS</string>
+  <string name="conversation_activity__type_message_mms_secure">Отправить защищённое MMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Отправить незащищённое MMS</string>
   <string name="conversation_activity__send">Отправить</string>
   <string name="conversation_activity__remove">Удалить</string>
+  <string name="conversation_activity__window_description">Разговор с %1$s</string>
+  <string name="conversation_activity__compose_description">Написание сообщения</string>
+  <string name="conversation_activity__emoji_toggle_description">Клавиатура смайликов</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">MMS-сообщение</string>
   <string name="conversation_item__play_button_description">Воспроизведение</string>
+  <string name="conversation_item__secure_message_description">Защищённое сообщение</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Скачать</string>
   <string name="conversation_item_sent__downloading">Скачивание</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Не удалось отправить</string>
   <string name="conversation_item_sent__pending_approval_description">Ожидается одобрение</string>
+  <string name="conversation_item_sent__delivered_description">Доставлено</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Скачать</string>
+  <string name="conversation_item_received__contact_photo_description">Фотография контакта</string>
   <string name="conversation_item_received__downloading">Скачивание</string>
   <!--conversation_fragment_cab-->
-  <string name="conversation_fragment_cab__batch_selection_mode">Пакетный режим выбора</string>
+  <string name="conversation_fragment_cab__batch_selection_mode">Выбрать несколько</string>
   <string name="conversation_fragment_cab__batch_selection_amount">%s выбрано</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Загружаем страны...</string>
@@ -378,7 +391,8 @@
   <string name="log_submit_activity__button_ok">Отправить</string>
   <string name="log_submit_activity__log_fetch_failed">Не удается получить лог с вашего устройства. Вы можете воспользоваться для этого ADB.</string>
   <string name="log_submit_activity__log_submit_success_title">Успешно!</string>
-  <string name="log_submit_activity__log_got_it">Получилось</string>
+  <string name="log_submit_activity__log_got_it">Понятно</string>
+  <string name="log_submit_activity__your_pastebin_url">Пожалуйста, скопируйте этот адрес и добавьте к вашему замечанию (нажмите и удерживайте для копирования):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Скопировано в буфер</string>
   <string name="log_submit_activity__loading_logcat">Загружаем логи...</string>
   <string name="log_submit_activity__thanks">Спасибо за помощь!</string>
@@ -392,10 +406,10 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Это может занять какое-то время. Пожалуйста, наберитесь терпения, мы вам сообщим, когда импортирование завершится.</string>
   <string name="database_migration_activity__importing">ИМПОРТИРОВАНИЕ</string>
   <!--database_upgrade_activity-->
-  <string name="database_upgrade_activity__updating_database">Обновление базы данных...</string>
+  <string name="database_upgrade_activity__updating_database">Обновляем базу данных...</string>
   <string name="export_fragment__export_encrypted_backup">Экспорт зашифрованной резервной копии</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Экспортировать на SD-карту зашифрованную резервную копию.</string>
-  <string name="export_fragment__export_plaintext_backup">Экспорт незашифрованной резервной копии.</string>
+  <string name="export_fragment__export_plaintext_backup">Экспорт простой резервной копии.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">
 Экспортировать на SD-карту простую резервную копию, совместимую с приложением «SMSBackup And Restore».</string>
   <string name="import_fragment__import_system_sms_database">Импорт системной базы SMS</string>
@@ -403,7 +417,7 @@
   <string name="import_fragment__import_encrypted_backup">Импорт зашифрованной резервной копии</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
 Восстановить из ранее экспортированной зашифрованной резервной копии TextSecure.</string>
-  <string name="import_fragment__import_plaintext_backup">Импорт незашифрованной резервной копии</string>
+  <string name="import_fragment__import_plaintext_backup">Импорт простой резервной копии</string>
   <string name="import_fragment__import_a_plaintext_backup_file">
 Импортировать из простой резервной копии. Совместимо с приложением «SMSBackup And Restore».</string>
   <string name="local_identity__regenerate_key">Пересоздать ключ</string>
@@ -490,6 +504,8 @@ SMS-подтверждения...
   <string name="verify_identity_activity__their_identity_they_read">Личность собеседника (он читает):</string>
   <string name="verify_identity_activity__your_identity_you_read">Ваша личность (вы читаете):</string>
   <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">Имя личности:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Импортирована личность:\\n</string>
   <string name="verify_import_identity_activity__verified">Подтверждено!</string>
   <string name="verify_import_identity_activity__compare">Сравнить</string>
   <!--verify_keys_activity-->
@@ -503,13 +519,14 @@ SMS-подтверждения...
   <string name="AndroidManifest__textsecure_detected">Обнаружен TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Публичный ключ</string>
   <string name="AndroidManifest__change_passphrase">Изменить парольную фразу</string>
-  <string name="AndroidManifest__verify_session">Проверка сессии</string>
-  <string name="AndroidManifest__verify_identity">Проверка личности</string>
+  <string name="AndroidManifest__verify_session">Подтвердить сеанс</string>
+  <string name="AndroidManifest__verify_identity">Подтвердить личность</string>
   <string name="AndroidManifest__manage_identity_keys">Управление личными ключами</string>
-  <string name="AndroidManifest__complete_key_exchange">Завершить обмен ключами</string>
-  <string name="AndroidManifest__log_submit">Отправить журнал отладки</string>
+  <string name="AndroidManifest__complete_key_exchange">Выполнить обмен ключами</string>
+  <string name="AndroidManifest__log_submit">Отправлять отладочные логи</string>
   <!--arrays.xml-->
-  <string name="arrays__my_identity_key">Мой ключ</string>
+  <string name="arrays__import_export">Импорт / экспорт</string>
+  <string name="arrays__my_identity_key">Мой личный ключ</string>
   <!--preferences.xml-->
   <string name="preferences__general">Общие</string>
   <string name="preferences__push_sms_category">Push и SMS</string>
@@ -520,9 +537,9 @@ SMS-подтверждения...
   <string name="preferences__input_settings">Настройки ввода</string>
   <string name="preferences__enable_enter_key_title">Включить клавишу «Ввод»</string>
   <string name="preferences__replace_smiley_with_enter_key">Заменить клавишу смайликов на «Ввод»</string>
-  <string name="preferences__pref_enter_sends_title">Enter для отправки</string>
+  <string name="preferences__pref_enter_sends_title">Отправка клавишей «Ввод»</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Нажатие клавиши ввода будет отправлять текстовые сообщения</string>
-  <string name="preferences__display_settings">Настройки вида</string>
+  <string name="preferences__display_settings">Внешний вид</string>
   <string name="preferences__choose_identity">Выберите личность</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Выберите себя из списка контактов.</string>
   <string name="preferences__change_passphrase">Изменить парольную фразу</string>
@@ -535,7 +552,7 @@ SMS-подтверждения...
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Блокировать снимки экрана внутри приложения</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Стирать из памяти парольную фразу через некоторое время</string>
   <string name="preferences__timeout_passphrase">Забывать парольную фразу</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Выберите тайм-аут пароля</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Выберите срок хранения парольной фразы</string>
   <string name="preferences__pref_timeout_interval_title">Срок хранения</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Время, по прошествии которого парольная фраза будет стёрта из памяти</string>
   <string name="preferences__identity_key_settings">Личные ключи</string>
@@ -546,9 +563,9 @@ SMS-подтверждения...
   <string name="preferences__display_message_notifications_in_status_bar">Показывать уведомления о сообщениях в статусной строке</string>
   <string name="preferences__led_color">Цвет светодиода</string>
   <string name="preferences__pref_led_blink_title">Мигание светодиода</string>
-  <string name="preferences__pref_led_blink_custom_pattern_title">Настроить индикацию</string>
-  <string name="preferences__pref_led_blink_custom_pattern_on_for">Включение:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_off_for">Выключение:</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">Настроить мигание светодиода</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">Включён</string>
+  <string name="preferences__pref_led_blink_custom_pattern_off_for">Выключен</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Мигание светодиода настроено!</string>
   <string name="preferences__sound">Мелодия</string>
   <string name="preferences__change_notification_sound">Изменить мелодию уведомления</string>
@@ -599,8 +616,8 @@ SMS-подтверждения...
 Повысить безопасность и снизить расходы на SMS, используя передачу данных при общении с другими пользователями TextSecure</string>
   <string name="preferences__allow_sms_fallback">Разрешить исходящие SMS для</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure является SMS-приложением по умолчанию в вашей системе. Выберите другое приложение для SMS, чтобы изменить эту настройку.</string>
-  <string name="preferences__refresh_push_directory">Обновить Push каталог</string>
-  <string name="preferences__submit_debug_log">Отправить лог отладки</string>
+  <string name="preferences__refresh_push_directory">Обновить push-каталог</string>
+  <string name="preferences__submit_debug_log">Отправлять лог отладки</string>
   <string name="preferences__sms_outgoing_push_users">Пользователи TextSecure</string>
   <string name="preferences__sms_fallback_push_users_ask">(сначала спросить)</string>
   <string name="preferences__sms_outgoing_push_users_description">Отправлять защищённые SMS, если нет интернета</string>
@@ -622,10 +639,10 @@ SMS-подтверждения...
   <string name="push_directory__menu_refresh">Обновить контакты</string>
   <!--conversation_button_context-->
   <string name="conversation_button_context__send_textsecure_message">Отправить сообщение TextSecure</string>
-  <string name="conversation_button_context__send_secure_sms">Отправить защищенную SMS</string>
-  <string name="conversation_button_context__send_insecure_sms">Отправить незащищенную SMS</string>
-  <string name="conversation_button_context__send_secure_mms">Отправить защищенную MMS</string>
-  <string name="conversation_button_context__send_insecure_mms">Отправить незащищенную MMS</string>
+  <string name="conversation_button_context__send_secure_sms">Отправить защищённое SMS</string>
+  <string name="conversation_button_context__send_insecure_sms">Отправить незащищённое SMS</string>
+  <string name="conversation_button_context__send_secure_mms">Отправить защищённое MMS</string>
+  <string name="conversation_button_context__send_insecure_mms">Отправить незащищённое MMS</string>
   <!--conversation_callable-->
   <string name="conversation_callable__menu_call">Звонок</string>
   <!--conversation_context-->
@@ -637,9 +654,9 @@ SMS-подтверждения...
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Сохранить вложение</string>
   <!--conversation_insecure-->
-  <string name="conversation_insecure__menu_start_secure_session">Начать защищенный сеанс</string>
+  <string name="conversation_insecure__menu_start_secure_session">Начать защищённый сеанс</string>
   <!--conversation_list_batch-->
-  <string name="conversation_list_batch__menu_delete_selected">Удали выбранное</string>
+  <string name="conversation_list_batch__menu_delete_selected">Удалить выбранное</string>
   <string name="conversation_list_batch__menu_select_all">Выбрать все</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Поиск</string>
@@ -648,7 +665,7 @@ SMS-подтверждения...
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Безопасность</string>
   <string name="conversation_secure_verified__menu_no_identity">Личность недоступна</string>
-  <string name="conversation_secure_verified__menu_verify_identity">Проверка личности</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Подтвердить личность</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Завершить защищённый сеанс</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Добавить вложение</string>
@@ -676,5 +693,11 @@ SMS-подтверждения...
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Подтверждено</string>
   <!--reminder_header-->
+  <string name="reminder_header_sms_default_title">Использовать как SMS-приложение по умолчанию?</string>
+  <string name="reminder_header_sms_default_text">TextSecure сейчас не используется как ваше SMS-приложение по умолчанию</string>
+  <string name="reminder_header_sms_import_title">Импортировать SMS из системы?</string>
+  <string name="reminder_header_sms_import_text">TextSecure может скопировать SMS из вашего телефона в свою зашифрованную базу.</string>
+  <string name="reminder_header_push_title">Включить общение через TextSecure?</string>
+  <string name="reminder_header_push_text">Мгновенная доставка, защита приватности и никакой платы за SMS.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f99c864e7a..0bb9eba35f 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -14,7 +14,8 @@
   <string name="ApplicationPreferencesActivity_delete">Zmaž</string>
   <string name="ApplicationPreferencesActivity_my">Moja</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Vypnúť kryptovanie úložiska?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nUpozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpečné sessions budú naďalej fungovať, ale hocikto s fyzickým prístupom k zariadeniu ich bude schopný čítať.</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Upozornenie, toto vypne kryptovanie úložiska správ a kľúčov. Vaše bezpečné sessions budú naďalej fungovať, ale hocikto s fyzickým prístupom k zariadeniu ich bude schopný čítať.</string>
   <string name="ApplicationPreferencesActivity_disable">Vypnúť</string>
   <string name="ApplicationPreferencesActivity_unregistering">Neregistrovanie...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Neregistrovanie pre dátovú komunikáciu</string>
@@ -62,7 +63,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Ste si istí že chcete opustiť túto skupinu?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detaily správy</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Odosielateľ:: %1$s\nPrepravené: %2$s\nOdoslané: %3$s\nPrijaté:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Potvrď zmazanie správy</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Ste si istí že chcete úplne zmazať túto správu?</string>
   <string name="ConversationFragment_save_to_sd_card">Uložiť na SD kartu?</string>
@@ -84,14 +84,17 @@
   <string name="ShareActivity_share_with">Zdieľaj s</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportuj na SD kartu?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Toto\nexportuje Vaše kryptované kľúče, nastavenia a správy na SD kartu.</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Toto
+exportuje Vaše kryptované kľúče, nastavenia a správy na SD kartu.</string>
   <string name="ExportFragment_export">Export</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportuj čistý text na SD kartu?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Upozornenie, toto\nexportuje nekryptovaný obsah TextSecure správy na SD kartu.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Upozornenie, toto
+exportuje nekryptovaný obsah TextSecure správy na SD kartu.</string>
   <string name="ExportFragment_cancel">Zrušiť</string>
   <string name="ExportFragment_exporting">Exportujem</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportujem nekryptovaný text na SD kartu...</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Chyba, nemôžem zapísať na SD\nkartu!</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Chyba, nemôžem zapísať na SD
+kartu!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Chyba pri zápise na SD kartu.</string>
   <string name="ExportFragment_success">Úspech!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Exportujem zakryptované kľúče, nastavenia a správy...</string>
@@ -110,11 +113,14 @@
   <string name="ImportExportActivity_export">Export</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importovať systémovú databázu SMS?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Toto naimportuje\nsprávy zo štandardnej systémovj databázy SMS správ do TextSecure. Ak ste predým\nimportovali systémovú databázu SMS, opakovaný import zduplikuje správy.</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Toto naimportuje
+správy zo štandardnej systémovj databázy SMS správ do TextSecure. Ak ste predým
+importovali systémovú databázu SMS, opakovaný import zduplikuje správy.</string>
   <string name="ImportFragment_import">Import</string>
   <string name="ImportFragment_cancel">Zrušiť</string>
   <string name="ImportFragment_restore_encrypted_backup">Obnoviť zašifrovanú zálohu?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nObnovenie zakryptovanej zálohy prepíše všetky existujúce kryptovacie kľúče, nastavenia a správy. Všetky informácie v aktuálnej inštalácii TextSecure budú prepísané. Záloha zostane zachovaná.</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Obnovenie zakryptovanej zálohy prepíše všetky existujúce kryptovacie kľúče, nastavenia a správy. Všetky informácie v aktuálnej inštalácii TextSecure budú prepísané. Záloha zostane zachovaná.</string>
   <string name="ImportFragment_restore">Obnovenie</string>
   <string name="ImportFragment_import_plaintext_backup">Importovať nezašifrovanú zálohu?</string>
   <string name="ImportFragment_importing">Importujem</string>
@@ -150,8 +156,13 @@
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Pripojiť s TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Vyber svoju krajinu</string>
-  <string name="RegistrationActivity_you_must_specify_your_country_code">Ty musíš zadať tvoj\n\nkód krajiny\n</string>
-  <string name="RegistrationActivity_you_must_specify_your_phone_number">Ty musíš zadať tvoje\n\ntelefónne číslo</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Ty musíš zadať tvoj
+
+kód krajiny
+</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Ty musíš zadať tvoje
+
+telefónne číslo</string>
   <string name="RegistrationActivity_invalid_number">Neplatné číslo</string>
   <string name="RegistrationActivity_unsupported">Nepodporované</string>
   <string name="RegistrationActivity_continue">Pokračovať</string>
@@ -249,7 +260,8 @@
   <string name="MessageNotifier_mark_as_read">Označ ako prečítané</string>
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Pregenerovávam...</string>
-  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Pregenerovávam kľúče\ntotožnosti...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Pregenerovávam kľúče
+totožnosti...</string>
   <string name="ViewLocalIdentityActivity_regenerated">Pregenerované!</string>
   <string name="ViewLocalIdentityActivity_cancel">Zrušiť</string>
   <string name="ViewLocalIdentityActivity_continue">Pokračovať</string>
@@ -323,15 +335,20 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aktualizujem databázu...</string>
   <string name="export_fragment__export_encrypted_backup">Exportovať zakryptovanú zálohu</string>
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportovať zakryptovanú\nzálohu na SD kartu.</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportovať zakryptovanú
+zálohu na SD kartu.</string>
   <string name="export_fragment__export_plaintext_backup">Exportovať nezakryptovanú zálohu</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportovať nezakryptovanú zálohu kompatibilnú so \'SMSBackup a Restore\' na SD kartu.</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+Exportovať nezakryptovanú zálohu kompatibilnú so \'SMSBackup a Restore\' na SD kartu.</string>
   <string name="import_fragment__import_system_sms_database">Importovať systémovú databázu SMS</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Importovať databázu\nštandardnej systémovej aplikácie na správy.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importovať databázu
+štandardnej systémovej aplikácie na správy.</string>
   <string name="import_fragment__import_encrypted_backup">Importovať zakryptovanú zálohu</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nObnoviť predtým exportovanú zakryptovanú TextSecure zálohu.</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Obnoviť predtým exportovanú zakryptovanú TextSecure zálohu.</string>
   <string name="import_fragment__import_plaintext_backup">Importovať nezakryptovanú zálohu</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nImportovať nezakryptovanú zálohu. Kompatibilné so \'SMSBackup And Restore\'.</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">
+Importovať nezakryptovanú zálohu. Kompatibilné so \'SMSBackup And Restore\'.</string>
   <string name="local_identity__regenerate_key">Pregeneruj kľúče</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Manuálne MMS nastavenia sú vyžadované pre tvoj telefón.</string>
@@ -343,7 +360,8 @@
   <string name="receive_key_activity__complete">Dokončené</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">TVOJA KRAJINA</string>
-  <string name="registration_activity__your_country_code_and_phone_number">Tvoj kód krajiny a\ntelefónne číslo</string>
+  <string name="registration_activity__your_country_code_and_phone_number">Tvoj kód krajiny a
+telefónne číslo</string>
   <string name="registration_activity__phone_number">TELEFÓNNE ČÍSLO </string>
   <string name="registration_activity__register">Registrovať</string>
   <string name="registration_activity__skip">Preskoč</string>
@@ -352,18 +370,28 @@
   <string name="registration_problems__google_voice">Google hlas</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Hlasové overovanie</string>
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure Vám môže tiež zavolať kvôli overeniu Vášho čísla. Kliknite \"Zavolaj mi\" a vložte 6 číslic\nkód ktoré budete počuť.\n</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+TextSecure Vám môže tiež zavolať kvôli overeniu Vášho čísla. Kliknite \"Zavolaj mi\" a vložte 6 číslic
+kód ktoré budete počuť.
+</string>
   <string name="registration_progress_activity__verify">Overené</string>
   <string name="registration_progress_activity__call_me">Zavolaj mi</string>
   <string name="registration_progress_activity__edit_number">Úprav číslo</string>
   <string name="registration_progress_activity__connectivity_error">Problém pripojenia.</string>
-  <string name="registration_progress_activity__no_network_connectivity">Žiadne sieťové\npripojenie.\n</string>
+  <string name="registration_progress_activity__no_network_connectivity">Žiadne sieťové
+pripojenie.
+</string>
   <string name="registration_progress_activity__restrictive_firewall">Reštriktívny firewall</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTeraz TextSecure automaticky overí tvoje číslo prostredníctvom overovacej SMS správy.\n</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+Teraz TextSecure automaticky overí tvoje číslo prostredníctvom overovacej SMS správy.
+</string>
   <string name="registration_progress_activity__connecting">Pripájanie...</string>
-  <string name="registration_progress_activity__waiting_for_sms_verification">Čakanie na SMS\noverovanie...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Čakanie na SMS
+overovanie...</string>
   <string name="registration_progress_activity__registering_with_server">Registrujem na server...</string>
-  <string name="registration_progress_activity__sms_verification_failed">SMS overovanie\nzlyhalo.\n</string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS overovanie
+zlyhalo.
+</string>
   <string name="registration_progress_activity__generating_keys">Generovanie kľúčov...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Vlož meno alebo číslo</small></string>
@@ -374,8 +402,6 @@
   <string name="verify_identity_activity__their_identity_they_read">Ich totožnosť (oni vidia):</string>
   <string name="verify_identity_activity__your_identity_you_read">Vaša totožnosť (vy vidíte):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Meno totožnosti:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Importovaná totožnosť:\\n</string>
   <string name="verify_import_identity_activity__verified">Verifikované!</string>
   <string name="verify_import_identity_activity__compare">Porovnaj</string>
   <!--verify_keys_activity-->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9d541d6797..fe121ef7b1 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -57,6 +57,7 @@ Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern
   <string name="ConversationItem_click_to_approve_mms_dialog_title">Använd MMS istället?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Använd okrypterat SMS istället?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Använd okrypterat MMS istället?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Det här meddelandet kommer <b>inte</b> bli krypterat eftersom en säker session inte kunde etableras.\n\nSkicka osäkert meddelande?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Påbörja säker session?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Upprätta en säker förbindelse med %s?</string>
@@ -85,6 +86,8 @@ Det här kommer slå av pushmeddelanden genom att avregistrera dig från servern
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Är du säker på att du vill lämna den här gruppen?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meddelandedetaljer</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSkickat/Mottagits: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Avsändare: %1$s\nTransport: %2$s\nSkickat: %3$s\nMottagits: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Bekräfta borttagning av meddelande</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Är du säker på att du vill ta bort detta meddelande permanent?</string>
   <string name="ConversationFragment_save_to_sd_card">Spara till minneskort?</string>
@@ -203,6 +206,10 @@ verifiera denna kontakt.</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Numret du angav (%s) är ogiltigt.</string>
   <string name="RegistrationActivity_unsupported">Stöds ej</string>
   <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Tyvärr stödjer inte den här enheten datameddelanden. Enheter som kör versioner av Android äldre än 4.0 måste ha ett registrerat Google-konto. Enheter som kör Android 4.0 eller nyare behöver inte ett Google-konto, men måste ha appen Play Store installerad.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+        Vi kommer nu verifiera att följande nummer är associerat med den här enheten:\n\n%s\n\n
+        Är detta nummer korrekt, eller vill du ändra det innan du går vidare?
+    </string>
   <string name="RegistrationActivity_continue">Fortsätt</string>
   <string name="RegistrationActivity_edit">Ändra</string>
   <!--RegistrationProblemsActivity-->
@@ -397,6 +404,7 @@ och dina existerande kontakter kommer att få varningar när de etablerar nya s
   <string name="log_submit_activity__log_fetch_failed">Kunde inte plocka loggarna från din enhet, men du kan använda ADB för att hämta debugloggarna istället.</string>
   <string name="log_submit_activity__log_submit_success_title">Lyckades!</string>
   <string name="log_submit_activity__log_got_it">Uppfattat</string>
+  <string name="log_submit_activity__your_pastebin_url">Var vänlig och kopiera denna URL och skriv in den i ditt ärende (långtryck för att kopiera):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Kopierade till urklipp</string>
   <string name="log_submit_activity__loading_logcat">Laddar logcat…</string>
   <string name="log_submit_activity__thanks">Tack för din hjälp!</string>
@@ -498,6 +506,8 @@ TextSecure uppnådde tidsgränsen för sms-verifiering.</string>
   <string name="verify_identity_activity__their_identity_they_read">Deras identitet (de läser):</string>
   <string name="verify_identity_activity__your_identity_you_read">Din identitet (du läser):</string>
   <!--verify_import_identity_activity-->
+  <string name="verify_import_identity_activity__identity_name_n">Identitetsnamn:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Importerad identitet:\\n</string>
   <string name="verify_import_identity_activity__verified">Verifierad!</string>
   <string name="verify_import_identity_activity__compare">Jämför</string>
   <!--verify_keys_activity-->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 1f570f6ff4..e2e869ea28 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -55,8 +55,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Ви дійсно хочете покинути цю групу?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Деталі повідомлення</string>
-  <string name="ConversationFragment_transport_s_sent_received_s">Відправник: %1$s\nВідправлено/Отримано: %2$s</string>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Відправник: %1$s\nТип зв’язку: %2$s\nВідправлено: %3$s\nОтримано: %4$s</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Ви дійсно хочете назавжди вилучити це повідомлення?</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">Цей медіа-файл зберігається в зашифрованій базі даних. Його копія, яку ви збережете на SD-картку, не буде зашифрована. Бажаєте продовжити?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Сталась помилка підчас збереження прикріплення на SD-карту!</string>
@@ -133,7 +131,6 @@
   <string name="RegistrationActivity_invalid_number">Невірний номер</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Вказаний вами номер (%s) не є дійсним.</string>
   <string name="RegistrationActivity_unsupported">Не підтримується</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">Зараз буде виконана перевірка, що цим пристроєм дійсно використовується номер телефону:\n\n%S\n\nНомер введений правильно, чи Ви хочете його редагувати?</string>
   <string name="RegistrationActivity_continue">Продовжити</string>
   <string name="RegistrationActivity_edit">Редагувати</string>
   <!--RegistrationProblemsActivity-->
@@ -260,7 +257,9 @@
   <string name="country_selection_fragment__loading_countries">Завантаження країн\u2026</string>
   <string name="country_selection_fragment__search">Пошук</string>
   <!--create_passphrase_activity-->
-  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Будь ласка, виберіть фразу-пароль, яка використовуватиметься для локального шифрування ваших даних.\n\nВона повинна бути надійною.</string>
+  <string name="create_passphrase_activity__please_choose_a_passphrase_that_will_be_used_to_locally_encrypt_your_data_this_should_be_a_strong_passphrase">Будь ласка, виберіть фразу-пароль, яка використовуватиметься для локального шифрування ваших даних.
+
+Вона повинна бути надійною.</string>
   <string name="create_passphrase_activity__passphrase">ФРАЗА-КЛЮЧ:</string>
   <string name="create_passphrase_activity__repeat">ПОВТОРІТЬ:</string>
   <string name="create_passphrase_activity__continue">Продовжити</string>
@@ -283,7 +282,8 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Це може зайняти якийсь час. Будь ласка, наберіться терпіння, ми Вам повідомимо, коли імпортування завершиться.</string>
   <string name="database_migration_activity__importing">ІМПОРТУВАННЯ</string>
   <!--database_upgrade_activity-->
-  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Експортувати на SD-карту\nзашифровану резервну копію.</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Експортувати на SD-карту
+зашифровану резервну копію.</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">Експортувати на SD-карту незашифровану резервну копію, сумісну з додатком \'SMSBackup And Restore\'.</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Імпортувати базу даних з SMS-додатку, який використовується зараз за замовчуванням.</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Відновити з раніше експортованої зашифрованої резервної копії TextSecure</string>
@@ -303,7 +303,8 @@
   <string name="receive_key_activity__complete">Виконати</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">ВАША КРАЇНА</string>
-  <string name="registration_activity__your_country_code_and_phone_number">КОД ВАШОЇ КРАЇНИ ТА НОМЕР ТЕЛЕФОНУ\n    </string>
+  <string name="registration_activity__your_country_code_and_phone_number">КОД ВАШОЇ КРАЇНИ ТА НОМЕР ТЕЛЕФОНУ
+    </string>
   <string name="registration_activity__phone_number">НОМЕР ТЕЛЕФОНУ</string>
   <string name="registration_activity__register">Реєстрація</string>
   <string name="registration_activity__skip">Пропустити</string>
@@ -339,8 +340,6 @@
   <string name="verify_identity_activity__their_identity_they_read">Cпіврозмовник (він читає):</string>
   <string name="verify_identity_activity__your_identity_you_read">Ви (ви читаєте):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">І’мя :\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Імпортований співрозмовник:\\n</string>
   <string name="verify_import_identity_activity__verified">Перевірено!</string>
   <string name="verify_import_identity_activity__compare">Порівняти</string>
   <!--verify_keys_activity-->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 56f0b97d86..8437265d73 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -14,12 +14,14 @@
   <string name="ApplicationPreferencesActivity_delete">Xóa</string>
   <string name="ApplicationPreferencesActivity_my">Của Tôi</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Tắt mã hóa lưu trữ?</string>
-  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nCảnh báo, điều này tắt mã hóa lưu trữ cho tất cả tin nhắn và chìa khóa. Phiên mã hóa vẫn tiếp tục hoạt động, nhưng bất cứ ai vào được máy bạn sẽ truy cập được nội dung.</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
+Cảnh báo, điều này tắt mã hóa lưu trữ cho tất cả tin nhắn và chìa khóa. Phiên mã hóa vẫn tiếp tục hoạt động, nhưng bất cứ ai vào được máy bạn sẽ truy cập được nội dung.</string>
   <string name="ApplicationPreferencesActivity_disable">Tắt</string>
   <string name="ApplicationPreferencesActivity_unregistering">Gỡ đăng ký...</string>
   <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Gỡ đăng ký cho thông tin qua đường truyền mạng</string>
   <string name="ApplicationPreferencesActivity_disable_push_messages">Tắt tin nhắn đẩy?</string>
-  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nThao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn ra khỏi máy chủ. Bạn sẽ cần đăng ký lại số điện thoại để dùng tin nhắn đẩy trong tương lai.</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">
+Thao tác này sẽ tắt tin nhắn đẩy bằng cách gỡ đăng ký bạn ra khỏi máy chủ. Bạn sẽ cần đăng ký lại số điện thoại để dùng tin nhắn đẩy trong tương lai.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Có lỗi kết nối vào máy chủ!</string>
   <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Bạn chưa đăng ký với dịch vụ đẩy...</string>
   <string name="ApplicationPreferencesActivity_updating_directory">Cập nhật thư mục</string>
@@ -52,7 +54,6 @@
   <string name="ConversationItem_click_to_approve_mms_dialog_title">Hủy bỏ MMS?</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">Hủy bỏ MMS chưa được 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ã hóa vì không thiết lập được phiên an toàn.\n\nGửi tin nhắn không mã hóa?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Khởi động tiến trình mã hóa?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Khởi tạo phiên trao đổi an toàn với %s?</string>
@@ -81,8 +82,6 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Bạn có chắc là muốn rời nhóm?</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>
-  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Nơi gởi: %1$s\nChuyển tải: %2$s\nGửi: %3$s\nNhận: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Xác nhận xóa tin</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Bạn có chắc là muốn xóa vĩnh viễn tin nhắn này?</string>
   <string name="ConversationFragment_save_to_sd_card">Lưu vào thẻ nhớ?</string>
@@ -140,7 +139,8 @@
   <string name="ImportFragment_import">Nhập</string>
   <string name="ImportFragment_cancel">Hủy bỏ</string>
   <string name="ImportFragment_restore_encrypted_backup">Khôi phục phần sao lưu đã mã hóa?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nPhục hồi bản sao lưu có mã hóa sẽ thay thế hoàn toàn các chìa khóa hiện thời, chọn lựa và tin nhắn. Bạn sẽ mất những thông tin nào có trong phiên bản TextSecure cài đặt hiện thời nhưng không có trong bản sao lưu.</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Phục hồi bản sao lưu có mã hóa sẽ thay thế hoàn toàn các chìa khóa hiện thời, chọn lựa và tin nhắn. Bạn sẽ mất những thông tin nào có trong phiên bản TextSecure cài đặt hiện thời nhưng không có trong bản sao lưu.</string>
   <string name="ImportFragment_restore">Phục hồi</string>
   <string name="ImportFragment_import_plaintext_backup">Xuất dữ liệu sao lưu dạng thuần văn bản?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Thao tác này sẽ nhập các tin nhắn từ bản sao lưu thường (không mã hóa). Nếu bạn đã nhập sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin nhắn trùng lập.</string>
@@ -178,7 +178,9 @@
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Bạn có thể sửa đổi các trị số này trong menu thiết đặt của TextSecure bất cứ lúc nào.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Chữ ký của việc trao đổi chìa khóa này khác với lần trao đổi trước nhận được từ người liên lạc này. Điều này có nghĩa là có ai đó tìm cách chận bắt liên lạc thông tin của bạn, hoặc đơn thuần là người này cài đặt lại TextSecure và có chìa khóa nhận diện mới.</string>
-  <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Bạn có thể muốn kiểm chứng\nđịa chỉ liên lạc này.\n    </string>
+  <string name="ReceiveKeyActivity_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>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Chữ ký của việc trao đổi chìa khóa này thì tin cẩn, nhưng bạn để tắt thiết đặt \'tự động hoàn tất trao đổi chìa khóa\'.</string>
   <string name="ReceiveKeyActivity_processing">Đang xử lý</string>
   <string name="ReceiveKeyActivity_processing_key_exchange">Xử lý trao đổi chìa khóa...</string>
@@ -190,7 +192,6 @@
   <string name="RegistrationActivity_invalid_number">Số không đúng</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Số bạn cung cấp (%s) không đúng.</string>
   <string name="RegistrationActivity_unsupported">Không hỗ trợ</string>
-  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nBây giờ chúng tôi sẽ kiểm chứng xem số sau đây có liên đới với thiết bị này:\n\n%s\n\nSố này có đúng không, hay bạn có muốn sửa đổi nó trước khi tiếp tục?</string>
   <string name="RegistrationActivity_continue">Tiếp tục</string>
   <string name="RegistrationActivity_edit">Sửa</string>
   <!--RegistrationProblemsActivity-->
@@ -215,9 +216,12 @@
   <string name="RegistrationService_textsecure_registration_has_successfully_completed">Đăng ký TextSecure đã hoàn tất tốt đẹp.</string>
   <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Đăng ký TextSecure gặp phải vấn đề.</string>
   <!--SmsMessageRecord-->
-  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Nhận được thông tin\ntrao đổi chìa khóa bị hỏng!</string>
-  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nNhận thông tin trao đổi chìa khóa về phiên bản giao thức không hợp lệ.</string>
-  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nNhận thông tin về chìa khóa nhận diện không rõ. Bấm để xử lý và hiển thị.</string>
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Nhận được thông tin
+trao đổi chìa khóa bị hỏng!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+Nhận thông tin trao đổi chìa khóa về phiên bản giao thức không hợp lệ.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+Nhận thông tin về chìa khóa nhận diện 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 nhận diện. Nhấn vào để kiểm nhận tên nhận diện.</string>
   <string name="SmsMessageRecord_secure_session_ended">Phiên an toàn chấm dứt.</string>
   <string name="SmsMessageRecord_duplicate_message">Tin nhắn trùng lập.</string>
@@ -286,7 +290,8 @@
   <string name="ViewLocalIdentityActivity_regenerating">Tái tạo...</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Tái tạo chìa khóa nhận diện</string>
   <string name="ViewLocalIdentityActivity_regenerated">Tái tạo xong!</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nLưu ý! Khi tái tạo chìa khóa nhận diện của bạn, chìa khóa hiện thời sẽ bị mất vĩnh viễn, và những người liên hệ với bạn sẽ được cảnh báo khi thiết lập phiên an toàn mới với bạn. Bạn có chắc là muốn tiếp tục?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">
+Lưu ý! Khi tái tạo chìa khóa nhận diện của bạn, chìa khóa hiện thời sẽ bị mất vĩnh viễn, và những người liên hệ với bạn sẽ được cảnh báo khi thiết lập phiên an toàn mới với bạn. Bạn có chắc là muốn tiếp tục?</string>
   <string name="ViewLocalIdentityActivity_cancel">Hủy bỏ</string>
   <string name="ViewLocalIdentityActivity_continue">Tiếp tục</string>
   <!--SmsReceiver-->
@@ -343,7 +348,6 @@
   <string name="log_submit_activity__log_fetch_failed">Không lấy được ký sự từ thiết bị của bạn. Thay vào đó, bạn có thể dùng ADB để lấy ký sự gỡ lỗi (debug).</string>
   <string name="log_submit_activity__log_submit_success_title">Thành công!</string>
   <string name="log_submit_activity__log_got_it">Nhận tốt</string>
-  <string name="log_submit_activity__your_pastebin_url">Xin sao chép đường dẫn này và thêm vào phần báo lỗi (nhấn/đè lâu để cho vào bảng ghi tạm-clipboard):\n\n<b>%1$s</b></string>
   <string name="log_submit_activity__copied_to_clipboard">Sao chép vào bảng ghi tạm</string>
   <string name="log_submit_activity__loading_logcat">Nạp logcat...</string>
   <string name="log_submit_activity__thanks">Cám ơn sự trợ giúp của bạn!</string>
@@ -358,10 +362,13 @@
   <string name="database_migration_activity__importing">ĐANG NHẬP VÀO</string>
   <!--database_upgrade_activity-->
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Xuất sao lưu có mã hóa ra thẻ nhớ SD</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nXuất sao lưu thường tương thích với \'Sao Lưu và Phục Hồi SMS\' ra thẻ nhớ SD.</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
+Xuất sao lưu thường tương thích với \'Sao Lưu và Phục Hồi SMS\' ra thẻ nhớ SD.</string>
   <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__restore_a_previously_exported_encrypted_textsecure_backup">\nPhục hồi sao lưu TextSecure có mã hóa từng xuất ra trước đó.</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nNhập tập tin sao lưu thường-không mã hóa. Tương thích với \'Sao Lưu và Phục Hồi SMS\'.</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">
+Phục hồi sao lưu TextSecure có mã hóa từng xuất ra trước đó.</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 \'Sao Lưu và Phục Hồi SMS\'.</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Phải làm thiết đặt MMS bằng tay cho điện thoại của bạn.</string>
   <!--prompt_passphrase_activity-->
@@ -376,35 +383,48 @@
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Hoàn tất</string>
   <!--registration_activity-->
-  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure có thể dùng tin nhắn nhanh để tăng độ riêng tư và tránh cước SMS khi liên lạc với những người dùng TextSecure khác. Để mở tính năng này, xin kiểm chứng mã số quốc gia và số điện thoại của bạn.</string>
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+TextSecure có thể dùng tin nhắn nhanh để tăng độ riêng tư và tránh cước SMS khi liên lạc với những người dùng TextSecure khác. Để mở tính năng này, xin kiểm chứng mã số quốc gia và số điện thoại của bạn.</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À\nSỐ ĐIỆN THOẠI 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>
   <string name="registration_activity__phone_number">SỐ ĐIỆN THOẠI</string>
   <string name="registration_activity__register">Đăng ký</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Thể thức đăng ký sẽ chuyển một số thông tin liên hệ tạm thời đến máy chủ .</string>
   <string name="registration_activity__skip">Bỏ qua</string>
   <!--registration_problems-->
-  <string name="registration_problems__some_possible_problems_include">Một số vấn đề có thể gặp\nbao gồm:</string>
-  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nMột số ứng dụng tin nhắn bên thứ ba, như Handcent hay GoSMS hành xử không hay và chận bắt tất cả tin nhắn SMS đi vào. Kiểm lại trong các ứng dụng đó xem coi có tin nhắn nào có hàng chữ \'Mã số kiểm chứng TextSecure của bạn:\', trong trường hợp đó bạn cần cấu hình ứng dụng đó cho phép tin nhắn đi xuyên qua.</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__some_third_party_text_messaging_clients_such_as_handcent">
+Một số ứng dụng tin nhắn bên thứ ba, như Handcent hay GoSMS hành xử không hay và chận bắt tất cả tin nhắn SMS đi vào. Kiểm lại trong các ứng dụng đó xem coi có tin nhắn nào có hàng chữ \'Mã số kiểm chứng TextSecure của bạn:\', trong trường hợp đó bạn cần cấu hình ứng dụng đó cho phép tin nhắn đi xuyên qua.</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">\nXin 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__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__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure không chạy với số của Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">
+TextSecure không chạy với số của Google Voice.</string>
   <!--registration_progress_activity-->
-  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure cũng có thể gọi bạn để kiểm chứng số điện thoại. Nhấn vào \'Gọi Tôi\' và điền vào dưới đây mã 6 số mà bạn nghe được qua cú gọi.</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
+TextSecure cũng có thể gọi bạn để kiểm chứng số điện thoại. Nhấn vào \'Gọi Tôi\' và điền vào dưới đây mã 6 số mà bạn nghe được qua cú gọi.</string>
   <string name="registration_progress_activity__verify">Kiểm chứng</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__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure không thể kết nối vào dịch vụ đẩy.</string>
-  <string name="registration_progress_activity__some_possible_problems_include">Một số vấn đề có\nthể gặp bao gồm:</string>
-  <string name="registration_progress_activity__no_network_connectivity">Không có đường\ntruyền mạng.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">
+TextSecure không thể kết nối vào dịch vụ đẩy.</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__restrictive_firewall">Tường lửa ngăn chận.</string>
-  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure bây giờ sẽ tự động kiểm chứng số điện thoại bạn với một tin nhắn SMS xác nhận.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+TextSecure bây giờ sẽ tự động kiểm chứng số điện thoại bạn với một tin nhắn SMS xác nhận.</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\nchứng SMS...</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__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">
+TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</string>
   <string name="registration_progress_activity__sms_verification_failed">Kiểm chứng SMS thất bại.</string>
   <string name="registration_progress_activity__generating_keys">Tạo chìa khóa...</string>
   <!--recipients_panel-->
@@ -416,8 +436,6 @@
   <string name="verify_identity_activity__their_identity_they_read">Tên nhận diện của họ (họ đọc):</string>
   <string name="verify_identity_activity__your_identity_you_read">Tên nhận diện của bạn (bạn đọc):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Tên nhận diện:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Tên nhận diện nhập vào:\\n</string>
   <string name="verify_import_identity_activity__verified">Đã kiểm chứng!</string>
   <string name="verify_import_identity_activity__compare">So sánh</string>
   <!--verify_keys_activity-->
@@ -499,7 +517,8 @@
   <string name="preferences__make_default_sms_app">Chọn làm ứng dụng SMS mặc định</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Chọn TextSecure làm ứng dụng SMS/MMS mặc định của hệ thống.</string>
   <string name="preferences__use_data_channel">Tin nhắn đẩy</string>
-  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nTăng độ riêng tư và tránh cước SMS bằng cách dùng đường truyền internet để liên lạc với những người dùng TextSecure khác</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Tăng độ riêng tư và tránh cước SMS bằng cách dùng đường truyền internet để liên lạc với những người dùng TextSecure khác</string>
   <string name="preferences__allow_sms_fallback">Cho phép gửi SMS đến</string>
   <string name="preferences__allow_sms_fallback_disabled_reason">TextSecure hiện thời là ứng dụng SMS mặc định. Xin thiết đặt một ứng dụng SMS mặc định khác trước khi thay đổi chọn lựa này.</string>
   <string name="preferences__submit_debug_log">Nạp ký sự gỡ lỗi</string>