diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 0c30142dc2..96e8fd3c1f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -134,17 +134,16 @@
   <string name="ConversationListItem_key_exchange_message">رسالة تبادل المفاتيح</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">استخدام التخصيص: %s</string>
-  <string name="CustomDefaultPreference_using_default">مستخدم كافتراضي: %s</string>
+  <string name="CustomDefaultPreference_using_default">الاستخدام الافتراضي: %s</string>
   <string name="CustomDefaultPreference_none">لا شيء </string>
   <!--DateUtils-->
   <string name="DateUtils_now">الآن</string>
   <string name="DateUtils_minutes_ago">%d دقيقة</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">فصل \'%s\'؟</string>
-  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">الجهاز لن يتمكن من إرسال أو استقبال رسائل بعد فصله.</string>
+  <string name="DeviceListActivity_disconnect_s">قطع اتصال \'%s\'؟</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">الجهاز لن يتمكن من إرسال أو استقبال رسائل بعد قطع الاتصال.</string>
   <string name="DeviceListActivity_network_connection_failed">فشل في اتصال الشبكة...</string>
   <string name="DeviceListActivity_try_again">حاول مجددا</string>
-  <string name="DeviceListActivity_disconnecting_device">جارٍ فصل الجهاز..</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">جارٍ فصل الجهاز</string>
   <string name="DeviceListActivity_network_failed">فشل في الشبكة!</string>
   <!--DeviceListItem-->
@@ -159,7 +158,7 @@
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">تحذير: سوف يتم تصدير محتوى رسائل تيكست سيكيور في هيئة نص مجرد إلى بطاقة الذاكرة.</string>
   <string name="ExportFragment_cancel">إلغاء</string>
   <string name="ExportFragment_exporting">التصدير جارٍ...</string>
-  <string name="ExportFragment_exporting_plaintext_to_sd_card">تصدير غير مشفر إلى بطاقة الذاكرة...</string>
+  <string name="ExportFragment_exporting_plaintext_to_sd_card">جارٍ تصدير غير مشفر إلى بطاقة الذاكرة...</string>
   <string name="ExportFragment_error_unable_to_write_to_sd_card">خطأ. تعذر الكتابة على بطاقة الذاكرة!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">خطأ أثناء الكتابة على بطاقة الذاكرة.</string>
   <string name="ExportFragment_success">تم بنجاح!</string>
@@ -192,7 +191,7 @@
   <string name="ImportFragment_this_will_import_messages_from_the_system">هذه الخاصية ستستورد الرسائل النصية من النظام إلى تيكست سيكيور. إذا قمت بهذا من قبل، فأن الاستيراد مرة أخرى سيتسبب في تكرار الرسائل.</string>
   <string name="ImportFragment_import">استيراد</string>
   <string name="ImportFragment_cancel">إلغاء</string>
-  <string name="ImportFragment_restore_encrypted_backup">استرداد نسخة احيتاطية مشفرة؟</string>
+  <string name="ImportFragment_restore_encrypted_backup">استعادة نسخة احتياطية مشفرة؟</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
 استرجاع نسخة احتياطية مشفرة سيستبدل بالكامل المفاتيح حالية والإعدادات والرسائل. ستفقد المعلومات الموجودة الآن في تيكست سيكيور وغير موجودة في النسخة الاحتياطية.</string>
   <string name="ImportFragment_restore">استعادة</string>
@@ -223,7 +222,7 @@
   <!--MessageRecord-->
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">لقد استلمت رسالة مشفرة من إصدارة تيكست سيكيور قديمة وتوقف دعمها. من فضلك اطلب من الراسل الترقية إلي أحدث إصدار وإعادة إرسال الرسالة.</string>
   <string name="MessageRecord_left_group">لقد تركت المجموعة.</string>
-  <string name="MessageRecord_updated_group">خطأ..تعذر الكتابة على بطاقة الذاكرة.</string>
+  <string name="MessageRecord_updated_group">تم تحديث المجموعة.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">العبارات السرية غير متطابقة!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">العبارة السرية القديمة غير صحيحة!</string>
@@ -233,7 +232,7 @@
   <string name="DeviceProvisioningActivity_cancel">إلغاء</string>
   <string name="DeviceProvisioningActivity_continue">استمر</string>
   <string name="DeviceProvisioningActivity_title">ربط هذا الجهاز؟</string>
-  <string name="DeviceProvisioningActivity_content_intro">سوف يتمكن من</string>
+  <string name="DeviceProvisioningActivity_content_intro">سوف يتمكن من </string>
   <string name="DeviceProvisioningActivity_content_bullets">
 قراءة كل رسائلك.
 \n- استخدام أسمك للإرسال</string>
@@ -294,9 +293,9 @@
   <string name="RegistrationProgressActivity_verification_failed">فشل التحقق!</string>
   <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">كود التحقق الذي أدخلته غير صحيح. حاول مرة أخرى.</string>
   <string name="RegistrationProgressActivity_too_many_attempts">محاولات كثيرة</string>
-  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">لقد أدخلت كود التحقق مرات كثيرة. برجاء الانتظار دقيقة قبل المحاولة مرة أخرى.</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">لقد أدخلت كود تحقق غير صحيح عدة مرات. رجاء الانتظار دقيقة قبل المحاولة مرة أخرى.</string>
   <string name="RegistrationProgressActivity_requesting_call">طلب مكالمة</string>
-  <string name="RegistrationProgressActivity_requesting_incoming_call">طلب ورود مكالمة تحقق...</string>
+  <string name="RegistrationProgressActivity_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>
@@ -311,7 +310,7 @@
   <!--SmsMessageRecord-->
   <string name="SmsMessageRecord_received_corrupted_key_exchange_message">تم استلام رسالة تبادل مفاتيح تالفة.</string>
   <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
-تم استلام رسالة تبادل مفاتيح لإصدارة بروتوكول غير صحيحة.</string>
+تم استلام رسالة تبادل مفاتيح مع إصدارة بروتوكول غير صحيحة.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 تم استلام رسالة مع مفتاح هوية مجهول. أنقر للمتابعة والإظهار</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">تم استلام تحديث ولكن معلومات الهوية مجهولة. أنقر للتحقق من الهوية.</string>
@@ -350,9 +349,9 @@
   <string name="MessageDisplayHelper_decrypting_please_wait">انتظر، جارٍ فك التشفير..</string>
   <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">الرسالة مشفرة دون وجود قناة اتصال...</string>
   <!--EncryptingSmsDatabase-->
-  <string name="EncryptingSmsDatabase_error_decrypting_message">خطأ بفك شفرة الرسالة.</string>
+  <string name="EncryptingSmsDatabase_error_decrypting_message">خطأ بفك تشفير الرسالة.</string>
   <!--ThreadDatabase-->
-  <string name="ThreadDatabase_error_decrypting_message">خطأ بفك شفرة الرسالة.</string>
+  <string name="ThreadDatabase_error_decrypting_message">خطأ بفك تشفير الرسالة.</string>
   <!--MmsDatabase-->
   <string name="MmsDatabase_connecting_to_mms_server"> الاتصال مع مزود خدمة رسالة الوسائط المتعددة...</string>
   <string name="MmsDatabase_downloading_mms">تنزيل رسالة الوسائط المتعددة...</string>
