Updated language translations

// FREEBIE
2024-12-24 16:57:50 +00:00 · 2015-08-06 12:19:20 -07:00 · 2015-08-06 12:19:20 -07:00 · 9053bccd33
commit 9053bccd33
parent edc47247f9
40 changed files with 352 additions and 90 deletions
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@ -10,8 +10,11 @@
  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">لم تقم بتحديد عبارة سرية بعد!</string>
  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s رسائل في المحادثة</string>
  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">احذف جميع الرسائل القديمة الآن؟</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من حذف جميع الرسائل بالمحادثات وابقاء أحدث %s رسالة فقط؟</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من حذف جميع الرسائل بالمحادثات وإبقاء أحدث %s رسالة فقط؟</string>
  <string name="ApplicationPreferencesActivity_delete">حذف</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">تعطيل العبارة السرية؟</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+إلغاء قفل الشاشة للرسائل؟</string>
  <string name="ApplicationPreferencesActivity_disable">تعطيل</string>
  <string name="ApplicationPreferencesActivity_unregistering">جارٍ إلغاء التسجيل</string>
  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">جارٍ إلغاء التسجيل من رسائل تيكست سيكيور...</string>
@ -37,6 +40,7 @@
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">لم يتم العثور على تطبيق لاختيار ملف.</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">كاميرا</string>
  <string name="AttachmentTypeSelectorAdapter_picture">صورة</string>
  <string name="AttachmentTypeSelectorAdapter_video">فيديو</string>
  <string name="AttachmentTypeSelectorAdapter_audio">صوت</string>
@ -48,6 +52,7 @@
  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">ربما تود التحقق من جهة الاتصال.</string>
  <string name="ConfirmIdentityDialog_accept">موافقة</string>
  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">رسالة %s</string>
  <!--ConversationItem-->
  <string name="ConversationItem_message_size_d_kb">حجم الرسالة: %d كيلوبايت</string>
  <string name="ConversationItem_expires_s">تاريخ الانتهاء: %s</string>
