diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d4041ae289..53c0fd2f33 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -13,7 +13,9 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من مسح كل الرسائل بالمحادثات وابقاء أحدث %s رسالة فقط؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <string name="ApplicationPreferencesActivity_my">أنا</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">ايقاف تشفير التخزين؟</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>
@@ -31,18 +33,15 @@
   <string name="ConversationItem_success_exclamation">نجحت!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">غير قادر على الكتابة على كرت الذاكرة!</string>
   <string name="ConversationItem_view_secure_media_question">عرض الوسائط المشفرة؟</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">تم حفظ هذه الوسائط بقاعدة بيانات مشفرة. لعرضها بمصدر عرض خارجي، يجب أن يتم فك تشفيرها و تخزينها مؤقتاً بالذاكرة. هل تريد الاستمرار؟</string>
   <string name="ConversationItem_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>
   <!--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>
@@ -52,7 +51,6 @@
   <string name="ConversationActivity_forward_message_prefix">إعادة إرسال</string>
   <string name="ConversationActivity_group_conversation_recipients">مستقبلي رسائل المحادثة الجماعية</string>
   <string name="ConversationActivity_group_conversation">محادثة جماعية</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d مشاركين في المجموعة</string>
   <string name="ConversationActivity_saving_draft">حفظ مسودة</string>
   <string name="ConversationActivity_invalid_recipient">جهة اتصال غير صحيحة!</string>
   <string name="ConversationActivity_calls_not_supported">خاصية الاتصال غير متوفرة</string>
@@ -85,6 +83,7 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">خطأ أثناء الكتابة على كرت الذاكرة!</string>
   <string name="ExportFragment_success">نجحت!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">جاري تصدير مفاتيحك المشفرة و إعداداتك و رسائلك</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">استيراد الرسائل القصيرة بالنظام؟</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">هذه الخاصية ستستورد الرسائل القصيرة من النظام إلى داخل تكست سيكيور. إذا قمت بعمل هذا من قبل فسيتم تكرار رسائلك القصيرة.</string>
@@ -94,7 +93,6 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nاسترجاع نسخة احتياطية مشفرة سيمسح بالكامل أي مفاتيح حالية أو اعدادات أو رسائل. ستفقد أي معلومات موجودة الآن في تكست سيكيور ولكن غير موجودة في النسخة الاحتياطية.</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>
@@ -110,6 +108,7 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">لا يوجد اتصال لرسائل الوسائط المتعددة. حاول مرة أخرى لاحقاً.</string>
   <string name="MmsDownloader_error_storing_mms">خطأ بتخزين الرسالة!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">خطأ في الاتصال مع مزود خدمة رسالة الوسائط المتعددة...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">خطأ بقراءة اعدادات مزود خدمة رسائل الوسائط المتعددة...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">رسالة الوسائط المتعددة</string>
   <!--PassphraseChangeActivity-->
@@ -128,6 +127,13 @@
   <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>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">متابعة</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">لا يوجد لديك مفتاح هوية!</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">لا يوجد لدى الطرف الاخر مفتاح هوية!</string>
@@ -178,8 +184,6 @@
   <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_passphrase_cached">تم حفظ العبارة السرية مؤقتاً</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) رسائل جديدة</string>
   <string name="MessageNotifier_most_recent_from_s">آخر رسالة من: %s</string>
@@ -194,9 +198,12 @@
   <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_cancel">الغاء</string>
+  <string name="ViewLocalIdentityActivity_continue">متابعة</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">غير قادر على ارسال الرسالة حاليا. سيتم ارسالها عندما تتوفر الخدمة مرة أخرى.</string>
+  <!--QuickResponseService-->
   <!--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>
@@ -207,12 +214,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">لا توجد جهات اتصال.</string>
+  <!--single_contact_selection_activity-->
   <!--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">اكتب الرسالة</string>
   <string name="conversation_activity__send">ارسال</string>
   <string name="conversation_activity__remove">إزالة</string>
   <!--conversation_item_sent-->
@@ -223,8 +230,9 @@
   <string name="conversation_item_received__downloading">تحميل</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">وضع الدفعات</string>
+  <!--country_selection_fragment-->
+  <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">الرجاء اختيار عبارة سرية ليتم استخدامها بتشفير البيانات المحلية. يجب أن تكون عبارة سرية قوية و صعبة التخمين.</string>
   <string name="create_passphrase_activity__passphrase">العبارة السرية:</string>
   <string name="create_passphrase_activity__repeat">تكرار:</string>
   <string name="create_passphrase_activity__continue">متابعة</string>
@@ -241,6 +249,7 @@
   <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_plaintext_backup">تصدير النسخة الاحتياطية الغير مشفرة</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nتصدير نسخة غير مشفرة لكرت الذاكرة SD Card  بصيغة متوافقة مع SMSBackup And Restore</string>
   <string name="import_fragment__import_system_sms_database">استيراد الرسائل القصيرة بالنظام</string>
   <string name="import_fragment__import_encrypted_backup">استيراد النسخ الاحتياطية المشفرة</string>
   <string name="import_fragment__import_plaintext_backup">استيراد النسخة الاحتياطية الغير مشفرة</string>
@@ -255,6 +264,9 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">منفذ بروكسي مركز رسائل الوسائط المتعددة (اختياري):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">انتهاء</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">إلى</string>
   <!--review_identities-->
@@ -283,6 +295,7 @@
   <string name="AndroidManifest__complete_key_exchange">اكمال تبادل المفاتيح</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد/تصدير</string>
+  <string name="arrays__my_identity_key">مفتاح هويتي</string>
   <string name="arrays__contact_keys">مفاتيح جهات الاتصال</string>
   <!--preferences.xml-->
   <string name="preferences__general">عام</string>
@@ -311,11 +324,9 @@
   <string name="preferences__manage_configured_identity_keys">إدارة مفاتيح الهوية التي تم ضبطها</string>
   <string name="preferences__notifications">التنبيهات</string>
   <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__change_notification_blink_pattern">تغيير اسلوب وميض تنبيهات LED</string>
-  <string name="preferences__pref_led_blink_dialogtitle">اختيار اسلوب وميض LED</string>
-  <string name="preferences__select_led_color">اختيار لون ضوء التنبيه LED</string>
+  <string name="preferences__sound">صوت</string>
+  <string name="preferences__inthread_notifications">تنبيهات داخل المحادثة</string>
+  <string name="preferences__play_inthread_notifications">تشغيل صوت التنبيهات أثناء متابعة محادثة نشطة.</string>
   <string name="preferences__vibrate">هزاز</string>
   <string name="preferences__also_vibrate_when_notified">شغل الهزاز عند وصول تنبيه</string>
   <string name="preferences__minutes">دقائق</string>
@@ -335,8 +346,8 @@
   <string name="preferences__mmsc_url_required">عنوان مركز رسائل الوسائط المتعددة (الزامي)</string>
   <string name="preferences__mms_proxy_host_optional">عنوان بروكسي رسائل الوسائط المتعددة (غير الزامي)</string>
   <string name="preferences__mms_proxy_port_optional">منفذ او بورت بروكسي  الرسائل الوسائط المتعددة (غير الزامي)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">اطلب تقرير توصيل لكل رسالة قصيرة ترسلها</string>
   <string name="preferences__sms_delivery_reports">تقرير توصيل الرسائل القصيرة</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">اطلب تقرير توصيل لكل رسالة قصيرة ترسلها</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">امسح كل الرسائل القديمة تلقائياً عند تخطي المحادثة الطول المحدد</string>
   <string name="preferences__delete_old_messages">امسح الرسائل القديمة</string>
   <string name="preferences__storage">التخزين</string>
@@ -366,6 +377,7 @@
   <string name="conversation_context__menu_copy_text">نسخ النص</string>
   <string name="conversation_context__menu_delete_message">مسح الرسالة</string>
   <string name="conversation_context__menu_forward_message">إعادة ارسال الرسالة</string>
+  <string name="conversation_context__menu_resend_message">إعادة إرسال الرسالة</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">بدء قناة تشفير</string>
   <!--conversation_list_batch-->
@@ -375,9 +387,7 @@
   <string name="conversation_list__menu_search">بحث</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">الأمن</string>
-  <string name="conversation_secure_verified__menu_verify_session">تحقق من قناة الاتصال</string>
   <string name="conversation_secure_verified__menu_verify_recipient">تحقق من مستقبل الرسالة</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">انهاء قناة التشفير</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">إضافات</string>
   <string name="conversation__menu_delete_thread">مسح المحاذفة</string>
@@ -395,7 +405,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">رسالة جديدة</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>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index aff0da0c35..81e7ebfc15 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Не сте сложили парола още!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">съобщения за повикване</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Изтрий старите съобщения сега?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Сигурни ли сте, че искате да приключите всички теми за разговор от последните съобщения за %s?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Сигурни ли сте, че искате да приключите всички теми за разговор от последните съобщения за% S?</string>
   <string name="ApplicationPreferencesActivity_delete">Изтрий</string>
   <string name="ApplicationPreferencesActivity_my">Мой</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Изключи криптиране на хранилището</string>
@@ -33,15 +33,11 @@
   <string name="ConversationItem_success_exclamation">Успех!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Не може да се запише на SD картата!</string>
   <string name="ConversationItem_view_secure_media_question">Искате ли да видите сигурните данни?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Тази информация се съхранява в криптирана база данни. За съжаление, за да го видите  в момента се изисква данните да бъдат временно разшифровани и записани на диска. Сигурни ли сте, че искате да направите това?</string>
   <string name="ConversationItem_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>
   <!--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>
@@ -54,7 +50,6 @@
   <string name="ConversationActivity_forward_message_prefix">Напред</string>
   <string name="ConversationActivity_group_conversation_recipients">Група от получатели</string>
   <string name="ConversationActivity_group_conversation">Група за разговори</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d получатели в групата</string>
   <string name="ConversationActivity_saving_draft">Запазване на чернова...</string>
   <string name="ConversationActivity_invalid_recipient">Невалиден получател!</string>
   <string name="ConversationActivity_calls_not_supported">Повикването не се поддържа</string>
@@ -87,6 +82,7 @@
   <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настройки, и съобщения...⏎</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Внасяне на  System SMS база от данни?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Това ще импортира ⏎\nсъобщенията от базата данни по подразбиране на системата за SMS TextSecure. Ако преди това сте ⏎\nвнесли SMS базата данни на системата, импортирайки ги отново ще доведе до дублиране на съобщения. ⏎</string>
@@ -96,7 +92,6 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nВъзстановяване на криптирано архивно копие ще замени съществуващите  ключовете, предпочитания и ⏎\nсъобщения. Ще загубите всякаква информация, която е в текущата TextSecure инсталирана, но не ⏎\nви в резервното копие.⏎</string>
   <string name="ImportFragment_restore">Възстанови</string>
   <string name="ImportFragment_import_plaintext_backup">Внеси Plaintext резервно копие?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Това ще импортира ⏎\nсъобщения от архив plaintext. Ако сте били внесли SMS базата данни на системата, ⏎\nако импортирате отново ще  дублирате  съобщенията. ⏎</string>
   <string name="ImportFragment_importing">Внасяне</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Внасяне plaintext архив...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Не е намерен архив!</string>
@@ -130,6 +125,13 @@
   <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>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">Продължи</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Нямате личен ключ.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Получателя няма личен ключ.</string>
@@ -180,11 +182,9 @@
   <string name="ApplicationMigrationService_import_in_progress">Импортирането е в процес на извършване</string>
   <string name="ApplicationMigrationService_importing_text_messages">Внасяне на текстови съобщения</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure парола се запази</string>
-  <string name="KeyCachingService_passphrase_cached">Паролата се запази</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Нови съобщения</string>
-  <string name="MessageNotifier_most_recent_from_s">Най-скоро от: %s</string>
+  <string name="MessageNotifier_most_recent_from_s">Най-скоро от: %2$s</string>
   <string name="MessageNotifier_encrypted_message">Криптирано съобщение...</string>
   <string name="MessageNotifier_no_subject">(Без тема)</string>
   <string name="MessageNotifier_message_delivery_failed">Изпращането на съобщението се провали</string>
@@ -193,8 +193,10 @@
   <string name="MessageNotifier_mark_all_as_read">Маркирай всички като прочетени</string>
   <string name="MessageNotifier_mark_as_read">Маркирай като прочетено</string>
   <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_continue">Продължи</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">В момента не може да изпратите SMS съобщение. Ще бъде изпратено след като услугата стане достъпна.</string>
+  <!--QuickResponseService-->
   <!--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>
@@ -205,12 +207,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Няма контакти.</string>
+  <!--single_contact_selection_activity-->
   <!--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">Напишете съобщение</string>
   <string name="conversation_activity__send">Изпрати</string>
   <string name="conversation_activity__remove">Премахни</string>
   <!--conversation_item_sent-->
@@ -221,8 +223,9 @@
   <string name="conversation_item_received__downloading">Изтегля се</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Общ избор</string>
+  <!--country_selection_fragment-->
+  <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">Моля изберете парола да заключи вашата информация локално. Трябва да бъде силна парола.</string>
   <string name="create_passphrase_activity__passphrase">ПАРОЛА: </string>
   <string name="create_passphrase_activity__repeat">ПОВТОРИ: </string>
   <string name="create_passphrase_activity__continue">Продължи</string>
@@ -256,6 +259,9 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (ДОПЪЛНИТЕЛНО):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Завършен</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">До</string>
   <!--review_identities-->
@@ -314,12 +320,6 @@
   <string name="preferences__manage_configured_identity_keys">Управление на конфигурираните личностни ключове</string>
   <string name="preferences__notifications">Известия</string>
   <string name="preferences__display_message_notifications_in_status_bar">Покажи известие в лентата за състояния</string>
-  <string name="preferences__led_color">LED Цвят</string>
-  <string name="preferences__change_notification_led_color">Сменете LED цвят на известията</string>
-  <string name="preferences__pref_led_blink_title">LED мигащ</string>
-  <string name="preferences__change_notification_blink_pattern">Промени известяването с LED мигане</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Избери LED мигане</string>
-  <string name="preferences__select_led_color">Изберете LED цвят</string>
   <string name="preferences__vibrate">Вибрирай</string>
   <string name="preferences__also_vibrate_when_notified">Вибрирай после известявай</string>
   <string name="preferences__minutes">минути</string>
@@ -339,8 +339,8 @@
   <string name="preferences__mmsc_url_required">MMSC URL (Задължително)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (По изборl)</string>
   <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (По избор)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Искане на доклад за всяко съобщение при изпращане на SMS</string>
   <string name="preferences__sms_delivery_reports">SMS известие за доставяне</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Искане на доклад за всяко съобщение при изпращане на SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Трий автоматично старите съобщения,щом разговора превишава определена дължина</string>
   <string name="preferences__delete_old_messages">Изтрий старите съобщения</string>
   <string name="preferences__storage">Памет</string>
@@ -379,9 +379,7 @@
   <string name="conversation_list__menu_search">Търси</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Защита</string>
-  <string name="conversation_secure_verified__menu_verify_session">Провери Сесията</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Провери получателя</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Прекрати криптираната сесия</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Добави файл</string>
   <string name="conversation__menu_delete_thread">Изтрий темата</string>
@@ -399,7 +397,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ново съобщение</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>
diff --git a/res/values-bo/strings.xml b/res/values-bo/strings.xml
index 8fcfeeb6d5..dc535d8d87 100644
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@@ -28,15 +28,11 @@
   <string name="ConversationItem_success_exclamation">ལེགས་འགྲུབ། </string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">ཉེན་སྲུང་འཕྲུལ་ཆས་ཀྱི་བྱང་བུའི་(SD Card) ནང་དུ་བླུགས་ཐུབ་མི་འདུག </string>
   <string name="ConversationItem_view_secure_media_question">ཉེན་སྲུང་ཡོད་པའི་བརྒྱུད་ལམ་ལ་ལྟོས། </string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">བརྒྱུད་ལམ་འདི་ཡིག་ཆའི་མཛོད་ཀྱི་གསང་སྡོམ་ཁོངས་སུ་ཉར་ཡོད། སྟབས་མི་ལེགས་པ་ཞིག་ལ། ཕྱི་རོལ་གྱི་པར་གཞི་ཞིག་དང་མཉམ་དུ་དེ་ལ་བལྟ་བ་ལ་གནས་སྐབས་རིང་གསང་སྡོམ་བྱས་མེད་པའི་གཞི་གྲངས་ཤིག་དགོས་ཀྱི་ཡོད། ཁྱེད་རང་གིས་དེ་ལྟར་བྱེད་ན་འདོད་དམ། </string>
   <string name="ConversationItem_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>
   <!--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>
@@ -49,7 +45,6 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">མཉམ་འདུས་གླེང་མོལ་གྱི་ཁོངས་མི་དག </string>
   <string name="ConversationActivity_group_conversation">མཉམ་འདུས་གླེང་མོལ། </string>
-  <string name="ConversationActivity_d_recipients_in_group">མཉམ་འདུས་ཀྱི་ཁོངས་སུ་ལེན་མཁན་གྱི་བརྒྱ་ཆ %d ཙམ། </string>
   <string name="ConversationActivity_saving_draft">ཟིན་བྲིས་ཉར་ཚགས་བྱེད་བཞིན་ཡོད།</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
@@ -68,9 +63,12 @@
   <string name="ConversationListItem_key_exchange_message">ལྡེ་མིག་བརྗེ་ལེན་བྱེད་རྒྱུའི་བརྡ་ལན།</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">ཕྱི་འདྲེན་བྱོས། </string>
+  <string name="ExportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
   <string name="ExportFragment_success">ལེགས་འགྲུབ། </string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import">ནང་འདྲེན་བྱོས། </string>
+  <string name="ImportFragment_cancel">ཕྱིར་འཐེན་བྱེད།</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">ཞིབ་བརྟག་བྱས་པའི་ལྡེ་མིག་རྙེད་མི་ཐུབ།</string>
   <!--MmsDownloader-->
@@ -78,6 +76,7 @@
   <string name="MmsDownloader_error_storing_mms">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གསོག་ཉར་ལ་སྐྱོན་འདུག </string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་མཁོ་སྤྲོད་བྱེད་མཁན་ལ་འབྲེལ་ཐག་གི་སྐྱོན་འདུག </string>
   <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">སྣ་མང་འཕྲིན་ཐུང་།</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">གསང་ཚིག་མཚུངས་ཀྱི་མི་འདུག</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">གསང་ཚིག་རྙིང་པ་དེ་ནོར་འདུག </string>
@@ -91,6 +90,13 @@
   <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-->
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">མུ་མཐུད། </string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">ཁྱེད་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">གཏོང་ཡུལ་ལ་ངོས་འཛིན་བྱེད་ཀྱི་ལྡེ་མིག་མི་འདུག</string>
@@ -139,8 +145,6 @@
   <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_passphrase_cached">གསང་ཚིག་དེ་སྦས།</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) ཡི་འཕྲིན་ཐུང་གསར་པ་རྣམས།</string>
   <string name="MessageNotifier_most_recent_from_s">%s: ནས་ཉེ་ཆར་གྱི་དེ། </string>
@@ -150,8 +154,11 @@
   <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>
   <string name="MessageNotifier_error_delivering_message">འཕྲིན་ཐུང་གཏོང་བར་སྐྱོན་ཤོར་འདུག </string>
   <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_cancel">ཕྱིར་འཐེན་བྱེད།</string>
+  <string name="ViewLocalIdentityActivity_continue">མུ་མཐུད། </string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">གནས་སྐབས་རིང་ཁྱེད་ཀྱི་སྣ་མང་བརྒྱུད་ལམ་འཕྲིན་ཐུང་དེ་གཏོང་ཐུབ་པ་མི་འདུག དྲ་འབྲེལ་སླར་གསོ་བྱུང་མཚམས་གཏོང་གི་རེད། </string>
+  <!--QuickResponseService-->
   <!--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>
@@ -162,12 +169,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">འབྲེལ་མིང་མི་འདུག</string>
+  <!--single_contact_selection_activity-->
   <!--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">འཕྲིན་ཐུང་ཕྲིས། </string>
   <string name="conversation_activity__send">ཐོངས། </string>
   <string name="conversation_activity__remove">ཕྱིར་ཕུད། </string>
   <!--conversation_item_sent-->
@@ -178,8 +185,9 @@
   <string name="conversation_item_received__downloading">ཕབ་ལེན་བྱེད་བཞིན་ཡོད། </string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">སྡེ་ཚན་འདེམས་ཚུལ།  </string>
+  <!--country_selection_fragment-->
+  <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">ཁྱེད་ཀྱི་་གསང་སྡོམ་མཛོད་ལ་མ་འོངས་པར་བེད་སྤྱོད་པའི་གསང་ཚིག་ཞིག་འདེམས། གསང་ཚིག་དེ་བརྟན་པོ་ཞིག་དགོས་གི་རེད། </string>
   <string name="create_passphrase_activity__passphrase">གསང་ཚིག :</string>
   <string name="create_passphrase_activity__repeat">བསྐྱར་དུ་སྤེལ། :</string>
   <string name="create_passphrase_activity__continue">མུ་མཐུད། </string>
@@ -192,16 +200,18 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">འདི་ལ་དུས་ཚོད་ཅུང་ཙམ་འགོར་སྲིད། བཟོད་སྒོམ་གནང་རོགས། ནང་འདྲེན་ལེགས་འགྲུབ་བྱུང་མཚམས་ང་ཚོས་ཁྱོད་ལ་བརྡ་གཏོང་གི་ཡིན། </string>
   <string name="database_migration_activity__importing">ནང་འདྲེན་བྱེད་བཞིན་པ། </string>
   <!--database_upgrade_activity-->
+  <!--mms_preferences_activity-->
   <!--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_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">ཁྱེད་ཀྱི་སྐུད་མེད་འཕྲིན་ལམ་བརྒྱུད་འཕྲིན་ཐུང་གཏོང་བ་ལ་གཡག་འཕྲིན་ལ་ APN སྒྲིག་བཟོ་དགོས་ཀྱི་ཡོད། ཁྱེད་ཀྱི་ལག་ཆ་དེས་གནས་ཚུལ་འདི་ཐོབ་རུང་བ་བཟོས་མི་འདུག་ཅིང་། དེ་ནི་མཚམས་ལན་རེར་སྒོ་ལྕགས་བརྒྱབ་ཡོད་པའི་ལག་ཆའི་རིགས་དང་བཀག་རྒྱ་ཅན་གྱི་བཟོ་སྒྲིག་རིགས་ལ་བདེན་པ་ཡིན། </string>
-  <string name="prompt_mms_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">བརྒྱུད་ལམ་གྱི་འཕྲིན་ཐུང་དག་གཏོང་བ་ལ་གཤམ་གྱི་ APN ཡི་གནས་ཚུལ་གལ་ཆེན་རིགས་ཚར་བ་བྱོས། \nཁྱེད་ཀྱི་སྐུད་མེད་འཕྲིན་ཐུང་འཁྱེར་མཁན་དེའི་ངོ་བོ་ནི་ \'&amp;lt;your carrier&amp;gt; APN\'.་བ་བརྒྱུད་གཏན་འབེབས་བྱེད་ཐུབ། ཁྱེད་ཀྱིས་འདི་ཐེངས་གཅིག་ལ་བྱས་ན་འགྲིག </string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (དགོས་ངེས་རེད།):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY PORT (གདམ་ཁ་ཅན།): </string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (གདམ་ཁ་ཅན):</string>
   <!--receive_key_activity-->
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">གཏོང་ཡུལ།</string>
   <!--review_identities-->
@@ -239,7 +249,9 @@
   <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__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">ལྡེ་མིག་གི་ངོས་འཛིན་གཅིག་པའི་ད་ཡོད་སྡེ་ཚན་ཞིག་གམ་ཡང་ན་སྡེ་ཚན་གསར་བ་ཞིག་གི་སླད་དུ། རང་བཞིན་ནས་ལྡེ་མིག་བརྗེ་ལེན་དེ་འགྲུབ་པ་བྱོས།</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">དུས་བརྒལ་གྱི་དབར་དྲན་ཐོ་ནས་གསང་ཚིག་བརྗེད། </string>
   <string name="preferences__timeout_passphrase">གསང་ཚིག་གི་དུས་ཚོད་ཡོལ་འདུག</string>
@@ -250,11 +262,6 @@
   <string name="preferences__manage_configured_identity_keys">སྡེབ་སྒྲིག་ཟིན་པའི་ངོས་འཛིན་ལྡེ་མིག་དོ་དམ་བྱོས། </string>
   <string name="preferences__notifications">བརྡ་གཏོང་།</string>
   <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__change_notification_blink_pattern">LED རྒྱན་རིས་ཀྱི་བརྡ་གཏོང་བརྗེས།</string>
-  <string name="preferences__pref_led_blink_dialogtitle">LED ཡི་བཀོད་རིས་དེ་འདེམས། </string>
-  <string name="preferences__select_led_color">LED ཡི་ཚོན་མདོག་དེ་འདེམས། </string>
   <string name="preferences__vibrate"> འདར་བཅུག</string>
   <string name="preferences__also_vibrate_when_notified">བརྡ་གཏོང་སྐབས་འདར་བཅུག</string>
   <string name="preferences__minutes">སྐར་མ།</string>
@@ -269,11 +276,12 @@
   <string name="preferences__normal">སྤྱིར་བཏང་། </string>
   <string name="preferences__slow">དལ་བོ། </string>
   <string name="preferences__custom">ཡུལ་སྲོལ། </string>
+  <string name="preferences__passphrase">གསང་ཚིག</string>
   <string name="preferences__mmsc_url_required">MMSC URL(དགོས་ངེས་ཅན) </string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (གདམ་ཀ་ཅན) </string>
   <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (གདམ་ཀ་ཅན) </string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ཁྱེད་ཀྱིས་གཏོང་བའི་འཕྲིན་ཐུང་རེ་རེར་སྙན་ཐོ་སྐྱེལ་བའི་རེ་སྐུལ་བྱོས། </string>
   <string name="preferences__sms_delivery_reports">སྣ་མང་བརྒྱུད་ལམ་ཅན་གྱི་འཕྲིན་ཐུང་གིས་སྙན་ཐོ་སྐྱེལ། </string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ཁྱེད་ཀྱིས་གཏོང་བའི་འཕྲིན་ཐུང་རེ་རེར་སྙན་ཐོ་སྐྱེལ་བའི་རེ་སྐུལ་བྱོས། </string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">གླེང་མོལ་གྱི་སྐུད་པའི་དམིགས་བསལ་རིང་ཚད་རྫོགས་མཚམས། རང་བཞིན་ནས་འཕྲིན་ཐུང་རྙིང་པ་དག་བསུབ་འགྲོ་གི་རེད། </string>
   <string name="preferences__delete_old_messages">འཕྲིན་ཐུང་རྙིང་པ་གསུབ། </string>
   <string name="preferences__storage">ཉར་ས། </string>
@@ -306,9 +314,7 @@
   <string name="conversation_list__menu_search">འཚོལ།</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">ཉེན་སྲུང་།</string>
-  <string name="conversation_secure_verified__menu_verify_session">གླེང་མོལ་ཁུངས་སྐྱེལ་བྱོས། </string>
   <string name="conversation_secure_verified__menu_verify_recipient">འཕྲིན་ཐུང་འབྱོར་ཡུལ་དེ་ཁུངས་སྐྱེལ་བྱོས། </string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">བདེ་འཇགས་གླེང་མོལ་མཚམས་ཞོག </string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">ཟུར་སྣོན་ཞོག </string>
   <string name="conversation__menu_delete_thread">འཕྲིན་ཐུང་སྐུད་རིམ་གསུབ།</string>
@@ -323,7 +329,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">འཕྲིན་ཐུང་གསར་པ།</string>
   <string name="text_secure_normal__menu_settings">སྒྲིག་བཟོ།</string>
-  <string name="text_secure_normal__menu_clear_passphrase">གསང་ཚིག་མེད་པ་བཟོས།</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">ཁུངས་སྐྱེལ་བྱས་ཟིན།</string>
   <!--EOF-->
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 79aeb411e5..0a8585940a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -7,12 +7,18 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Aktuálně: %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Před manipulací s klíči musíte zadat své heslo</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Dosud nemáte nastaveno své heslo</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Dosud nemáte nastavené heslo</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">zpráv na konverzaci</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Vymazat všechny staré zprávy?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Opravdu chcete všechny konverzace zkrátit na posledních %s zpráv?</string>
   <string name="ApplicationPreferencesActivity_delete">Vymazat</string>
   <string name="ApplicationPreferencesActivity_my">Já</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktivovat šifrování lokálně uložených zpráv?</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nVarování: Tímto znemožníte šifrování všech uložených zpráv a klíčů. Vaše komunikace\nbude i nadále šifrována, ale bude si ji moci přečíst kdokoliv s fyzickým přístupem\nk vašemu zařízení.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivovat</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Rušení registrace...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Probíháhá zrušení datové komunikace</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba při připojování k serveru!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Foto</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -25,6 +31,7 @@
   <string name="ConversationItem_saving_attachment">Ukládám přílohu</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Ukládám přílohu na SD kartu..</string>
   <string name="ConversationItem_save_to_sd_card">Uložit na SD kartu?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Tato média byla uložena v zašifrované databázi. Verze, kterou uložíte na SD kartu, zašifrovaná nebude. Opravdu chcete pokračovat?</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Chyba při ukládání přílohy na SD kartu!</string>
   <string name="ConversationItem_success_exclamation">Úspěšně dokončeno!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Nedaří se zapisovat na SD kartu!</string>
@@ -36,11 +43,12 @@
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Zahájit šifrovanou komunikaci?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Zahájit šifrovanou komunikaci s %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Přerušit potvrzení šifrované komunikace</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Opravdu už nechcete komunikaci šifrovat?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Potvrdit ukončení zabezpečené relace</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Opravdu chcete ukončit tuto zabezpečenou relaci?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Vymazat potvrzení vlákna</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Opravdu chcete zcela vymazat tuto konverzaci?</string>
   <string name="ConversationActivity_add_attachment">Přidat přílohu</string>
+  <string name="ConversationActivity_select_contact_info">Vybrat informace o kontaktu</string>
   <string name="ConversationActivity_compose_message">Napište zprávu</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Omlouváme se, ale došlo k chybě při zpracování přílohy</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Omlouváme se, ale zvolený video soubor je příliš velký.</string>
@@ -57,42 +65,58 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti zprávy</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Odesilatel: %1$s\nPřenos: %2$s\nOdesláno/Obdrženo:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Odesílatel: %1$s\nTyp zprávy: %2$s\nOdesláno: %3$s\nPřijato: %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Potvrdit výmaz zpráv</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Opravdu chcete trvale vymazat tyto zprávy?</string>
   <!--ConversationListAdapter-->
-  <string name="ConversationListAdapter_key_exchange_message">Předání klíčů...</string>
+  <string name="ConversationListAdapter_key_exchange_message">Předávání klíčů...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Vymazat konverace?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Opravdu chcete vymazat VŠECHNY označené konverzace?</string>
   <string name="ConversationListFragment_deleting">Mažu</string>
   <string name="ConversationListFragment_deleting_selected_threads">Mažu označené konverzace...</string>
   <!--ConversationListItem-->
-  <string name="ConversationListItem_key_exchange_message">Předání klíčů...</string>
+  <string name="ConversationListItem_key_exchange_message">Předávání klíčů...</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportovat na SD kartu?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Tímto\nexportujete šifrované klíče, nastavení a zprávy na SD kartu.</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Tímto exportujete šifrované klíče, nastavení a zprávy na SD kartu.</string>
   <string name="ExportFragment_export">Export</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportovat prostý text na SD kartu?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Varování: Tímto exportujete obsah vašich zpráv v TextSecure v nezašifrovaném formátu na SD kartu.</string>
   <string name="ExportFragment_cancel">Storno</string>
   <string name="ExportFragment_exporting">Exportuji</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportování prostého textu na SD kartu...</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Chyba: Nelze zapisovat na SD kartu!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Chyba při zápisu na SD kartu.</string>
   <string name="ExportFragment_success">Úspěšně dokončeno!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportování zašifrovaných klíčů, nastavení a zpráv...</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importovat všechny SMSky v telefonu</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Tímto importujete zprávy z výchozí systémové databáze SMS do TextSecure. Pokud\njste už databázi někdy importovali, některé zprávy se mohou objevit vícekrát.</string>
   <string name="ImportFragment_import">Import</string>
   <string name="ImportFragment_cancel">Storno</string>
   <string name="ImportFragment_restore_encrypted_backup">Obnovit šifrovanou zálohu?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nObnova zašifrované zálohy zcela nahradí vaše současné klíče, nastavení a zprávy. Ztratíte všechny nezálohované informace ve vaší současné instalaci TextSecure.</string>
   <string name="ImportFragment_restore">Obnovení</string>
   <string name="ImportFragment_import_plaintext_backup">Importovat zálohu ve formě prostého textu?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Tímto importujete zprávy z nešifrované zálohy. Pokud jste již někdy\ntuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string>
   <string name="ImportFragment_importing">Importuji</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Impor zálohy ve formě prostého textu...</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Import zálohy ve formě prostého textu...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nenalezena záloha ve formě prostého textu!</string>
   <string name="ImportFragment_error_importing_backup">Chyba při importování zálohy!</string>
   <string name="ImportFragment_import_complete">Import dokončen!</string>
   <string name="ImportFragment_restoring">Obnovuji</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Obnovování zašifrované zálohy...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Žádná zašifrovaná záloha nebyla nalezena!</string>
+  <string name="ImportFragment_restore_complete">Obnova dokončena!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Klíč při snímání nebyl nalezen!</string>
   <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Není dostupné žádné připojení ke stahování MMS, zkuste to znovu později</string>
   <string name="MmsDownloader_error_storing_mms">Chyba při ukládání MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Chyba při připojování k poskytovateli MMS</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Chyba při čtení nastavení MMS</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimediální zpráva</string>
   <!--PassphraseChangeActivity-->
@@ -104,13 +128,54 @@
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Chybné heslo!</string>
   <!--PromptMmsActivity-->
+  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Musíte zadat URL MMSC vašeho operátora.</string>
   <string name="PromptMmsActivity_mms_settings_updated">Nastavení MMS aktualizováno</string>
+  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Tyto hodnoty můžete kdykoliv změnit v nastavení TextSecure.</string>
   <!--ReceiveKeyActivity-->
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis na tomto předání je jiný, než jaký jste od tohoto kontaktu obdrželi dříve. To může\nznamenat, že se někdo pokouší zachytit vaši konverzaci, nebo jen že si váš kontakt\npřeinstaloval TextSecure a má teď nový identifikační klíč.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Podpis na tomto předání klíčů je ověřen, ale nemáte nastaveno automatické dokončování předání.</string>
+  <string name="ReceiveKeyActivity_processing">Probíhá zpracování</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Probíhá předání klíčů...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Připojení pomocí TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Zvolte svou zemi</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Zadejte kód\nvaší země</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Zadejte vaše\ntelefonní číslo</string>
+  <string name="RegistrationActivity_invalid_number">Neplatné číslo</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Zadané číslo (%s) je neplatné</string>
+  <string name="RegistrationActivity_unsupported">Nepodporováno</string>
+  <string name="RegistrationActivity_continue">Pokračovat</string>
+  <string name="RegistrationActivity_edit">Upravit</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Možné problémy</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Probíhá ověření čísla</string>
+  <string name="RegistrationProgressActivity_edit_s">Upravit %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registrace dokončena!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Možné problémy.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Nejdříve zadejte obdržený kód...</string>
+  <string name="RegistrationProgressActivity_connecting">Probíhá připojování</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Probíhá připojení pro ověření...</string>
+  <string name="RegistrationProgressActivity_network_error">Chyba sítě!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Připojení se nezdařilo. Zkontrolujte prosím připojení k síti a zkuste to znovu.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Ověření se nezdařilo!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Ověřovací kód, který jste odeslali, je nesprávný. Zkuste to prosím znovu.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Příliš mnoho pokusů</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Nesprávný ověřovací kód byl odeslán příliš mnohokrát. Před dalším pokusem prosím vyčkejte jednu minutu.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Probíhá požadavek na hovor</string>
+  <string name="RegistrationProgressActivity_server_error">Chyba serveru</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Příliš mnoho požadavků!</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registrace byla dokončena</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registrace TextSecure byla úspěšně dokončena</string>
+  <string name="RegistrationService_registration_error">Chyba registrace</string>
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nemáte identifikační klíč.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Příjemce nemá identifikační klíč.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Příjemce nemá identifikační klíč!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Nasnímejte cizí klíč pro srovnání</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Nasnímat cizí klíč pro srovnání</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Klíč byl nasnímán</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROVÁNÍ, nasnímaný klíč NENÍ SPRÁVNÝ! Zkontrolujte prosím textový otisk.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NEověřeno!</string>
@@ -118,36 +183,48 @@
   <string name="VerifyIdentityActivity_verified_exclamation">Ověřeno!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Nemáte identifikační klíč!</string>
   <!--VerifyKeysActivity-->
+  <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Nechat si naskenovat otisk</string>
+  <string name="VerifyKeysActivity_scan_their_fingerprint">Naskenovat jejich otisk</string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">VAROVÁNÍ, nasnímaný klíč NENÍ SPRÁVNÝ! Zkontrolujte prosím textový otisk.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">NEověřeno!</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Jejich klíč je správný. </string>
   <string name="VerifyKeysActivity_verified_exclamation">Ověřeno!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Nemáte identifikační klíč.</string>
   <string name="ViewIdentityActivity_scan_to_compare">Nasnímej a porovnej</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Nechat se naskenovat k porovnání</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">UPOZORNĚNÍ: naskenovaný klíč nesouhlasí</string>
   <string name="ViewIdentityActivity_not_verified_exclamation">NEověřeno!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Nasnímané klíče souhlasí!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Ověřeno!</string>
   <string name="ViewIdentityActivity_identity_fingerprint">Identifikační otisk</string>
   <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Tomuto příjemci jste již odeslali žádost o zahájení konverzace, opravdu chcete poslat další? Tato žádost zruší platnost předchozí.</string>
   <string name="KeyExchangeInitiator_send">Odeslat</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Chybně zašifrovaná zpráva...</string>
   <string name="MessageDisplayHelper_decrypting_please_wait">Dešifruji, prosím čekejte...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Zpráva byla zašifrována pro neexistující komunikaci</string>
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Kontaktuji MMS server...</string>
   <string name="MmsDatabase_downloading_mms">Stahuji MMS...</string>
   <string name="MmsDatabase_mms_download_failed">Stažení MMS se nepodařilo!</string>
   <string name="MmsDatabase_downloading">Stahuji...</string>
+  <string name="MmsDatabase_mms_pending_download">Aby mohlo stahování pokračovat, klepněte a vyplňte nastavení MMS.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dešifruji MMS, čekejte prosím...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Chybně zašifrovaná MMS ...</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS zpráva byla zašifrována pro neexistující komunikaci</string>
   <!--MmsSender-->
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">V současnosti nelze MMS zprávu odeslat</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Probíhá import</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importuji textové zprávy</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure heslo je v krátkodobé paměti</string>
-  <string name="KeyCachingService_passphrase_cached">Heslo v krátkodobé paměti</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Stisknutím otevřete.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Dotykem otevřete nebo stisknutím zámku uzavřete.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure je odemčený</string>
+  <string name="KeyCachingService_lock">Uzamčeno přístupovým heslem</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d nových zpráv</string>
   <string name="MessageNotifier_most_recent_from_s">Poslední od: %s</string>
@@ -168,7 +245,11 @@
   <string name="ViewLocalIdentityActivity_continue">Pokračovat</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">V této chvíli není možné poslat SMS. Ta bude odeslána jakmile bude služba operátora opět dostupná.</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Omlouváme se, ale TextSecure zatím nepodporuje možnost rychlé odpovědi</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">Obdrželi jste zprávu od někoho, kdo používá TextSecure. Chcete zahájit šifrovanou komunikaci?</string>
+  <string name="auto_initiate_activity__initiate_exchange">Zahájit předání</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">STARÉ HESLO</string>
   <string name="change_passphrase_activity__new_passphrase">NOVÉ HESLO</string>
@@ -176,12 +257,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Žádný kontakt</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vybrat</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Žádné nedávné hovory</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Psaní zprávy</string>
   <string name="conversation_activity__send">Odeslat</string>
   <string name="conversation_activity__remove">Odebrat</string>
   <!--conversation_item_sent-->
@@ -192,8 +273,10 @@
   <string name="conversation_item_received__downloading">Stahuji</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Hromadný výběr</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Načítám země...</string>
+  <string name="country_selection_fragment__search">Hledat</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">Prosím vyberte heslo, které bude použito k lokálnímu šifrování zpráv.\n\nMělo by být delší a obtížně uhodnutelné.</string>
   <string name="create_passphrase_activity__passphrase">HESLO:</string>
   <string name="create_passphrase_activity__repeat">ZNOVU:</string>
   <string name="create_passphrase_activity__continue">Pokračovat</string>
@@ -207,22 +290,46 @@
   <string name="database_migration_activity__importing">IMPORTUJI</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aktualizuji databázi...</string>
+  <string name="export_fragment__export_encrypted_backup">Export šifrované zálohy</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportovat zašifrovanou zálohu na SD kartu.</string>
+  <string name="export_fragment__export_plaintext_backup">Export nezašifrované zálohy</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportovat nezašifrovanou zálohu kompatibilní s \"SMSBackup And Restore\" na SD kartu</string>
+  <string name="import_fragment__import_system_sms_database">Import systémové databáze SMS</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importovat databázi\nz výchozí aplikace pro SMS a MMS.</string>
+  <string name="import_fragment__import_encrypted_backup">Import zašifrované zálohy</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nObnovit dříve exportovanou zašifrovanou zálohu TextSecure.</string>
   <string name="import_fragment__import_plaintext_backup">Importovat zálohu ve formě prostého textu</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImportovat nešifrovanou zálohu kompatibilní s \"SMSBackup And Restore\".</string>
   <string name="local_identity__regenerate_key">Vygenerovat klíč</string>
   <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">Váš přístroj vyžaduje manuální nastavení MMS.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">HESLO (TEXTSECURE)</string>
   <string name="prompt_passphrase_activity__unlock">Odemknout</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure vyžaduje informace o nastavení MMS, aby mohly být média a skupinové zprávy doručovány. Váš přístroj tyto informace neposkytuje, což se stává u zamknutých nebo jinak upravených přístrojů.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pro odesílání médií a skupinových zpráv klepněte na OK a vyplňte požadované informace. Nastavení MMS pro vašeho operátora lze většinou zjistit hledáním \"*váš operátor* APN\". Toto je je třeba udělat pouze jednou.</string>
+  <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (POVINNÉ):</string>
+  <string name="prompt_mms_activity__mms_proxy_host_optional">HOSTITEL PROXY MMS (VOLITELNÉ):</string>
+  <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (VOLITELNÉ):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Hotovo</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__verify">Ověřit</string>
+  <string name="registration_progress_activity__edit_number">Upravit číslo</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzovací SMS zprávy.</string>
+  <string name="registration_progress_activity__connecting">Probíhá připojování...</string>
+  <string name="registration_progress_activity__generating_keys">Probíhá generování klíčů...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Komu</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Aktuálně nemáte žádné cizí identifikační klíče v databázi.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Jejich identita (čtou)</string>
-  <string name="verify_identity_activity__your_identity_you_read">Vaše identita (čteš):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Vaše identita (čtete):</string>
   <!--verify_import_identity_activity-->
   <string name="verify_import_identity_activity__identity_name_n">Jméno identity:\n</string>
   <string name="verify_import_identity_activity__imported_identity_n">Importované identity:\n</string>
@@ -230,7 +337,7 @@
   <string name="verify_import_identity_activity__compare">Porovnat</string>
   <!--verify_keys_activity-->
   <string name="verify_keys_activity__they_read_this">Čtou toto:</string>
-  <string name="verify_keys_activity__you_read_this">Čteš toto:</string>
+  <string name="verify_keys_activity__you_read_this">Čtete toto:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Vytvořit heslo</string>
   <string name="AndroidManifest__enter_passphrase">Zadat heslo</string>
@@ -244,12 +351,15 @@
   <string name="AndroidManifest__complete_key_exchange">Dokončení předání klíčů</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
+  <string name="arrays__my_identity_key">Můj identifikační klíč</string>
+  <string name="arrays__contact_keys">Klíče kontaktů</string>
   <!--preferences.xml-->
   <string name="preferences__general">Obecné</string>
   <string name="preferences__pref_all_sms_title">Použít pro všechny SMS</string>
   <string name="preferences__pref_all_mms_title">Použít pro všechny MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Používat TextSecure k prohlížení a uchování všech SMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Používat TextSecure k prohlížení a uchování všech MMS</string>
+  <string name="preferences__replace_smiley_with_enter_key">Nahradit klávesu emotikon klávesou enter</string>
   <string name="preferences__pref_enter_sends_title">Klávesa \'Enter\' odesílá</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Stisk tlačítka \'enter\' na klávesnici odešle zprávu</string>
   <string name="preferences__display_settings">Nastavení zobrazení</string>
@@ -257,9 +367,11 @@
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Zvolte osobu ze svého adresáře</string>
   <string name="preferences__change_passphrase">Změnit heslo</string>
   <string name="preferences__change_my_passphrase">Změnit své heslo</string>
-  <string name="preferences__complete_key_exchanges">Dokončení předání klíčů</string>
+  <string name="preferences__complete_key_exchanges">Dokončovat předání klíčů</string>
   <string name="preferences__disable_passphrase">Deaktivovat heslo</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Deaktivovat lokální šifrování zpráv a klíčů</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automaticky dokončovat předání klíčů u nových komunikací a u existujících komunikací se stejným identifikačním klíčem</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Po určitém čase zapomenout heslo</string>
   <string name="preferences__timeout_passphrase">Vypršení hesla</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Volba zapomenutí hesla</string>
   <string name="preferences__pref_timeout_interval_title">Limit čekání</string>
@@ -269,14 +381,15 @@
   <string name="preferences__manage_identity_keys">Správa identifikačních klíčů</string>
   <string name="preferences__manage_configured_identity_keys">Spravovat nastavené identifikační klíče</string>
   <string name="preferences__notifications">Upozornění</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Zobrazovat upozornění v oznamovacím panelu</string>
   <string name="preferences__led_color">Barva LED</string>
-  <string name="preferences__change_notification_led_color">Změnit barvu upozorňující LED</string>
-  <string name="preferences__pref_led_blink_title">Způsob blikání LED</string>
-  <string name="preferences__change_notification_blink_pattern">Změnit způsob blikání LED</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Vyber způsob blikání LED</string>
-  <string name="preferences__select_led_color">Zvolit barvu LED</string>
+  <string name="preferences__pref_led_blink_title">Schéma blikání LED</string>
   <string name="preferences__sound">Zvuk</string>
+  <string name="preferences__change_notification_sound">Změnit zvuk upozornění</string>
+  <string name="preferences__inthread_notifications">Upozornění v konverzaci</string>
+  <string name="preferences__play_inthread_notifications">Upozornit i v případě, že se právě nacházite v aktivní konverzaci</string>
   <string name="preferences__vibrate">Vibrovat</string>
+  <string name="preferences__also_vibrate_when_notified">Při upozornění také vibrovat</string>
   <string name="preferences__minutes">minut</string>
   <string name="preferences__hours">hodin</string>
   <string name="preferences__green">Zelená</string>
@@ -291,7 +404,15 @@
   <string name="preferences__custom">Vlastní</string>
   <string name="preferences__advanced">Rozšířené možnosti</string>
   <string name="preferences__passphrase">Heslo</string>
+  <string name="preferences__advanced_mms_access_point_names">Nastavení MMS</string>
+  <string name="preferences__enable_manual_mms">Povolit manuální MMS</string>
+  <string name="preferences__override_system_mms_settings">Zadat vlastní nastavení MMS</string>
+  <string name="preferences__mmsc_url_required">URL MMSC (povinné)</string>
+  <string name="preferences__mms_proxy_host_optional">Hostitel proxy MMS (volitelné)</string>
+  <string name="preferences__mms_proxy_port_optional">Port proxy MMS (volitelné)</string>
   <string name="preferences__sms_delivery_reports">Doručenky SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">U každé odeslané zprávy požadovat potvrzení o doručení</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticky mazat starší zprávy jakmile konverzace přesáhne určitou délku</string>
   <string name="preferences__delete_old_messages">Vymazat staré zprávy</string>
   <string name="preferences__storage">Úložiště</string>
   <string name="preferences__conversation_length_limit">Limit délky konverzací</string>
@@ -303,6 +424,8 @@
   <string name="preferences__theme">Vzhled</string>
   <string name="preferences__default">Výchozí</string>
   <string name="preferences__language">Jazyk</string>
+  <string name="preferences__make_default_sms_app">Nastavit jako výchozí aplikaci pro SMS</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Učinit TextSecure na tomto systému výchozí aplikací pro SMS a MMS</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -320,6 +443,7 @@
   <string name="conversation_context__menu_copy_text">Kopírovat text</string>
   <string name="conversation_context__menu_delete_message">Vymazat zprávu</string>
   <string name="conversation_context__menu_forward_message">Přeposlat zprávu</string>
+  <string name="conversation_context__menu_resend_message">Znovu poslat zprávu</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Zahájit šifrovanou konverzaci</string>
   <!--conversation_list_batch-->
@@ -327,13 +451,15 @@
   <string name="conversation_list_batch__menu_select_all">Vybrat vše</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Hledat</string>
+  <string name="conversation_list__drawer_open">Otevřít navigační lištu</string>
+  <string name="conversation_list__drawer_close">Zavřít navigační lištu</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Zabezpečení</string>
-  <string name="conversation_secure_verified__menu_verify_session">Ověřit konverzaci</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Ověřit příjemce</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Přerušit zabezpečenou konverzaci</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Ukončit zabezpečenou relaci</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Přidat přílohu</string>
+  <string name="conversation__menu_add_contact_info">Přidat informace o kontaktu</string>
   <string name="conversation__menu_delete_thread">Vymazt konverzaci</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Seznam příjemců</string>
@@ -342,13 +468,13 @@
   <string name="conversation_group_options__broadcast">Rozeslat</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Porovnat</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Nechat se naskenovat k porovnání</string>
   <string name="key_scanning__menu_scan_to_compare">Nasnímej a porovnej</string>
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">Odemknout</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nová zpráva</string>
   <string name="text_secure_normal__menu_settings">Nastavení</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Zapomenout heslo</string>
   <string name="text_secure_normal__mark_all_as_read">Označit jako přečtené</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Ověřeno</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c2f8288071..38b6626062 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -33,15 +33,11 @@
   <string name="ConversationItem_success_exclamation">Fuldført!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Kunne ikke skrive til SD-kort!</string>
   <string name="ConversationItem_view_secure_media_question">Vis sikret data?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Data er gemt i en krypteret database. For at se dem i et eksternt program kræves det, at disse midlertidigt dekrypteres og gemmes ukrypteret. Vil du fortsætte?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Udvekslingsnøgle er modtaget og behandlet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fejl! Modtog en gammel udvekslingsnøgle.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Udvekslingsnøgle er modtaget. Klik for at fortsætte</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Opret en sikker session?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Opret en sikker session med %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Bekræft! Afbryd sikker session</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Vil du afbryde den sikre session?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Bekræft! Slet tråd</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Vil du slette denne samtale permanent?</string>
   <string name="ConversationActivity_add_attachment">Vedhæft fil.</string>
@@ -54,7 +50,6 @@
   <string name="ConversationActivity_forward_message_prefix">Videresend beskeden</string>
   <string name="ConversationActivity_group_conversation_recipients">Modtagere i gruppen</string>
   <string name="ConversationActivity_group_conversation">Gruppe beskeder</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d modtagere i gruppen</string>
   <string name="ConversationActivity_saving_draft">Gemmer kladde...</string>
   <string name="ConversationActivity_invalid_recipient">Ugyldig modtager!</string>
   <string name="ConversationActivity_calls_not_supported">Opkald er ikke understøttet</string>
@@ -87,6 +82,7 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">Fejl! Kunne ikke skrive til SD-kort!</string>
   <string name="ExportFragment_success">Fuldført!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Eksporterer krypterede nøgler, indstillinger og beskeder...</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importer systemets SMS database?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Dette vil importere beskeder fra systemets standard SMS database til TextSecure.</string>
@@ -96,7 +92,6 @@
   <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_restore">Genopret</string>
   <string name="ImportFragment_import_plaintext_backup">Importer klartekst backup?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dette vil importere beskeder fra en klartekst backup.</string>
   <string name="ImportFragment_importing">Importerer</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importerer klartekst backup...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Der blev ikke fundet en klartekst backup!</string>
@@ -130,6 +125,13 @@
   <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>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">Fortsæt</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Du har ingen ID-nøgle.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Modtageren har ingen ID-nøgle.</string>
@@ -180,8 +182,6 @@
   <string name="ApplicationMigrationService_import_in_progress">Henter...</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerer SMS beskeder</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure kodeord er gemt</string>
-  <string name="KeyCachingService_passphrase_cached">Kodeord er gemt</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nye beskeder</string>
   <string name="MessageNotifier_most_recent_from_s">Sidst modtaget fra: %s</string>
@@ -202,6 +202,7 @@
   <string name="ViewLocalIdentityActivity_continue">Fortsæt</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Det er ikke muligt at sende en SMS besked nu. Den vil blive sendt når tjenesten bliver tilgængelig igen.</string>
+  <!--QuickResponseService-->
   <!--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">Du har modtaget en besked fra en som understøtter TextSecure krypterede sessioner. Ønsker du at initiere en sikker session?</string>
   <string name="auto_initiate_activity__initiate_exchange">Start nøgleudveksling</string>
@@ -212,12 +213,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vælg</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Ingen nye samtaler.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Skriv besked</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slet</string>
   <!--conversation_item_sent-->
@@ -228,8 +229,9 @@
   <string name="conversation_item_received__downloading">Henter</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Batch-valg</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__search">Søg</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">Vælg et kodeord som skal bruges til kryptering af dine lokale data. Det bør være et svært kodeord.</string>
   <string name="create_passphrase_activity__passphrase">Kodeord:</string>
   <string name="create_passphrase_activity__repeat">Gentag:</string>
   <string name="create_passphrase_activity__continue">Fortsæt</string>
@@ -264,6 +266,9 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (IKKE PÅKRÆVET):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Udført</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">Til</string>
   <!--review_identities-->
@@ -322,12 +327,6 @@
   <string name="preferences__manage_configured_identity_keys">Administrer konfigurerede ID-nøgler</string>
   <string name="preferences__notifications">Notifikation</string>
   <string name="preferences__display_message_notifications_in_status_bar">Vis notifikation om beskeder i status feltet</string>
-  <string name="preferences__led_color">LED farve</string>
-  <string name="preferences__change_notification_led_color">Ændre farve på LED advarsel</string>
-  <string name="preferences__pref_led_blink_title">LED blinkemønster</string>
-  <string name="preferences__change_notification_blink_pattern">Ændre LED-notifikations blinkemønster</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Vælg LED blinkemønster</string>
-  <string name="preferences__select_led_color">Vælg LED farve</string>
   <string name="preferences__sound">Lyd</string>
   <string name="preferences__vibrate">Vibrér</string>
   <string name="preferences__also_vibrate_when_notified">Vibrér også ved tilbagemelding</string>
@@ -348,8 +347,8 @@
   <string name="preferences__mmsc_url_required">MMSC URL (påkrævet)</string>
   <string name="preferences__mms_proxy_host_optional">MMS proxy host (valgfrit)</string>
   <string name="preferences__mms_proxy_port_optional">MMS proxy port (valgfrit)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Bed om en leveringsrapport for hver SMS-besked du sender</string>
   <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Bed om en leveringsrapport for hver SMS-besked du sender</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slet gamle beskeder automatisk når en besked tråd overskrider en specificeret størrelse</string>
   <string name="preferences__delete_old_messages">Slet gamle beskeder</string>
   <string name="preferences__storage">Lager</string>
@@ -388,9 +387,7 @@
   <string name="conversation_list__menu_search">Søg</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sikkerhed</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verificer session</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verificer modtager</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Afbryd sikker session</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Vedhæft fil</string>
   <string name="conversation__menu_delete_thread">Slet tråd</string>
@@ -408,7 +405,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ny Besked</string>
   <string name="text_secure_normal__menu_settings">Indstillinger</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Slet kodeord</string>
   <string name="text_secure_normal__mark_all_as_read">Marker alle som læst</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Bekræftet</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b487ad8269..4d11f4f3bc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -16,6 +16,12 @@
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Speicherverschlüsselung deaktivieren?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nWarnung: Dies wird die Speicherverschlüsselung für alle Nachrichten und Schlüssel deaktivieren. Ihre verschlüsselten Sessions werden weiterhin funktionieren, aber jemand mit physischem Zugriff auf Ihr Gerät kann auch auf die Sessions zugreifen.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Abmeldung...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Melde mich von Kommunikation über die Datenverbindung ab</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden zum Server!</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Sie sind nicht beim Push Dienst regestriert...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Aktualisiere Verzeichnis</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Aktualisiere Push Verzeichnis...</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -33,19 +39,23 @@
   <string name="ConversationItem_success_exclamation">Erfolgreich!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Es kann nicht auf die SD-Karte geschrieben werden!</string>
   <string name="ConversationItem_view_secure_media_question">Sichere Datei anzeigen?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Datei wurde in einer verschlüsselten Datenbank gespeichert. Damit die Datei mit einem externen Anzeigeprogramm geöffnet werden kann, muss die Datei zuvor entschlüsselt und temporär im Speicher abgelegt werden. Sind Sie sicher, dass Sie fortfahren möchten?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Diese Datei wurde in einer verschlüsselten Datenbank gespeichert. Damit die Datei mit einem anderen Anzeigeprogramm geöffnet werden kann, muss die Datei zuvor entschlüsselt und vorübergehend im Speicher abgelegt werden. Sind Sie sicher, dass Sie fortfahren wollen?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Schlüsselaustausch Nachricht empfangen und verarbeitet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fehler: Es wurde eine abgelaufene Schlüsselaustausch-Nachricht empfangen.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Schlüsselaustausch Nachricht empfangen, zum Verarbeiten bitte klicken.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Nachricht zum Schlüssel-Austausch empfangen, drücken um fort zu fahren.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Sie haben eine unverschlüsselte SMS während einer sicheren Sitzung empfangen. Wenn Ihr Gegenüber keine Verschlüsselung mehr aktiviert hat, wird Ihr nächste Nachricht von ihm nicht lesbar sein. Drücken um sichere Session zu beenden. </string>
+  <string name="ConversationItem_group_action_left">%1$s hat die Gruppe verlassen.</string>
+  <string name="ConversationItem_group_action_joined">%1$s sind der Gruppe beigetreten.</string>
+  <string name="ConversationItem_group_action_modify">%1$s hat die Gruppe aktualisiert.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Soll eine sichere Sitzung aufgebaut werden?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Eine sichere Sitzung mit %s aufbauen?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Bestätigung: Sichere Sitzung beenden</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Wollen Sie die sichere Sitzung wirklich beenden?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Sichere Sitzung beenden bestätigen</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Wollen sie die sichere Sitzung wirklich beenden?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Bestätigung zum Löschen des Threads</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Sind Sie sicher, dass Sie diese Konversation unwiderruflich löschen möchten?</string>
   <string name="ConversationActivity_add_attachment">Anhang hinzufügen</string>
-  <string name="ConversationActivity_select_contact_info">Kontaktinfo wählen</string>
+  <string name="ConversationActivity_select_contact_info">Kontaktinformation auswählen</string>
   <string name="ConversationActivity_compose_message">Nachricht erstellen</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Leider ist ein Fehler beim Hinzufügen des Anhangs aufgetreten.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Das ausgewählte Video überschreitet leider die maximal mögliche Nachrichtengröße.</string>
@@ -55,11 +65,15 @@
   <string name="ConversationActivity_forward_message_prefix">Weiterleiten</string>
   <string name="ConversationActivity_group_conversation_recipients">Teilnehmer in Gruppengespräch</string>
   <string name="ConversationActivity_group_conversation">Gruppengespräch</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d Teilnehmer in Gruppe</string>
+  <string name="ConversationActivity_unnamed_group">Unbenannte Gruppe</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d Mitglieder</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 Mitglied</string>
   <string name="ConversationActivity_saving_draft">Entwurf speichern...</string>
   <string name="ConversationActivity_invalid_recipient">Ungültiger Empfänger!</string>
   <string name="ConversationActivity_calls_not_supported">Anrufe werden nicht unterstützt</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dieses Gerät scheint keine Wahlvorgänge zu unterstützen.</string>
+  <string name="ConversationActivity_leave_group">Gruppe verlassen?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Sind Sie sicher, dass Sie die Gruppe verlassen wollen?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s\nTransport: %2$s\nGesendet/Empfangen:%3$s</string>
@@ -87,17 +101,32 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Fehler, es war nicht möglich auf die\nSD-Karte zu schreiben!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Fehler beim Schreiben auf die SD-Karte.</string>
   <string name="ExportFragment_success">Erfolgreich!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportiere verschlüsselte Keys,\nEinstellungen und Nachrichten...</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Exportiere Schlüssel,\nEinstellungen und Nachrichten...</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Gruppe aktualisieren</string>
+  <string name="GroupCreateActivity_group_name_hint">Gruppen-Name</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Neue MMS Gruppe</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der nicht TextSecure Gruppen unterstützt, deshalb wird dies eine MMS Gruppe sein.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Sie sind nicht für Nachrichten über den  Datenkanal registriert, TextSecure Gruppen sind deshalb deaktiviert. </string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Die sind nicht der Besitzer dieser Gruppe, deshalb können Sie den Titel oder das Bild nicht bearbeiten.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Ein unerwarteter Fehler ist aufgetreten der das Erstellen der Gruppe verhindert hat.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Sie brauchen mindestens eine Person in Ihrer Gruppe.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Eines der Mitglieder Ihrer Gruppe hat eine Nummer die nicht richtig gelesen werden kann. Bitte beheben oder Kontakt entfernen und erneut versuchen.</string>
+  <string name="GroupCreateActivity_file_io_exception">Daten E/A Fehler, konnte temporäre Bild-Datei nicht erzeugen. </string>
+  <string name="GroupCreateActivity_avatar_content_description">Gruppen-Avatar</string>
+  <string name="GroupCreateActivity_menu_create_title">Gruppe erstellen</string>
+  <string name="GroupCreateActivity_creating_group">Erstelle %1$s...</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Soll die SMS-Systemdatenbank importiert werden?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Es werden jetzt die SMS von der Systemdatenbank in TextSecure importiert.\nWenn Sie dies schon einmal gemacht haben, werden doppelte Nachrichten erzeugt.</string>
   <string name="ImportFragment_import">Import</string>
   <string name="ImportFragment_cancel">Abbruch</string>
   <string name="ImportFragment_restore_encrypted_backup">Verschlüsselte Sicherung wiederherstellen?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nEine wiederhergestellte verschlüsselten Sicherung ersetzt Ihre bestehenden Keys, Einstellungen und\nNachrichten. Sie werden jegliche Informationen verlieren, die in Ihrer jetzigen TextSecure Installation sind,\naber nicht in der Sicherung.</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nDas Wiederherstellen einer verschlüsselten Sicherung ersetzt Ihre bestehenden Schlüssel, Einstellungen und\nNachrichten. Sie werden jegliche Informationen Ihrer jetzigen TextSecure Installation verlieren, die nicht auch\ndie Sicherung beinhaltet.</string>
   <string name="ImportFragment_restore">Wiederherstellen</string>
   <string name="ImportFragment_import_plaintext_backup">Klartext-Sicherung importieren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Es werden jetzt die SMS von der Systemdatenbank importiert.\nWenn Sie dies schon einmal gemacht haben, werden durch den erneuten Import doppelte Nachrichten erzeugt.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dies wird Nachrichten\naus einem Klartext-Backup importieren. Wenn Sie dies bereits gemacht haben,\nwird das zu doppelten Nachrichten führen.</string>
   <string name="ImportFragment_importing">Importiere</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importiere Klartext-Sicherung</string>
   <string name="ImportFragment_no_plaintext_backup_found">Keine Klartext-Sicherung gefunden!</string>
@@ -113,7 +142,7 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Keine Verbindung für MMS-Download verfügbar, versuchen Sie es später noch einmal ...</string>
   <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMSI</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fehler beim Verbinden zum MMS Provider...</string>
-  <string name="MmsDownloader_error_reading_mms_settings">Die Einstellungen des MMS-Anbieters konnten nicht gelesen werden...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Die MMS-Einstellungen Ihres Netz-Anbieters konnten nicht gelesen werden...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimedianachricht</string>
   <!--PassphraseChangeActivity-->
@@ -125,13 +154,64 @@
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Ungültiges Passwort!</string>
   <!--PromptMmsActivity-->
-  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Sie müssen eine MMSC URL für Ihren Provider angeben.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">MMS Einstellungen aktualisiert</string>
+  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Sie müssen eine MMSC URL für Ihren Netz-Anbieter angeben.</string>
+  <string name="PromptMmsActivity_mms_settings_updated">MMS-Einstellungen aktualisiert</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Sie können diese Werte jederzeit in den TextSecure Einstellungen ändern.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Die Signatur dieses Schlüsselaustauschs ist eine andere als die schon von diesem Kontakt erhaltenen.\nDas könnte bedeuten, dass jemand versucht, Ihr Gespräch abzufangen oder\nauch nur, dass dieser Kontakt TextSecure neu installiert hat und nun einen neuen Schlüssel benutzt.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Sie können diesen Kontakt überprüfen.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Die Signatur dieses Schlüsselaustauschs ist vertrauenswürdig, aber die Einstellung \'Schlüsselaustausch automatisch vervollständigen\' ist nicht aktiv.</string>
+  <string name="ReceiveKeyActivity_processing">Verarbeitung</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Führe Schlüssel-Austausch durch...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Verbinde mit TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Wähles Sie Ihr Land aus</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Sie müssen Ihren Länder-Code\nangeben</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Sie müssen Ihre Telefonnummer\nangeben</string>
+  <string name="RegistrationActivity_invalid_number">Ungültige Nummer</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Die Nummer, die Sie\nangegeben haben (%s) ist ungültig.</string>
+  <string name="RegistrationActivity_unsupported">Nicht unterstützt</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Entschuldigung,\ndieses Geräte unterstützt keine Nachrichten über den Datenkanal. Geräte die mit Android vor Version 4.0 laufen,\nmüssen einen Google Account eingerichtet haben. Geräte die mit Android 4.0 und neuer laufen\nbenötigen keinen Google Account, müssen aber die Play Store App installiert haben.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nEs wird jetzt überprüft ob die folgende Nummer zu diesem Geräte gehört:\n\n%s\n\n\nIst diese Nummer richtig oder wollen Sie sie bearbeiten bevor es weiter geht?</string>
+  <string name="RegistrationActivity_continue">Fortsetzen</string>
+  <string name="RegistrationActivity_edit">Bearbeiten</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Mögliche Probleme</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Überprüfe Nummer</string>
+  <string name="RegistrationProgressActivity_edit_s">%s bearbeiten</string>
+  <string name="RegistrationProgressActivity_registration_complete">Anmeldung abgeschlossen!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Mögliche Probleme.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Sie müssen den Code eingeben, den Sie zuvor empfangen haben...</string>
+  <string name="RegistrationProgressActivity_connecting">Verbinde</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Verbinde zur Überprüfung...</string>
+  <string name="RegistrationProgressActivity_network_error">Netzwerkfehler!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Konnte nicht verbinden. Bitte überprüfen Sie Ihre Verbindung und versuchen es dann erneut.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Überprüfung fehlgeschlagen!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Der Code, den Sie eingegeben haben, ist falsch. Bitte versuchen Sie es erneut.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Zu viele Versuche</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Sie haben zu viel falsche Codes eingegeben. Bitte warten Sie eine Minute und versuchen es dann erneut.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Fordere Anruf an</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Fordere Bestätigungs-Anruf an...</string>
+  <string name="RegistrationProgressActivity_server_error">Server Fehler</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Der Server hat einen Fehler festgestellt. Bitte versuchen Sie es erneut.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Zu viele Anfragen!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Sie haben vor Kurzem schon einen Anruf angefordert. Sie können in 20 Minuten einen Weiteren anfordern.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Überprüfe Code aus dem Anruf...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Anmeldung abgeschlossen</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Die Anmeldung bei TextSecure war erfolgreich.</string>
+  <string name="RegistrationService_registration_error">Fehler bei der Anmeldung</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Bei der Anmeldung bei TextSecure ist ein Fehler aufgetreten.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Fehlerhafte Schlüsselaustausch-Nachricht \nempfangen!\n</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nEs wurde eine Schlüsselaustausch-Nachricht für eine ungültige Protokoll-Version empfangen.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nNachricht mit unbekanntem Schlüssel empfangen. Klicken um fort zu fahren und ihn an zu zeigen.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Veränderte, aber unbekannte Identitäts-Information empfangen. Tippen um Identität zu bestätigen.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Sichere Sitzung beendet.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Gruppe verlassen...</string>
+  <string name="TheadRecord_secure_session_ended">Sichere Sitzung beendet.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen Schlüssel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Der Empfänger hat keinen Schlüssel.</string>
@@ -148,7 +228,7 @@
   <string name="VerifyKeysActivity_scan_their_fingerprint">Deren Fingerabdruck einlesen </string>
   <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ACHTUNG: Der gescannte Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Fingerabdruck des Schlüssels sorgfältig.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">NICHT verifiziert!</string>
-  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Dieser Schlüssel ist korrekt. Sie sollten auch Ihren eigenen Fingerabdruck einlesen lassen.</string>
+  <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">Dieser Schlüssel ist korrekt. Sie sollten auch Ihren eigenen Fingerabdruck scannen lassen.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Verifiziert!</string>
   <!--ViewIdentityActivity-->
   <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen persönlichen Schlüssel.</string>
@@ -172,7 +252,7 @@
   <string name="MmsDatabase_downloading_mms">MMS werden heruntergeladen...</string>
   <string name="MmsDatabase_mms_download_failed">MMS Download fehlgeschlagen!</string>
   <string name="MmsDatabase_downloading">Herunterladen...</string>
-  <string name="MmsDatabase_mms_pending_download">Antippen und MMS-Einstellungen konfigurieren um den Download fortzusetzen.</string>
+  <string name="MmsDatabase_mms_pending_download">Antippen und MMS-Einstellungen vornehmen um den Download fortzusetzen.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS wird entschlüsselt, bitte warten...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Fehlererhaft verschlüsselte MMS...</string>
@@ -183,8 +263,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Import läuft</string>
   <string name="ApplicationMigrationService_importing_text_messages">NachrichtenImport</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Passwort gecached</string>
-  <string name="KeyCachingService_passphrase_cached">Passwort gecached</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Berühren um zu öffnen.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Berühren um zu öffnen oder Schloss berühren um zu schließen.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure ist entsperrt</string>
+  <string name="KeyCachingService_lock">Mit Passphrase sperren</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d neue Nachrichten</string>
   <string name="MessageNotifier_most_recent_from_s">Letzte Nachricht von: %s</string>
@@ -198,7 +280,7 @@
   <!--ViewLocalIdentityActivity-->
   <string name="ViewLocalIdentityActivity_regenerating">Neuerzeugung...</string>
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Schlüssel wird\nneu erzeugt...</string>
-  <string name="ViewLocalIdentityActivity_regenerated">Schlüssel neu erzeugt!</string>
+  <string name="ViewLocalIdentityActivity_regenerated">Neu erzeugt!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Schlüssel zurücksetzen?</string>
   <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nVorsicht! Das Neuerzeugen des Schlüssels führt dazu, dass der jetzige Schlüssel permanent gelöscht wird.⏎\nSchon existierende Kontakte erhalten eine Warnung, wenn Sie neue Sitzungen mit Ihnen beginnen.⏎\nMöchten Sie dennoch fortfahren?</string>
   <string name="ViewLocalIdentityActivity_cancel">Abbruch</string>
@@ -217,12 +299,15 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Keine Kontakte.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Suche Kontakte...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Namen eingeben um zu filtern...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Auswählen für</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Keine letzten Anrufe</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Nachricht schreiben</string>
+  <string name="conversation_activity__type_message"><small>Sende eine Nachricht</small></string>
   <string name="conversation_activity__send">Senden</string>
   <string name="conversation_activity__remove">Löschen</string>
   <!--conversation_item_sent-->
@@ -233,12 +318,15 @@
   <string name="conversation_item_received__downloading">Herunterladen</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mehrfachauswahl</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Lade Länder...</string>
+  <string name="country_selection_fragment__search">Suchen</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">Bitte wählen Sie ein starkes Passwort aus, das dazu genutzt wird, Ihre Daten lokal zu verschlüsseln.</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">Wählen Sie eine Passphrase, wenn Sie Ihre Daten lokal verschlüsseln wollen.</string>
   <string name="create_passphrase_activity__passphrase">PASSWORT:</string>
   <string name="create_passphrase_activity__repeat">WIEDERHOLEN:</string>
   <string name="create_passphrase_activity__continue">Fortsetzen</string>
-  <string name="create_passphrase_activity__generating_secrets">GENERIERT SICHERHEITSSCHLÜSSEL</string>
+  <string name="create_passphrase_activity__generating_secrets">GENERIERE SICHERHEITSSCHLÜSSEL</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Möchten Sie Ihre vorhandenen Nachrichten in TextSecures verschlüsselte Datenbank importieren?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Die System-Datenbank des Geräts wird in keiner Weise verändert.</string>
@@ -251,13 +339,13 @@
   <string name="export_fragment__export_encrypted_backup">Exportiere verschlüsselte Sicherung</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportiere eine verschlüsselte\nSicherung auf die SD-Karte.</string>
   <string name="export_fragment__export_plaintext_backup">Exportiere Klartext-Sicherung</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportiert eine Klartext-Sicherung kompatibel mit \'SMSBackup And Restore\' auf die SD-Karte</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nExportiert ein Klartext-Backup kompatibel mit \'SMS Backup und Wiederherstellung\' auf die SD-Karte</string>
   <string name="import_fragment__import_system_sms_database">Importiere SMS-Systemdatenbank</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importiere die\nDatenbank der Standard Nachrichten-App des Geräts.</string>
   <string name="import_fragment__import_encrypted_backup">Importiere verschlüsselte Sicherung</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nWiederherstellen einer zuvor exportierten TextSecure Sicherung.</string>
   <string name="import_fragment__import_plaintext_backup">Importiere Klartext-Sicherung</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nImportiere eine Klartext-Sicherungdatei. Kompatibel mit \'SMSBackup And Restore\'</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nImportiere eine Klartext-Backupdatei. Kompatibel mit \'SMS Backup und Wiederherstellung\'</string>
   <string name="local_identity__regenerate_key">Schlüssel neu erstellen</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Für Ihr Telefon werden manuelle MMS-Einstellungen benötigt.</string>
@@ -265,17 +353,54 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE PASSWORT</string>
   <string name="prompt_passphrase_activity__unlock">Entsperren</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure benötigt MMS-Einstellungen um Medien- und Gruppennachrichten zu senden. Ihr Telefon stellt diese Informationen nicht zur Verfügung, was daran liegen kann, dass manche Geräte blockiert sind oder anderweitig restriktiv konfiguriert sind.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Um Medien- und Gruppennachrichten zu senden, bitte auf \"OK\" klicken und die Einstellungen ausfüllen. Die MMS-Einstellungen des Anbieters können gefunden werden, indem man nach dem \"APN\" des Anbieters sucht. Diese Operation muss nur einmal ausgeführt werden.</string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure benötigt MMS-Einstellungen um Medien- und Gruppennachrichten zu senden. Ihr Telefon stellt diese Informationen nicht zur Verfügung, was daran liegen kann, dass dies vom Netzbetreiber blockiert wurde oder anderweitig unterbunden wurde.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Um Medien- und Gruppennachrichten zu senden, bitte auf \"OK\" drücken und die Einstellungen vervollständigen. Die MMS-Einstellungen des Anbieters können gefunden werden, indem man nach dem \"APN\" des Anbieters sucht. Diese ist nur ein mal nötig.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (BENÖTIGT):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONAL):</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (OPTIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Vollständig</string>
+  <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure kann die Datenverbindung benutzen um Kosten für SMS bei der Kommunikation mit anderen TextSecure Nutzern \nzu vermeiden. Um dies zu aktivieren bestätigen Sie bitte ihre Landesvorwahl und Telefonnummer.</string>
+  <string name="registration_activity__your_country">IHR LAND</string>
+  <string name="registration_activity__your_country_code_and_phone_number">IHRE LANDESVORWAHL UND\nTELEFONNUMMER</string>
+  <string name="registration_activity__phone_number">TELEFONNUMMER</string>
+  <string name="registration_activity__register">Registrieren</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Die Anmeldung wird ein paar Kontakt-Informationen vorübergehend an den Server senden.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Einige mögliche Probleme\nbeinhalten:</string>
+  <string name="registration_problems__sms_interceptors">Apps, die SMS abfangen.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nManche SMS Apps von Drittanbietern, wie z.B. Handcent oder GoSMS, verhalten sich falsch und\nfangen alle eingehenden SMS ab. Überprüfen Sie, ob Sie eine Textnachricht empfangen haben,\ndie mit \"Ihr TextSecure Bestätigungs-Code:\" beginnt. Sollte dies der Fall sein, müssen sie Ihre \nDrittanbieter-App so einstellen, dass sie alle SMS durch lässt.</string>
+  <string name="registration_problems__incorrect_number">Flasche Nummer.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nBitte überprüfen Sie die eingegebene Nummer und dass Sie für Ihre Region das\nrichtige Format hat.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure funktioniert nicht mit Google Voice Rufnummern.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Überprüfung durch Anruf</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure kann Sie auch anrufen um Ihre Nummer zu überprüfen. Drücken Sie \'Anrufen\'\nund geben dann die sechs Ziffern ein, die Sie gehört haben.</string>
+  <string name="registration_progress_activity__verify">Überprüfen</string>
+  <string name="registration_progress_activity__call_me">Anrufen</string>
+  <string name="registration_progress_activity__edit_number">Nummer bearbeiten</string>
+  <string name="registration_progress_activity__connectivity_error">Verbindungsfehler.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure hat es nicht geschafft sich mit dem Push Dienst zu verbinden.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Einige der möglichen\nProbleme beinhalten:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Keine Netzwerk-\nVerbindung.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Ihr\nGeräte benötigt eine Netzverbindung um diese TextSecure Funktion nutzen zu können. Stellen Sie sicher,\ndass Sie eine Mobilfunk- oder Wifi-Verbindung haben.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Restriktive Firewall.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nWenn Sie über Wifi verbunden sind ist es möglich, dass eine Firewall den Zugang zum\nTextSecure Server blockiert. Versuchen Sie ein anderes Netzwerk oder die mobile Datenverbindung.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure wird Ihre Nummer nun automatisch mit einer SMS überprüfen.</string>
+  <string name="registration_progress_activity__connecting">Verbinde...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Warte auf SMS\nÜberprüfung...</string>
+  <string name="registration_progress_activity__registering_with_server">Registriere am Server...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dies\nkann einen Moment dauern. Bitte seinen Sie geduldig, wir benachrichtigen Sie, wenn die Überprüfung abgeschlossen ist.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nDie Überprüfung der SMS Bestätigung hat zu lange gedauert.</string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS Überprüfung\nfehlgeschlagen.</string>
+  <string name="registration_progress_activity__generating_keys">Erzeuge Schlüssel...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">An</string>
+  <string name="recipients_panel__add_member">Mitglied hinzu fügen</string>
   <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Sie haben momentan keine Schlüssel denen Sie vertrauen in ihrer Datenbank.</string>
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Sie haben momentan keine Schlüssel denen Sie vertrauen in Ihrer Datenbank.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Deren Identität (sie lesen):</string>
   <string name="verify_identity_activity__your_identity_you_read">Ihre Identität (Sie lesen):</string>
@@ -291,6 +416,7 @@
   <string name="AndroidManifest__create_passphrase">Passwort erstellen</string>
   <string name="AndroidManifest__enter_passphrase">Passwort eingeben</string>
   <string name="AndroidManifest__select_contacts">Kontakt auswählen</string>
+  <string name="AndroidManifest__select_contact">Kontakt auswählen</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure erkannt</string>
   <string name="AndroidManifest__public_identity_key">Öffentlicher Schlüssel</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
@@ -300,14 +426,16 @@
   <string name="AndroidManifest__complete_key_exchange">Vollständiger Schlüsselaustausch</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / Export</string>
-  <string name="arrays__my_identity_key">Mein Identitätsschlüssel</string>
-  <string name="arrays__contact_keys">Kontaktschlüssel</string>
+  <string name="arrays__my_identity_key">Mein Schlüssel</string>
+  <string name="arrays__contact_keys">Schlüssel meiner Kontakte</string>
   <!--preferences.xml-->
   <string name="preferences__general">Allgemein</string>
   <string name="preferences__pref_all_sms_title">Für alle SMS benutzen</string>
   <string name="preferences__pref_all_mms_title">Für alle MMS benutzen</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">TextSecure zur Anzeige und Speicherung aller eingehenden SMS verwenden</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">TextSecure zur Anzeige und Speicherung aller eingehenden MMS verwenden</string>
+  <string name="preferences__enable_enter_key_title">Enter-Taste einschalten</string>
+  <string name="preferences__replace_smiley_with_enter_key">Smiley-Taste durch Enter-Taste ersetzen</string>
   <string name="preferences__pref_enter_sends_title">Enter schickt ab</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Enter Taste versendet Nachrichten</string>
   <string name="preferences__display_settings">Anzeige-Einstellungen</string>
@@ -315,30 +443,27 @@
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wählen Sie den Kontakt aus der Kontaktliste.</string>
   <string name="preferences__change_passphrase">Passwort ändern</string>
   <string name="preferences__change_my_passphrase">Mein Passwort ändern</string>
-  <string name="preferences__complete_key_exchanges">Schlüsselaustausch abschliessen</string>
+  <string name="preferences__complete_key_exchanges">Schlüsselaustausch abschließen</string>
   <string name="preferences__disable_passphrase">Passwort deaktivieren</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Verschlüsselung von Nachrichten und Schlüsseln auf diesem Gerät deaktivieren</string>
-  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatischer Schlüsselaustausch für neue Sitzungen und bestehende Sitzungen mit demselben persönlichen Schlüssel</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatischer Schlüsselaustausch für neue Sitzungen oder für bestehende Sitzungen mit dem selben persönlichen Schlüssel</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Passwort im Speicher nach einer gewissen Zeit vergessen</string>
   <string name="preferences__timeout_passphrase">Passwort im Speicher vergessen</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Passwort-Timeout auswählen</string>
   <string name="preferences__pref_timeout_interval_title">Timeout-Dauer</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Länge des Zeitraums, während dessen das Passwort im Speicher gehalten wird</string>
-  <string name="preferences__identity_key_settings">Identitäten</string>
+  <string name="preferences__identity_key_settings">Schlüssel</string>
   <string name="preferences__view_my_identity_key">Meinen persönlichen Schlüssel anzeigen</string>
   <string name="preferences__manage_identity_keys">Schlüssel verwalten</string>
   <string name="preferences__manage_configured_identity_keys">Konfigurierte Schlüssel verwalten</string>
   <string name="preferences__notifications">Benachrichtigungen</string>
   <string name="preferences__display_message_notifications_in_status_bar">Benachrichtigung in der Statuszeile anzeigen</string>
   <string name="preferences__led_color">LED Farbe</string>
-  <string name="preferences__change_notification_led_color">LED Farbe anpassen</string>
-  <string name="preferences__pref_led_blink_title">LED Blinkmuster</string>
-  <string name="preferences__change_notification_blink_pattern">Ändern des LED Blinkmusters für Benachrichtigungen</string>
-  <string name="preferences__pref_led_blink_dialogtitle">LED Blinkmuster auswählen</string>
-  <string name="preferences__select_led_color">LED Farbe auswählen</string>
+  <string name="preferences__pref_led_blink_title">LED Blink-Muster</string>
   <string name="preferences__sound">Ton</string>
-  <string name="preferences__inthread_notifications">Benachrichtigungen im Thread</string>
-  <string name="preferences__play_inthread_notifications">Einen Alarmton abspielen wenn Sie ein aktives Gespräch ansehen.</string>
+  <string name="preferences__change_notification_sound">Benachrichtigungston ändern</string>
+  <string name="preferences__inthread_notifications">Benachrichtigungen innerhalb Konversationen</string>
+  <string name="preferences__play_inthread_notifications">Einen Alarmton abspielen während Sie eine aktive Konversation ansehen.</string>
   <string name="preferences__vibrate">Vibrieren</string>
   <string name="preferences__also_vibrate_when_notified">Bei Benachrichtigung vibrieren</string>
   <string name="preferences__minutes">Minuten</string>
@@ -357,12 +482,12 @@
   <string name="preferences__passphrase">Passwort</string>
   <string name="preferences__advanced_mms_access_point_names">MMS-Einstellungen</string>
   <string name="preferences__enable_manual_mms">Manuelle MMS erlauben</string>
-  <string name="preferences__override_system_mms_settings">Statt der Systemeinstellungen für SMS die unten genannten Einstellungen benutzen.</string>
+  <string name="preferences__override_system_mms_settings">Statt der Systemeinstellungen für MMS die unten genannten Einstellungen benutzen.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (Benötigt)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Optional)</string>
   <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (Optional)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Einen Zustellungsbericht für jede von Ihnen gesendete SMS anfordern</string>
   <string name="preferences__sms_delivery_reports">SMS Zustellungsberichte</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Einen Zustellungsbericht für jede von Ihnen gesendete SMS anfordern</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, falls der Thread eine bestimmte Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
   <string name="preferences__storage">Speicher</string>
@@ -375,8 +500,13 @@
   <string name="preferences__theme">Design</string>
   <string name="preferences__default">Voreinstellung</string>
   <string name="preferences__language">Sprache</string>
-  <string name="preferences__make_default_sms_app">Als Standard SMS-Programm einrichten</string>
-  <string name="preferences__make_textsecure_the_default_sms_mms_app">Text/Secure als Standard SMS/MMS-Programm einrichten.</string>
+  <string name="preferences__make_default_sms_app">Als standard SMS App einstellen</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">TextSecure als standard SMS/MMS App einrichten.</string>
+  <string name="preferences__use_data_channel">Push Benachrichtigungen</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nMehr Privatsphäre und keine SMS-Kosten durch das Nutzen der Datenverbindung zur Kommunikation mit anderen TextSecure Nutzern.</string>
+  <string name="preferences__allow_sms_fallback">Erlaube Rückgriff auf  SMS</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Sende und empfange SMS Nachrichten wenn der Datenkanal nicht verfügbar ist.</string>
+  <string name="preferences__refresh_push_directory">Aktualisiere Push Verzeichnis</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -402,14 +532,18 @@
   <string name="conversation_list_batch__menu_select_all">Alle auswählen</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Suchen</string>
+  <string name="conversation_list__drawer_open">Seitenleiste öffnen</string>
+  <string name="conversation_list__drawer_close">Seitenleiste schließen</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicherheit</string>
-  <string name="conversation_secure_verified__menu_verify_session">Sitzung verifizieren</string>
+  <string name="conversation_secure_verified__menu_no_identity">Keine Identität verfügbar.</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Empfänger verifizieren</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Sitzung abbrechen</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Sitzung beenden</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Anhang hinzufügen</string>
-  <string name="conversation__menu_add_contact_info">Kontaktinfo hinzufügen</string>
+  <string name="conversation__menu_update_group">Gruppe aktualisieren</string>
+  <string name="conversation__menu_leave_group">Gruppe verlassen</string>
+  <string name="conversation__menu_add_contact_info">Kontaktinformation hinzufügen</string>
   <string name="conversation__menu_delete_thread">Thread löschen</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Teilnehmerliste</string>
@@ -424,8 +558,9 @@
   <string name="text_secure_locked__menu_unlock">Entsperren</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Neue Nachricht</string>
+  <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
   <string name="text_secure_normal__menu_settings">Einstellungen</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Passwort löschen</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Sperren</string>
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verifiziert</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e5dd423be5..c12bc4fe06 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -7,7 +7,7 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Αυτήν τη στιγμή: %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Πρέπει να έχετε εισάγει τη συνθηματική φράση σας πριν διαχειριστείτε κλειδιά...</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχετε ορίσει τη συνθηματική φράση σας!</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχετε ορίσει συνθηματική φράση!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">μηνύματα ανά συζήτηση</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Διαγραφή όλων των παλιών μηνυμάτων τώρα;</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Είστε σίγουροι πως θέλετε να μειωθούν όλες οι συζητήσεις στα %s πιο πρόσφατα μηνύματα;</string>
@@ -16,6 +16,8 @@
   <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_disable">Απενεργοποίηση</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Διαγραφή...</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Σφάλμα κατά τη σύνδεση με τον διακομιστή!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Εικόνα</string>
   <string name="AttachmentTypeSelectorAdapter_video">Βίντεο</string>
@@ -26,22 +28,22 @@
   <string name="ConversationItem_error_sending_message">Σφάλμα κατά την αποστολή μηνύματος</string>
   <string name="ConversationItem_sending">Αποστολή...</string>
   <string name="ConversationItem_saving_attachment">Αποθήκευση Συνημμένου</string>
-  <string name="ConversationItem_saving_attachment_to_sd_card">Αποθήκευση συνημμένου σε κάρτα μνήμης...</string>
+  <string name="ConversationItem_saving_attachment_to_sd_card">Αποθηκεύεται το συνημμένο στην κάρτα μνήμης...</string>
   <string name="ConversationItem_save_to_sd_card">Να Αποθηκευτεί στην Κάρτα Μνήμης;</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Αυτό το αρχείο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Το αντίγραφο που θα σωθεί στην κάρτα μνήμης σας δε θα είναι κρυπτογραφημένο. Θέλετε να συνεχίσετε;</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Σφάλμα κατά την αποθήκευση στην κάρτα μνήμης!</string>
   <string name="ConversationItem_success_exclamation">Επιτυχία!</string>
-  <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Απέτυχε η γραφή στην κάρτα μνήμης!</string>
-  <string name="ConversationItem_view_secure_media_question">Προβολή ασφαλών αρχείων;</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Αυτό το αρχείο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Δυστυχώς, για να το ανοίξετε με κάποιο εξωτερικό πρόγραμμα, είναι απαραίτητο να αποκρυπτογραφηθεί και να γραφτεί στο δίσκο. Είστε σίγουροι πως το θέλετε αυτό;</string>
+  <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Απέτυχε η εγγραφή στην κάρτα μνήμης!</string>
+  <string name="ConversationItem_view_secure_media_question">Προβολή ασφαλών πολυμέσων;</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Αυτό το αρχείο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Δυστυχώς, για να το ανοίξετε με κάποιο εξωτερικό πρόγραμμα, είναι απαραίτητο να αποκρυπτογραφηθεί και να εγγραφεί στον δίσκο. Είστε σίγουροι πως το θέλετε αυτό;</string>
   <string name="ConversationItem_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_key_exchange_message_click_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, κάνετε κλικ για να επεξεργαστεί.</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_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>
@@ -55,8 +57,7 @@
   <string name="ConversationActivity_forward_message_prefix">ΠΡΘ</string>
   <string name="ConversationActivity_group_conversation_recipients">Παραλήπτες Ομαδικής Συζήτησης</string>
   <string name="ConversationActivity_group_conversation">Ομαδική Συζήτηση</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d παραλήπτες στην ομάδα</string>
-  <string name="ConversationActivity_saving_draft">Σώζεται προσχέδιο...</string>
+  <string name="ConversationActivity_saving_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>
@@ -83,14 +84,15 @@
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Προσοχή, αυτό θα\n        εξάγει τα αποκρυπτογραφημένα περιεχόμενα των μηνυμάτων σας στη κάρτα μνήμης.\n    </string>
   <string name="ExportFragment_cancel">Ακύρωση</string>
   <string name="ExportFragment_exporting">Εξαγωγή</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Εξαγωγή αποκρυπτογραφημένου κειμένου στην κάρτα μνήμης...\n</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Γίνεται εξαγωγή αποκρυπτογραφημένου κειμένου στην κάρτα μνήμης...\n</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Σφάλμα, δε μπορέσαμε να αποθηκεύσουμε\n        στην κάρτα μνήμης!\n    </string>
-  <string name="ExportFragment_error_while_writing_to_sd_card">Σφάλμα κατά την αποθήκευση στην κάρτα μνήμης.\n</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Σφάλμα κατά την εγγραφή στην κάρτα μνήμης.\n</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">Γίνεται εξαγωγή κρυπτογραφημένων κλειδιών,\n        ρυθμίσεων και μηνυμάτων...\n    </string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
-  <string name="ImportFragment_import_system_sms_database">Να εισαγχθούν όλα τα προϋπάρχοντα SMS;</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Εισαγωγή όλων των\n        μηνυμάτων από το προκαθορισμένο αρχείο μηνυμάτων SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη εισάγει\n        το αρχείο μηνυμάτων της συσκευής σας, η επανα-εισαγωγή θα έχει ως αποτέλεσμα διπλά μηνύματα.\n    </string>
+  <string name="ImportFragment_import_system_sms_database">Να εισαχθούν όλα τα προϋπάρχοντα SMS;</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Θα γίνει εισαγωγή όλων των\n        μηνυμάτων από το προκαθορισμένο αρχείο μηνυμάτων SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη εισάγει\n        το αρχείο μηνυμάτων της συσκευής σας, η επανα-εισαγωγή θα έχει ως αποτέλεσμα διπλά μηνύματα.\n    </string>
   <string name="ImportFragment_import">Εισαγωγή</string>
   <string name="ImportFragment_cancel">Ακύρωση</string>
   <string name="ImportFragment_restore_encrypted_backup">Επαναφορά Του Κρυπτογραφημένου Αντιγράφου Ασφαλείας;</string>
@@ -98,11 +100,11 @@
   <string name="ImportFragment_restore">Επαναφορά</string>
   <string name="ImportFragment_import_plaintext_backup">Εισαγωγή Μη Κρυπτογραφημένου Αντιγράφου Ασφαλείας;</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Αυτό θα εισάγει\n        μηνύματα από ένα μη κρυπτογραφημένο αντίγραφο ασφαλείας. Αν έχετε ήδη πρωτύτερα εισάγει το αρχείο μηνυμάτων SMS του συστήματος,\n        η επανα-εισαγωγή θα έχει ως αποτέλεσμα διπλά μηνύματα.\n    </string>
-  <string name="ImportFragment_importing">Εισαγωγή</string>
+  <string name="ImportFragment_importing">Γίνεται εισαγωγή</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Εισαγωγή μη κρυπτογραφημένου αντιγράφου ασφαλείας...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Δε βρέθηκε μη κρυπτογραφημένο αντίγραφο ασφαλείας!</string>
   <string name="ImportFragment_error_importing_backup">Σφάλμα κατά την εισαγωγή αντιγράφων ασφαλείας!</string>
-  <string name="ImportFragment_import_complete">Εισαγωγή ολοκληρώθηκε!</string>
+  <string name="ImportFragment_import_complete">Η εισαγωγή ολοκληρώθηκε!</string>
   <string name="ImportFragment_restoring">Επαναφορά</string>
   <string name="ImportFragment_restoring_encrypted_backup">Επαναφορά κρυπτογραφημένου αντιγράφου ασφαλείας...</string>
   <string name="ImportFragment_no_encrypted_backup_found">Δε βρέθηκε κρυπτογραφημένο αντίγραφο ασφαλείας!</string>
@@ -110,9 +112,9 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Δε βρέθηκε κλειδί!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Δε βρέθηκε σύνδεση για παραλαβή  MMS , δοκιμάστε αργότερα...</string>
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Δε βρέθηκε σύνδεση για παραλαβή MMS , δοκιμάστε αργότερα...</string>
   <string name="MmsDownloader_error_storing_mms">Σφάλμα κατά την αποθήκευση MMS! </string>
-  <string name="MmsDownloader_error_connecting_to_mms_provider">Σφάλμα κατά στη σύνδεση στον πάροχο MMS...</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Σφάλμα κατά στη σύνδεση με τον πάροχο MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Σφάλμα κατά την διάβαση των ρυθμίσεων MMS του παροχέα...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Μήνυμα Πολυμέσων</string>
@@ -121,17 +123,63 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Λανθασμένη παλιά συνθηματική φράση!</string>
   <!--PassphraseCreateActivity-->
   <string name="PassphraseCreateActivity_passphrases_dont_match">Οι συνθηματικές φράσεις δε ταιριάζουν</string>
-  <string name="PassphraseCreateActivity_you_must_specify_a_password">Πρέπει να επιλέξετε ένα κωδικό</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Πρέπει να επιλέξετε έναν κωδικό</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Μη Έγκυρη Συνθηματική Φράση!</string>
   <!--PromptMmsActivity-->
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Πρέπει να καθορίσετε μια διεύθυνση MMSC για τον πάροχό σας.</string>
-  <string name="PromptMmsActivity_mms_settings_updated">Ρυθμίσεις MMS Ενημερώθηκαν</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Μπορείτε να αλλάξετε αυτές τις ρυθμίσεις από το μενού ρυθμίσεων του TextSecure.</string>
+  <string name="PromptMmsActivity_mms_settings_updated">Οι Ρυθμίσεις MMS Ενημερώθηκαν</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 και τώρα έχει νέο κλειδί ταυτότητας.\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_trusted_but">Η\n        υπογραφή αυτής της ανταλλαγής κλειδιών είναι έμπιστη, αλλά η ρύθμιση «Να ολοκληρώνονται\n        οι ανταλλαγές κλειδιών» είναι απενεργοποιημένη.\n    </string>
+  <string name="ReceiveKeyActivity_processing">Γίνεται επεξεργασία</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Επεξεργάζεται η ανταλλαγή κλειδιών...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Σύνδεση Με TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Επιλέξτε Χώρα</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Πρέπει να καθορίσετε\nτον κώδικα της χώρας σας\n</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Πρέπει να καθορίσετε\nτον αριθμό του κινητού σας\n</string>
+  <string name="RegistrationActivity_invalid_number">Άκυρος αριθμός</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Ο αριθμός που καθορίσατε (%s)\nδεν είναι έγκυρος.\n</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\n%s\n\n\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>
+  <string name="RegistrationProgressActivity_registration_complete">Η εγγραφή ολοκληρώθηκε!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Πιθανά προβλήματα.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Πρέπει πρώτα να εισάγετε τον κωδικό που παραλήφθηκε...</string>
+  <string name="RegistrationProgressActivity_connecting">Γίνεται σύνδεση</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Γίνεται σύνδεση για επιβεβαίωση...</string>
+  <string name="RegistrationProgressActivity_network_error">Σφάλμα Δικτύου!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Δε μπορέσαμε να συνδεθούμε. Παρακαλώ ελέγξτε τη σύνδεση δικτύου σας και προσπαθήστε ξανά.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Η Επιβεβαίωση Απέτυχε!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Ο κωδικός επαλήθευσης δεν ήταν σωστός. Παρακαλώ δοκιμάστε ξανά.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Υπερβολικά πολλές προσπάθειες</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Εισάγατε λάθος κωδικό επαλήθευσης υπερβολικά πολλές φορές. Παρακαλώ περιμένετε λίγο πριν προσπαθήσετε και πάλι.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Αίτηση για κλήση</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Αίτηση εισερχόμενης κλήσης επαλήθευσης...</string>
+  <string name="RegistrationProgressActivity_server_error">Σφάλμα Διακομιστή</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Σφάλμα στο διακομιστή. Παρακαλώ δοκιμάστε ξανά.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Πάρα Πολλές Αιτήσεις!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Έχετε ζητήσει κλήση επαλήθευσης πρόσφατα. Μπορείτε να ζητήσετε άλλη μία σε 20 λεπτά.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Επαλήθευση φωνητικού κωδικού...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Η Εγγραφή Ολοκληρώθηκε</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Η εγγραφή TextSecure ολοκληρώθηκε επιτυχώς.</string>
+  <string name="RegistrationService_registration_error">Σφάλμα Εγγραφής</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Η εγγραφή TextSecure παρουσίασε ένα πρόβλημα.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Ελήφθη προβληματικό μήνυμα\n        ανταλλαγής κλειδιών!\n    </string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\n        Ελήφθη μήνυμα ανταλλαγής κλειδιών για άκυρη έκδοση του πρωτόκολου.\n    </string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\n        Ελήφθη μήνυμα με άγνωστο κλειδί ταυτότητας. Κλικ για επεξεργασία και προβολή.\n    </string>
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Δεν έχετε κλειδί ταυτότητας.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Ο παραλήπτης δεν έχει κλειδί ταυτότητας.</string>
@@ -160,7 +208,7 @@
   <string name="ViewIdentityActivity_verified_exclamation">Επιβεβαιώθηκε!</string>
   <string name="ViewIdentityActivity_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-->
@@ -169,22 +217,24 @@
   <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Το μήνυμα κρυπτογραφήθηκε για ανύπαρκτη συζήτηση...</string>
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server">Σύνδεση στο διακομιστή MMS...</string>
-  <string name="MmsDatabase_downloading_mms">Λήψη MMS...</string>
-  <string name="MmsDatabase_mms_download_failed">Λήψη MMS απέτυχε!</string>
+  <string name="MmsDatabase_downloading_mms">Γίνεται λήψη MMS...</string>
+  <string name="MmsDatabase_mms_download_failed">Η λήψη MMS απέτυχε!</string>
   <string name="MmsDatabase_downloading">Γίνεται λήψη...</string>
   <string name="MmsDatabase_mms_pending_download">Πατήστε και ρυθμίσετε το MMS για να συνεχίσετε την λήψη.</string>
   <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">Αποκρυπτογράφηση MMS, παρακαλώ περιμένετε...</string>
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">Γίνεται αποκρυπτογράφηση MMS, παρακαλώ περιμένετε...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Κακό κρυπτογραφημένο μήνυμα MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Το μήνυμα MMS κρυπτογραφήθηκε για ανύπαρκτη συζήτηση...</string>
   <!--MmsSender-->
-  <string name="MmsSender_currently_unable_to_send_your_mms_message">Αυτή τη στιγμή δε μπορούμε να στείλουμε το μήνυμα MMS σας.</string>
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Αυτήν τη στιγμή δε μπορούμε να στείλουμε το μήνυμα MMS σας.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Εισαγωγή σε εξέλιξη</string>
   <string name="ApplicationMigrationService_importing_text_messages">Εισάγονται τα Μηνύματα Κειμένου</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Φράση-κλειδί του TextSecure αποθηκεύτηκε</string>
-  <string name="KeyCachingService_passphrase_cached">Συνθηματική Φράση Αποθηκεύτηκε</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Πατήστε για άνοιγμα.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Πατήστε για άνοιγμα, ή πατήστε τη κλειδαριά για κλείσιμο.</string>
+  <string name="KeyCachingService_passphrase_cached">Το TextSecure είναι ξεκλειδωμένο</string>
+  <string name="KeyCachingService_lock">Κλείδωμα με συνθηματική φράση</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d νέα μηνύματα</string>
   <string name="MessageNotifier_most_recent_from_s">Τελευταίο μήνυμα από: %s</string>
@@ -196,8 +246,8 @@
   <string name="MessageNotifier_mark_all_as_read">Επισήμανση όλων ως αναγνωσμένα</string>
   <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">Γίνεται ανανέωση...</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">Γίνεται ανανέωση κλειδιού\n        ταυτότητας...\n    </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>
@@ -205,22 +255,24 @@
   <string name="ViewLocalIdentityActivity_continue">Συνέχεια</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Αυτήν τη στιγμή δε μπορούμε να αποστείλουμε το SMS σας. Θα σταλεί μόλις η υπηρεσία γίνει διαθέσιμη.</string>
+  <!--QuickResponseService-->
+  <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>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">ΠΑΛΙΑ ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ</string>
   <string name="change_passphrase_activity__new_passphrase">ΝΕΑ ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ:</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">ΕΠΑΝΑΛΗΨΗ ΝΕΑΣ ΣΥΝΘΗΜΑΤΙΚΗΣ ΦΡΑΣΗΣ</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">ΕΠΑΝΑΛΗΨΗ ΝΕΑΣ ΣΥΝΘΗΜΑΤΙΚΗΣ ΦΡΑΣΗΣ:</string>
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Δεν υπάρχουν επαφές.</string>
+  <!--single_contact_selection_activity-->
   <!--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">Εισάγετε μήνυμα</string>
   <string name="conversation_activity__send">Αποστολή</string>
   <string name="conversation_activity__remove">Αφαίρεση</string>
   <!--conversation_item_sent-->
@@ -231,8 +283,10 @@
   <string name="conversation_item_received__downloading">Γίνεται λήψη</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Λειτουργία Μαζικής Επιλογής</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Γίνεται φόρτωση χωρών...</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__passphrase">ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ:</string>
   <string name="create_passphrase_activity__repeat">ΕΠΑΝΑΛΗΨΗ:</string>
   <string name="create_passphrase_activity__continue">Συνέχεια</string>
@@ -247,7 +301,7 @@
   <!--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        ασφαλείας στην κάρτα μνήμης.\n    </string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Κάνετε εξαγωγή κρυπτογραφημένου\n        αντιγράφου ασφαλείας στην κάρτα μνήμης.\n    </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="import_fragment__import_system_sms_database">Εισαγωγή Της Βάσης Δεδομένων SMS Του Συστήματος</string>
@@ -263,15 +317,41 @@
   <string name="prompt_passphrase_activity__textsecure_passphrase">ΣΥΝΘΗΜΑΤΙΚΗ ΦΡΑΣΗ TEXTSECURE</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">Το TextSecure χρειάζεται τις ρυθμίσεις MMS για να στείλει μηνύματα πολυμέσων μέσω του πάροχού σας. Η συσκευή σας δεν παρέχει αυτές τις ρυθμίσεις, κάτι που ισχύει σε κλειδωμένες συσκευές και άλλες περιοριστικές διαμορφώσεις.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Για να στείλετε μηνύματα πολυμέσων, πατήστε «ΟΚ» και συμπληρώστε τις ρυθμίσεις APN. Θα βρείτε τις σωστές ρυθμίσεις APN για τον πάροχό σας ψάχνοντας online για «το όνομα του πάροχού σας» + APN. Αυτές οι ρυθμίσεις θα χρειαστούν μόνο μία φορά.</string>
   <string name="prompt_mms_activity__mmsc_url_required">ΔΙΕΥΘΥΝΣΗ MMSC (ΑΠΑΙΤΕΙΤΑΙ):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">ΔΙΑΚΟΜΙΣΤΗΣ ΜΕΣΟΛΑΒΗΣΗΣ MMS (ΠΡΟΑΙΡΕΤΙΚΟΣ):</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">ΘΥΡΑ ΔΙΑΚΟΜΙΣΤΗ ΜΕΣΟΛΑΒΗΣΗΣ MMS (ΠΡΟΑΙΡΕΤΙΚΟ):</string>
   <!--receive_key_activity-->
   <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__phone_number">ΑΡΙΘΜΟΣ ΚΙΝΗΤΟΥ</string>
+  <string name="registration_activity__register">Εγγραφή</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Μερικά ενδεχόμενα προβλήματα\nσυμπεριλαμβάνουν:\n</string>
+  <string name="registration_problems__incorrect_number">Λανθασμένος αριθμός.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nΤο TextSecure δεν λειτουργεί με αριθμούς Google Voice.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Επιβεβαίωση Με Φωνή</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        προβλήματα:\n    </string>
+  <string name="registration_progress_activity__no_network_connectivity">Δεν υπάρχει σύνδεση\n        στο Διαδίκτυο.\n    </string>
+  <string name="registration_progress_activity__restrictive_firewall">Περιοριστικό τοίχος προστασίας.\n</string>
+  <string name="registration_progress_activity__connecting">Γίνεται σύνδεση...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Αναμονή για επιβεβαίωση\n        SMS...\n    </string>
+  <string name="registration_progress_activity__registering_with_server">Γίνεται εγγραφή με τον διακομιστή...</string>
+  <string name="registration_progress_activity__sms_verification_failed">Η επιβεβαίωση SMS\n        απέτυχε.\n    </string>
+  <string name="registration_progress_activity__generating_keys">Δημιουργία κλειδιών σε εξέλιξη...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Προς</string>
   <!--review_identities-->
-  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Δεν έχετε κλειδιά ταυτότητας στην έμπιστη λίστα σας.</string>
+  <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Δεν έχετε κλειδιά ταυτότητας στη λίστα έμπιστών σας.</string>
   <!--verify_identity_activity-->
   <string name="verify_identity_activity__their_identity_they_read">Η ταυτότητά τους (αυτό διαβάζουν):</string>
   <string name="verify_identity_activity__your_identity_you_read">Η ταυτότητά σας (εσείς διαβάζετε):</string>
@@ -302,8 +382,10 @@
   <string name="preferences__general">Γενικά</string>
   <string name="preferences__pref_all_sms_title">Χρήση για όλα τα SMS</string>
   <string name="preferences__pref_all_mms_title">Χρήση για όλα τα MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Να χρησιμοποιείται το TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων SMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Χρήση TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων </string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Χρήση TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων SMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Χρήση TextSecure για προβολή και αποθήκευση όλων των μηνυμάτων MMS</string>
+  <string name="preferences__enable_enter_key_title">Ενεργοποίηση πλήκτρου Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Αντικαθιστά το πλήκτρο με χαρούμενο φατσούλα με το πλήκτρο Enter</string>
   <string name="preferences__pref_enter_sends_title">Το Enter αποστέλλει</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Αποστολή μηνυμάτων με το πλήκτρο enter</string>
   <string name="preferences__display_settings">Ρυθμίσεις Προβολής</string>
@@ -319,7 +401,7 @@
   <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__the_amount_of_time_to_wait_before_forgetting_passphrase">Πόση ώρα θα περιμένουμε πριν σβήσουμε τη συνθηματική φράση από τη μνήμη</string>
   <string name="preferences__identity_key_settings">Κλειδιά ταυτότητας</string>
   <string name="preferences__view_my_identity_key">Προβολή του κλειδιού ταυτότητάς μου</string>
   <string name="preferences__manage_identity_keys">Διαχείριση κλειδιών ταυτότητας</string>
@@ -327,14 +409,11 @@
   <string name="preferences__notifications">Ειδοποιήσεις</string>
   <string name="preferences__display_message_notifications_in_status_bar">Προβολή ειδοποιήσεων για νέα μηνύματα στη γραμμή κατάστασης</string>
   <string name="preferences__led_color">Χρώμα LED</string>
-  <string name="preferences__change_notification_led_color">Αλλαγή του χρώματος LED</string>
-  <string name="preferences__pref_led_blink_title">Τρόπος Αναβοσβηνόματος του LED</string>
-  <string name="preferences__change_notification_blink_pattern">Αλλάξτε το πώς αναβοσβήνει το LED</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Επιλογή τρόπου αναβοσβηνόματος του LED</string>
-  <string name="preferences__select_led_color">Επιλέξτε Χρώμα LED</string>
+  <string name="preferences__pref_led_blink_title">Μοτίβο αναβοσβήσματος του LED</string>
   <string name="preferences__sound">Ήχος</string>
-  <string name="preferences__inthread_notifications">ΕΙδοποιήσεις εντός συζητήσεων</string>
-  <string name="preferences__play_inthread_notifications">Ήχος ειδοποίησης κατά τη προβολή ενεργής συζήτησης.</string>
+  <string name="preferences__change_notification_sound">Αλλαγή ήχου ειδοποίησης</string>
+  <string name="preferences__inthread_notifications">Ειδοποιήσεις εντός συζητήσεων</string>
+  <string name="preferences__play_inthread_notifications">Αναπαράγει έναν ήχο ειδοποίησης κατά τη προβολή μιας ενεργής συζήτησης.</string>
   <string name="preferences__vibrate">Δόνηση</string>
   <string name="preferences__also_vibrate_when_notified">Δόνηση και κατά την ειδοποίηση</string>
   <string name="preferences__minutes">λεπτά</string>
@@ -353,12 +432,13 @@
   <string name="preferences__passphrase">Συνθηματική φράση</string>
   <string name="preferences__advanced_mms_access_point_names">Προτιμήσεις MMS</string>
   <string name="preferences__enable_manual_mms">Ενεργοποίηση Προσαρμοσμένου MMS</string>
+  <string name="preferences__override_system_mms_settings">Να χρησιμοποιηθούν οι παρακάτω ρυθμίσεις MMS ασχέτως των ρυθμίσεων του συστήματος.</string>
   <string name="preferences__mmsc_url_required">Διεύθυνση MMSC (Απαραίτητη)</string>
   <string name="preferences__mms_proxy_host_optional">Διακομιστής Μεσολάβησης MMS (Προαιρετικός)</string>
-  <string name="preferences__mms_proxy_port_optional">Επιλογή Θύρας Διακομιστή Μεσολάβησης MMS (Προαιρετική)</string>
+  <string name="preferences__mms_proxy_port_optional">Θύρα Διακομιστή Μεσολάβησης MMS (Προαιρετική)</string>
+  <string name="preferences__sms_delivery_reports">Αναφορές παράδοσης SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Αίτημα αναφοράς παράδοσης για κάθε SMS που στέλνετε</string>
-  <string name="preferences__sms_delivery_reports">Αναφορές παράδοσης</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Αυτόματο σβήσιμο παλιών μηνυμάτων όταν μια συζήτηση ξεπεράσει ένα προκαθορισμένο όριο μηνυμάτων</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Αυτόματη διαγραφή παλιών μηνυμάτων όταν μια συζήτηση ξεπεράσει ένα προκαθορισμένο όριο μηνυμάτων</string>
   <string name="preferences__delete_old_messages">Διαγραφή παλιών μηνυμάτων</string>
   <string name="preferences__storage">Αποθήκευση</string>
   <string name="preferences__conversation_length_limit">Όριο μεγέθους συζήτησης</string>
@@ -370,6 +450,8 @@
   <string name="preferences__theme">Θέμα</string>
   <string name="preferences__default">Προκαθορισμένη</string>
   <string name="preferences__language">Γλώσσα</string>
+  <string name="preferences__make_default_sms_app">Ανάθεση ως προεπιλεγμένη εφαρμογή για SMS</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Το TextSecure να είναι η προεπιλεγμένη εφαρμογή για SMS/MMS.</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -387,7 +469,7 @@
   <string name="conversation_context__menu_copy_text">Αντιγραφή κειμένου</string>
   <string name="conversation_context__menu_delete_message">Διαγραφή μηνύματος</string>
   <string name="conversation_context__menu_forward_message">Προώθηση μηνύματος</string>
-  <string name="conversation_context__menu_resend_message">Αποστολή ξανά.</string>
+  <string name="conversation_context__menu_resend_message">Αποστολή ξανά</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Έναρξη Ασφαλούς Συζήτησης</string>
   <!--conversation_list_batch-->
@@ -397,15 +479,15 @@
   <string name="conversation_list__menu_search">Αναζήτηση</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Ασφάλεια</string>
-  <string name="conversation_secure_verified__menu_verify_session">Επιβεβαίωση Συζήτησης</string>
+  <string name="conversation_secure_verified__menu_no_identity">Δεν υπάρχει διαθέσιμη ταυτότητα</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Επικύρωση Παραλήπτη</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Τερματισμός Ασφαλούς Συζήτησης</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Τελείωμα Ασφαλούς Συζήτησης</string>
   <!--conversation-->
-  <string name="conversation__menu_add_attachment">Πρόσθεση συνημμένου</string>
+  <string name="conversation__menu_add_attachment">Προσθήκη συνημμένου</string>
   <string name="conversation__menu_add_contact_info">Προσθήκη πληροφοριών επαφής</string>
   <string name="conversation__menu_delete_thread">Διαγραφή συζήτησης</string>
   <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Λίστα παραληπτών</string>
+  <string name="convesation_group_options__recipients_list">Λίστα παραλήπτων</string>
   <string name="conversation_group_options__delivery">Παράδοση</string>
   <string name="conversation_group_options__conversation">Συζήτηση</string>
   <string name="conversation_group_options__broadcast">Αποστολή Σε Όλους</string>
@@ -418,7 +500,7 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Νέο Μήνυμα</string>
   <string name="text_secure_normal__menu_settings">Ρυθμίσεις</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Εκκαθάριση Συνθηματικής Φράσης</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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 919ae740af..90ff56b430 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -16,6 +16,9 @@
   <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_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_error_connecting_to_server">¡Error conectando al servidor!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Fotografía</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
@@ -33,15 +36,19 @@
   <string name="ConversationItem_success_exclamation">¡Éxito!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">No es posible escribir en la tarjeta SD</string>
   <string name="ConversationItem_view_secure_media_question">¿Ver archivos de medios seguros?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este archivo se ha guardado en una base de datos cifrada. Desafortunadamente, para verlo necesita un visualizador de contenidos externo que requiere que los datos sean temporalmente descifrados y copiados en el disco. ¿Está seguro que desea hacer esto?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este audiovisual ha sido guardado en una base de datos cifrada. Desafortunadamente, para verlo con un visor de contenido externo se requiere que los datos sean descifrados temporalmente y escritos al disco. ¿Está seguro de que desea hacer esto?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Mensaje de intercambio de claves recibido y procesado.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Error, recibió un mensaje de intercambio de claves expirado.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Ha recibido un mensaje de intercambio de claves, haga clic para proceder</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Se recibió un SMS en texto simple mientra tiene abierta una sesión segura. Si sus interlocutores no tienen una sesión abierta, los mensajes que envíe aparecerán como texto distorsionado. Haga clic para terminar la sesión segura.</string>
+  <string name="ConversationItem_group_action_left">%1$s ha abandonado el grupo.</string>
+  <string name="ConversationItem_group_action_joined">%1$s se ha unido al grupo.</string>
+  <string name="ConversationItem_group_action_modify">%1$s ha actualizado el grupo.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">¿Iniciar una sesión segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">¿Iniciar sesión segura con %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Abandonar la confirmación de sesión segura</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">¿Está seguro de que desea abandonar esta sesión segura?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Confirmación de finalización de sesión segura</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">¿Está seguro de que desea finalizar esta sesión segura?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirmar borrado de conversación</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">¿Está seguro de que desea borrar esta conversación permanentemente?</string>
   <string name="ConversationActivity_add_attachment">Añadir archivo adjunto</string>
@@ -55,11 +62,15 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Receptores de Conversación en Grupo</string>
   <string name="ConversationActivity_group_conversation">Conversación en Grupo</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d receptores en grupo</string>
+  <string name="ConversationActivity_unnamed_group">Grupo sin nombre</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d miembros</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 miembro</string>
   <string name="ConversationActivity_saving_draft">Guardando borrador...</string>
   <string name="ConversationActivity_invalid_recipient">Receptor inválido!</string>
   <string name="ConversationActivity_calls_not_supported">Llamadas no soportadas</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Este dispositivo no es compatible con la función de realizar llamadas.</string>
+  <string name="ConversationActivity_leave_group">¿Abandonar grupo?</string>
+  <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_sender_s_transport_s_sent_received_s">Remitente: %1$s\nTransporte: %2$s\nEnviado/Recibido:%3$s</string>
@@ -88,6 +99,21 @@
   <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_success">¡Éxito!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Exportando claves cifradas,\n        configuración y mensajes...\n    </string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nuevo grupo</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Actualizar grupo</string>
+  <string name="GroupCreateActivity_group_name_hint">Nombre del grupo</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Nuevo grupo de MMS</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Ha seleccionado un contacto que no soporta grupos TextSecure, así que este grupo será de MMS (mensajería multimedia).</string>
+  <string name="GroupCreateActivity_you_dont_support_push">No está registrado para usar el canal de datos, así que tiene los grupos TextSecure deshabilitados.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Usted no es el propietario de este grupo, así que no puede editar el título ni la imagen.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Ocurrió un error inesperado que ha hecho fallar la creación del grupo.</string>
+  <string name="GroupCreateActivity_contacts_no_members">¡Necesita al menos una persona en su grupo!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Uno de los miembros de su grupo tiene un número que no puede ser leído correctamente. Por favor arréglelo o elimine ese contacto, e inténtelo de nuevo.</string>
+  <string name="GroupCreateActivity_file_io_exception">Error de E/S del fichero, no se pudo crear un fichero de imagen temporal.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar del grupo</string>
+  <string name="GroupCreateActivity_menu_create_title">Crear grupo</string>
+  <string name="GroupCreateActivity_creating_group">Creando %1$s…</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>
@@ -97,7 +123,7 @@
   <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_restore">Restaurar</string>
   <string name="ImportFragment_import_plaintext_backup">¿Importar copia de seguridad de los mensajes en claro?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Esto importará\n        los mensajes desde una copia de seguridad sin cifrar. Si ha importado anteriormente la base de datos de SMS del sistema,\n        esto producirá mensajes duplicados.\n    </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_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>
@@ -132,6 +158,57 @@
   <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_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_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_unsupported">No soportado</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Lo sentimos,\neste dipositivo no está soportado para mensajería de datos. Los dispositivos que ejecutan versiones de Android\nanteriores a la 4.0 deben tener una cuenta de Google registrada. Los dispositivos que ejecutan Android 4.0\no superior, no requieren una cuenta de Google, pero deben tener instalada la aplicación de Play Store.\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_continue">Continuar</string>
+  <string name="RegistrationActivity_edit">Editar</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Problemas posibles</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Verificando número</string>
+  <string name="RegistrationProgressActivity_edit_s">Editar %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">¡Proceso de registro completado!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Problemas posibles.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Debe introducir primero el código que recibió...</string>
+  <string name="RegistrationProgressActivity_connecting">Conectando</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Conectando para verificación...</string>
+  <string name="RegistrationProgressActivity_network_error">¡Error de la red!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">No se pudo conectar. Por favor compruebe su conexión a la red e inténtelo de nuevo.</string>
+  <string name="RegistrationProgressActivity_verification_failed">¡Fallo de verificación!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">El código de verificación que envió no es correcto. Por favor inténtelo de nuevo.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Demasiados intentos</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Ha enviado un código de verificación incorrecto demasiadas veces. Por favor espere un minuto antes de intentarlo de nuevo.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Solicitando llamada</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Solicitando llamada de verificación entrante...</string>
+  <string name="RegistrationProgressActivity_server_error">Fallo del servidor</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">El servidor ha encontrado un error. Por favor inténtelo de nuevo.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">¡Demasiadas solicitudes!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Usted ya ha solicitado recientemente una llamada de voz. Puede pedir otra en 20 minutos.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Verificando código de voz...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Proceso de registro completado</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">El proceso de registro de TextSecure ha finalizado con éxito.</string>
+  <string name="RegistrationService_registration_error">Fallo del proceso de registro</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_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>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Ha dejado el grupo...</string>
+  <string name="TheadRecord_secure_session_ended">La sesión segura finalizó.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">No tiene ninguna clave de identidad.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">El destinatario no tiene clave de identidad.</string>
@@ -183,8 +260,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Importación en progreso</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando Mensajes de Texto</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Frase de contraseña de TextSecure en memoria caché</string>
-  <string name="KeyCachingService_passphrase_cached">Frase de contraseña en memoria caché</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Pulse para abrir.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Pulse para abrir, o pulse el candado para cerrar.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure está desbloqueado</string>
+  <string name="KeyCachingService_lock">Bloqueado con contraseña</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) nuevos mensajes</string>
   <string name="MessageNotifier_most_recent_from_s">Mensaje más reciente de: %s</string>
@@ -217,12 +296,15 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">No hay contactos.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Buscando contactos...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Escriba un nombre a filtrar...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">No hay llamadas recientes.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Escribir mensaje</string>
+  <string name="conversation_activity__type_message"><small>Enviar un mensaje</small></string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Eliminar</string>
   <!--conversation_item_sent-->
@@ -233,8 +315,10 @@
   <string name="conversation_item_received__downloading">Descargando</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modo de selección múltiple</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Cargando países...</string>
+  <string name="country_selection_fragment__search">Buscar</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">Por favor escoja una frase de contraseña que se usará de forma local para cifrar sus datos. ⏎ ⏎Debe elegir una frase de contraseña fuerte. </string>
   <string name="create_passphrase_activity__passphrase">Frase de contraseña:</string>
   <string name="create_passphrase_activity__repeat">Repetir:</string>
   <string name="create_passphrase_activity__continue">Continuar</string>
@@ -272,8 +356,45 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">PUERTO PROXY MMS (OPCIONAL):</string>
   <!--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__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__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>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Algunos posibles problemas\nincluyen:\n</string>
+  <string name="registration_problems__sms_interceptors">Interceptadores 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__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__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>
+  <!--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__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 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\n        dispositivo precisa conectividad a la red para usar esta característica de TextSecure. Asegúrese\n        de que está conectado a 3G o wifi.\n    </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">\n        Si está conectado vía wifi, es posible que haya un cortafuegos (firewall) bloqueando \n       el acceso al servidor de TextSecure. Pruebe con otra red o conexión 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__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__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__generating_keys">Generando claves...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Para</string>
+  <string name="recipients_panel__add_member">Añadir miembro</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">En este momento no tiene ninguna clave de identidad en su base de datos de confianza.</string>
   <!--verify_identity_activity-->
@@ -291,6 +412,7 @@
   <string name="AndroidManifest__create_passphrase">Crear frase de contraseña</string>
   <string name="AndroidManifest__enter_passphrase">Ingresar frase de contraseña</string>
   <string name="AndroidManifest__select_contacts">Seleccionar Contactos</string>
+  <string name="AndroidManifest__select_contact">Seleccionar contacto</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
   <string name="AndroidManifest__public_identity_key">Clave de Identidad Pública</string>
   <string name="AndroidManifest__change_passphrase">Cambiar la frase de contraseña</string>
@@ -308,6 +430,8 @@
   <string name="preferences__pref_all_mms_title">Usar para todos los MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Usar TextSecure para ver y guardar todos los mensajes de texto entrantes</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Usar TextSecure para ver y guardar todos los mensajes multimedia entrantes</string>
+  <string name="preferences__enable_enter_key_title">Habilitar tecla Intro</string>
+  <string name="preferences__replace_smiley_with_enter_key">Reemplazar tecla de emoticono con una tecla Intro</string>
   <string name="preferences__pref_enter_sends_title">Envío con la tecla de entrada</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Presionar la tecla de entrada enviará sus mensajes de texto</string>
   <string name="preferences__display_settings">Mostrar preferencias</string>
@@ -330,13 +454,10 @@
   <string name="preferences__manage_configured_identity_keys">Gestionar las claves de identidad configuradas</string>
   <string name="preferences__notifications">Notificaciones</string>
   <string name="preferences__display_message_notifications_in_status_bar">Desplegar notificaciones de mensaje en la barra de estado</string>
-  <string name="preferences__led_color">Color LED</string>
-  <string name="preferences__change_notification_led_color">Cambiar el color LED de la notificación</string>
+  <string name="preferences__led_color">Color del LED</string>
   <string name="preferences__pref_led_blink_title">Patrón de parpadeo del LED</string>
-  <string name="preferences__change_notification_blink_pattern">Cambiar el patrón de parpadeo de la notificación LED</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Seleccionar un patrón e parpadeo del LED</string>
-  <string name="preferences__select_led_color">Seleccionar color LED</string>
   <string name="preferences__sound">Sonido</string>
+  <string name="preferences__change_notification_sound">Cambiar sonido de notificación</string>
   <string name="preferences__inthread_notifications">Notificaciones en-el-hilo</string>
   <string name="preferences__play_inthread_notifications">Reproducir sonido de notificación cuando esté viendo una conversación activa.</string>
   <string name="preferences__vibrate">Vibración</string>
@@ -357,12 +478,12 @@
   <string name="preferences__passphrase">Frase de contraseña</string>
   <string name="preferences__advanced_mms_access_point_names">Preferencias MMS </string>
   <string name="preferences__enable_manual_mms">Habilitar MMS manual</string>
-  <string name="preferences__override_system_mms_settings">Imponer la información de debajo sobre las configuraciones MMS del sistema.</string>
+  <string name="preferences__override_system_mms_settings">Hacer que la información de debajo prevalezca sobre las configuraciones MMS del sistema.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (Requerido)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Opcional)</string>
   <string name="preferences__mms_proxy_port_optional">Puerto de Proxy MMS (Opcional)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pide una noticia de entrega por cada mensaje SMS que envías</string>
   <string name="preferences__sms_delivery_reports">Noticias de entrega de SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pide una noticia de entrega por cada mensaje SMS que envías</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automáticamente los mensajes más viejos una vez el hilo de conversación excede el límite de longitud</string>
   <string name="preferences__delete_old_messages">Eliminar mensajes viejos</string>
   <string name="preferences__storage">Almacenamiento</string>
@@ -377,6 +498,10 @@
   <string name="preferences__language">Idioma</string>
   <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 ususarios de TextSecure\n</string>
+  <string name="preferences__allow_sms_fallback">Permitir recurrir al SMS</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Envía y recibe mensajes SMS cuando la actualización activa (\'push\') no está disponible</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -402,13 +527,17 @@
   <string name="conversation_list_batch__menu_select_all">Seleccionar todo</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Buscar</string>
+  <string name="conversation_list__drawer_open">Abrir cajón de navegación</string>
+  <string name="conversation_list__drawer_close">Cerrar cajón de navegación</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Seguridad</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verificar sesión</string>
+  <string name="conversation_secure_verified__menu_no_identity">Ninguna identidad disponible</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verificar destinatario</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Abandonar la sesión segura</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Finalizar sesión segura</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Añadir archivo adjunto</string>
+  <string name="conversation__menu_update_group">Actualizar grupo</string>
+  <string name="conversation__menu_leave_group">Abandonar grupo</string>
   <string name="conversation__menu_add_contact_info">Añadir información de contacto</string>
   <string name="conversation__menu_delete_thread">Borrar conversación</string>
   <!--conversation_group_options-->
@@ -424,8 +553,9 @@
   <string name="text_secure_locked__menu_unlock">Desbloquear</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nuevo mensaje</string>
+  <string name="text_secure_normal__menu_new_group">Nuevo grupo</string>
   <string name="text_secure_normal__menu_settings">Preferencias</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Eliminar frase de contraseña</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Bloquear</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar Todos Leídos</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9986e7d8cf..777d4f9008 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -16,6 +16,12 @@
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Désactiver le chiffrement de sauvegarde ?</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 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_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>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Mise à jour du répertoire de push…</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Image</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vidéo</string>
@@ -33,15 +39,19 @@
   <string name="ConversationItem_success_exclamation">Réussite !</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Impossible d’écrire sur la carte SD !</string>
   <string name="ConversationItem_view_secure_media_question">Visualiser le média sécurisé ?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ce média est stocké dans une base de données chiffrée. Malheureusement, le voir avec un visualisateur de contenu externe nécessite pour le moment que les données soient temporairement déchiffrées et écrites sur le disque. Êtes-vous sûr de vouloir faire cela ?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ce média est stocké dans une base de données chiffrée. Malheureusement, le voir avec un outil de visualisation externe nécessite pour le moment que les données soient temporairement déchiffrées et écrites sur le disque. Êtes-vous sûr de vouloir faire cela ?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Message d’échange de clés reçu et traité.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erreur, un message d’échange de clés périmé a été reçu.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Message d’échange de clés reçu, cliquez pour le traiter</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Message d’échange de clés reçu, cliquez pour le traiter.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Ai reçu un SMS en texte clair pendant que votre session sécurisée était ouverte. S\'ils n\'ont pas ouvert une session, les messages que vous envoyez apparaîtront en tant que texte illisible. Cliquez pour terminer la session.</string>
+  <string name="ConversationItem_group_action_left">%1$s a quitté le groupe.</string>
+  <string name="ConversationItem_group_action_joined">%1$s ont rejoint le groupe.</string>
+  <string name="ConversationItem_group_action_modify">%1$s a mis à jour le groupe.</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">Initer une session sécurisée avec %s ?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Confirmer l\'interruption de la session sécurisée</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Êtes-vous sûr de vouloir interrompre cette session sécurisée ?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Fin de la confirmation de session sécurisée</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Etes-vous sûr de vouloir terminer cette session sécurisée ?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirmation de la suppression du fil</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Êtes-vous sûr de vouloir supprimer définitivement cette conversation ?</string>
   <string name="ConversationActivity_add_attachment">Ajouter une pièce jointe</string>
@@ -55,11 +65,15 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Destinataires Conversation de Groupe</string>
   <string name="ConversationActivity_group_conversation">Conversation de Groupe</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d destinataires dans le groupe</string>
+  <string name="ConversationActivity_unnamed_group">Groupe sans nom</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d membres</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 membre</string>
   <string name="ConversationActivity_saving_draft">Sauvegarde du brouillon…</string>
   <string name="ConversationActivity_invalid_recipient">Destinataire invalide !</string>
   <string name="ConversationActivity_calls_not_supported">Appels non pris en charge</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Cet appareil ne semble pas prendre en charge les actions de numérotation.</string>
+  <string name="ConversationActivity_leave_group">Quitter le groupe ?</string>
+  <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_sender_s_transport_s_sent_received_s">Expéditeur : %1$s\nTransport : %2$s\nEnvoyé / Reçu : %3$s</string>
@@ -88,6 +102,21 @@
   <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 cryptées, ⏎\nparamètres et messages ... ⏎</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nouveau groupe</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Modifier le Groupe</string>
+  <string name="GroupCreateActivity_group_name_hint">Nom du groupe</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Nouveau groupe MMS</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Vous avez sélectionné un contact qui ne supporte pas les groupes TextSecure, ce groupe sera donc converti en groupe MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Vous n\'êtes pas enregistré pour utiliser la transmission de données, les groupes TextSecure sont donc désactivés.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Vous n’êtes pas le propriétaire de ce groupe, et ne pouvez donc pas modifier son titre ou son image.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Une erreur inattendue s\'est produite qui a empêché la création du groupe.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Il vous faut au moins une personne dans votre groupe !</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Un des membres de votre groupe a un numéro illisible. Veuillez réparer ou enlever ce contact et essayer à nouveau.</string>
+  <string name="GroupCreateActivity_file_io_exception">Erreur de fichier I/O, impossible de créer un fichier image temporaire.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar du groupe</string>
+  <string name="GroupCreateActivity_menu_create_title">Nouveau groupe</string>
+  <string name="GroupCreateActivity_creating_group">Création de %1$s en cours…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importer 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>
@@ -97,7 +126,7 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">La restauration d\'une sauvegarde crypté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_restore">Restaurer</string>
   <string name="ImportFragment_import_plaintext_backup">Importer la sauvegarde du contenu 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, ⏎\nimporter à nouveau se traduira par des messages dupliqués. ⏎</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,\nimporter à nouveau se traduira par des messages dupliqués.</string>
   <string name="ImportFragment_importing">Importer</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>
@@ -132,6 +161,57 @@
   <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 soit que quelqu’un essaie d’intercepter votre communication, soit\nque ce contact a simplement réinstallé TextSecure et a maintenant une nouvelle clé d’identité.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Peut-être devriez-vous\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_processing">En traitement</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">L\'échange de clés est en traitement...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Se connecter à travers TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Sélectionnez 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_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 valable.</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 pris en charge pour la messagerie par données. Les appareils dont la version d\'Android est plus ancienne\nque 4.0 doivent être enregistrés avec un compte Google. Les appareils sous Android 4.0 ou plus récent n\'ont pas\nbesoin d\'un compte Google, mais requièrent l\'application Play Store.</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 changer avant de continuer?\n</string>
+  <string name="RegistrationActivity_continue">Continuer</string>
+  <string name="RegistrationActivity_edit">Editer</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Problèmes Possibles</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Vérification du numéro</string>
+  <string name="RegistrationProgressActivity_edit_s">Editer %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Enregistrement terminé!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Problèmes possibles.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Vous devez d\'abord introduire le code que vous avez reçu...</string>
+  <string name="RegistrationProgressActivity_connecting">Connexion</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Connexion pour vérification...</string>
+  <string name="RegistrationProgressActivity_network_error">Erreur de réseau!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Impossible d\'effectuer la connexion. Merci de vérifier votre connexion réseau, et de réessayer.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Echec de la vérification !</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Le code de vérification que vous avez introduit est erroné. Veuillez réessayer.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Trop de tentatives</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Vous avez introduit un code de vérification incorrect trop de fois. Merci de patienter une minute avant de réessayer.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Demande d\'appel</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Demande d\'appel entrant de vérification...</string>
+  <string name="RegistrationProgressActivity_server_error">Erreur du serveur distant</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Une erreur est survenue sur le serveur distant. Merci de réessayer</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Trop De Demandes !</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Vous avez déjà demandé un appel vocal. Vous pouvez en demander un autre dans 20 minutes.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Vérification du code voix...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Inscription Terminée</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">L\'inscription de TextSecure s\'est achevée avec succès.</string>
+  <string name="RegistrationService_registration_error">Erreur d\'Inscription</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 cryptage inconnue a été reçu. Cliquer pour l\'accepter et l\'afficher.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Ai reçu de nouvelles informations d\'identité, mais celles-ci sont inconnues. Tapez pour valider l\'identité.</string>
+  <string name="SmsMessageRecord_secure_session_ended">La session sécurisée s’est terminée.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Groupe quitté…</string>
+  <string name="TheadRecord_secure_session_ended">La session sécurisée s’est terminée.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Vous n’avez pas de clé d’identité.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Le destinataire n’a pas de clé d’identité.</string>
@@ -183,8 +263,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Importation en cours</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importation des Messages Texte</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Phrase de passe TextSecure en cache</string>
-  <string name="KeyCachingService_passphrase_cached">Phrase de passe en cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Touchez pour ouvrir.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Touchez pour ouvrir, ou touchez le cadenas pour fermer.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure est dévérouillé</string>
+  <string name="KeyCachingService_lock">Vérouiller avec la phrase de passe</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nouveaux messages</string>
   <string name="MessageNotifier_most_recent_from_s">Dernier de : %s</string>
@@ -217,12 +299,15 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Aucun contact.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Recherche des contacts en cours...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Taper un nom à filtrer...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Sélectionner pour</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Aucun appel récent.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Entrez le message</string>
+  <string name="conversation_activity__type_message"><small>Envoyer un message</small></string>
   <string name="conversation_activity__send">Envoyer</string>
   <string name="conversation_activity__remove">Supprimer</string>
   <!--conversation_item_sent-->
@@ -233,8 +318,11 @@
   <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>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Chargement des pays...</string>
+  <string name="country_selection_fragment__search">Chercher</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">Veuillez choisir une phrase de passe pour chiffrer localement vos données. Cette phrase de passe doit être complexe.</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">Veuillez choisir une phrase de passe si vous souhaitez chiffrer localement vos données.</string>
   <string name="create_passphrase_activity__passphrase">Phrase de passe :</string>
   <string name="create_passphrase_activity__repeat">Répétez :</string>
   <string name="create_passphrase_activity__continue">Continuer</string>
@@ -272,8 +360,45 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">PORT PROXY MMS (OPTIONNEL) :</string>
   <!--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 discrétion 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__your_country">VOTRE PAYS</string>
+  <string name="registration_activity__your_country_code_and_phone_number">VOTRE CODE PAYS ET\nVOTRE NUMERO DE TELEPHONE</string>
+  <string name="registration_activity__phone_number">NUMERO DE TELEPHONE</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 des informations de contact au serveur bientôt.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Certains des problèmes possibles\nsont:</string>
+  <string name="registration_problems__sms_interceptors">Intercepteurs de 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__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__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>
+  <!--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 cliqué \"Appelez-Moi\",\nentrez 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">TextSecure a été incapable de 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 connection\nau réseau.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Votre\nappareil a besoin d\'une connection à un réseau de données pour utiliser cette fonction de TextSecure. Assurez-vous\nqu\'il est connecté à la 3G ou au WiFi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Parre-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é par WiFi, il est possible qu\'il y ait un pare-feu qui bloque l\'accès\nau serveur distant 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__connecting">Connexion...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Attente du SMS\nvé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\npourrait prendre un moment. Merci d\'être patient, nous vous dirons quand la vérification s\'est achevée.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nLa connection de TextSecure s\'est interrompue en attendant un SMS de vérification.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Echec de la vérification\npar SMS.</string>
+  <string name="registration_progress_activity__generating_keys">Création des clés de cryptage...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">À</string>
+  <string name="recipients_panel__add_member">Ajouter un membre</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Vous n\'avez pour l’instant pas de clé d\'identité dans votre base de données de confiance.</string>
   <!--verify_identity_activity-->
@@ -291,6 +416,7 @@
   <string name="AndroidManifest__create_passphrase">Créer une phrase de passe</string>
   <string name="AndroidManifest__enter_passphrase">Saisir la phrase de passe</string>
   <string name="AndroidManifest__select_contacts">Sélectionner des contacts</string>
+  <string name="AndroidManifest__select_contact">Sélectionner contact</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure détecté</string>
   <string name="AndroidManifest__public_identity_key">Clé d\'Identité Publique</string>
   <string name="AndroidManifest__change_passphrase">Modifier la phrase de passe</string>
@@ -308,6 +434,8 @@
   <string name="preferences__pref_all_mms_title">Utiliser pour tous les MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utiliser TextSecure pour consulter et stocker tous les messages texte entrant ?</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utiliser TextSecure pour consulter et stocker tous les messages multimédia entrant ?</string>
+  <string name="preferences__enable_enter_key_title">Activer la touche Entrée</string>
+  <string name="preferences__replace_smiley_with_enter_key">Remplacer la touche émoticône par une touche Entrée</string>
   <string name="preferences__pref_enter_sends_title">La touche Entrée envoie</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">La touche entrée enverra les messages texte</string>
   <string name="preferences__display_settings">Paramètres d\'affichage</string>
@@ -331,12 +459,9 @@
   <string name="preferences__notifications">Notifications</string>
   <string name="preferences__display_message_notifications_in_status_bar">Afficher les notifications dans la barre de statut</string>
   <string name="preferences__led_color">Couleur de la LED</string>
-  <string name="preferences__change_notification_led_color">Modifier la couleur de la LED de notification</string>
   <string name="preferences__pref_led_blink_title">Rythme de clignotement de la LED</string>
-  <string name="preferences__change_notification_blink_pattern">Modifier le rythme de clignotement de la LED de notification</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Choisir le rythme de clignotement de la LED</string>
-  <string name="preferences__select_led_color">Choisir la couleur de la LED</string>
   <string name="preferences__sound">Son</string>
+  <string name="preferences__change_notification_sound">Modifier le son de notification</string>
   <string name="preferences__inthread_notifications">Notifications dans la discussion</string>
   <string name="preferences__play_inthread_notifications">Émettre une notification sonore lors de la lecture d’une discussion active.</string>
   <string name="preferences__vibrate">Vibrer</string>
@@ -361,8 +486,8 @@
   <string name="preferences__mmsc_url_required">URL MMSC (Obligatoire)</string>
   <string name="preferences__mms_proxy_host_optional">Hôte Proxy MMS (Optionnel)</string>
   <string name="preferences__mms_proxy_port_optional">Port Proxy MMS (Optionnel)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
   <string name="preferences__sms_delivery_reports">Accusés de réception SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatiquement les anciens messages lorsque la conversation dépasse un certaine taille d\'échange.</string>
   <string name="preferences__delete_old_messages">Supprimer les anciens messages</string>
   <string name="preferences__storage">Stockage</string>
@@ -377,6 +502,11 @@
   <string name="preferences__language">Langue</string>
   <string name="preferences__make_default_sms_app">Régler comme app 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">Pousser les messages</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nAugmenter la discrétion 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 solution de repli SMS</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Envoyer et recevoir des SMS quand les données ne sont pas disponible</string>
+  <string name="preferences__refresh_push_directory">Actualiser le Répertoire de Push</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -402,13 +532,17 @@
   <string name="conversation_list_batch__menu_select_all">Sélectionner tout</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Chercher</string>
+  <string name="conversation_list__drawer_open">Ouvrir le volet de navigation</string>
+  <string name="conversation_list__drawer_close">Fermer le volet de navigation</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sécurité</string>
-  <string name="conversation_secure_verified__menu_verify_session">Vérifier la Session</string>
+  <string name="conversation_secure_verified__menu_no_identity">Pas d\'Identité Disponible</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Vérifier le Destinataire</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Interrompre la session sécurisée</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Fin de la session sécurisée</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Ajouter une pièce jointe</string>
+  <string name="conversation__menu_update_group">Modifier le Groupe</string>
+  <string name="conversation__menu_leave_group">Quitter le Groupe</string>
   <string name="conversation__menu_add_contact_info">Ajouter des informations de contact</string>
   <string name="conversation__menu_delete_thread">Supprimer le fil de discussion</string>
   <!--conversation_group_options-->
@@ -424,8 +558,9 @@
   <string name="text_secure_locked__menu_unlock">Débloquer</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nouveau Message</string>
+  <string name="text_secure_normal__menu_new_group">Nouveau groupe</string>
   <string name="text_secure_normal__menu_settings">Paramètres</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Oublier le mot de passe</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Vérouiller</string>
   <string name="text_secure_normal__mark_all_as_read">Tout marquer comme Lu</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Vérifié</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index f16da17f04..ae33d12f0b 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -33,15 +33,12 @@
   <string name="ConversationItem_success_exclamation">הצליח!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">לא ניתן לכתוב לכרטיס ה-SD!</string>
   <string name="ConversationItem_view_secure_media_question">לצפות במדיה מאובטחת?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">המדיה נשמרה בבסיס נתונים מוצפן. למרבה הצער, כדי לצפות בזה עם קורא חיצוני יש לפענח זמנית את המידע ולכתוב אותו לדיסק. אתה בטוח שאתה רוצה לעשות את זה?</string>
   <string name="ConversationItem_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>
   <!--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>
@@ -55,7 +52,6 @@
   <string name="ConversationActivity_forward_message_prefix">העבר</string>
   <string name="ConversationActivity_group_conversation_recipients">נמעני שיחה קבוצתית</string>
   <string name="ConversationActivity_group_conversation">שיחה קבוצתית</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d נמענים בקבוצה</string>
   <string name="ConversationActivity_saving_draft">שומר טיוטה...</string>
   <string name="ConversationActivity_invalid_recipient">נמען שגוי!</string>
   <string name="ConversationActivity_calls_not_supported">שיחות אינן נתמכות</string>
@@ -88,6 +84,7 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">שגיאה בכתיבה לכרטיס ה-SD.\n</string>
   <string name="ExportFragment_success">הצליח!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">מייצא מפתחות, הגדרות\nוהודעות מוצפנות...\n</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">לייבא את בסיס הנתונים של ה-SMS מהמערכת?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">פעולה זו תייבא\nהודעות מבסיס הנתונים של ה-SMS ברירת המחדל של המערכת ל-TextSecure.\n אם כבר ייבאת מבסיס נתונים זה, ייבוא מחדש יגרום להודעות כפולות.</string>
@@ -97,7 +94,6 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nשחזור גיבוי מוצפן יחליף לגמרי את המפתחות, ההגדרות וההודעות הקיימות.\nאתה \nתאבד את כל המידע שבהתקנת ה-TextSecure הנוכחית שלך אבל לא שבגיבוי.\n</string>
   <string name="ImportFragment_restore">שחזר</string>
   <string name="ImportFragment_import_plaintext_backup">לייבא גיבוי לא מוצפן?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">פעולה זו תייבא\nהודעות מגיבוי לא מוצפן. אם כבר ייבאת בעבר את בסיס הנתונים\nשל ה-SMS\nשל המערכת, ייבוא מחדש יגרום להודעות כפולות.\n</string>
   <string name="ImportFragment_importing">מייבא</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">יבא גיבוי לא מוצפן...</string>
   <string name="ImportFragment_no_plaintext_backup_found">לא נמצא גיבוי לא מוצפן!</string>
@@ -132,6 +128,13 @@
   <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>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">המשך</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">אין לך מפתח זהות.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">לנמען אין מפתח זהות.</string>
@@ -183,8 +186,6 @@
   <string name="ApplicationMigrationService_import_in_progress">בתהליך ייבוא</string>
   <string name="ApplicationMigrationService_importing_text_messages">מייבא הודעות טקסט</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">הסיסמה של TextSecure בזיכרון</string>
-  <string name="KeyCachingService_passphrase_cached">הסיסמא בזיכרון</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d הודעות חדשות</string>
   <string name="MessageNotifier_most_recent_from_s">האחרון מ-: %s</string>
@@ -216,12 +217,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">אין אנשי קשר.</string>
+  <!--single_contact_selection_activity-->
   <!--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">הקלד הודעה</string>
   <string name="conversation_activity__send">שלח</string>
   <string name="conversation_activity__remove">הסר</string>
   <!--conversation_item_sent-->
@@ -232,8 +233,9 @@
   <string name="conversation_item_received__downloading">מוריד</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">מצב בחירה מרובה</string>
+  <!--country_selection_fragment-->
+  <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__passphrase">סיסמה:</string>
   <string name="create_passphrase_activity__repeat">חזור:</string>
   <string name="create_passphrase_activity__continue">המשך</string>
@@ -271,6 +273,9 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">פתחת ה-Proxy של שרת ה-MMS (לא חובה):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">השלם</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">אל</string>
   <!--review_identities-->
@@ -330,11 +335,7 @@
   <string name="preferences__notifications">התראות</string>
   <string name="preferences__display_message_notifications_in_status_bar">הצג התראות של הודעה בשורת המצב</string>
   <string name="preferences__led_color">צבע LED</string>
-  <string name="preferences__change_notification_led_color">שנה צבע LED של התראות</string>
   <string name="preferences__pref_led_blink_title">תבנית הבהוב ה- LED</string>
-  <string name="preferences__change_notification_blink_pattern">שנה את תבנית הבהוב הLED בהתראה</string>
-  <string name="preferences__pref_led_blink_dialogtitle">בחר תבנית הבהוב ה-LED</string>
-  <string name="preferences__select_led_color">בחר צבע LED</string>
   <string name="preferences__sound">קול</string>
   <string name="preferences__inthread_notifications">התראות תוך-שרשוריות</string>
   <string name="preferences__play_inthread_notifications">נגן צליל התראות כשצופים בשיחה פעילה.</string>
@@ -360,8 +361,8 @@
   <string name="preferences__mmsc_url_required">כתובת MMSC (חובה)</string>
   <string name="preferences__mms_proxy_host_optional">שרת Proxy של MMS (לא חובה)</string>
   <string name="preferences__mms_proxy_port_optional">יציאת MMS (לא חובה)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">בקש דוח מסירה לכל SMS שאתה שולח</string>
   <string name="preferences__sms_delivery_reports">דוחות מסירה של SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">בקש דוח מסירה לכל SMS שאתה שולח</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">מחק אוטומטית הודעות ישנות יותר כששרשור השיחה עולה על אורך מסויים</string>
   <string name="preferences__delete_old_messages">מחק הודעות ישנות</string>
   <string name="preferences__storage">אחסון</string>
@@ -401,9 +402,7 @@
   <string name="conversation_list__menu_search">חפש</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">אבטחה</string>
-  <string name="conversation_secure_verified__menu_verify_session">אמת חיבור</string>
   <string name="conversation_secure_verified__menu_verify_recipient">אמת נמען</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">בטל חיבור מאובטח</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">צרף קובץ</string>
   <string name="conversation__menu_add_contact_info">הוסף מידע לאיש הקשר</string>
@@ -422,7 +421,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">הודעה חדשה</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>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 08462187c4..019ef0f886 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -31,18 +31,16 @@
   <string name="ConversationItem_success_exclamation">Completato!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Impossibile scrivere nella memoria SD!</string>
   <string name="ConversationItem_view_secure_media_question">Vuoi vedere il file multimediale?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Questo file multimediale è salvato in un database cifrato. Sfortunatamente, per vederlo con un programma esterno è necessario che il file venga decifrato e riscritto su disco. Vuoi procedere?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Contrattazione della chiave ricevuta e completata.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Errore, ricevuto messaggio per la contrattazione della chiave scaduto.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ricevuto messaggio per la contrattazione della chiave, cliccare per procedere</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Ricevuto messaggio per lo scambio della chiave, cliccare per procedere</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniziare una sessione sicura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniziare una sessione sicura con %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Terminare la sessione sicura?</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Sei sicuro di voler terminare questa sessione sicura?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confermi di voler cancellare il thread?</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Sei sicuro di voler cancellare permanentemente questa conversazione?</string>
   <string name="ConversationActivity_add_attachment">Aggiungi allegato</string>
+  <string name="ConversationActivity_select_contact_info">Seleziona informazioni dei contatti</string>
   <string name="ConversationActivity_compose_message">Scrivi un messaggio</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Attenzione, c\'è stato un errore nell\'inviare il tuo allegato.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Attenzione, il video selezionato supera la grandezza massima consentita.</string>
@@ -52,7 +50,6 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Conversazione di Gruppo Destinatari</string>
   <string name="ConversationActivity_group_conversation">Conversazione di Gruppo</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d destinatari in gruppo</string>
   <string name="ConversationActivity_saving_draft">Salvataggio in corso</string>
   <string name="ConversationActivity_invalid_recipient">Destinatario invalido!</string>
   <string name="ConversationActivity_calls_not_supported">Chiamate non supportate</string>
@@ -80,16 +77,32 @@
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Attenzione, verranno\n        esportati i contenuti dei tuoi messaggi TextSecure in formato plaintext nella scheda SD.\n    </string>
   <string name="ExportFragment_cancel">Cancella</string>
   <string name="ExportFragment_exporting">In esportazione</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Esporta il testo in formato PlainText nella scheda SD?</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Errore, impossibile scrivere \nnella scheda SD!</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">Errore durante la scrittura su scheda SD.</string>
   <string name="ExportFragment_success">Completato!</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">Esporta le chiavi crittografiche,\nle impostazioni ed i messaggi...</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">Importare gli SMS dal Database di sistema?</string>
   <string name="ImportFragment_import">Importa</string>
   <string name="ImportFragment_cancel">Cancella</string>
+  <string name="ImportFragment_restore_encrypted_backup">Ripristinare il Backup crittato?</string>
+  <string name="ImportFragment_restore">Ripristina</string>
+  <string name="ImportFragment_importing">Importazione</string>
+  <string name="ImportFragment_error_importing_backup">Errore durante l\'importazione del backup!</string>
+  <string name="ImportFragment_import_complete">Importazione terminata!</string>
+  <string name="ImportFragment_restoring">Ripristino</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Ripristino backup crittato...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Nessun backup crittato trovato!</string>
+  <string name="ImportFragment_restore_complete">Ripristino completato!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nessuna chiave scansionata trovata!</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Nessuna connessione disponibile per il download del MMS, riprovare più tardi...</string>
   <string name="MmsDownloader_error_storing_mms">Errore nel salvare l\'MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Errore durante la connessione al provider MMS...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Errore durante la lettura delle impostazioni MMS</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Messaggio Multimediale</string>
   <!--PassphraseChangeActivity-->
@@ -108,6 +121,13 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">La\nfirma su questo scambio di chiavi è differente di quella ricevuta precedentemente. Questo potrebbe significare che qualcuno stà cercando di intercettare la tua comunicazione\no\nche il contatto ha reinstallato TextSecure e ora ha una nuova chiave.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Dovresti verificare\nquesto contatto.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">La\nfirma di questa chiave è fidata, ma al momento hai lo scambio automatico della chiave disabilitato.</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">Continua</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Non hai una chiave di identità.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Il destinatario non ha una chiave di identità.</string>
@@ -158,8 +178,6 @@
   <string name="ApplicationMigrationService_import_in_progress">Importazione in corso</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importazione dei messaggi di testo</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Password di TextSecure salvata in cache</string>
-  <string name="KeyCachingService_passphrase_cached">Password salvata in cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nuovi messaggi</string>
   <string name="MessageNotifier_most_recent_from_s">Più recente da: %s</string>
@@ -167,13 +185,17 @@
   <string name="MessageNotifier_no_subject">(Nessun Oggetto)</string>
   <string name="MessageNotifier_message_delivery_failed">Non è riuscito l\'invio del messaggio</string>
   <string name="MessageNotifier_failed_to_deliver_message">Non è riuscito l\'invio del messaggio</string>
-  <string name="MessageNotifier_error_delivering_message">C\'e stato un errore durante l\'invio del messagio</string>
-  <string name="MessageNotifier_mark_all_as_read">Segna tutti come gia\' letto</string>
-  <string name="MessageNotifier_mark_as_read">Segna come gia\' letto</string>
+  <string name="MessageNotifier_error_delivering_message">C\'è stato un errore durante l\'invio del messagio</string>
+  <string name="MessageNotifier_mark_all_as_read">Segna tutto come già letto</string>
+  <string name="MessageNotifier_mark_as_read">Segna come già letto</string>
   <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_regenerating">Rigenerazione...</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Reimpostare la chiave d\'identità?</string>
   <string name="ViewLocalIdentityActivity_cancel">Cancella</string>
+  <string name="ViewLocalIdentityActivity_continue">Continua</string>
   <!--SmsReceiver-->
-  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">In questo momento non e\' possibile inviare il tuo messagio SMS. Sara\' inviato quando la communicazione e\' disponibile</string>
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">In questo momento non è possibile inviare il tuo messagio SMS. Sarà inviato quando la comunicazione è disponibile</string>
+  <!--QuickResponseService-->
   <!--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">Hai ricevuto un messaggio da qualcuno che supporta una sessione cifrata di TextSecure. Vuoi iniziare una sessione sicura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Inizio scambio delle chiavi</string>
@@ -184,12 +206,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nessun contatto.</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleziona per</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Nessuna chiamata recente.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Inserisci il messaggio</string>
   <string name="conversation_activity__send">Invia</string>
   <string name="conversation_activity__remove">Elimina</string>
   <!--conversation_item_sent-->
@@ -200,8 +222,9 @@
   <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>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__search">Cerca</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">Scegli una password che verrà usata per cifrata i tuoi dati localmente. Attenzione a scegliere una password robusta.</string>
   <string name="create_passphrase_activity__passphrase">Password:</string>
   <string name="create_passphrase_activity__repeat">Ripeti:</string>
   <string name="create_passphrase_activity__continue">Continua</string>
@@ -211,11 +234,16 @@
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Il database di default non verrà modificat o alterato in nessun modo.</string>
   <string name="database_migration_activity__skip">Salta</string>
   <string name="database_migration_activity__import">Importa</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Potrebbe volerci un pò. Attendi per favore, verrai notificato quando l\'importazione sarà completata.</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Potrebbe volerci un po\'. Attendi per favore, verrai notificato quando l\'importazione sarà completata.</string>
   <string name="database_migration_activity__importing">COPIA</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aggiornamento Database...</string>
+  <string name="export_fragment__export_encrypted_backup">Esporta il backup crittato</string>
+  <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Esporta un backup\ncrittato sulla scheda SD</string>
+  <string name="import_fragment__import_encrypted_backup">Importa backup crittato</string>
+  <string name="local_identity__regenerate_key">Rigenera chiave</string>
   <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">Impostazioni manuali degli MMS sono necessarie per il tuo telefono.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">PASSWORD TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Sblocca</string>
@@ -225,6 +253,9 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PORTA PROXY ( OPZIONALE )</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completato</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">A</string>
   <!--review_identities-->
@@ -252,6 +283,9 @@
   <string name="AndroidManifest__manage_identity_keys">Controlla le chiavi di identità</string>
   <string name="AndroidManifest__complete_key_exchange">Completa lo scambio della chiave</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Importa/Esporta</string>
+  <string name="arrays__my_identity_key">La mia chiave d\'identità</string>
+  <string name="arrays__contact_keys">Chiavi dei contatti</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generale</string>
   <string name="preferences__pref_all_sms_title">Utilizza per tutti gli SMS</string>
@@ -266,6 +300,7 @@
   <string name="preferences__change_passphrase">Cambia passphrase</string>
   <string name="preferences__change_my_passphrase">Cambia la mia password</string>
   <string name="preferences__complete_key_exchanges">Scambio di chiavi completato</string>
+  <string name="preferences__disable_passphrase">Disabilita passphrase</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Completa lo scambio della chiave automaticamente per le nuove sessione con la stessa chiave di identità</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Dimentica la password dalla cache dopo un intervallo di tempo</string>
   <string name="preferences__timeout_passphrase">Tempo per dimenticare la password</string>
@@ -279,11 +314,9 @@
   <string name="preferences__notifications">Notifiche</string>
   <string name="preferences__display_message_notifications_in_status_bar">Mostra messaggio di notifica nella barra di stato</string>
   <string name="preferences__led_color">Colore del LED</string>
-  <string name="preferences__change_notification_led_color">Cambia il colore del LED di notifica</string>
   <string name="preferences__pref_led_blink_title">Impostazioni LED</string>
-  <string name="preferences__change_notification_blink_pattern">Cambia il lampeggio del LED di notifica</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Seleziona un impostazione per il LED di notifica</string>
-  <string name="preferences__select_led_color">Selezione il colore del LED</string>
+  <string name="preferences__sound">Suono</string>
+  <string name="preferences__change_notification_sound">Cambia il suono di notifica</string>
   <string name="preferences__vibrate">Vibrazione</string>
   <string name="preferences__also_vibrate_when_notified">Vibra anche durante l\'arrivo di una notifica</string>
   <string name="preferences__minutes">minuti</string>
@@ -300,11 +333,14 @@
   <string name="preferences__custom">Personalizzato</string>
   <string name="preferences__advanced">Avanzate</string>
   <string name="preferences__passphrase">Passphrase</string>
+  <string name="preferences__advanced_mms_access_point_names">Impostazioni MMS.</string>
+  <string name="preferences__enable_manual_mms">Abilita MMS manuali.</string>
+  <string name="preferences__override_system_mms_settings">Sovrascrivi le impostazioni MMS di sistema con le seguenti informazioni</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Richiesto)</string>
   <string name="preferences__mms_proxy_host_optional">MMS - Indirizzo Proxy ( Opzionale )</string>
   <string name="preferences__mms_proxy_port_optional">MMS - Porta Proxy ( Opzionale )</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Richiedi un rapporto di consegna per ogni SMS inviato</string>
   <string name="preferences__sms_delivery_reports">Rapporti di consegna SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Richiedi un rapporto di consegna per ogni SMS inviato</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automaticamente i messaggi più vecchi quando un thread di conversazione supera una lunghezza determinata.</string>
   <string name="preferences__delete_old_messages">Elimina i messagi vecchi</string>
   <string name="preferences__storage">Stoccaggio</string>
@@ -315,7 +351,10 @@
   <string name="preferences__dark_theme">Tema Scuro</string>
   <string name="preferences__appearance">Aspetto</string>
   <string name="preferences__theme">Tema</string>
+  <string name="preferences__default">Predefinito</string>
   <string name="preferences__language">Lingua</string>
+  <string name="preferences__make_default_sms_app">Imposta come applicazione SMS predefinita.</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Rendi TextSecure l\'applicazione predefinita per SMS/MMS.</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -333,6 +372,7 @@
   <string name="conversation_context__menu_copy_text">Copia testo</string>
   <string name="conversation_context__menu_delete_message">Cancella messaggio</string>
   <string name="conversation_context__menu_forward_message">Inoltra messaggio</string>
+  <string name="conversation_context__menu_resend_message">Rinvia il messaggio</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Inizia una sessione sicura</string>
   <!--conversation_list_batch-->
@@ -342,9 +382,7 @@
   <string name="conversation_list__menu_search">Cerca</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicurezza</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verifica la sessione</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verifica il destinatario</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Cancella la sessione sicura</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Aggiungi allegato</string>
   <string name="conversation__menu_delete_thread">Cancella conversazione</string>
@@ -362,8 +400,7 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nuovo messaggio</string>
   <string name="text_secure_normal__menu_settings">Impostazioni</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Cancella password</string>
-  <string name="text_secure_normal__mark_all_as_read">Segna come gia\' letto</string>
+  <string name="text_secure_normal__mark_all_as_read">Segna come già letto</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificato</string>
   <!--EOF-->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index bebeff195d..f1efa56575 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -33,15 +33,11 @@
   <string name="ConversationItem_success_exclamation">成功しました。</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">SDカードに書き込めません。</string>
   <string name="ConversationItem_view_secure_media_question">暗号化されたファイルを表示しますか？</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">このファイルは暗号化されたデータベースに保存されています。外部コンテンツのビューアで見るには、データを一時的に復号し、ディスクに書き込まなければなりません。この作業を実行してもいいですか？</string>
   <string name="ConversationItem_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>
   <!--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>
@@ -54,7 +50,6 @@
   <string name="ConversationActivity_forward_message_prefix">転送：</string>
   <string name="ConversationActivity_group_conversation_recipients">グループ通信の受信者</string>
   <string name="ConversationActivity_group_conversation">グループ通信</string>
-  <string name="ConversationActivity_d_recipients_in_group">グループの受信者は%d人です</string>
   <string name="ConversationActivity_saving_draft">下書き保存中…</string>
   <string name="ConversationActivity_invalid_recipient">受信先が無効です。</string>
   <string name="ConversationActivity_calls_not_supported">通話不可</string>
@@ -87,6 +82,7 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">SDカードに書き込む途中でエラーが発生しました。</string>
   <string name="ExportFragment_success">成功しました。</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">暗号化されたキー、設定及びメッセージをエクスポート中…</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">携帯端末のSMSデータベースをインポートしますか？</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">これで、携帯端末の既定SMSデータベースにあるメッセージがTextSecureにインポートされます。以前にこの作業を行ったことがあれば、メッセージが重複する場合があります。</string>
@@ -96,7 +92,6 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n暗号化されたバックアップ・ファイルを復元すると、現在のキー、設定、及びメッセージは完全に上書きされます。現在の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>
   <string name="ImportFragment_importing">インポート中…</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">非暗号テキストのバックアップ・ファイルをインポート中…</string>
   <string name="ImportFragment_no_plaintext_backup_found">非暗号テキストのバックアップ・ファイルが見つかりませんでした。</string>
@@ -130,6 +125,13 @@
   <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>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">続行</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">認証キーがありません。</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">受信者は認証キーがありません。</string>
@@ -180,8 +182,6 @@
   <string name="ApplicationMigrationService_import_in_progress">インポート中</string>
   <string name="ApplicationMigrationService_importing_text_messages">テキストメッセージをインポート中</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecureパスワードがキャッシュされています</string>
-  <string name="KeyCachingService_passphrase_cached">パスワードがキャッシュされています</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d 新しいメッセージ</string>
   <string name="MessageNotifier_most_recent_from_s">最新の送信者： %s</string>
@@ -202,6 +202,7 @@
   <string name="ViewLocalIdentityActivity_continue">続行</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">現在、このSMSは送信できません。サービスが利用可能になると、すぐに送信されます。</string>
+  <!--QuickResponseService-->
   <!--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>
@@ -212,12 +213,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">連絡先はありません。</string>
+  <!--single_contact_selection_activity-->
   <!--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">メッセージを入力</string>
   <string name="conversation_activity__send">送信</string>
   <string name="conversation_activity__remove">削除</string>
   <!--conversation_item_sent-->
@@ -228,8 +229,9 @@
   <string name="conversation_item_received__downloading">ダウンロード中</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">一括選択モード</string>
+  <!--country_selection_fragment-->
+  <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__passphrase">パスワード：</string>
   <string name="create_passphrase_activity__repeat">再入力：</string>
   <string name="create_passphrase_activity__continue">続行</string>
@@ -264,6 +266,9 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMSプロキシ・ポート (自由選択)</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">完了</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">宛先</string>
   <!--review_identities-->
@@ -322,12 +327,6 @@
   <string name="preferences__manage_configured_identity_keys">設定済みの認証キーを管理</string>
   <string name="preferences__notifications">通知</string>
   <string name="preferences__display_message_notifications_in_status_bar">受信通知をステータスバーに表示</string>
-  <string name="preferences__led_color">LED色</string>
-  <string name="preferences__change_notification_led_color">受信通知のLED色を変更</string>
-  <string name="preferences__pref_led_blink_title">LED点滅パターン</string>
-  <string name="preferences__change_notification_blink_pattern">通知LED点滅パターンの変更</string>
-  <string name="preferences__pref_led_blink_dialogtitle">LED点滅パターンを選択</string>
-  <string name="preferences__select_led_color">LED色を選択</string>
   <string name="preferences__vibrate">振動</string>
   <string name="preferences__also_vibrate_when_notified">通知する時に振動もする</string>
   <string name="preferences__minutes">分</string>
@@ -347,8 +346,8 @@
   <string name="preferences__mmsc_url_required">MMSC URL (必須)</string>
   <string name="preferences__mms_proxy_host_optional">MMSプロキシ・ホスト（選択自由）</string>
   <string name="preferences__mms_proxy_port_optional">MMSプロキシ・ポート（選択自由）</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">送信する全てのSMSに配信報告をつけます</string>
   <string name="preferences__sms_delivery_reports">SMS配信報告</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">送信する全てのSMSに配信報告をつけます</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">会話スレッドが一定の長さを超えると、古いメッセージが自動的に削除されます</string>
   <string name="preferences__delete_old_messages">古いメッセージの削除</string>
   <string name="preferences__storage">ストレージ</string>
@@ -387,9 +386,7 @@
   <string name="conversation_list__menu_search">検索</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">セキュリティ</string>
-  <string name="conversation_secure_verified__menu_verify_session">セッションを照合</string>
   <string name="conversation_secure_verified__menu_verify_recipient">受信者を照合</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">セキュア・セッションを中止</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">添付</string>
   <string name="conversation__menu_delete_thread">スレッドを削除</string>
@@ -407,7 +404,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">新規メッセージ</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>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index d998285738..90ddfe7d2f 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -16,6 +16,9 @@
   <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_disable">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
+  <string name="ApplicationPreferencesActivity_unregistering">ನೋಂದಣಿಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುತ್ತಿದೆ...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">ಮಾಹಿತಿ ಆಧಾರಿತ ಸಂವಹನವನ್ನು ರದ್ದುಗೊಳಿಸಲು</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">ಸರ್ವರ್ಗೆ ಸಂಪರ್ಕಿಸುವಾಗ ದೋಷ!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">ಚಿತ್ರ</string>
   <string name="AttachmentTypeSelectorAdapter_video">ದೃಶ್ಯ</string>
@@ -33,15 +36,15 @@
   <string name="ConversationItem_success_exclamation">ಯಶಸ್ವಿಯಾಗಿದೆ!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">ಎಸ್. ಡಿ ಕಾರ್ಡಿಗೆ ಬರೆಯಲು ಸಾಧ್ಯವಿಲ್ಲ!</string>
   <string name="ConversationItem_view_secure_media_question">ಸುರಕ್ಷಿತ ಮಾಧ್ಯಮವನ್ನು ವೀಕ್ಷಿಸಬೇಕೆ?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">ಈ ಕಡತವನ್ನು ಗೂಢಲಿಪೀಕರಣಗೊಂಡ ದತ್ತಸಂಚಯದಲ್ಲಿ ಸಂಗ್ರಹಿಸಲಾಗಿದೆ. ದುರದೃಷ್ಟವಶಾತ್, ಬಾಹ್ಯ ಕಂಟೆಂಟ್ ವೀಕ್ಷಕದಲ್ಲಿ ಇದನ್ನು ವೀಕ್ಷಿಸಲು  ತಾತ್ಕಾಲಿಕವಾಗಿ ಇದನ್ನು ಡಿಕ್ರಿಪ್ಟ್ ಮಾಡಿ ಡಿಸ್ಕಿಗೆ ಬರೆಯಬೇಕಾಗುತ್ತದೆ.  ನೀವು ಹಾಗೆ ಮಾಡಲು ಬಯಸುತ್ತೀರಿ ಎಂದು ಖಾತ್ರಿಯೇ?</string>
+  <string name="ConversationItem_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_key_exchange_message_click_to_process">ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶ ಸ್ವೀಕರಿಸಲಾಗಿದೆ, ಪ್ರಕ್ರಿಯೆಗೊಳಿಸಲು ಕ್ಲಿಕ್ ಮಾಡಿ.</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_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>
@@ -55,7 +58,6 @@
   <string name="ConversationActivity_forward_message_prefix">ಎಫ್. ಡಬ್ಲು. ಡಿ</string>
   <string name="ConversationActivity_group_conversation_recipients">ಸಮೂಹ ಸಂವಾದದ ಸ್ವೀಕೃತದಾರರು</string>
   <string name="ConversationActivity_group_conversation">ಸಮೂಹ ಸಂವಾದ</string>
-  <string name="ConversationActivity_d_recipients_in_group">ಈ ಗುಂಪಿನಲ್ಲಿ %d ಸ್ವೀಕೃತಿದಾರರು </string>
   <string name="ConversationActivity_saving_draft">ಕರಡು ಉಳಿಸುತ್ತಿದ್ದೇವೆ</string>
   <string name="ConversationActivity_invalid_recipient">ಸ್ವೀಕರಿಸುವವರು ಅಮಾನ್ಯ!</string>
   <string name="ConversationActivity_calls_not_supported">ಕರೆಗಳ ಬೆಂಬಲವಿರುವುದಿಲ್ಲ</string>
@@ -88,6 +90,7 @@
   <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>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">ವ್ಯವಸ್ಥೆಯ  ಎಸ್.ಎಮ್.ಎಸ್ ದತ್ತಾಂಶವನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">ಇದು ವ್ಯವಸ್ಥೆಯ ಪೂರ್ವನಿಯೋಜಿತ ಎಸ್ಎಮ್ಎಸ್ ದತ್ತಸಂಚಯದಿಂದ ಟೆಕ್ಸ್ಟ್ ಸೆಕುರ್  ಗೆ ಸಂದೇಶಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳುತ್ತದೆ. \nನೀವು ಈ ಹಿಂದೆ ವ್ಯವಸ್ಥೆಯ ಸಂಚಿಕೆ ದತ್ತಾಂಶ ಆಮದು ಮಾಡಿಕೊಂಡಿದ್ದರೆ, ಮತ್ತೆ ಆಮದು ನಕಲು ಸಂದೇಶಗಳಿಗೆ ಕಾರಣವಾಗುತ್ತದೆ.</string>
@@ -97,7 +100,7 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nಗೂಢಲಿಪೀಕರಣಗೊಂಡ ಬ್ಯಾಕ್ಅಪ್ನ ಪುನಃಸ್ಥಾಪಿಸಿದರೆ, ಅದು ನಿಮ್ಮ ಚಾಲ್ತಿಯಲ್ಲಿರುವ ಕೀಲಿಗಳನ್ನು, ಆಯ್ಕೆಗಳು, ಮತ್ತು \nಸಂದೇಶಗಳನ್ನು ಸಂಪೂರ್ಣವಾಗಿ ಬದಲಾಯಿಸುತ್ತದೆ. ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್ ಅನುಸ್ಥಾಪನೆಯಲ್ಲಿ ಇರುವ ಹಾಗು \nಬ್ಯಾಕ್ಅಪ್ನಲ್ಲಿ ಇರದ ಯಾವುದೇ ಮಾಹಿತಿಯನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳುತ್ತೀರಿ.</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_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>
@@ -132,6 +135,53 @@
   <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_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_invalid_number">ಅಮಾನ್ಯವಾದ ಸಂಖ್ಯೆ</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">ನೀವು ಸೂಚಿಸಿದ \nಸಂಖ್ಯೆ (%s) ಅಮಾನ್ಯವಾಗಿದೆ. </string>
+  <string name="RegistrationActivity_unsupported">ಬೆಂಬಲವಿಲ್ಲ</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">ಕ್ಷಮಿಸಿ, \nಈ ಸಾಧನ ಮಾಹಿತಿ ಆಧಾರಿತ ಸಂದೇಶ ರವಾನೆಯನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ಆವೃತ್ತಿ ೪.೦ ಗಿಂತ ಹಳೆಯದಾಗಿರುವ ಆಂಡ್ರಾಯ್ಡ್ ಚಾಲನೆಯಲ್ಲಿರುವ ಸಾಧನಗಳು ನೋಂದಾಯಿತ ಗೂಗಲ್ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು. ಆಂಡ್ರಾಯ್ಡ್ ೪.೦ ಅಥವಾ ಹೊಸ ಆವೃತ್ತಿ ಚಾಲನೆಯಲ್ಲಿರುವ ಸಾಧನಗಳಿಗೆ ಗೂಗಲ್ ಖಾತೆಯ ಅಗತ್ಯವಿಲ್ಲ, ಆದರೆ ಪ್ಲೇ ಅಂಗಡಿ ಅಪ್ಲಿಕೇಶನ್ ಪ್ರತಿಸ್ಟಾಪಿಸಿರಬೇಕು. </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-->
+  <string name="RegistrationProblemsActivity_possible_problems">ಸಂಭಾವ್ಯ ಸಮಸ್ಯೆಗಳು</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">ಸಂಖ್ಯೆಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ</string>
+  <string name="RegistrationProgressActivity_edit_s">%s ಸಂಪಾದಿಸಿ</string>
+  <string name="RegistrationProgressActivity_registration_complete">ನೋಂದಣಿ ಪೂರ್ಣಗೊಂಡಿದೆ!</string>
+  <string name="RegistrationProgressActivity_possible_problems">ಸಂಭಾವ್ಯ ಸಮಸ್ಯೆಗಳು.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">ನೀವು ಮೊದಲ ಸ್ವೀಕರಿಸಿದ ಸಂಕೇತವನ್ನು ನಮೂದಿಸಬೇಕು ...</string>
+  <string name="RegistrationProgressActivity_connecting">ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">ಪರಿಶೀಲನೆಗಾಗಿ ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ ...</string>
+  <string name="RegistrationProgressActivity_network_error">ಜಾಲಬಂಧದ ದೋಷ!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ನಿಮ್ಮ ಜಾಲಬಂಧದ ಸಂಪರ್ಕವನ್ನೊಮ್ಮೆ ಪರಿಶೀಲಿಸಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
+  <string name="RegistrationProgressActivity_verification_failed">ಪರಿಶೀಲನೆ ವಿಫಲವಾಗಿದೆ!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">ನೀವು ಸಲ್ಲಿಸಿದ ಪರಿಶೀಲನಾ ಸ೦ಕೇತ ತಪ್ಪಾಗಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">ಬಹಳಷ್ಟು ಪ್ರಯತ್ನಗಳು</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">ನೀವು ತಪ್ಪು ಪರಿಶೀಲನಾ ಸ೦ಕೇತವನ್ನು ಹಲವು ಬಾರಿ ಸಲ್ಲಿಸಿದ್ದೀರಿ. ಪುನಃ ಪ್ರಯತ್ನಿಸುವ ಮೊದಲು ದಯವಿಟ್ಟು ಒಂದು ನಿಮಿಷ ನಿರೀಕ್ಷಿಸಿ.</string>
+  <string name="RegistrationProgressActivity_requesting_call">ಕರೆಗೆ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">ಒಳಬರುವ ಪರಿಶೀಲನೆ ಕರೆಗೆ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ ...</string>
+  <string name="RegistrationProgressActivity_server_error">ಸರ್ವರ್ ದೋಷ</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">ಸರ್ವರ್ ದೋಷವನ್ನು ಎದುರಿಸಿದೆ. ದಯವಿಟ್ಟು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">ಅತೀ ಹೆಚ್ಚು ವಿನಂತಿಗಳು!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">ನೀವು ಈಗಾಗಲೇ ಧ್ವನಿ ಕರೆಯನ್ನು ವಿನಂತಿಸಿರುವಿರಿ. ನೀವು 20 ನಿಮಿಷಗಳಲ್ಲಿ ಮತ್ತೊಂದುನ್ನು ಕೋರಬಹುದು.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">ಧ್ವನಿ ಸಂಕೇತವನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ ...</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">ಭ್ರಷ್ಟಗೊಂಡಿದೆ ಕೀಲಿಯನ್ನು ಸ್ವೀಕರಿಸಲಾಗಿದೆ\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>
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">ನೀವು ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಹೊಂದಿಲ್ಲ.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">ಸ್ವೀಕರಿಸುವವರ ಯಾವುದೇ ಗುರುತಿನ ಕೀಲಿಯನ್ನು ಹೊಂದಿಲ್ಲ.</string>
@@ -183,8 +233,10 @@
   <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_passphrase_cached">ಗುಪ್ತಪದನ್ನು ಉಳಿಸಿಕೊಳ್ಳಲಾಗಿದೆ </string>
+  <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>
@@ -217,12 +269,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">ಸಂಪರ್ಕಗಳಿಲ್ಲ.</string>
+  <!--single_contact_selection_activity-->
   <!--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">ಸಂದೇಶವನ್ನು ಟೈಪಿಸಿ</string>
   <string name="conversation_activity__send">ಕಳುಹಿಸು</string>
   <string name="conversation_activity__remove">ತೆಗೆದುಹಾಕಿ</string>
   <!--conversation_item_sent-->
@@ -233,8 +285,10 @@
   <string name="conversation_item_received__downloading">ಡೌನ್ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">ಗುಂಪು ಆಯ್ಕೆಯ ಕ್ರಮ</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">ರಾಷ್ಟ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ ...</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__passphrase">ಗುಪ್ತಪದ:</string>
   <string name="create_passphrase_activity__repeat">ಪುನರಾವರ್ತಿಸಿ:</string>
   <string name="create_passphrase_activity__continue">ಮುಂದುವರಿಸು</string>
@@ -272,6 +326,41 @@
   <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__your_country">ನಿಮ್ಮ ರಾಷ್ಟ್ರ</string>
+  <string name="registration_activity__your_country_code_and_phone_number">ನಿಮ್ಮ ರಾಷ್ಟ್ರ ಸಂಕೇತ ಹಾಗೂ\nದೂರವಾಣಿ ಸಂಖ್ಯೆ</string>
+  <string name="registration_activity__phone_number">ದೂರವಾಣಿ ಸಂಖ್ಯೆ</string>
+  <string name="registration_activity__register">ನೋಂದಾಯಿಸು</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">ನೋಂದಣಿಗೆ ತಾತ್ಕಾಲಿಕವಾಗಿ ಸರ್ವರ್ಗೆ ಕೆಲವು ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ರವಾನಿಸಲಾಗುತ್ತದೆ.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">ಕೆಲವು ಸಂಭಾವ್ಯ ಸಮಸ್ಯೆಗಳಲ್ಲಿ \nಇವು ಸೇರಿವೆ: </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__incorrect_number">ತಪ್ಪಾದ ಸಂಖ್ಯೆ.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nನೀವು ಸರಿಯಾಗಿ ನಿಮ್ಮ ಸಂಖ್ಯೆಯನ್ನು ನಮೂದಿಸಿರುವಿರಿ ಹಾಗೂ ಇದು ನಿಮ್ಮ ವಲಯಕ್ಕೆ ಸೂಕ್ತವಾಗಿ ಸ್ವರೂಪಗೊಳಿಸಲಾಗಿದೆ ಎಂದು ಪರಿಶೀಲಿಸಿ.</string>
+  <string name="registration_problems__google_voice">ಗೂಗಲ್ ವಾಯ್ಸ್.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nಟೆಕ್ಸ್ಟ-ಸೆಕ್ಯೂರ್ ಗೂಗಲ್ ವಾಯ್ಸ್ ಸಂಖ್ಯೆಯ ಜೋತೆ ಕೆಲಸ ಮಾಡುವುದಿಲ್ಲ.</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__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__your_device_needs_network_connectivity">ನಿಮ್ಮ\nಸಾಧನ ಈ ಟೆಕ್ಸ್ಟ್-ಸೆಕ್ಯೂರ್ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು ಜಾಲ ಸಂಪರ್ಕದ ಅಗತ್ಯವಿದೆ.  3G ಅಥವಾ ವೈಫೈ ಸಂಪರ್ಕ ಇದೆ ಎಂದು ಪರಿಶೀಲಿಸಿ ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ</string>
+  <string name="registration_progress_activity__restrictive_firewall">ನಿರ್ಬಂಧಿತ ಫೈರ್ವಾಲ್.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nನೀವು ನಿಸ್ತಂತು (ವೈಫೈ) ಜಾಲಬಂಧದ ಮೂಲಕ ಸಂಪರ್ಕವನ್ನು ಹೊಂದಿದ್ದರೆ, ಫೈರ್ವಾಲ್ ಟೆಕ್ಸ್ಟ್-ಸೆಕ್ಯೂರ್ ಸರ್ವರ್ ಜೋತೆಗಿನ ಸಂಪರ್ಕವನ್ನು ತಡೆಯುವ ಸಾಧ್ಯತೆ ಇದೆ.  ಇನ್ನೊಂದು ಜಾಲಬಂಧ ಅಥವಾ ಸಂಚಾರಿ ದೂರವಾಣಿ ಡೇಟಾ ಪ್ರಯತ್ನಿಸಿ.</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__connecting">ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">ಎಸ್ಎಂಎಸ್ ಪರಿಶೀಲನೆಗಾಗಿ\nನಿರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ ...</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__generating_keys">ಕೀಲಿಗಳನ್ನು ರಚಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">ಗೆ</string>
   <!--review_identities-->
@@ -308,6 +397,8 @@
   <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__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__pressing_the_enter_key_will_send_text_messages">ಎಂಟರ್ ಕೀಲಿಯನ್ನು ಒತ್ತಿದರೆ ಪಠ್ಯ ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸುತ್ತೇವೆ</string>
   <string name="preferences__display_settings">ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
@@ -331,12 +422,9 @@
   <string name="preferences__notifications">ಸೂಚನೆಗಳು</string>
   <string name="preferences__display_message_notifications_in_status_bar">ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಸಂದೇಶದ ಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
   <string name="preferences__led_color">ಎಲ್. ಇ. ಡಿ ಬಣ್ಣ</string>
-  <string name="preferences__change_notification_led_color">ಸೂಚನೆಯ ಎಲ್. ಇ. ಡಿ ಬಣ್ಣ ಬದಲಾಯಿಸಿ</string>
   <string name="preferences__pref_led_blink_title">ಎಲ್. ಇ. ಡಿ ಮಿಣುಕುವ ಮಾದರಿ</string>
-  <string name="preferences__change_notification_blink_pattern">ಸೂಚನೆ ಎಲ್. ಇ. ಡಿ ಮಿಣುಕುವ ಮಾದರಿಯನ್ನು ಬದಲಾಯಿಸಿ</string>
-  <string name="preferences__pref_led_blink_dialogtitle">ಎಲ್. ಇ. ಡಿ ಮಿಣುಕುವ ಮಾದರಿಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
-  <string name="preferences__select_led_color">ಎಲ್. ಇ. ಡಿ ಬಣ್ಣ ಆಯ್ಕೆಮಾಡಿ</string>
   <string name="preferences__sound">ಶಬ್ದ</string>
+  <string name="preferences__change_notification_sound">ಸೂಚನೆಯ ಶಬ್ದ ಬದಲಾಯಿಸಿ</string>
   <string name="preferences__inthread_notifications">ಎಳೆಗಳಲ್ಲಿನ ಸೂಚನೆಗಳು</string>
   <string name="preferences__play_inthread_notifications">ಸಕ್ರಿಯ ಸಂಭಾಷಣೆಯನ್ನು ನೋಡುವಾಗ ಸೂಚನೆ ಶಬ್ದವನ್ನು ನುಡಿಸಿ.</string>
   <string name="preferences__vibrate">ಕಂಪಿಸು</string>
@@ -361,8 +449,8 @@
   <string name="preferences__mmsc_url_required">ಎಂ. ಎಂ. ಎಸ್. ಸಿ  ಯು. ಆರ್. ಎಲ್ (ಅಗತ್ಯವಿದೆ)</string>
   <string name="preferences__mms_proxy_host_optional">ಎಂ. ಎಂ. ಎಸ್ ಪ್ರಾಕ್ಸಿ ಹೋಸ್ಟ್ (ಐಚ್ಛಿಕ)</string>
   <string name="preferences__mms_proxy_port_optional">ಎಂ. ಎಂ. ಎಸ್ ಪ್ರಾಕ್ಸಿ ಪೋರ್ಟ್ (ಐಚ್ಛಿಕ)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ನೀವು ಕಳುಹಿಸುವ ಪ್ರತಿ ಎಸ್.ಎಮ್.ಎಸ್ ಸಂದೇಶಕ್ಕೂ ವಿತರಣಾ ವರದಿಯನ್ನು ವಿನಂತಿಸಿ</string>
   <string name="preferences__sms_delivery_reports">ಎಸ್. ಎಮ್. ಎಸ್ ವಿತರಣಾ ವರದಿಗಳು</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ನೀವು ಕಳುಹಿಸುವ ಪ್ರತಿ ಎಸ್.ಎಮ್.ಎಸ್ ಸಂದೇಶಕ್ಕೂ ವಿತರಣಾ ವರದಿಯನ್ನು ವಿನಂತಿಸಿ</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">ಒಂದು ಸಂಭಾಷಣೆಯ ಎಳೆ ಒಂದು ನಿಗದಿತ ಮಿತಿಯನ್ನು ಮೀರಿದ ಕೂಡಲೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ</string>
   <string name="preferences__delete_old_messages">ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ</string>
   <string name="preferences__storage">ಸಂಗ್ರಹ</string>
@@ -404,9 +492,9 @@
   <string name="conversation_list__menu_search">ಹುಡುಕಿ</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">ಸುರಕ್ಷತೆ</string>
-  <string name="conversation_secure_verified__menu_verify_session">ಸೆಷನ್ನನ್ನು ಪರಿಶೀಲಿಸಿ</string>
+  <string name="conversation_secure_verified__menu_no_identity">ಯಾವುದೇ ಗುರುತು ಲಭ್ಯವಿಲ್ಲ</string>
   <string name="conversation_secure_verified__menu_verify_recipient">ಸ್ವೀಕೃತಿದಾರರನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">ಸುರಕ್ಷಿತ ಸೆಷನನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಿ</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">ಸುರಕ್ಷಿತ ಸೆಷನ್ ಕೊನೆಗೊಳಿಸು</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">ಲಗತ್ತು ಸೇರಿಸಿ</string>
   <string name="conversation__menu_add_contact_info">ಸಂಪರ್ಕ ಮಾಹಿತಿಯನ್ನು ಸೇರಿಸು</string>
@@ -425,7 +513,7 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">ಹೊಸ ಸಂದೇಶ</string>
   <string name="text_secure_normal__menu_settings">ಸೆಟ್ಟಿಂಗ್ಗಳು</string>
-  <string name="text_secure_normal__menu_clear_passphrase">ಗುಪ್ತಪದವನ್ನು ತೆರವುಗೊಳಿಸಿ</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>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 0a39dff2ac..302d63cbea 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -28,15 +28,11 @@
   <string name="ConversationItem_success_exclamation">အောင်မြင်!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">SDကဒ်သို့ ရေးမှတ်ခြင်းမပြုနိုင်</string>
   <string name="ConversationItem_view_secure_media_question">လံုခြုံသောမီဒီယာကိုကြည့်မည်လား</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">This media has been stored in an encrypted database. Unfortunately, to view it with an external content viewer currently requires the data to be temporarily decrypted and written to disk.  Are you sure that you would like to do this?</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>
   <!--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>
@@ -49,7 +45,6 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">အစုအဖွဲ့ဖြင့်စကားစမြည်ပြောခြင်းလက်ခံသူများ</string>
   <string name="ConversationActivity_group_conversation">အစုအဖွဲ့ဖြင့်စကားစမြည်ပြောခြင်း</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d အစုအဖွဲ့အလိုက်　လက်ခံသူများ</string>
   <string name="ConversationActivity_saving_draft">အကြမ်းသိမ်း...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">စာတို အသေးစိတ်အချက်အလက်များ</string>
@@ -67,6 +62,7 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">ကီးပြောင်းလဲခြင်းစာတို...</string>
   <!--ExportFragment-->
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">စိစစ်ထားသောကီးရှာမတွေ့</string>
@@ -88,6 +84,13 @@
   <string name="PromptMmsActivity_mms_settings_updated">MMS ဆက်တင် အဆင့်မြှင့်ပြီး</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">သင်သည်　ဤတန်ဖိုးတွေကို　စာသာလံုခြုံမှု　ဆက်တင်မီနူးမှနေ၍　အချိန်မရွေး　ပြင်ဆင်နိုင်</string>
   <!--ReceiveKeyActivity-->
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">ရှေ့ဆက်</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">သင့်တွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">လက်ခံသူတွင်အသိအမှတ်ပြုကီးမရှိပါ</string>
@@ -136,8 +139,6 @@
   <string name="ApplicationMigrationService_import_in_progress">သွင်းယူနေ</string>
   <string name="ApplicationMigrationService_importing_text_messages">စာသားစာတိုများသွင်းယူနေ</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure စကားဝှက် အရံသင့်သိမ်း</string>
-  <string name="KeyCachingService_passphrase_cached">စကားဝှက် အရံသင့်သိမ်း</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">စာတိုအသစ် %d</string>
   <string name="MessageNotifier_most_recent_from_s">မကြာသေးမီက: %s</string>
@@ -147,8 +148,10 @@
   <string name="MessageNotifier_failed_to_deliver_message">အကြောင်းကြားချက်ပို့လွတ်ရန်မအောင်မြင်</string>
   <string name="MessageNotifier_error_delivering_message">အကြောင်းကြားချက်ပို့လွတ်စဉ်အမှား</string>
   <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_continue">ရှေ့ဆက်</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">လောလောဆယ် အသင့်၏ SMS စာတိုကို ပို့နိုင်ခြင်း မရှိပါ။ ဆားဗစ်ပြန်ရလာသည်နှင့် ပို့ပေးပါမည်။</string>
+  <!--QuickResponseService-->
   <!--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>
@@ -159,12 +162,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">အဆက်အသွယ်မရှိ</string>
+  <!--single_contact_selection_activity-->
   <!--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">အကြာင်းကြားစာရိုက်</string>
   <string name="conversation_activity__send">ပို့</string>
   <string name="conversation_activity__remove">ဖယ်ပစ်</string>
   <!--conversation_item_sent-->
@@ -175,8 +178,9 @@
   <string name="conversation_item_received__downloading">ကူးဆွဲနေသည်</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">အုပ်လိုက်ရွေးရန်</string>
+  <!--country_selection_fragment-->
+  <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">လိုကယ်ဒေတာများကို ဝှက်သိမ်းရန်သုံးမည့် စကားဝှက်ကို ရွေးပါ။ စိတ်ချရမည့် စကားဝှက် ဖြစ်ပါစေ။</string>
   <string name="create_passphrase_activity__passphrase">စကားဝှက်:</string>
   <string name="create_passphrase_activity__repeat">နောက်တစ်ကြိမ်:</string>
   <string name="create_passphrase_activity__continue">ရှေ့ဆက်</string>
@@ -189,16 +193,18 @@
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">ခေတ္တကြာပါလိမ့်မယ်။ တင်သွင်းမှု ပြီးဆုံးသွားရင် အကြောင်းကြားပေးပါမယ်။</string>
   <string name="database_migration_activity__importing">သွင်းယူနေ</string>
   <!--database_upgrade_activity-->
+  <!--mms_preferences_activity-->
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">Textsecure စကားဝှက်</string>
   <string name="prompt_passphrase_activity__unlock">ပိတ်ထားသည်ကိုဖွင့်</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_apn_settings_to_deliver_media_messages_via_your_wireless_carrier">TextSecure requires APN settings to deliver media messages via your wireless carrier.  Your device does not make this information available, which is occasionally true for locked devices and other restrictive configurations.</string>
-  <string name="prompt_mms_activity__to_send_media_messages_please_complete_the_necessary_apn_information_below">To send media messages, please complete the necessary APN information below. The values for your carrier can generally be located by searching for \'&amp;lt;your carrier&amp;gt; APN\'.  You will only need to do this once.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (အရေးကြီး) - </string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMSC ပရောက်ဇီ အိမ်ရှင်စက် (အရေးမကြီး) -</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS ပရောက်ဇီ PORT (အရေးမကြီး)</string>
   <!--receive_key_activity-->
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">သို့</string>
   <!--review_identities-->
@@ -247,12 +253,6 @@
   <string name="preferences__manage_configured_identity_keys">သတ်မှတ်ပြီးသောကိုယ်စားပြုကီးများစီမံခံ့ခွဲရန်</string>
   <string name="preferences__notifications">အသိပေးချက်များ</string>
   <string name="preferences__display_message_notifications_in_status_bar">null</string>
-  <string name="preferences__led_color">LED အရောင်</string>
-  <string name="preferences__change_notification_led_color">အချက်ပြ LED အရောင်ပြောင်းရန်</string>
-  <string name="preferences__pref_led_blink_title">LED လင်းမည့်ပုံစံ</string>
-  <string name="preferences__change_notification_blink_pattern">အချက်ပြ LED လင်းမည့်ပုံစံကိုရွေးချယ်ပါ</string>
-  <string name="preferences__pref_led_blink_dialogtitle">LED လင်းမည့်ပုံစံရွေးချယ်ပါ</string>
-  <string name="preferences__select_led_color">LED အရောင်ရွေးချယ်ပါ</string>
   <string name="preferences__vibrate">တုန်ခါမှု</string>
   <string name="preferences__also_vibrate_when_notified">အချက်ပြစဉ်တုန်ခါပါ</string>
   <string name="preferences__minutes">မိနစ်</string>
@@ -270,8 +270,8 @@
   <string name="preferences__mmsc_url_required">MMSC URL (အရေးကြီး)</string>
   <string name="preferences__mms_proxy_host_optional">MMS ပရောက်ဇီ အိမ်ရှင်စက် (အရေးမကြီး)</string>
   <string name="preferences__mms_proxy_port_optional">MMS ပရောက်ဇီ Port (အရေးမကြီး)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">SMS တစ်ခုပို့ပြီးတိုင်း ပို့ပြီးကြောင်း အသိပေးပါ</string>
   <string name="preferences__sms_delivery_reports">SMS ပို့ပြီးကြောင်းအသိပေးခြင်း</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">SMS တစ်ခုပို့ပြီးတိုင်း ပို့ပြီးကြောင်း အသိပေးပါ</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">သတ်မှတ်အရေအတွက်ထက်ကျော်လွန်ပါက စာတိုအဟောင်းများကို အလိုလျှောက်ဖျတ်ပါ</string>
   <string name="preferences__delete_old_messages">စာတိုအဟောင်းများကိုဖျတ်ပါ</string>
   <string name="preferences__storage">သိမ်းဆည်းရာ</string>
@@ -304,9 +304,7 @@
   <string name="conversation_list__menu_search">ရှာရန်</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">လုံခြုံရေး</string>
-  <string name="conversation_secure_verified__menu_verify_session">ဆက်ရှင်အတည်ပြု</string>
   <string name="conversation_secure_verified__menu_verify_recipient">လက်ခံကိုစစ်ဆေးပါ</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">လုံခြုံရေးဆက်ရှင်ကိုရပ်ဆိုင်းပါ</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">ပူးတွဲမှုအားပေါင်းထည့်</string>
   <string name="conversation__menu_delete_thread">စာတွဲကိုဖျက်ပါ</string>
@@ -321,7 +319,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">စာတိုအသစ်</string>
   <string name="text_secure_normal__menu_settings">ဆက်တင်</string>
-  <string name="text_secure_normal__menu_clear_passphrase">စကားဝှက်ကိုရှင်းလင်းပါ</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">စစ်ဆေးပြီး</string>
   <!--EOF-->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 8e50d25e07..1f83c19792 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -33,18 +33,21 @@
   <string name="ConversationItem_success_exclamation">Succesvol!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">SD-kaart niet beschrijfbaar!</string>
   <string name="ConversationItem_view_secure_media_question">Bekijk veilige media?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Deze media is opgeslagen in een versleutelde database. Deze data moet helaas tijdelijk ontsleuteld en naar de opslagruimte geschreven worden om deze te bekijken met een externe applicatie. Weet u zeker dat u dit wilt?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Sleuteluitwisselingsbericht ontvangen en verwerkt.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fout, verouderd steuteluitwisselingsbericht ontvangen.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Sleuteluitwisselingsbericht ontvangen, klik om te verwerken</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Sleuteluitwisselingsbericht ontvangen, klik hier om te verwerken.</string>
+  <string name="ConversationItem_group_action_left">%1$s heeft de groep verlaten.</string>
+  <string name="ConversationItem_group_action_joined">%1$s is toegetreden tot de groep.</string>
+  <string name="ConversationItem_group_action_modify">%1$s heeft de groep bijgewerkt.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Initieer veilige sessie?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initieer veilige sessie met %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Bevestiging afbreken beveiligde sessie</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Weet u zeker dat u deze beveiligde sessie wilt stopzetten?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Bevestiging Beëindigen Beveiligde Sessie</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Weet u zeker dat u deze beveiligde sessie wilt beëindigen?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Conversatiebevestiging verwijderen</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Weet u zeker dat u deze conversatie permanent wilt verwijderen?</string>
   <string name="ConversationActivity_add_attachment">Voeg bijlage toe</string>
+  <string name="ConversationActivity_select_contact_info">Selecteer contactinformatie</string>
   <string name="ConversationActivity_compose_message">Bericht opstellen</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Excuses, er trad een fout op bij het instellen van uw bijlage.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Excuses, de geselecteerde video overschrijdt de berichtgrootterestricties.</string>
@@ -54,7 +57,9 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Groepsconversatie Ontvangers</string>
   <string name="ConversationActivity_group_conversation">Groepsconversatie</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d ontvangers in groep</string>
+  <string name="ConversationActivity_unnamed_group">Naamloze Groep</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d leden</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 lid</string>
   <string name="ConversationActivity_saving_draft">Concept opslaan...</string>
   <string name="ConversationActivity_invalid_recipient">Ongeldige ontvanger!</string>
   <string name="ConversationActivity_calls_not_supported">Oproepen Niet Ondersteund</string>
@@ -87,6 +92,17 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">Fout tijdens het schrijven naar de SD-kaart.</string>
   <string name="ExportFragment_success">Succesvol!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Keys, instellingen en berichten versleuteld naar de SD-kaart aan het exporteren...</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nieuwe Groep</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Groep Bijwerken</string>
+  <string name="GroupCreateActivity_group_name_hint">Groepsnaam</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Nieuwe MMS-Groep</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">U hebt een contactpersoon geselecteerd die geen TextSecure-groepen ondersteunt, dus deze groep zal gebruik maken van MMS.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Je bent niet de beheerder van deze groep, dus je de titel of afbeelding niet wijzigen.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Er is een onverwachte fout opgetreden waardoor het aanmaken van een groep is mislukt.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Uw groep moet ten minste één persoon bevatten.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Het nummer van een van de leden van uw groep kan niet goed worden gelezen. Corrigeer dit of verwijder deze persoon, en probeer het opnieuw.</string>
+  <string name="GroupCreateActivity_menu_create_title">Groep Aanmaken</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">SMS-berichten uit de systeemdatabase importeren?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Dit zal berichten uit de standaard SMS-database van het systeem importeren naar TextSecure. Als je de SMS-database van het systeem voorheen hebt geïmporteerd, kan opnieuw importeren resulteren in dubbele berichten.</string>
@@ -96,7 +112,6 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nHerstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en berichten volledig vervangen. Je zult alle informatie verliezen die wel in je huidige TextSecure-installatie zit, maar niet de back-up.</string>
   <string name="ImportFragment_restore">Herstellen</string>
   <string name="ImportFragment_import_plaintext_backup">Niet-versleutelde Back-up Importeren?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Dit zal berichten uit een niet-versleutelde back-up importeren. Als je de SMS-database van het systeem voorheen hebt geïmporteerd, kan opnieuw importeren resulteren in dubbele berichten.</string>
   <string name="ImportFragment_importing">Importeren</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Niet-versleutelde back-up importeren...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Geen niet-versleutelde back-up gevonden!</string>
@@ -112,6 +127,7 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Geen connectie beschikbaar voor MMS download, probeer later opnieuw...</string>
   <string name="MmsDownloader_error_storing_mms">MMS opslaan mislukt!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Fout bij verbinden met MMS provider...</string>
+  <string name="MmsDownloader_error_reading_mms_settings">Fout bij het lezen van de MMS-instellingen van uw provider...</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimediabericht</string>
   <!--PassphraseChangeActivity-->
@@ -130,6 +146,49 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">De handtekening op deze sleuteluitwisseling is anders dan wat u eerder ontvangen heeft van dit contact. Dit kan betekenen dat iemand probeert uw communicatie the onderscheppen, of dat dit contact gewoon TextSecure opnieuw geïnstalleerd heeft en nu een nieuwe identiteitssleutel heeft.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">U kunt wensen dit contact te verifiëren.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">De handtekening op deze sleuteluitwisseling is vertrouwd, maar u heeft de \'automatisch aanvullen sleuteluitwisselingen\' instelling uitgeschakeld.</string>
+  <string name="ReceiveKeyActivity_processing">Aan het verwerken</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Sleuteluitwisseling verwerken...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Verbind met TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Selecteer Uw Land</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">U moet uw\nlandcode opgeven</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">U moet uw\ntelefoonnummer opgeven</string>
+  <string name="RegistrationActivity_invalid_number">Ongeldig nummer</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Het nummer dat u hebt\ningevoerd (%s) is ongeldig.</string>
+  <string name="RegistrationActivity_unsupported">Niet ondersteund</string>
+  <string name="RegistrationActivity_continue">Doorgaan</string>
+  <string name="RegistrationActivity_edit">Bewerken</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Mogelijke Problemen</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Nummer verifiëren</string>
+  <string name="RegistrationProgressActivity_edit_s">Bewerk %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registratie voltooid!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Mogelijke problemen.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">U moet eerst de code invullen die u heeft ontvangen...</string>
+  <string name="RegistrationProgressActivity_connecting">Aan het verbinden</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Verbinding maken voor verificatie...</string>
+  <string name="RegistrationProgressActivity_network_error">Netwerkfout!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Verbinden niet mogelijk. Controleer uw netwerkverbinding en probeer opnieuw.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Verificatie Mislukt!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">De verificatiecode die u opgaf is niet juist. Probeer opnieuw.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Te veel pogingen</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">U hebt te vaak een onjuiste verificatiecode geprobeerd. Wacht alstublieft een minuut voordat u het opnieuw probeert.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Telefoongesprek Aanvragen</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Inkomend verificatiegesprek aanvragen...</string>
+  <string name="RegistrationProgressActivity_server_error">Serverfout</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Er is een fout opgetreden. Probeer alstublieft opnieuw.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Te Veel Verzoeken!</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registratie Voltooid</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registratie bij TextSecure is succesvol afgerond.</string>
+  <string name="RegistrationService_registration_error">Registratiefout</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Registratie bij TextSecure is mislukt.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Misvormd sleuteluitwisselingsbericht\nontvangen!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nSleuteluitwisselingsbericht ontvangen voor een verkeerde protocol-versie.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nBericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en weer te geven.</string>
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">U heeft geen identiteitssleutel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">De ontvanger heeft geen identiteitssleutel.</string>
@@ -170,6 +229,7 @@
   <string name="MmsDatabase_downloading_mms">Downloaden van MMS...</string>
   <string name="MmsDatabase_mms_download_failed">MMS Download mislukt!</string>
   <string name="MmsDatabase_downloading">Downloaden...</string>
+  <string name="MmsDatabase_mms_pending_download">Tik en configureer MMS-instellingen om de download te hervatten.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS ontsleutelen, een moment...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Verkeerd versleuteld MMS-bericht...</string>
@@ -180,8 +240,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Bezig met importeren</string>
   <string name="ApplicationMigrationService_importing_text_messages">Tekstberichten aan het importeren</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure Wachtwoord In Cache</string>
-  <string name="KeyCachingService_passphrase_cached">Wachtwoord In Cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Raak aan om te openen.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Raak aan om te openen, of raak het slot aan om te sluiten.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure is ontgrendeld</string>
+  <string name="KeyCachingService_lock">Vergrendel met wachtwoord</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nieuwe berichten</string>
   <string name="MessageNotifier_most_recent_from_s">Meest recente van: %s</string>
@@ -202,6 +264,8 @@
   <string name="ViewLocalIdentityActivity_continue">Doorgaan</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Momenteel niet in staat om uw SMS bericht te versturen. Zodra de service beschikbaar is zal het verzonden worden .</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Sorry, Quick Response wordt nog niet ondersteund door 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">U heeft een bericht ontvangen van iemand die versleutelde TextSecure sessies ondersteunt. Wilt u een beveiligde sessie initiëren?</string>
   <string name="auto_initiate_activity__initiate_exchange">Initieer Uitwisseling</string>
@@ -212,12 +276,14 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Geen contacten.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Contacten zoeken...</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecteer voor</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Geen recente gesprekken.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Typ bericht</string>
+  <string name="conversation_activity__type_message"><small>Verstuur een bericht</small></string>
   <string name="conversation_activity__send">Verstuur</string>
   <string name="conversation_activity__remove">Verwijder</string>
   <!--conversation_item_sent-->
@@ -228,8 +294,10 @@
   <string name="conversation_item_received__downloading">Downloaden</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Selecteer Meerdere Tegelijk</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Landen laden...</string>
+  <string name="country_selection_fragment__search">Zoeken</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">Kiest u alstublieft een wachtwoord welke gebruikt zal worden om lokaal uw data te versleutelen. Een sterk wachtwoord wordt aangeraden.</string>
   <string name="create_passphrase_activity__passphrase">Wachtwoord:</string>
   <string name="create_passphrase_activity__repeat">Herhaal:</string>
   <string name="create_passphrase_activity__continue">Doorgaan</string>
@@ -255,17 +323,43 @@
   <string name="import_fragment__import_a_plaintext_backup_file">\nImporteer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\'.</string>
   <string name="local_identity__regenerate_key">Sleutel regenereren</string>
   <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">Voor uw telefoon zijn handmatige MMS-instellingen noodzakelijk.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE WACHTWOORD</string>
   <string name="prompt_passphrase_activity__unlock">Ontgrendel</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure heeft MMS-instellingen nodig om mediaberichten te kunnen versturen via uw telefoonprovider. Uw toestel heeft deze informatie niet beschikbaar. Dit komt vaker voor bij gelockte toestellen en andere beperkende configuraties.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (VEREIST):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">MMS PROXY HOST (OPTIONEEL):</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY POORT (OPTIONEEL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Voltooid</string>
+  <!--registration_activity-->
+  <string name="registration_activity__your_country">UW LAND</string>
+  <string name="registration_activity__your_country_code_and_phone_number">UW LANDCODE EN\nTELEFOONNUMMER</string>
+  <string name="registration_activity__phone_number">TELEFOONNUMMER</string>
+  <string name="registration_activity__register">Registreren</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Mogelijke problemen\nzijn:</string>
+  <string name="registration_problems__incorrect_number">Incorrect nummer.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure werkt niet met nummers van Google Voice.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__verify">Verifieer</string>
+  <string name="registration_progress_activity__call_me">Bel Me</string>
+  <string name="registration_progress_activity__edit_number">Nummer bewerken</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Mogelijke problemen\nzijn:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Geen netwerkverbinding.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Uw apparaat heeft netwerkverbinding nodig om deze functionaliteit te gebruiken. Controleer of u verbonden bent met 3G of WiFi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Beperkende firewall.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nAls u bent verbonden via WiFi is het mogelijk dat een firewall de verbinding met\nde TextSecure-server blokkeert. Probeer een ander- of het mobiele netwerk.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure zal uw nummer nu automatisch verifiëren door middel van een SMS-bericht.</string>
+  <string name="registration_progress_activity__connecting">Verbinden...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Wachten op\nSMS-verificatie...</string>
+  <string name="registration_progress_activity__generating_keys">Sleutels genereren...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Aan</string>
+  <string name="recipients_panel__add_member">Voeg groepslid toe</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">U heeft momenteel geen identiteitssleutels in uw vertrouwensdatabase.</string>
   <!--verify_identity_activity-->
@@ -283,6 +377,7 @@
   <string name="AndroidManifest__create_passphrase">Creëer Wachtwoord</string>
   <string name="AndroidManifest__enter_passphrase">Voer Wachtwoord In</string>
   <string name="AndroidManifest__select_contacts">Selecteer Contacten</string>
+  <string name="AndroidManifest__select_contact">Selecteer Contact</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure gedetecteerd</string>
   <string name="AndroidManifest__public_identity_key">Publieke Identiteitssleutel</string>
   <string name="AndroidManifest__change_passphrase">Wachtwoord Veranderen</string>
@@ -300,6 +395,8 @@
   <string name="preferences__pref_all_mms_title">Gebruik voor alle MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Gebruik TextSecure voor het bekijken en opslaan van alle inkomende tekstberichten</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Gebruik TextSecure voor het bekijken en opslaan van alle inkomende multimediaberichten</string>
+  <string name="preferences__enable_enter_key_title">Activeer Enter-toets</string>
+  <string name="preferences__replace_smiley_with_enter_key">Vervang de smiley-toets door een enter-toets</string>
   <string name="preferences__pref_enter_sends_title">Enter verstuurt</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">De \'Enter\' toets gebruiken voor versturen tekstberichten</string>
   <string name="preferences__display_settings">Beeldscherminstellingen</string>
@@ -322,12 +419,12 @@
   <string name="preferences__manage_configured_identity_keys">Beheer ingestelde identiteitssleutels</string>
   <string name="preferences__notifications">Notificaties</string>
   <string name="preferences__display_message_notifications_in_status_bar">Toon berichtmeldingen in notificatiebalk</string>
-  <string name="preferences__led_color">LED Kleur</string>
-  <string name="preferences__change_notification_led_color">Wijzig notificatie LED kleur</string>
-  <string name="preferences__pref_led_blink_title">LED Knipperpatroon</string>
-  <string name="preferences__change_notification_blink_pattern">Verander notificatie LED knipperpatroon</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Selecteer LED Knipperpatroon</string>
-  <string name="preferences__select_led_color">Selecteer LED Kleur</string>
+  <string name="preferences__led_color">LED-kleur</string>
+  <string name="preferences__pref_led_blink_title">LED-knipperpatroon</string>
+  <string name="preferences__sound">Geluid</string>
+  <string name="preferences__change_notification_sound">Verander notificatiegeluid</string>
+  <string name="preferences__inthread_notifications">Notificatie binnen een conversatie</string>
+  <string name="preferences__play_inthread_notifications">Speel notificatiegeluid af bij het bekijken van een actieve conversatie.</string>
   <string name="preferences__vibrate">Trillen</string>
   <string name="preferences__also_vibrate_when_notified">Ook trillen bij notificaties</string>
   <string name="preferences__minutes">minuten</string>
@@ -344,11 +441,13 @@
   <string name="preferences__custom">Aangepast</string>
   <string name="preferences__advanced">Geavanceerd</string>
   <string name="preferences__passphrase">Wachtwoord</string>
+  <string name="preferences__advanced_mms_access_point_names">MMS-Voorkeuren</string>
+  <string name="preferences__enable_manual_mms">Handmatige MMS Activeren</string>
   <string name="preferences__mmsc_url_required">MMSC URL (Vereist)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Optioneel)</string>
   <string name="preferences__mms_proxy_port_optional">MMS Proxy Poort (Optioneel)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Verzoek om een ontvangstbevestiging voor ieder verzonden SMS bericht</string>
   <string name="preferences__sms_delivery_reports">SMS ontvangstbevestigingen</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Verzoek om een ontvangstbevestiging voor ieder verzonden SMS bericht</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatisch oudere berichten verwijderen wanneer een conversatie meer dan een bepaald aantal berichten bevat</string>
   <string name="preferences__delete_old_messages">Verwijder oude berichten</string>
   <string name="preferences__storage">Opslag</string>
@@ -361,6 +460,9 @@
   <string name="preferences__theme">Thema</string>
   <string name="preferences__default">Standaard</string>
   <string name="preferences__language">Taal</string>
+  <string name="preferences__make_default_sms_app">Stel in als standaard SMS-app</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Stel TextSecure in als standaard SMS/MMS-applicatie voor uw systeem.</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Verstuur en ontvang SMS-berichten wanneer push niet beschikbaar is.</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -378,6 +480,7 @@
   <string name="conversation_context__menu_copy_text">Tekst kopiëren</string>
   <string name="conversation_context__menu_delete_message">Bericht verwijderen</string>
   <string name="conversation_context__menu_forward_message">Bericht doorsturen</string>
+  <string name="conversation_context__menu_resend_message">Bericht opnieuw versturen</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Begin Beveiligde Sessie</string>
   <!--conversation_list_batch-->
@@ -385,13 +488,18 @@
   <string name="conversation_list_batch__menu_select_all">Alles Selecteren</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Zoeken</string>
+  <string name="conversation_list__drawer_open">Open navigatiepaneel</string>
+  <string name="conversation_list__drawer_close">Sluit navigatiepaneel</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Veiligheid</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verifieer Sessie</string>
+  <string name="conversation_secure_verified__menu_no_identity">Geen Identiteit Beschikbaar</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verifieer Ontvanger</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Stop Beveiligde Sessie</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Beëindig Beveiligde Sessie</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Voeg bijlage toe</string>
+  <string name="conversation__menu_update_group">Groep Bijwerken</string>
+  <string name="conversation__menu_leave_group">Groep Verlaten</string>
+  <string name="conversation__menu_add_contact_info">Voeg contactinformatie toe</string>
   <string name="conversation__menu_delete_thread">Verwijder gehele gesprek</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Lijst met ontvangers</string>
@@ -406,8 +514,9 @@
   <string name="text_secure_locked__menu_unlock">Ontgrendel</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nieuw Bericht</string>
+  <string name="text_secure_normal__menu_new_group">Nieuwe Groep</string>
   <string name="text_secure_normal__menu_settings">Instellingen</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Vergrendelen</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Vergrendel</string>
   <string name="text_secure_normal__mark_all_as_read">Markeer Alles Als Gelezen</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Geverifieerd</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index f4688397f8..de2e57c1f6 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -16,6 +16,9 @@
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Deaktivere kryptert lagring?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nAdvarsel! Dette vil deaktivere kryptert lagring av alle meldinger og nøkler. Dine krypterte sesjoner vil fortsette å fungere, men alle med fysisk tilgang til enheten din vil kunne få tilgang til dem.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktiver</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Avregistrerer...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Avregistrerering av data som bærer av meldinger</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Feil ved tilkobling til meldingstjener!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bilde</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -33,15 +36,19 @@
   <string name="ConversationItem_success_exclamation">Suksess!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Kunne ikke skrive til SD-kort!</string>
   <string name="ConversationItem_view_secure_media_question">Vise kryptert vedlegg?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Dette vedlegget har blitt lagret i en kryptert database. For å vise det med en ekstern fremviser må vedlegget dessverre midlertidig dekrypteres og lagres til et usikkert område. Er du sikker på at du ønsker å gjøre dette?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Dette vedlegget har blitt lagret i en kryptert database. For å vise det med en ekstern viewer må vedlegget dessverre midlertidig dekrypteres og skrives til et usikkert område. Er du sikker på at du ønsker å gjøre dette?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Nøkkelutvekslingsmelding mottatt og behandlet.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Feil, fikk en gammel nøkkelutvekslingsmelding.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Nøkkelutvekslingsmelding mottatt, klikk for å behandle</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Nøkkelutveksling melding mottatt, klikk for å behandle.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Mottok en klartekst SMS mens du hadde en åpen sikker sesjon. Hvis motparten ikke har en åpen sesjon, vil meldinger som du sender vises som uleselig tekst. Klikk for å terminere sikker sesjon.</string>
+  <string name="ConversationItem_group_action_left">%1$s har forlatt gruppen.</string>
+  <string name="ConversationItem_group_action_joined">%1$s har sluttet seg til gruppen.</string>
+  <string name="ConversationItem_group_action_modify">%1$s har oppdatert gruppen.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Starte sikker sesjon?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Starte sikker sesjon med %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Bekreft avbrudd av sikker sesjon</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Er du sikker på at du ønsker å avbryte denne sikre sesjonen?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Bekreft avslutning av sikker sesjon</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Er du sikker på at du ønsker å avslutte denne sikre sesjonen?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Bekreft sletting av tråd</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Er du sikker på at du ønsker å slette denne samtalen?</string>
   <string name="ConversationActivity_add_attachment">Legg til vedlegg</string>
@@ -55,7 +62,9 @@
   <string name="ConversationActivity_forward_message_prefix">VS</string>
   <string name="ConversationActivity_group_conversation_recipients">Mottakere i gruppen</string>
   <string name="ConversationActivity_group_conversation">Gruppesamtale</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d mottakere i gruppen</string>
+  <string name="ConversationActivity_unnamed_group">Navnløs gruppe</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d medlemmer</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 medlem</string>
   <string name="ConversationActivity_saving_draft">Lagrer utkast...</string>
   <string name="ConversationActivity_invalid_recipient">Ugyldig mottaker!</string>
   <string name="ConversationActivity_calls_not_supported">Anrop er ikke støttet</string>
@@ -88,6 +97,21 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">En feil oppstod under lagring til SD-kort.</string>
   <string name="ExportFragment_success">Suksess!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Eksporterer krypterte nøkler, innstillinger og meldinger...</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Oppdater gruppe</string>
+  <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Ny MMS gruppe</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Du har valgt en kontakt som ikke støtter TextSecure grupper, så dette vil bli en MMS gruppe.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Du har ikke registert deg som bruker av data kanalen, så TextSecure grupper er deaktivert.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Du er ikke eieren av denne gruppen, derfor kan du ikke endre tittel eller bilde.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">En ukjent feil har gjort at gruppeopprettelsen feilet.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Du må ha minst en person i gruppen din!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">En av gruppemedlemmene har et nummer som ikke kan tolkes riktig. Vær vennlig og rett opp eller slett kontakten og prøv igjen. </string>
+  <string name="GroupCreateActivity_file_io_exception">Fil I/O feil, kunne ikke opprette temporær bildefil.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Gruppeavatar</string>
+  <string name="GroupCreateActivity_menu_create_title">Opprett gruppe</string>
+  <string name="GroupCreateActivity_creating_group">Oppretter %1$s...</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importer systemets SMS database?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Dette vil importere meldinger fra systemets standard SMS database til TextSecure. Dersom du har gjort en import tidligere, vil dette føre til dupliserte meldinger.</string>
@@ -132,6 +156,54 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen på denne nøkkelutvekslingen er ikke lik den du tidligere mottok fra denne\nkontakten. Det kan enten bety at noen prøver å avskjære kommunikasjonen din eller\nat denne kontakten har installert TextSecure på nytt og dermed fått en ny identitetsnøkkel.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Du bør verifisere\ndenne kontakten.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Signaturen på denne nøkkelutvekslingen er til å stole på, men du har deaktivert innstillingen\n\'fullfør nøkkelutvekslinger automatisk\'.</string>
+  <string name="ReceiveKeyActivity_processing">Prosesserer</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Prosesserer nøkkelutveksling...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Koble til TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Velg land</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Du må spesifisere \nlandskoden din</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Du må oppgi\ntelefonnummeret ditt</string>
+  <string name="RegistrationActivity_invalid_number">Ugyldig nummer</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Nummeret du oppga (%s) er ugylig.</string>
+  <string name="RegistrationActivity_unsupported">Ingen støtte</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Beklager, denne enheten støtter ikke meldinger med data som bærer. Enheter som kjører versjoner av Android lavere enn 4.0 krever en Google konto. Enheter  som kjører versjoner av Android 4.0 eller nyere krever ikke en Google konto, men Play Store applikasjonen må være installert.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nVi vil nå verifisere om følgende nummer er forbundet med denne enheten:\n\n%s\n\nEr dette nummeret korrekt, eller ønsker du å endre det før du fortsetter? </string>
+  <string name="RegistrationActivity_continue">Fortsett</string>
+  <string name="RegistrationActivity_edit">Endre</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Mulige problemer</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Verifiserer nummer</string>
+  <string name="RegistrationProgressActivity_edit_s">Endre %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registrering fullført!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Mulige problemer.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Du må angi koden du fikk først...</string>
+  <string name="RegistrationProgressActivity_connecting">Kobler til</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Kobler til for verifikasjon</string>
+  <string name="RegistrationProgressActivity_network_error">Nettverksfeil!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Tilkobling ikke mulig. Vær vennlig å sjekke nettverksforbindelsen din og prøv igjen.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Verifikasjon feilet!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Verifikasjonskoden du sendte er feil. Vær vennlig og prøv igjen.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">For mange forsøk</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Du har sendt feil verifikasjonskode for mange ganger. Vær vennlig og vent ett minutt før du prøver igjen.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Forespør anrop</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Ber om innkommende anrop for verifikasjon...</string>
+  <string name="RegistrationProgressActivity_server_error">Serverfeil</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Det oppstod en feil på serveren. Prøv igjen.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">For mange forespørsler!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Du har allerede forespurt et voice anrop. Du kan be om et til om 20 minutter.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Verifiserer voice kode...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registrering fullført</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure registreringen er fullført.</string>
+  <string name="RegistrationService_registration_error">Registreringsfeil</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Det har oppstått en feil ved registeringen til TextSecure.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Mottatt korrupt nøkkelutvekslingsmelding!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nMottatt nøkkelutvekslingsmelding for feil protokollversjon.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nMottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Mottok oppdatert men ukjent identitetsinformasjon. Trykk for å validere identiteten.</string>
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Du har ingen ID-nøkkel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Mottakeren har ingen ID-nøkkel.</string>
@@ -183,8 +255,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerer SMS meldinger</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure passordet er bufret</string>
-  <string name="KeyCachingService_passphrase_cached">Passord bufret</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Berør for å åpne.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Berør for å åpne, eller velg låsen for å lukke.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure er ulåst</string>
+  <string name="KeyCachingService_lock">Lås med passord</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nye meldinger</string>
   <string name="MessageNotifier_most_recent_from_s">Sist mottatt fra: %s</string>
@@ -217,12 +291,15 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Finner kontakter...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Tast et navn for å filtrere...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Velg for</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Ingen nye samtaler.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Skriv melding</string>
+  <string name="conversation_activity__type_message"><small>Send en melding</small></string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slett</string>
   <!--conversation_item_sent-->
@@ -233,8 +310,10 @@
   <string name="conversation_item_received__downloading">Laster ned</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Batch-valg modus</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Laster land...</string>
+  <string name="country_selection_fragment__search">Søk</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">Velg et passord som skal brukes til kryptering av dine lokale data. Dette bør være et sterkt passord.</string>
   <string name="create_passphrase_activity__passphrase">Passord:</string>
   <string name="create_passphrase_activity__repeat">Repeter:</string>
   <string name="create_passphrase_activity__continue">Gå videre</string>
@@ -272,8 +351,44 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (IKKE PÅKREVD):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complete</string>
+  <!--registration_activity-->
+  <string name="registration_activity__your_country">LANDET DITT</string>
+  <string name="registration_activity__your_country_code_and_phone_number">DIN LANDSKODE OG\nTELEFONNUMMER</string>
+  <string name="registration_activity__phone_number">TELEFONNUMMER</string>
+  <string name="registration_activity__register">Registrer</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registreringsprosessen vil sende noe midlertidig kontaktinformasjon til serveren.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Mulige problemer:</string>
+  <string name="registration_problems__sms_interceptors">SMS blokkerere.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nNoen tredjeparts meldingsklienter, som Handcent eller GoSMS, oppfører seg dårlig og kaprer alle innkommende SMS meldinger. Sjekk for å se om du har mottatt en tekstmelding som starter med \'Your TextSecure verification code:\'. Om så er tilfelle må du konfigurere din tredjeparts meldingsklient til å slippe igjennom tekstmeldinger.</string>
+  <string name="registration_problems__incorrect_number">Feil nummer.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nSjekk at du har tastet inn telefonnummeret ditt riktig, og at det er riktig formattert for din region.</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.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Voice verifikasjon</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure can også ringe deg for å verisifere nummeret ditt. Trykk \'Ring meg\' og tast inn de 6 sifferene fra koden du hører nedenfor.</string>
+  <string name="registration_progress_activity__verify">Verifiser</string>
+  <string name="registration_progress_activity__call_me">Ring meg</string>
+  <string name="registration_progress_activity__edit_number">Endre nummer</string>
+  <string name="registration_progress_activity__connectivity_error">Tilkoblingsfeil.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure var ikke i stand til å opprette en forbindelse til \'push\' tjenesten.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Mulige problemer:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Ingen nettverksforbindelse.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Enheten din krever en nettverksforbindelse for å kunne benytte denne TextSecure funksjonen. Sjekk at den er er tilkoblet Edge, 3G, LTE eller et trådløst nett.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Restriktiv brannvegg.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nOm du er tilkoblet til Internett via et trådløst nett, så er det mulig at en brannvegg blokkerer tilgangen til TextSecure serveren. Prøv et annet trådløst nett eller benytt mobil data.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure vil nå automatisk verifisere nummeret ditt med en bekreftelse via SMS.</string>
+  <string name="registration_progress_activity__connecting">Kobler til...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Venter på SMS verifikasjon...</string>
+  <string name="registration_progress_activity__registering_with_server">Registrering mot server pågår...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Dette kan ta litt tid. Vær tålmodig; vi vil varsle deg når verifikasjonen er gjennomført.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure timet ut mens den ventet på en verifikasjons-SMS.\n</string>
+  <string name="registration_progress_activity__sms_verification_failed">SMS verifikasjon feilet.</string>
+  <string name="registration_progress_activity__generating_keys">Genererer nøkler...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Til</string>
+  <string name="recipients_panel__add_member">Legg til medlem</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Du har ingen ID-nøkler som du stoler på.</string>
   <!--verify_identity_activity-->
@@ -291,6 +406,7 @@
   <string name="AndroidManifest__create_passphrase">Opprett passord</string>
   <string name="AndroidManifest__enter_passphrase">Tast inn passord</string>
   <string name="AndroidManifest__select_contacts">Velg kontakter</string>
+  <string name="AndroidManifest__select_contact">Velg kontakt</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure oppdaget</string>
   <string name="AndroidManifest__public_identity_key">Offentlig ID-nøkkel</string>
   <string name="AndroidManifest__change_passphrase">Bytt passord</string>
@@ -308,6 +424,8 @@
   <string name="preferences__pref_all_mms_title">Benytt for all MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Benytt TextSecure for å lese og lagre alle innkommende SMS meldinger.</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Benytt TextSecure for å lese og lagre alle innkommende MMS meldinger.</string>
+  <string name="preferences__enable_enter_key_title">Aktiver \"Enter\" tasten</string>
+  <string name="preferences__replace_smiley_with_enter_key">Bytt ut \"Smiley\" tasten med en \"Enter\" tast</string>
   <string name="preferences__pref_enter_sends_title">\"Enter\" sender</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Inntasting av \"Enter\" fører til at meldingen blir sendt</string>
   <string name="preferences__display_settings">Innstillinger for visning</string>
@@ -331,12 +449,9 @@
   <string name="preferences__notifications">Varsling</string>
   <string name="preferences__display_message_notifications_in_status_bar">Vis varsel om meldinger i status feltet</string>
   <string name="preferences__led_color">LED farge</string>
-  <string name="preferences__change_notification_led_color">Endre farge på LED varsling</string>
   <string name="preferences__pref_led_blink_title">LED blinkemønster</string>
-  <string name="preferences__change_notification_blink_pattern">Endre LED-varslingens blinkemønster</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Velg LED blinkemønster</string>
-  <string name="preferences__select_led_color">Velg LED farge</string>
   <string name="preferences__sound">Lyd</string>
+  <string name="preferences__change_notification_sound">Endre lyd på meldingsvarsling</string>
   <string name="preferences__inthread_notifications">Varsling i aktiv tråd</string>
   <string name="preferences__play_inthread_notifications">Spill av varslingslyd ved visning av en aktiv samtaletråd. </string>
   <string name="preferences__vibrate">Vibrasjon</string>
@@ -361,8 +476,8 @@
   <string name="preferences__mmsc_url_required">MMSC URL (påkrevd)</string>
   <string name="preferences__mms_proxy_host_optional">MMS proxy host (valgfritt)</string>
   <string name="preferences__mms_proxy_port_optional">MMS proxy port (valgfritt)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Be om en leveringsrapport for hver SMS-melding du sender</string>
   <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Be om en leveringsrapport for hver SMS-melding du sender</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slett eldre meldinger automatisk når en samtale tråd overskrider en spesifisert lengde</string>
   <string name="preferences__delete_old_messages">Slett gamle meldinger</string>
   <string name="preferences__storage">Lagring</string>
@@ -377,6 +492,8 @@
   <string name="preferences__language">Språk</string>
   <string name="preferences__make_default_sms_app">Sett som standard SMS applikasjon</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">La TextSecure være enhetens standard SMS/MMS applikasjon.</string>
+  <string name="preferences__allow_sms_fallback">Tillat SMS fallback</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Send og motta SMS meldinger når push tjenesten ikke er tilgjengelig</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -402,13 +519,17 @@
   <string name="conversation_list_batch__menu_select_all">Merk alt</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Søk</string>
+  <string name="conversation_list__drawer_open">Åpne navigasjonsskuff</string>
+  <string name="conversation_list__drawer_close">Lukk navigasjonsskuff</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sikkerhet</string>
-  <string name="conversation_secure_verified__menu_verify_session">Bekreft sesjon</string>
+  <string name="conversation_secure_verified__menu_no_identity">Ingen identitet tilgjenglig</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Bekreft mottaker</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Abryt sikker sesjon</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Avslutt sikker sesjon</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Legg til vedlegg</string>
+  <string name="conversation__menu_update_group">Oppdater gruppe</string>
+  <string name="conversation__menu_leave_group">Forlat gruppe</string>
   <string name="conversation__menu_add_contact_info">Legg til kontaktinformasjon</string>
   <string name="conversation__menu_delete_thread">Slett tråd</string>
   <!--conversation_group_options-->
@@ -424,8 +545,9 @@
   <string name="text_secure_locked__menu_unlock">Lås opp</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Ny melding</string>
+  <string name="text_secure_normal__menu_new_group">Ny gruppe</string>
   <string name="text_secure_normal__menu_settings">Innstillinger</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Fjern passord</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Marker alle lest</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Bekreftet</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 789ccda74a..ff7e488e99 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -16,6 +16,9 @@
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Wyłączyć lokalne szyfrowanie?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nUwaga, szyfrowanie wszystkich Twoich wiadomości i kluczy zostanie wyłączone. Twoje szyfrowane sesje będą dalej funkcjonować, jednak ktokolwiek z fizycznym dostępem do urządzenia będzie miał dostęp do Twoich danych.</string>
   <string name="ApplicationPreferencesActivity_disable">Wyłącz</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Wyrejestrowywanie...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Wyrejestrowanie dla transmisji danych</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Błąd połączenia z serwerem!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Zdjęcie</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -33,15 +36,19 @@
   <string name="ConversationItem_success_exclamation">Sukces!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Nie udało się zapisać na karcie SD!</string>
   <string name="ConversationItem_view_secure_media_question">Pokazać zabezpieczone media? </string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Te media są obecnie przechowywane w zaszyfrowanej bazie danych. Niestety, żeby zobaczyć je przy użyciu zewnętrznej przeglądarki wymagane jest tymczasowe odszyfrowanie i zapisanie danych na dysk. Czy na pewno chcesz to zrobić?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Te media są obecnie przechowywane w zaszyfrowanej bazie danych. Niestety, żeby zobaczyć je przy użyciu zewnętrznej przeglądarki konieczne jest tymczasowe odszyfrowanie i zapisanie danych na dysk. Czy na pewno chcesz to zrobić?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Odebrano i przetworzono wiadomość wymiany kluczy.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Błąd, otrzymano nieprawidłową wiadomość wymiany kluczy. </string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Otrzymano wiadomość wymiany kluczy, kliknij żeby kontynuować</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Otrzymano wiadomość wymiany kluczy, kliknij żeby kontynuować.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Otrzymał zwykły tekstkowy, nieszyfrowany SMS podczas kiedy Ty masz otwartą bezpieczną sesję. Jeśli oni nie mają otwartej sesji, wiadomości które im wyślesz będą wyglądać jako zniekształcony tekst. Kliknij aby zakonczyć bezpieczną sesję.</string>
+  <string name="ConversationItem_group_action_left">%1$s opuścił grupę.</string>
+  <string name="ConversationItem_group_action_joined">%1$s dołączył do grupy.</string>
+  <string name="ConversationItem_group_action_modify">%1$s zaktualizował grupę.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Rozpocząć Bezpieczną Sesję?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Rozpocząć Bezpieczną Sesję z %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Potwierdzenie przerwania Bezpiecznej Sesji</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Na pewno chcesz przerwać bezpieczną sesję?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Potwierdzenie zakończenie bezpiecznej sesji</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Czy na pewno chcesz zakończyć bezpieczną sesję?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Potwierdzenie usunięcia wątku</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Na pewno chcesz całkowicie skasować tą konwersację?</string>
   <string name="ConversationActivity_add_attachment">Dodaj załącznik</string>
@@ -55,11 +62,15 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Grupuj Odbiorców Rozmowy</string>
   <string name="ConversationActivity_group_conversation">Grupuj Rozmowę</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d odbiorców w grupie</string>
+  <string name="ConversationActivity_unnamed_group">Grupa bez nazwy</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d uczestników</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 uczestnik</string>
   <string name="ConversationActivity_saving_draft">Zapisuję kopię roboczą...</string>
   <string name="ConversationActivity_invalid_recipient">Nieprawidłowy adresat!</string>
   <string name="ConversationActivity_calls_not_supported">Połączenia nie są obsługiwane</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Wygląda na to, że urządzenie nie wspiera wybierania numeru.</string>
+  <string name="ConversationActivity_leave_group">Opuścić grupę?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Czy na pewno chcesz opuścić grupę?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Szczegóły wiadomości</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Nadawca: %1$s\nTyp wiadomości: %2$s\nWysłano/Odebrano:%3$s</string>
@@ -88,6 +99,21 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">Błąd podczas zapisu na kartę SD.</string>
   <string name="ExportFragment_success">Sukces!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Eksportowanie zaszyfrowanych kluczy,\nustawień i wiadomości...\n\n    </string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nowa Grupa</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Aktualizuj Grupę</string>
+  <string name="GroupCreateActivity_group_name_hint">Nazwa Grupy</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Nowa Grupa MMS</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Zaznaczyłeś kontakt, który nie wspiera grup TextSecure, dlatego ta grupa będzie grupą MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Nie jesteś zajerestrowany do urzywania kanału danych, tak więc grupy TextSecure są niedostępne.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Nie jesteś właścicielem tej grupy, nie możesz edytować tytułu lub zdjęcia.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Wystąpił niespodziewany błąd, który wywołał nieudane utworzenie nowej grupy.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Potrzebujesz przynajmniej jeden osoby w Twojej grupie.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Jeden z Twoich kontaktów z Twojej grupy ma numer który nie może być prawidłowo odczytany. Proszę popraw go, lub usuń ten kontakt i spróbuj ponownie.</string>
+  <string name="GroupCreateActivity_file_io_exception">Błąd pliku I/O,  nie udało się stworzyć tymczasowego pliku obrazu.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar Grupy</string>
+  <string name="GroupCreateActivity_menu_create_title">Utwórz Grupę</string>
+  <string name="GroupCreateActivity_creating_group">Trwa tworzenie %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Zaimportować systemową bazę danych SMS?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Wiadomości z Twojej domyślnej bazy danych zostaną zaimportowane do bazy TextSecure. Jeśli wcześniej importowałeś już bazę danych SMS, ponowny import spowoduje zduplikowanie się wiadomości.</string>
@@ -97,7 +123,7 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nPrzywracanie z zaszyfrowanej kopii zapasowej spowoduje nadpisanie Twoich istniejących kluczy, ustawień i wiadomości. Stracisz wszystkie informacje zawarte w aplikacji TextSecure, oprócz informacji zawartych w kopii zapasowej.</string>
   <string name="ImportFragment_restore">Przywróć</string>
   <string name="ImportFragment_import_plaintext_backup">Importować z jawnej kopii zapasowej?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Wiadomości z jawnej kopii zapasowej zostaną zaimportowane. Jeśli wcześniej importowałeś już bazę danych SMS, ponowny import spowoduje zduplikowanie się wiadomości.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Wiadomości z jawnej kopii zapasowej zostaną zaimportowane. Jeżeli wcześniej wykonywałeś już tę czynność, ponowny import spowoduje zduplikowanie się wiadomości.</string>
   <string name="ImportFragment_importing">Importuje </string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importowanie tekstu z jawnej kopii zapasowej...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nie odnaleziono niezaszyfrowanej kopii zapasowej!</string>
@@ -132,6 +158,57 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pod tą wymianą kluczy jest inny od tego, który otrzymałeś poprzednio od tego kontaktu. Może to oznaczać, że ktoś próbuje przechwycić Twoją komunikację lub Twój kontakt przeinstalował program TextSecure i posiada teraz nowy klucz tożsamości.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Możesz chcieć zweryfikować kontakt.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Podpis pod tą wymianą kluczy jest zaufany, ale masz wyłączoną opcję \'automatyczna wymiana klucza\'.</string>
+  <string name="ReceiveKeyActivity_processing">Przetwarzanie</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Przetwarzanie kluczy...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Połącz z TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Wybierz Swój kraj</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Podaj kod telefoniczny kraju</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Podaj Swój numer telefonu</string>
+  <string name="RegistrationActivity_invalid_number">Niepoprawny numer</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Numer jaki podałeś (%s) jest niepoprawny.\n    </string>
+  <string name="RegistrationActivity_unsupported">Nieobsługiwany</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Przepraszamy, \nto urządzenie nie jest wspierane do przesyłania wiadomości korzystających z transmisji danych. Urządzenia działające na systemie Android starszym niż 4.0 muszą mieć zarejestrowane konto Google. \nUrządzenia działające na systemie Android 4.0 lub nowszym nie wymagają konta Google, ale muszą mieć zainstalowaną aplikację Sklep Play.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nTeraz sprawdzimy czy następujący numer jest powiązany z urządzeniem:\n%s\n\n\nCzy numer jest poprawny, czy chcesz edytować go przed kontynuowaniem?\n    </string>
+  <string name="RegistrationActivity_continue">Kontynuuj</string>
+  <string name="RegistrationActivity_edit">Edytuj</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Możliwe problemy</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Weryfikowanie numeru</string>
+  <string name="RegistrationProgressActivity_edit_s">Edytuj %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Rejestracja zakończona!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Możliwe problemy.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Musisz najpierw podać otrzymany kod...</string>
+  <string name="RegistrationProgressActivity_connecting">Łączenie</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Łączenie w celu weryfikacji...</string>
+  <string name="RegistrationProgressActivity_network_error">Błąd sieci!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Nie można połączyć. Sprawdź swoje połączenie sieciowe i spróbuj ponownie.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Weryfikacja zakończona niepowodzeniem!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Wysłany przez Ciebie kod weryfikacyjny jest niepoprawny. Spróbuj ponownie.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Zbyt wiele prób</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Wysłałeś zbyt wiele niepoprawnych kodów weryfikacyjnych. Poczekaj chwilę zanim spróbujesz ponownie.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Żądanie Połączenia</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Żądanie weryfikacyjnego połączenia przychodzącego...</string>
+  <string name="RegistrationProgressActivity_server_error">Błąd Serwera</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Serwer napotkał na błąd. Spróbuj ponownie.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Zbyt wiele zapytań!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Właśnie zażądałeś połączenie głosowego. Możesz ponownie żądać innego połączenia w ciągu 20 minut.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Weryfikacja kodu głosowego...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Rejestracja zakończona</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Rejestracja TextSecure została pomyślnie zakończona.</string>
+  <string name="RegistrationService_registration_error">Błąd rejestracji</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Rejestracja TextSecure napotkała na problem.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Otrzymano uszkodzony klucz!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nOtrzymano klucz dla niepoprawnej wersji protokołu.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nOtrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć i wyświetlić.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Otrzymał zaktualizowany, ale z nieznaną informacją tożsamości. Naciśnij aby potwierdzić tożsamość.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Bezpieczna sesja zakończona.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Opuścił grupę...</string>
+  <string name="TheadRecord_secure_session_ended">Bezpieczna sesja zakończona.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nie posiadasz klucza tożsamości.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Odbiorca nie posiada klucza tożsamości.</string>
@@ -183,8 +260,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Trwa import</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importuje wiadomości tekstowe</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Hasło TextSecure zapisane</string>
-  <string name="KeyCachingService_passphrase_cached">Hasło zapisane</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Dotknij, aby otworzyć.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Dotknij, aby otworzyć lub dotknij zablokuj, aby zamknąć.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure jest odblokowany</string>
+  <string name="KeyCachingService_lock">Zablokuj hasłem</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d nowych wiadomości</string>
   <string name="MessageNotifier_most_recent_from_s">Najnowsze zaczynając od: %s</string>
@@ -217,12 +296,15 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Brak kontaktów.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Szukanie kontaktów...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Wpisz imię aby przefiltrować...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Wybierz dla</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Brak ostatnich telefonów.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Wprowadź wiadomość</string>
+  <string name="conversation_activity__type_message"><small>Wyślij wiadomość</small></string>
   <string name="conversation_activity__send">Wyślij</string>
   <string name="conversation_activity__remove">Usuń</string>
   <!--conversation_item_sent-->
@@ -233,8 +315,10 @@
   <string name="conversation_item_received__downloading">Pobieranie</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Wybór trybu Batch</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Wczytywanie krajów...</string>
+  <string name="country_selection_fragment__search">Szukaj</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">Proszę wybierz hasło które będzie użyte do lokalnego szyfrowanie Twoich danych.\n\nHasło powinno być mocne.</string>
   <string name="create_passphrase_activity__passphrase">HASŁO:</string>
   <string name="create_passphrase_activity__repeat">POWTÓRZ</string>
   <string name="create_passphrase_activity__continue">Kontynuuj</string>
@@ -272,8 +356,45 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (OPCJONALNIE):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Zakończono</string>
+  <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nTextSecure może wykorzystać czat on-line aby zwiększyć prywatność i uniknąć opłat za SMS podczas komunikacji z innymi użytkownikami TextSecure. Aby włączyć tą funkcję, zweryfikuj swój numer telefonu.</string>
+  <string name="registration_activity__your_country">TWÓJ KRAJ</string>
+  <string name="registration_activity__your_country_code_and_phone_number">KOD TWOJEGO KRAJU I NUMER TELEFONU</string>
+  <string name="registration_activity__phone_number">NUMER TELEFONU</string>
+  <string name="registration_activity__register">Rejestracja</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Podczas rejestracji, niektóre informacje o kontakcie zostaną przesłane tymczasowo na serwer.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Niektóre możliwe problemy:</string>
+  <string name="registration_problems__sms_interceptors">Przechwytywanie SMS.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nNiektóre zewnętrzne aplikacje SMS, takie jak Handcent lub GoSMS mogą przechwytywać całą komunikację SMS. Sprawdź czy otrzymałeś wiadomość rozpoczynającą się od słów: \'Twój kod weryfikacyjny TextSecure:\'. Jeśli tak, musisz skonfigurować swoją zewnętrzną aplikację tak aby nie przechwytywała wiadomości SMS.</string>
+  <string name="registration_problems__incorrect_number">Niepoprawny numer.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nUpewnij się czy wprowadzony numer jest poprawny oraz czy podany jest prawidłowy kod Twojego regionu.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure nie będzie współpracował z numerami Google Voice.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Weryfikacja Głosowa</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure może również zadzwonić  do Ciebie w celu weryfikacji numeru. Wybierz \'Zadzwoń do mnie\' i wprowadź sześciocyfrowy kod który usłyszysz.</string>
+  <string name="registration_progress_activity__verify">Weryfikuj</string>
+  <string name="registration_progress_activity__call_me">Zadzwoń do mnie</string>
+  <string name="registration_progress_activity__edit_number">Edytuj numer</string>
+  <string name="registration_progress_activity__connectivity_error">Błąd połączenia.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure nie był w stanie połączyć się z usługą push service.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Niektóre możliwe problemy:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Brak połączenie z siecią.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Twoje urządzenie potrzebuje połączyć się z siecią aby użyć tej funkcji TextSecure. Sprawdź czy urządzenie podłączone jest do sieci 3G lub WiFi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Restrykcyjny Firewall.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nJeśli jesteś połączony przez WiFi, możliwe jest że Firewall blokuje dostęp do serwera TextSecure.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure zweryfikuje teraz automatycznie Twój numer za pomocą wiadomości SMS.</string>
+  <string name="registration_progress_activity__connecting">Łączenie...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Oczekiwanie na weryfikację SMS...</string>
+  <string name="registration_progress_activity__registering_with_server">Rejestrowanie na serwerze...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">To może zająć chwilę. Prosimy o cierpliwość, powiadomimy Cię gdy weryfikacja zostanie zakończona.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nUpłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Weryfikacja SMS zakończona niepowodzeniem.</string>
+  <string name="registration_progress_activity__generating_keys">Generowanie kluczy...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Do</string>
+  <string name="recipients_panel__add_member">Dodaj uczestnika</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Aktualnie nie masz żadnych kluczy tożsamości w swojej bazie danych zaufania.</string>
   <!--verify_identity_activity-->
@@ -291,6 +412,7 @@
   <string name="AndroidManifest__create_passphrase">Stwórz hasło</string>
   <string name="AndroidManifest__enter_passphrase">Wprowadź hasło</string>
   <string name="AndroidManifest__select_contacts">Wybierz kontakty</string>
+  <string name="AndroidManifest__select_contact">Wybierz Kontakt</string>
   <string name="AndroidManifest__textsecure_detected">Wykryto TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Publiczny klucz tożsamości</string>
   <string name="AndroidManifest__change_passphrase">Zmień hasło</string>
@@ -306,8 +428,10 @@
   <string name="preferences__general">Ogólne</string>
   <string name="preferences__pref_all_sms_title">Wykorzystaj dla wszystkich SMS</string>
   <string name="preferences__pref_all_mms_title">Wykorzystaj dla wszystkich MMS</string>
-  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Użyj TextSecure do przeglądania i trzymania wszystkich wiadomości tekstowych</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Użyj TextSecure do przeglądania i przechowywania wszystkich wiadomości tekstowych.</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Użyj TextSecure do przeglądania i przechowywania wszystkich wiadomości multimedialnych</string>
+  <string name="preferences__enable_enter_key_title">Włącz klawisz Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Zastąp emotikonę klawiszem Enter</string>
   <string name="preferences__pref_enter_sends_title">Enter wysyła</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Wciśnięcie przycisku enter wyśle wiadomość</string>
   <string name="preferences__display_settings">Ustawienia wyświetlania</string>
@@ -315,15 +439,15 @@
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Wybierz swój kontakt początkowy z listy kontaktów.</string>
   <string name="preferences__change_passphrase">Zmień hasło</string>
   <string name="preferences__change_my_passphrase">Zmień moje hasło</string>
-  <string name="preferences__complete_key_exchanges">Wymiana kluczy zakończona</string>
+  <string name="preferences__complete_key_exchanges">Wymiana kluczy</string>
   <string name="preferences__disable_passphrase">Wyłącz lokalne szyfrowanie</string>
   <string name="preferences__disable_local_encryption_of_messages_and_keys">Wyłącz szyfrowanie wiadomości i kluczy przechowywanych w urządzeniu</string>
-  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatycznie wypełnij wymianę kluczy dla nowej sesji albo dla obecnej sesji używając tego samego klucza</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automatycznie wymień klucze dla nowej sesji albo użyj tego samego klucza tożsamości dla istniejącej sesji</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Zapomnij hasło z pamięci systemu po pewnym czasie</string>
   <string name="preferences__timeout_passphrase">Limit czasu dla hasła</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Wybierz czas do automatycznego wylogowania</string>
   <string name="preferences__pref_timeout_interval_title">Czas wygaśnięcia</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Ilość czasu przed sformatowaniem hasła z pamięci</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Ilość czasu do usunięcia hasła z pamięci urządzenia</string>
   <string name="preferences__identity_key_settings">Klucze tożsamości</string>
   <string name="preferences__view_my_identity_key">Pokaż mój klucz identyfikacyjny</string>
   <string name="preferences__manage_identity_keys">Zarządzaj kluczami tożsamości</string>
@@ -331,12 +455,9 @@
   <string name="preferences__notifications">Powiadomienia</string>
   <string name="preferences__display_message_notifications_in_status_bar">Wyświetlaj powiadomienia o wiadomości na pasku </string>
   <string name="preferences__led_color">Kolor LED</string>
-  <string name="preferences__change_notification_led_color">Zmień kolor powiadomienia LED</string>
   <string name="preferences__pref_led_blink_title">Wzór powiadomień LED</string>
-  <string name="preferences__change_notification_blink_pattern">Zmień wzór powiadomień LED</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Wybierz wzór migających LED</string>
-  <string name="preferences__select_led_color">Wybierz kolor LED</string>
   <string name="preferences__sound">Dźwięk</string>
+  <string name="preferences__change_notification_sound">Zmień dźwięk powiadomienia</string>
   <string name="preferences__inthread_notifications">Powiadomienia \"w rozmowie\"</string>
   <string name="preferences__play_inthread_notifications">Odtwórz dźwięk powiadomienia podczas przeglądania rozmowy.</string>
   <string name="preferences__vibrate">Wibracja</string>
@@ -357,12 +478,12 @@
   <string name="preferences__passphrase">Hasło</string>
   <string name="preferences__advanced_mms_access_point_names">Ustawienia MMS</string>
   <string name="preferences__enable_manual_mms">Włącz ustawienia ręczne MMS</string>
-  <string name="preferences__override_system_mms_settings">Zastąp systemowe ustawienia MMS informacjami poniżej.</string>
+  <string name="preferences__override_system_mms_settings">Zastąp ustawienia systemowe MMS informacjami poniżej.</string>
   <string name="preferences__mmsc_url_required">Adres MMSC (Wymagane)</string>
-  <string name="preferences__mms_proxy_host_optional">Host Proxy dla MMS\'a (nieobowiązkowe)</string>
-  <string name="preferences__mms_proxy_port_optional">Port Proxy dla MMS\'a (nieobowiązkowe)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Żądaj raportu dostarczenia każdej wysłanej wiadomości SMS</string>
+  <string name="preferences__mms_proxy_host_optional">Host Proxy dla MMS (nieobowiązkowe)</string>
+  <string name="preferences__mms_proxy_port_optional">Port Proxy dla MMS (nieobowiązkowe)</string>
   <string name="preferences__sms_delivery_reports">Raporty dostarczenia SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Żądaj raportu dostarczenia każdej wysłanej wiadomości SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatycznie kasuj starsze wiadomości po przekroczeniu określonej długości wątku</string>
   <string name="preferences__delete_old_messages">Skasuj stare wiadomości</string>
   <string name="preferences__storage">Przechowywanie</string>
@@ -377,6 +498,10 @@
   <string name="preferences__language">Język</string>
   <string name="preferences__make_default_sms_app">Ustaw jako domyślną aplikację SMS</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Ustaw TextSecure jako domyślną aplikację SMS/MMS.</string>
+  <string name="preferences__use_data_channel">Czat</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nZwiększ swoją prywatność i uniknij opłat za SMS używając transmisji danych do komunikacji z innymi użytkownikami TextSecure.</string>
+  <string name="preferences__allow_sms_fallback">Pozwól na SMS Fallback</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Wysyłaj i otrzymuj wiadomości SMS kiedy pchnięcie nie jest dostępne.</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -402,13 +527,17 @@
   <string name="conversation_list_batch__menu_select_all">Wybierz wszystko</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Szukaj</string>
+  <string name="conversation_list__drawer_open">Otwórz szufladę nawigacji</string>
+  <string name="conversation_list__drawer_close">Zamknij szufladę nawigacji</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Bezpieczeństwo</string>
-  <string name="conversation_secure_verified__menu_verify_session">Zweryfikuj sesję</string>
+  <string name="conversation_secure_verified__menu_no_identity">Brak dostępnych tożsamości</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Zweryfikuj odbiorcę</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Przerwij bezpieczną sesję</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Zakończ Bezpieczną Sesję</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Dodaj załącznik</string>
+  <string name="conversation__menu_update_group">Aktualizuj Grupę</string>
+  <string name="conversation__menu_leave_group">Opuść Grupę</string>
   <string name="conversation__menu_add_contact_info">Dodaj dane kontaktowe</string>
   <string name="conversation__menu_delete_thread">Usuń wątek</string>
   <!--conversation_group_options-->
@@ -424,8 +553,9 @@
   <string name="text_secure_locked__menu_unlock">Odblokuj</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nowa wiadomość</string>
+  <string name="text_secure_normal__menu_new_group">Nowa Grupa</string>
   <string name="text_secure_normal__menu_settings">Ustawienia</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Wyczyść Hasło</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Zablokuj</string>
   <string name="text_secure_normal__mark_all_as_read">Oznacz jako przeczytane</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Zweryfikowano</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 3e4d0d1251..12b882b765 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -16,6 +16,9 @@
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Desabilitar criptografia de armazenamento?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n        Atenção, isto irá desabilitar a criptografia de armazenamento para todas as mensagens e chaves. Suas sessões\n        criptografadas continuarão funcionando, mas qualquer um com acesso físico ao seu aparelho\n        conseguirá acessá-las.\n    </string>
   <string name="ApplicationPreferencesActivity_disable">Desabilitar</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Descadastrando...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Descadastrando-se da comunicação de dados</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
@@ -33,15 +36,19 @@
   <string name="ConversationItem_success_exclamation">Sucesso!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Não é possível escrever no cartão SD...</string>
   <string name="ConversationItem_view_secure_media_question">Ver ficheiro seguro?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este ficheiro foi armazenado numa base de dados cifrada. Infelizmente, para o visualizar com um visualizador externo, é necessário que os dados sejam decifrados temporariamente e escritos para o disco.\nTem a certeza que pretende fazer isto?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Esta mídia foi armazenada em uma base de dados criptografada. Infelizmente, para visualizá-la em um programa externo é necessário que os dados sejam descriptografados temporariamente e escritos para o disco.\nTem certeza que deseja fazer isto?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Mensagem de intercâmbio de chaves recebida e processada.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erro, foi recebida uma mensagem de intercâmbio de chaves desactualizada.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Foi recebida uma mensagem de intercâmbio de chaves, clique para a processar</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Foi recebida uma mensagem de intercâmbio de chaves, clique para processá-la.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Foi recebido um SMS em texto claro enquanto você tem uma sessão segura aberta. Se eles não tiverem uma sessão aberta, as mensagens que você enviar aparecerão como texto ilegível. Clique para terminar a sessão segura.</string>
+  <string name="ConversationItem_group_action_left">%1$s saiu do grupo.</string>
+  <string name="ConversationItem_group_action_joined">%1$s entrou no grupo.</string>
+  <string name="ConversationItem_group_action_modify">%1$s atualizou o grupo.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniciar sessão segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar sessão segura com %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Confirmação de término de sessão segura</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Tem a certeza que pretende terminar esta sessão segura?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Confirmação de Encerramento de Sessão Segura</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Tem certeza que deseja encerrar esta sessão segura?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirme apagar a conversa</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Tem a certeza que pretende apagar permanentemente esta conversa?</string>
   <string name="ConversationActivity_add_attachment">Adicionar anexo</string>
@@ -55,7 +62,9 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Agrupar destinatários de conversa</string>
   <string name="ConversationActivity_group_conversation">Conversa em grupo</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d destinatários no grupo</string>
+  <string name="ConversationActivity_unnamed_group">Grupo sem nome</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d membros</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 membro</string>
   <string name="ConversationActivity_saving_draft">Salvando rascunho...</string>
   <string name="ConversationActivity_invalid_recipient">Destinatário inválido!</string>
   <string name="ConversationActivity_calls_not_supported">Chamadas não suportadas</string>
@@ -79,15 +88,30 @@
   <string name="ExportFragment_export_to_sd_card">Exportar para cartão SD?</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">Isto\n        exportará suas chaves criptografadas, configurações e mensagens para o cartão SD.\n    </string>
   <string name="ExportFragment_export">Exportar</string>
-  <string name="ExportFragment_export_plaintext_to_sd_card">Exportar como texto puro para cartão SD?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenção, isto exportará\n        os conteúdos de texto puro de suas mensagens TextSecure para o cartão SD.\n    </string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Exportar Texto Claro Para Cartão SD?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenção, isto exportará\n        os conteúdos de texto claro de suas mensagens TextSecure para o cartão SD.\n    </string>
   <string name="ExportFragment_cancel">Cancelar</string>
   <string name="ExportFragment_exporting">Exportando</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportando texto puro para cartão SD...\n    </string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Exportando texto claro para cartão SD...\n    </string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Erro, não foi possível escrever\n        no cartão SD!\n    </string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Erro durante escrita no cartão SD.\n    </string>
   <string name="ExportFragment_success">Sucesso!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Exportando chaves criptogradas,\n        configurações e mensagens...\n    </string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Novo grupo</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Atualizar grupo</string>
+  <string name="GroupCreateActivity_group_name_hint">Nome do grupo</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Novo grupo MMS</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Você selecionou um contato que não tem suporte a grupos TextSecure, então este grupo será de MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Você não está cadastrado para usar o canal de dados, então grupos TextSecure estão desabilitados.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Você não é o dono deste grupo, portanto não pode editar o título nem a foto.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Um erro inesperado ocorreu e fez a criação do grupo falhar.</string>
+  <string name="GroupCreateActivity_contacts_no_members">Você precisa de pelo menos uma pessoa no seu grupo!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Um dos membros do seu grupo tem um número que não pôde ser lido. Favor consertar ou remover esse contato e tentar novamente.</string>
+  <string name="GroupCreateActivity_file_io_exception">Erro de E/S de arquivo. Não foi possível criar um arquivo temporário de imagem.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar do grupo</string>
+  <string name="GroupCreateActivity_menu_create_title">Criar grupo</string>
+  <string name="GroupCreateActivity_creating_group">Criando %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importar base de dados SMS do sistema?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Isto importará\n        mensagens da base de dados SMS padrão do sistema para o TextSecure. \n         Se isto já foi feito anteriormente, importar novamente resultará em mensagens duplicadas.\n    </string>
@@ -96,11 +120,11 @@
   <string name="ImportFragment_restore_encrypted_backup">Restaurar backup criptografado?</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n        Restorar um backup criptografado irá substituir completamente suas chaves existentes, preferências e\n        mensagens. Você perderá toda informação que estiver em sua instalação atual\n        mas não estiver no backup.\n    </string>
   <string name="ImportFragment_restore">Restaurar</string>
-  <string name="ImportFragment_import_plaintext_backup">Importar backup de texto puro?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Isto importará\n        mensagens de um backup de texto puro. Se você já fez isso anteriormente,\n        importar novamente resultará em mensagens duplicadas.\n    </string>
+  <string name="ImportFragment_import_plaintext_backup">Importar Backup de Texto Claro?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Isto irá importar\n        mensagens de um backup em texto claro. Se você já importou este backup anteriormente,\n        importá-lo novamente resultará em mensagens duplicadas.\n    </string>
   <string name="ImportFragment_importing">Importando</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Importar backup de texto puro...</string>
-  <string name="ImportFragment_no_plaintext_backup_found">Nenhum backup de texto puro encontrado!</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importar backup de texto claro...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Nenhum backup de texto claro encontrado!</string>
   <string name="ImportFragment_error_importing_backup">Erro ao importar backup!</string>
   <string name="ImportFragment_import_complete">Importação finalizada!</string>
   <string name="ImportFragment_restoring">Restaurando</string>
@@ -132,6 +156,54 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">A\n        assinatura nesta troca de chaves é diferente da que você recebeu anteriormente deste\n        contato. Isto pode significar que alguém está tentando interceptar sua comunicação, ou\n        que este contato reinstalou o TextSecure e agora tem uma nova chave de identidade.\n    </string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Talvez você queira verificar\n        este contato.\n    </string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">A\n        assinatura nesta troca de chaves é confiável, mas a opção \'completar troca de chaves automaticamente\'\n        está desabilitada.\n    </string>
+  <string name="ReceiveKeyActivity_processing">Processando</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Processando troca de chaves...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Conectar-se ao TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Selecione seu país</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Você deve especificar o\n        código do seu país\n    </string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Você deve especificar seu\n        número de telefone\n    </string>
+  <string name="RegistrationActivity_invalid_number">Número inválido</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">O número que você\n        especificou (%s) é inválido.\n    </string>
+  <string name="RegistrationActivity_unsupported">Não suportado</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Desculpe,\n        este dispositivo não é suportado para mensagens de dados. Dispositivos rodando versões de Android anteriores\n        à 4.0 devem ter uma Conta Google registrada. Dispositivos rodando Android 4.0 ou superior não\n        precisam de uma Conta Google, mas devem ter o aplicativo Play Store instalado.\n    </string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\n        Vamos agora verificar se o seguinte número está associado a este aparelho:\n\n%s\n\n\n        Este número está correto ou gostaria de editá-lo antes de continuar?\n    </string>
+  <string name="RegistrationActivity_continue">Continuar</string>
+  <string name="RegistrationActivity_edit">Editar</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Possíveis problemas</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Verificando número</string>
+  <string name="RegistrationProgressActivity_edit_s">Editar %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Cadastro completo!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Possíveis problemas.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Você deve inserir o código recebido anteriormente...</string>
+  <string name="RegistrationProgressActivity_connecting">Conectando</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Conectando para verificação...</string>
+  <string name="RegistrationProgressActivity_network_error">Erro de rede!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Não foi possível conectar. Favor checar sua conexão de rede e tentar novamente.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Falha na verificação!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">O código de verificação enviado está incorreto. Favor tentar novamente.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Muitas tentativas</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Você enviou muitas vezes um código de verificação incorreto. Favor aguardar um minuto antes de tentar novamente.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Solicitar chamada</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Solicitando chamada de verificação...</string>
+  <string name="RegistrationProgressActivity_server_error">Erro no servidor</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">O servidor encontrou um erro. Favor tentar novamente.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Muitas solicitações!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Você já solicitou recentemente um chamada de voz. Você pode solicitar outra em 20 minutos.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Verificando código de voz...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Cadastro completo</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">O cadastro em TextSecure foi completado com sucesso.</string>
+  <string name="RegistrationService_registration_error">Erro de cadastro</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">O cadastro em TextSecure encontrou um problema.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Recebida mensagem de troca\n        de chaves corrompida!\n    </string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\n        Mensagem de troca de chaves recebida para uma versão de protocolo inválida.\n    </string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\n        Mensagem recebida com chave de identidade desconhecida. Clique para processar e exibir.\n    </string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Foi recebida atualização mas com informação de identidade desconhecida. Clique para validar a identidade.</string>
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Não tem uma chave de identidade.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Destinatário não tem chave de identidade.</string>
@@ -183,8 +255,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Importação em andamento</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importando mensagens de texto</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Frase-chave TextSecure guardada em memória cache</string>
-  <string name="KeyCachingService_passphrase_cached">Frase-chave guardada em cache</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Toque para abrir.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Toque para abrir, ou toque no cadeado para fechar.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure está destrancado</string>
+  <string name="KeyCachingService_lock">Trancar com frase-chave</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) novas mensagens</string>
   <string name="MessageNotifier_most_recent_from_s">Mais recente de: %s</string>
@@ -217,12 +291,15 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Encontrando contatos...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Digite um nome para filtrar...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Sem chamadas recentes.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Digite a mensagem</string>
+  <string name="conversation_activity__type_message"><small>Enviar uma mensagem</small></string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
   <!--conversation_item_sent-->
@@ -233,8 +310,10 @@
   <string name="conversation_item_received__downloading">A transferir</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modo de selecção em grupo</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Carregando países...</string>
+  <string name="country_selection_fragment__search">Procurar</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">Por favor escolha uma frase-chave que será usada para cifrar os seus dados localmente. Esta deve ser uma frase-chave forte.</string>
   <string name="create_passphrase_activity__passphrase">Frase-chave:</string>
   <string name="create_passphrase_activity__repeat">Repetir:</string>
   <string name="create_passphrase_activity__continue">Continuar</string>
@@ -250,14 +329,14 @@
   <string name="database_upgrade_activity__updating_database">Atualizando base de dados...</string>
   <string name="export_fragment__export_encrypted_backup">Exportar backup criptografado</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Exportar um backup\n        criptografado para o cartão SD.\n    </string>
-  <string name="export_fragment__export_plaintext_backup">Exportar backup de texto puro</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n        Exportar um backup de texto puro compatível com \'SMSBackup And Restore\' para o cartão SD.</string>
+  <string name="export_fragment__export_plaintext_backup">Exportar backup de texto claro</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\n        Exportar um backup de texto claro compatível com \'SMSBackup And Restore\' para o cartão SD.</string>
   <string name="import_fragment__import_system_sms_database">Importar Base de Dados SMS do Sistema</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importar base de dados\n        do app de mensagens padrão do sistema.\n    </string>
   <string name="import_fragment__import_encrypted_backup">Importar Backup Criptografado</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\n        Restaurar um backup TextSecure criptografado previamente exportado.\n    </string>
-  <string name="import_fragment__import_plaintext_backup">Importar Backup de Texto Puro</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\n        Importar um backup de texto puro. Compatível com \'SMSBackup And Restore.\'</string>
+  <string name="import_fragment__import_plaintext_backup">Importar Backup de Texto Claro</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\n        Importar um backup de texto claro. Compatível com \'SMSBackup And Restore.\'</string>
   <string name="local_identity__regenerate_key">Gerar Nova Chave</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">É necessária a configuração manual de MMS para seu aparelho.</string>
@@ -272,8 +351,44 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">PORTA DO PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Concluído</string>
+  <!--registration_activity-->
+  <string name="registration_activity__your_country">SEU PAÍS</string>
+  <string name="registration_activity__your_country_code_and_phone_number">SEU CÓDIGO DE PAÍS E\n        NÚMERO TELEFÔNICO\n    </string>
+  <string name="registration_activity__phone_number">NÚMERO TELEFÔNICO</string>
+  <string name="registration_activity__register">Cadastrar</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">O registro irá transmitir algumas informações de contato com o servidor temporariamente.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Alguns problemas possíveis\n        incluem:\n    </string>
+  <string name="registration_problems__sms_interceptors">Interceptadores SMS.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\n        Alguns clientes externos de mensagem de texto, como Handcent ou GoSMS, comportam-se mal e\n        interceptam todas as mensagens SMS que chegam. Verifique se você recebeu uma mensagem de texto\n        que começa com \'Seu código de verificação TextSecure:\', neste caso será necessário configurar\n        seu app de mensagem de texto para ele deixar as mensagens de texto passarem.\n    </string>
+  <string name="registration_problems__incorrect_number">Número incorreto.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nPor favor, verifique se colocou o número corretamente, e se está formatado corretamente\npara sua região.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\n        TextSecure não funcionará com números Google Voice.\n    </string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Verificação por voz</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\n        TextSecure também pode te ligar para verificar seu número. Clique em \'Me ligar\' e\n        insira abaixo o código de seis dígitos que você ouvir.\n    </string>
+  <string name="registration_progress_activity__verify">Verificar</string>
+  <string name="registration_progress_activity__call_me">Me ligar</string>
+  <string name="registration_progress_activity__edit_number">Editar número</string>
+  <string name="registration_progress_activity__connectivity_error">Erro de conectividade.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\n        TextSecure não conseguiu conectar-se ao serviço de entrega.\n    </string>
+  <string name="registration_progress_activity__some_possible_problems_include">Alguns problemas \npossíveis, incluem:\n    </string>
+  <string name="registration_progress_activity__no_network_connectivity">Sem conectividade\n na rede.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">O seu dispositivo precisa de conectividade de rede para usar este recurso do TextSecure.\nConfira para ter certeza de que está conectado ao 3G ou Wifi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Firewall restritivo.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nSe você está conectado via wifi, é possível que exista um firewall bloqueando o acesso\nao servidor do TextSecure. Tente outra rede ou dados móveis.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure agora, irá, automaticamente, verificar seu número com uma mensagem sms de confirmação.</string>
+  <string name="registration_progress_activity__connecting">Conectando...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Aguardando SMS\nverificando...</string>
+  <string name="registration_progress_activity__registering_with_server">Registrando no servidor...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Isto\npoderá levar um tempo. Por favor seja paciente, nós te notificaremos quando a verificação estiver completa.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure expirou o tempo enquanto aguardava pela verificação da mensagem SMS.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Verificação de SMS\nfalhou.</string>
+  <string name="registration_progress_activity__generating_keys">Gerando chaves...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Para</string>
+  <string name="recipients_panel__add_member">Adicionar membro</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Não tem, presentemente, nenhuma chave de identidade na sua base de dados de confianças.</string>
   <!--verify_identity_activity-->
@@ -282,7 +397,7 @@
   <!--verify_import_identity_activity-->
   <string name="verify_import_identity_activity__identity_name_n">Nome de identidade:\n\n</string>
   <string name="verify_import_identity_activity__imported_identity_n">Identidade importada:\n\n</string>
-  <string name="verify_import_identity_activity__verified">Verificado!</string>
+  <string name="verify_import_identity_activity__verified">Verificada!</string>
   <string name="verify_import_identity_activity__compare">Comparar</string>
   <!--verify_keys_activity-->
   <string name="verify_keys_activity__they_read_this">O destinatário lê:</string>
@@ -291,6 +406,7 @@
   <string name="AndroidManifest__create_passphrase">Criar frase-chave</string>
   <string name="AndroidManifest__enter_passphrase">Introduzir frase-chave</string>
   <string name="AndroidManifest__select_contacts">Seleccionar contactos</string>
+  <string name="AndroidManifest__select_contact">Selecionar contato</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
   <string name="AndroidManifest__public_identity_key">Chave de identidade pública</string>
   <string name="AndroidManifest__change_passphrase">Mudar frase-chave</string>
@@ -308,6 +424,8 @@
   <string name="preferences__pref_all_mms_title">Utilizar para todas as MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens de texto recebidas</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para visualizar e armazenar todas as mensagens multimédia recebidas</string>
+  <string name="preferences__enable_enter_key_title">Habilitar tecla Enter</string>
+  <string name="preferences__replace_smiley_with_enter_key">Troca a tecla smiley por uma tecla enter</string>
   <string name="preferences__pref_enter_sends_title">Tecla de enter envia</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Pressionar a tecla Enter envia mensagem de texto</string>
   <string name="preferences__display_settings">Configurações de apresentação</string>
@@ -331,12 +449,9 @@
   <string name="preferences__notifications">Notificações</string>
   <string name="preferences__display_message_notifications_in_status_bar">Apresentar notificações de mensagens na barra de estado</string>
   <string name="preferences__led_color">Cor do LED</string>
-  <string name="preferences__change_notification_led_color">Mudar a cor do LED de notificação</string>
-  <string name="preferences__pref_led_blink_title">Padrão de pisca do LED</string>
-  <string name="preferences__change_notification_blink_pattern">Alterar padrão de pisca do LED</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Seleccionar padrão de pisca do LED</string>
-  <string name="preferences__select_led_color">Seleccionar cor do LED</string>
+  <string name="preferences__pref_led_blink_title">Padrão de piscagem do LED</string>
   <string name="preferences__sound">Som</string>
+  <string name="preferences__change_notification_sound">Mudar som de notificação</string>
   <string name="preferences__inthread_notifications">Notificações em conversas</string>
   <string name="preferences__play_inthread_notifications">Tocar som de notificação quando vendo uma conversa ativa.</string>
   <string name="preferences__vibrate">Vibrar</string>
@@ -361,8 +476,8 @@
   <string name="preferences__mmsc_url_required">URL do MMSC (Necessário)</string>
   <string name="preferences__mms_proxy_host_optional">Proxy MMS (Opcional)</string>
   <string name="preferences__mms_proxy_port_optional">Porta do Proxy MMS (Opcional)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente deletar mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
   <string name="preferences__delete_old_messages">Deletar mensagens antigas</string>
   <string name="preferences__storage">Armazenamento</string>
@@ -377,6 +492,8 @@
   <string name="preferences__language">Idioma</string>
   <string name="preferences__make_default_sms_app">Definir como app SMS padrão</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Tornar o TextSecure o aplicativo SMS/MMS padrão do sistema.</string>
+  <string name="preferences__allow_sms_fallback">Permitir SMS como segunda opção</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Enviar e receber mensagens SMS quando envio não estiver disponível</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -402,13 +519,17 @@
   <string name="conversation_list_batch__menu_select_all">Seleccionar tudo</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Procurar</string>
+  <string name="conversation_list__drawer_open">Abrir menu de navegação</string>
+  <string name="conversation_list__drawer_close">Fechar menu de navegação</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Segurança</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verificar sessão</string>
+  <string name="conversation_secure_verified__menu_no_identity">Nenhuma Identidade Disponível</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verificar destinatário</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Abortar sessão segura</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Terminar sessão segura</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Adicionar anexo</string>
+  <string name="conversation__menu_update_group">Atualizar grupo</string>
+  <string name="conversation__menu_leave_group">Sair do grupo</string>
   <string name="conversation__menu_add_contact_info">Adicionar informações de contato</string>
   <string name="conversation__menu_delete_thread">Apagar conversa</string>
   <!--conversation_group_options-->
@@ -424,10 +545,11 @@
   <string name="text_secure_locked__menu_unlock">Desbloquear</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Mensagem nova</string>
+  <string name="text_secure_normal__menu_new_group">Novo grupo</string>
   <string name="text_secure_normal__menu_settings">Configurações</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Limpar frase-chave</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Trancar</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
   <!--verify_keys-->
-  <string name="verify_keys__menu_verified">Verificado</string>
+  <string name="verify_keys__menu_verified">Verificadas</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a6b5d03303..6e43a6fdff 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -33,15 +33,11 @@
   <string name="ConversationItem_success_exclamation">Sucesso!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Não é possível escrever no cartão SD!</string>
   <string name="ConversationItem_view_secure_media_question">Ver ficheiro seguro?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Este ficheiro foi armazenado numa base de dados cifrada. Infelizmente, para o visualizar com um visualizador externo, é necessário que os dados sejam decifrados temporariamente e escritos para o disco.\nTem a certeza que pretende fazer isto?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Mensagem de intercâmbio de chaves recebida e processada.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erro, foi recebida uma mensagem de intercâmbio de chaves desactualizada.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Foi recebida uma mensagem de intercâmbio de chaves, clique para a processar</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniciar sessão segura?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Iniciar sessão segura com %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Confirmação de término de sessão segura</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Tem a certeza que pretende terminar esta sessão segura?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirme apagar a conversa</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Tem a certeza que pretende apagar permanentemente esta conversa?</string>
   <string name="ConversationActivity_add_attachment">Adicionar anexo</string>
@@ -54,7 +50,6 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Agrupar destinatários de conversa</string>
   <string name="ConversationActivity_group_conversation">Conversa em grupo</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d destinatários no grupo</string>
   <string name="ConversationActivity_saving_draft">A guardar rascunho...</string>
   <string name="ConversationActivity_invalid_recipient">Destinatário inválido!</string>
   <string name="ConversationActivity_calls_not_supported">Chamadas não suportadas</string>
@@ -76,7 +71,7 @@
   <string name="ConversationListItem_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export_to_sd_card">Exportar para cartão SD?</string>
-  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">As suas\nchaves de segurança, definições e mensagens serão exportadas para o cartão SD.\n</string>
+  <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">As suas\nchaves de segurança, configurações e mensagens serão exportadas para o cartão SD.\n</string>
   <string name="ExportFragment_export">Exportar</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Exportar texto simples para cartão SD?</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenção, esta operação\nirá exportar o conteúdo de texto das suas mensagens TextSecure para o cartão SD.\n</string>
@@ -86,7 +81,8 @@
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Erro, não é possível escrever para o\ncartão SD!\n</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Erro ao escrever para o cartão SD.\n</string>
   <string name="ExportFragment_success">Sucesso!</string>
-  <string name="ExportFragment_exporting_keys_settings_and_messages">A exportar chaves de segurança,\ndefinições e mensagens...\n</string>
+  <string name="ExportFragment_exporting_keys_settings_and_messages">A exportar chaves de segurança,\nconfigurações e mensagens...\n</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importar a base de dados SMS do sistema?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Esta operação irá\nexportar as mensagens da base de dados do seu sistema para o TextSecure. Se já as importou\nanteriormente, importar novamente poderá resultar em mensagens duplicadas.\n</string>
@@ -96,7 +92,6 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nRestaurar um backup cifrado irá substituir totalmente as suas chaves, definições e msangens.\nIrá perder todas as informações na sua instalação atual do TextSecure, mas não do seu backup.\n</string>
   <string name="ImportFragment_restore">Restaurar</string>
   <string name="ImportFragment_import_plaintext_backup">Importar cópia de segurança em texto simples?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Esta operação\nirá importar as mensagens de um ficheiro de texto simples de backup. Se já fez a importação da base de dados de SMS do sistema,\nImportar novamente poderá resultar em mensagens duplicadas.</string>
   <string name="ImportFragment_importing">A importar</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">A importar cópia de segurança em texto simples</string>
   <string name="ImportFragment_no_plaintext_backup_found">Não foi encontrada uma cópia de segurança em texto simples!</string>
@@ -127,16 +122,23 @@
   <string name="PromptMmsActivity_mms_settings_updated">Configuração MMS Actualizada</string>
   <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Pode modificar estes valores a partir do menu de configuração TextSecure em qualquer altura.</string>
   <!--ReceiveKeyActivity-->
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">A assinatura deste intercâmbio de chaves é diferente da previamente recebida deste contacto. Isto pode significar que alguém está a tentar interceptar esta comunicação ou simplesmente que este contacto reinstalou o TextSecure e tem agora uma nova chave de identidade.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">A\nassinatura deste intercâmbio de chaves é diferente da previamente recebida deste contacto.\nIsto pode significar que alguém está a tentar interceptar esta comunicação ou simplesmente\nque este contacto reinstalou TextSecure e tem agora uma nova chave de identidade.\n</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Pode ser desejável verificar este contracto.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">A assinatura deste intercâmbio de chaves é confiada, mas tem a configuração \"completar automaticamente intercâmbio de chaves\" desactivada.</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">Continuar</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Não tem uma chave de identidade.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Destinatário não tem chave de identidade.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Destinatário não tem chave de identidade!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Ler a chave do destinatário para comparação</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Ler a minha chave</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">AVISO, a chave lida NÃO corresponde. Por favor verifique a impressão digital da chave cuidadosamente.</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ATENÇÃO, a chave lida NÃO coincide! Por favor, verifique a impressão digital cuidadosamente.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NÃO verificado!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">A chave do destinatário está correcta. É igualmente necessário verificar a sua chave perante ele.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Verificado!</string>
@@ -144,7 +146,7 @@
   <!--VerifyKeysActivity-->
   <string name="VerifyKeysActivity_get_my_fingerprint_scanned">Apresentar a minha impressão digital para leitura</string>
   <string name="VerifyKeysActivity_scan_their_fingerprint">Ler a impressão digital do destinatário</string>
-  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">AVISO, a chave lida NÃO coincide. Por favor verifique a impressão digital cuidadosamente.</string>
+  <string name="VerifyKeysActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully2">ATENÇÃO, a chave lida NÃO coincide! Por favor, verifique a impressão digital cuidadosamente.</string>
   <string name="VerifyKeysActivity_not_verified_exclamation">NÃO verificado!</string>
   <string name="VerifyKeysActivity_their_key_is_correct_it_is_also_necessary_to_get_your_fingerprint_scanned_as_well">A chave está correcta. É igualmente necessário que o destinatário valide a sua impressão digital.</string>
   <string name="VerifyKeysActivity_verified_exclamation">Verificado!</string>
@@ -171,7 +173,7 @@
   <string name="MmsDatabase_mms_download_failed">Transferência de MMS falhou!</string>
   <string name="MmsDatabase_downloading">A transferir...</string>
   <!--MmsMessageRecord-->
-  <string name="MmsMessageRecord_decrypting_mms_please_wait">A decifrar MMS, por favor aguarde...</string>
+  <string name="MmsMessageRecord_decrypting_mms_please_wait">A decifrar MMS, por favor, aguarde...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
   <!--MmsSender-->
@@ -180,8 +182,6 @@
   <string name="ApplicationMigrationService_import_in_progress">Importação em progresso</string>
   <string name="ApplicationMigrationService_importing_text_messages">A importar mensages de texto</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Frase-chave TextSecure guardada em memória cache</string>
-  <string name="KeyCachingService_passphrase_cached">Frase-chave guardada em cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) novas mensagens</string>
   <string name="MessageNotifier_most_recent_from_s">Mais recente de: %s</string>
@@ -197,14 +197,15 @@
   <string name="ViewLocalIdentityActivity_regenerating_identity_key">Recriando chave\nde identidade</string>
   <string name="ViewLocalIdentityActivity_regenerated">Gerado!</string>
   <string name="ViewLocalIdentityActivity_reset_identity_key">Redefinir chave de identidade?</string>
-  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nCuidado! Ao criar uma chave de identidade nova, a sua chave de identidade atual será removida permanentemente,\ne os seus contatos receberão avisos quando estabelecer novas sessões seguras consigo.\nTem a certeza que pretende continuar?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nAtenção! Ao criar uma chave de identidade nova, a sua chave de identidade actual será\nremovida permanentemente, e os seus contactos receberão avisos quando estabelecer novas\nsessões seguras consigo. Tem a certeza que pretende continuar?\n</string>
   <string name="ViewLocalIdentityActivity_cancel">Cancelar</string>
   <string name="ViewLocalIdentityActivity_continue">Continuar</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Presentemente não é possível remeter a mensagem SMS. Será reenviada assim que o serviço esteja disponível.</string>
+  <!--QuickResponseService-->
   <!--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">Recebeu uma mensagem de alguém que suporta sessões cifradas TextSecure. Deseja iniciar uma sessão segura?</string>
-  <string name="auto_initiate_activity__initiate_exchange">Iniciar intercâmbio</string>
+  <string name="auto_initiate_activity__initiate_exchange">Iniciar Intercâmbio</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Frase-chave anterior:</string>
   <string name="change_passphrase_activity__new_passphrase">Frase-chave nova:</string>
@@ -212,12 +213,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Sem contactos.</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Sem chamadas recentes.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Digite a mensagem</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
   <!--conversation_item_sent-->
@@ -228,8 +229,9 @@
   <string name="conversation_item_received__downloading">A transferir</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modo de selecção em grupo</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__search">Procurar</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">Por favor escolha uma frase-chave que será usada para cifrar os seus dados localmente. Esta deve ser uma frase-chave forte.</string>
   <string name="create_passphrase_activity__passphrase">Frase-chave:</string>
   <string name="create_passphrase_activity__repeat">Repetir:</string>
   <string name="create_passphrase_activity__continue">Continuar</string>
@@ -239,7 +241,7 @@
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">A base de dados de sistema não será modificada ou alterada de nenhuma forma.</string>
   <string name="database_migration_activity__skip">Saltar</string>
   <string name="database_migration_activity__import">Importar</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Isto pode demorar um pouco. Por favor seja paciente, será notificado quanto a importação estiver completa.</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Isto pode demorar um pouco. Por favor, seja paciente. Será notificado quanto a importação estiver completa.</string>
   <string name="database_migration_activity__importing">A IMPORTAR</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">A actualizar a base de dados...</string>
@@ -261,9 +263,12 @@
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__mmsc_url_required">URL MMSC (OBRIGATÓRIO):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">ANFITRIÃO PROXY MMS (OPCIONAL):</string>
-  <string name="prompt_mms_activity__mms_proxy_port_optional">PORTA PROXY MMS (OPCIONAL):</string>
+  <string name="prompt_mms_activity__mms_proxy_port_optional">PORTO PROXY MMS (OPCIONAL):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Completo</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">Para</string>
   <!--review_identities-->
@@ -282,14 +287,14 @@
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Criar frase-chave</string>
   <string name="AndroidManifest__enter_passphrase">Introduzir frase-chave</string>
-  <string name="AndroidManifest__select_contacts">Seleccionar contactos</string>
+  <string name="AndroidManifest__select_contacts">Seleccionar Contactos</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure detectado</string>
   <string name="AndroidManifest__public_identity_key">Chave de identidade pública</string>
   <string name="AndroidManifest__change_passphrase">Mudar frase-chave</string>
   <string name="AndroidManifest__verify_session">Verificar sessão</string>
   <string name="AndroidManifest__verify_identity">Verificar identidade</string>
   <string name="AndroidManifest__manage_identity_keys">Gerir chaves de identidade</string>
-  <string name="AndroidManifest__complete_key_exchange">Completar intercâmbio de chaves</string>
+  <string name="AndroidManifest__complete_key_exchange">Completar Intercâmbio de Chaves</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
@@ -323,11 +328,8 @@
   <string name="preferences__notifications">Notificações</string>
   <string name="preferences__display_message_notifications_in_status_bar">Apresentar notificações de mensagens na barra de estado</string>
   <string name="preferences__led_color">Cor do LED</string>
-  <string name="preferences__change_notification_led_color">Mudar a cor do LED de notificação</string>
-  <string name="preferences__pref_led_blink_title">Padrão de pisca do LED</string>
-  <string name="preferences__change_notification_blink_pattern">Alterar padrão de pisca do LED</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Seleccionar padrão de pisca do LED</string>
-  <string name="preferences__select_led_color">Seleccionar cor do LED</string>
+  <string name="preferences__sound">Som</string>
+  <string name="preferences__change_notification_sound">Alterar som de notificação</string>
   <string name="preferences__vibrate">Vibrar</string>
   <string name="preferences__also_vibrate_when_notified">Vibrar também quando notificado</string>
   <string name="preferences__minutes">minutos</string>
@@ -347,8 +349,8 @@
   <string name="preferences__mmsc_url_required">URL do MMSC (Necessário)</string>
   <string name="preferences__mms_proxy_host_optional">Proxy MMS (Opcional)</string>
   <string name="preferences__mms_proxy_port_optional">Porta do Proxy MMS (Opcional)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente deletar mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
   <string name="preferences__delete_old_messages">Deletar mensagens antigas</string>
   <string name="preferences__storage">Armazenamento</string>
@@ -361,6 +363,7 @@
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Opção por omissão</string>
   <string name="preferences__language">Língua</string>
+  <string name="preferences__make_default_sms_app">Definir como aplicação SMS por omissão</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -378,6 +381,7 @@
   <string name="conversation_context__menu_copy_text">Copiar texto</string>
   <string name="conversation_context__menu_delete_message">Apagar mensagem</string>
   <string name="conversation_context__menu_forward_message">Reencaminhar mensagem</string>
+  <string name="conversation_context__menu_resend_message">Reenviar mensagem</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Iniciar sessão segura</string>
   <!--conversation_list_batch-->
@@ -387,9 +391,7 @@
   <string name="conversation_list__menu_search">Procurar</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Segurança</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verificar sessão</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verificar destinatário</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Abortar sessão segura</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Adicionar anexo</string>
   <string name="conversation__menu_delete_thread">Apagar conversa</string>
@@ -407,7 +409,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Mensagem nova</string>
   <string name="text_secure_normal__menu_settings">Configurações</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Limpar frase-chave</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f6c95cc138..341eaef062 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -33,18 +33,15 @@
   <string name="ConversationItem_success_exclamation">Succes!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Nu pot scrie pe SD Card!</string>
   <string name="ConversationItem_view_secure_media_question">Afisez datele securizate?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Aceste date au fost salvate intr-o baza de date criptata. Din pacate, pentru a vizualiza datele cu ajutorul unui viewer de date extern trebuie ca datele sa fie temporar decriptate si scrise pe disc. Esti sigur ca doresti acest lucru?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Mesajul pentru schimbul de chei a fost primit si procesat.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Eroare, mesajul pentru schimbul de chei este vechi.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Am primit un mesaj pentru schimbul de chei, click pentru a-l procesa.</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">Confirma anularea Sesiunii Securizate</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Esti sigur ca doresti anularea Sesiunii Securizate?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Confirma stergerea conversatiei</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Esti sigur ca doresti sa stergi permanent aceasta conversatie?</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 rau, a aparut o eroare in setarea atasamentului tau.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Ne pare rau, fisierul video selectat depaseste restrictiile de marime pentru mesaje.</string>
@@ -54,7 +51,6 @@
   <string name="ConversationActivity_forward_message_prefix">TMT</string>
   <string name="ConversationActivity_group_conversation_recipients">Grupeaza destinatarii conversatiei</string>
   <string name="ConversationActivity_group_conversation">Grupeaza conversatia</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d recipienti in grup</string>
   <string name="ConversationActivity_saving_draft">Se salveaza ciorna...</string>
   <string name="ConversationActivity_invalid_recipient">Destinatar invalid!</string>
   <string name="ConversationActivity_calls_not_supported">Apelurile nu sunt disponibile</string>
@@ -87,6 +83,7 @@
   <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 exporta cheile incriptate, setarile si mesajele...</string>
+  <!--GroupCreateActivity-->
   <!--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">Aceasta actiune va importa mesajele din baza de date cu SMS-uri a dispozitivului in TextSecure. Daca ai importat anterior aceste mesaje, importarea lor din nou va rezulta in mesaje duplicate.</string>
@@ -96,7 +93,6 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Restaurarea unui backup incriptat va inlocui complet cheile existente, setarile si mesajele. Vei pierde toate informatiile curente din TextSecure, dar nu cele din backup.</string>
   <string name="ImportFragment_restore">Restaureaza</string>
   <string name="ImportFragment_import_plaintext_backup">Importa backup text?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Aceasta actiune va importa mesajele dintr-un backup text. Daca ai importat anterior baza de date cu SMS-uri, importul repetat va duce la mesaje duplicate.</string>
   <string name="ImportFragment_importing">Se importa</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importa backup text...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Nu a fost gasit nci un backup text!</string>
@@ -130,6 +126,13 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Semnatura digitala din acest schimb de chei este diferita fata de ce ai primit anterior de la aceasta persoana. Asta poate insemna ca cineva incearca sa intercepteze comunicatia sau ca aceasta persoana a reinstalat TextSecure si acum are o noua cheie de identitate.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Probabil ca doresti sa verifici aceasta persoana.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Semnatura din acest schimb de chei este de incredere, dar optiunea \"incheie automat schimburile de chei\" este dezactivata.</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">Continuă</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nu ai o cheie de identitate.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Destinatarul nu are o cheie de identitate.</string>
@@ -180,8 +183,6 @@
   <string name="ApplicationMigrationService_import_in_progress">Import in progres</string>
   <string name="ApplicationMigrationService_importing_text_messages">Mesajele text sunt importate</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Parola TextSecure salvata in cache</string>
-  <string name="KeyCachingService_passphrase_cached">Parola salvata in cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d mesaje noi</string>
   <string name="MessageNotifier_most_recent_from_s">Cel mai recent de la: %s</string>
@@ -193,8 +194,15 @@
   <string name="MessageNotifier_mark_all_as_read">Marcheaza tot ca citit</string>
   <string name="MessageNotifier_mark_as_read">Marcheaza 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_regenerated">Regenerată!</string>
+  <string name="ViewLocalIdentityActivity_reset_identity_key">Resetare cheie de identitate?</string>
+  <string name="ViewLocalIdentityActivity_cancel">Anulează</string>
+  <string name="ViewLocalIdentityActivity_continue">Continuă</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Mesajul SMS nu poate fi trimis in acest moment. Va fi trimis de indata ce serviciul devine disponibil.</string>
+  <!--QuickResponseService-->
   <!--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 device care suporta sesiuni criptate TextSecure. Doresti sa initiezi o sesiune securizata?</string>
   <string name="auto_initiate_activity__initiate_exchange">Initializeaza schimb de chei.</string>
@@ -205,12 +213,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Nu exista contacte.</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Selecteaza pentru</string>
   <!--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">Scrie mesaj</string>
   <string name="conversation_activity__send">Trimite</string>
   <string name="conversation_activity__remove">Sterge</string>
   <!--conversation_item_sent-->
@@ -221,8 +229,9 @@
   <string name="conversation_item_received__downloading">Se descarca</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mod selectie multipla</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__search">Cauta</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">Va rugam sa alegeti o parola care va fi folosita pentru a incripta local datele.\n\nAceasta parola ar trebui sa fie una sigura.</string>
   <string name="create_passphrase_activity__passphrase">PAROLA:</string>
   <string name="create_passphrase_activity__repeat">REPETA:</string>
   <string name="create_passphrase_activity__continue">Continua</string>
@@ -246,7 +255,9 @@
   <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">Restaureaza un backup incriptat exportat anterior din TextSecure.</string>
   <string name="import_fragment__import_plaintext_backup">Importa backup text</string>
   <string name="import_fragment__import_a_plaintext_backup_file">Importa un fisier 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-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">PAROLA TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Deblocheaza</string>
@@ -256,6 +267,9 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">Port proxy MMS (Optional):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Complet</string>
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">Catre</string>
   <!--review_identities-->
@@ -315,11 +329,9 @@
   <string name="preferences__notifications">Notificari</string>
   <string name="preferences__display_message_notifications_in_status_bar">Afiseaza notificarile in bara de stare</string>
   <string name="preferences__led_color">Culoare LED</string>
-  <string name="preferences__change_notification_led_color">Schimba culoarea LED-ului de notificare</string>
-  <string name="preferences__pref_led_blink_title">Sablon clipire LED</string>
-  <string name="preferences__change_notification_blink_pattern">Schimba sablonul de clipire a LED-ului de notificare</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Selecteaza sablonul de clipire a LED-ului</string>
-  <string name="preferences__select_led_color">Alege culoarea LED-ului</string>
+  <string name="preferences__pref_led_blink_title">Tipar de clipire LED</string>
+  <string name="preferences__sound">Sunet</string>
+  <string name="preferences__change_notification_sound">Schimbă sunetul de notificare</string>
   <string name="preferences__vibrate">Vibreaza</string>
   <string name="preferences__also_vibrate_when_notified">Vibreaza si cand esti notificat</string>
   <string name="preferences__minutes">minute</string>
@@ -336,11 +348,14 @@
   <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">Host proxy MMS (Optional)</string>
   <string name="preferences__mms_proxy_port_optional">Port proxy MMS (Optional)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Cere o confirmare de livrare pentru fiecare SMS trimis</string>
   <string name="preferences__sms_delivery_reports">Confirmari de livrare SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Cere o confirmare de livrare pentru fiecare SMS trimis</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Sterge automat mesajele vechi cand conversatia depaseste marimea specificata</string>
   <string name="preferences__delete_old_messages">Sterge mesajele vechi</string>
   <string name="preferences__storage">Spatiu stocare</string>
@@ -353,6 +368,8 @@
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Implicit</string>
   <string name="preferences__language">Limba</string>
+  <string name="preferences__make_default_sms_app">Setează ca aplicație implicită SMS</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Alege TextSecure ca aplicație SMS/MMS implicită pentru sistemul tău.</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -370,6 +387,7 @@
   <string name="conversation_context__menu_copy_text">Copiaza text</string>
   <string name="conversation_context__menu_delete_message">Sterge mesaj</string>
   <string name="conversation_context__menu_forward_message">Expediaza mesaj</string>
+  <string name="conversation_context__menu_resend_message">Retrimite mesaj</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">Initializeaza Sesiune Securizata</string>
   <!--conversation_list_batch-->
@@ -379,11 +397,10 @@
   <string name="conversation_list__menu_search">Cauta</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Securitate</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verifica sesiunea</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verifica destinatar</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Anuleaza Sesiune Securizata</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Adauga atasament</string>
+  <string name="conversation__menu_add_contact_info">Adaugă informații de contact</string>
   <string name="conversation__menu_delete_thread">Sterge conversatie</string>
   <!--conversation_group_options-->
   <string name="convesation_group_options__recipients_list">Lista recipienti</string>
@@ -399,7 +416,6 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Mesaj nou</string>
   <string name="text_secure_normal__menu_settings">Setari</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Sterge parola</string>
   <string name="text_secure_normal__mark_all_as_read">Marcheaza tot ca citit</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificat</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 03691082a8..6dd308991c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -10,12 +10,15 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Вы ещё не задали парольную фразу!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">сообщений в разговоре</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Удалить все старые сообщения?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы уверены что хотите немедленно обрезать все разговоры до %s последних сообщений?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы уверены, что хотите обрезать все разговоры до %s последних сообщений, удалив более старые?</string>
   <string name="ApplicationPreferencesActivity_delete">Удалить</string>
   <string name="ApplicationPreferencesActivity_my">Мой</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Отключить шифрование базы?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nВнимание, вы собираетесь отключить шифрование базы данных, в которой хранятся все ваши сообщения и ключи. При переписке шифрование продолжит работать, однако любой, кто имеет физический доступ к вашему устройству, сможет прочитать ваши сообщения.</string>
   <string name="ApplicationPreferencesActivity_disable">Отключить</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Отмена регистрации...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Отменяем регистрацию для обмена сообщениями по каналу данных</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ошибка при соединении с сервером!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Изображение</string>
   <string name="AttachmentTypeSelectorAdapter_video">Видео</string>
@@ -33,10 +36,10 @@
   <string name="ConversationItem_success_exclamation">Успешно!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Невозможно произвести запись на SD-карту!</string>
   <string name="ConversationItem_view_secure_media_question">Просмотреть защищенный медиа-файл?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Этот медиа-файл хранится в зашифрованной базе данных. Из-за технических ограничений для того, чтобы просмотреть его через стороннее приложение, необходимо его временно расшифровать и записать на диск. Вы уверены, что хотите это сделать?</string>
+  <string name="ConversationItem_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_key_exchange_message_click_to_process">Получено сообщение обмена ключами. Нажмите, чтобы его обработать.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Начать защищённый сеанс?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Начать защищённый сеанс связи с %s?</string>
@@ -55,15 +58,18 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Получатели в конференции</string>
   <string name="ConversationActivity_group_conversation">Конференция</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d получателей в конференции</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d участников</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 участник</string>
   <string name="ConversationActivity_saving_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_sender_s_transport_s_sent_received_s">Отправитель: %1$s\nТип связи: %2$s\nОтправлено/Получено: %3$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_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>
   <!--ConversationListAdapter-->
@@ -88,6 +94,20 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">Ошибка при записи на SD-карту.</string>
   <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_contacts_dont_support_push">Выбранный контакт не поддерживает группы TextSecure. Для группы будет использоваться MMS.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Вы не зарегистрированны для использования канала передачи данных. Группы отключены.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Вы не владелец этой группы и не можете менять название или изображение.</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>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Импортировать системную базу SMS?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Вы собираетесь импортировать SMS-сообщения из системной базы данных в TextSecure. Если вы уже это делали ранее, повторный импорт приведёт к дублированию сообщений.</string>
@@ -96,11 +116,11 @@
   <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_restore">Восстановить</string>
-  <string name="ImportFragment_import_plaintext_backup">Импортировать из нешифрованной резервной копии?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Вы собираетесь импортировать сообщения из незашифрованной резервной копии. Если вы ранее уже импортировали SMS-сообщения из системной базы данных, повторный импорт приведёт к дублированию сообщений.</string>
+  <string name="ImportFragment_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>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Импортируем из простой резервной копии...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Простая резервная копия не найдена!</string>
   <string name="ImportFragment_error_importing_backup">Ошибка при импорте!</string>
   <string name="ImportFragment_import_complete">Импорт завершён.</string>
   <string name="ImportFragment_restoring">Восстановление</string>
@@ -110,7 +130,7 @@
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">При сканировании ключ не обнаружен!</string>
   <!--MmsDownloader-->
-  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Нет подключения, через которое можно скачать MMS; попробуйте позже ...</string>
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">Нет подключения, через которое можно скачать MMS. Попробуйте позже...</string>
   <string name="MmsDownloader_error_storing_mms">Ошибка при сохранении MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Ошибка подключения к провайдеру MMS...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Ошибка при чтении настроек MMS...</string>
@@ -121,7 +141,7 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Неверная старая парольная фраза!</string>
   <!--PassphraseCreateActivity-->
   <string name="PassphraseCreateActivity_passphrases_dont_match">Парольные фразы не совпадают!</string>
-  <string name="PassphraseCreateActivity_you_must_specify_a_password">Необходимо указать пароль</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Необходимо ввести парольную фразу</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Неверная парольная фраза!</string>
   <!--PromptMmsActivity-->
@@ -132,6 +152,55 @@
   <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-->
+  <string name="RegistrationActivity_connect_with_textsecure">Подключение к TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Выберите страну</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Необходимо указать код страны</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Необходимо указать номер телефона</string>
+  <string name="RegistrationActivity_invalid_number">Неверный номер</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Указанный вами \nномер телефона (%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_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nСейчас мы проверим, что с этим устройством связан следующий номер телефона:\n\n%s\n\n\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>
+  <string name="RegistrationProgressActivity_registration_complete">Регистрация завершена!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Возможные проблемы.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Сначала введите полученный вами код...</string>
+  <string name="RegistrationProgressActivity_connecting">Соединение</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Соединяемся для проверки...</string>
+  <string name="RegistrationProgressActivity_network_error">Ошибка сети!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Невозможно соединиться. Проверьте, есть ли подключение к интернету и попробуйте снова.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Проверка не удалась!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Код подтверждения, введённый вами, неверен. Пожалуйста, попробуйте ещё раз.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Слишком много попыток</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Вы слишком много раз вводили неверный код подтверждения. Подождите минуту перед следующей попыткой.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Запрос звонка</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Запрашиваем входящий звонок для подтверждения...</string>
+  <string name="RegistrationProgressActivity_server_error">Ошибка сервера</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">На сервере возникла ошибка. Пожалуйста, попробуйте ещё раз.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Слишком много запросов!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Вы недавно уже запрашивали голосовой звонок. Запросить ещё один вы сможете через 20 минут.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Проверяем голосовой код...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Регистрация завершена</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Регистрация в TextSecure успешно завершена.</string>
+  <string name="RegistrationService_registration_error">Ошибка регистрации</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">При регистрации в TextSecure возникла ошибка.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Получено повреждённое\nсообщение обмена ключами!\n</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nПолучено сообщение обмена ключами для неверной версии протокола.\n</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nПолучено сообщение с неизвестным личным ключом. Нажмите, чтобы обработать и показать его.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Защищённый сеанс завершён.</string>
+  <!--ThreadRecord-->
+  <string name="TheadRecord_secure_session_ended">Защищённый сеанс завершён.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">У вас нет личного ключа.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">У получателя нет личного ключа.</string>
@@ -183,8 +252,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Идёт импорт</string>
   <string name="ApplicationMigrationService_importing_text_messages">Импортируем текстовые сообщения</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Парольная фраза TextSecure кэширована.</string>
-  <string name="KeyCachingService_passphrase_cached">Парольная фраза кэширована</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Нажмите, чтобы открыть.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Нажмите, чтобы открыть. Чтобы закрыть, нажмите на замок.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure разблокирован</string>
+  <string name="KeyCachingService_lock">Заблокировать парольной фразой</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">Новых сообщений: %d</string>
   <string name="MessageNotifier_most_recent_from_s">Последнее — от %s</string>
@@ -200,11 +271,13 @@
   <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Осторожно! Если вы заново сгенерируете свой личный ключ, текущий будет утрачен навсегда, и ваши собеседники получат предупрежения при начале новых защищённых сеансов с вами. Вы уверены, что хотите продолжить?</string>
+  <string name="ViewLocalIdentityActivity_by_regenerating_your_identity_key_your_existing_contacts_will_receive_warnings">\nОсторожно! Если вы заново сгенерируете свой личный ключ, текущий будет утрачен навсегда, и ваши собеседники получат предупреждения при начале новых защищённых сеансов с вами. Вы уверены, что хотите продолжить?</string>
   <string name="ViewLocalIdentityActivity_cancel">Отмена</string>
   <string name="ViewLocalIdentityActivity_continue">Продолжить</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Сейчас невозможно отправить ваше SMS-сообщение. Оно будет отправлено, когда связь восстановится.</string>
+  <!--QuickResponseService-->
+  <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>
@@ -215,12 +288,14 @@
   <!--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-->
   <!--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">Наберите сообщение</string>
+  <string name="conversation_activity__type_message"><small>Послать сообщение</small></string>
   <string name="conversation_activity__send">Отправить</string>
   <string name="conversation_activity__remove">Удалить</string>
   <!--conversation_item_sent-->
@@ -231,15 +306,17 @@
   <string name="conversation_item_received__downloading">Скачивание</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Выбрать несколько</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Загружаем страны...</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__passphrase">ПАРОЛЬНАЯ ФРАЗА:</string>
   <string name="create_passphrase_activity__repeat">ПОВТОРИТЕ:</string>
   <string name="create_passphrase_activity__continue">Продолжить</string>
-  <string name="create_passphrase_activity__generating_secrets">СОЗДАЕМ СЕКРЕТЫ </string>
+  <string name="create_passphrase_activity__generating_secrets">СОЗДАЁМ СЕКРЕТЫ </string>
   <!--database_migration_activity-->
-  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Вы хотите импортировать хранящиеся у вас сейчас текстовые сообщения в зашифрованную базу данных TextSecure?</string>
-  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Cистемная база данных затронута не будет.</string>
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Хотите ли вы импортировать имеющиеся текстовые сообщения в зашифрованную базу данных TextSecure?</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Cистемная база данных изменена не будет.</string>
   <string name="database_migration_activity__skip">Пропустить</string>
   <string name="database_migration_activity__import">Импортировать</string>
   <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Это может занять какое-то время. Пожалуйста, наберитесь терпения, мы вам сообщим, когда импортирование завершится.</string>
@@ -248,15 +325,15 @@
   <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_a_plaintext_backup_compatible_with">\nЭкспортировать на SD-карту незашифрованную резервную копию, совместимую с приложением «SMSBackup And Restore».</string>
+  <string name="export_fragment__export_plaintext_backup">Экспорт простой резервной копии</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nЭкспортировать на SD-карту простую резервную копию, совместимую с приложением «SMSBackup And Restore».</string>
   <string name="import_fragment__import_system_sms_database">Импорт системной базы SMS</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Импортировать базу данных из SMS-приложения, которое используется сейчас по умолчанию.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Импортировать сообщения из базы данных SMS-приложения, которое используется сейчас по умолчанию.</string>
   <string name="import_fragment__import_encrypted_backup">Импорт зашифрованной резервной копии</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nВосстановить из ранее экспортированной зашифрованной резервной копии TextSecure</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="local_identity__regenerate_key">Повторно сгенерировать ключ</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nВосстановить из ранее экспортированной зашифрованной резервной копии TextSecure.</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="local_identity__regenerate_key">Заново сгенерировать ключ</string>
   <!--mms_preferences_activity-->
   <string name="mms_preferences_activity__manual_mms_settings_are_required">Для вашего телефона необходимо настроить MMS вручную.</string>
   <!--prompt_passphrase_activity-->
@@ -270,8 +347,44 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">ПОРТ ПРОКСИ ДЛЯ MMS (НЕОБЯЗАТЕЛЬНО):</string>
   <!--receive_key_activity-->
   <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__phone_number">НОМЕР ТЕЛЕФОНА</string>
+  <string name="registration_activity__register">Зарегистрироваться</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Для регистрации на сервер будет временно передана некоторая контактная информация.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Возможные причины:</string>
+  <string name="registration_problems__sms_interceptors">Перехватчики SMS-сообщений.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nНекоторые SMS-приложения сторонних разработчиков (например, Handcent или GoSMS) ведут себя неправильно и перехватывают все входящие SMS-сообщения. Проверьте, не получали ли вы сообщение, начинающееся со слов «Your TextSecure verification code». Если да, то вам необходимо настроить ваше SMS-приложение так, чтобы оно пропускало сообщения дальше. </string>
+  <string name="registration_problems__incorrect_number">Неверный номер.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nПожалуйста, убедитесь, правильно ли вы указали свой номер и соответствует ли его формат\nвашему региону.\n</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>
+  <!--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Для проверки вашего номера TextSecure также может вам позвонить. Нажмите «Позвонить мне», дождитесь звонка и введите ниже шесть цифр, которые вы услышите.</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">\nTextSecure не смог соединиться с push-сервисом.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Возможные \nпричины:\n</string>
+  <string name="registration_progress_activity__no_network_connectivity">Нет соединения \nс интернетом.\n</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Для использования этой функции TextSecure необходимо подключение к интернету. Убедитесь, что ваше устройство подключено к 3G или Wi-Fi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Ограничения брандмауэра.\n</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nЕсли вы подключены по Wi-Fi, возможно, в сети имеется брандмауэр, который блокирует доступ к серверу TextSecure. Попробуйте воспользоваться другой беспроводной сетью либо мобильным интернетом.\n</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nСейчас TextSecure автоматически проверит ваш номер телефона при помощи SMS-сообщения.\n</string>
+  <string name="registration_progress_activity__connecting">Соединяемся...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Ожидаем\nSMS-подтверждения...\n</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Истекло время ожидания SMS-сообщения для подтверждения вашего номера.\n</string>
+  <string name="registration_progress_activity__sms_verification_failed">Подтверждение\nпо SMS не удалось.\n</string>
+  <string name="registration_progress_activity__generating_keys">Генерируем ключи...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Кому</string>
+  <string name="recipients_panel__add_member">Добавить участника</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">В вашей базе доверенных собеседников нет ни одного личного ключа.</string>
   <!--verify_identity_activity-->
@@ -286,9 +399,10 @@
   <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__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">Обнаружено TextSecure</string>
   <string name="AndroidManifest__public_identity_key">Открытый личный ключ</string>
   <string name="AndroidManifest__change_passphrase">Изменить парольную фразу</string>
@@ -297,7 +411,7 @@
   <string name="AndroidManifest__manage_identity_keys">Управление личными ключами</string>
   <string name="AndroidManifest__complete_key_exchange">Выполнить обмен ключами</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Импорт / Экспорт</string>
+  <string name="arrays__import_export">Импорт и экспорт</string>
   <string name="arrays__my_identity_key">Мой личный ключ</string>
   <string name="arrays__contact_keys">Ключи контактов</string>
   <!--preferences.xml-->
@@ -306,8 +420,10 @@
   <string name="preferences__pref_all_mms_title">Использовать для всех MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Использовать TextSecure для просмотра и хранения всех входящих текстовых сообщений</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Использовать TextSecure для просмотра и хранения всех входящих мультимедийных сообщений</string>
+  <string name="preferences__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__pressing_the_enter_key_will_send_text_messages">Сообщения будут отправляться при нажатии клавиши «Ввод»</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">Сообщения будут отправляться при нажатии клавиши «Enter»</string>
   <string name="preferences__display_settings">Настройки отображения</string>
   <string name="preferences__choose_identity">Выбрать личность</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Выберите себя из списка контактов.</string>
@@ -316,7 +432,7 @@
   <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__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Автоматически выполнять обмен ключами в новых сеансах, а также в существующих сеансах с тем же личным ключом</string>
+  <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Автоматически выполнять обмен ключами в новых сеансах, а также в существующих сеансах с не изменившимся личным ключом</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>
@@ -329,14 +445,11 @@
   <string name="preferences__notifications">Уведомления</string>
   <string name="preferences__display_message_notifications_in_status_bar">Показывать уведомления о сообщениях в статусной строке</string>
   <string name="preferences__led_color">Цвет светодиода</string>
-  <string name="preferences__change_notification_led_color">Поменять цвет светодиода</string>
   <string name="preferences__pref_led_blink_title">Мигание светодиода</string>
-  <string name="preferences__change_notification_blink_pattern">Изменить тип мигания светодиода</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Выберите тип мигания</string>
-  <string name="preferences__select_led_color">Выбрать цвет светодиода</string>
   <string name="preferences__sound">Мелодия</string>
+  <string name="preferences__change_notification_sound">Изменить мелодию уведомления</string>
   <string name="preferences__inthread_notifications">Уведомления при разговоре</string>
-  <string name="preferences__play_inthread_notifications">Проигрывать мелодию уведомления даже во время активной переписки.</string>
+  <string name="preferences__play_inthread_notifications">Проигрывать мелодию уведомления даже во время активной переписки</string>
   <string name="preferences__vibrate">Вибрация</string>
   <string name="preferences__also_vibrate_when_notified">Вибрировать при уведомлении</string>
   <string name="preferences__minutes">мин.</string>
@@ -350,29 +463,31 @@
   <string name="preferences__fast">Быстро</string>
   <string name="preferences__normal">Средне</string>
   <string name="preferences__slow">Медленно</string>
-  <string name="preferences__custom">Настроить</string>
+  <string name="preferences__custom">Настроить...</string>
   <string name="preferences__advanced">Расширенные</string>
   <string name="preferences__passphrase">Парольная фраза</string>
   <string name="preferences__advanced_mms_access_point_names">Настройки MMS</string>
   <string name="preferences__enable_manual_mms">Настроить MMS вручную</string>
-  <string name="preferences__override_system_mms_settings">Использовать указанную ниже информацию вместо системных настроек MMS.</string>
+  <string name="preferences__override_system_mms_settings">Использовать вместо системных настроек MMS указанную ниже информацию.</string>
   <string name="preferences__mmsc_url_required">Адрес MMS-центра (обязательно)</string>
   <string name="preferences__mms_proxy_host_optional">Адрес прокси для MMS (необязательно)</string>
   <string name="preferences__mms_proxy_port_optional">Порт прокси для MMS (необязательно)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запрашивать отчёт о доставке каждого отправленного вами SMS-сообщения</string>
   <string name="preferences__sms_delivery_reports">Отчеты о доставке SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запрашивать отчёт о доставке каждого отправленного SMS-сообщения</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматически удалять старые сообщения, когда длина разговора превышает заданную</string>
   <string name="preferences__delete_old_messages">Удалить старые сообщения</string>
   <string name="preferences__storage">Память</string>
   <string name="preferences__conversation_length_limit">Ограничение длины разговора</string>
   <string name="preferences__trim_all_threads_now">Обрезать все разговоры</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Просмотреть все разговоры и привести их длину в соответствие с заданной</string>
+  <string name="preferences__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">Язык (language)</string>
+  <string name="preferences__make_default_sms_app">SMS-приложение по умолчанию</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Сделать TextSecure приложением по умолчанию для SMS и MMS.</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -398,13 +513,17 @@
   <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_verify_session">Подтвердить сеанс</string>
+  <string name="conversation_secure_verified__menu_no_identity">Личность недоступна</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Подтвердить получателя</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Закончить защищённый сеанс</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-->
@@ -420,8 +539,9 @@
   <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__menu_clear_passphrase">Заблокировать</string>
   <string name="text_secure_normal__mark_all_as_read">Отметить все как прочитанные</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Подтверждено</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 802cfe5344..1df14bbc66 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -12,6 +12,9 @@
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Zmazať všetky staré správy?</string>
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste si istí, že chcete skrátiť všetky vlákna konverzácií na %s najnovších správ?</string>
   <string name="ApplicationPreferencesActivity_delete">Zmaž</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_disable">Vypnúť</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Obrázok</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -28,15 +31,11 @@
   <string name="ConversationItem_success_exclamation">Hotovo!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Nemôžem zapisovať na SD kartu!</string>
   <string name="ConversationItem_view_secure_media_question">Zobraziť kryptované údaje?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Tieto údaje sú uložené v kryptovanej databáze. Pre zobrazenie externým prehliadačom budú údaje dekryptované a dočasne zapísané na disk.  Ste si istí že chcete pokračovať?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Prijal som správu vzájomnej výmeny kľúčov a spracovávam ju.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Chyba, prijal som zaseknutú správu vzájomnej výmeny kľúčov.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Prijal som správu vzájomnej výmeny kľúčov, kliknite pre spracovanie.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Vytvoriť bezpečnú session?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Vytvoriť bezpečnú session s %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Potvrdenie zrušenia bezpečnej session</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ste si istí, že chcete zrušiť bezpečnú session?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Potvrdenie zmazania vlákna</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ste si istí, že chcete natrvalo zmazať túto konveráciu?</string>
   <string name="ConversationActivity_add_attachment">Pridať prílohu</string>
@@ -49,8 +48,9 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Príjemcovia skupinovej správy</string>
   <string name="ConversationActivity_group_conversation">Skupinová konverzácia</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d príjemcov v skupine</string>
   <string name="ConversationActivity_saving_draft">Ukladám koncept...</string>
+  <string name="ConversationActivity_invalid_recipient">Nesprávny príjemca</string>
+  <string name="ConversationActivity_calls_not_supported">Hovory nie sú podporované</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detaily správy</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Odosielateľ: %1$s\nTransport: %2$s\nOdoslané/Prijaté:%3$s</string>
@@ -67,19 +67,60 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Správa vzájomnej výmeny kľúčov...</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">Exportovať 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_export">Export</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">Exportovať nekryptovaný 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_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_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>
+  <!--GroupCreateActivity-->
   <!--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_import">Import</string>
+  <string name="ImportFragment_cancel">Zrušiť</string>
+  <string name="ImportFragment_restore_encrypted_backup">Obnoviť zakryptovanú 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_restore">Obnovenie</string>
+  <string name="ImportFragment_import_plaintext_backup">Importovať nekryptovanú zálohu?</string>
+  <string name="ImportFragment_importing">Importujem</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importujem nekryptovanú zálohu...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">Nenašiel som nekryptovanú zálohu!</string>
+  <string name="ImportFragment_error_importing_backup">Chyba pri importovaní zálohy!</string>
+  <string name="ImportFragment_import_complete">Import dokončený!</string>
+  <string name="ImportFragment_restoring">Obnovujem</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Obnovujem kryptovanú zálohu...</string>
+  <string name="ImportFragment_no_encrypted_backup_found">Nenašiel som kryptovanú zálohu!</string>
+  <string name="ImportFragment_restore_complete">Obnova dokončená!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nenašiel som scannovaný kľúč!</string>
   <!--MmsDownloader-->
+  <string name="MmsDownloader_error_storing_mms">Chyba pri ukladaní MMS!</string>
   <!--NotificationMmsMessageRecord-->
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Heslá sa nezhodujú!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Nesprávne staré heslo!</string>
   <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">Heslá sa nezhodujú</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">Musíte zadať heslo</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Nesprávne heslo!</string>
   <!--PromptMmsActivity-->
+  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Môžete  tieto hodnoty zmeniť kedykoľvek z menu nastavenie TextSecure. </string>
   <!--ReceiveKeyActivity-->
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_continue">Pokračovať</string>
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nemáte kľúč totožnosti.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Príjemca nemá kľúč totožnosti.</string>
@@ -125,16 +166,28 @@
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS správa zakryptovaná pre neexistujúcu session...</string>
   <!--MmsSender-->
   <!--ApplicationMigrationService-->
+  <string name="ApplicationMigrationService_import_in_progress">Prebieha import</string>
+  <string name="ApplicationMigrationService_importing_text_messages">Importovanie textových správ</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Heslo pre TextSecure kešované</string>
-  <string name="KeyCachingService_passphrase_cached">Heslo kešované</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) nových správ</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovšia od: %s</string>
   <string name="MessageNotifier_encrypted_message">Kryptovaná správa...</string>
   <string name="MessageNotifier_no_subject">(bez predmetu)</string>
+  <string name="MessageNotifier_message_delivery_failed">Doručenie správy zlyhalo.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Zlyhanie doručenia správy.</string>
+  <string name="MessageNotifier_error_delivering_message">Chyba doručovania správy.</string>
+  <string name="MessageNotifier_mark_all_as_read">Označ všetko ako prečítané</string>
+  <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_regenerated">Pregenerované!</string>
+  <string name="ViewLocalIdentityActivity_cancel">Zrušiť</string>
+  <string name="ViewLocalIdentityActivity_continue">Pokračovať</string>
   <!--SmsReceiver-->
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Momentálne nie je možné poslať Vašu sms správu. Budo odoslaná ihneď pri dostupnosti služby.</string>
+  <!--QuickResponseService-->
   <!--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">Dostali ste správu od klienta podporujúceho TextSecure bezpečnú session.  Želáte si vytvoriť bezpečnú session?</string>
   <string name="auto_initiate_activity__initiate_exchange">Začni vzájomnú výmenu</string>
@@ -145,12 +198,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Žiadne kontakty.</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Vyber pre</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Žiadne nedávne hovory.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Napísať správu</string>
   <string name="conversation_activity__send">Odoslať</string>
   <string name="conversation_activity__remove">Odstrániť</string>
   <!--conversation_item_sent-->
@@ -161,19 +214,40 @@
   <string name="conversation_item_received__downloading">Sťahujem</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mód hromadného výberu</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__search">Hľadaj</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">Vyberte si prosím heslo ktoré bude použité na lokálne kryptovanie údajov. Malo by to byť silné heslo.</string>
   <string name="create_passphrase_activity__passphrase">Heslo:</string>
   <string name="create_passphrase_activity__repeat">Zopakujte:</string>
+  <string name="create_passphrase_activity__continue">Pokračovať</string>
   <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Chcete importovať Vaše existujúce textové správy do kryptovanej databázy TextSecure? </string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Predvolená systémová databáza nebude modifikovaná alebo nahradenáv žiadnom prípade.</string>
   <string name="database_migration_activity__skip">Preskoč</string>
   <string name="database_migration_activity__import">Import</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Toto môže chvíľu trvať. Buďte trpezlivý prosím, dokončenie importu Vám oznámime.</string>
   <string name="database_migration_activity__importing">IMPORTUJEM</string>
   <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">Updatujem 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_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="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_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__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>
+  <!--mms_preferences_activity-->
   <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE HESLO</string>
   <string name="prompt_passphrase_activity__unlock">Odomkni</string>
-  <!--prompt_apn_activity-->
+  <!--prompt_mms_activity-->
   <!--receive_key_activity-->
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
   <!--recipients_panel-->
   <string name="recipients_panel__to">Pre</string>
   <!--review_identities-->
@@ -201,7 +275,9 @@
   <string name="AndroidManifest__manage_identity_keys">Spravuj kľúče totožnosti</string>
   <string name="AndroidManifest__complete_key_exchange">Vzájomná výmena kľúčov</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">Import / Export</string>
   <!--preferences.xml-->
+  <string name="preferences__general">Všeobecné</string>
   <string name="preferences__pref_all_sms_title">Použi pre všetky SMS</string>
   <string name="preferences__pref_all_mms_title">Použi pre všetky MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Použi TextSecure na zobrazenie a uloženie všetkých prichádzajúcich správ</string>
@@ -211,7 +287,10 @@
   <string name="preferences__display_settings">Nastavenia zobrazenia</string>
   <string name="preferences__choose_identity">Vyberte totožnosť</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Vyberte Váš kontakt zo zoznamu kontaktov.</string>
+  <string name="preferences__change_passphrase">Zmeň heslo</string>
   <string name="preferences__change_my_passphrase">Zmeniť moje heslo</string>
+  <string name="preferences__disable_passphrase">Vypnúť heslo</string>
+  <string name="preferences__disable_local_encryption_of_messages_and_keys">Vypnúť lokálne kryptovanie správ a kľúčov</string>
   <string name="preferences__automatically_complete_key_exchanges_for_new_sessions_or_for_existing_sessions_with_the_same_identity_key">Automaticky dokonči vzájomné výmeny kľúčov pre nové session alebo pre existujúce session s rovnakým kľúčom totožnosti.</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Po určitom čase zmaž heslo z pamäte</string>
   <string name="preferences__timeout_passphrase">Doba zapamätania hesla</string>
@@ -222,13 +301,6 @@
   <string name="preferences__manage_configured_identity_keys">Spravuj konfigurované kľúče totožnosti</string>
   <string name="preferences__notifications">Hlásenia</string>
   <string name="preferences__display_message_notifications_in_status_bar">Zobrazuj hlásenia o správach v stavovom riadku</string>
-  <string name="preferences__led_color">Farba LED</string>
-  <string name="preferences__change_notification_led_color">Zmeň farbu LED hlásení</string>
-  <string name="preferences__pref_led_blink_title">Vzor blikania LED</string>
-  <string name="preferences__change_notification_blink_pattern">Zmena vzoru blikania LED hlásení</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Vyberte vzor blikania LED</string>
-  <string name="preferences__select_led_color">Vyber farbu LED</string>
-  <string name="preferences__sound">Vyber zvonenie</string>
   <string name="preferences__vibrate">Vybruj</string>
   <string name="preferences__also_vibrate_when_notified">Počas hlásenia tiež vibruj</string>
   <string name="preferences__minutes">minúty</string>
@@ -243,19 +315,23 @@
   <string name="preferences__normal">Normálne</string>
   <string name="preferences__slow">Pomaly</string>
   <string name="preferences__custom">Vlastné</string>
-  <string name="preferences__enable_manual_mms">Povoľ fallback MMSC</string>
-  <string name="preferences__override_system_mms_settings">Použi nastavenia MMSC ak nie sú dostupné APN informácie.</string>
+  <string name="preferences__passphrase">Heslo</string>
   <string name="preferences__mmsc_url_required">MMSC URL (nutné)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxy (voliteľné)</string>
   <string name="preferences__mms_proxy_port_optional">MMS Proxy port (voliteľné)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pre každú odoslanú SMS vyžiadaj správu o doručení</string>
   <string name="preferences__sms_delivery_reports">Správy o doručení SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pre každú odoslanú SMS vyžiadaj správu o doručení</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Ak dĺžka vlákna presiahne nastavenú hranicu, automaticky zmaž najstaršie správy.</string>
   <string name="preferences__delete_old_messages">Zmaž staré správy</string>
   <string name="preferences__storage">Úložisko</string>
   <string name="preferences__conversation_length_limit">Obmedzenie dĺžky konverzácie</string>
   <string name="preferences__trim_all_threads_now">Skráť všetky vlákna</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skontroluj dĺžku vlákna všetkých konverzácií.</string>
+  <string name="preferences__light_theme">Svetlá téma</string>
+  <string name="preferences__dark_theme">Tmavá téma</string>
+  <string name="preferences__appearance">Vzhľad</string>
+  <string name="preferences__theme">Téma</string>
+  <string name="preferences__language">Jazyk</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -282,9 +358,7 @@
   <string name="conversation_list__menu_search">Hľadaj</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Bezpečnosť</string>
-  <string name="conversation_secure_verified__menu_verify_session">Over session</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Over príjemcu</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Zruš bezpečnú session</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Pridaj prílohu</string>
   <string name="conversation__menu_delete_thread">Zmaž vlákno</string>
@@ -299,7 +373,7 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nová správa</string>
   <string name="text_secure_normal__menu_settings">Nastavenia</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Vymaž heslo</string>
+  <string name="text_secure_normal__mark_all_as_read">Označ všetko ako prečítané</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overené</string>
   <!--EOF-->
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f497841653..9cc9b9fbef 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -13,9 +13,15 @@
   <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste prepričani, da želite izbrisati vse stare pogovore, razen najnovejših?</string>
   <string name="ApplicationPreferencesActivity_delete">Izbriši</string>
   <string name="ApplicationPreferencesActivity_my">Moj</string>
-  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Onemogoči šifriranje pomnilnika</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">Onemogočim šifriranje pomnilnika?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nPozor, s tem boste onemogočili šifriranje sporočil in ključev v pomnilniku naprave. Vaše šifrirane komunikacije bodo še vedno varne, toda vsakdo s fizičnim dostopom do vaše naprave bo lahko dostopal do njih.</string>
   <string name="ApplicationPreferencesActivity_disable">Onemogoči</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Deregistracija...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Deregistracija kumunikacije preko podatkovne povezave</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Napaka pri povezavi s strežnikom</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">Niste prijavljeni v potisno storitev...</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">Posodabljanje seznama</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">Posodabljam potisni seznam...</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Slika</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -28,20 +34,24 @@
   <string name="ConversationItem_saving_attachment">Shranjevanje priponke</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">Shranjujem priponko na kartico SD...</string>
   <string name="ConversationItem_save_to_sd_card">Shranim na kartico SD?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Ta datoteka je shranjena v kriptirani zbirki. Različica, ki jo boste shranili na SD kartico ne bo več kriptirana. Želite nadaljevati?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">Datoteka, ki jo želite odpreti, je shranjena v šifrirani zbirki. Različica, ki jo boste shranili na kartico SD ne bo več šifrirana. Želite nadaljevati?</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">Napaka pri shranjevanju priponke na kartico SD!</string>
   <string name="ConversationItem_success_exclamation">Izvršeno!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Onemogočeno pisanje na kartico SD!</string>
   <string name="ConversationItem_view_secure_media_question">Želite pogledati zavarovano datoteko?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ta datoteka je shranjena v šifrirani podatkovni zbirki. Če jo boste odprli z zunanjim pregledovalnikom, bo začasno dešifrirana in shranjena na disk? Ste prepričani, da želite to storiti?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Ta datoteka je shranjena v kriptirani zbirki. Pregledovanje z zunanjim pregledovalnikom zaenkrat žal zahteva, da bo začasno dešifrirana in shranjena na disk. Ste prepričani, da želite to storiti?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Sporočilo za izmenjavo ključev je prejeto in obdelano.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Napaka, prejeto zastarelo sporočilo za izmenjavo ključev.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Prejeto sporočilo za izmenjavo ključev, kliknite za obdelavo.</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Prejeto sporočilo za izmenjavo ključev. Za obdelavo kliknite.</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">Med varno sejo je bilo prejeto nekriptirano SMS sporočilo. Če pošiljatelj nima odprte varne seje, vaših sporočil ne bo mogel prebrati. Kliknite za prekinitev varne seje.</string>
+  <string name="ConversationItem_group_action_left">Oseba %1$s je zapustila skupino.</string>
+  <string name="ConversationItem_group_action_joined">Oseba %1$s se je pridružila skupini.</string>
+  <string name="ConversationItem_group_action_modify">Oseba %1$s je posodobila skupino.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Začnem varno sejo?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Začnem varno sejo z %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Potrditev prekinitve varne seje</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ste prepričani, da želite prekiniti trenutno varno sejo?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Potrditev za končanje varnostne seje</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Ste prepričani, da želite končati varno sejo?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Potrditev brisanja pogovora</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Ste prepričani, da želite trajno izbrisati pogovor?</string>
   <string name="ConversationActivity_add_attachment">Dodaj priponko</string>
@@ -55,11 +65,15 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Prejemniki skupinskega pogovora</string>
   <string name="ConversationActivity_group_conversation">Skupinski pogovor</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d prejemnikov v skupini</string>
+  <string name="ConversationActivity_unnamed_group">Neimenovana skupina</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d članov</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">1 član</string>
   <string name="ConversationActivity_saving_draft">Shranjujem osnutek...</string>
   <string name="ConversationActivity_invalid_recipient">Neveljaven prejemnik!</string>
   <string name="ConversationActivity_calls_not_supported">Klici niso podprti</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Naprava ne omogoča podpore klicnim operacijam.</string>
+  <string name="ConversationActivity_leave_group">Želite zapustiti skupino?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Ste prepričani, da res želite zapustiti to skupino?</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Podrobnosti sporočila</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Pošiljatelj: %1$s\nPrenos: %2$s\nPoslano/Prejeto:%3$s</string>
@@ -83,30 +97,45 @@
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Pozor, s tem boste izvozili vsebino svojih sporočil na SD kartico v nešifrirani obliki.</string>
   <string name="ExportFragment_cancel">Prekliči</string>
   <string name="ExportFragment_exporting">Izvažam</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">Izvažam nešifrirano na kartico SD...</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">Izvažam na kartico SD nešifrirano...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">Napaka, ne morem pisati na kartico SD!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Napaka pri zapisovanju na kartico SD.</string>
   <string name="ExportFragment_success">Uspešno opravljeno!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Izvažam ključe, nastavitve in sporočila v šifrirani obliki...</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">Nova skupina</string>
+  <string name="GroupCreateActivity_actionbar_update_title">Posodobi skupino</string>
+  <string name="GroupCreateActivity_group_name_hint">Ime skupine</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">Nova MMS skupina</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Izbrali ste stik, ki ne podpira skupin TextSecure, zato bo ta skupina MMS skupina.</string>
+  <string name="GroupCreateActivity_you_dont_support_push">Ker niste prijavljeni za uporabo podatkovnega kanala, so skupine TextSecure onemogočene.</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">Ker niste upravljalec te skupine, ne morete spreminjati naslova ali slike.</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">Prišlo je do nepričakovane napake, zato skupina ni bila ustvarjena.</string>
+  <string name="GroupCreateActivity_contacts_no_members">V skupini mora biti vsaj ena oseba!</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">En izmed članov skupine ima nepravilno zapisano številko. Popravite napako ali odstranite stik iz skupine in poskusite znova.</string>
+  <string name="GroupCreateActivity_file_io_exception">Napaka I/O, ne morem ustvariti začasne slikovne datoteke.</string>
+  <string name="GroupCreateActivity_avatar_content_description">Avatar skupine</string>
+  <string name="GroupCreateActivity_menu_create_title">Ustvari skupino</string>
+  <string name="GroupCreateActivity_creating_group">Ustvarjam %1$s…</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Uvozim sistemsko zbirko SMS sporočil?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">S tem boste uvozili sporočila iz sistemske zbirke SMS v TextSecure. Če ste predhodno že uvozili sporočila iz sistemske SMS zbirke, bodo ta sporočila v aplikaciji TextSecure podvojena.</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">S tem boste uvozili sporočila iz sistemske zbirke SMS v aplikacijo TextSecure. Če ste predhodno že uvozili sporočila iz sistemske zbirke SMS, bodo ta sporočila v aplikaciji TextSecure podvojena.</string>
   <string name="ImportFragment_import">Uvozi</string>
   <string name="ImportFragment_cancel">Prekliči</string>
   <string name="ImportFragment_restore_encrypted_backup">Obnovim iz šifirane varnostne kopije?</string>
-  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nObnova šifrirane varnostne kopije bo nadomestila vaše obstoječe ključe, nastavitve in sporočila. Izgubili boste vse kar se nahaja v trenutni podatkovni zbirki TextSecure, ne pa tudi v varnostni kopiji.</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\nObnova iz šifrirane varnostne kopije bo nadomestila vaše obstoječe ključe, nastavitve in sporočila. Izgubili boste vse kar se nahaja v trenutni podatkovni zbirki aplikacije TextSecure, ne pa tudi vsebine varnostne kopije.</string>
   <string name="ImportFragment_restore">Obnovi</string>
-  <string name="ImportFragment_import_plaintext_backup">Uvozim nešifrirano varnostno kopijo?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">S tem boste uvozili sporočila iz nešifrirane varnostne kopije v TextSecure. Če ste predhodno že uvozili sporočila iz iste varnostne kopije, bodo ta sporočila v aplikaciji TextSecure podvojena.</string>
+  <string name="ImportFragment_import_plaintext_backup">Uvozim iz nešifrirane varnostne kopije?</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">S tem boste uvozili sporočila iz nešifrirane varnostne kopije. Če ste predhodno že uvozili sporočila iz iste varnostne kopije, bodo ta sporočila podvojena.</string>
   <string name="ImportFragment_importing">Uvažam</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Uvozi nešifrirano varnostno kopijo...</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Uvozi iz nešifrirane varnostne kopije...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Ne najdem nobene nešifrirane varnostne kopije!</string>
-  <string name="ImportFragment_error_importing_backup">Napaka pri uvozu varnostne kopije!</string>
-  <string name="ImportFragment_import_complete">Uvoz zaključen!</string>
+  <string name="ImportFragment_error_importing_backup">Napaka pri uvozu iz varnostne kopije!</string>
+  <string name="ImportFragment_import_complete">Uvoz dokončan!</string>
   <string name="ImportFragment_restoring">Obnavljam</string>
-  <string name="ImportFragment_restoring_encrypted_backup">Obnavljam šifrirano varnostno kopijo...</string>
+  <string name="ImportFragment_restoring_encrypted_backup">Obnavljam iz šifrirane varnostne kopije...</string>
   <string name="ImportFragment_no_encrypted_backup_found">Ne najdem nobene šifrirane varnostne kopije!</string>
-  <string name="ImportFragment_restore_complete">Obnova končana!</string>
+  <string name="ImportFragment_restore_complete">Obnova dokončana!</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Noben skeniran ključ ni bil najden!</string>
   <!--MmsDownloader-->
@@ -127,11 +156,62 @@
   <!--PromptMmsActivity-->
   <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">Navesti morate MMSC URL vašega operaterja.</string>
   <string name="PromptMmsActivity_mms_settings_updated">Nastavitve MMS posodobljene</string>
-  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vnešeno lahko kadarkoli popravite v nastavitvah TextSecure.</string>
+  <string name="PromptMmsActivity_you_can_modify_these_values_from_the_textsecure_settings_menu_at_any_time_">Vnešeno lahko kadarkoli popravite v nastavitvah aplikacije TextSecure.</string>
   <!--ReceiveKeyActivity-->
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Podpis pri izmenjavi ključev se razlikuje od tistih pri predhodno izmenjanih ključih s to osebo. To lahko pomeni, da nekdo prestreza komunikacijo, ali pa, da je oseba ponovno namestila TextSecure in ima zdaj nov identifikacijski ključ.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Morda bi želeli preveriti ta stik.</string>
-  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Podpis pri tej izmenjavi je zaupanja vreden, vendar imate izklopljeno možnost \'Samodejno dokončaj izmenjavo ključev\'.</string>
+  <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Podpis pri tej izmenjavi je vreden zaupanja, vendar imate izklopljeno možnost \'Samodejno dokončaj izmenjavo ključev\'.</string>
+  <string name="ReceiveKeyActivity_processing">Obdelujem</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Izmenjava ključev poteka...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Povezava s TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Izberite svojo državo</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Navesti morate mednarodno kodo svoje države</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Navesti morate svojo telefonsko številko</string>
+  <string name="RegistrationActivity_invalid_number">Napačna številka</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Številka, ki ste jo navedli (%s) je neveljavna.</string>
+  <string name="RegistrationActivity_unsupported">Nepodprto</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Vaša naprava žal ne podpira podatkovnega sporočanja. Naprave z Androidom različice starejše od 4.0 morajo imeti registriran Googlov račun. Naprave z Androidom različice 4.0 ali več ne potrebujejo računa Google, vendar morajo imeti nameščeno aplikacijo Play Store.</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\nPreverili bomo, če je spodnja številka povezana s to napravo:\n\n%s\n\n\nJe ta številka prava, ali jo želite pred nadaljevanjem postopka spremeniti?</string>
+  <string name="RegistrationActivity_continue">Nadaljuj</string>
+  <string name="RegistrationActivity_edit">Urejanje</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Možne težave</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Preverjam številko</string>
+  <string name="RegistrationProgressActivity_edit_s">Uredi %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registracija je končana!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Možne težave.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Najprej morate vnesti kodo, ki ste jo prejeli...</string>
+  <string name="RegistrationProgressActivity_connecting">Povezujem</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Povezujem za verifikacijo...</string>
+  <string name="RegistrationProgressActivity_network_error">Napaka v omrežju!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Ne morem se povezati. Preverite svojo internetno povezavo in poskusite znova.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Verifikacija ni uspela!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Koda za verifikacijo, ki ste jo vnesli, je napačna. Poskusite znova.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">Preveč poskusov</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Prevečkrat ste vnesli napačno kodo za verifikacijo. Za ponoven poskus počakajte minuto.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Zahtevam klic</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Zahtevam dohodni klic za verifikacijo...</string>
+  <string name="RegistrationProgressActivity_server_error">Napaka strežnika</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Strežnik je naletel na težavo. Poskusite znova.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">Preveč zahtevkov!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Pred kratkim ste že zahtevali glasovni klic. Naslednjič lahko poskusite čez 20 minut.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Preverjam glasovno kodo...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registracija je zaključena</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">Registracija TextSecure je uspešno zaključena.</string>
+  <string name="RegistrationService_registration_error">Napaka pri registraciji</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">Pri registraciji TextSecure je prišlo do težav.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Prejeto poškodovano\nsporočilo za izmenjavo ključev!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nPrejeto sporočilo za izmenjavo ključev za napačno različico protokola.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nPrejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo in prikaz.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Prejet je bil nadgrajen identifikacijski ključ neznanega stika. Tapnite za potrditev istovetnosti.</string>
+  <string name="SmsMessageRecord_secure_session_ended">Varna seja je zaključena.</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">Zapustili ste skupino...</string>
+  <string name="TheadRecord_secure_session_ended">Varna seja je zaključena.</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Nimate identifikacijskega ključa.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Prejemnik nima identifikacijskega ključa.</string>
@@ -172,7 +252,7 @@
   <string name="MmsDatabase_downloading_mms">Prejemam MMS...</string>
   <string name="MmsDatabase_mms_download_failed">Prejem MMS sporočila neuspešen!</string>
   <string name="MmsDatabase_downloading">Prejemam...</string>
-  <string name="MmsDatabase_mms_pending_download">Za dolpoteg klikni in spremeni MMS nastavitve.</string>
+  <string name="MmsDatabase_mms_pending_download">Za dolpoteg klikni in spremeni nastavitve MMS.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dešifriranje sporočila MMS, počakajte...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Okvarjeno šifrirano sporočilo MMS...</string>
@@ -183,8 +263,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Uvoz v teku</string>
   <string name="ApplicationMigrationService_importing_text_messages">Uvažanje kratkih sporočil</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">Geslo TextSecure zajeto</string>
-  <string name="KeyCachingService_passphrase_cached">Geslo zajeto</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Odpri z dotikom.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Odpri z dotikom ali zapri z dotikom ključavnice.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure je odklenjen</string>
+  <string name="KeyCachingService_lock">Zakleni z geslom</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d novih sporočil</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovejše od: %s</string>
@@ -217,12 +299,15 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Ni stikov.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Iščem stike...</string>
+  <!--single_contact_selection_activity-->
+  <string name="single_contact_selection_group_activity__filter">Vnesite ime za filtriranje...</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Izberi za</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Ni zadnjih klicev.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Vpiši sporočilo</string>
+  <string name="conversation_activity__type_message"><small>Pošlji sporočilo</small></string>
   <string name="conversation_activity__send">Pošlji</string>
   <string name="conversation_activity__remove">Odstrani</string>
   <!--conversation_item_sent-->
@@ -233,8 +318,11 @@
   <string name="conversation_item_received__downloading">Prenašam</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Paketni način izbire</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Pripravljam države...</string>
+  <string name="country_selection_fragment__search">Iskanje</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">Nastavite geslo, s katerim bodo šifrirani vaši podatki v okviru aplikacije.\n\nGeslo naj bo močno.</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">Izberite geslo, če želite šifrirati podatke lokalno na napravi.</string>
   <string name="create_passphrase_activity__passphrase">Geslo:</string>
   <string name="create_passphrase_activity__repeat">Ponovi:</string>
   <string name="create_passphrase_activity__continue">Nadaljuj</string>
@@ -248,40 +336,77 @@
   <string name="database_migration_activity__importing">UVAŽANJE</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Posodabljam podatkovne zbirke...</string>
-  <string name="export_fragment__export_encrypted_backup">Izvoz šifrirane varnostne kopije</string>
+  <string name="export_fragment__export_encrypted_backup">Izvozi šifrirano varnostno kopijo</string>
   <string name="export_fragment__export_an_encrypted_backup_to_the_sd_card">Izvozi šifrirano varnostno kopijo na kartico SD.</string>
   <string name="export_fragment__export_plaintext_backup">Izvozi nešifrirano varnostno kopijo</string>
   <string name="export_fragment__export_a_plaintext_backup_compatible_with">\nIzvozi nešifrirano varnostno kopijo združljivo s sistemskimi varnostnimi kopijami SMS na kartico SD.</string>
   <string name="import_fragment__import_system_sms_database">Uvozi sistemsko zbirko SMS sporočil</string>
-  <string name="import_fragment__import_the_database_from_the_default_system">Uvozi podatke iz sistemsko privzete SMS aplikacije.</string>
-  <string name="import_fragment__import_encrypted_backup">Uvozi šifrirano varnostno kopijo</string>
-  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nObnovi predhodno izvoženo šifrirano varnostno kopijo Text Secure.</string>
-  <string name="import_fragment__import_plaintext_backup">Uvozi nešifrirano varnostno kopijo</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">\nUvozi nešifrirano datoteko z varnostno kopijo. Združljivo s sistemskimi varnostnimi kopijami SMS.</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Uvozi zbirko sporočil iz sistemsko privzete aplikacije SMS.</string>
+  <string name="import_fragment__import_encrypted_backup">Uvozi iz šifrirane varnostne kopije</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_textsecure_backup">\nObnovi podatke iz predhodno izvožene šifrirane varnostne kopije TextSecure.</string>
+  <string name="import_fragment__import_plaintext_backup">Uvozi iz nešifrirane varnostne kopije</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">\nUvozi iz datoteke z nešifrirano varnostno kopijo. Združljivo s sistemskimi varnostnimi kopijami SMS.</string>
   <string name="local_identity__regenerate_key">Ustvari nov ključ</string>
   <!--mms_preferences_activity-->
-  <string name="mms_preferences_activity__manual_mms_settings_are_required">Za vaš telefon je potrebna ročna nastavitev MMS.</string>
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">Za vaš telefon je potreben ročen vnos nastavitev MMS.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__textsecure_passphrase">GESLO TEXTSECURE</string>
   <string name="prompt_passphrase_activity__unlock">Odkleni</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Za pošiljanje multimedijskih in skupinskih sporočil potrebuje TextSecure nastavitve MMS vašega mobilnega operaterja. Potrebnih podatkov ni moč pridobiti iz vaše naprave, kar je značilno za zaklenjene naprave in druge omejene konfiguracije. </string>
+  <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Za pošiljanje multimedijskih in skupinskih sporočil potrebuje aplikacija TextSecure nastavitve MMS vašega mobilnega operaterja. Teh podatkov ni moč pridobiti iz vaše naprave, kar je značilno za zaklenjene naprave in druge omejene konfiguracije. </string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Za pošiljanje multimedijskih in skupinskih sporočil kliknite \'OK\' in vnesite potrebne podatke. Nastavitve MMS za vašo napravo najdete pod \'APN operaterja\'. Podatke morate vnesti samo enkrat.</string>
   <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (ZAHTEVANO):</string>
   <string name="prompt_mms_activity__mms_proxy_host_optional">GOSTITELJ POSRED. STREŽNIKA MMS (IZBIRNO):</string>
   <string name="prompt_mms_activity__mms_proxy_port_optional">VRATA POSRED. STREŽNIKA MMS (IZBIRNO):</string>
   <!--receive_key_activity-->
-  <string name="receive_key_activity__complete">Končano</string>
+  <string name="receive_key_activity__complete">Dokončaj</string>
+  <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">\nZa večjo zasebnost in v izogib stroškom SMS sporočil lahko TextSecure pri komunikaciji z drugimi uporabniki aplikacije\nuporablja potisna sporočila. Za aktivacijo te funkcije preverite kodo vaše države in telefonsko številko.</string>
+  <string name="registration_activity__your_country">VAŠA DRŽAVA</string>
+  <string name="registration_activity__your_country_code_and_phone_number">KODA DRŽAVE IN VAŠA\nTELEFONSKA ŠTEVILKA</string>
+  <string name="registration_activity__phone_number">TELEFONSKA ŠTEVILKA</string>
+  <string name="registration_activity__register">Registriraj</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Med registracijo bo nekaj podatkov o stikih začasno posredovano na strežnik.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Nekatere možni razlogi\nza težave:</string>
+  <string name="registration_problems__sms_interceptors">Prestrezniki SMS.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nNekatere zunanje aplikacije SMS, kot npr. Handcent ali GoSMS, ravnajo napačno in\nprestrezajo vsa dohodna sporočila SMS. Preverite, če ste nanje prejeli sporočilo SMS, ki se\nzačne z \'Your TextSecure verification code:\'. V tem primeru morate nastaviti takšno SMS\naplikacijo, da bo sporočila SMS spustila naprej.</string>
+  <string name="registration_problems__incorrect_number">Napačna številka.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nPreverite, če ste pravilno vnesli svojo telefonsko številko in če je koda vaše regije/države prava.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure ne bo deloval s telefonskimi številkami Google Voice.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Glasovna preverba</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nZa preverbo vaše telefonske številke vas TextSecure lahko tudi pokliče. Kliknite \'Pokliči me\'\nin spodaj vnesite šetmestno kodo, ki jo boste zaslišali.</string>
+  <string name="registration_progress_activity__verify">Preveri</string>
+  <string name="registration_progress_activity__call_me">Pokliči me</string>
+  <string name="registration_progress_activity__edit_number">Uredi številko</string>
+  <string name="registration_progress_activity__connectivity_error">Napaka v povezavi.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure se ni mogel povezati s potisno storitvijo.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Nekateri možni razlogi\nza težave:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Ni povezave\nz omrežjem.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Za uporabo te storitve mora biti vaša naprava povezana z omrežjem. Preverite, če je naprava\npovezana v omrežje preko 3G ali Wifi.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Omejujoč požarni zid.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nČe uporabljate povezavo Wifi, lahko dostop do strežnika TextSecure onemogoča\npožarni zid. Poskusite z drugim Wifi omrežjem ali z mobilnim omrežjem.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure bo avtomatsko preveril vašo telefonsko številko s potrditvenim sporočilom SMS.</string>
+  <string name="registration_progress_activity__connecting">Povezujem...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Čakam na SMS\npotrditev...</string>
+  <string name="registration_progress_activity__registering_with_server">Registracija s strežnikom...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">To utegne trajati trenutek ali dva. Ko bo registracija končana, boste obveščeni.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nČakanje aplikacije TextSecure na potrditveni SMS je bilo neuspešno.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Potrditev SMS ni\nbila uspešna.</string>
+  <string name="registration_progress_activity__generating_keys">Ustvarjam ključe...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Za</string>
+  <string name="recipients_panel__add_member">Dodaj člana</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">Trenutno nimate identifikacijskih ključev v zbirki zaupanja vrednih.</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Identiteta stika (prebere on):</string>
-  <string name="verify_identity_activity__your_identity_you_read">Vaša identiteta (preberete vi):</string>
+  <string name="verify_identity_activity__their_identity_they_read">Istovetnost stika (prebere on):</string>
+  <string name="verify_identity_activity__your_identity_you_read">Vaša istovetnost (preberete vi):</string>
   <!--verify_import_identity_activity-->
-  <string name="verify_import_identity_activity__identity_name_n">Ime identitete:\\n</string>
-  <string name="verify_import_identity_activity__imported_identity_n">Uvožena identiteta:\\n</string>
+  <string name="verify_import_identity_activity__identity_name_n">Istovetnost stika:\\n</string>
+  <string name="verify_import_identity_activity__imported_identity_n">Uvožen identifikacijski ključ:\\n</string>
   <string name="verify_import_identity_activity__verified">Preverjeno!</string>
   <string name="verify_import_identity_activity__compare">Primerjaj</string>
   <!--verify_keys_activity-->
@@ -291,27 +416,30 @@
   <string name="AndroidManifest__create_passphrase">Ustvari geslo</string>
   <string name="AndroidManifest__enter_passphrase">Vpiši geslo</string>
   <string name="AndroidManifest__select_contacts">Izberi stike</string>
+  <string name="AndroidManifest__select_contact">Izberi stik</string>
   <string name="AndroidManifest__textsecure_detected">Aplikacija TextSecure zaznana</string>
   <string name="AndroidManifest__public_identity_key">Javni identifikacijski ključ</string>
   <string name="AndroidManifest__change_passphrase">Zamenjaj geslo</string>
   <string name="AndroidManifest__verify_session">Overovi sejo</string>
-  <string name="AndroidManifest__verify_identity">Overovi identiteto</string>
+  <string name="AndroidManifest__verify_identity">Preveri istovetnost</string>
   <string name="AndroidManifest__manage_identity_keys">Upravljanje identifikacijskih ključev</string>
   <string name="AndroidManifest__complete_key_exchange">Dokončaj izmenjavo ključev</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz / izvoz</string>
   <string name="arrays__my_identity_key">Moj ID ključ</string>
-  <string name="arrays__contact_keys">Ključi stikov</string>
+  <string name="arrays__contact_keys">ID ključi stikov</string>
   <!--preferences.xml-->
   <string name="preferences__general">Splošno</string>
   <string name="preferences__pref_all_sms_title">Uporabljaj za vsa SMS sporočila</string>
   <string name="preferences__pref_all_mms_title">Uporabljaj za vsa MMS sporočila</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Uporabi TextSecure za ogled in shranjevanje vseh dohodnih SMS sporočil</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Uporabi TextSecure za ogled in shranjevanje vseh dohodnih MMS sporočil</string>
+  <string name="preferences__enable_enter_key_title">Vklopi tipko \'pošlji\'</string>
+  <string name="preferences__replace_smiley_with_enter_key">Zamenjaj tipko \'smeško\' s tipko \'pošlji\'</string>
   <string name="preferences__pref_enter_sends_title">Tipka Naprej (Enter) pošlje</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">S pritiskom na tipko Naprej (Enter) bo sporočilo poslano</string>
   <string name="preferences__display_settings">Nastavitve prikaza</string>
-  <string name="preferences__choose_identity">Izberi identiteto</string>
+  <string name="preferences__choose_identity">Izberi identifikacijski ključ</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Na sezmanu stikov izberite svojo lastno vizitko.</string>
   <string name="preferences__change_passphrase">Zamenjaj geslo</string>
   <string name="preferences__change_my_passphrase">Zamenjaj geslo</string>
@@ -331,12 +459,9 @@
   <string name="preferences__notifications">Obvestila</string>
   <string name="preferences__display_message_notifications_in_status_bar">Prikaži obvestilo o sporočilu v statusni vrstici</string>
   <string name="preferences__led_color">Barva LED</string>
-  <string name="preferences__change_notification_led_color">Spremeni barvo LED za obvestila</string>
   <string name="preferences__pref_led_blink_title">Vzorec utripanja LED</string>
-  <string name="preferences__change_notification_blink_pattern">Spremeni vzorec utripanja LED za obvestila</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Izveri vzorec utripanja LED</string>
-  <string name="preferences__select_led_color">Izberi barvo LED</string>
   <string name="preferences__sound">Zvok</string>
+  <string name="preferences__change_notification_sound">Spremeni zvok za obvestila</string>
   <string name="preferences__inthread_notifications">Obvestila znotraj pogovora</string>
   <string name="preferences__play_inthread_notifications">Predvajaj zvočna obvestila znotraj pogovora.</string>
   <string name="preferences__vibrate">Vibriranje</string>
@@ -357,12 +482,12 @@
   <string name="preferences__passphrase">Geslo</string>
   <string name="preferences__advanced_mms_access_point_names">Nastavitve MMS</string>
   <string name="preferences__enable_manual_mms">Omogoči ročno nastavitev MMS</string>
-  <string name="preferences__override_system_mms_settings">Uveljevi spodnje podatke preko sistemskih MMS nastavitev.</string>
+  <string name="preferences__override_system_mms_settings">Uveljevi spodnje nastavitve preko sistemskih MMS nastavitev.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (zahtevano)</string>
   <string name="preferences__mms_proxy_host_optional">Posredniški strežnik za MMS (opcijsko)</string>
   <string name="preferences__mms_proxy_port_optional">Vrata posredniškega strežnika za MMS (opcijsko)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo SMS</string>
   <string name="preferences__sms_delivery_reports">Potrdila o dostavi SMS</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo SMS</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Samodejno izbriši stara sporočila, ko pogovor preseže določeno dolžino</string>
   <string name="preferences__delete_old_messages">Izbriši stara sporočila</string>
   <string name="preferences__storage">Shranjevanje</string>
@@ -377,6 +502,11 @@
   <string name="preferences__language">Jezik</string>
   <string name="preferences__make_default_sms_app">Nastavi za privzeto aplikacijo SMS</string>
   <string name="preferences__make_textsecure_the_default_sms_mms_app">Nastavi TextSecure za privzeto aplikacijo SMS/MMS na napravi.</string>
+  <string name="preferences__use_data_channel">Potisna sporočila</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\nPovečajte svojo zasebnost in izognite se stroškom SMS sporočil z uporabo podatkovnega kanala pri komunikaciji z drugimi uporabniki TectSecure</string>
+  <string name="preferences__allow_sms_fallback">Dovoli prehod na SMS</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">Kadar podatkovna povezava ni na voljo, pošiljaj in prejemaj SMS sporočila</string>
+  <string name="preferences__refresh_push_directory">Osveži potisni seznam</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -402,13 +532,17 @@
   <string name="conversation_list_batch__menu_select_all">Izberi vse</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Iskanje</string>
+  <string name="conversation_list__drawer_open">Odpri navigacijski poteznik</string>
+  <string name="conversation_list__drawer_close">Zapri navigacijski poteznik</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Varnost</string>
-  <string name="conversation_secure_verified__menu_verify_session">Overovi sejo</string>
+  <string name="conversation_secure_verified__menu_no_identity">Identifikacijski ključ ni na voljo</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Overovi prejemnika</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Prekini varno sejo</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Končaj varno sejo</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Dodaj priponko</string>
+  <string name="conversation__menu_update_group">Posodobi skupino</string>
+  <string name="conversation__menu_leave_group">Zapusti skupino</string>
   <string name="conversation__menu_add_contact_info">Dodaj podatke o stiku</string>
   <string name="conversation__menu_delete_thread">Izbriši pogovor</string>
   <!--conversation_group_options-->
@@ -424,8 +558,9 @@
   <string name="text_secure_locked__menu_unlock">Odkleni</string>
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Novo sporočilo</string>
+  <string name="text_secure_normal__menu_new_group">Nova skupina</string>
   <string name="text_secure_normal__menu_settings">Nastavitve</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Počisti geslo</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Zakleni</string>
   <string name="text_secure_normal__mark_all_as_read">Označi vsa kot prebrana</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Overjeno</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 7f74c32371..88b54f25d7 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -16,6 +16,9 @@
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Inaktivera lagringskryptering?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\nVarning, detta inaktiverar lagringskryptering för alla meddelanden och nycklar. Dina krypterade\nsessioner kommer fortsätta att fungera, men vem som helst med fysisk tillgång till din enhet\nkommer kunna komma åt dem.</string>
   <string name="ApplicationPreferencesActivity_disable">Inaktivera</string>
+  <string name="ApplicationPreferencesActivity_unregistering">Avregistrerar...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">Avregistrerar för datakommunikation</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fel vid anslutning till server!</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -33,15 +36,15 @@
   <string name="ConversationItem_success_exclamation">Framgång!</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">Kan ej skriva till SD Kort!</string>
   <string name="ConversationItem_view_secure_media_question">Visa säker media?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denna media har lagrats i en krypterad databas. Tyvärr, för att öppna den med en extern visare behöver datan tillfälligt dekrypteras och skrivas till disken. Är du säker på att du vill göra detta?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denna mediefil har lagrats krypterat. För att öppna den i en en extern visare måste den tillfälligt dekrypteras och skrivas till disk. Är du säker på att du vill göra detta?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Tog emot och bearbetade nyckelutbytesmeddelande.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Fel, tog emot gammalt nyckeutbytesmeddelande.</string>
-  <string name="ConversationItem_received_key_exchange_message_click_to_process">Tog emot nyckelutbytesmeddelande, klicka för att bearbeta</string>
+  <string name="ConversationItem_received_key_exchange_message_click_to_process">Tog emot nyckelutbytesmeddelande, tryck för att behandla.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Initiera säker session?</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">Initiera säker session med %s?</string>
-  <string name="ConversationActivity_abort_secure_session_confirmation">Avbryt säker session bekräftelse</string>
-  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Är du säker att du vill avbryta denna säkra session?</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">Bekräfta avslutning av säker session</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">Är du säker på att du vill avsluta denna säkra session?</string>
   <string name="ConversationActivity_delete_thread_confirmation">Radera tråd bekräftelse</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Är du säker att du vill permanent radera denna konversation?</string>
   <string name="ConversationActivity_add_attachment">Bifoga fil</string>
@@ -55,7 +58,6 @@
   <string name="ConversationActivity_forward_message_prefix">FWD</string>
   <string name="ConversationActivity_group_conversation_recipients">Mottagare för gruppkonversation</string>
   <string name="ConversationActivity_group_conversation">Gruppkonversation</string>
-  <string name="ConversationActivity_d_recipients_in_group">%d mottagare i grupp</string>
   <string name="ConversationActivity_saving_draft">Sparar utkast...</string>
   <string name="ConversationActivity_invalid_recipient">Ogiltig mottagare!</string>
   <string name="ConversationActivity_calls_not_supported">Samtal stöds ej</string>
@@ -88,6 +90,7 @@
   <string name="ExportFragment_error_while_writing_to_sd_card">Kunde inte skriva till minneskort.</string>
   <string name="ExportFragment_success">Lyckades!</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">Exporterar krypterade nycklar,\ninställningar och meddelanden...</string>
+  <!--GroupCreateActivity-->
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Importera okrypterade SMS?</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">Denna åtgärd importerar\nmeddelanden från telefonens originella SMS-databas till TextSecure. Om du tidigare har\nimporterat via denna metod kommer samtliga SMS bli duplicerade.</string>
@@ -97,7 +100,7 @@
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">Genom att återställa en krypterad säkerhetskopia resulterar i att dina existerande nycklar,\ninställningar och meddelanden kommer att skrivas över. Du kommer att förlora all information\nsom för närvarande finns i TextSecure.</string>
   <string name="ImportFragment_restore">Återställ</string>
   <string name="ImportFragment_import_plaintext_backup">Importera okrypterad säkerhetskopia?</string>
-  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Denna åtgärd kommer\natt importera meddelanden från en okrypterad säkerhetskopia. Om du tidigare har importerat\nvia denna metod kommer samtliga SMS bli duplicerade.</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Denna åtgärd importerar meddelanden från en säkerhetskopia i klartext. Om du redan har importerat denna säkerhetskopia och importerar igen kommer du att få duplicerade meddelanden.</string>
   <string name="ImportFragment_importing">Importerar</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">Importera okrypterad säkerhetskopia...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Ingen okrypterad säkerhetskopia kunde hittas!</string>
@@ -132,6 +135,53 @@
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_different">Signaturen för detta nyckelutbytet skiljer sig från det som du tidigare har mottagit från denna kontakt.\nDetta kan innebära antingen att någon försöker avlyssna din kommunikation, eller att denna kontakt helt enkelt installerade om TextSecure och nu har en ny identitetsnyckel.</string>
   <string name="ReceiveKeyActivity_you_may_wish_to_verify_this_contact">Det kan vara en bra idé att\nverifiera denna kontakt.</string>
   <string name="ReceiveKeyActivity_the_signature_on_this_key_exchange_is_trusted_but">Signaturen för detta nyckelutbytet är betrodd, men du har inställningen \'fullborda nyckelutbyten automatiskt\' avstängd.</string>
+  <string name="ReceiveKeyActivity_processing">Bearbetar</string>
+  <string name="ReceiveKeyActivity_processing_key_exchange">Bearbetar nyckelutbyte...</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_textsecure">Anslut med TextSecure</string>
+  <string name="RegistrationActivity_select_your_country">Välj ditt land</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">Du måste ange din landskod</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">Du måste ange ditt telefonnummer</string>
+  <string name="RegistrationActivity_invalid_number">Ogiltigt nummer</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,\ndenna enhet stöds inte för datameddelanden. Enheter som kör versioner av Android äldre än 4.0 måste ha ett registrerat Google-konto. Enheter med Android 4.0 eller senare 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">\nVi kommer nu att verifiera att följande nummer går till denna enhet:\n\n%s\n\n\nÄr detta nummer rätt eller vill du ändra det innan du fortsätter?</string>
+  <string name="RegistrationActivity_continue">Fortsätt</string>
+  <string name="RegistrationActivity_edit">Ändra</string>
+  <!--RegistrationProblemsActivity-->
+  <string name="RegistrationProblemsActivity_possible_problems">Möjliga problem</string>
+  <!--RegistrationProgressActivity-->
+  <string name="RegistrationProgressActivity_verifying_number">Verifierar nummer</string>
+  <string name="RegistrationProgressActivity_edit_s">Ändra %s</string>
+  <string name="RegistrationProgressActivity_registration_complete">Registrering klar!</string>
+  <string name="RegistrationProgressActivity_possible_problems">Möjliga problem.</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Du måste ange koden du tog emot först...</string>
+  <string name="RegistrationProgressActivity_connecting">Ansluter</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">Ansluter för verifiering...</string>
+  <string name="RegistrationProgressActivity_network_error">Nätverksfel!</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">Kan inte ansluta. Kontrollera din nätverksanslutning och försök igen.</string>
+  <string name="RegistrationProgressActivity_verification_failed">Verifiering misslyckades!</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">Verifieringskoden du angav är fel. Försök igen.</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">För många försök</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">Du har angivit en felaktig verifieringskod för många gånger. Vänta en minut innan du försöker igen.</string>
+  <string name="RegistrationProgressActivity_requesting_call">Begär samtal</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">Begär inkommande verifieringssamtal...</string>
+  <string name="RegistrationProgressActivity_server_error">Serverfel</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">Servern drabbades av ett fel. Försök igen.</string>
+  <string name="RegistrationProgressActivity_too_many_requests">För många förfrågningar!</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Du har redan begärt ett röstsamtal. Du kan begära ett nytt om 20 minuter.</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">Verifierar röstkod...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">Registrering klar</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">TextSecure-registrering har lyckats.</string>
+  <string name="RegistrationService_registration_error">Registreringsfel</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure-registreringen har drabbats av ett problem.</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">Tog emot trasigt nyckelutbytesmeddelande!</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">\nTog emot nyckelutbytesmeddelande för ogiltig protokollversion.</string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">\nTog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och visa.</string>
+  <!--ThreadRecord-->
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Du har ingen identitetsnyckel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Mottagaren har ingen identitetsnyckel.</string>
@@ -183,8 +233,10 @@
   <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerar textmeddelanden</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">TextSecure lösenord lagrat</string>
-  <string name="KeyCachingService_passphrase_cached">Lösenord lagrat</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">Tryck för att öppna.</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">Tryck för att öppna, tryck på låset för att stänga.</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure är upplåst</string>
+  <string name="KeyCachingService_lock">Lås med lösenord</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">%d nya meddelanden</string>
   <string name="MessageNotifier_most_recent_from_s">Senaste från: %s</string>
@@ -205,6 +257,8 @@
   <string name="ViewLocalIdentityActivity_continue">Fortsätt</string>
   <!--SmsReceiver-->
   <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Kan för tillfället inte skicka ditt SMS meddelande. Det kommer skickas när service blir tillgängligt.</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_sorry_quick_response_is_not_yet_supported_by_textsecure">Tyvärr, Quick Response stöds inte ännu av 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">Du har fått ett meddelande från någon som stödjer TextSecure krypterade sessioner. Vill du initiera en säker session?</string>
   <string name="auto_initiate_activity__initiate_exchange">Initiera utbyte</string>
@@ -215,12 +269,12 @@
   <!--contact_selection_group_activity-->
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">Inga kontakter.</string>
+  <!--single_contact_selection_activity-->
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Välj för</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Inga nyliga samtal.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message">Skriv meddelande</string>
   <string name="conversation_activity__send">Skicka</string>
   <string name="conversation_activity__remove">Ta bort</string>
   <!--conversation_item_sent-->
@@ -231,8 +285,10 @@
   <string name="conversation_item_received__downloading">Laddar ner</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Sats-markerings läge</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">Läser in länder...</string>
+  <string name="country_selection_fragment__search">Sök</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">Var vänlig välj ett lösenord som används för att kryptera din data lokalt.\n\nDetta bör vara ett starkt lösenord.</string>
   <string name="create_passphrase_activity__passphrase">LÖSENORD:</string>
   <string name="create_passphrase_activity__repeat">UPPREPA:</string>
   <string name="create_passphrase_activity__continue">Fortsätt</string>
@@ -270,6 +326,41 @@
   <string name="prompt_mms_activity__mms_proxy_port_optional">MMS PROXY PORT (VALFRITT):</string>
   <!--receive_key_activity-->
   <string name="receive_key_activity__complete">Klart</string>
+  <!--registration_activity-->
+  <string name="registration_activity__your_country">DITT LAND</string>
+  <string name="registration_activity__your_country_code_and_phone_number">DIN LANDSKOD OCH \nTELEFONNUMMER</string>
+  <string name="registration_activity__phone_number">TELEFONNUMMER</string>
+  <string name="registration_activity__register">Registrera</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registrering kommer att temporärt överföra viss kontaktinformation till servern.</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">Några möjliga orsaker:</string>
+  <string name="registration_problems__sms_interceptors">SMS-uppsnappare.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\nVissa meddelandeklienter från tredje part, t.ex. Handcent och GoSMS, \nsnappar upp alla inkommande sms. Kontrollera om du tog emot ett meddelande som börjar\nmed \'Your TextSecure verification code:\', isåfall måste du konfigurera din\nmeddelandeklient för att släppa igenom meddelanden.</string>
+  <string name="registration_problems__incorrect_number">Felaktigt nummer.</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\nKontrollera att du angav telefonnummret rätt och att det är rätt formaterat för ditt område.</string>
+  <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure fungerar inte med Google Voice-nummer.</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">Röstverifiering</string>
+  <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">\nTextSecure kan också ringa upp dig för att verifiera ditt telefonnummer. Tryck \'Ring mig\'\n och fyll i den sexsiffriga kod som du hör nedan.</string>
+  <string name="registration_progress_activity__verify">Verifiera</string>
+  <string name="registration_progress_activity__call_me">Ring mig</string>
+  <string name="registration_progress_activity__edit_number">Ändra nummer</string>
+  <string name="registration_progress_activity__connectivity_error">Anslutningsfel.</string>
+  <string name="registration_progress_activity__textsecure_was_unable_to_connect_to_the_push_service">\nTextSecure kunde inte ansluta till push-tjänsten.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">Några möjliga orsaker:</string>
+  <string name="registration_progress_activity__no_network_connectivity">Ingen nätverksanslutning.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Din enhet behöver nätverksanslutning för att använda denna funktion. Kontrollera att du är ansluten via mobil data eller trådlöst nätverk.</string>
+  <string name="registration_progress_activity__restrictive_firewall">Restriktiv brandvägg.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\nOm du är ansluten via trådlöst nätverk är det möjligt att en brandvägg blockerar åtkomst till TextSecure-servern. Prova med ett annat nätverk eller mobil data.</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure kommer nu att automatiskt verifiera ditt telefonnummer med ett sms.</string>
+  <string name="registration_progress_activity__connecting">Ansluter...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">Väntar på sms-verifiering...</string>
+  <string name="registration_progress_activity__registering_with_server">Registrerar på server...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Detta kan ta en stund. Vi notifierar dig när verifieringen är klar.</string>
+  <string name="registration_progress_activity__textsecure_timed_out_while_waiting_for_a_verification_sms_message">\nTextSecure uppnådde tidsgränsen för sms-verifiering.</string>
+  <string name="registration_progress_activity__sms_verification_failed">Sms-verifiering misslyckades.</string>
+  <string name="registration_progress_activity__generating_keys">Skapar nycklar...</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">Till</string>
   <!--review_identities-->
@@ -306,6 +397,8 @@
   <string name="preferences__pref_all_mms_title">Använd för alla MMS</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Använd TextSecure för att läsa och lagra alla inkommande text meddelanden</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Använd TextSecure för att se och lagra alla inkommande multimedia meddelanden</string>
+  <string name="preferences__enable_enter_key_title">Aktivera returtagenten</string>
+  <string name="preferences__replace_smiley_with_enter_key">Ersätt tangenten för uttryckssymboler med retur</string>
   <string name="preferences__pref_enter_sends_title">Enter skickar</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Klick på enter-tangenten skickar text meddelanden</string>
   <string name="preferences__display_settings">Visningsinställningar</string>
@@ -328,13 +421,10 @@
   <string name="preferences__manage_configured_identity_keys">Hantera konfigurerade identitetsnycklar</string>
   <string name="preferences__notifications">Notifikationer</string>
   <string name="preferences__display_message_notifications_in_status_bar">Visa meddelande notifikationer i statusraden</string>
-  <string name="preferences__led_color">LED-färg</string>
-  <string name="preferences__change_notification_led_color">Ändra LED-färg för notifikationer</string>
-  <string name="preferences__pref_led_blink_title">LED-blinkmönster</string>
-  <string name="preferences__change_notification_blink_pattern">Ändra LED-blinkmönster för notifikationer</string>
-  <string name="preferences__pref_led_blink_dialogtitle">Välj LED-blinkmönster</string>
-  <string name="preferences__select_led_color">Välj LED-färg</string>
+  <string name="preferences__led_color">Färg på ljusindikator</string>
+  <string name="preferences__pref_led_blink_title">Blinkmönster på ljusindikator</string>
   <string name="preferences__sound">Ljud</string>
+  <string name="preferences__change_notification_sound">Ändra notifieringsljud</string>
   <string name="preferences__inthread_notifications">Inom-tråd notifikationer</string>
   <string name="preferences__play_inthread_notifications">Spela notifikationsljud när en aktiv konversation visas</string>
   <string name="preferences__vibrate">Vibrera</string>
@@ -355,12 +445,12 @@
   <string name="preferences__passphrase">Lösenfras</string>
   <string name="preferences__advanced_mms_access_point_names">MMS inställningar</string>
   <string name="preferences__enable_manual_mms">Aktivera manuell MMS</string>
-  <string name="preferences__override_system_mms_settings">Skriv över systemets MMS inställningar med nedanstående information</string>
+  <string name="preferences__override_system_mms_settings">Åsidosätt systemets MMS-inställningar med nedanstående.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (nödvändigt)</string>
   <string name="preferences__mms_proxy_host_optional">MMS Proxyvärd (valfritt)</string>
   <string name="preferences__mms_proxy_port_optional">MMS proxyport (valfritt)</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Begär en leveransrapport för varje SMS meddelande du skickar</string>
   <string name="preferences__sms_delivery_reports">SMS leveransrapporter</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Begär en leveransrapport för varje SMS meddelande du skickar</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Radera automatiskt gamla meddelanden när en konversationstråd överstiger en specificerad längd</string>
   <string name="preferences__delete_old_messages">Radera gamla meddelanden</string>
   <string name="preferences__storage">Lagring</string>
@@ -373,6 +463,8 @@
   <string name="preferences__theme">Tema</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Språk</string>
+  <string name="preferences__make_default_sms_app">Använd som standardapp för sms</string>
+  <string name="preferences__make_textsecure_the_default_sms_mms_app">Gör TextSecure till standardapp för SMS/MMS på din enhet.</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -400,9 +492,9 @@
   <string name="conversation_list__menu_search">Sök</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Säkerhet</string>
-  <string name="conversation_secure_verified__menu_verify_session">Verifiera Session</string>
+  <string name="conversation_secure_verified__menu_no_identity">Ingen identitet tillgänglig</string>
   <string name="conversation_secure_verified__menu_verify_recipient">Verifiera mottagare</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">Avbryt säker session</string>
+  <string name="conversation_secure_verified__menu_abort_secure_session">Avsluta säker session</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Bifoga fil</string>
   <string name="conversation__menu_add_contact_info">Lägg till kontaktinfo</string>
@@ -421,7 +513,7 @@
   <!--text_secure_normal-->
   <string name="text_secure_normal__menu_new_message">Nytt meddelande</string>
   <string name="text_secure_normal__menu_settings">Inställningar</string>
-  <string name="text_secure_normal__menu_clear_passphrase">Rensa lösenord</string>
+  <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Markera alla som lästa</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verifierad</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d63d69fd83..704bb4659a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -8,6 +8,20 @@
   <string name="ApplicationPreferencesActivity_currently_s">当前： %s</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">您需要在管理密钥之前输入密码...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您还未设置密码！</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">每次通话的信息</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">删除旧的信息？</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">你确定处理与%s的最近的对话消息？</string>
+  <string name="ApplicationPreferencesActivity_delete">删除</string>
+  <string name="ApplicationPreferencesActivity_my">我</string>
+  <string name="ApplicationPreferencesActivity_disable_storage_encryption">关闭存储加密？</string>
+  <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n警告：这将会关闭所有信息和密钥的存储加密。您的加密会话会继续发挥作用，但是任何能物理接触到此设备的人都能够访问这些数据。</string>
+  <string name="ApplicationPreferencesActivity_disable">禁用</string>
+  <string name="ApplicationPreferencesActivity_unregistering">未注册...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">基于数据通信的注册未能完成</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>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">图片</string>
   <string name="AttachmentTypeSelectorAdapter_video">视频</string>
@@ -20,22 +34,28 @@
   <string name="ConversationItem_saving_attachment">正在保存附件</string>
   <string name="ConversationItem_saving_attachment_to_sd_card">正在将附件保存到 SD 卡...</string>
   <string name="ConversationItem_save_to_sd_card">保存到 SD 卡？</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_warning">该媒体已存储在加密数据库中。 您保存到 SD 卡的版本将不再加密，是否继续？</string>
   <string name="ConversationItem_error_while_saving_attachment_to_sd_card">将附件保存到 SD 卡时出现错误！</string>
   <string name="ConversationItem_success_exclamation">成功！</string>
   <string name="ConversationItem_unable_to_write_to_sd_card_exclamation">无法写入 SD 卡！</string>
   <string name="ConversationItem_view_secure_media_question">查看安全媒体？</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">该媒体已存储在加密数据库中。 很遗憾，当前要使用外部内容查看器查看需要将数据临时解密并写入磁盘。  是否确定要这么做？</string>
+  <string name="ConversationItem_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_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>
   <!--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_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>
@@ -45,10 +65,19 @@
   <string name="ConversationActivity_forward_message_prefix">转发</string>
   <string name="ConversationActivity_group_conversation_recipients">多人对话接收人</string>
   <string name="ConversationActivity_group_conversation">对人对话</string>
-  <string name="ConversationActivity_d_recipients_in_group">小组中有 %d 个接收人</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_saving_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_sender_s_transport_s_sent_received_s">发件人： %1$s\n传输： %2$s\n已发送/接收：%3$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>
   <!--ConversationListAdapter-->
@@ -56,25 +85,133 @@
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">删除线程？</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">是否确定要删除所有选定对话线程？</string>
+  <string name="ConversationListFragment_deleting">正在删除</string>
+  <string name="ConversationListFragment_deleting_selected_threads">正在删除选中的对话...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">密钥交换消息...</string>
   <!--ExportFragment-->
+  <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">导出明文到SD卡？</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">警告：这将会导出明文的TextSecure信息到您的SD卡上。</string>
+  <string name="ExportFragment_cancel">取消</string>
+  <string name="ExportFragment_exporting">正在导出</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">正在导出明文到SD卡…</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">错误：无法写入SD卡！</string>
+  <string name="ExportFragment_error_while_writing_to_sd_card">在写入SD卡时发生一个错误。</string>
   <string name="ExportFragment_success">成功！</string>
+  <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">您所选择的联系人并不支持TextSecure群组，该群组将转化为彩信群组。</string>
+  <string name="GroupCreateActivity_you_dont_support_push">您并没有注册成为使用数据频道，TextSecure群组功能将被禁用。</string>
+  <string name="GroupCreateActivity_you_dont_own_this_group">您并不是该群组的拥有者，因此无法编辑标题或图片。</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>
   <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">导入系统的短信数据库吗？</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">系统默认的短信数据库将会被导入TextSecure，如果您已经进行过导入的操作，本次操作可能会导致出现重复的短信。</string>
   <string name="ImportFragment_import">导入</string>
+  <string name="ImportFragment_cancel">取消</string>
+  <string name="ImportFragment_restore_encrypted_backup">要恢复加密的备份吗？</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">恢复加密的备份将会完全替代当前的密钥，选项以及短信。您会丢失当前存储于TextSecure的一切，但是已经备份的内容不会被替换。</string>
+  <string name="ImportFragment_restore">还原</string>
+  <string name="ImportFragment_import_plaintext_backup">导入明文备份？</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">这将会导入\n来自明文备份的信息。如果您事先已经导入过该备份，\n再次导入将会出现重复信息。</string>
+  <string name="ImportFragment_importing">导入中</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">导入明文备份…</string>
+  <string name="ImportFragment_no_plaintext_backup_found">没有发现明文备份！</string>
+  <string name="ImportFragment_error_importing_backup">导入备份的过程中发生一个错误！</string>
+  <string name="ImportFragment_import_complete">导入完成！</string>
+  <string name="ImportFragment_restoring">正在还原</string>
+  <string name="ImportFragment_restoring_encrypted_backup">正在还原加密的备份…</string>
+  <string name="ImportFragment_no_encrypted_backup_found">没有找到加密的备份！</string>
+  <string name="ImportFragment_restore_complete">还原完成！</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">未找到已扫描密钥！</string>
   <!--MmsDownloader-->
+  <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">没有可用的网络连接用于彩信下载，请稍后重试…</string>
+  <string name="MmsDownloader_error_storing_mms">存储彩信时发生一个错误！</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">在连接彩信服务器时遇到一个错误…</string>
+  <string name="MmsDownloader_error_reading_mms_settings">在阅读彩信服务器设置信息时遇到一个错误…</string>
   <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">多媒体信息</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">密码不匹配！</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">旧密码不正确！</string>
   <!--PassphraseCreateActivity-->
+  <string name="PassphraseCreateActivity_passphrases_dont_match">密码不匹配！</string>
+  <string name="PassphraseCreateActivity_you_must_specify_a_password">您必须设定一个密码</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">无效密码！</string>
   <!--PromptMmsActivity-->
+  <string name="PromptMmsActivity_you_must_specify_an_mmsc_url_for_your_carrier">您必须指定您的彩信服务器（MMSC）地址！</string>
+  <string name="PromptMmsActivity_mms_settings_updated">彩信设置已更新</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">此人当前签名所使用的密钥与之前所接收到的密钥不一致，这可能是由于某人正试图拦截您的通信，或者只是因为对方重新安装了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-->
+  <string name="RegistrationActivity_connect_with_textsecure">通过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_invalid_number">号码不正确</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">您所指定的\n号码(%s)是不正确的。</string>
+  <string name="RegistrationActivity_unsupported">无法支持</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">抱歉，\n该设备不支持数据信息。设备运行的Android版本低于4.0，则还需要拥有已注册的Google账户。\n如果高于4.0版本，则可以不需要谷歌账户，但是仍然需要安装了Google Play商店。</string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">\n我们将会验证下列号码已经属于该设备：\n\n%s\n\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>
+  <string name="RegistrationProgressActivity_registration_complete">注册完成！</string>
+  <string name="RegistrationProgressActivity_possible_problems">可能的问题。</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">您必须先输入您所接收到的代码才能继续...</string>
+  <string name="RegistrationProgressActivity_connecting">连接中</string>
+  <string name="RegistrationProgressActivity_connecting_for_verification">正在通过连接进行验证…</string>
+  <string name="RegistrationProgressActivity_network_error">网络错误！</string>
+  <string name="RegistrationProgressActivity_unable_to_connect">无法连接，请检查您的网络连接，并且再试一次。</string>
+  <string name="RegistrationProgressActivity_verification_failed">验证失败！</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">您输入的验证代码有误，请重试。</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">尝试次数过多</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">由于您短时间内输入了太多次错误的验证代码，请等待一分钟后重试。</string>
+  <string name="RegistrationProgressActivity_requesting_call">正在请求呼叫</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">正在请求拨入的验证呼叫...</string>
+  <string name="RegistrationProgressActivity_server_error">服务器错误</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">当前服务器遇到一个错误，请稍后重试。</string>
+  <string name="RegistrationProgressActivity_too_many_requests">太多请求！</string>
+  <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">您已经请求了一个语音呼叫，您可能需要等待20分钟后才能再次请求。</string>
+  <string name="RegistrationProgressActivity_verifying_voice_code">正在验证语音代码...</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">注册成功</string>
+  <string name="RegistrationService_textsecure_registration_has_successfully_completed">已经成功完成TextSecure的注册过程。</string>
+  <string name="RegistrationService_registration_error">注册错误</string>
+  <string name="RegistrationService_textsecure_registration_has_encountered_a_problem">TextSecure在注册的过程中遇到一个问题。</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">接收到损坏的密钥\n交换消息！</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">\n接受到的消息来自未知的身份识别密钥，点击将处理并显示。</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">已经收到更新，但是无法确认身份信息。点击并验证身份。</string>
+  <string name="SmsMessageRecord_secure_session_ended">安全会话已结束。</string>
+  <!--ThreadRecord-->
+  <string name="ThreadRecord_left_the_group">离开此群组...</string>
+  <string name="TheadRecord_secure_session_ended">安全会话已结束。</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">您没有身份密钥。</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">收件人没有身份密钥。</string>
@@ -101,6 +238,7 @@
   <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>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">启动 Despite Existing Request？</string>
   <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">您已经发送会话启动请求到此收件人，是否确定要再次发送？  这将使第一个请求无效。</string>
@@ -114,20 +252,43 @@
   <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>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">已为不存在的会话加密彩信消息...</string>
   <!--MmsSender-->
+  <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">TextSecure 密码已缓存</string>
-  <string name="KeyCachingService_passphrase_cached">密码已缓存</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">轻触即可开启。</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">轻触即可开启，轻触锁即可关闭。</string>
+  <string name="KeyCachingService_passphrase_cached">TextSecure已经解锁</string>
+  <string name="KeyCachingService_lock">使用密码锁定</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) 新邮件</string>
   <string name="MessageNotifier_most_recent_from_s">最新邮件来自： %s</string>
+  <string name="MessageNotifier_encrypted_message">加密信息...</string>
+  <string name="MessageNotifier_no_subject">（没有内容）</string>
+  <string name="MessageNotifier_message_delivery_failed">信息发送失败.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">信息无法传递.</string>
+  <string name="MessageNotifier_error_delivering_message">发送信息错误.</string>
+  <string name="MessageNotifier_mark_all_as_read">全部标记为已读</string>
+  <string name="MessageNotifier_mark_as_read">标记为已读</string>
   <!--ViewLocalIdentityActivity-->
+  <string name="ViewLocalIdentityActivity_regenerating">正在重新生成…</string>
+  <string name="ViewLocalIdentityActivity_regenerating_identity_key">重新生成身份\n密钥…</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您确定要继续？</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">抱歉，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>
@@ -138,12 +299,15 @@
   <!--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>
   <!--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">输入消息</string>
+  <string name="conversation_activity__type_message"><small>发送一条信息</small></string>
   <string name="conversation_activity__send">发送</string>
   <string name="conversation_activity__remove">删除</string>
   <!--conversation_item_sent-->
@@ -154,18 +318,87 @@
   <string name="conversation_item_received__downloading">正在下载</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">批量选择模式</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">正在读取国家列表...</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">请选择用于本地加密数据的密码。  这应是强密码。</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>
+  <string name="create_passphrase_activity__generating_secrets">正在生成密钥</string>
   <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">您希望将目前已经存在的短信导入至TextSecure的加密数据库吗？</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">默认的系统数据库将不会被改变。</string>
+  <string name="database_migration_activity__skip">略过</string>
   <string name="database_migration_activity__import">导入</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">请稍候，这需要一些时间，当导入结束后我们将通知您。</string>
+  <string name="database_migration_activity__importing">正在导入</string>
   <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">正在更新数据库…</string>
+  <string name="export_fragment__export_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_a_plaintext_backup_compatible_with">成功导出明文备份和\'SMSBackup And Restore\'到SD卡。</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">恢复之前导出的TextSecure加密备份。</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="local_identity__regenerate_key">重新生成密钥</string>
+  <!--mms_preferences_activity-->
+  <string name="mms_preferences_activity__manual_mms_settings_are_required">您必须手动配置彩信设置。</string>
   <!--prompt_passphrase_activity-->
-  <!--prompt_apn_activity-->
+  <string name="prompt_passphrase_activity__textsecure_passphrase">TEXTSECURE密码</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">TextSecure需要通过运营商获取您的彩信设置才能接受彩信或组播信息，但是您的设备没有这些信息，可能是由于设备被锁定或者访问受到限制。</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">发送多媒体和组播信息，点击“好”来完成所需的设置。您可以通过搜索“您的运营商 APN”（如百度／谷歌：中国移动 APN）来获取这些信息。通常，您只需要设置一次。</string>
+  <string name="prompt_mms_activity__mmsc_url_required">MMSC URL (必须):</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">\n当您进行即时消息通信时，TextSecure能私密的将您的短信以免短信费的情况下\n发送给其他TextSecure用户。要启用此功能，请确认您的国家代码和电话号码。</string>
+  <string name="registration_activity__your_country">您的国家</string>
+  <string name="registration_activity__your_country_code_and_phone_number">您的国家代码和\n电话号码</string>
+  <string name="registration_activity__phone_number">电话号码</string>
+  <string name="registration_activity__register">注册人</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">注册过程将会发送一些临时性的联系信息到服务器。</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">可能有一些问题\n包括：</string>
+  <string name="registration_problems__sms_interceptors">短信拦截。</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">\n一些第三方的短信客户端，比如Handcent或GoSMS，\n这些客户端可能会拦截所有进入的短信。\n请检查这些软件中是否有“Your TextSecure verification code:”或“您的TextSecure验证码：”类似的短信。\n对于这种情况，请配置您的短信客户端以便让验证码通过。</string>
+  <string name="registration_problems__incorrect_number">不正确的号码。</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">\n请检查并确定您输入的号码是正确的，并且它的格式符合\n您所在的地区。</string>
+  <string name="registration_problems__google_voice">Google 语音。</string>
+  <string name="registration_problems__textsecure_will_not_work_with_google_voice_numbers">\nTextSecure无法在Google语音号码上工作。</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">\nVerification也可以通过拨打您的电话号码来进行验证。点击“呼叫我”并在下方输入您所听到的\n四位数字代码。</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">\nTextSecure目前无法连接推送服务。</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__your_device_needs_network_connectivity">\n您的设备需要可用的网络连接来使用TextSecure，请确保\n您已经连上了3G或Wifi网络。</string>
+  <string name="registration_progress_activity__restrictive_firewall">受限防火墙。</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">\n如果您正通过Wifi访问互联网，有可能您访问TextSecure服务器的过程被防火墙屏蔽了。\n请尝试连接其他的Wifi网络或者使用移动数据网络。</string>
+  <string name="registration_progress_activity__textsecure_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">\nTextSecure将会通过短信自动验证您的手机号码。</string>
+  <string name="registration_progress_activity__connecting">连接中……</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">等待短信\n验证…</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">\nTextSecure 在等待短信验证时超时。</string>
+  <string name="registration_progress_activity__sms_verification_failed">短信验证\n失败。</string>
+  <string name="registration_progress_activity__generating_keys">正在生成密钥…</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to">收件人</string>
+  <string name="recipients_panel__add_member">添加成员</string>
   <!--review_identities-->
   <string name="review_identities__you_don_t_currently_have_any_identity_keys_in_your_trust_database">您的信任数据库当前没有任何身份密钥。</string>
   <!--verify_identity_activity-->
@@ -183,6 +416,7 @@
   <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">检测到 TextSecure</string>
   <string name="AndroidManifest__public_identity_key">身份公钥</string>
   <string name="AndroidManifest__change_passphrase">更改密码</string>
@@ -191,34 +425,45 @@
   <string name="AndroidManifest__manage_identity_keys">管理身份密钥</string>
   <string name="AndroidManifest__complete_key_exchange">完成密钥交换</string>
   <!--arrays.xml-->
+  <string name="arrays__import_export">导入/导出</string>
+  <string name="arrays__my_identity_key">我的身份密钥</string>
+  <string name="arrays__contact_keys">联系人密钥</string>
   <!--preferences.xml-->
+  <string name="preferences__general">通用</string>
   <string name="preferences__pref_all_sms_title">用于所有短信</string>
   <string name="preferences__pref_all_mms_title">用于所有彩信</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">使用 TextSecure 查看和存储所有入站文本消息</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">使用 TextSecure 查看和存储所有入站多媒体消息</string>
+  <string name="preferences__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">按下 enter 键将发送文本消息</string>
   <string name="preferences__display_settings">显示设置</string>
   <string name="preferences__choose_identity">选择身份</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">从联系人列表选择您的联系人条目。</string>
+  <string name="preferences__change_passphrase"> 修改密码</string>
   <string name="preferences__change_my_passphrase">更改我的密码</string>
+  <string name="preferences__complete_key_exchanges">完成密钥交换</string>
+  <string name="preferences__disable_passphrase">禁用密码</string>
+  <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">使用同一身份密钥自动完成新会话或现有会话的密钥交换</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>
   <string name="preferences__view_my_identity_key">查看我的身份密钥</string>
+  <string name="preferences__manage_identity_keys">管理身份密钥</string>
   <string name="preferences__manage_configured_identity_keys">管理配置的身份密钥</string>
   <string name="preferences__notifications">通知</string>
   <string name="preferences__display_message_notifications_in_status_bar">在状态栏显示邮件通知</string>
-  <string name="preferences__led_color">LED 颜色</string>
-  <string name="preferences__change_notification_led_color">更改通知 LED 颜色</string>
-  <string name="preferences__pref_led_blink_title">LED 闪烁模式</string>
-  <string name="preferences__change_notification_blink_pattern">更改通知 LED 闪烁模式</string>
-  <string name="preferences__pref_led_blink_dialogtitle">选择 LED 闪烁模式</string>
-  <string name="preferences__select_led_color">选择 LED 颜色</string>
-  <string name="preferences__sound">选择铃声</string>
+  <string name="preferences__led_color">LED指示灯颜色</string>
+  <string name="preferences__pref_led_blink_title">LED指示灯闪烁规律</string>
+  <string name="preferences__sound">声音</string>
+  <string name="preferences__change_notification_sound">改变提示音</string>
+  <string name="preferences__inthread_notifications">在线程通知</string>
+  <string name="preferences__play_inthread_notifications">正在查看的会话接到新信息时，播放通知提醒声音。</string>
   <string name="preferences__vibrate">振动</string>
   <string name="preferences__also_vibrate_when_notified">通知时同时振动</string>
   <string name="preferences__minutes">分钟</string>
@@ -233,6 +478,35 @@
   <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>
+  <string name="preferences__sms_delivery_reports">阅读回执</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">需要发送回执</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">对话超过制定数量自动删除旧的信息</string>
+  <string name="preferences__delete_old_messages">删除旧的信息</string>
+  <string name="preferences__storage">存储</string>
+  <string name="preferences__conversation_length_limit">对话数量限制</string>
+  <string name="preferences__trim_all_threads_now">处理所有的对话</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">查找并处理所有超过限制的对话</string>
+  <string name="preferences__light_theme">亮色主题</string>
+  <string name="preferences__dark_theme">暗色主题</string>
+  <string name="preferences__appearance">外观</string>
+  <string name="preferences__theme">主题</string>
+  <string name="preferences__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">将TextSecure设置为默认的短信／彩信应用程序。</string>
+  <string name="preferences__use_data_channel">推送信息</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">\n与其他TextSecure用户通信所使用的私密保护和免短信费基于数据通道</string>
+  <string name="preferences__allow_sms_fallback">允许失败时以短信方式发送</string>
+  <string name="preferences__send_and_receive_sms_messages_when_push_is_not_available">当推送不可用时，以短信方式发送和接收信息。</string>
+  <string name="preferences__refresh_push_directory">刷新推送目录</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -250,6 +524,7 @@
   <string name="conversation_context__menu_copy_text">复制文本</string>
   <string name="conversation_context__menu_delete_message">删除邮件</string>
   <string name="conversation_context__menu_forward_message">转发邮件</string>
+  <string name="conversation_context__menu_resend_message">重新发送信息</string>
   <!--conversation_insecure-->
   <string name="conversation_insecure__menu_start_secure_session">启动安全会话</string>
   <!--conversation_list_batch-->
@@ -257,16 +532,24 @@
   <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_verify_session">验证会话</string>
+  <string name="conversation_secure_verified__menu_no_identity">没有可用身份</string>
   <string name="conversation_secure_verified__menu_verify_recipient">验证收件人</string>
-  <string name="conversation_secure_verified__menu_abort_secure_session">中止安全会话</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-->
   <string name="convesation_group_options__recipients_list">接收人列表</string>
+  <string name="conversation_group_options__delivery">投递</string>
+  <string name="conversation_group_options__conversation">对话</string>
+  <string name="conversation_group_options__broadcast">广播</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">比较</string>
   <string name="key_scanning__menu_get_scanned_to_compare">进行扫描以进行比较</string>
@@ -275,8 +558,10 @@
   <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__menu_clear_passphrase">锁定</string>
+  <string name="text_secure_normal__mark_all_as_read">全部标记为已读</string>
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">已验证</string>
   <!--EOF-->