@@ -370,7 +369,7 @@
   <string name="ApplicationMigrationService_import_in_progress">جاري الاستيراد...</string>
   <string name="ApplicationMigrationService_importing_text_messages">استيراد رسائل نصية</string>
   <!--KeyCachingService-->
-  <string name="KeyCachingService_textsecure_passphrase_cached">افتح</string>
+  <string name="KeyCachingService_textsecure_passphrase_cached">المس للفتح</string>
   <string name="KeyCachingService_textsecure_passphrase_cached_with_lock">أنقر للفتح أو أنقر رمز القفل للإغلاق</string>
   <string name="KeyCachingService_passphrase_cached">تيكست سيكيور غير مقفل</string>
   <string name="KeyCachingService_lock">أقفل بالعبارة السرية</string>
@@ -384,7 +383,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">فشل توصيل الرسالة.</string>
   <string name="MessageNotifier_error_delivering_message">خطأ بالارسال</string>
   <string name="MessageNotifier_mark_all_as_read">اعتبر جميع الرسائل مقروءة</string>
-  <string name="MessageNotifier_mark_as_read">اعتبرها مقروءة</string>
   <string name="MessageNotifier_media_message">رسالة وسائط متعددة</string>
   <string name="MessageNotifier_reply">رَدّ</string>
   <!--QuickResponseService-->
@@ -410,7 +408,7 @@
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">لا توجد مكالمات حديثة.</string>
   <!--conversation_title_view-->
-  <string name="conversation_title_view__conversation_muted">المحادثة في الوضع الصامت.</string>
+  <string name="conversation_title_view__conversation_muted">إخطارات المحادثة مكتومة</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">أرسل رسالة تيكست سيكيور</string>
   <string name="conversation_activity__type_message_sms_insecure">أرسل رسالة نصية غير آمنة</string>
@@ -746,6 +744,7 @@
   <string name="conversation__menu_delete_thread">حذف المحادثة</string>
   <string name="conversation__menu_view_media">جميع الصور</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">توسيع الإشعار</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">أضف إلى جهات الاتصال</string>
   <!--conversation_group_options-->
@@ -764,14 +763,14 @@
   <string name="text_secure_normal__menu_clear_passphrase">أقفل</string>
   <string name="text_secure_normal__mark_all_as_read">اعتبارها رسائل مقروءة</string>
   <!--reminder_header-->
-  <string name="reminder_header_expired_build">لقد انتهت صلاحية نسختك من تيكست سيكيور!</string>
+  <string name="reminder_header_expired_build">لقد انتهت صلاحية هذه النسخة من تيكست سيكيور!</string>
   <string name="reminder_header_expired_build_details">رجاء التحديث لآخر إصداره من التطبيق. لن ترسل الرسائل بنجاح بعد الآن.</string>
   <string name="reminder_header_sms_default_title">اجعله التطبيق الافتراضي المستخدم للرسائل؟</string>
   <string name="reminder_header_sms_default_text">أضغط لجعل تيكست سيكيورالتطبيق الافتراضي للرسائل.</string>
   <string name="reminder_header_sms_import_title">استيراد رسائل النظام؟</string>
   <string name="reminder_header_sms_import_text">أضغط لنسخ الرسائل النصية القصيرة على الهاتف إلى قاعدة البيانات المشفرة.</string>
   <string name="reminder_header_push_title">تفعيل رسائل تيكست سيكيور؟</string>
-  <string name="reminder_header_push_text">أنقر من أجل تراسل لحظي،  خصوصية أقوي، وبدون رسوم رسائل نصية قصيرة.</string>
+  <string name="reminder_header_push_text">أنقر من أجل تراسل لحظي،  خصوصية أقوي، وبدون رسوم الرسائل النصية.</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">أنت</string>
   <string name="MediaPreviewActivity_cant_display">خطأ في معاينة هذه الصورة</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 7718f3791e..0f7012ecf9 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -344,7 +344,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">Памылка дастаўкі паведамлення.</string>
   <string name="MessageNotifier_error_delivering_message">Памылка дастаўкі паведамлення.</string>
   <string name="MessageNotifier_mark_all_as_read">Пазначыць усе як прачытаныя</string>
-  <string name="MessageNotifier_mark_as_read">Пазначыць як прачытанае</string>
   <string name="MessageNotifier_media_message">Мультымедыя паведамленне</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index c3fa2541d0..6614060768 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -144,7 +144,16 @@
   <string name="DateUtils_now">Сега</string>
   <string name="DateUtils_minutes_ago">%d мин</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s">Прекрати връзка с \'%s\'?</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ако прекратиш връзката с това устройство, няма да можеш да изпращаш и получаваш съобщения от него.</string>
+  <string name="DeviceListActivity_network_connection_failed">Неуспешна връзка с интернет...</string>
+  <string name="DeviceListActivity_try_again">Опитай отново</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Прекратяване на връзката с устройството</string>
+  <string name="DeviceListActivity_network_failed">Грешка в мрежата!</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Некръстено устройство</string>
+  <string name="DeviceListItem_created_s">Създанено %s</string>
+  <string name="DeviceListItem_last_active_s">Последна активност %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Сподели с</string>
   <!--ExportFragment-->
@@ -244,6 +253,7 @@ SMS съобщенията от системната базата данни в
   <string name="DeviceProvisioningActivity_content_progress_no_device">Не е открито устройство.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Проблем с мобилната мрежа.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Невалиден QR код.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">За съжалние имаш твърде много регистрирани устройства, опитай да премахнеш някои от тях...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Въведи паролата</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Икона на TextSecure</string>
@@ -390,9 +400,11 @@ SMS съобщенията от системната базата данни в
   <string name="MessageNotifier_failed_to_deliver_message">Неуспешно изпращането на съобщението.</string>
   <string name="MessageNotifier_error_delivering_message">Грешка при изпращането на съобщението</string>
   <string name="MessageNotifier_mark_all_as_read">Всички са прочетени</string>
-  <string name="MessageNotifier_mark_as_read">Прочетено</string>
   <string name="MessageNotifier_media_message">Медийно съобщение</string>
+  <string name="MessageNotifier_reply">Отговори</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Бърз отговор не е възможен, когато TextSecure е заключен!</string>
+  <string name="QuickResponseService_problem_sending_message">Проблем при изпрашане на съобщение!</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРА ПАРОЛА: </string>
   <string name="change_passphrase_activity__new_passphrase">НОВА ПАРОЛА: </string>
@@ -445,6 +457,7 @@ SMS съобщенията от системната базата данни в
   <string name="country_selection_fragment__loading_countries">Зареждане на държавите...</string>
   <string name="country_selection_fragment__search">Търси</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_paired">Няма свързани устройства...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не успешен опит да се сдобием с доклада от устройството ти. Въпреки това можеш да ползваш ADB, за да се добиеш с доклада.</string>
   <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