@ -74,6 +79,7 @@
  <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_the_gif_you_selected_was_too_big">حجم الملف كبير للغاية!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">عذرا، حجم الفيديو يتجاوز الحد المسموح (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">عذرا، حجم ملف الصوت يتجاوز الحد المسموح (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">الطرف الآخر ليس رقم هاتف أو عنوان بريد الكتروني صحيح!</string>
@ -137,11 +143,16 @@
  <string name="DateUtils_now">الآن</string>
  <string name="DateUtils_minutes_ago">%d دقيقة</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">إلغاء ربط  \'%s\'؟</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">لن يكون إرسال واستقبال الرسائل ممكنا بمجرد إلغاء ربط الجهاز.</string>
  <string name="DeviceListActivity_network_connection_failed">فشل في اتصال الشبكة...</string>
  <string name="DeviceListActivity_try_again">حاول مجددا</string>
+  <string name="DeviceListActivity_unlinking_device">جارٍ إلغاء ربط الجهاز...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">جارٍ إلغاء ربط الجهاز</string>
  <string name="DeviceListActivity_network_failed">فشل في الشبكة!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">جهاز غير مسمى</string>
+  <string name="DeviceListItem_linked_s">متصل %s</string>
  <string name="DeviceListItem_last_active_s">آخر مرة %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">شارك مع</string>
@ -229,9 +240,13 @@
  <string name="DeviceProvisioningActivity_content_bullets">
 قراءة كل رسائلك.
 \n- استخدام أسمك للإرسال</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">ربط الجهاز</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">جارٍ ربط الجهاز...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">الجهاز متصل!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">لم يتم العثور على جهاز.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">خطأ في الشبكة.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">الرمز غير سليم.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">عذرا، لديك بالفعل أجهزة عديدة متصلة. حاول إزالة بعضهم...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
  <string name="PassphrasePromptActivity_watermark_content_description">أيقونة تيكست سيكيور</string>
@ -363,7 +378,6 @@
  <string name="KeyCachingService_passphrase_cached">تيكست سيكيور غير مقفل</string>
  <string name="KeyCachingService_lock">أقفل بالعبارة السرية</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d رسالة في %2$d محادثات</string>
  <string name="MessageNotifier_most_recent_from_s">الأحدث من: %1$s</string>
  <string name="MessageNotifier_media_message_with_text">رسالة وسائط متعددة: %s</string>
  <string name="MessageNotifier_no_subject">(بلا عنوان)</string>
@ -371,16 +385,19 @@
  <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_read">اعتبرها مقروءة</string>
  <string name="MessageNotifier_media_message">رسالة وسائط متعددة</string>
  <string name="MessageNotifier_reply">رَدّ</string>
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">الردود السريعة غير متاحة عند قفل تيكست سيكيور</string>
  <string name="QuickResponseService_problem_sending_message">مشكلة في الإرسال!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">العبارة السرية القديمة:</string>
  <string name="change_passphrase_activity__new_passphrase">العبارة السرية الجديدة:</string>
  <string name="change_passphrase_activity__repeat_new_passphrase">تكرار العبارة السرية الجديدة:</string>
  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">أدخل أسم أو رقم</string>
  <!--contact_selection_group_activity-->
  <string name="contact_selection_group_activity__no_contacts">لا توجد جهات اتصال.</string>
  <string name="contact_selection_group_activity__finding_contacts">تحميل جهات الاتصال...</string>
@ -425,6 +442,7 @@
  <string name="country_selection_fragment__loading_countries">تحميل البلدان جارٍ ...</string>
  <string name="country_selection_fragment__search">بحث</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">لا توجد أجهزة متصلة...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">تعذر التقاط سجلات التصحيح من هاتفك. يمكنك استخدام ADB للحصول على سجلات التصحيح بدلا من ذلك.</string>
  <string name="log_submit_activity__thanks">شكرا للمساعدة!</string>
@ -489,6 +507,7 @@
  <string name="registration_activity__phone_number">رقم الهاتف</string>
  <string name="registration_activity__register">سجل</string>
  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">يتم نقل بعض بيانات الاتصال إلى الخادم أثناء التسجيل، ولا يتم حفظها.</string>
+  <string name="registration_activity__powered_by_twilio">مدعم بواسطة Twilio</string>
  <!--registration_problems-->
  <string name="registration_problems__some_possible_problems_include">بعض المشاكل المحتملة
 وتتضمن:</string>
@ -558,6 +577,7 @@
  <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_linked_devices">إدارة الأجهزة المتصلة</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">استيراد \ تصدير</string>
  <string name="arrays__my_identity_key">مفتاح هويتي</string>
@ -598,6 +618,7 @@
  <string name="preferences__change_my_passphrase">غير عبارتي السرية</string>
  <string name="preferences__enable_passphrase">تفعيل العبارة السرية</string>
  <string name="preferences__passphrase_summary">عبارة سرية %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">تفعيل قفل الشاشة للرسائل</string>
  <string name="preferences__screen_security">تأمين الشاشة</string>
  <string name="preferences__screen_security_summary">تأمين الشاشة %s</string>
  <string name="preferences__disable_screen_security_to_allow_screen_shots">منع لقطات الشاشة داخل التطبيق</string>
@ -607,7 +628,6 @@
  <string name="preferences__pref_timeout_interval_title">مدة الصلاحية</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">الوقت اللازم ليتم مسح العبارة السرية من الذاكرة</string>
  <string name="preferences__notifications">التنبيهات</string>
-  <string name="preferences__display_message_notifications_in_status_bar">عرض تنبيهات الرسائل بشريط التنبيهات</string>
  <string name="preferences__led_color">لون ضوء التنبيه LED</string>
  <string name="preferences__led_color_unknown">مجهول</string>
  <string name="preferences__pref_led_blink_title">نمط وميض LED</string>
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@ -340,6 +340,7 @@
  <string name="MessageNotifier_mark_all_as_read">Пазначыць усе як прачытаныя</string>
  <string name="MessageNotifier_media_message">Мультымедыя паведамленне</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">СТАРЫ ПАРОЛЬ:</string>
  <string name="change_passphrase_activity__new_passphrase">НОВЫ ПАРОЛЬ:</string>
@ -552,7 +553,6 @@ TextSecure не дачакаўся параверачная SMS.</string>
  <string name="preferences__pref_timeout_interval_title">Інтэрвал часу запамінання</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Значэнне часу, праз які пароль будзе выдалены з памяці</string>
  <string name="preferences__notifications">Апавяшчэнні</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Адлюстроўваць апавяшчэнні пра паведамленні на статуснай панэлі</string>
  <string name="preferences__led_color">колер святлодыёда</string>
  <string name="preferences__led_color_unknown">Невядома</string>
  <string name="preferences__pref_led_blink_title">Узор міргацення светладыёда</string>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@ -41,6 +41,7 @@
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">Неуспешно откирване на папка за избор на файл.</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Камера</string>
  <string name="AttachmentTypeSelectorAdapter_picture">Картина</string>
  <string name="AttachmentTypeSelectorAdapter_video">Видео</string>
  <string name="AttachmentTypeSelectorAdapter_audio">Аудио</string>
@ -80,6 +81,7 @@
  <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_the_gif_you_selected_was_too_big">Gif-ът, който избра е твърде голям</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">За съжеление, избраното видео надвишава допустимия максимален размер (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">За съжеление, избраното audio надвишава допустимия максимален размер (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Получателя не е с валиден SMS или имейл!</string>
@ -143,11 +145,16 @@
  <string name="DateUtils_now">Сега</string>
  <string name="DateUtils_minutes_ago">%d мин</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Премахни връзката \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ако прекратиш връзката с това устройство, няма да можеш да изпращаш и получаваш съобщения от него.</string>
  <string name="DeviceListActivity_network_connection_failed">Неуспешна връзка с интернет...</string>
  <string name="DeviceListActivity_try_again">Опитай отново</string>
+  <string name="DeviceListActivity_unlinking_device">Прекратяване на връзката с устройството...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Прекратяване на връзката с устройството</string>
  <string name="DeviceListActivity_network_failed">Грешка в мрежата!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Некръстено устройство</string>
+  <string name="DeviceListItem_linked_s">Свързан с %s</string>
  <string name="DeviceListItem_last_active_s">Последна активност %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Сподели с</string>
@ -242,9 +249,13 @@ SMS съобщенията от системната базата данни в
  <string name="DeviceProvisioningActivity_content_bullets">
 Чете всичките ти съобщения
 \n - Изпраща съобщения от твое име</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Свързване с устройството</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Свързване с ново устройство...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Устройството е свързано!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Не е открито устройство.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Проблем с мобилната мрежа.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Невалиден QR код.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">За съжалние имаш твърде много регистрирани устройства, опитай да премахнеш някои от тях...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Въведи паролата</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Икона на TextSecure</string>
@ -382,7 +393,7 @@ SMS съобщенията от системната базата данни в
  <string name="KeyCachingService_passphrase_cached">TextSecure е отключен</string>
  <string name="KeyCachingService_lock">Заключи паролата</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d съобщения в %2$d чата</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d нови съобщения в %2$d чата</string>
  <string name="MessageNotifier_most_recent_from_s">Най-скорошно от: %1$s</string>
  <string name="MessageNotifier_locked_message">Заключено съобщение...</string>
  <string name="MessageNotifier_media_message_with_text">Медийно съобщение: %s</string>
@ -397,6 +408,9 @@ SMS съобщенията от системната базата данни в
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Бърз отговор не е възможен, когато TextSecure е заключен!</string>
  <string name="QuickResponseService_problem_sending_message">Проблем при изпрашане на съобщение!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Ново TextSecure съобщение</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Съдържанието е скрито</string>
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">СТАРА ПАРОЛА: </string>
  <string name="change_passphrase_activity__new_passphrase">НОВА ПАРОЛА: </string>
@ -448,6 +462,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_linked">Няма свързани устройства...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Не успешен опит да се сдобием с доклада от устройството ти. Въпреки това можеш да ползваш ADB, за да се добиеш с доклада.</string>
  <string name="log_submit_activity__thanks">Благодаря за помоща!</string>
@ -602,6 +617,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_linked_devices">Управление на свързани устройства</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Внасяне / изнасяне</string>
  <string name="arrays__my_identity_key">Моят ключ за самоличност</string>
@ -614,6 +630,9 @@ TextSecure чака твърде дълго за SMS потвърждение.
  <string name="arrays__settings_default">Настройки по подразбиране</string>
  <string name="arrays__enabled">Включено</string>
  <string name="arrays__disabled">Изключено</string>
+  <string name="arrays__name_and_message">Име и съобщение</string>
+  <string name="arrays__name_only">Само име</string>
+  <string name="arrays__neither">Нито едното</string>
  <!--plurals.xml-->
  <plurals name="hours_ago">
    <item quantity="one">%d час</item>
@ -648,7 +667,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
  <string name="preferences__pref_timeout_interval_title">Продължителност на помненето</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Продължителнос от време, преди да забравя паролата от памета</string>
  <string name="preferences__notifications">Известия</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Покажи известия за съобщения в лентата за известия</string>
+  <string name="preferences__enable_message_notifications">Разреши известия за съобщения</string>
  <string name="preferences__led_color">LED цвят</string>
  <string name="preferences__led_color_unknown">Непознат</string>
  <string name="preferences__pref_led_blink_title">LED известяване</string>
@ -716,6 +735,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
  <string name="preferences__support_wifi_calling">Съвместим режим \'WiFi Calling\'</string>
  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включи ако устройството ти използва WiFi за SMS/MMS(само ако \'Wifi Calling\' е включен на устройството ти)</string>
  <string name="preferences_app_protection__blocked_contacts">Блокирани контакти</string>
+  <string name="preferences_notifications__display_in_notifications">Покажи в полето с известия</string>
  <!--****************************************-->
  <!--menus-->
  <!--****************************************-->
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@ -128,6 +128,7 @@
  <string name="MessageNotifier_failed_to_deliver_message">འཕྲིན་ཐུང་གཏོང་ཐུབ་མ་སོང་། </string>
  <string name="MessageNotifier_error_delivering_message">འཕྲིན་ཐུང་གཏོང་བར་སྐྱོན་ཤོར་འདུག </string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">གསང་ཚིག་རྙིང་པ།</string>
  <string name="change_passphrase_activity__new_passphrase">གསང་ཚིག་གསར་པ།</string>
@ -196,7 +197,6 @@
  <string name="preferences__pref_timeout_interval_title">བར་སེང་མཚམས་ཞོག </string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">དྲན་ཐོ་ནས་གསང་ཚིག་མ་བརྗེད་གོང་སྒུག་ཡུན་དུས་ཚོད།</string>
  <string name="preferences__notifications">བརྡ་གཏོང་།</string>
-  <string name="preferences__display_message_notifications_in_status_bar">འཕྲིན་ཐུང་གི་བརྡ་ཁྱབ་དེ་རྣམ་པའི་ཚན་བྱང་གི་ནང་དུ་བཀྲམས། </string>
  <string name="preferences__vibrate"> འདར་བཅུག</string>
  <string name="preferences__also_vibrate_when_notified">བརྡ་གཏོང་སྐབས་འདར་བཅུག</string>
  <string name="preferences__minutes">སྐར་མ།</string>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@ -203,6 +203,7 @@
  <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>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">FRASE CONTRASENYA ANTIGA:</string>
  <string name="change_passphrase_activity__new_passphrase">NOVA FRASE CONTRASENYA:</string>
@ -311,7 +312,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
  <string name="preferences__pref_timeout_interval_title">Interval del temps d\'espera</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantitat de temps que s\'esperarà abans d\'oblidar la frase contrasenya de la memòria</string>
  <string name="preferences__notifications">Notificacions</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Mostra notificacions dels missatges a la barra d\'estat</string>
  <string name="preferences__led_color">Color del LED</string>
  <string name="preferences__pref_led_blink_title">Patró d\'intermitència del LED</string>
  <string name="preferences__pref_led_blink_custom_pattern_set">S\'ha fixat un patró de parpalleig del LED personalitzat!</string>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@ -148,11 +148,16 @@ kontakt</string>
  <string name="DateUtils_now">Teď</string>
  <string name="DateUtils_minutes_ago">%d minuta</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Rozpojit \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Rozpojením toho zařízení nebude dále možno posílat a přijímat 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_unlinking_device">Rozpojování zařízení...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Rozpojuji zařízení</string>
  <string name="DeviceListActivity_network_failed">Síť selhala</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Nepojmenované zřízení</string>
+  <string name="DeviceListItem_linked_s">Propojeno %s</string>
  <string name="DeviceListItem_last_active_s">Naposled aktivní %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Sdílet s</string>
@ -242,9 +247,13 @@ tuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string
  <string name="DeviceProvisioningActivity_content_bullets">
 Přečíst všechny zprávy
 Poslat zprávy Vaším jménem.</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Propojuji zařízení</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Propojuji nové zařízení...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Zařízení propojena!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Nenalezeno žádné zařízení.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Chyba sítě.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Omlouváme se, ale máte propojeno příliš mnoho zařízení, pokuste se některé odpojit...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Zadat heslo</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@ -376,7 +385,6 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
  <string name="KeyCachingService_passphrase_cached">TextSecure je odemčený</string>
  <string name="KeyCachingService_lock">Uzamknout heslem</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d zpráv v %2$d konverzacích</string>
  <string name="MessageNotifier_most_recent_from_s">Poslední od: %1$s</string>
  <string name="MessageNotifier_locked_message">Zamčená zpráva</string>
  <string name="MessageNotifier_media_message_with_text">Multimediální zpráva: %s</string>
@ -391,6 +399,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Rychlá dopověď není dostupná pokud je TextSecure uzamčen!</string>
  <string name="QuickResponseService_problem_sending_message">Problém při odesílání zprávy!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">STARÉ HESLO</string>
  <string name="change_passphrase_activity__new_passphrase">NOVÉ HESLO</string>
@ -442,6 +451,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
  <string name="country_selection_fragment__loading_countries">Načítám země...</string>
  <string name="country_selection_fragment__search">Hledat</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Žádná zařízení nejsou propojena...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Nepodařilo se zaznamenat logy z vašeho zařízení. Jěště můžete zkusit použít pro získání debug logů nástroj ADB.</string>
  <string name="log_submit_activity__thanks">Díky za Vaši pomoc!</string>
@ -594,6 +604,7 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
  <string name="AndroidManifest__media_overview">Všechny obrázky</string>
  <string name="AndroidManifest__media_overview_named">Všechny obrázky s %1$s</string>
  <string name="AndroidManifest__message_details">Podrobnosti zprávy</string>
+  <string name="AndroidManifest_manage_linked_devices">Spravovat propojená zařízení</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Import / export</string>
  <string name="arrays__my_identity_key">Můj identifikační klíč</string>
@ -641,7 +652,6 @@ TextSecure nyní automaticky ověří vaše telefonní číslo pomocí potvrzova
  <string name="preferences__pref_timeout_interval_title">Limit čekání</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Doba po kterou si pamatovat vyplněné heslo</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__led_color_unknown">Neznámý</string>
  <string name="preferences__pref_led_blink_title">Schéma blikání LED</string>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@ -295,6 +295,7 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
  <string name="MessageNotifier_mark_all_as_read">Marker alle som læst</string>
  <string name="MessageNotifier_media_message">Multimedie besked</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">GAMMELT KODEORD:</string>
  <string name="change_passphrase_activity__new_passphrase">NYT KODEORD:</string>
@ -468,7 +469,6 @@ fejlede.
  <string name="preferences__pref_timeout_interval_title">Timeout tidsinterval</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hvor lang tid skal der gå før kodeordet slettes fra hukommelsen</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__pref_led_blink_title">LED blinkemønster</string>
  <string name="preferences__pref_led_blink_custom_pattern_title">Tilpas LED blinkemønster</string>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@ -14,7 +14,7 @@
  <string name="ApplicationPreferencesActivity_delete">Löschen</string>
  <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
  <string name="ApplicationPreferencesActivity_disable_lock_screen">
-TextSecure und dessen Benachrichtigungen dauerhaft entsperren.</string>
+TextSecure und Benachrichtigungen dauerhaft entsperren.</string>
  <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
  <string name="ApplicationPreferencesActivity_unregistering">Registrierung löschen</string>
  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">TextSecure-Registrierung wird gelöscht …</string>
@ -144,11 +144,16 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
  <string name="DateUtils_now">Jetzt</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">\"%s\" entfernen?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Nach Entfernen dieses Geräts wird es keine weiteren Nachrichten senden oder empfangen können.</string>
  <string name="DeviceListActivity_network_connection_failed">Keine Netzwerkverbindung …</string>
  <string name="DeviceListActivity_try_again">Erneut versuchen</string>
+  <string name="DeviceListActivity_unlinking_device">Gerät wird entfernt …</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Gerät entfernen</string>
  <string name="DeviceListActivity_network_failed">Netzwerkfehler!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Unbenanntes Gerät</string>
+  <string name="DeviceListItem_linked_s">%s verknüpft</string>
  <string name="DeviceListItem_last_active_s">Zuletzt aktiv %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Teilen mit</string>
@ -238,9 +243,13 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
  <string name="DeviceProvisioningActivity_content_bullets">
 - Alle Nachrichten lesen
 \n- Nachrichten in Ihrem Namen senden </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Gerät verknüpfen</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Neues Gerät wird verknüpft …</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Gerät verknüpft!</string>
  <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_linked_already">Es sind bereits zu viele Geräte verknüpft. 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>
@ -322,7 +331,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Kontakt hat keinen Schlüssel.</string>
  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Kontakt hat keinen Schlüssel!</string>
  <string name="VerifyIdentityActivity_scan_their_key_to_compare">QR-Code einscannen</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Eigenen QR-Code anzeigen</string>
+  <string name="VerifyIdentityActivity_get_my_key_scanned">Ihren QR-Code anzeigen</string>
  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ACHTUNG: Der eingescannte Schlüssel stimmt NICHT überein! Bitte überprüfen Sie den Text des Schlüssels sorgfältig.</string>
  <string name="VerifyIdentityActivity_not_verified_exclamation">NICHT überprüft!</string>
  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Der Schlüssel des Kontakts ist korrekt. Lassen Sie ihn auch Ihren eigenen Schlüssel überprüfen.</string>
@ -331,12 +340,12 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
  <!--ViewIdentityActivity-->
  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen eigenen Schlüssel.</string>
  <string name="ViewIdentityActivity_scan_to_compare">QR-Code einscannen</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Eigenen QR-Code anzeigen</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">Ihren QR-Code anzeigen</string>
  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">ACHTUNG: Der eingescannte Schlüssel stimmt NICHT überein!</string>
  <string name="ViewIdentityActivity_not_verified_exclamation">NICHT überprüft!</string>
  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Der eingescannte Schlüssel stimmt überein!</string>
  <string name="ViewIdentityActivity_verified_exclamation">Überprüft!</string>
-  <string name="ViewIdentityActivity_my_identity_fingerprint">Mein Schlüssel</string>
+  <string name="ViewIdentityActivity_my_identity_fingerprint">Ihr Schlüssel</string>
  <!--KeyExchangeInitiator-->
  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Trotz bestehender Anfrage starten?</string>
  <string name="KeyExchangeInitiator_youve_already_sent_a_session_initiation_request_to_this_recipient_are_you_sure">Sie haben bereits eine Unterhaltungsanfrage an den Kontakt gesendet. Wollen Sie wirklich eine weitere senden? Dies wird die erste Anfrage ungültig machen.</string>
@ -371,7 +380,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
  <string name="KeyCachingService_passphrase_cached">TextSecure ist entsperrt</string>
  <string name="KeyCachingService_lock">Mit Passwort sperren</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d Nachrichten in %2$d Unterhaltungen</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d neue Nachrichten in %2$d Unterhaltungen</string>
  <string name="MessageNotifier_most_recent_from_s">Neueste von: %1$s</string>
  <string name="MessageNotifier_locked_message">Gesperrte Nachricht …</string>
  <string name="MessageNotifier_media_message_with_text">Mediennachricht: %s</string>
@ -386,6 +395,9 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Schnellantwort nicht verfügbar, solange TextSecure gesperrt ist!</string>
  <string name="QuickResponseService_problem_sending_message">Problem beim Senden der Nachricht!</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Neue TextSecure-Nachricht</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Inhalt verborgen</string>
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">ALTES PASSWORT:</string>
  <string name="change_passphrase_activity__new_passphrase">NEUES PASSWORT:</string>
@ -437,6 +449,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
  <string name="country_selection_fragment__loading_countries">Länder werden geladen …</string>
  <string name="country_selection_fragment__search">Suchen</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Keine Geräte verknüpft …</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Entweder konnte kein Diagnoseprotokoll vom Gerät gelesen werden oder es gab Probleme dieses an den Server zu senden. Wenn Sie sicher sind, dass das Gerät mit dem Internet verbunden ist, können Sie versuchen das Protokoll mit ADB auszulesen.</string>
  <string name="log_submit_activity__thanks">Danke für Ihre Hilfe!</string>
@ -453,7 +466,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
  <string name="database_upgrade_activity__updating_database">Datenbank wird aktualisiert …</string>
  <string name="export_fragment__export_plaintext_backup">Klartextsicherung exportieren</string>
  <string name="export_fragment__export_a_plaintext_backup_compatible_with">
-Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung exportieren</string>
+Eine mit "SMS Backup &amp; Restore" kompatible Klartextsicherung exportieren</string>
  <string name="import_fragment__import_system_sms_database">System-SMS importieren</string>
  <string name="import_fragment__import_the_database_from_the_default_system">Datenbank aus der Standard-SMS-App importieren</string>
  <string name="import_fragment__import_encrypted_backup">Verschlüsselte Sicherung wiederherstellen</string>
@ -461,7 +474,7 @@ Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung exportieren</stri
 Eine zuvor exportierte, verschlüsselte TextSecure-Datensicherung wiederherstellen</string>
  <string name="import_fragment__import_plaintext_backup">Klartextsicherung importieren</string>
  <string name="import_fragment__import_a_plaintext_backup_file">
-Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren</string>
+Eine mit "SMS Backup &amp; Restore" kompatible Klartextsicherung importieren</string>
  <!--media_overview_activity-->
  <string name="media_overview_activity__no_images">Keine Bilder</string>
  <!--message_recipients_list_item-->
@ -547,7 +560,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
  <string name="recipients_panel__add_member">Mitglieder hinzufügen</string>
  <!--verify_identity_activity-->
  <string name="verify_identity_activity__their_identity_they_read">Schlüssel des Kontakts:</string>
-  <string name="verify_identity_activity__your_identity_you_read">Eigener Schlüssel:</string>
+  <string name="verify_identity_activity__your_identity_you_read">Ihr Schlüssel:</string>
  <!--message_details_header-->
  <string name="message_details_header__issues_need_your_attention">Einige Vorgänge benötigen Ihre Aufmerksamkeit.</string>
  <string name="message_details_header__sent">Gesendet</string>
@ -569,9 +582,10 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
  <string name="AndroidManifest__media_overview">Alle Bilder</string>
  <string name="AndroidManifest__media_overview_named">Alle Bilder mit %1$s</string>
  <string name="AndroidManifest__message_details">Nachrichtendetails</string>
+  <string name="AndroidManifest_manage_linked_devices">Verknüpfte Geräte verwalten</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Datensicherung</string>
-  <string name="arrays__my_identity_key">Mein Schlüssel</string>
+  <string name="arrays__my_identity_key">Ihr Schlüssel</string>
  <string name="arrays__use_default">Standard verwenden</string>
  <string name="arrays__use_custom">Benutzerdefiniert verwenden</string>
  <string name="arrays__mute_for_one_hour">Für 1 Stunde</string>
@ -581,6 +595,9 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
  <string name="arrays__settings_default">Standard</string>
  <string name="arrays__enabled">Aktiviert</string>
  <string name="arrays__disabled">Deaktiviert</string>
+  <string name="arrays__name_and_message">Name und Nachricht</string>
+  <string name="arrays__name_only">Name</string>
+  <string name="arrays__neither">Weder noch</string>
  <!--plurals.xml-->
  <plurals name="hours_ago">
    <item quantity="one">%d Stunde</item>
@ -602,10 +619,10 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
  <string name="preferences__choose_identity">Kontakt auswählen</string>
  <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__change_my_passphrase">Ihr Passwort ändern</string>
  <string name="preferences__enable_passphrase">Passwort aktivieren</string>
  <string name="preferences__passphrase_summary">Passwort %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">TextSecure und dessen Benachrichtigungen sperren</string>
+  <string name="preferences__enable_lock_screen_for_messages">TextSecure und Benachrichtigungen mit Passwort sperren</string>
  <string name="preferences__screen_security">Bildschirmschutz</string>
  <string name="preferences__screen_security_summary">Bildschirmschutz %s</string>
  <string name="preferences__disable_screen_security_to_allow_screen_shots">Bildschirmfotos in der Anwendung und der Liste der letzten Anwendungen blockieren</string>
@ -615,14 +632,14 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
  <string name="preferences__pref_timeout_interval_title">Zeitüberschreitung</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Wartezeit, nach deren Ablauf das Passwort vergessen wird</string>
  <string name="preferences__notifications">Benachrichtigungen</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Benachrichtigungen über Nachrichten aktivieren</string>
+  <string name="preferences__enable_message_notifications">Benachrichtigungen bei Nachrichtenempfang einschalten</string>
  <string name="preferences__led_color">LED-Farbe</string>
  <string name="preferences__led_color_unknown">Unbekannt</string>
  <string name="preferences__pref_led_blink_title">LED-Blinkmuster</string>
-  <string name="preferences__pref_led_blink_custom_pattern_title">Eigenes LED-Blinkmuster wählen</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">LED-Blinkmuster festlegen</string>
  <string name="preferences__pref_led_blink_custom_pattern_on_for">Aktiviert für:</string>
  <string name="preferences__pref_led_blink_custom_pattern_off_for">Deaktiviert für:</string>
-  <string name="preferences__pref_led_blink_custom_pattern_set">Eigenes LED-Blinkmuster aktiviert!</string>
+  <string name="preferences__pref_led_blink_custom_pattern_set">LED-Blinkmuster festgelegt</string>
  <string name="preferences__sound">Benachrichtigungston</string>
  <string name="preferences__change_notification_sound">Benachrichtigungston ändern</string>
  <string name="preferences__inthread_notifications">Immer benachrichtigen</string>
@ -683,6 +700,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
  <string name="preferences__support_wifi_calling">Kompatibilität WLAN-Telefonie</string>
  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivieren, falls das Gerät SMS/MMS über WLAN nutzt (nur bei aktivierter WLAN-Telefonie)</string>
  <string name="preferences_app_protection__blocked_contacts">Blockierte Kontakte</string>
+  <string name="preferences_notifications__display_in_notifications">In Benachrichtigungen anzeigen</string>
  <!--****************************************-->
  <!--menus-->
  <!--****************************************-->
@ -747,7 +765,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
  <string name="conversation_group_options__broadcast">Übertragen</string>
  <!--key_scanning-->
  <string name="key_scanning__menu_compare">Vergleichen</string>
-  <string name="key_scanning__menu_get_scanned_to_compare">Eigenen QR-Code anzeigen</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Ihren QR-Code anzeigen</string>
  <string name="key_scanning__menu_scan_to_compare">QR-Code einscannen</string>
  <!--text_secure_normal-->
  <string name="text_secure_normal__menu_new_message">Neue Unterhaltung</string>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@ -368,7 +368,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
  <string name="KeyCachingService_passphrase_cached">Το TextSecure είναι ξεκλειδωμένο</string>
  <string name="KeyCachingService_lock">Κλείδωμα με συνθηματικό</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d μηνύματα σe %2$d συζητήσεις</string>
  <string name="MessageNotifier_most_recent_from_s">Τελευταίο μήνυμα από: %1$s</string>
  <string name="MessageNotifier_media_message_with_text">Μήνυμα Πολυμέσων: %s</string>
  <string name="MessageNotifier_no_subject">(Χωρίς Θέμα)</string>
@ -378,6 +377,7 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
  <string name="MessageNotifier_mark_all_as_read">Επισήμανση όλων ως αναγνωσμένα</string>
  <string name="MessageNotifier_media_message">Μήνυμα πολυμέσων</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">ΠΑΛΙΟ ΣΥΝΘΗΜΑΤΙΚΟ</string>
  <string name="change_passphrase_activity__new_passphrase">ΝΕΟ ΣΥΝΘΗΜΑΤΙΚΟ:</string>
@ -606,7 +606,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
  <string name="preferences__pref_timeout_interval_title">Χρονικό όριο</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Πόση ώρα θα περιμένουμε πριν σβήσουμε το συνθηματικό από τη μνήμη</string>
  <string name="preferences__notifications">Ειδοποιήσεις</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Προβολή ειδοποιήσεων για νέα μηνύματα στη γραμμή κατάστασης</string>
  <string name="preferences__led_color">Χρώμα LED</string>
  <string name="preferences__led_color_unknown">Αγνωστο</string>
  <string name="preferences__pref_led_blink_title">Μοτίβο αναβοσβήματος του LED</string>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@ -153,11 +153,16 @@ Recibido:%4$s</string>
  <string name="DateUtils_now">Ahora</string>
  <string name="DateUtils_minutes_ago">%d mins</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">¿Desvincular \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Al desvincular 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_unlinking_device">Desvinculando dispositivo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Desvinculando dispositivo</string>
  <string name="DeviceListActivity_network_failed">¡Fallo de red!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Dispositivo sin nombre</string>
+  <string name="DeviceListItem_linked_s">Se vinculó %s</string>
  <string name="DeviceListItem_last_active_s">Activo por última vez el %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Compartir con</string>
@ -259,9 +264,13 @@ Por favor pida al remitente que actualice a la versión más reciente y reenvíe
        - Leer todos sus mensajes
        \n- Enviar mensajes en su nombre
    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Vinculando dispositivo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Vinculando nuevo dispositivo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">¡Dispositivo vinculado!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">No se encontró ningun dispositivo.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Error de red.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR no válido.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Lo sentimos, ya tiene demasiados dispositivos vinculados, pruebe a eliminar alguno...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Introduzca clave de acceso</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Icono de TextSecure</string>
@ -407,7 +416,6 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
  <string name="KeyCachingService_passphrase_cached">TextSecure está desbloqueado</string>
  <string name="KeyCachingService_lock">Bloquear con clave de acceso</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mensajes en %2$d conversaciones</string>
  <string name="MessageNotifier_most_recent_from_s">Más recientes desde: %1$s</string>
  <string name="MessageNotifier_locked_message">Mensaje bloqueado...</string>
  <string name="MessageNotifier_media_message_with_text">Mensaje multimedia: %s</string>
@ -422,6 +430,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">¡Respuesta rápida no disponible cuando TextSecure está bloqueado!</string>
  <string name="QuickResponseService_problem_sending_message">¡Hubo un problema al enviar el mensaje!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">CLAVE DE ACCESO ANTERIOR:</string>
  <string name="change_passphrase_activity__new_passphrase">CLAVE DE ACCESO NUEVA:</string>
@ -473,6 +482,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
  <string name="country_selection_fragment__loading_countries">Cargando países...</string>
  <string name="country_selection_fragment__search">Buscar</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">No hay dispositivos vinculados...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">No se pudieron obtener los registros de actividad de su dispositivo. En su lugar, aún puede usar ADB para acceder a los registros de depuración.</string>
  <string name="log_submit_activity__thanks">¡Gracias por su ayuda!</string>
@ -645,6 +655,7 @@ por SMS.
  <string name="AndroidManifest__media_overview">Todas las imágenes</string>
  <string name="AndroidManifest__media_overview_named">Todas la imágenes con %1$s</string>
  <string name="AndroidManifest__message_details">Detalles del mensaje</string>
+  <string name="AndroidManifest_manage_linked_devices">Administrar dispositivos vinculados</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Importar/exportar</string>
  <string name="arrays__my_identity_key">Mi clave de identidad</string>
@ -691,7 +702,6 @@ por SMS.
  <string name="preferences__pref_timeout_interval_title">Intervalo de expiración</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">El intervalo de tiempo a esperar antes de eliminar la clave de acceso de la memoria</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 del LED</string>
  <string name="preferences__led_color_unknown">Desconocido</string>
  <string name="preferences__pref_led_blink_title">Patrón de parpadeo del LED</string>
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@ -323,6 +323,7 @@ Nortasun gako ezezagun batekin jaso da mezua. Klik egin prozesatzeko eta erakust
  <string name="MessageNotifier_mark_all_as_read">Denak irrakurritako gisa markatu</string>
  <string name="MessageNotifier_media_message">Media mezua</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">PASAHITZ ZAHARRA:</string>
  <string name="change_passphrase_activity__new_passphrase">PASAHITZ BERRIA:</string>
@ -517,7 +518,6 @@ huts egin du.
  <string name="preferences__pref_timeout_interval_title">Iraungitzearen tartea</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Memoriatik pasahitza kentzeko itxaron behar den denbora</string>
  <string name="preferences__notifications">Jakinarazpenak</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Mezuaren jakinarazpenak erakutsi egoera-barran</string>
  <string name="preferences__led_color">LED kolorea</string>
  <string name="preferences__led_color_unknown">Ezezaguna</string>
  <string name="preferences__pref_led_blink_title">LEDaren keinuka eredua</string>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@ -329,6 +329,7 @@
  <string name="MessageNotifier_reply">پاسخ</string>
  <!--QuickResponseService-->
  <string name="QuickResponseService_problem_sending_message">بروز خطا در ارسال پیام!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">رمز قبلی:</string>
  <string name="change_passphrase_activity__new_passphrase">رمز جدید:</string>
@ -517,7 +518,6 @@
  <string name="preferences__pref_timeout_interval_title">فاصله ایست</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">برنامه پس از چه مدت به طور خودکار رمز وارد شده را فراموش کند و قفل شود</string>
  <string name="preferences__notifications">اطلاعیه‌ها</string>
-  <string name="preferences__display_message_notifications_in_status_bar">نمایش اطلاعیه دریافت پیام در نوار وضعیت</string>
  <string name="preferences__led_color">رنگ چراغ ال‌ای‌دی</string>
  <string name="preferences__led_color_unknown">ناشناخته</string>
  <string name="preferences__pref_led_blink_title">الگوی چشمک زدن</string>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@ -152,11 +152,16 @@ Vastaanotettu: %4$s</string>
  <string name="DateUtils_now">Nyt</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Poista \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Jos poistat tämän laitteen, sillä ei voi enää lähettää eikä vastaanottaa viestejä.</string>
  <string name="DeviceListActivity_network_connection_failed">Verkkoyhteyden muodostus epäonnistui...</string>
  <string name="DeviceListActivity_try_again">Yritä uudelleen</string>
+  <string name="DeviceListActivity_unlinking_device">Poistetaan laitetta...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Poistetaan laitetta</string>
  <string name="DeviceListActivity_network_failed">Verkkoyhteysvirhe!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Nimeämätön laite</string>
+  <string name="DeviceListItem_linked_s">Yhdistetty %s</string>
  <string name="DeviceListItem_last_active_s">Viimeksi käytetty %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Jaa</string>
@ -250,9 +255,13 @@ seuraa niiden uudelleentuonnista viestien kaksoiskappaleita.</string>
  <string name="DeviceProvisioningActivity_content_bullets">
 - lukea kaikki viestisi
 \n- lähettää viestejä sinun nimessäsi</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Yhdistetään laitetta</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Yhdistetään uutta laitetta...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Laite yhdistetty!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Laitetta ei löytynyt.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Verkkovirhe.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Virheellinen QR-koodi.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sinulla on liian monta laitetta yhdistettynä. Kokeile poistaa joitakin...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Syötä salalause</string>
  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure-kuvake</string>
@ -391,7 +400,6 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
  <string name="KeyCachingService_passphrase_cached">TextSecuren lukitus on auki</string>
  <string name="KeyCachingService_lock">Lukitse salalauseella</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d viestiä %2$d keskustelussa</string>
  <string name="MessageNotifier_most_recent_from_s">Uusin lähettäjältä: %1$s</string>
  <string name="MessageNotifier_locked_message">Lukittu viesti...</string>
  <string name="MessageNotifier_media_message_with_text">Mediaviesti: %s</string>
@ -400,12 +408,13 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
  <string name="MessageNotifier_failed_to_deliver_message">Viestin lähetys ei onnistunut.</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_read">Merk. luetuksi</string>
+  <string name="MessageNotifier_mark_read">Luettu</string>
  <string name="MessageNotifier_media_message">Mediaviesti</string>
  <string name="MessageNotifier_reply">Vastaa</string>
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Pikavastaus ei toimi, kun TextSecure on lukittu!</string>
  <string name="QuickResponseService_problem_sending_message">Ongelma viestin lähettämisessä!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">VANHA SALALAUSE:</string>
  <string name="change_passphrase_activity__new_passphrase">UUSI SALALAUSE:</string>
@ -457,6 +466,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
  <string name="country_selection_fragment__loading_countries">Ladataan maita...</string>
  <string name="country_selection_fragment__search">Hae</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Ei yhdistettyjä laitteita...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Lokien hakeminen laitteesta epäonnistui. Voit sen sijaan käyttää ADB-työkalua virheenkorjauslokien noutamiseen.</string>
  <string name="log_submit_activity__thanks">Kiitos avustasi!</string>
@ -599,6 +609,7 @@ epäonnistui.</string>
  <string name="AndroidManifest__media_overview">Kaikki kuvat</string>
  <string name="AndroidManifest__media_overview_named">%1$s: kaikki kuvat</string>
  <string name="AndroidManifest__message_details">Viestin tiedot</string>
+  <string name="AndroidManifest_manage_linked_devices">Hallitse yhdistettyjä laitteita</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Varmuuskopiot</string>
  <string name="arrays__my_identity_key">Oma identiteettiavaimeni</string>
@ -645,7 +656,6 @@ epäonnistui.</string>
  <string name="preferences__pref_timeout_interval_title">Salalauseen ajastimen kesto</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Odotusaika, ennen kuin salalause unohdetaan muistista</string>
  <string name="preferences__notifications">Ilmoitukset</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Näytä ilmoitukset viesteistä tilapalkissa</string>
  <string name="preferences__led_color">LED:in väri</string>
  <string name="preferences__led_color_unknown">Tuntematon</string>
  <string name="preferences__pref_led_blink_title">LED:in vilkkumistahti</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@ -43,6 +43,7 @@
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">Impossible de trouver une application pour sélectionner le média.</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Appareil photo</string>
  <string name="AttachmentTypeSelectorAdapter_picture">Image</string>
  <string name="AttachmentTypeSelectorAdapter_video">Vidéo</string>
  <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@ -85,6 +86,7 @@ vérifier ce contact.</string>
  <string name="ConversationActivity_select_contact_info">Sélectionner les informations du contact</string>
  <string name="ConversationActivity_compose_message">Rédiger un message</string>
  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Désolé, il y a eu une erreur lors de l\'ajout de votre pièce jointe.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Le gif que vous avez sélectionné est trop gros!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Désolé, la vidéo sélectionnée dépasse les restrictions de taille de message (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Désolé, le fichier audio sélectionné dépasse les restrictions de taille de message (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Le destinataire n’est pas une adresse SMS ou e-mail valide !</string>
@ -148,11 +150,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_unlink_s">Délier \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Si vous dissociez cet appareil, il ne sera plus capable d\'envoyer ou recevoir des messages.</string>
  <string name="DeviceListActivity_network_connection_failed">Erreur de connexion réseau...</string>
  <string name="DeviceListActivity_try_again">Essayer à nouveau</string>
+  <string name="DeviceListActivity_unlinking_device">Dissociation de l\'appareil...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Dissociation 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_linked_s">Associé %s</string>
  <string name="DeviceListItem_last_active_s">Vu pour la dernière fois %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Partager avec</string>
@ -248,9 +255,13 @@ Merci de demander à l’expéditeur de mettre à jour TextSecure dans sa versio
        - Lire tous vos messages
        \n- Envoyer des messages en votre nom
    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Association de l\'appareil</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Association de l\'appareil...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Appareil associé!</string>
  <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_linked_already">Désolé, vous avez trop d\'appareils déjà associé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>
@ -389,7 +400,6 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
  <string name="KeyCachingService_passphrase_cached">TextSecure est déverrouillé</string>
  <string name="KeyCachingService_lock">Verrouiller avec la phrase de passe</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d messages dans %2$d conversations</string>
  <string name="MessageNotifier_most_recent_from_s">Plus récent de : %1$s</string>
  <string name="MessageNotifier_locked_message">Message bloqué...</string>
  <string name="MessageNotifier_media_message_with_text">Message média : %s</string>
@ -404,6 +414,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Les réponses rapides ne sont pas disponibles quand TextSecure est verrouillé !</string>
  <string name="QuickResponseService_problem_sending_message">Erreur lors de l\'envoi du message !</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--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>
@ -455,6 +466,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_linked">Aucun appareil associé...</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>
@ -601,6 +613,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_linked_devices">Gérer les appareils associés</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Importer / exporter</string>
  <string name="arrays__my_identity_key">Ma clé d\'identité</string>
@ -647,7 +660,6 @@ par SMS.</string>
  <string name="preferences__pref_timeout_interval_title">Délai d\'expiration</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Délai avant l\'oubli de la phrase de passe en mémoire</string>
  <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__led_color_unknown">Inconnu</string>
  <string name="preferences__pref_led_blink_title">Rythme de clignotement de la LED</string>
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@ -41,6 +41,7 @@ Trebat ćete ponovno registrirati vaš broj telefona kako biste koristili TextSe
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">Nije moguće pronaći aplikaciju za odabir medija.</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
  <string name="AttachmentTypeSelectorAdapter_picture">Slika</string>
  <string name="AttachmentTypeSelectorAdapter_video">Video</string>
  <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
@ -81,6 +82,7 @@ ovaj kontakt.</string>
  <string name="ConversationActivity_select_contact_info">Odaberite informacije kontakta</string>
  <string name="ConversationActivity_compose_message">Sastavi poruku</string>
  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Došlo je do greške prilikom postavljanja privitka.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Odabrana gif slika je prevelika!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Odabrani video prelazi ograničenje veličine poruke (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Odabrani audio prelazi ograničenje veličine poruke (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Primatelj nije valjana SMS ili adresa e-pošte!</string>
@ -144,11 +146,16 @@ ovaj kontakt.</string>
  <string name="DateUtils_now">Sada</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Odspoji \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_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_unlinking_device">Odspajanje uređaja...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Odspajanje uređaja</string>
  <string name="DeviceListActivity_network_failed">Greška mreže!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Neimenovani uređaj</string>
+  <string name="DeviceListItem_linked_s">Povezan %s</string>
  <string name="DeviceListItem_last_active_s">Zadnje aktivno %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Podijeli s</string>
@ -242,9 +249,13 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
  <string name="DeviceProvisioningActivity_content_bullets">
 - Čitati sve vaše poruke
 \n- Slati poruke u vaše ime</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Povezivanje uređaja</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Povezivanje novog uređaja...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Uređaj povezan!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Uređaj nije pronađen.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Mrežna greška.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Neispravan QR kod.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Imate previše povezanih uređaja, pokušajte ukloniti neke...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Unesite lozinku</string>
  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikona</string>
@ -382,7 +393,6 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
  <string name="KeyCachingService_passphrase_cached">TextSecure je otključan</string>
  <string name="KeyCachingService_lock">Zaključajte sa lozinkom</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d poruka u %2$d razgovora</string>
  <string name="MessageNotifier_most_recent_from_s">Najnovije od: %1$s</string>
  <string name="MessageNotifier_locked_message">Zaključana poruka...</string>
  <string name="MessageNotifier_media_message_with_text">Media poruka: %s</string>
@ -397,6 +407,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Brzi odgovor nije dostupan kada je TextSecure zaključan!</string>
  <string name="QuickResponseService_problem_sending_message">Greška prilikom slanja poruke!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">STARA LOZINKA:</string>
  <string name="change_passphrase_activity__new_passphrase">NOVA LOZINKA:</string>
@ -448,6 +459,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
  <string name="country_selection_fragment__loading_countries">Učitavanje zemalja...</string>
  <string name="country_selection_fragment__search">Traži</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Nema povezanih uređaja...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Nije moguće dohvatiti zapise sa vašeg uređaja. Još uvijek možete koristiti ADB kako biste dohvatili debug zapise.</string>
  <string name="log_submit_activity__thanks">Hvala na pomoći!</string>
@ -594,6 +606,7 @@ neuspješno.</string>
  <string name="AndroidManifest__media_overview">Sve slike</string>
  <string name="AndroidManifest__media_overview_named">Sve slike sa %1$s</string>
  <string name="AndroidManifest__message_details">Detalji poruke</string>
+  <string name="AndroidManifest_manage_linked_devices">Upravljanje povezanim uređajima</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Uvoz / izvoz</string>
  <string name="arrays__my_identity_key">Moj ključ identiteta</string>
@ -641,7 +654,6 @@ neuspješno.</string>
  <string name="preferences__pref_timeout_interval_title">Interval vremenskog ograničenja</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Vrijeme nakon kojeg će se obrisati lozinka iz memorije</string>
  <string name="preferences__notifications">Obavijesti</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Prikaži obavijesti o porukama u statusnoj traci</string>
  <string name="preferences__led_color">LED boja</string>
  <string name="preferences__led_color_unknown">Nepoznato</string>
  <string name="preferences__pref_led_blink_title">LED uzorak treptanja</string>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@ -42,6 +42,7 @@ Tárolt képernyő engedélyezése az üzeneteknek?</string>
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">Nem található alkalmazás a média kiválasztásához</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
  <string name="AttachmentTypeSelectorAdapter_picture">Kép</string>
  <string name="AttachmentTypeSelectorAdapter_video">Mozgókép</string>
  <string name="AttachmentTypeSelectorAdapter_audio">Hang</string>
@ -86,6 +87,7 @@ Elküldöd a titkosítatlan üzenetet?</string>
  <string name="ConversationActivity_select_contact_info">Válassz névjegy infót!</string>
  <string name="ConversationActivity_compose_message">Üzenetírás</string>
  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sajnos nem sikerült a melléklet beállítása.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Az általad választott gif túl nagy volt!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Sajnos a kiválasztott mozgókép mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sajnos a kiválasztott hangállomány mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">A fogadó címe nem érvényes SMS vagy email cím!</string>
@ -149,11 +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_unlink_s">Társítás megszüntetése ezzel: \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ez az eszköz társításának megszüntetésével ez többé nem lesz képes üzeneteket küldeni vagy fogadni.</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_unlinking_device">Eszköz társításának megszüntetése...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Eszköz társításának megszüntetése</string>
  <string name="DeviceListActivity_network_failed">Hálózati hiba!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Megnevezetlen eszköz</string>
+  <string name="DeviceListItem_linked_s">Társítva: %s</string>
  <string name="DeviceListItem_last_active_s">Utoljára aktív %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Megosztás...</string>
@ -243,17 +250,21 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Hibás korábbi jelszó!</string>
  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Adj meg egy új jelszót!</string>
  <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">Csatlakozzon az eszköz?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Társítod ezt az eszközt?</string>
  <string name="DeviceProvisioningActivity_cancel">MÉGSEM</string>
  <string name="DeviceProvisioningActivity_continue">FOLYTATÁS</string>
-  <string name="DeviceProvisioningActivity_title">Csatlakozzon az eszköz?</string>
+  <string name="DeviceProvisioningActivity_title">Társítod ezt az eszközt?</string>
  <string name="DeviceProvisioningActivity_content_intro">Képes lesz</string>
  <string name="DeviceProvisioningActivity_content_bullets">
 - Az összes üzenet olvasása
 \n- Üzenetek küldése a nevedben</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Eszköz társítása</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Új eszköz társítása</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Eszköz társítva!</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_linked_already">Sajnos túl sok eszközöd van társítva jelenleg, próbálj meg néhányat eltávolítani...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Jelszó megadása</string>
  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
@ -291,7 +302,7 @@ telefonszámot!
 szám (%s) érvénytelen.
 </string>
  <string name="RegistrationActivity_unsupported">Nem támogatott</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnáljuk, de a jelen
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnos a jelen
 eszköz nem támogatja az adat alapú üzenetküldést. Az Android 4.0-nál régebbi verziót használó eszközök esetén
 rendelkezniük kell Google fiókkal. Az Android 4.0-t vagy frissebb verziót használó eszközök
 nem igénylik a Google fiók meglétét, de a Play Áruház alkalmazásnak telepítve kell lennie.
@ -399,7 +410,6 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
  <string name="KeyCachingService_passphrase_cached">A TextSecure feloldásra került.</string>
  <string name="KeyCachingService_lock">Lezárás jelszóval</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d üzenet %2$d beszélgetésben</string>
  <string name="MessageNotifier_most_recent_from_s">Legutóbbi tőle: %1$s</string>
  <string name="MessageNotifier_locked_message">Zárolt üzenet...</string>
  <string name="MessageNotifier_media_message_with_text">Média üzenet: %s</string>
@ -414,6 +424,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
  <!--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>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">RÉGI JELSZÓ:</string>
  <string name="change_passphrase_activity__new_passphrase">ÚJ JELSZÓ:</string>
@ -465,6 +476,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_linked">Nincsenek társított eszközök...</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>
@ -631,6 +643,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_linked_devices">Társí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>
@ -677,7 +690,6 @@ sikertelen.
  <string name="preferences__pref_timeout_interval_title">Érvényességi idő tartama</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">A jelszó memóriából való törlése előtti várakozási idő tartama</string>
  <string name="preferences__notifications">Értesítések</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Üzenet értesítések megjelenítése a státusz sorban</string>
  <string name="preferences__led_color">LED színe</string>
  <string name="preferences__led_color_unknown">Ismeretlen</string>
  <string name="preferences__pref_led_blink_title">LED villogás mintázata</string>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@ -12,6 +12,9 @@
  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Eliminare tutti i messaggi vecchi ora?</string>
  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Vuoi davvero ridurre tutte conversazioni ai soli %s messaggi più recenti?</string>
  <string name="ApplicationPreferencesActivity_delete">Elimina</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Disabilitare la password?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Disabilitare la schermata di blocco per i messaggi?</string>
  <string name="ApplicationPreferencesActivity_disable">Disabilita</string>
  <string name="ApplicationPreferencesActivity_unregistering">Disiscriviti</string>
  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Disicriviti dai messaggi di TextSecure</string>
@ -142,11 +145,16 @@ questo contatto.</string>
  <string name="DateUtils_now">Adesso</string>
  <string name="DateUtils_minutes_ago">%d minuto</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Scollegare \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Scollegando questo dispositivo, esso non sarà più in grado di inviare o ricevere messaggi.</string>
  <string name="DeviceListActivity_network_connection_failed">Connessione di rete fallita....</string>
  <string name="DeviceListActivity_try_again">Riprova</string>
+  <string name="DeviceListActivity_unlinking_device">Scollegamento dispositivo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Scollegamento dispositivo</string>
  <string name="DeviceListActivity_network_failed">Errore di rete!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Dispositivo senza nome</string>
+  <string name="DeviceListItem_linked_s">Collegato %s</string>
  <string name="DeviceListItem_last_active_s">Ultima attività %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Condividi con</string>
@ -242,9 +250,13 @@ una nuova importazione creerà dei messaggi duplicati.</string>
  <string name="DeviceProvisioningActivity_content_bullets">
 - Leggere tutti i tuoi messaggi
 \n- Inviare messaggi col tuo nome</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Collegamento dispositivo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Collegamento nuovo dispositivo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo collegato!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Nessun dispositivo trovato.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Errore di rete.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Codice QR non valido.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Siamo spiacenti, hai già troppi dispositivi collegati. Prova a scollegarne qualcuno...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Inserire la password</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Icona TextSecure</string>
@ -384,7 +396,6 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
  <string name="KeyCachingService_passphrase_cached">TextSecure è sbloccato</string>
  <string name="KeyCachingService_lock">Chiudi con password</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d messaggi in %2$d conversazioni</string>
  <string name="MessageNotifier_most_recent_from_s">Il più recente da: %1$s</string>
  <string name="MessageNotifier_locked_message">Messaggio bloccato...</string>
  <string name="MessageNotifier_media_message_with_text">Messaggio multimediale: %s</string>
@ -399,6 +410,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Risposta veloce non disponibile quando TextSecure è bloccato!</string>
  <string name="QuickResponseService_problem_sending_message">Problema nell\'invio del messaggio!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">Vecchia password:</string>
  <string name="change_passphrase_activity__new_passphrase">Nuova password:</string>
@ -449,6 +461,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
  <string name="country_selection_fragment__loading_countries">Caricamento dei paese...</string>
  <string name="country_selection_fragment__search">Cerca</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Nessun dispositivo collegato...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Non riesco a recuperare i log dal tuo dispositivo. Puoi sempre utilizzare ADB per ottenere i log di debug.</string>
  <string name="log_submit_activity__thanks">Grazie dell\'aiuto!</string>
@ -609,6 +622,7 @@ non riuscita.
  <string name="AndroidManifest__media_overview">Tutte le immagini</string>
  <string name="AndroidManifest__media_overview_named">Tutte le immagini con %1$s</string>
  <string name="AndroidManifest__message_details">Dettagli messaggio</string>
+  <string name="AndroidManifest_manage_linked_devices">Gestisci dispositivi collegati</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Importa / Esporta</string>
  <string name="arrays__my_identity_key">La chiave della mia identità</string>
@ -655,7 +669,6 @@ non riuscita.
  <string name="preferences__pref_timeout_interval_title">Intervallo di tempo</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">La quantità di tempo prima di dimenticare la password</string>
  <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__led_color_unknown">Sconosciuto</string>
  <string name="preferences__pref_led_blink_title">Impostazioni LED</string>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@ -162,6 +162,7 @@
  <string name="MessageNotifier_error_delivering_message">שגיאה במסירת ההודעה.</string>
  <string name="MessageNotifier_mark_all_as_read">סמן הכל כנקרא</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">סיסמה ישנה:</string>
  <string name="change_passphrase_activity__new_passphrase">סיסמה חדשה:</string>
@ -244,7 +245,6 @@
  <string name="preferences__pref_timeout_interval_title">זמן התוקף</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">פרק הזמן שיש להמתין לפני שכיחת הסיסמה מהזיכרון</string>
  <string name="preferences__notifications">התראות</string>
-  <string name="preferences__display_message_notifications_in_status_bar">הצג התראות של הודעה בשורת המצב</string>
  <string name="preferences__led_color">צבע LED</string>
  <string name="preferences__pref_led_blink_title">תבנית הבהוב ה- LED</string>
  <string name="preferences__sound">קול</string>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@ -12,6 +12,10 @@
  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">全ての古いメッセージを今、削除しますか？</string>
  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">今すぐ全ての会話スレッドを最新メッセージ%s通にまで縮小（トリム）しますか？</string>
  <string name="ApplicationPreferencesActivity_delete">削除</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">パスワードを無効にする?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+        ロックスクリーンでのメッセージを無効化する?
+    </string>
  <string name="ApplicationPreferencesActivity_disable">無効</string>
  <string name="ApplicationPreferencesActivity_unregistering">未登録</string>
  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">TextSecureメッセージが未登録...</string>
@ -38,6 +42,7 @@
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">メディアの選択用アプリが見つかりません。</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">カメラ</string>
  <string name="AttachmentTypeSelectorAdapter_picture">写真</string>
  <string name="AttachmentTypeSelectorAdapter_video">動画</string>
  <string name="AttachmentTypeSelectorAdapter_audio">音声</string>
@ -80,6 +85,7 @@
  <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_the_gif_you_selected_was_too_big">あなたの選択したGIFは大きすぎます!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">選択された映像ファイルはサイズ限度を超えています(%1$skB)。</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">選択された音声ファイルはサイズ限度を超えています(%1$skB)。</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">受信先のSMS又はEメールアドレスが有効ではありません。</string>
@ -143,11 +149,16 @@
  <string name="DateUtils_now">今</string>
  <string name="DateUtils_minutes_ago">%d 分</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">\'%s\' をリンク解除?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">このデバイスをリンク解除すると、メッセージを送信/受信することはできなくなります。</string>
  <string name="DeviceListActivity_network_connection_failed">ネットワーク接続が失敗...</string>
  <string name="DeviceListActivity_try_again">再試行</string>
+  <string name="DeviceListActivity_unlinking_device">デバイスのリンク解除...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">デバイスのリンク解除</string>
  <string name="DeviceListActivity_network_failed">ネットワークが失敗!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">無名のデバイス</string>
+  <string name="DeviceListItem_linked_s">%s とリンク</string>
  <string name="DeviceListItem_last_active_s">最後にアクティブ %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">共有</string>
@ -236,9 +247,13 @@
        - あなたへのすべてのメッセージを読むこと
        \n- あなたの名前でメッセージを送ること
    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">デバイスのリンク</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">新しいデバイスのリンク...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">デバイスとリンクした!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">デバイスがありません。</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">ネットワークエラー。</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">QRコードが無効。</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">すみません、あなたはすでにとても多数のデバイスをリンクしています、なんらかを削除してください...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">パスワード入力</string>
  <string name="PassphrasePromptActivity_watermark_content_description">TextSecureアイコン</string>
@ -370,7 +385,6 @@
  <string name="KeyCachingService_passphrase_cached">TextSecureは、アンロックされています</string>
  <string name="KeyCachingService_lock">パスワードでロックする</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%2$d 会話の中の %1$d メッセージ </string>
  <string name="MessageNotifier_most_recent_from_s">最新の受信は次から: %1$s</string>
  <string name="MessageNotifier_locked_message">メッセージをロック...</string>
  <string name="MessageNotifier_media_message_with_text">メディアメッセージ: %s</string>
@ -385,11 +399,13 @@
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">TextSecureがロックされていますので、クイック返信は利用できません!</string>
  <string name="QuickResponseService_problem_sending_message">送信メッセージでの問題!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">既存のパスワード：</string>
  <string name="change_passphrase_activity__new_passphrase">新規のパスワード：</string>
  <string name="change_passphrase_activity__repeat_new_passphrase">新規のパスワードを再入力：</string>
  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">名前もしくは番号を入力</string>
  <!--contact_selection_group_activity-->
  <string name="contact_selection_group_activity__no_contacts">連絡先はありません。</string>
  <string name="contact_selection_group_activity__finding_contacts">連絡先を読み込み中…</string>
@ -435,6 +451,7 @@
  <string name="country_selection_fragment__loading_countries">国名を読み込み中...</string>
  <string name="country_selection_fragment__search">検索</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">リンクしたデバイスはありません...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">デバッグログの入手に失敗しました。ADBを使ってログの入手は、可能です。</string>
  <string name="log_submit_activity__thanks">提出どうもありがとうございます！</string>
@ -572,6 +589,7 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
  <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_linked_devices">リンク済みデバイスの管理</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">インポート／エクスポート</string>
  <string name="arrays__my_identity_key">自分の認証キー</string>
@ -618,7 +636,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
  <string name="preferences__pref_timeout_interval_title">タイムアウトの間隔</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">メモリからパスワードを消去するまでの待ち時間です</string>
  <string name="preferences__notifications">通知</string>
-  <string name="preferences__display_message_notifications_in_status_bar">受信通知をステータスバーに表示</string>
  <string name="preferences__led_color">LED色</string>
  <string name="preferences__led_color_unknown">不明</string>
  <string name="preferences__pref_led_blink_title">LED点滅パターン</string>
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@ -348,7 +348,6 @@
  <string name="KeyCachingService_passphrase_cached">ಟೆಕ್ಸ್ಟ್ ಸೆಕ್ಯೂರ್  ಬೀಗ ತೆಗೆದಿದೆ </string>
  <string name="KeyCachingService_lock">ಗುಪ್ತಪದವನ್ನು ಉಪಯೋಗಿಸಿಕೊಂಡು ಬೀಗ ಹಾಕಿ</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d ಸಂದೇಶಗಳನ್ನು %2$d ಸಂಭಾಷಣೆಗಳಲ್ಲಿ.</string>
  <string name="MessageNotifier_most_recent_from_s">%1$s ನಿಂದ ಇತ್ತೀಚಿನ</string>
  <string name="MessageNotifier_media_message_with_text">ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ: %s</string>
  <string name="MessageNotifier_no_subject">(ವಿಷಯವಸ್ತು ಇಲ್ಲ)</string>
@ -358,6 +357,7 @@
  <string name="MessageNotifier_mark_all_as_read">ಎಲ್ಲವನ್ನು ಓದಿದೆ ಎಂದು ಗುರುತು ಮಾಡಿ</string>
  <string name="MessageNotifier_media_message">ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">ಹಳೆಯ ಗುಪ್ತಪದ:</string>
  <string name="change_passphrase_activity__new_passphrase">ಹೊಸ ಗುಪ್ತಪದ:</string>
@ -569,7 +569,6 @@
  <string name="preferences__pref_timeout_interval_title">ಕಾಲಾವಧಿ</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">ಸ್ಮರಣೆಯಿಂದ ಗುಪ್ತಪದವನ್ನು ಮರೆಯುವ ಮೊದಲು ಕಾಯಬೇಕಿರುವ ಸಮಯ ಪ್ರಮಾಣ</string>
  <string name="preferences__notifications">ಸೂಚನೆಗಳು</string>
-  <string name="preferences__display_message_notifications_in_status_bar">ಸ್ಥಿತಿ ಪಟ್ಟಿಯಲ್ಲಿ ಸಂದೇಶದ ಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
  <string name="preferences__led_color">ಎಲ್. ಇ. ಡಿ ಬಣ್ಣ</string>
  <string name="preferences__led_color_unknown">ತಿಳಿಯದ</string>
  <string name="preferences__pref_led_blink_title">ಎಲ್. ಇ. ಡಿ ಮಿಣುಕುವ ಮಾದರಿ</string>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@ -141,11 +141,16 @@
  <string name="DateUtils_now">방금 전</string>
  <string name="DateUtils_minutes_ago">%d분 전</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">%s을(를) 연결 해제하시겠습니까?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">연결 해제를 통해 메시지를 보내거나 받지 못할 수 있습니다.</string>
  <string name="DeviceListActivity_network_connection_failed">네트워크에 연결되지 않습니다.</string>
  <string name="DeviceListActivity_try_again">다시 시도</string>
+  <string name="DeviceListActivity_unlinking_device">기기 연결 해제 중…</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">기기 연결 해제</string>
  <string name="DeviceListActivity_network_failed">네트워크에 연결되지 않음</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">이름이 없는 기기</string>
+  <string name="DeviceListItem_linked_s">연결: %s</string>
  <string name="DeviceListItem_last_active_s">최근 사용: %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">공유 대상</string>
@ -224,16 +229,20 @@
  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">기존 암호가 잘못됨</string>
  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">새 암호가 입력되지 않음</string>
  <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">해당 기기를 설정하시겠습니까?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">해당 기기를 연결하시겠습니까?</string>
  <string name="DeviceProvisioningActivity_cancel">취소</string>
  <string name="DeviceProvisioningActivity_continue">확인</string>
-  <string name="DeviceProvisioningActivity_title">해당 기기를 설정하시겠습니까?</string>
+  <string name="DeviceProvisioningActivity_title">해당 기기를 연결하시겠습니까?</string>
  <string name="DeviceProvisioningActivity_content_intro">액세스 권한</string>
  <string name="DeviceProvisioningActivity_content_bullets">- 내 메시지 읽기
 \n- 내 이름으로 메시지 보내기</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">기기 연결</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">새 기기를 연결 중…</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">기기 연결 완료</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">기기 없음</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">네트워크 오류</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">QR코드가 잘못됨</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">기기 연결 가능 갯수 초과하여 기존의 기기 중 하나 연결 해제 필요</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">암호 입력</string>
  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 아이콘</string>
@ -361,7 +370,6 @@
  <string name="KeyCachingService_passphrase_cached">TextSecure 잠금 해제 됨</string>
  <string name="KeyCachingService_lock">암호로 잠금</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">대화 %2$d개에 있는 메시지 %1$d개</string>
  <string name="MessageNotifier_most_recent_from_s">%1$s님에게서 최근 메시지</string>
  <string name="MessageNotifier_locked_message">잠겨 있는 메시지</string>
  <string name="MessageNotifier_media_message_with_text">미디어 메시지: %s</string>
@ -376,6 +384,7 @@
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">TextSecure 잠겨 있는 경우 빠른 응답 사용할 수 없음</string>
  <string name="QuickResponseService_problem_sending_message">메시지 보내지 못함</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">기존 암호:</string>
  <string name="change_passphrase_activity__new_passphrase">새 암호:</string>
@ -427,6 +436,7 @@
  <string name="country_selection_fragment__loading_countries">국가 로드 중…</string>
  <string name="country_selection_fragment__search">검색</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">연결된 기기 없음</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">기기에서 로그 가져올 수 없지만 ADB로 수동 가져올 수 있음</string>
  <string name="log_submit_activity__thanks">도와주셔서 감사합니다.</string>
@ -547,6 +557,7 @@
  <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_linked_devices">연결된 기기 관리</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">가져오기 / 내보내기</string>
  <string name="arrays__my_identity_key">내 인증 키</string>
@ -592,7 +603,6 @@
  <string name="preferences__pref_timeout_interval_title">시간 초과 간격</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">메모리에서 암호 삭제되지 않는 기간</string>
  <string name="preferences__notifications">알림</string>
-  <string name="preferences__display_message_notifications_in_status_bar">메시지 알림 표시</string>
  <string name="preferences__led_color">알림등 색상</string>
  <string name="preferences__led_color_unknown">알 수 없음</string>
  <string name="preferences__pref_led_blink_title">알림등 반복 패턴</string>
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@ -377,7 +377,6 @@
  <string name="KeyCachingService_passphrase_cached">TextSecure е отклучен.</string>
  <string name="KeyCachingService_lock">Заклучете со лозинка</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d пораки во %2$d теми</string>
  <string name="MessageNotifier_most_recent_from_s">Најнови од: %1$s</string>
  <string name="MessageNotifier_media_message_with_text">Медиа порака: %s</string>
  <string name="MessageNotifier_no_subject">(Без наслов)</string>
@ -387,6 +386,7 @@
  <string name="MessageNotifier_mark_all_as_read">Обележи ги сите како прочитани</string>
  <string name="MessageNotifier_media_message">Медиа порака</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">СТАРА ЛОЗИНКА:</string>
  <string name="change_passphrase_activity__new_passphrase">НОВА ЛОЗИНКА:</string>
@ -627,7 +627,6 @@ TextSecure автоматски ќе го провери вашиот број
  <string name="preferences__pref_timeout_interval_title">Интервал за временско ограничување </string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Време после кое лозинката ќе биде избришана од меморија</string>
  <string name="preferences__notifications">Известувања</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Покажете известувања во лентата за статуси</string>
  <string name="preferences__led_color">LED боја</string>
  <string name="preferences__led_color_unknown">Непознато</string>
  <string name="preferences__pref_led_blink_title">LED примерок за трепкање</string>
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@ -126,6 +126,7 @@
  <string name="MessageNotifier_failed_to_deliver_message">အကြောင်းကြားချက်ပို့လွတ်ရန်မအောင်မြင်</string>
  <string name="MessageNotifier_error_delivering_message">အကြောင်းကြားချက်ပို့လွတ်စဉ်အမှား</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">စကားဝှက်အဟောင်း:</string>
  <string name="change_passphrase_activity__new_passphrase">စကားဝှက်အသစ်:</string>
@ -192,7 +193,6 @@
  <string name="preferences__pref_timeout_interval_title">ကြားချိန်</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">မန်မိုရီပေါ်မှစကားဝှက်ပျောက်မသွားခင်စောင့်ရမည့်ကြာချိန်</string>
  <string name="preferences__notifications">အသိပေးချက်များ</string>
-  <string name="preferences__display_message_notifications_in_status_bar">null</string>
  <string name="preferences__vibrate">တုန်ခါမှု</string>
  <string name="preferences__also_vibrate_when_notified">အချက်ပြစဉ်တုန်ခါပါ</string>
  <string name="preferences__minutes">မိနစ်</string>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@ -145,11 +145,16 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
  <string name="DateUtils_now">Nu</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Ontkoppel \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Door het ontkoppelen van dit apparaat kan het niet langer berichten verzenden of ontvangen.</string>
  <string name="DeviceListActivity_network_connection_failed">Netwerkverbinding mislukt..</string>
  <string name="DeviceListActivity_try_again">Probeer opnieuw</string>
+  <string name="DeviceListActivity_unlinking_device">Apparaat ontkoppelen...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Apparaat ontkoppelen</string>
  <string name="DeviceListActivity_network_failed">Netwerkfout!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Naamloos apparaat</string>
+  <string name="DeviceListItem_linked_s">Gekoppeld %s</string>
  <string name="DeviceListItem_last_active_s">Laatst actief %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Delen met</string>
@ -238,9 +243,13 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
        - Al je berichten lezen
        \n- Berichten versturen namens jou
    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Apparaat koppelen</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Koppelen nieuw apparaat...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Apparaat gekoppeld!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Geen apparaat gevonden.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Netwerkfout!</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Ongeldige QR code.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, u hebt teveel gekoppelde apparaten, probeer er te verwijderen...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Voer wachtwoord in</string>
  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure icoon</string>
@ -376,7 +385,6 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
  <string name="KeyCachingService_passphrase_cached">TextSecure is ontgrendeld</string>
  <string name="KeyCachingService_lock">Vergrendelen met wachtwoord</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d berichten in %2$d gesprekken</string>
  <string name="MessageNotifier_most_recent_from_s">Meest recente van: %1$s</string>
  <string name="MessageNotifier_locked_message">Vergrendeld bericht...</string>
  <string name="MessageNotifier_media_message_with_text">Mediabericht: %s</string>
@ -391,6 +399,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Snel reageren niet beschikbaar als TextSecure vergrendeld is!</string>
  <string name="QuickResponseService_problem_sending_message">Fout bij het bericht versturen!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">Oud wachtwoord:</string>
  <string name="change_passphrase_activity__new_passphrase">Nieuw wachtwoord:</string>
@ -442,6 +451,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
  <string name="country_selection_fragment__loading_countries">Landen laden...</string>
  <string name="country_selection_fragment__search">Zoeken</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Geen apparaten gekoppeld...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Kan geen logs van je apparaat verzamelen. Je kan nog steeds ADB gebruiken om debug logs te verzamelen.</string>
  <string name="log_submit_activity__thanks">Bedankt voor uw hulp!</string>
@ -585,6 +595,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
  <string name="AndroidManifest__media_overview">Alle afbeeldingen</string>
  <string name="AndroidManifest__media_overview_named">Alle afbeeldingen met %1$s</string>
  <string name="AndroidManifest__message_details">Bericht Details</string>
+  <string name="AndroidManifest_manage_linked_devices">Beheer gekoppelde apparaten</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Importeren / exporteren</string>
  <string name="arrays__my_identity_key">Mijn identiteitssleutel</string>
@ -631,7 +642,6 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
  <string name="preferences__pref_timeout_interval_title">Time-out interval</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hoe lang te wachten voor het vergeten van het wachtwoord uit het geheugen</string>
  <string name="preferences__notifications">Notificaties</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Berichtmeldingen in notificatiebalk tonen</string>
  <string name="preferences__led_color">LED-kleur</string>
  <string name="preferences__led_color_unknown">Onbekend</string>
  <string name="preferences__pref_led_blink_title">LED-knipperpatroon</string>
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@ -145,11 +145,16 @@ denne kontakten.</string>
  <string name="DateUtils_now">Nå</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Frakoble \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_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_unlinking_device">Frakobler enhet...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Frakobler enhet</string>
  <string name="DeviceListActivity_network_failed">Nettverk feilet!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Ikke navngitt enhet</string>
+  <string name="DeviceListItem_linked_s">%s tilkoblet</string>
  <string name="DeviceListItem_last_active_s">Sist aktiv %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Del med</string>
@ -238,9 +243,13 @@ Gjenoppretting av en kryptert backup vil overskrive eksisterende nøkler, innsti
 - Lese alle meldingene dine
 \n- Sende meldinger i ditt navn
 </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Kobler enhet</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Kobler til ny enhet...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Enhet tilkoblet!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Ingen enhet funnet.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Nettverksfeil.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Ugyldig QR-kode.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Beklager, du har for mange enheter koblet til allerede, forsøk å fjerne noen...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Tast inn passord</string>
  <string name="PassphrasePromptActivity_watermark_content_description">TextSecure ikon</string>
@ -375,7 +384,6 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</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_messages_in_d_conversations">%1$d meldinger i %2$d samtaler</string>
  <string name="MessageNotifier_most_recent_from_s">Nyeste fra: %1$s</string>
  <string name="MessageNotifier_locked_message">Låst melding...</string>
  <string name="MessageNotifier_media_message_with_text">Media melding: %s</string>
@ -390,6 +398,7 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Rask tilbakemelding ikke tilgjengelig når TextSecure er låst!</string>
  <string name="QuickResponseService_problem_sending_message">Kunne ikke sende melding!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">Gammelt passord:</string>
  <string name="change_passphrase_activity__new_passphrase">Nytt passord:</string>
@ -441,6 +450,7 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
  <string name="country_selection_fragment__loading_countries">Laster land...</string>
  <string name="country_selection_fragment__search">Søk</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Ingen enheter tilkoblet...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Kunne ikke hente loggene fra din enhet. Du kan fremdeles benytte ADB for å hente debug logger.</string>
  <string name="log_submit_activity__thanks">Takk for hjelpen!</string>
@ -579,6 +589,7 @@ feilet.</string>
  <string name="AndroidManifest__media_overview">Alle bilder</string>
  <string name="AndroidManifest__media_overview_named">Alle bilder med %1$s</string>
  <string name="AndroidManifest__message_details">Meldingsdetaljer</string>
+  <string name="AndroidManifest_manage_linked_devices">Administrer tilkoblede enheter</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Importere / eksportere</string>
  <string name="arrays__my_identity_key">Min ID-nøkkel</string>
@ -625,7 +636,6 @@ feilet.</string>
  <string name="preferences__pref_timeout_interval_title">Timeoutintervall</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tiden det skal gå før passordet slettes fra minnet på enheten</string>
  <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__led_color_unknown">Ukjent</string>
  <string name="preferences__pref_led_blink_title">LED blinkemønster</string>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@ -12,6 +12,10 @@
  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Usunąć wszystkie stare wiadomości?</string>
  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Czy na pewno chcesz przyciąć wszystkie wątki rozmów do %s najnowszych wiadomości?</string>
  <string name="ApplicationPreferencesActivity_delete">Usuń</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Wyłączyć hasło?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+Wyłączyć blokadę ekranu dla wiadomości?
+</string>
  <string name="ApplicationPreferencesActivity_disable">Wyłącz</string>
  <string name="ApplicationPreferencesActivity_unregistering">Wyrejestrowanie </string>
  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Trwa wyrejestrowanie od używania wiadomości TextSecure</string>
@ -38,6 +42,7 @@ Aby ponownie zacząć używać wiadomości TextSecure, będziesz musiał/a ponow
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">Nie można znaleźć aplikacji, aby wybrać media.</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
  <string name="AttachmentTypeSelectorAdapter_picture">Zdjęcie</string>
  <string name="AttachmentTypeSelectorAdapter_video">Film</string>
  <string name="AttachmentTypeSelectorAdapter_audio">Dźwięk</string>
@ -51,6 +56,7 @@ ten kontakt.
 </string>
  <string name="ConfirmIdentityDialog_accept">Akceptuj</string>
  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">Wiadomość %s</string>
  <!--ConversationItem-->
  <string name="ConversationItem_message_size_d_kb">Rozmiar wiadomości: %d KB </string>
  <string name="ConversationItem_expires_s">Wygasa: %s</string>
@ -77,6 +83,7 @@ ten kontakt.
  <string name="ConversationActivity_select_contact_info">Wybierz dane kontaktowe</string>
  <string name="ConversationActivity_compose_message">Nowa wiadomość</string>
  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Przepraszamy, wystąpił błąd podczas dodawania załącznika.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Obraz gif, który wybrałeś był zbyt duży!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Przepraszamy, ten plik wideo przekracza dozwolony rozmiar (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Przepraszamy, ten plik audio przekracza dozwolony rozmiar (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Podany numer lub adres e-mail jest niepoprawny!</string>
@ -140,11 +147,16 @@ ten kontakt.
  <string name="DateUtils_now">Teraz</string>
  <string name="DateUtils_minutes_ago">%d minuta</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Wyrejestrować \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Wyrejestrowanie tego urządzenia spowoduje, że nie będziesz miał możliwości wysyłania i odbierania 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_unlinking_device">Wyrejestrowywanie urządzenia...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Wyrejestrowywanie 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_linked_s">Zarejestrowano %s</string>
  <string name="DeviceListItem_last_active_s">Ostatnio aktywny %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Podziel się z</string>
@ -234,9 +246,13 @@ Przywracanie szyfrowanej kopii zapasowej TextSecure spowoduje nadpisanie Twoich
 \n- Wysyłać wiadomości w Twoim imieniu

    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Rejestrowanie urządzenia</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Rejestrowanie nowego urządzenia...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Urządzenie zostało zarejestrowane!</string>
  <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_linked_already">Niestety masz już zbyt dużo zarejestrowanych urządzeń, spróbuj usunąć któreś z nich...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Podaj hasło</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@ -371,24 +387,27 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
  <string name="KeyCachingService_passphrase_cached">TextSecure jest odblokowany</string>
  <string name="KeyCachingService_lock">Zablokuj hasłem</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d wiadomości w %2$d wątkach</string>
  <string name="MessageNotifier_most_recent_from_s">Najnowsza z: %1$s</string>
+  <string name="MessageNotifier_locked_message">Wiadomość zablokowana...</string>
  <string name="MessageNotifier_media_message_with_text">Wiadomość multimedialna: %s</string>
  <string name="MessageNotifier_no_subject">(Brak tematu)</string>
  <string name="MessageNotifier_message_delivery_failed">Nie udało się dostarczyć wiadomości.</string>
  <string name="MessageNotifier_failed_to_deliver_message">Dostarczenie wiadomości nie powiodło się.</string>
  <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_read">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>
+  <!--SingleRecipientNotificationBuilder-->
  <!--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>
  <string name="change_passphrase_activity__repeat_new_passphrase">POWTÓRZ NOWE HASŁO:</string>
  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">Wprowadź nazwę lub numer</string>
  <!--contact_selection_group_activity-->
  <string name="contact_selection_group_activity__no_contacts">Brak kontaktów.</string>
  <string name="contact_selection_group_activity__finding_contacts">Ładowanie listy kontaktów...</string>
@ -412,6 +431,7 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
  <string name="conversation_activity__compose_description">Kompozycja wiadomości</string>
  <string name="conversation_activity__emoji_toggle_description">Przełącz do emoji klawiatury</string>
  <string name="conversation_activity__attachment_thumbnail">Minaturka załącznika</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Bezpośrednie przechwytywanie</string>
  <!--conversation_item-->
  <string name="conversation_item__mms_downloading_description">Trwa pobieranie wiadomości multimedialnej</string>
  <string name="conversation_item__mms_image_description">Wiadomość multimedialna</string>
@ -433,6 +453,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_linked">Brak zarejestrowanych 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>
@ -488,6 +509,8 @@ Importuj niezaszyfrowany plik kopii zapasowej, kompatybilny z \'SMSBackup And Re
  <string name="recipient_preferences__ringtone">Dzwonek</string>
  <string name="recipient_preferences__vibrate">Wibracja</string>
  <string name="recipient_preferences__block">Blokuj</string>
+  <string name="recipient_preferences__color">Kolor</string>
+  <string name="recipient_preferences__color_for_this_contact">Kolor tego kontaktu</string>
  <!--registration_activity-->
  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Weryfikuj swój numer telefonu, aby połączyć się z TextSecure.</string>
@ -497,6 +520,7 @@ 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. Nie będą one zapisane.</string>
+  <string name="registration_activity__powered_by_twilio">Wspierane przez twilio</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>
@ -564,6 +588,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_linked_devices">Zarządzaj zarejestrowanymi 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>
@ -601,6 +626,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
  <string name="preferences__change_my_passphrase">Zmień moje hasło</string>
  <string name="preferences__enable_passphrase">Włącz hasło</string>
  <string name="preferences__passphrase_summary">Hasło %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">Włącz blokadę ekranu dla wiadomości</string>
  <string name="preferences__screen_security">Ochrona ekranu</string>
  <string name="preferences__screen_security_summary">Ochrona ekranu %s</string>
  <string name="preferences__disable_screen_security_to_allow_screen_shots">Blokuj rzuty ekranu w obecnej liście oraz w aplikacji</string>
@ -610,7 +636,6 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
  <string name="preferences__pref_timeout_interval_title">Wybierz czas wygaśnięcia hasła</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Ilość czasu zanim hasło zostanie wymazane z pamięci urządzenia</string>
  <string name="preferences__notifications">Powiadomienia</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Wyświetlaj powiadomienia wiadomości w pasku statusu</string>
  <string name="preferences__led_color">Kolor LED</string>
  <string name="preferences__led_color_unknown">Nieznane</string>
  <string name="preferences__pref_led_blink_title">Wzór powiadomień LED</string>
@ -730,6 +755,7 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
  <string name="conversation__menu_leave_group">Opuść grupę</string>
  <string name="conversation__menu_delete_thread">Usuń wątek</string>
  <string name="conversation__menu_view_media">Wszystkie obrazy</string>
+  <string name="conversation__menu_conversation_settings">Ustawienia rozmowy</string>
  <!--conversation_popup-->
  <string name="conversation_popup__menu_expand_popup">Powiększ okno</string>
  <!--conversation_callable-->
@ -773,5 +799,6 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
  <!--transport_selection_list_item-->
  <string name="transport_selection_list_item__transport_icon">Ikona transportu</string>
  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera jest niedostępna</string>
  <!--EOF-->
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@ -43,6 +43,7 @@
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">Não localizei um aplicativo para selecionar o arquivo.</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Câmera</string>
  <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
  <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
  <string name="AttachmentTypeSelectorAdapter_audio">Áudio</string>
@ -88,6 +89,7 @@ Tem certeza que deseja fazer isto?</string>
  <string name="ConversationActivity_select_contact_info">Selecionar informações de contato</string>
  <string name="ConversationActivity_compose_message">Escrever mensagem</string>
  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Lamento, ocorreu um erro no envio do seu anexo</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">O gif selecionado é muito grande!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Desculpe, o vídeo selecionado excede as restrições de tamanho da mensagem (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Desculpe, o áudio selecionado excede as restrições de tamanho da mensagem (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Destinatário não é um endereço SMS ou email válido!</string>
@ -151,11 +153,16 @@ Tem certeza que deseja fazer isto?</string>
  <string name="DateUtils_now">Agora</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Desvincular \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desvincular este dispositivo, ele não será mais capaz de 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_unlinking_device">Desvinculando dispositivo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Desvinculando dispositivo</string>
  <string name="DeviceListActivity_network_failed">Rede falhou!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Dispositivo sem nome</string>
+  <string name="DeviceListItem_linked_s">%s vinculado</string>
  <string name="DeviceListItem_last_active_s">Último ativo %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Compartilhar com</string>
@ -255,9 +262,13 @@ Tem certeza que deseja fazer isto?</string>
        - Ler todas as suas mensagens
        \n- Enviar mensagens em seu nome
    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Vinculando dispositivo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Vinculando novo dispositivo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo vinculado!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Nenhum dispositivo encontrado.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Erro de rede.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR inválido.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Desculpe, você já possui muitos dispositivos vinculados. Tente remover alguns...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Inserir frase-chave</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Ícone do TextSecure</string>
@ -403,7 +414,6 @@ Tem certeza que deseja fazer isto?</string>
  <string name="KeyCachingService_passphrase_cached">TextSecure está destrancado</string>
  <string name="KeyCachingService_lock">Trancar com frase-chave</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mensagens em %2$d conversas</string>
  <string name="MessageNotifier_most_recent_from_s">Mais recente de: %1$s</string>
  <string name="MessageNotifier_locked_message">Mensagem trancada...</string>
  <string name="MessageNotifier_media_message_with_text">Mensagem multimídia: %s</string>
@ -418,6 +428,7 @@ Tem certeza que deseja fazer isto?</string>
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Responder rápido não está disponível quando o TextSecure está travado!</string>
  <string name="QuickResponseService_problem_sending_message">Problema ao enviar mensagem!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--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>
@ -469,6 +480,7 @@ Tem certeza que deseja fazer isto?</string>
  <string name="country_selection_fragment__loading_countries">Carregando países...</string>
  <string name="country_selection_fragment__search">Procurar</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Nenhum dispositivo vinculado...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Não foi possível captar logs do seu dispositivo. É possível usar como alternativa o ADB para captar logs de debug.</string>
  <string name="log_submit_activity__thanks">Obrigado por sua ajuda!</string>
@ -630,6 +642,7 @@ falhou.</string>
  <string name="AndroidManifest__media_overview">Todas as imagens</string>
  <string name="AndroidManifest__media_overview_named">Todas as imagens com %1$s</string>
  <string name="AndroidManifest__message_details">Detalhes da mensagem</string>
+  <string name="AndroidManifest_manage_linked_devices">Gerenciar dispositivos vinculados</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Importar / exportar</string>
  <string name="arrays__my_identity_key">Minha chave de identidade</string>
@ -676,7 +689,6 @@ falhou.</string>
  <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
  <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__led_color_unknown">Desconhecida</string>
  <string name="preferences__pref_led_blink_title">Padrão de piscagem do LED</string>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@ -394,7 +394,6 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
  <string name="KeyCachingService_passphrase_cached">O TextSecure está desbloqueado</string>
  <string name="KeyCachingService_lock">Bloquear com frase-chave</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mensagens em %2$d conversas</string>
  <string name="MessageNotifier_most_recent_from_s">Mais recente de: %1$s</string>
  <string name="MessageNotifier_locked_message">Mensagem bloqueada...</string>
  <string name="MessageNotifier_media_message_with_text">Mensagem media: %s</string>
@ -409,6 +408,7 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">A resposta rápida encontra-se indisponível quando o TextSecure está bloqueado!</string>
  <string name="QuickResponseService_problem_sending_message">Problema no envio da mensagem!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--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>
@ -658,7 +658,6 @@ falhou.
  <string name="preferences__pref_timeout_interval_title">Intervalo de expiração</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Tempo a esperar antes de remover a frase-chave da memória</string>
  <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__led_color_unknown">Desconhecido</string>
  <string name="preferences__pref_led_blink_title">Padrão de piscar do LED</string>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@ -352,7 +352,6 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
  <string name="KeyCachingService_passphrase_cached">TextSecure e deblocat.</string>
  <string name="KeyCachingService_lock">Blocare acces cu parola</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d mesaje în %2$d conversaţii</string>
  <string name="MessageNotifier_most_recent_from_s">Cel mai recent de la: %1$s</string>
  <string name="MessageNotifier_locked_message">Mesaj blocat...</string>
  <string name="MessageNotifier_media_message_with_text">Mesaje media: %s</string>
@ -366,6 +365,7 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
  <string name="MessageNotifier_reply">Răspunde</string>
  <!--QuickResponseService-->
  <string name="QuickResponseService_problem_sending_message">Problemă la trimiterea mesajului!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">PAROLA VECHE:</string>
  <string name="change_passphrase_activity__new_passphrase">NOUA PAROLĂ:</string>
@ -598,7 +598,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
  <string name="preferences__pref_timeout_interval_title">Interval expirare</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Perioada de timp de așteptare înainte de a șterge parola din memorie</string>
  <string name="preferences__notifications">Notificări</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Afișează notificările în bara de stare</string>
  <string name="preferences__led_color">Culoare LED</string>
  <string name="preferences__led_color_unknown">Necunoscut</string>
  <string name="preferences__pref_led_blink_title">Tipar de clipire LED</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@ -368,7 +368,6 @@
  <string name="KeyCachingService_passphrase_cached">TextSecure разблокирован</string>
  <string name="KeyCachingService_lock">Заблокировать парольной фразой</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d сообщений %2$d разговорах</string>
  <string name="MessageNotifier_most_recent_from_s">Последнее от %1$s</string>
  <string name="MessageNotifier_media_message_with_text">MMS-сообщение: %s</string>
  <string name="MessageNotifier_no_subject">(Нет темы)</string>
@ -382,6 +381,7 @@
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Быстрые ответы недоступны, когда TextSecure заблокирован!</string>
  <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">СТАРАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
  <string name="change_passphrase_activity__new_passphrase">НОВАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
@ -625,7 +625,6 @@ SMS-подтверждения...
  <string name="preferences__pref_timeout_interval_title">Срок хранения</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Время, по прошествии которого парольная фраза будет стёрта из памяти</string>
  <string name="preferences__notifications">Уведомления</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Показывать уведомления о сообщениях в статусной строке</string>
  <string name="preferences__led_color">Цвет светодиода</string>
  <string name="preferences__led_color_unknown">Неизвестен</string>
  <string name="preferences__pref_led_blink_title">Мигание светодиода</string>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@ -364,7 +364,6 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
  <string name="KeyCachingService_passphrase_cached">TextSecure je otvorený</string>
  <string name="KeyCachingService_lock">Zamkni s heslom</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d správ v %2$d konverzáciách</string>
  <string name="MessageNotifier_most_recent_from_s">Najnovšie od: %1$s</string>
  <string name="MessageNotifier_media_message_with_text">Multimediálna správa: %s</string>
  <string name="MessageNotifier_no_subject">(bez predmetu)</string>
@ -374,6 +373,7 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
  <string name="MessageNotifier_mark_all_as_read">Označ všetko ako prečítané</string>
  <string name="MessageNotifier_media_message">Multimediálna správa</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">Staré heslo:</string>
  <string name="change_passphrase_activity__new_passphrase">Nové heslo:</string>
@ -612,7 +612,6 @@ zlyhalo.
  <string name="preferences__pref_timeout_interval_title">Doba platnosti</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Časový interval po ktorom sa heslo vymaže z pamäte</string>
  <string name="preferences__notifications">Notifikácie</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">LED farba</string>
  <string name="preferences__led_color_unknown">Neznáme</string>
  <string name="preferences__pref_led_blink_title">Sekvencia blikania LED</string>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@ -145,11 +145,16 @@ preveriti ta stik.</string>
  <string name="DateUtils_now">Ravnokar</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Odstranim \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_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_unlinking_device">Odstranjujem napravo...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Odstranjujem napravo</string>
  <string name="DeviceListActivity_network_failed">Povezovanje ni uspelo!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Nepoimenovana naprava</string>
+  <string name="DeviceListItem_linked_s">Povezan z %s</string>
  <string name="DeviceListItem_last_active_s">Zadnja aktivna %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Deli z</string>
@ -236,9 +241,13 @@ preveriti ta stik.</string>
  <string name="DeviceProvisioningActivity_content_bullets">
 - prebirala vsa vaša sporočila
 \n- pošiljala sporočila v vašem imenu</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Povezujem napravo</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Povezujem novo napravo...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Naprava povezana!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Nobena naprava ni bila najdena.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Napaka omrežja.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Neveljavna koda QR.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Imate preveč povezanih naprav, poskusite kakšno odstraniti...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Vnesite geslo</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Ikona TextSecure</string>
@ -370,7 +379,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
  <string name="KeyCachingService_passphrase_cached">TextSecure je odklenjen</string>
  <string name="KeyCachingService_lock">Zakleni z geslom</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">Sporočil: %1$d, pogovorov: %2$d</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">Novih sporočil: %1$d, pogovorov: %2$d</string>
  <string name="MessageNotifier_most_recent_from_s">Zadnje sporočilo od: %1$s</string>
  <string name="MessageNotifier_locked_message">Zaklenjeno sporočilo...</string>
  <string name="MessageNotifier_media_message_with_text">Multimedijsko sporočilo: %s</string>
@ -385,6 +394,9 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Ko je TextSecure zaklenjen, hitro odgovarjanje ni mogoče!</string>
  <string name="QuickResponseService_problem_sending_message">Težava pri pošiljanju sporočila</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Novo sporočilo TextSecure</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Vsebina prikrita</string>
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">Staro geslo:</string>
  <string name="change_passphrase_activity__new_passphrase">Novo geslo:</string>
@ -436,6 +448,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
  <string name="country_selection_fragment__loading_countries">Pripravljam države...</string>
  <string name="country_selection_fragment__search">Poišči</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Ni povezanih naprav...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Ne morem zajeti podatkov iz vaše naprave. Sistemsko zabeležbo lahko zajamete tudi sami preko ADB.</string>
  <string name="log_submit_activity__thanks">Hvala za pomoč!</string>
@ -576,6 +589,7 @@ bila uspešna.</string>
  <string name="AndroidManifest__media_overview">Vse slike</string>
  <string name="AndroidManifest__media_overview_named">Vse slike z %1$s</string>
  <string name="AndroidManifest__message_details">Podrobnosti sporočila</string>
+  <string name="AndroidManifest_manage_linked_devices">Upravljanje povezanih naprav</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Uvoz/izvoz</string>
  <string name="arrays__my_identity_key">Moja identifikacija</string>
@ -588,6 +602,9 @@ bila uspešna.</string>
  <string name="arrays__settings_default">Sistemsko privzeto</string>
  <string name="arrays__enabled">Vklopljeno</string>
  <string name="arrays__disabled">Izklopljeno</string>
+  <string name="arrays__name_and_message">Pošiljatelj in sporočilo</string>
+  <string name="arrays__name_only">Samo pošiljatelj</string>
+  <string name="arrays__neither">Brez</string>
  <!--plurals.xml-->
  <plurals name="hours_ago">
    <item quantity="one">%d ura</item>
@ -624,7 +641,7 @@ bila uspešna.</string>
  <string name="preferences__pref_timeout_interval_title">Čas pomnjenja gesla</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Koliko časa naj bo geslo v pomnilniku, preden bo pozabljeno</string>
  <string name="preferences__notifications">Obvestila</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Prikaz obvestila o sporočilu v statusni vrstici</string>
+  <string name="preferences__enable_message_notifications">Omogoči obvestila o novih sporočilih</string>
  <string name="preferences__led_color">Barva LED</string>
  <string name="preferences__led_color_unknown">Neznano</string>
  <string name="preferences__pref_led_blink_title">Vzorec utripanja LED</string>
@ -692,6 +709,7 @@ Brezplačno zasebno sporočanje za TextSecure in Signal</string>
  <string name="preferences__support_wifi_calling">Združljivostni način \'Klicanje WiFi\'</string>
  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivirajte, če dostava SMS/MMS sporočil na vaši napravi poteka preko povezave WiFi (samo, če imate vklopljeno \'WiFi klicanje/WiFi Calling)</string>
  <string name="preferences_app_protection__blocked_contacts">Blokirani stiki</string>
+  <string name="preferences_notifications__display_in_notifications">Prikazano v obvestilu</string>
  <!--****************************************-->
  <!--menus-->
  <!--****************************************-->
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@ -148,11 +148,16 @@
  <string name="DateUtils_now">Сад</string>
  <string name="DateUtils_minutes_ago">%d минута</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Да уклоним „%s“?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Овај уређај више неће моћи да шаље или прима поруке ако га уклоните.</string>
  <string name="DeviceListActivity_network_connection_failed">Повезивање на мрежу није успело...</string>
  <string name="DeviceListActivity_try_again">Покушај поново</string>
+  <string name="DeviceListActivity_unlinking_device">Уклањам уређај...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Уклањам уређај</string>
  <string name="DeviceListActivity_network_failed">Неуспех мреже!</string>
  <!--DeviceListItem-->
  <string name="DeviceListItem_unnamed_device">Неименован уређај</string>
+  <string name="DeviceListItem_linked_s">Повезан %s</string>
  <string name="DeviceListItem_last_active_s">Задња активност %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Подели са</string>
@ -240,7 +245,7 @@
  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Нетачна стара лозинка!</string>
  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Унесите нову лозинку!</string>
  <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">Да поежем овај уређај?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Да повежем овај уређај?</string>
  <string name="DeviceProvisioningActivity_cancel">ОДУСТАНИ</string>
  <string name="DeviceProvisioningActivity_continue">НАСТАВИ</string>
  <string name="DeviceProvisioningActivity_title">Повезати овај уређај?</string>
@ -248,9 +253,13 @@
  <string name="DeviceProvisioningActivity_content_bullets">
 - чита све ваше поруке
 \n- шаље поруке у ваше име</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Повезујем уређај</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Повезујем нови уређај...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Уређај повезан!</string>
  <string name="DeviceProvisioningActivity_content_progress_no_device">Није нађен уређај.</string>
  <string name="DeviceProvisioningActivity_content_progress_network_error">Грешка мреже.</string>
  <string name="DeviceProvisioningActivity_content_progress_key_error">Неисправан бар-кôд.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Већ имате превише повезаних уређаја, уклоните неке од њих...</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Унесите лозинку</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Икона Сигурних порука</string>
@ -388,7 +397,6 @@
  <string name="KeyCachingService_passphrase_cached">Сигурне поруке су откључане</string>
  <string name="KeyCachingService_lock">Закључај лозинком</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d порука у %2$d преписки</string>
  <string name="MessageNotifier_most_recent_from_s">Најскорија од: %1$s</string>
  <string name="MessageNotifier_locked_message">Закључана порука...</string>
  <string name="MessageNotifier_media_message_with_text">Мултимедијална порука: %s</string>
@ -403,6 +411,7 @@
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Брзи одговор није доступан ако су Сигурне поруке закључане!</string>
  <string name="QuickResponseService_problem_sending_message">Проблем са слањем поруке!</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">СТАРА ЛОЗИНКА:</string>
  <string name="change_passphrase_activity__new_passphrase">НОВА ЛОЗИНКА:</string>
@ -454,6 +463,7 @@
  <string name="country_selection_fragment__loading_countries">Учитавам државе...</string>
  <string name="country_selection_fragment__search">Тражи</string>
  <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Нема повезаних уређаја...</string>
  <!--log_submit_activity-->
  <string name="log_submit_activity__log_fetch_failed">Не могу да дохватим дневник са вашег уређаја. Можете да искористите АДБ да бисте добавили дневник исправљања грешака.</string>
  <string name="log_submit_activity__thanks">Хвала вам на помоћи!</string>
@ -601,6 +611,7 @@
  <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_linked_devices">Управљај повезаним уређајима</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Увоз/извоз</string>
  <string name="arrays__my_identity_key">Мој кључ идентитета</string>
@ -648,7 +659,6 @@
  <string name="preferences__pref_timeout_interval_title">Интервал истека</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Време чекања пре уклањања лозинке из меморије</string>
  <string name="preferences__notifications">Обавештења</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Прикажи обавештења о порукама у траци стања</string>
  <string name="preferences__led_color">Боја ЛЕД светла</string>
  <string name="preferences__led_color_unknown">Непозната</string>
  <string name="preferences__pref_led_blink_title">Трептање ЛЕД светла</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@ -41,6 +41,7 @@ Stäng av låsskärm för meddelanden?</string>
  <!--AttchmentManager-->
  <string name="AttachmentManager_cant_open_media_selection">Kan ej hitta app för att välja media.</string>
  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
  <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
  <string name="AttachmentTypeSelectorAdapter_video">Video</string>
  <string name="AttachmentTypeSelectorAdapter_audio">Ljud</string>
@ -83,6 +84,7 @@ verifiera denna kontakt.</string>
  <string name="ConversationActivity_select_contact_info">Välj kontaktinformation</string>
  <string name="ConversationActivity_compose_message">Skriv meddelande</string>
  <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Tyvärr uppstod det ett fel vid bifogning av din fil.</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Gifen du valde är för stor!</string>
  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Tyvärr, den valda videon överskrider gränsen för meddelandestorlek (%1$skB).</string>
  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Tyvärr, den valda ljudfilen överskrider gränsen för meddelandestorlek (%1$skB).</string>
  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mottagare är inte en giltig SMS eller e-postadress!</string>
@ -146,11 +148,16 @@ verifiera denna kontakt.</string>
  <string name="DateUtils_now">Nu</string>
  <string name="DateUtils_minutes_ago">%d min</string>
  <!--DeviceListActivity-->
+  <string name="DeviceListActivity_unlink_s">Koppla bort \'%s\'?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Genom att koppla 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_unlinking_device">Kopplar bort enhet...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Kopplar 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_linked_s">Länkade %s</string>
  <string name="DeviceListItem_last_active_s">Senast aktiv %s</string>
  <!--ShareActivity-->
  <string name="ShareActivity_share_with">Dela med</string>
@ -243,9 +250,13 @@ som för närvarande finns i TextSecure.</string>
  <string name="DeviceProvisioningActivity_content_bullets">
 - Läsa alla dina meddelanden
 \n- Skicka meddelanden i ditt namn</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Länkar enhet</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Länkar ny enhet...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Enhet länkad</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_linked_already">Tyvärr har du redan för många länkade 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>
@ -377,7 +388,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
  <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_messages_in_d_conversations">%1$d meddelanden i %2$d konversationer</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nya meddelanden i %2$d konversationer</string>
  <string name="MessageNotifier_most_recent_from_s">Senaste från %1$s</string>
  <string name="MessageNotifier_locked_message">Låst meddelande...</string>
  <string name="MessageNotifier_media_message_with_text">Mediameddelande: %s</string>
@ -392,6 +403,9 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
  <!--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>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_textsecure_message">Nytt TextSecure-meddelande</string>
+  <string name="SingleRecipientNotificationBuilder_contents_hidden">Innehållet dolt</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>
@ -443,6 +457,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_linked">Inga länkade enheter...</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>
@ -580,6 +595,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_linked_devices">Hantera länkade enheter</string>
  <!--arrays.xml-->
  <string name="arrays__import_export">Importera / exportera</string>
  <string name="arrays__my_identity_key">Min identitetsnyckel</string>
@ -592,6 +608,9 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</string>
  <string name="arrays__settings_default">Inställningars standardvärde</string>
  <string name="arrays__enabled">Aktiverad</string>
  <string name="arrays__disabled">Inaktiverad</string>
+  <string name="arrays__name_and_message">Namn och meddelande</string>
+  <string name="arrays__name_only">Endast namn</string>
+  <string name="arrays__neither">Varken eller</string>
  <!--plurals.xml-->
  <plurals name="hours_ago">
    <item quantity="one">%d timme</item>
@ -626,7 +645,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</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">Aviseringar</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Visa meddelande-aviseringar i statusraden</string>
+  <string name="preferences__enable_message_notifications">Slå på meddelandeaviseringar</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>
@ -636,7 +655,7 @@ TextSecure uppnådde tidsgränsen för SMS-verifiering.</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 aviseringsljud</string>
-  <string name="preferences__inthread_notifications">Inom-tråd aviseringar</string>
+  <string name="preferences__inthread_notifications">Aviseringar i tråden</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>
@ -694,6 +713,7 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
  <string name="preferences__support_wifi_calling">\'WiFi Calling\' kompatibilitetsläge</string>
  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivera om din enhet använder SMS/MMS sändning över WiFi (aktivera endast när \'WiFi Calling\' är aktiverat på din enhet)</string>
  <string name="preferences_app_protection__blocked_contacts">Blockerade kontakter</string>
+  <string name="preferences_notifications__display_in_notifications">Visa i aviseringar</string>
  <!--****************************************-->
  <!--menus-->
  <!--****************************************-->
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@ -348,6 +348,7 @@ SMS-களை இறக்குமதி செய்திருந்தா
  <string name="MessageNotifier_mark_all_as_read">அனைத்தையும் படித்தாக குறியிடு</string>
  <string name="MessageNotifier_media_message">மீடியா செய்தி</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">பழைய கடவுச்சொல்:</string>
  <string name="change_passphrase_activity__new_passphrase">புதிய கடவுச்சொல்:</string>
@ -574,7 +575,6 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
  <string name="preferences__pref_timeout_interval_title">காலாவதி நேரம்</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">நினைவகத்திலிருந்து கடவுச்சொல்லை மறக்கச்செய்யும் முன் காத்திருக்கவேண்டிய நேர அளவு</string>
  <string name="preferences__notifications">அறிவிப்புகள்</string>
-  <string name="preferences__display_message_notifications_in_status_bar">செய்தி அறிவிப்புகளை நிலைப்பட்டையில் காண்பிக்கவும்</string>
  <string name="preferences__led_color">LED நிறம்</string>
  <string name="preferences__led_color_unknown">முன் தெரிந்திராத</string>
  <string name="preferences__pref_led_blink_title">LED மிளிரும் முறை</string>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@ -357,7 +357,6 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
  <string name="KeyCachingService_passphrase_cached">TextSecure kilitsiz</string>
  <string name="KeyCachingService_lock">Parola ile kilitle</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%2$d sohbette %1$d mesaj</string>
  <string name="MessageNotifier_most_recent_from_s">En yeni mesaj: %1$s</string>
  <string name="MessageNotifier_media_message_with_text">Medya mesajı: %s</string>
  <string name="MessageNotifier_no_subject">(Konusuz)</string>
@ -367,6 +366,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
  <string name="MessageNotifier_mark_all_as_read">Tümünü okundu işaretle</string>
  <string name="MessageNotifier_media_message">Medya mesajı</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">ESKİ PAROLA:</string>
  <string name="change_passphrase_activity__new_passphrase">YENİ PAROLA:</string>
@ -591,7 +591,6 @@ başarısız.</string>
  <string name="preferences__pref_timeout_interval_title">Zaman aşımı aralığı</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hafızadaki parolanın unutulması için geçmesi gereken zaman miktarı</string>
  <string name="preferences__notifications">Bildirimler</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Durum çubuğunda mesaj bildirimlerini göster</string>
  <string name="preferences__led_color">LED rengi</string>
  <string name="preferences__led_color_unknown">Bilinmeyen</string>
  <string name="preferences__pref_led_blink_title">LED yanıp sönme şekli</string>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@ -193,6 +193,7 @@
  <string name="MessageNotifier_error_delivering_message">Помилка доставки повідомлення.</string>
  <string name="MessageNotifier_mark_all_as_read">Позначити все як прочитане</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">СТАРА ФРАЗА-КЛЮЧ:</string>
  <string name="change_passphrase_activity__new_passphrase">НОВА ФРАЗА-КЛЮЧ:</string>
@ -299,7 +300,6 @@
  <string name="preferences__pref_timeout_interval_title">Термін зберігання</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Час, після якого фраза-пароль буде стерта з пам’яті</string>
  <string name="preferences__notifications">Сповіщення</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Показувати сповіщення повідомлень в рядку стану</string>
  <string name="preferences__led_color">Колір LED</string>
  <string name="preferences__pref_led_blink_title">Шаблон мерехтіння LED</string>
  <string name="preferences__pref_led_blink_custom_pattern_set">Власний шаблон мерехтіння LED задано!</string>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@ -241,6 +241,7 @@ Nhận thông tin về chìa khóa nhận diện không rõ. Bấm để xử l
  <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>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">MẬT KHẨU CŨ:</string>
  <string name="change_passphrase_activity__new_passphrase">MẬT KHẨU MỚI:</string>
@ -372,7 +373,6 @@ TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</stri
  <string name="preferences__pref_timeout_interval_title">Thời gian hết hạn</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Khoảng thời gian chờ trước khi quên đi mật khẩu trong bộ nhớ</string>
  <string name="preferences__notifications">Thông báo</string>
-  <string name="preferences__display_message_notifications_in_status_bar">Hiển thị thông báo tin nhắn trong thanh trạng thái</string>
  <string name="preferences__led_color">Màu LED</string>
  <string name="preferences__pref_led_blink_title">Mô hình chớp nháy LED</string>
  <string name="preferences__pref_led_blink_custom_pattern_set">Mô hình chớp nháy LED tùy biến thiết lập xong!</string>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@ -375,7 +375,6 @@
  <string name="KeyCachingService_passphrase_cached">TextSecure 已解锁</string>
  <string name="KeyCachingService_lock">使用密码锁定</string>
  <!--MessageNotifier-->
-  <string name="MessageNotifier_d_messages_in_d_conversations">%1$d 信息是在 %2$d 中的会话</string>
  <string name="MessageNotifier_most_recent_from_s">最新的邮件来自：%1$s</string>
  <string name="MessageNotifier_locked_message">锁定的信息…</string>
  <string name="MessageNotifier_media_message_with_text">媒体信息：%s</string>
@ -390,6 +389,7 @@
  <!--QuickResponseService-->
  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">当 TextSecure 处于锁定状态时，快速回复不可用！</string>
  <string name="QuickResponseService_problem_sending_message">发送信息时遇到问题！</string>
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">旧密码：</string>
  <string name="change_passphrase_activity__new_passphrase">新密码：</string>
@ -633,7 +633,6 @@ TextSecure 在等待短信验证时超时。</string>
  <string name="preferences__pref_timeout_interval_title">超时间隔</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">忘记缓存密码的等待时间</string>
  <string name="preferences__notifications">通知</string>
-  <string name="preferences__display_message_notifications_in_status_bar">在状态栏显示信息通知</string>
  <string name="preferences__led_color">LED颜色</string>
  <string name="preferences__led_color_unknown">未知</string>
  <string name="preferences__pref_led_blink_title">LED闪烁规律</string>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@ -291,6 +291,7 @@
  <string name="MessageNotifier_mark_all_as_read">全部標示為已讀</string>
  <string name="MessageNotifier_media_message">媒體訊息</string>
  <!--QuickResponseService-->
+  <!--SingleRecipientNotificationBuilder-->
  <!--change_passphrase_activity-->
  <string name="change_passphrase_activity__old_passphrase">舊的『自訂密碼』:</string>
  <string name="change_passphrase_activity__new_passphrase">新的『自訂密碼』:</string>
@ -472,7 +473,6 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
  <string name="preferences__pref_timeout_interval_title">倒數時間</string>
  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">等候『自訂密碼』幫 TextSecure 上鎖的等候時間</string>
  <string name="preferences__notifications">通知</string>
-  <string name="preferences__display_message_notifications_in_status_bar">在 Android 系統狀態列顯示通知</string>
  <string name="preferences__led_color">LED燈號顏色</string>
  <string name="preferences__pref_led_blink_title">LED 閃爍模式</string>
  <string name="preferences__pref_led_blink_custom_pattern_title">自訂 LED 閃爍模式</string>