@@ -596,6 +609,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="AndroidManifest__media_overview">Всички изображения</string>
   <string name="AndroidManifest__media_overview_named">Всички изображения с %1$s</string>
   <string name="AndroidManifest__message_details">Информаця за съобщението</string>
+  <string name="AndroidManifest_manage_paired_devices">Управление на свързани устройства</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__my_identity_key">Моят ключ за самоличност</string>
@@ -763,6 +777,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="conversation__menu_delete_thread">Изтрий разговора</string>
   <string name="conversation__menu_view_media">Всички изображения</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Разшири диалога</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Добави в контакти</string>
   <!--conversation_group_options-->
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6ea2e13356..32330259de 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -204,7 +204,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">No s\'ha pogut entregar el missatge.</string>
   <string name="MessageNotifier_error_delivering_message">Error entregant el missatge.</string>
   <string name="MessageNotifier_mark_all_as_read">Marca-ho tot com a llegit</string>
-  <string name="MessageNotifier_mark_as_read">Marca com a llegit</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">FRASE CONTRASENYA ANTIGA:</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 67269955e4..2f9070c816 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -151,7 +151,6 @@ kontakt</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Po odpojení toho zařízení již nebude možno přijímat nebo odesílat zprávy.</string>
   <string name="DeviceListActivity_network_connection_failed">Síťové spojení slehalo...</string>
   <string name="DeviceListActivity_try_again">Zkusit znovu</string>
-  <string name="DeviceListActivity_disconnecting_device">Odpojuji zařízení...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odpojuji zařízení</string>
   <string name="DeviceListActivity_network_failed">Síť selhala</string>
   <!--DeviceListItem-->
@@ -393,7 +392,6 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="MessageNotifier_failed_to_deliver_message">Selhalo doručení zprávy.</string>
   <string name="MessageNotifier_error_delivering_message">Chyba při doručení zprávy.</string>
   <string name="MessageNotifier_mark_all_as_read">Označit vše jako přečtené</string>
-  <string name="MessageNotifier_mark_as_read">Označit jako přečtené</string>
   <string name="MessageNotifier_media_message">Multimediální zpráva</string>
   <string name="MessageNotifier_reply">Odpověď</string>
   <!--QuickResponseService-->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index ae94731220..c68bf15051 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -299,7 +299,6 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="MessageNotifier_failed_to_deliver_message">Kunne ikke sende besked.</string>
   <string name="MessageNotifier_error_delivering_message">Fejl ved levering af besked.</string>
   <string name="MessageNotifier_mark_all_as_read">Marker alle som læst</string>
-  <string name="MessageNotifier_mark_as_read">Marker som læst</string>
   <string name="MessageNotifier_media_message">Multimedie besked</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9dadd83112..9808fa0f03 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -147,9 +147,8 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Durch Trennung dieses Geräts wird es keine weiteren Nachrichten senden oder empfangen können.</string>
   <string name="DeviceListActivity_network_connection_failed">Netzwerkverbindung fehlgeschlagen …</string>
   <string name="DeviceListActivity_try_again">Erneut versuchen</string>
-  <string name="DeviceListActivity_disconnecting_device">Trennen</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Gerät wird getrennt …</string>
-  <string name="DeviceListActivity_network_failed">Netzwerk fehlgeschlagen!</string>
+  <string name="DeviceListActivity_network_failed">Netzwerkfehler!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Unbenanntes Gerät</string>
   <string name="DeviceListItem_created_s">Erstellt %s</string>
@@ -250,7 +249,7 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="DeviceProvisioningActivity_content_progress_no_device">Kein Gerät gefunden.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Netzwerkfehler.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ungültiger QR-Code.</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Es sind bereits zu viele Geräte registriert. Versuchen Sie, einige zu entfernen …</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Es sind bereits zu viele Geräte registriert. Versuchen Sie, mindestens eines zu entfernen …</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Passwort eingeben</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-Symbol</string>
@@ -390,7 +389,6 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_error_delivering_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_mark_all_as_read">Alle als gelesen markieren</string>
-  <string name="MessageNotifier_mark_as_read">Als gelesen markieren</string>
   <string name="MessageNotifier_media_message">Mediennachricht</string>
   <string name="MessageNotifier_reply">Antworten</string>
   <!--QuickResponseService-->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 232d50aafe..8d723f1384 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -386,7 +386,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="MessageNotifier_failed_to_deliver_message">Αποτυχία παράδοσης του μήνυματος.</string>
   <string name="MessageNotifier_error_delivering_message">Σφάλμα κατά την παράδοση του μηνύματος.</string>
   <string name="MessageNotifier_mark_all_as_read">Επισήμανση όλων ως αναγνωσμένα</string>
-  <string name="MessageNotifier_mark_as_read">Επισήμανση ως αναγνωσμένο</string>
   <string name="MessageNotifier_media_message">Μήνυμα πολυμέσων</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 70299d1390..67202c50ab 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -156,7 +156,6 @@ Recibido:%4$s</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Al desconectar este dispositivo, ya no podrá enviar y recibir mensajes.</string>
   <string name="DeviceListActivity_network_connection_failed">Fallo de conexión a la red...</string>
   <string name="DeviceListActivity_try_again">Intentar de nuevo</string>
-  <string name="DeviceListActivity_disconnecting_device">Desconectando dispositivo...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Desconectando dispositivo</string>
   <string name="DeviceListActivity_network_failed">¡Fallo de red!</string>
   <!--DeviceListItem-->
@@ -424,7 +423,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="MessageNotifier_failed_to_deliver_message">Fallo al entregar mensaje.</string>
   <string name="MessageNotifier_error_delivering_message">Error entregando mensaje.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todos como leídos</string>
-  <string name="MessageNotifier_mark_as_read">Marcar como leídos</string>
   <string name="MessageNotifier_media_message">Mensaje multimedia</string>
   <string name="MessageNotifier_reply">Responder</string>
   <!--QuickResponseService-->
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index d0984f403d..cce729d554 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -326,7 +326,6 @@ Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakust
   <string name="MessageNotifier_failed_to_deliver_message">Mezuaren banaketak huts egin du.</string>
   <string name="MessageNotifier_error_delivering_message">Errorea mezua banatzen.</string>
   <string name="MessageNotifier_mark_all_as_read">Denak irrakurritako gisa markatu</string>
-  <string name="MessageNotifier_mark_as_read">Irakurritako gisa markatu</string>
   <string name="MessageNotifier_media_message">Media mezua</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 217c07f337..19a63c0819 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -315,7 +315,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">ناموفق برای تحویل پیام.</string>
   <string name="MessageNotifier_error_delivering_message">خطا در تحویل پیام.</string>
   <string name="MessageNotifier_mark_all_as_read">علامت همه به عنوان خوانده شده</string>
-  <string name="MessageNotifier_mark_as_read">علامت گذاری به عنوان خوانده شده</string>
   <string name="MessageNotifier_media_message">پیام رسانه</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 8084d735ef..7eaa5aa5f8 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -407,7 +407,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="MessageNotifier_failed_to_deliver_message">Viestin toimitus epäonnistui.</string>
   <string name="MessageNotifier_error_delivering_message">Virhe viestiä toimitettaessa.</string>
   <string name="MessageNotifier_mark_all_as_read">Merkitse kaikki luetuiksi</string>
-  <string name="MessageNotifier_mark_as_read">Merkitse luetuksi</string>
+  <string name="MessageNotifier_mark_read">Merkitse luetuksi</string>
   <string name="MessageNotifier_media_message">Mediaviesti</string>
   <string name="MessageNotifier_reply">Vastaa</string>
   <!--QuickResponseService-->
@@ -521,6 +521,8 @@ Tuo salaamaton varmuuskopiotiedosto. Yhteensopiva \"SMS Backup And Restore\" -so
   <string name="recipient_preferences__ringtone">Ilmoitusääni</string>
   <string name="recipient_preferences__vibrate">Värinä</string>
   <string name="recipient_preferences__block">Estä</string>
+  <string name="recipient_preferences__color">Väri</string>
+  <string name="recipient_preferences__color_for_this_contact">Tämän yhteystiedon väri</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Jotta voit ottaa TextSecuren käyttöön, tulee sinun ensin vahvistaa puhelinnumerosi.</string>
@@ -530,6 +532,7 @@ PUHELINNUMEROSI</string>
   <string name="registration_activity__phone_number">PUHELINNUMERO</string>
   <string name="registration_activity__register">Rekisteröidy</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Rekisteröityminen siirtää joitakin yhteystietoja väliaikaisesti palvelimelle. Niitä ei kuitenkaan tallenneta sinne.</string>
+  <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Mahdollisiin ongelmiin
 sisältyvät:</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8d92783e7f..1c3c459b6e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -148,7 +148,16 @@ vérifier ce contact.</string>
   <string name="DateUtils_now">À l\'instant</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s">Déconnecter \'%s\'?</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Si vous déconnectez cet appareil, il ne sera plus capable d\'envoyer ou recevoir des messages.</string>
+  <string name="DeviceListActivity_network_connection_failed">Erreur de connection réseau...</string>
+  <string name="DeviceListActivity_try_again">Essayer à nouveau</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Déconnexion de l\'appareil</string>
+  <string name="DeviceListActivity_network_failed">Erreur réseau!</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Appareil sans nom</string>
+  <string name="DeviceListItem_created_s">%s créé</string>
+  <string name="DeviceListItem_last_active_s">Vu pour la dernière fois %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partager avec</string>
   <!--ExportFragment-->
@@ -249,6 +258,7 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
   <string name="DeviceProvisioningActivity_content_progress_no_device">Pas d\'appareil trouvé.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Erreur réseau.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR code invalide.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Désolé, vous avez trop d\'appareils déjà enregistrés, essayez d\'en enlever quelques-uns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Entrez la phrase de passe</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icône TextSecure</string>
@@ -396,9 +406,11 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="MessageNotifier_failed_to_deliver_message">Échec de distribution du message.</string>
   <string name="MessageNotifier_error_delivering_message">Erreur lors de la distribution du message.</string>
   <string name="MessageNotifier_mark_all_as_read">Tout marquer comme lu</string>
-  <string name="MessageNotifier_mark_as_read">Marquer comme lu</string>
   <string name="MessageNotifier_media_message">Message média</string>
+  <string name="MessageNotifier_reply">Répondre</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Les réponses rapides ne sont pas disponibles quand TextSecure est bloqué!</string>
+  <string name="QuickResponseService_problem_sending_message">Erreur lors de l\'envoi du message!</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Ancienne phrase de passe :</string>
   <string name="change_passphrase_activity__new_passphrase">Nouvelle phrase de passe :</string>
@@ -451,6 +463,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="country_selection_fragment__loading_countries">Chargement des pays...</string>
   <string name="country_selection_fragment__search">Chercher</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_paired">Aucun appareil appairé...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">TextSecure n\'a pas pu obtenir les logs de votre téléphone. Vous pouvez utiliser ADB pour récupérer les logs de debug.</string>
   <string name="log_submit_activity__thanks">Merci pour votre aide !</string>
@@ -594,6 +607,7 @@ par SMS.</string>
   <string name="AndroidManifest__media_overview">Toutes les images</string>
   <string name="AndroidManifest__media_overview_named">Toutes les images avec %1$s</string>
   <string name="AndroidManifest__message_details">Détails du message</string>
+  <string name="AndroidManifest_manage_paired_devices">Gérer les appareils appairés</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
@@ -762,6 +776,7 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
   <string name="conversation__menu_delete_thread">Supprimer le fil de discussion</string>
   <string name="conversation__menu_view_media">Toutes les images</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Étendre la popup</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Ajouter aux contacts</string>
   <!--conversation_group_options-->
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e84d7c7511..8ee7551748 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -149,7 +149,6 @@ ovaj kontakt.</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Odspajanjem ovog uređaja više nećete moći slati ili primati poruke.</string>
   <string name="DeviceListActivity_network_connection_failed">Povezivanje na mrežu nije uspjelo...</string>
   <string name="DeviceListActivity_try_again">Pokušajte ponovno</string>
-  <string name="DeviceListActivity_disconnecting_device">Odspajanje uređaja...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odspajanje uređaja</string>
   <string name="DeviceListActivity_network_failed">Greška mreže!</string>
   <!--DeviceListItem-->
@@ -401,7 +400,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="MessageNotifier_failed_to_deliver_message">Isporuka poruke nije uspjela.</string>
   <string name="MessageNotifier_error_delivering_message">Greška prilikom isporuke poruke.</string>
   <string name="MessageNotifier_mark_all_as_read">Označi sve kao pročitano</string>
-  <string name="MessageNotifier_mark_as_read">Označi kao pročitano</string>
   <string name="MessageNotifier_media_message">Multimedijalna poruka</string>
   <string name="MessageNotifier_reply">Odgovori</string>
   <!--QuickResponseService-->
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 154f9f06ef..53717b8f7b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -151,7 +151,16 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="DateUtils_now">Most</string>
   <string name="DateUtils_minutes_ago">%d perc</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s">Lecsatlakoztatod \'%s\'-t?</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ennek az eszköznek a lecsatlakoztatásával többé nem lesz alkalmas üzenetek küldésére vagy fogadására.</string>
+  <string name="DeviceListActivity_network_connection_failed">Hálózati csatlakozás sikertelen...</string>
+  <string name="DeviceListActivity_try_again">Újrapróbálkozás</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Eszköz lecsatlakoztatása</string>
+  <string name="DeviceListActivity_network_failed">Hálózati hiba!</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Megnevezetlen eszköz</string>
+  <string name="DeviceListItem_created_s">Készítve %s</string>
+  <string name="DeviceListItem_last_active_s">Utoljára aktív %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Megosztás...</string>
   <!--ExportFragment-->
@@ -254,6 +263,7 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nem található eszköz</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Hálózati hiba</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Érvénytelen QR kód</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sajnálom, túl sok eszközöd van jelenleg regisztrálva, próbálj eltávolítani néhányat...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Jelszó megadása</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
@@ -408,9 +418,11 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="MessageNotifier_failed_to_deliver_message">Nem sikerült az üzenet kézbesítése!</string>
   <string name="MessageNotifier_error_delivering_message">Hiba az üzenet kézbesítése közben!</string>
   <string name="MessageNotifier_mark_all_as_read">Az összes olvasottként való megjelölése</string>
-  <string name="MessageNotifier_mark_as_read">Olvasottként való megjelölés</string>
   <string name="MessageNotifier_media_message">Média üzenet</string>
+  <string name="MessageNotifier_reply">Válasz</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Gyors válasz nem elérhető, amikor a TextSecure zárolva van!</string>
+  <string name="QuickResponseService_problem_sending_message">Probléma az üzenetküldésben!</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">RÉGI JELSZÓ:</string>
   <string name="change_passphrase_activity__new_passphrase">ÚJ JELSZÓ:</string>
@@ -463,6 +475,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="country_selection_fragment__loading_countries">Országok betöltése...</string>
   <string name="country_selection_fragment__search">Keresés</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_paired">Nincsenek eszközök párosítva...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nem sikerült a naplóbejegyzések elérése az eszközön. Helyettük az ADB használható a hibakeresési naplóbejegyzésekhez.</string>
   <string name="log_submit_activity__thanks">Köszönjük a segítségedet!</string>
@@ -626,6 +639,7 @@ sikertelen.
   <string name="AndroidManifest__media_overview">Minden fénykép</string>
   <string name="AndroidManifest__media_overview_named">Minden fénykép vele: %1$s</string>
   <string name="AndroidManifest__message_details">Üzenet részletei</string>
+  <string name="AndroidManifest_manage_paired_devices">Párosított eszközök kezelése</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__my_identity_key">Saját azonosító kulcs</string>
@@ -793,6 +807,7 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <string name="conversation__menu_delete_thread">Beszélgetésfolyam törlése</string>
   <string name="conversation__menu_view_media">Minden fénykép</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Felugró kiterjesztése</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Hozzáadás névjegyzékhez</string>
   <!--conversation_group_options-->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2406b3272e..4f4d7fa77a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -146,7 +146,7 @@ questo contatto.</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Disconnettendo questo dispositivo, esso non sarà più in grado di ricevere nè inviare messaggi.</string>
   <string name="DeviceListActivity_network_connection_failed">Connessione di rete fallita....</string>
   <string name="DeviceListActivity_try_again">Riprova</string>
-  <string name="DeviceListActivity_disconnecting_device">Scollegamento dispositivo..</string>
+  <string name="DeviceListActivity_disconnecting_device">Disconnessione dispositivo...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Scollegamento dispositivo</string>
   <string name="DeviceListActivity_network_failed">Errore di rete!</string>
   <!--DeviceListItem-->
@@ -402,7 +402,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="MessageNotifier_failed_to_deliver_message">Non è riuscito l\'invio del messaggio</string>
   <string name="MessageNotifier_error_delivering_message">C\'è stato un errore durante l\'invio del messaggio</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>
+  <string name="MessageNotifier_mark_read">Ho letto</string>
   <string name="MessageNotifier_media_message">Messaggio multimediale</string>
   <string name="MessageNotifier_reply">Rispondi</string>
   <!--QuickResponseService-->
@@ -516,6 +516,8 @@ Importo una copia in chiaro. Compatibile con \"SMSBackup And Restore\"</string>
   <string name="recipient_preferences__ringtone">Suoneria</string>
   <string name="recipient_preferences__vibrate">Vibra</string>
   <string name="recipient_preferences__block">Blocca</string>
+  <string name="recipient_preferences__color">Colore</string>
+  <string name="recipient_preferences__color_for_this_contact">Colore per questo contatto</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifica il tuo numero di telefono per connetterti a TextSecure.
@@ -526,6 +528,7 @@ NUMERO DI TELEFONO</string>
   <string name="registration_activity__phone_number">NUMERO DI TELEFONO</string>
   <string name="registration_activity__register">Registro</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">La registrazione trasmette delle informazioni sui contatti al server. Non vengono conservate.</string>
+  <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Alcuni possibili problemi
 tra cui:
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0c4177180d..5cfa0ad252 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -167,7 +167,6 @@
   <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>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">סיסמה ישנה:</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ada3090c26..640a370947 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -380,7 +380,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">メッセージの配信に失敗しました。</string>
   <string name="MessageNotifier_error_delivering_message">メッセージ配信中にエラーがありました。</string>
   <string name="MessageNotifier_mark_all_as_read">すべて既読にする</string>
-  <string name="MessageNotifier_mark_as_read">既読にする</string>
   <string name="MessageNotifier_media_message">メディアーメッセージ</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 4c2cc9c311..09cdfc005a 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -360,7 +360,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">ಸಂದೇಶ ತಲುಪಿಸಲು ವಿಫಲವಾಗಿದೆ.</string>
   <string name="MessageNotifier_error_delivering_message">ಸಂದೇಶವನ್ನು ತಲುಪಿಸುವುದರಲ್ಲಿದೋಷ ಸಂಭವಿಸಿದೆ</string>
   <string name="MessageNotifier_mark_all_as_read">ಎಲ್ಲವನ್ನು ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
-  <string name="MessageNotifier_mark_as_read">ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
   <string name="MessageNotifier_media_message">ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7bda9ca6c1..11172b5718 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -365,9 +365,11 @@
   <string name="MessageNotifier_failed_to_deliver_message">메시지가 전송되지 않았습니다.</string>
   <string name="MessageNotifier_error_delivering_message">메시지 전송 오류</string>
   <string name="MessageNotifier_mark_all_as_read">모두 읽음으로 표시</string>
-  <string name="MessageNotifier_mark_as_read">읽음으로 표시</string>
   <string name="MessageNotifier_media_message">미디어 메시지</string>
+  <string name="MessageNotifier_reply">답장</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">TextSecure 잠겨 있는 경우 빠른 응답 사용할 수 없음</string>
+  <string name="QuickResponseService_problem_sending_message">메시지 보내지 못함</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">기존 암호:</string>
   <string name="change_passphrase_activity__new_passphrase">새 암호:</string>
@@ -702,6 +704,7 @@
   <string name="conversation__menu_delete_thread">대화 삭제</string>
   <string name="conversation__menu_view_media">전체 이미지</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">팝업 펼치기</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">주소록에 추가</string>
   <!--conversation_group_options-->
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 28d28e676b..1cf188462d 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -395,7 +395,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">Неуспешно доставување на пораката.</string>
   <string name="MessageNotifier_error_delivering_message">Грешка при доставувањето на пораката.</string>
   <string name="MessageNotifier_mark_all_as_read">Обележи ги сите како прочитани</string>
-  <string name="MessageNotifier_mark_as_read">Обележи ги како прочитани</string>
   <string name="MessageNotifier_media_message">Медиа порака</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7967b73906..abcb5867d6 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -145,7 +145,6 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Door dit apparaat te ontkoppelen zal het niet langer berichten kunnen verzenden en ontvangen.</string>
   <string name="DeviceListActivity_network_connection_failed">Netwerkverbinding mislukt..</string>
   <string name="DeviceListActivity_try_again">Probeer opnieuw</string>
-  <string name="DeviceListActivity_disconnecting_device">Apparaat aan het loskoppelen...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Apparaat aan het loskoppelen</string>
   <string name="DeviceListActivity_network_failed">Netwerkfout!</string>
   <!--DeviceListItem-->
@@ -390,7 +389,6 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="MessageNotifier_failed_to_deliver_message">Het bericht afleveren is mislukt.</string>
   <string name="MessageNotifier_error_delivering_message">Fout bij afleveren bericht.</string>
   <string name="MessageNotifier_mark_all_as_read">Alles als gelezen markeren</string>
-  <string name="MessageNotifier_mark_as_read">Markeren als gelezen</string>
   <string name="MessageNotifier_media_message">Mediabericht</string>
   <string name="MessageNotifier_reply">Reageren</string>
   <!--QuickResponseService-->
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 0c8a5722e7..e6414b8dbc 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -146,7 +146,6 @@ denne kontakten.</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ved å frakoble denne enheten vil den ikke lenger være i stand til å sende eller motta meldinger.</string>
   <string name="DeviceListActivity_network_connection_failed">Nettverksforbindelse feilet...</string>
   <string name="DeviceListActivity_try_again">Prøv igjen</string>
-  <string name="DeviceListActivity_disconnecting_device">Frakobler enhet..</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Frakobler enhet</string>
   <string name="DeviceListActivity_network_failed">Nettverk feilet!</string>
   <!--DeviceListItem-->
@@ -390,7 +389,6 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Klarte ikke å levere meldingen.</string>
   <string name="MessageNotifier_error_delivering_message">Feil ved levering av meldingen.</string>
   <string name="MessageNotifier_mark_all_as_read">Marker alle som lest</string>
-  <string name="MessageNotifier_mark_as_read">Marker som lest</string>
   <string name="MessageNotifier_media_message">Multimediamelding</string>
   <string name="MessageNotifier_reply">Svar</string>
   <!--QuickResponseService-->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2016f91f6b..0a7179ef76 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -143,7 +143,16 @@ ten kontakt.
   <string name="DateUtils_now">Teraz</string>
   <string name="DateUtils_minutes_ago">%d minuta</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s">Rozłączyć \'%s\'?</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Poprzez odłączenie tego urządzenia, nie będzie ono otrzymywać wiadomości.</string>
+  <string name="DeviceListActivity_network_connection_failed">Brak połączenia internetowego...</string>
+  <string name="DeviceListActivity_try_again">Spróbuj ponownie</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Rozłączanie urządzenia</string>
+  <string name="DeviceListActivity_network_failed">Błąd sieci!</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Nieznane urządzenie</string>
+  <string name="DeviceListItem_created_s">Utworzono %s</string>
+  <string name="DeviceListItem_last_active_s">Ostatnio aktywny %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podziel się z</string>
   <!--ExportFragment-->
@@ -238,6 +247,7 @@ Przywracanie szyfrowanej kopii zapasowej TextSecure spowoduje nadpisanie Twoich
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nie znaleziono żadnych urządzeń.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Błąd sieci.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Niepoprawny kod QR.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Niestety masz już zbyt wiele zarejestrowanych urządzeń, usuń któryś, aby dodać nowy...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Podaj hasło</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@@ -381,9 +391,11 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="MessageNotifier_failed_to_deliver_message">Dostarczenie wiadomości nie powiodło się.</string>
   <string name="MessageNotifier_error_delivering_message">Błąd przy wysyłaniu wiadomości.</string>
   <string name="MessageNotifier_mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
-  <string name="MessageNotifier_mark_as_read">Oznacz jako przeczytane</string>
   <string name="MessageNotifier_media_message">Wiadomość multimedialna</string>
+  <string name="MessageNotifier_reply">Odpowiedź</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Szybka odpowiedź jest niedostępna kiedy TextSecure jest zablokowany!</string>
+  <string name="QuickResponseService_problem_sending_message">Wystąpił błąd przy wysyłaniu wiadomości!</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">STARE HASŁO:</string>
   <string name="change_passphrase_activity__new_passphrase">NOWE HASŁO:</string>
@@ -436,6 +448,7 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="country_selection_fragment__loading_countries">Wczytywanie krajów...</string>
   <string name="country_selection_fragment__search">Szukaj</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_paired">Brak połączonych urządzeń...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Nie udało się odczytać logów z Twojego urządzenia. W dalszym ciągu możesz użyć ADB, aby pobrać logi debugowania.</string>
   <string name="log_submit_activity__thanks">Dziękujemy za Twoją pomoc!</string>
@@ -567,6 +580,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="AndroidManifest__media_overview">Wszystkie obrazy</string>
   <string name="AndroidManifest__media_overview_named">Wszystkie obrazy z %1$s</string>
   <string name="AndroidManifest__message_details">Szczegóły wiadomości</string>
+  <string name="AndroidManifest_manage_paired_devices">Zarządzaj połączonymi urządzeniami</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / eksport</string>
   <string name="arrays__my_identity_key">Mój klucz tożsamości</string>
@@ -735,6 +749,7 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
   <string name="conversation__menu_delete_thread">Usuń wątek</string>
   <string name="conversation__menu_view_media">Wszystkie obrazy</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Powiększ okno</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Dodaj do kontaktów</string>
   <!--conversation_group_options-->
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 2b5b125bbc..bb47e012b2 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -156,7 +156,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desconectar este dispositivo, ele não poderá mais enviar ou receber mensagens.</string>
   <string name="DeviceListActivity_network_connection_failed">Conexão de rede falhou...</string>
   <string name="DeviceListActivity_try_again">Tentar de novo</string>
-  <string name="DeviceListActivity_disconnecting_device">Desconectando dispositivo...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Desconectando dispositivo</string>
   <string name="DeviceListActivity_network_failed">Rede falhou!</string>
   <!--DeviceListItem-->
@@ -422,7 +421,6 @@ Tem certeza que deseja fazer isto?</string>
   <string name="MessageNotifier_failed_to_deliver_message">Falha ao enviar mensagem.</string>
   <string name="MessageNotifier_error_delivering_message">Erro ao enviar mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
-  <string name="MessageNotifier_mark_as_read">Marcar como lida</string>
   <string name="MessageNotifier_media_message">Mensagem multimídia</string>
   <string name="MessageNotifier_reply">Responder</string>
   <!--QuickResponseService-->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index d137ad7efb..15cf3ef71d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -342,7 +342,6 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="MessageNotifier_failed_to_deliver_message">Falhou a remessa de mensagem.</string>
   <string name="MessageNotifier_error_delivering_message">Erro a remeter a mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
-  <string name="MessageNotifier_mark_as_read">Marcar como lidas</string>
   <string name="MessageNotifier_media_message">Mensagem media</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 2fa7ffa241..d38b4de15c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -343,7 +343,6 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="MessageNotifier_failed_to_deliver_message">Mesajul nu a putut fi trimis.</string>
   <string name="MessageNotifier_error_delivering_message">A aparut o eroare la trimiterea mesajului.</string>
   <string name="MessageNotifier_mark_all_as_read">Marchează tot ca citit</string>
-  <string name="MessageNotifier_mark_as_read">Marchează ca citit</string>
   <string name="MessageNotifier_media_message">Mesaj media</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 7c5e2b856c..f7e6c39930 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -375,7 +375,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">Не удалось доставить сообщение.</string>
   <string name="MessageNotifier_error_delivering_message">Ошибка при доставке сообщения.</string>
   <string name="MessageNotifier_mark_all_as_read">Отметить все как прочитанные</string>
-  <string name="MessageNotifier_mark_as_read">Отметить как прочитанное</string>
   <string name="MessageNotifier_media_message">MMS-сообщение</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index dcd2a2b69c..0fc41ca50a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -382,7 +382,6 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <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>
   <string name="MessageNotifier_media_message">Multimediálna správa</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e0516b96f8..869c3760c1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -146,7 +146,6 @@ preveriti ta stik.</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Z odstranitvijo naprave ta ne bo več mogla pošiljati ali prejemati sporočil.</string>
   <string name="DeviceListActivity_network_connection_failed">Omrežno povezovanje ni bilo uspešno...</string>
   <string name="DeviceListActivity_try_again">Poskusite znova</string>
-  <string name="DeviceListActivity_disconnecting_device">Odstranjujem napravo...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odklapljam napravo...</string>
   <string name="DeviceListActivity_network_failed">Povezovanje ni uspelo!</string>
   <!--DeviceListItem-->
@@ -385,7 +384,6 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="MessageNotifier_failed_to_deliver_message">Neuspešna dostava sporočila.</string>
   <string name="MessageNotifier_error_delivering_message">Napaka pri dostavi sporočila.</string>
   <string name="MessageNotifier_mark_all_as_read">Označi vse kot prebrano</string>
-  <string name="MessageNotifier_mark_as_read">Označi kot prebrano</string>
   <string name="MessageNotifier_media_message">Multiedijsko sporočilo</string>
   <string name="MessageNotifier_reply">Odgovor</string>
   <!--QuickResponseService-->
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 876d3c34d4..863dbdd956 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -151,7 +151,6 @@
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Овај уређај више неће моћи да шаље или прима поруке ако му прекинете везу:</string>
   <string name="DeviceListActivity_network_connection_failed">Повезивање на мрежу није успело...</string>
   <string name="DeviceListActivity_try_again">Покушај поново</string>
-  <string name="DeviceListActivity_disconnecting_device">Прекидам везу са уређајем..</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Прекидам везу са уређајем</string>
   <string name="DeviceListActivity_network_failed">Неуспех мреже!</string>
   <!--DeviceListItem-->
@@ -405,7 +404,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">Нисам успео да испоручим поруку.</string>
   <string name="MessageNotifier_error_delivering_message">Грешка при испоруци поруке.</string>
   <string name="MessageNotifier_mark_all_as_read">Означи све прочитаним</string>
-  <string name="MessageNotifier_mark_as_read">Означи као прочитано</string>
   <string name="MessageNotifier_media_message">Мултимедијална порука</string>
   <string name="MessageNotifier_reply">Одговори</string>
   <!--QuickResponseService-->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b1c4183a02..a8d8457d25 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -147,7 +147,16 @@ verifiera denna kontakt.</string>
   <string name="DateUtils_now">Nu</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s">Ta bort \'%s\'?</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Genom att ta bort denna enhet kommer den inte längre kunna skicka eller få meddelanden.</string>
+  <string name="DeviceListActivity_network_connection_failed">Nätverksuppkoppling misslyckades...</string>
+  <string name="DeviceListActivity_try_again">Försök igen</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Tar bort enhet</string>
+  <string name="DeviceListActivity_network_failed">Nätverket misslyckades</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Namnlös enhet</string>
+  <string name="DeviceListItem_created_s">Skapade %s</string>
+  <string name="DeviceListItem_last_active_s">Senast aktiv %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Dela med</string>
   <!--ExportFragment-->
@@ -245,6 +254,7 @@ som för närvarande finns i TextSecure.</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ingen enhet hittades.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Nätverksfel.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ogiltig QR-kod.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Tyvärr har du redan för många registrerade enheter, försök ta bort några...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Ange lösenord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-ikon</string>
@@ -355,7 +365,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <!--ThreadDatabase-->
   <string name="ThreadDatabase_error_decrypting_message">Fel vid dekryptering av meddelande.</string>
   <!--MmsDatabase-->
-  <string name="MmsDatabase_connecting_to_mms_server">Ansluter till MMS server...</string>
+  <string name="MmsDatabase_connecting_to_mms_server">Ansluter till MMS-server...</string>
   <string name="MmsDatabase_downloading_mms">Laddar ner MMS...</string>
   <string name="MmsDatabase_mms_download_failed">MMS-nedladdning misslyckades!</string>
   <string name="MmsDatabase_downloading">Laddar ner...</string>
@@ -366,7 +376,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Dåligt krypterat MMS meddelande...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS-meddelande krypterat för icke-existerande session...</string>
   <!--MuteDialog-->
-  <string name="MuteDialog_mute_notifications">Tysta ner notifieringar</string>
+  <string name="MuteDialog_mute_notifications">Tysta ner aviseringar</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Import pågår</string>
   <string name="ApplicationMigrationService_importing_text_messages">Importerar SMS</string>
@@ -385,9 +395,11 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="MessageNotifier_failed_to_deliver_message">Kunde inte leverera meddelande.</string>
   <string name="MessageNotifier_error_delivering_message">Fel vid leverans av meddelande.</string>
   <string name="MessageNotifier_mark_all_as_read">Markera alla som lästa</string>
-  <string name="MessageNotifier_mark_as_read">Markera som läst</string>
   <string name="MessageNotifier_media_message">Mediameddelande</string>
+  <string name="MessageNotifier_reply">Svara</string>
   <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Snabbsvar är ej tillgänglit när TextSecure är låst!</string>
+  <string name="QuickResponseService_problem_sending_message">Problem med att skicka meddelandet!</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">GAMMALT LÖSENORD:</string>
   <string name="change_passphrase_activity__new_passphrase">NYTT LÖSENORD:</string>
@@ -440,6 +452,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="country_selection_fragment__loading_countries">Läser in länder...</string>
   <string name="country_selection_fragment__search">Sök</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_paired">Inga enheter ihopkopplade</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Kunde inte plocka loggarna från din enhet, men du kan använda ADB för att hämta debugloggarna istället.</string>
   <string name="log_submit_activity__thanks">Tack för din hjälp!</string>
@@ -450,7 +463,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Systemets standarddatabas kommer på intet sätt att modifieras eller ändras.</string>
   <string name="database_migration_activity__skip">Hoppa över</string>
   <string name="database_migration_activity__import">Importera</string>
-  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Detta kan ta en stund. Var tålmodig, vi notifierar dig när importen är klar.</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">Detta kan ta en stund. Var tålmodig, vi meddelar dig när importen är klar.</string>
   <string name="database_migration_activity__importing">IMPORTERAR</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Uppgraderar databasen...</string>
@@ -488,7 +501,7 @@ från systemets standardapp för meddelanden.</string>
   <string name="recipient_preference_activity__blocked">BLOCKERAD</string>
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">Tysta konversation</string>
-  <string name="recipient_preferences__disable_notifications_for_this_conversation">Inaktivera notifieringar för denna konversation</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">Inaktivera aviseringar för denna konversation</string>
   <string name="recipient_preferences__ringtone">Rington</string>
   <string name="recipient_preferences__vibrate">Vibrera</string>
   <string name="recipient_preferences__block">Blockera</string>
@@ -572,6 +585,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="AndroidManifest__media_overview">Alla bilder</string>
   <string name="AndroidManifest__media_overview_named">Alla bilder med %1$s</string>
   <string name="AndroidManifest__message_details">Meddelandedetaljer</string>
+  <string name="AndroidManifest_manage_paired_devices">Hantera ihopkopplade enheter</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importera / exportera</string>
   <string name="arrays__my_identity_key">Min identitetsnyckel</string>
@@ -617,8 +631,8 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Välj lösenordstimeout</string>
   <string name="preferences__pref_timeout_interval_title">Timeout intervall</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Väntetiden innan lösenordet glöms från minnet</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__notifications">Aviseringar</string>
+  <string name="preferences__display_message_notifications_in_status_bar">Visa meddelande-aviseringar i statusraden</string>
   <string name="preferences__led_color">Färg på ljusindikator</string>
   <string name="preferences__led_color_unknown">Okänd</string>
   <string name="preferences__pref_led_blink_title">Blinkmönster på ljusindikator</string>
@@ -627,10 +641,10 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Av under:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Specialanpassat LED-blinkningsmönster valt!</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 notifieringsljud när du tittar på en aktiv konversation</string>
-  <string name="preferences__repeat_alerts">Upprepa notifieringar</string>
+  <string name="preferences__change_notification_sound">Ändra aviseringsljud</string>
+  <string name="preferences__inthread_notifications">Inom-tråd aviseringar</string>
+  <string name="preferences__play_inthread_notifications">Spela aviseringsljud när du tittar på en aktiv konversation</string>
+  <string name="preferences__repeat_alerts">Upprepa aviseringar</string>
   <string name="preferences__never">Aldrig</string>
   <string name="preferences__one_time">En gång</string>
   <string name="preferences__two_times">Två gånger</string>
@@ -638,7 +652,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__five_times">Fem gånger</string>
   <string name="preferences__ten_times">Tio gånger</string>
   <string name="preferences__vibrate">Vibrera</string>
-  <string name="preferences__also_vibrate_when_notified">Vibrera också vid notifikation</string>
+  <string name="preferences__also_vibrate_when_notified">Vibrera också vid avisering</string>
   <string name="preferences__minutes">minuter</string>
   <string name="preferences__hours">timmar</string>
   <string name="preferences__green">Grön</string>
@@ -664,8 +678,8 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__mms_proxy_port">MMS Proxyport</string>
   <string name="preferences__mmsc_username">MMSC Användarnamn</string>
   <string name="preferences__mmsc_password">MMSC Lösenord</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__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__conversation_length_limit">Konversationstrådslängd</string>
@@ -702,7 +716,7 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <!--conversation_callable-->
   <string name="conversation_callable__menu_call">Ring</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Meddelande detaljer</string>
+  <string name="conversation_context__menu_message_details">Meddelandedetaljer</string>
   <string name="conversation_context__menu_copy_text">Kopiera text</string>
   <string name="conversation_context__menu_delete_message">Radera meddelande</string>
   <string name="conversation_context__menu_forward_message">Vidarebefordra meddelande</string>
@@ -731,7 +745,7 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <!--conversation_muted-->
   <string name="conversation_muted__unmute">Ljud på</string>
   <!--conversation_unmuted-->
-  <string name="conversation_unmuted__mute_notifications">Tysta ner notifieringar</string>
+  <string name="conversation_unmuted__mute_notifications">Tysta ner aviseringar</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Bifoga fil</string>
   <string name="conversation__menu_update_group">Uppdatera grupp</string>
@@ -739,6 +753,7 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <string name="conversation__menu_delete_thread">Radera tråd</string>
   <string name="conversation__menu_view_media">Alla bilder</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Expandera popup</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Lägg till kontakter</string>
   <!--conversation_group_options-->
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 1da0c0361c..f5cfb6bd0e 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -353,7 +353,6 @@ SMS-களை இறக்குமதி செய்திருந்தா
   <string name="MessageNotifier_failed_to_deliver_message">செய்தி விநியோகிப்பது தோல்வியடைந்தது.</string>
   <string name="MessageNotifier_error_delivering_message">செய்தி விநியோகிப்பதில் பிழை.</string>
   <string name="MessageNotifier_mark_all_as_read">அனைத்தையும் படித்தாக குறியிடு</string>
-  <string name="MessageNotifier_mark_as_read"> படித்தாக குறியிடு</string>
   <string name="MessageNotifier_media_message">மீடியா செய்தி</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 48a204f591..a316213acf 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -373,7 +373,6 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="MessageNotifier_failed_to_deliver_message">Mesaj iletimi başarısız oldu.</string>
   <string name="MessageNotifier_error_delivering_message">Hata mesaj iletimi</string>
   <string name="MessageNotifier_mark_all_as_read">Tümünü okundu işaretle</string>
-  <string name="MessageNotifier_mark_as_read">Okundu işaretle</string>
   <string name="MessageNotifier_media_message">Medya mesajı</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b72bd21123..94eb686521 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -194,7 +194,6 @@
   <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>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРА ФРАЗА-КЛЮЧ:</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 4f76514135..7bcf93034d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -243,7 +243,6 @@ Nhận thông tin về chìa khóa nhận diện không rõ. Bấm để xử l
   <string name="MessageNotifier_failed_to_deliver_message">Thất bại trong việc phân phối tin.</string>
   <string name="MessageNotifier_error_delivering_message">Có lỗi khi phân phối tin.</string>
   <string name="MessageNotifier_mark_all_as_read">Đánh dấu tất cả đã đọc</string>
-  <string name="MessageNotifier_mark_as_read">Đánh dấu đã đọc</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">MẬT KHẨU CŨ:</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8a69ff2eb4..51d67fec12 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -381,7 +381,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">信息发送失败</string>
   <string name="MessageNotifier_error_delivering_message">发送信息错误。</string>
   <string name="MessageNotifier_mark_all_as_read">全部标记为已读</string>
-  <string name="MessageNotifier_mark_as_read">标记为已读</string>
   <string name="MessageNotifier_media_message">媒体信息</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 860b5077aa..059ac0d388 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -295,7 +295,6 @@
   <string name="MessageNotifier_failed_to_deliver_message">無法傳送訊息。</string>
   <string name="MessageNotifier_error_delivering_message">傳送訊息發生失誤。</string>
   <string name="MessageNotifier_mark_all_as_read">全部標示為已讀</string>
-  <string name="MessageNotifier_mark_as_read">標示已讀</string>
   <string name="MessageNotifier_media_message">媒體訊息</string>
   <!--QuickResponseService-->
   <!--change_passphrase_activity-->