diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 96e8fd3c1f..6f19c59ab1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -144,6 +144,7 @@
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">الجهاز لن يتمكن من إرسال أو استقبال رسائل بعد قطع الاتصال.</string>
   <string name="DeviceListActivity_network_connection_failed">فشل في اتصال الشبكة...</string>
   <string name="DeviceListActivity_try_again">حاول مجددا</string>
+  <string name="DeviceListActivity_disconnecting_device">جارٍ فصل الجهاز...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">جارٍ فصل الجهاز</string>
   <string name="DeviceListActivity_network_failed">فشل في الشبكة!</string>
   <!--DeviceListItem-->
@@ -495,6 +496,8 @@
   <string name="recipient_preferences__ringtone">نغمة الرنين</string>
   <string name="recipient_preferences__vibrate">الاهتزاز</string>
   <string name="recipient_preferences__block">حظر</string>
+  <string name="recipient_preferences__color">اللون</string>
+  <string name="recipient_preferences__color_for_this_contact">اللون المخصص لجهة الاتصال</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 تحقق من رقم تليفونك للاتصال بتيكست سيكيور</string>
@@ -590,8 +593,8 @@
     <item quantity="zero">%d صفر</item>
     <item quantity="one">%d ساعة</item>
     <item quantity="two">%d ساعتين</item>
-    <item quantity="few">%d أقل</item>
-    <item quantity="many">%d كثيرة</item>
+    <item quantity="few">%d ساعات</item>
+    <item quantity="many">%d ساعة</item>
     <item quantity="other">%d أخرى</item>
   </plurals>
   <!--preferences.xml-->
@@ -743,6 +746,7 @@
   <string name="conversation__menu_leave_group">أترك المجموعة</string>
   <string name="conversation__menu_delete_thread">حذف المحادثة</string>
   <string name="conversation__menu_view_media">جميع الصور</string>
+  <string name="conversation__menu_conversation_settings">إعدادات المحادثة</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">توسيع الإشعار</string>
   <!--conversation_callable-->
@@ -785,5 +789,7 @@
   <string name="trimmer__old_messages_successfully_deleted">تم حذف الرسائل القديمة بنجاح</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">أيقونة النقل.</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">الكاميرا غير متاحة</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0f7012ecf9..acac159156 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -716,5 +716,6 @@ TextSecure не дачакаўся параверачная SMS.</string>
   <string name="trimmer__old_messages_successfully_deleted">Старыя паведамленні паспяхова выдалены</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Транспартны значок</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6614060768..824a0770b3 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -148,6 +148,7 @@
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ако прекратиш връзката с това устройство, няма да можеш да изпращаш и получаваш съобщения от него.</string>
   <string name="DeviceListActivity_network_connection_failed">Неуспешна връзка с интернет...</string>
   <string name="DeviceListActivity_try_again">Опитай отново</string>
+  <string name="DeviceListActivity_disconnecting_device">Прекратяване на връзката с устройството</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Прекратяване на връзката с устройството</string>
   <string name="DeviceListActivity_network_failed">Грешка в мрежата!</string>
   <!--DeviceListItem-->
@@ -400,6 +401,7 @@ SMS съобщенията от системната базата данни в
   <string name="MessageNotifier_failed_to_deliver_message">Неуспешно изпращането на съобщението.</string>
   <string name="MessageNotifier_error_delivering_message">Грешка при изпращането на съобщението</string>
   <string name="MessageNotifier_mark_all_as_read">Всички са прочетени</string>
+  <string name="MessageNotifier_mark_read">Прочетено</string>
   <string name="MessageNotifier_media_message">Медийно съобщение</string>
   <string name="MessageNotifier_reply">Отговори</string>
   <!--QuickResponseService-->
@@ -436,6 +438,7 @@ SMS съобщенията от системната базата данни в
   <string name="conversation_activity__compose_description">Създаване на съобщение</string>
   <string name="conversation_activity__emoji_toggle_description">Смени emoji клавиатурата</string>
   <string name="conversation_activity__attachment_thumbnail">Изображение на прикачен файл</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Затвори/отвори чекмеджето с прикачени файлове</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Изтегляне на медийно съобщение</string>
   <string name="conversation_item__mms_image_description">Медийно съобщение</string>
@@ -513,6 +516,8 @@ SMS съобщенията от системната базата данни в
   <string name="recipient_preferences__ringtone">Мелодия</string>
   <string name="recipient_preferences__vibrate">Вибрирация</string>
   <string name="recipient_preferences__block">Блокирай</string>
+  <string name="recipient_preferences__color">Цвят</string>
+  <string name="recipient_preferences__color_for_this_contact">Цвят за този контакт</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Потвърди своя телфонен номер, за да се свържеш с TextSecure</string>
@@ -522,6 +527,7 @@ SMS съобщенията от системната базата данни в
   <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">Няколко вероятни
 проблема включват:
@@ -776,6 +782,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="conversation__menu_leave_group">Напусни група</string>
   <string name="conversation__menu_delete_thread">Изтрий разговора</string>
   <string name="conversation__menu_view_media">Всички изображения</string>
+  <string name="conversation__menu_conversation_settings">Настройки на разговора</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Разшири диалога</string>
   <!--conversation_callable-->
@@ -818,5 +825,7 @@ TextSecure чака твърде дълго за SMS потвърждение.
   <string name="trimmer__old_messages_successfully_deleted">Старите съобщения бяха успешно изтрити</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Икона за транспорт</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Камерата е недостъпна</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-bo/strings.xml b/res/values-bo/strings.xml
index 8d8f41e2d7..5d0da117d2 100644
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@@ -264,5 +264,6 @@
   <!--media_preview_activity-->
   <!--Trimmer-->
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 32330259de..67349f668c 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -401,5 +401,6 @@ des de l\'app de missatgeria predeterminada del sistema.</string>
   <!--media_preview_activity-->
   <!--Trimmer-->
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 2f9070c816..f106fc864d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -151,6 +151,7 @@ kontakt</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Po odpojení toho zařízení již nebude možno přijímat nebo odesílat zprávy.</string>
   <string name="DeviceListActivity_network_connection_failed">Síťové spojení slehalo...</string>
   <string name="DeviceListActivity_try_again">Zkusit znovu</string>
+  <string name="DeviceListActivity_disconnecting_device">Odpojuji zařízení...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odpojuji zařízení</string>
   <string name="DeviceListActivity_network_failed">Síť selhala</string>
   <!--DeviceListItem-->
@@ -392,6 +393,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="MessageNotifier_failed_to_deliver_message">Selhalo doručení zprávy.</string>
   <string name="MessageNotifier_error_delivering_message">Chyba při doručení zprávy.</string>
   <string name="MessageNotifier_mark_all_as_read">Označit vše jako přečtené</string>
+  <string name="MessageNotifier_mark_read">Označit jako přečtené</string>
   <string name="MessageNotifier_media_message">Multimediální zpráva</string>
   <string name="MessageNotifier_reply">Odpověď</string>
   <!--QuickResponseService-->
@@ -428,6 +430,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="conversation_activity__compose_description">Sestavení zprávy</string>
   <string name="conversation_activity__emoji_toggle_description">Zapnout klávesnici se smajlíky</string>
   <string name="conversation_activity__attachment_thumbnail">Připojený náhled</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Vybrat úložiště pro přílohy</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Stahuji multimediální zprávu</string>
   <string name="conversation_item__mms_image_description">Multimediální zpráva</string>
@@ -505,6 +508,8 @@ Importovat nešifrovanou zálohu kompatibilní s \"SMSBackup And Restore\".</str
   <string name="recipient_preferences__ringtone">Vyzvánění</string>
   <string name="recipient_preferences__vibrate">Vibrace</string>
   <string name="recipient_preferences__block">Blokovat</string>
+  <string name="recipient_preferences__color">Barva</string>
+  <string name="recipient_preferences__color_for_this_contact">Brava tohoto kontaktu</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Ověření vašeho telefoního čísla pro připojení k TextSecure</string>
@@ -515,6 +520,7 @@ Ověření vašeho telefoního čísla pro připojení k TextSecure</string>
   <string name="registration_activity__phone_number">Telefonní číslo</string>
   <string name="registration_activity__register">Zaregistrovat</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">V průběhu registrace jsou odeslány některé kontaktní informace na server. Nejsou ale uloženy.</string>
+  <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Možné příčiny jsou:</string>
   <string name="registration_problems__sms_interceptors">Přijemci SMS</string>
@@ -767,6 +773,7 @@ Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</string>
   <string name="conversation__menu_leave_group">Opustit skupinu</string>
   <string name="conversation__menu_delete_thread">Smazat konverzaci</string>
   <string name="conversation__menu_view_media">Všechny obrázky</string>
+  <string name="conversation__menu_conversation_settings">Nastavení konverzace</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Rozbalit menu</string>
   <!--conversation_callable-->
@@ -809,5 +816,7 @@ Svobodná šifrovaná komunikace s uživateli TextSecure a Signal</string>
   <string name="trimmer__old_messages_successfully_deleted">Staré zprávy byly úspěšně smazány.</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona přenosu</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera není dostupná</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c68bf15051..c1645e5204 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -588,5 +588,6 @@ fejlede.
   <!--media_preview_activity-->
   <!--Trimmer-->
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9808fa0f03..4cc5d75b5e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -53,7 +53,7 @@ Sie werden Ihre Rufnummer erneut registrieren müssen, um TextSecure-Nachrichten
   <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Der Schlüssel von %1$s hat sich geändert.
 Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleicht hat %2$s TextSecure aber auch nur neu installiert und benutzt nun einen neuen Schlüssel.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Sie sollten diesen Kontakt ggf. überprüfen.</string>
-  <string name="ConfirmIdentityDialog_accept">Zustimmen</string>
+  <string name="ConfirmIdentityDialog_accept">OK</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Nachrichtengröße: %d kB</string>
   <string name="ConversationItem_expires_s">Läuft ab in: %s</string>
@@ -67,7 +67,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationItem_click_to_approve_unencrypted">Für Rückgriff auf unsicheren Versand antippen</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Rückgriff auf unverschlüsselte SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Rückgriff auf unverschlüsselte MMS?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Diese Nachricht wird <b>nicht</b> verschlüsselt sein, da der Empfänger TextSecure nicht mehr nutzt.\n\nUnsichere Nachricht senden?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Diese Nachricht wird <b>nicht</b> verschlüsselt sein, da der Kontakt nicht mehr TextSecure nutzt.\n\nUnsichere Nachricht senden?</string>
   <string name="ConversationItem_unable_to_open_media">Keine App zum Öffnen der Datei gefunden.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Sichere Unterhaltung starten?</string>
@@ -82,7 +82,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Leider ist ein Fehler beim Hinzufügen des Anhangs aufgetreten.</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Die ausgewählte Videodatei überschreitet leider die maximal mögliche Nachrichtengröße (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Die ausgewählte Audiodatei überschreitet leider die maximal mögliche Nachrichtengröße (%1$skB).</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Empfängeradresse ist keine gültige SMS- oder E-Mail-Adresse!</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Mobilrufnummer oder E-Mail-Adresse des Kontakts ist ungültig!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Die Nachricht ist leer!</string>
   <string name="ConversationActivity_group_members">Gruppenmitglieder</string>
   <string name="ConversationActivity_group_conversation">Gruppenunterhaltung</string>
@@ -90,7 +90,7 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_d_recipients_in_group">%d Mitglieder</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">1 Mitglied</string>
   <string name="ConversationActivity_saved_draft">Entwurf gespeichert</string>
-  <string name="ConversationActivity_invalid_recipient">Ungültiger Empfänger!</string>
+  <string name="ConversationActivity_invalid_recipient">Ungültiger Kontakt!</string>
   <string name="ConversationActivity_calls_not_supported">Anrufe nicht unterstützt</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Dieses Gerät scheint keine Wahlvorgänge zu unterstützen.</string>
   <string name="ConversationActivity_leave_group">Gruppe verlassen?</string>
@@ -102,9 +102,9 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <string name="ConversationActivity_lets_use_this_to_chat">Lassen Sie uns diese App zum Unterhalten verwenden: %s</string>
   <string name="ConversationActivity_error_leaving_group">Fehler beim Verlassen der Gruppe …</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS nicht unterstützt</string>
-  <string name="ConversationActivity_mms_not_supported_message">Diese Nachricht kann nicht gesendet werden, da Ihr Mobilfunkbetreiber MMS nicht unterstützt.</string>
+  <string name="ConversationActivity_mms_not_supported_message">Diese Nachricht kann nicht gesendet werden, da Ihr Mobilfunkanbieter MMS nicht unterstützt.</string>
   <string name="ConversationActivity_specify_recipient">Bitte einen Kontakt auswählen</string>
-  <string name="ConversationActivity_unblock_question">Blockierung aufheben?</string>
+  <string name="ConversationActivity_unblock_question">Nicht mehr blockieren?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Sind Sie sicher, dass Sie die Blockierung dieses Kontakts aufheben möchten?</string>
   <string name="ConversationActivity_unblock">Blockierung aufheben</string>
   <!--ConversationFragment-->
@@ -145,9 +145,10 @@ Dies könnte bedeuten, dass jemand versucht, Ihr Gespräch abzuhören. Vielleich
   <!--DeviceListActivity-->
   <string name="DeviceListActivity_disconnect_s">\"%s\" trennen?</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Durch Trennung dieses Geräts wird es keine weiteren Nachrichten senden oder empfangen können.</string>
-  <string name="DeviceListActivity_network_connection_failed">Netzwerkverbindung fehlgeschlagen …</string>
+  <string name="DeviceListActivity_network_connection_failed">Keine Netzwerkverbindung …</string>
   <string name="DeviceListActivity_try_again">Erneut versuchen</string>
-  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Gerät wird getrennt …</string>
+  <string name="DeviceListActivity_disconnecting_device">Gerät wird getrennt …</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Trennen</string>
   <string name="DeviceListActivity_network_failed">Netzwerkfehler!</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Unbenanntes Gerät</string>
@@ -218,7 +219,7 @@ Falls Sie bereits zuvor diese Datensicherung importiert haben, wird das zu gedop
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Für QR-Codes benötigt TextSecure die App \"Barcode Scanner\".</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Versand fehlgeschlagen</string>
-  <string name="MessageDetailsRecipient_new_identity">Neue Identität</string>
+  <string name="MessageDetailsRecipient_new_identity">Neuer Schlüssel</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Fehler beim Speichern der MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Verbindung zum MMS-Anbieter fehlgeschlagen …</string>
@@ -265,11 +266,11 @@ Bitten Sie den Absender, TextSecure zu aktualisieren und die Nachricht erneut zu
   <string name="RatingManager_later">Später</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Diesen Kontakt blockieren?</string>
-  <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Nachrichten dieses Benutzers werden nicht mehr angezeigt werden.</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Nachrichten dieses Kontakts werden nicht mehr angezeigt werden.</string>
   <string name="RecipientPreferenceActivity_block">Blockieren</string>
-  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Blockierung dieses Kontakts aufheben?</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Diesen Kontakt nicht mehr blockieren?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Sind Sie sicher, dass Sie die Blockierung dieses Kontakts aufheben möchten?</string>
-  <string name="RecipientPreferenceActivity_unblock">Blockierung aufheben</string>
+  <string name="RecipientPreferenceActivity_unblock">Nicht mehr blockieren</string>
   <string name="RecipientPreferenceActivity_enabled">Aktiviert</string>
   <string name="RecipientPreferenceActivity_disabled">Deaktiviert</string>
   <!--RegistrationActivity-->
@@ -319,7 +320,7 @@ Bitte kontrollieren Sie noch einmal Ihre Rufnummer. Diese wird anschließend dur
 Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Veränderte, aber unbekannte Identitätsinformation empfangen. Antippen, um die Identität zu prüfen.</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Aktualisierten, aber unbekannten Schlüssel empfangen. Antippen, um Schlüssel zu prüfen.</string>
   <string name="SmsMessageRecord_secure_session_ended">Sichere Unterhaltung beendet.</string>
   <string name="SmsMessageRecord_duplicate_message">Doppelte Nachricht.</string>
   <!--ThreadRecord-->
@@ -328,19 +329,19 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="ThreadRecord_draft">Entwurf:</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Sie haben keinen eigenen Schlüssel.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Der Empfänger hat keinen Schlüssel.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Der Empfänger hat keinen Schlüssel!</string>
-  <string name="VerifyIdentityActivity_scan_their_key_to_compare">Empfängerschlüssel einscannen</string>
-  <string name="VerifyIdentityActivity_get_my_key_scanned">Eigenen Schlüssel einscannen lassen</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Der Kontakt hat keinen Schlüssel.</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Der 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_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 Empfängers ist korrekt. Lassen Sie ihn auch Ihren eigenen Schlüssel überprüfen.</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>
   <string name="VerifyIdentityActivity_verified_exclamation">Überprüft!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sie haben keinen eigenen Schlüssel!</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">Zum Vergleich einscannen</string>
-  <string name="ViewIdentityActivity_get_scanned_to_compare">Zum Vergleich einscannen lassen</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_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>
@@ -348,7 +349,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="ViewIdentityActivity_my_identity_fingerprint">Mein 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 Empfänger gesendet. Sind Sie sicher, dass Sie eine weitere senden wollen? Dies wird die erste Anfrage ungültig machen.</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. Sind Sie sicher, dass Sie eine weitere senden wollen? Dies wird die erste Anfrage ungültig machen.</string>
   <string name="KeyExchangeInitiator_send">Senden</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Fehlerhaft verschlüsselte Nachricht …</string>
@@ -388,7 +389,8 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="MessageNotifier_message_delivery_failed">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Nachrichtenübermittlung fehlgeschlagen.</string>
   <string name="MessageNotifier_error_delivering_message">Nachrichtenübermittlung fehlgeschlagen.</string>
-  <string name="MessageNotifier_mark_all_as_read">Alle als gelesen markieren</string>
+  <string name="MessageNotifier_mark_all_as_read">Alle gelesen</string>
+  <string name="MessageNotifier_mark_read">Gelesen</string>
   <string name="MessageNotifier_media_message">Mediennachricht</string>
   <string name="MessageNotifier_reply">Antworten</string>
   <!--QuickResponseService-->
@@ -425,6 +427,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="conversation_activity__compose_description">Nachricht verfassen</string>
   <string name="conversation_activity__emoji_toggle_description">Emoji-Tastatur aktivieren</string>
   <string name="conversation_activity__attachment_thumbnail">Anhangsvorschaubild</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Direktaufnahme</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Mediennachricht wird heruntergeladen</string>
   <string name="conversation_item__mms_image_description">Mediennachricht</string>
@@ -492,7 +495,7 @@ Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren</stri
   <string name="prompt_passphrase_activity__unlock">Entsperren</string>
   <!--prompt_mms_activity-->
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">TextSecure benötigt MMS-Einstellungen, um Medien- und Gruppennachrichten zu versenden. Ihr Gerät stellt diese Informationen nicht zur Verfügung, was gelegentlich bei gesperrten oder anderweitig restriktiv konfigurierten Geräten der Fall ist.</string>
-  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Zum Versenden von Medien- und Gruppennachrichten bitte \"OK\" antippen und die geforderten Einstellungen vervollständigen. Die MMS-Einstellungen Ihres Anbieters können normalerweise  durch eine Internetsuche nach dem \"APN\" des Anbieters gefunden werden.</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Zum Versenden von Medien- und Gruppennachrichten bitte \"OK\" antippen und die geforderten Einstellungen vervollständigen. Die MMS-Einstellungen Ihres Mobilfunkanbieters können normalerweise durch eine Internetsuche nach dem \"APN\" des Anbieters gefunden werden.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BLOCKIERT</string>
   <!--recipient_preferences-->
@@ -501,15 +504,18 @@ Eine mit \"SMS Backup + Restore\" kompatible Klartextsicherung importieren</stri
   <string name="recipient_preferences__ringtone">Benachrichtigungston</string>
   <string name="recipient_preferences__vibrate">Vibration</string>
   <string name="recipient_preferences__block">Blockieren</string>
+  <string name="recipient_preferences__color">Farbe</string>
+  <string name="recipient_preferences__color_for_this_contact">Farbe dieses Kontakts</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
-Überprüfen Sie zur Verbindung mit TextSecure Ihre Rufnummer.</string>
+Überprüfen Sie Ihre Rufnummer zur Verknüpfung mit TextSecure.</string>
   <string name="registration_activity__your_country">IHR LAND</string>
   <string name="registration_activity__your_country_code_and_phone_number">IHRE LANDESVORWAHL UND
 RUFNUMMER</string>
   <string name="registration_activity__phone_number">RUFNUMMER</string>
   <string name="registration_activity__register">Registrieren</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Während der Registrierung werden einige Kontaktinformationen an den Server übermittelt. Diese werden jedoch nicht gespeichert.</string>
+  <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Einige mögliche Probleme beinhalten:</string>
   <string name="registration_problems__sms_interceptors">SMS-abfangende Apps.</string>
@@ -553,8 +559,8 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="recipients_panel__to"><small>Name oder Rufnummer eingeben</small></string>
   <string name="recipients_panel__add_member">Mitglied hinzufügen</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Empfängeridentität:</string>
-  <string name="verify_identity_activity__your_identity_you_read">Eigene Identität:</string>
+  <string name="verify_identity_activity__their_identity_they_read">Kontaktschlüssel:</string>
+  <string name="verify_identity_activity__your_identity_you_read">Eigener 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>
@@ -570,7 +576,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="AndroidManifest__textsecure_detected">TextSecure erkannt</string>
   <string name="AndroidManifest__public_identity_key">Öffentlicher Schlüssel</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
-  <string name="AndroidManifest__verify_identity">Empfänger überprüfen</string>
+  <string name="AndroidManifest__verify_identity">Kontakt überprüfen</string>
   <string name="AndroidManifest__log_submit">Diagnoseprotokoll übermitteln</string>
   <string name="AndroidManifest__media_preview">Dateivorschau</string>
   <string name="AndroidManifest__media_overview">Alle Bilder</string>
@@ -607,7 +613,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__pref_enter_sends_title">Eingabetaste sendet</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Antippen der Eingabetaste versendet Nachrichten sofort</string>
   <string name="preferences__display_settings">Darstellung</string>
-  <string name="preferences__choose_identity">Identität auswählen</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>
@@ -731,7 +737,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="conversation_list_fragment__fab_content_description">Neue Unterhaltung</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Sicherheit</string>
-  <string name="conversation_secure_verified__menu_verify_identity">Empfänger überprüfen</string>
+  <string name="conversation_secure_verified__menu_verify_identity">Kontakt überprüfen</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Sichere Unterhaltung beenden</string>
   <!--conversation_muted-->
   <string name="conversation_muted__unmute">Stummschaltung aufheben</string>
@@ -743,19 +749,20 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="conversation__menu_leave_group">Gruppe verlassen</string>
   <string name="conversation__menu_delete_thread">Unterhaltung löschen</string>
   <string name="conversation__menu_view_media">Alle Bilder</string>
+  <string name="conversation__menu_conversation_settings">Unterhaltungseinstellungen</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Dialog maximieren</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Zu Kontakten hinzufügen</string>
   <!--conversation_group_options-->
-  <string name="convesation_group_options__recipients_list">Teilnehmerliste</string>
+  <string name="convesation_group_options__recipients_list">Teilnahmeliste</string>
   <string name="conversation_group_options__delivery">Zustellung</string>
   <string name="conversation_group_options__conversation">Unterhaltung</string>
   <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">Zum Vergleich einscannen lassen</string>
-  <string name="key_scanning__menu_scan_to_compare">Zum Vergleich einscannen</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">Eigenen 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>
   <string name="text_secure_normal__menu_new_group">Neue Gruppe</string>
@@ -785,5 +792,7 @@ Kostenlos verschlüsselte Nachrichten mit TextSecure- und Signal-Nutzern austaus
   <string name="trimmer__old_messages_successfully_deleted">Alte Nachrichten wurden erfolgreich gelöscht</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Übertragungssymbol</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera nicht verfügbar</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 8d723f1384..ddcfe2efd5 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -774,5 +774,6 @@ SMS της συσκευής σας στο TextSecure. Αν έχετε ήδη ε
   <string name="trimmer__old_messages_successfully_deleted">Τα παλιά μηνύματα διεγράφτηκαν επιτυχώς</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Μεταφορά εικονίδιου</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 67202c50ab..ea459239a1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -156,6 +156,7 @@ Recibido:%4$s</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Al desconectar este dispositivo, ya no podrá enviar y recibir mensajes.</string>
   <string name="DeviceListActivity_network_connection_failed">Fallo de conexión a la red...</string>
   <string name="DeviceListActivity_try_again">Intentar de nuevo</string>
+  <string name="DeviceListActivity_disconnecting_device">Desconectar dispositivo...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Desconectando dispositivo</string>
   <string name="DeviceListActivity_network_failed">¡Fallo de red!</string>
   <!--DeviceListItem-->
@@ -423,6 +424,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="MessageNotifier_failed_to_deliver_message">Fallo al entregar mensaje.</string>
   <string name="MessageNotifier_error_delivering_message">Error entregando mensaje.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todos como leídos</string>
+  <string name="MessageNotifier_mark_read">Marcar como leído</string>
   <string name="MessageNotifier_media_message">Mensaje multimedia</string>
   <string name="MessageNotifier_reply">Responder</string>
   <!--QuickResponseService-->
@@ -459,6 +461,7 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="conversation_activity__compose_description">Composición de mensaje</string>
   <string name="conversation_activity__emoji_toggle_description">Cambiar a teclado emoji</string>
   <string name="conversation_activity__attachment_thumbnail">Miniatura del adjunto</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Accionar bandeja desplegable de adjunto</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Descargando mensaje multimedia</string>
   <string name="conversation_item__mms_image_description">Mensaje multimedia</string>
@@ -538,6 +541,8 @@ Importar una copia de seguridad en texto plano. Compatible con \'SMSBackup And R
   <string name="recipient_preferences__ringtone">Tono de llamada</string>
   <string name="recipient_preferences__vibrate">Vibración</string>
   <string name="recipient_preferences__block">Bloquear</string>
+  <string name="recipient_preferences__color">Color</string>
+  <string name="recipient_preferences__color_for_this_contact">Color para este contacto</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Verifique su número de teléfono para conectar con TextSecure.</string>
@@ -548,6 +553,7 @@ NÚMERO DE TELÉFONO
   <string name="registration_activity__phone_number">NÚMERO DE TELÉFONO</string>
   <string name="registration_activity__register">Registro</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Al registrarse se transmitirá cierta información de contacto al servidor pero esta no será guardada.</string>
+  <string name="registration_activity__powered_by_twilio">Impulsado por twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Algunos posibles problemas
 son:
@@ -817,6 +823,7 @@ Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
   <string name="conversation__menu_leave_group">Abandonar grupo</string>
   <string name="conversation__menu_delete_thread">Borrar conversación</string>
   <string name="conversation__menu_view_media">Todas las imágenes</string>
+  <string name="conversation__menu_conversation_settings">Configuración de la conversación</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Expandir emergente</string>
   <!--conversation_callable-->
@@ -859,5 +866,7 @@ Mensajería privada gratuita con usuarios de TextSecure y Signal</string>
   <string name="trimmer__old_messages_successfully_deleted">Mensajes antiguos borrados con éxito</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icono de transporte</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Cámara no disponible</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index cce729d554..5b229d9721 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -651,5 +651,6 @@ huts egin du.
   <string name="trimmer__deleting_old_messages">Mezu zaharrak ezabatzen...</string>
   <string name="trimmer__old_messages_successfully_deleted">Mezu zaharrak ondo ezabatu dira</string>
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 19a63c0819..49ce95f557 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -40,6 +40,7 @@
   <string name="AttachmentTypeSelectorAdapter_audio">صدا</string>
   <string name="AttachmentTypeSelectorAdapter_contact">اطلاعات مخاطب</string>
   <!--BlockedContactsActivity-->
+  <string name="BlockedContactsActivity_blocked_contacts">اطلاعات تماس مسدود</string>
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">شما ممکن است مایل به منظور بررسی
 تماس با ما</string>
@@ -100,6 +101,7 @@
   <string name="ConversationFragment_push">داده ها (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">پیامک</string>
+  <string name="ConversationFragment_deleting">در حال حذف کردن</string>
   <string name="ConversationFragment_deleting_messages">حذف پیام های...</string>
   <!--ConversationListActivity-->
   <string name="ConversationListActivity_search">جستجو...</string>
@@ -117,7 +119,11 @@
   <!--DateUtils-->
   <string name="DateUtils_now">اکنون</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_try_again">دوباره تلاش کن</string>
+  <string name="DeviceListActivity_disconnecting_device">قطع اتصال دستگاه ...</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">قطع اتصال دستگاه</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">دستگاهی که نامش ذکر نشده</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">به اشتراک گذاشتن با</string>
   <!--ExportFragment-->
@@ -315,7 +321,9 @@
   <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-->
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">رمز قبلی:</string>
@@ -403,6 +411,8 @@
   <string name="recipient_preferences__ringtone">آهنگ های زنگ</string>
   <string name="recipient_preferences__vibrate">لرزش</string>
   <string name="recipient_preferences__block">بلوک</string>
+  <string name="recipient_preferences__color">رنگ</string>
+  <string name="recipient_preferences__color_for_this_contact">رنگ برای این مخاطب</string>
   <!--registration_activity-->
   <string name="registration_activity__your_country">کشور شما</string>
   <string name="registration_activity__your_country_code_and_phone_number">کد کشور شما و
@@ -566,6 +576,7 @@
   <string name="preferences__textsecure_messages">پیام های TextSecure</string>
   <string name="preferences__submit_debug_log">ارسال گزارش اشکال‌زدایی</string>
   <string name="preferences__support_wifi_calling">\'وای فای تلفن\' حالت سازگاری</string>
+  <string name="preferences_app_protection__blocked_contacts">اطلاعات تماس مسدود</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -650,9 +661,12 @@
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">پیش‌نمایش تصویر</string>
   <!--Trimmer-->
+  <string name="trimmer__deleting">در حال حذف</string>
   <string name="trimmer__deleting_old_messages">در حال حذف پیام‌های قدیمی...</string>
   <string name="trimmer__old_messages_successfully_deleted">پیام‌های قدیمی با موفقیت حذف شدند</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">آیکون های حمل و نقل</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">دوربین در دسترس نیست</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 7eaa5aa5f8..1f5889fa65 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -14,7 +14,7 @@
   <string name="ApplicationPreferencesActivity_delete">Poista</string>
   <string name="ApplicationPreferencesActivity_disable_storage_encryption">Poistetaanko tallennustilan salaus käytöstä?</string>
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">
-Varoitus. Viestiesi ja avaimiesi tallennustilan salaus poistetaan käytöstä. Salatut istuntosi
+Varoitus: Viestiesi ja avaimiesi tallennustilan salaus poistetaan käytöstä. Salatut istuntosi
 jatkavat toimintaansa, mutta kuka tahansa, jolla on fyysinen pääsy laitteeseesi, voi lukea ne.</string>
   <string name="ApplicationPreferencesActivity_disable">Poista käytöstä</string>
   <string name="ApplicationPreferencesActivity_unregistering">Puretaan rekisteröintiä</string>
@@ -166,12 +166,12 @@ Vastaanotettu: %4$s</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Vie</string>
   <string name="ExportFragment_export_plaintext_to_sd_card">Viedäänkö salaamattomana tallennustilaan?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Varoitus, tämä vie
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Varoitus: tämä vie
 kaikki TextSecure-viestisi salaamattomana laitteesi tallennustilaan.</string>
   <string name="ExportFragment_cancel">Peruuta</string>
   <string name="ExportFragment_exporting">Viedään</string>
   <string name="ExportFragment_exporting_plaintext_to_sd_card">Viedään salaamattomana tallennustilaan...</string>
-  <string name="ExportFragment_error_unable_to_write_to_sd_card">Virhe, tallennustilaan kirjoitus epäonnistui!</string>
+  <string name="ExportFragment_error_unable_to_write_to_sd_card">Virhe: tallennustilaan kirjoitus epäonnistui!</string>
   <string name="ExportFragment_error_while_writing_to_sd_card">Tallennustilaan kirjoitettaessa sattui virhe.</string>
   <string name="ExportFragment_success">Onnistui!</string>
   <!--GcmRefreshJob-->
@@ -345,18 +345,18 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="TheadRecord_secure_session_ended">Salattu istunto päättyi</string>
   <string name="ThreadRecord_draft">Luonnos:</string>
   <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Sinulla ei ole identiteettiavainta.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Vastaanottajalla ei ole identiteettiavainta.</string>
-  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Vastaanottajalla ei ole identiteettiavainta!</string>
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">(Sinulla ei ole identiteettiavainta.)</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">(Vastapuolella ei ole identiteettiavainta.)</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Vastapuolella ei ole identiteettiavainta!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skannaa vastapuolen avaimen QR-koodi</string>
   <string name="VerifyIdentityActivity_get_my_key_scanned">Näytä oman avaimeni QR-koodi</string>
-  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROITUS, skannattu avain EI TÄSMÄÄ! Tarkastakaa sormenjälki huolella.</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VAROITUS: Skannattu avain EI TÄSMÄÄ! Tarkastakaa sormenjälki huolella.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">EI varmennettu!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Vastapuolen avain on oikea. Huomaa, että hänen on syytä tarkastaa vastaavasti sinun avaimesi.</string>
   <string name="VerifyIdentityActivity_verified_exclamation">Varmennettu!</string>
   <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">Sinulla ei ole identiteettiavainta!</string>
   <!--ViewIdentityActivity-->
-  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">Sinulla ei ole identiteettiavainta.</string>
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">(Sinulla ei ole identiteettiavainta.)</string>
   <string name="ViewIdentityActivity_scan_to_compare">Skannaa vastapuolen avaimen QR-koodi</string>
   <string name="ViewIdentityActivity_get_scanned_to_compare">Näytä oman avaimeni QR-koodi</string>
   <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">VAROITUS: Skannattu avain EI TÄSMÄÄ!</string>
@@ -407,7 +407,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="MessageNotifier_failed_to_deliver_message">Viestin toimitus epäonnistui.</string>
   <string name="MessageNotifier_error_delivering_message">Virhe viestiä toimitettaessa.</string>
   <string name="MessageNotifier_mark_all_as_read">Merkitse kaikki luetuiksi</string>
-  <string name="MessageNotifier_mark_read">Merkitse luetuksi</string>
+  <string name="MessageNotifier_mark_read">Merk. luetuksi</string>
   <string name="MessageNotifier_media_message">Mediaviesti</string>
   <string name="MessageNotifier_reply">Vastaa</string>
   <!--QuickResponseService-->
@@ -442,8 +442,9 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="conversation_activity__remove">Poista</string>
   <string name="conversation_activity__window_description">Keskustelu %1$s kanssa</string>
   <string name="conversation_activity__compose_description">Viestin kirjoitus</string>
-  <string name="conversation_activity__emoji_toggle_description">Ota emojinäppäimistö käyttöön</string>
+  <string name="conversation_activity__emoji_toggle_description">Näytä tai piilota emoji-näppäimistö</string>
   <string name="conversation_activity__attachment_thumbnail">Liitteen esikatselu</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Näytä tai piilota liitetiedostopaneeli</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Ladataan mediaviestiä</string>
   <string name="conversation_item__mms_image_description">Mediaviesti</string>
@@ -532,7 +533,7 @@ PUHELINNUMEROSI</string>
   <string name="registration_activity__phone_number">PUHELINNUMERO</string>
   <string name="registration_activity__register">Rekisteröidy</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Rekisteröityminen siirtää joitakin yhteystietoja väliaikaisesti palvelimelle. Niitä ei kuitenkaan tallenneta sinne.</string>
-  <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
+  <string name="registration_activity__powered_by_twilio">Palvelun tarjoaa Twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Mahdollisiin ongelmiin
 sisältyvät:</string>
@@ -562,8 +563,8 @@ TextSecure ei saanut yhteyttä pikaviestipalveluun.</string>
 sisältyvät:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ei verkkoyhteyttä.</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Laitteesi
-tarvitsee verkkoyhteyttä tämän TextSecuren ominaisuuden käyttämiseen. Tarkista, että laitteesi
-on yhdistettynä 3G- tai WiFi-verkkoon.</string>
+tarvitsee verkkoyhteyttä tämän TextSecuren ominaisuuden käyttämiseen. Tarkista, että
+laitteesi on yhdistettynä mobiilitiedonsiirto- tai WiFi-verkkoon.</string>
   <string name="registration_progress_activity__restrictive_firewall">Rajoittava palomuuri.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Jos olet yhdistänyt WiFi-verkkoon, on mahdollista että palomuuri estää pääsyn TextSecuren palvelimelle. Kokeile toista verkkoa tai mobiiliverkkoa.</string>
@@ -720,8 +721,8 @@ epäonnistui.</string>
   <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
 Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="preferences__submit_debug_log">Lähetä virheenkorjausloki</string>
-  <string name="preferences__support_wifi_calling">\'WiFi Calling\' -yhteensopiva tila</string>
-  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ota käyttöön, jos laitteesi lähettää SMS/MMS-viestit WiFi-yhteyden kautta (ota käyttöön vain kun \'WiFi Calling\' on käytössä laitteessasi).</string>
+  <string name="preferences__support_wifi_calling">\"WiFi Calling\" -yhteensopiva tila</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Ota käyttöön, jos laitteesi lähettää SMS- ja MMS-viestit WiFi-yhteyden kautta. (Ota käyttöön vain, kun \"WiFi Calling\" on käytössä laitteessasi.)</string>
   <string name="preferences_app_protection__blocked_contacts">Estetyt yhteystiedot</string>
   <!--****************************************-->
   <!--menus-->
@@ -775,6 +776,7 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="conversation__menu_leave_group">Poistu ryhmästä</string>
   <string name="conversation__menu_delete_thread">Poista keskustelu</string>
   <string name="conversation__menu_view_media">Kaikki kuvat</string>
+  <string name="conversation__menu_conversation_settings">Keskustelun asetukset</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Suurenna ponnahdusikkuna</string>
   <!--conversation_callable-->
@@ -817,5 +819,7 @@ Ilmaiset ja yksityiset viestit TextSecuren ja Signalin käyttäjille</string>
   <string name="trimmer__old_messages_successfully_deleted">Vanhojen viestien poisto onnistui</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Tyypin kuvake</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera ei käytettävissä</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 1c3c459b6e..d60343c1e0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -148,12 +148,13 @@ vérifier ce contact.</string>
   <string name="DateUtils_now">À l\'instant</string>
   <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_disconnect_s">Déconnecter \'%s\'?</string>
+  <string name="DeviceListActivity_disconnect_s">Déconnecter \'%s\' ?</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Si vous déconnectez cet appareil, il ne sera plus capable d\'envoyer ou recevoir des messages.</string>
-  <string name="DeviceListActivity_network_connection_failed">Erreur de connection réseau...</string>
+  <string name="DeviceListActivity_network_connection_failed">Erreur de connexion réseau...</string>
   <string name="DeviceListActivity_try_again">Essayer à nouveau</string>
+  <string name="DeviceListActivity_disconnecting_device">Déconnexion de l\'appareil...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Déconnexion de l\'appareil</string>
-  <string name="DeviceListActivity_network_failed">Erreur réseau!</string>
+  <string name="DeviceListActivity_network_failed">Erreur réseau !</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Appareil sans nom</string>
   <string name="DeviceListItem_created_s">%s créé</string>
@@ -406,11 +407,12 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="MessageNotifier_failed_to_deliver_message">Échec de distribution du message.</string>
   <string name="MessageNotifier_error_delivering_message">Erreur lors de la distribution du message.</string>
   <string name="MessageNotifier_mark_all_as_read">Tout marquer comme lu</string>
+  <string name="MessageNotifier_mark_read">Marquer comme lu</string>
   <string name="MessageNotifier_media_message">Message média</string>
   <string name="MessageNotifier_reply">Répondre</string>
   <!--QuickResponseService-->
-  <string name="QuickResponseService_quick_response_unavailable_when_TextSecure_is_locked">Les réponses rapides ne sont pas disponibles quand TextSecure est bloqué!</string>
-  <string name="QuickResponseService_problem_sending_message">Erreur lors de l\'envoi du message!</string>
+  <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>
   <!--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>
@@ -518,6 +520,8 @@ Importer un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup An
   <string name="recipient_preferences__ringtone">Sonnerie</string>
   <string name="recipient_preferences__vibrate">Vibreur</string>
   <string name="recipient_preferences__block">Bloquer</string>
+  <string name="recipient_preferences__color">Couleur</string>
+  <string name="recipient_preferences__color_for_this_contact">Couleur pour ce contact</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Veuillez vérifier votre numéro de téléphone pour vous connecter avec TextSecure.</string>
@@ -527,6 +531,7 @@ VOTRE NUMÉRO DE TÉLÉPHONE</string>
   <string name="registration_activity__phone_number">NUMÉRO DE TÉLÉPHONE</string>
   <string name="registration_activity__register">S\'enregistrer</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">L\'enregistrement transmettra des informations de contact au serveur. Il n\'est pas stocké.</string>
+  <string name="registration_activity__powered_by_twilio">Fourni par twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Certains des problèmes possibles
 sont:</string>
@@ -721,7 +726,7 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
 </string>
   <string name="preferences__submit_debug_log">Envoyer un rapport de débogage</string>
   <string name="preferences__support_wifi_calling">Compatibilité \'WiFi Calling\'</string>
-  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activer si votre appareil délivre les SMS/MMS à l\'aide du WiFI (N\'activer que lorsque \'WiFi Calling\' est activé sur votre appareil).</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Activer si votre appareil délivre les SMS/MMS à l\'aide du WiFi (n\'activer que lorsque \"WiFi Calling\" est activé sur votre appareil).</string>
   <string name="preferences_app_protection__blocked_contacts">Contacts bloqués</string>
   <!--****************************************-->
   <!--menus-->
@@ -775,6 +780,7 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
   <string name="conversation__menu_leave_group">Quitter le groupe</string>
   <string name="conversation__menu_delete_thread">Supprimer le fil de discussion</string>
   <string name="conversation__menu_view_media">Toutes les images</string>
+  <string name="conversation__menu_conversation_settings">Préférences de conversation</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Étendre la popup</string>
   <!--conversation_callable-->
@@ -817,5 +823,7 @@ Messages privés gratuits vers les utilisateurs TextSecure et Signal
   <string name="trimmer__old_messages_successfully_deleted">Anciens messages supprimés avec succès</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icône de transport</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Caméra indisponible</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8ee7551748..0c8457f7dc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -811,5 +811,6 @@ Besplatno privatno dopisivanje sa TextSecure i Signal korisnicima</string>
   <string name="trimmer__old_messages_successfully_deleted">Stare poruke su uspješno obrisane</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona transporta</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 53717b8f7b..013f3cd83b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -155,6 +155,7 @@ Elküldöd a titkosítatlan üzenetet?</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ennek az eszköznek a lecsatlakoztatásával többé nem lesz alkalmas üzenetek küldésére vagy fogadására.</string>
   <string name="DeviceListActivity_network_connection_failed">Hálózati csatlakozás sikertelen...</string>
   <string name="DeviceListActivity_try_again">Újrapróbálkozás</string>
+  <string name="DeviceListActivity_disconnecting_device">Eszköz leválasztása...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Eszköz lecsatlakoztatása</string>
   <string name="DeviceListActivity_network_failed">Hálózati hiba!</string>
   <!--DeviceListItem-->
@@ -418,6 +419,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="MessageNotifier_failed_to_deliver_message">Nem sikerült az üzenet kézbesítése!</string>
   <string name="MessageNotifier_error_delivering_message">Hiba az üzenet kézbesítése közben!</string>
   <string name="MessageNotifier_mark_all_as_read">Az összes olvasottként való megjelölése</string>
+  <string name="MessageNotifier_mark_read">Olvasottnak jelöl</string>
   <string name="MessageNotifier_media_message">Média üzenet</string>
   <string name="MessageNotifier_reply">Válasz</string>
   <!--QuickResponseService-->
@@ -533,6 +535,8 @@ Egy titkosítatlan biztonsági mentés fájl importálása. \"SMS biztonsági me
   <string name="recipient_preferences__ringtone">Csengőhang</string>
   <string name="recipient_preferences__vibrate">Rezgés</string>
   <string name="recipient_preferences__block">Letiltás</string>
+  <string name="recipient_preferences__color">Szín</string>
+  <string name="recipient_preferences__color_for_this_contact">Szín a névjegynek</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Ellenőrizd a telefonszámodat a TextSecure alkalmazással történő kapcsolódáshoz.</string>
@@ -543,6 +547,7 @@ TELEFONSZÁM
   <string name="registration_activity__phone_number">TELEFONSZÁM</string>
   <string name="registration_activity__register">Regisztrálás</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">A regisztrálás néhány névjegy információt juttat el a kiszolgálóhoz. Az adatok nem kerülnek tárolásra.</string>
+  <string name="registration_activity__powered_by_twilio">Powered by twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Néhány lehetséges probléma
 beleértve:
@@ -848,5 +853,6 @@ Ingyenes biztonságos üzenet küldés TextSecure és Signal felhasználóknak</
   <string name="trimmer__old_messages_successfully_deleted">A régi üzenetek sikeresen törlődtek</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Átvitel ikon</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4f4d7fa77a..a0a9d39c06 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -830,5 +830,6 @@ Chatta gratis con gli utenti TextSecure e Signal</string>
   <string name="trimmer__old_messages_successfully_deleted">Vecchi messaggi cancellati con successo</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icona trasporto</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5cfa0ad252..093789e6c9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -332,5 +332,6 @@
   <!--media_preview_activity-->
   <!--Trimmer-->
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 640a370947..e4de4b71d8 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -776,5 +776,6 @@ Wi-Fiに接続している場合、ファイアウォールがTextSecureサー
   <string name="trimmer__old_messages_successfully_deleted">古いメッセージの削除に成功</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">転送アイコン</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 09cdfc005a..d3799e2ba6 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -725,5 +725,6 @@
   <string name="trimmer__old_messages_successfully_deleted">ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಗಿದೆ</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">ಸಾರಿಗೆ ಮಾಧ್ಯಮದ ಚಿಹ್ನೆ</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 11172b5718..760aff5195 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -365,6 +365,7 @@
   <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-->
@@ -473,6 +474,8 @@
   <string name="recipient_preferences__ringtone">알림 벨소리</string>
   <string name="recipient_preferences__vibrate">진동</string>
   <string name="recipient_preferences__block">차단</string>
+  <string name="recipient_preferences__color">색상</string>
+  <string name="recipient_preferences__color_for_this_contact">사용자 색상</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">TextSecure에 연결을 위해 전화번호를 확인합니다.</string>
   <string name="registration_activity__your_country">국가</string>
@@ -745,5 +748,6 @@
   <string name="trimmer__old_messages_successfully_deleted">이전 메시지 삭제됨</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">전송 아이콘</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 1cf188462d..c29373febb 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -802,5 +802,6 @@ TextSecure автоматски ќе го провери вашиот број 
   <string name="trimmer__old_messages_successfully_deleted">Старите пораки се успешно избришани</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Симбол за транспорт</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 4e68a423f9..4a4f42a515 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -260,5 +260,6 @@
   <!--media_preview_activity-->
   <!--Trimmer-->
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index abcb5867d6..1b84e3931f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -49,7 +49,7 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Geblokkeerde contacten</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">De identificerende sleutel van %1$s is veranderd. Dit kan betekenen dat iemand je communicatie probeert te onderscheppen of dat %2$s simpelweg TextSecure opnieuw geïnstalleerd heeft en nu een nieuwe identiteit heeft.</string>
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">De identificerende sleutel van %1$s is veranderd. Dit kan betekenen dat iemand probeert je communicatie te onderscheppen óf %2$s heeft simpelweg TextSecure opnieuw geïnstalleerd en heeft nu een nieuwe identiteitssleutel.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Je wilt wellicht dit contact verifiëren.</string>
   <string name="ConfirmIdentityDialog_accept">Accepteren</string>
   <!--ConversationItem-->
@@ -145,6 +145,7 @@ Indien je in de toekomst weer TextSecure berichten wilt gebruiken zul je je tele
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Door dit apparaat te ontkoppelen zal het niet langer berichten kunnen verzenden en ontvangen.</string>
   <string name="DeviceListActivity_network_connection_failed">Netwerkverbinding mislukt..</string>
   <string name="DeviceListActivity_try_again">Probeer opnieuw</string>
+  <string name="DeviceListActivity_disconnecting_device">Toestel aan het loskoppelen...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Apparaat aan het loskoppelen</string>
   <string name="DeviceListActivity_network_failed">Netwerkfout!</string>
   <!--DeviceListItem-->
@@ -389,6 +390,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="MessageNotifier_failed_to_deliver_message">Het bericht afleveren is mislukt.</string>
   <string name="MessageNotifier_error_delivering_message">Fout bij afleveren bericht.</string>
   <string name="MessageNotifier_mark_all_as_read">Alles als gelezen markeren</string>
+  <string name="MessageNotifier_mark_read">Gelezen</string>
   <string name="MessageNotifier_media_message">Mediabericht</string>
   <string name="MessageNotifier_reply">Reageren</string>
   <!--QuickResponseService-->
@@ -425,6 +427,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="conversation_activity__compose_description">Bericht samenstelling</string>
   <string name="conversation_activity__emoji_toggle_description">Wissel emoji toetsenbord</string>
   <string name="conversation_activity__attachment_thumbnail">Bijlage Miniatuur</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Bijlageoverzicht tonen/verbergen</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Mediabericht aan het downloaden</string>
   <string name="conversation_item__mms_image_description">Mediabericht</string>
@@ -501,6 +504,8 @@ Importeer een niet-versleutelde back-up voor \'SMS Back-up En Herstellen\'.</str
   <string name="recipient_preferences__ringtone">Beltoon</string>
   <string name="recipient_preferences__vibrate">Vibreren</string>
   <string name="recipient_preferences__block">Blokkeren</string>
+  <string name="recipient_preferences__color">Kleur</string>
+  <string name="recipient_preferences__color_for_this_contact">Kleur voor dit contact</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifieer je telefoonnummer om met TextSecure verbinding te maken.
@@ -511,6 +516,7 @@ TELEFOONNUMMER</string>
   <string name="registration_activity__phone_number">TELEFOONNUMMER</string>
   <string name="registration_activity__register">Registreren</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registreren deelt tijdelijk enige informatie met de server. Het wordt niet bewaard.</string>
+  <string name="registration_activity__powered_by_twilio">Mogelijk gemaakt door twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Mogelijke problemen
 zijn:</string>
@@ -755,6 +761,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="conversation__menu_leave_group">Groep verlaten</string>
   <string name="conversation__menu_delete_thread">Gehele gesprek verwijderen</string>
   <string name="conversation__menu_view_media">Alle afbeeldingen</string>
+  <string name="conversation__menu_conversation_settings">Gespreksinstellingen</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Popup vergroten</string>
   <!--conversation_callable-->
@@ -797,5 +804,7 @@ TextSecure heeft te lang moeten wachten op het binnenkomen van de verificatie-SM
   <string name="trimmer__old_messages_successfully_deleted">Oude berichten succesvol verwijderd</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Transportkanaal icoon</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Camera niet beschikbaar</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index e6414b8dbc..fc745e7c97 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -146,6 +146,7 @@ denne kontakten.</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ved å frakoble denne enheten vil den ikke lenger være i stand til å sende eller motta meldinger.</string>
   <string name="DeviceListActivity_network_connection_failed">Nettverksforbindelse feilet...</string>
   <string name="DeviceListActivity_try_again">Prøv igjen</string>
+  <string name="DeviceListActivity_disconnecting_device">Frakobler enhet...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Frakobler enhet</string>
   <string name="DeviceListActivity_network_failed">Nettverk feilet!</string>
   <!--DeviceListItem-->
@@ -389,6 +390,7 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Klarte ikke å levere meldingen.</string>
   <string name="MessageNotifier_error_delivering_message">Feil ved levering av meldingen.</string>
   <string name="MessageNotifier_mark_all_as_read">Marker alle som lest</string>
+  <string name="MessageNotifier_mark_read">Marker som lest</string>
   <string name="MessageNotifier_media_message">Multimediamelding</string>
   <string name="MessageNotifier_reply">Svar</string>
   <!--QuickResponseService-->
@@ -425,6 +427,7 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="conversation_activity__compose_description">Meldingssammensetning</string>
   <string name="conversation_activity__emoji_toggle_description">Emoji tastatur av/på</string>
   <string name="conversation_activity__attachment_thumbnail">Vedleggsikon</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Vedleggsskuff av/på</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Media melding lastes ned</string>
   <string name="conversation_item__mms_image_description">Multimediamelding</string>
@@ -500,6 +503,8 @@ Importer en klartekst backup kompatibel med \'SMSBackup And Restore\'.</string>
   <string name="recipient_preferences__ringtone">Ringelyd</string>
   <string name="recipient_preferences__vibrate">Vibrer</string>
   <string name="recipient_preferences__block">Blokker</string>
+  <string name="recipient_preferences__color">Farge</string>
+  <string name="recipient_preferences__color_for_this_contact">Farge for denne kontakten</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Verifiser telefonnummeret dit for å koble til TextSecure.
@@ -510,6 +515,7 @@ TELEFONNUMMER</string>
   <string name="registration_activity__phone_number">TELEFONNUMMER</string>
   <string name="registration_activity__register">Registrer</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Registrering sender noe kontaktinformasjon til serveren. Det blir ikke lagret.</string>
+  <string name="registration_activity__powered_by_twilio">Drevet av twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Noen mulige problemer
 inkluderer:</string>
@@ -750,6 +756,7 @@ Gratis og private meldinger til TextSecure og Signal brukere
   <string name="conversation__menu_leave_group">Forlat gruppe</string>
   <string name="conversation__menu_delete_thread">Slett tråd</string>
   <string name="conversation__menu_view_media">Alle bilder</string>
+  <string name="conversation__menu_conversation_settings">Samtaleinstillinger</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Utvid pop-up</string>
   <!--conversation_callable-->
@@ -792,5 +799,7 @@ Gratis og private meldinger til TextSecure og Signal brukere
   <string name="trimmer__old_messages_successfully_deleted">Sletting av gamle meldinger vellykket</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Transportikon</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera utilgjengelig</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 0a7179ef76..2509a6e484 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -790,5 +790,6 @@ Darmowe i prywatne wiadomości do użytkowników TextSecure i Signal</string>
   <string name="trimmer__old_messages_successfully_deleted">Stare wiadomości zostały pomyślnie usunięte</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona transportu</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index bb47e012b2..25cf6d2175 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -156,6 +156,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desconectar este dispositivo, ele não poderá mais enviar ou receber mensagens.</string>
   <string name="DeviceListActivity_network_connection_failed">Conexão de rede falhou...</string>
   <string name="DeviceListActivity_try_again">Tentar de novo</string>
+  <string name="DeviceListActivity_disconnecting_device">Desconectando dispositivo...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Desconectando dispositivo</string>
   <string name="DeviceListActivity_network_failed">Rede falhou!</string>
   <!--DeviceListItem-->
@@ -421,6 +422,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="MessageNotifier_failed_to_deliver_message">Falha ao enviar mensagem.</string>
   <string name="MessageNotifier_error_delivering_message">Erro ao enviar mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
+  <string name="MessageNotifier_mark_read">Marcar como lida</string>
   <string name="MessageNotifier_media_message">Mensagem multimídia</string>
   <string name="MessageNotifier_reply">Responder</string>
   <!--QuickResponseService-->
@@ -457,6 +459,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="conversation_activity__compose_description">Composição de mensagem</string>
   <string name="conversation_activity__emoji_toggle_description">Alternar teclado emoji</string>
   <string name="conversation_activity__attachment_thumbnail">Miniatura do anexo</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Trocar guardador de anexos</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Baixando mensagem multimídia</string>
   <string name="conversation_item__mms_image_description">Mensagem multimídia</string>
@@ -536,6 +539,8 @@ Tem certeza que deseja fazer isto?</string>
   <string name="recipient_preferences__ringtone">Toque</string>
   <string name="recipient_preferences__vibrate">Vibrar</string>
   <string name="recipient_preferences__block">Bloquear</string>
+  <string name="recipient_preferences__color">Cor</string>
+  <string name="recipient_preferences__color_for_this_contact">Cor para este contato</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
         Verifique seu número telefônico para conectar-se ao TextSecure.
@@ -547,6 +552,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="registration_activity__phone_number">NÚMERO TELEFÔNICO</string>
   <string name="registration_activity__register">Cadastrar</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">O registro irá transmitir algumas informações de contato para o servidor. Elas não serão gravadas.</string>
+  <string name="registration_activity__powered_by_twilio">Fornecido por twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Alguns problemas possíveis
         incluem:
@@ -805,6 +811,7 @@ falhou.</string>
   <string name="conversation__menu_leave_group">Sair do grupo</string>
   <string name="conversation__menu_delete_thread">Excluir conversa</string>
   <string name="conversation__menu_view_media">Todas as imagens</string>
+  <string name="conversation__menu_conversation_settings">Configurações de conversa</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Expandir popup</string>
   <!--conversation_callable-->
@@ -847,5 +854,7 @@ falhou.</string>
   <string name="trimmer__old_messages_successfully_deleted">Mensagens antigas excluídas com sucesso</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ícone do transporte</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Câmera indisponível</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 15cf3ef71d..654eb7418c 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -18,6 +18,13 @@ Atenção, isto desativa a cifra de armazenamento para todas as mensagens e chav
 As suas sessões continuam cifradas, mas qualquer pessoa com acesso físico ao dispositivo
 terá acesso ás mensagens e chaves.</string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
+  <string name="ApplicationPreferencesActivity_unregistering">A eliminar o registo...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">A eliminar o registo de mensagens TextSexure...</string>
+  <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Desabilitar mensagens TextSecure?</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
+Isto vai desactivar as mensagens TextSecure, eliminando o seu registo do servidor.
+Vai ser necessário re-registar o seu número de telefone se pretender utilizar esta funcionalidade novamente.
+</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Erro ao conectar-se com o servidor!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Activos</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Definir como aplicação SMS por omissão</string>
@@ -27,6 +34,7 @@ terá acesso ás mensagens e chaves.</string>
   <string name="ApplicationPreferencesActivity_On">Ligado</string>
   <string name="ApplicationPreferencesActivity_off">desligado</string>
   <string name="ApplicationPreferencesActivity_Off">Desligado</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
   <string name="AppProtectionPreferenceFragment_minutes">%d minutos</string>
   <!--DraftDatabase-->
@@ -36,24 +44,35 @@ terá acesso ás mensagens e chaves.</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Não foi possível encontrar uma aplicação para seleccionar o média.</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_take_photo">Tirar Fotografia</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Áudio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Informação de contacto</string>
   <!--BlockedContactsActivity-->
+  <string name="BlockedContactsActivity_blocked_contacts">Contactos bloqueados</string>
   <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">A
+assinatura deste intercâmbio de chaves é diferente da previamente recebida de %1$s.
+Isto pode significar que alguém está a tentar interceptar esta comunicação ou simplesmente
+que %2$s reinstalou TextSecure e tem agora uma nova chave de identidade.
+</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Pode ser desejável verificar este contracto.</string>
+  <string name="ConfirmIdentityDialog_accept">Aceitar</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Tamanho da mensagem: %d KB</string>
   <string name="ConversationItem_expires_s">Expira: %s</string>
+  <string name="ConversationItem_error_not_delivered">Não entregue</string>
   <string name="ConversationItem_view_secure_media_question">Ver ficheiro seguro?</string>
   <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Esta média foi armazenada numa base de dados cifrada. Infelizmente, para visualizá-la num programa externo, é necessário que os dados sejam temporariamente decifrados e escritos para o disco. Tem certeza que deseja fazer isto?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Erro, foi recebida uma mensagem de intercâmbio de chaves desactualizada.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Foi recebida uma mensagem de intercâmbio de chaves, clique para processá-la.</string>
   <string name="ConversationItem_group_action_left">%1$s deixou o grupo.</string>
+  <string name="ConversationItem_click_for_details">Pressione para ver detalhes</string>
   <string name="ConversationItem_click_to_approve_unencrypted">Pressione para enviar de modo inseguro</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Recorrer a SMS não cifrado?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Recorrer a MMS não cifrado?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Esta mensagem <b>não</b> será cifrada porque o recipiente já não é um utilizador TextSecure. Enviar mensagem de modo inseguro?</string>
   <string name="ConversationItem_unable_to_open_media">Não foi possível encontrar uma aplicação capaz de abrir este média.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_initiate_secure_session_question">Iniciar sessão segura?</string>
@@ -70,6 +89,7 @@ terá acesso ás mensagens e chaves.</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lamento, o áudio seleccionado 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>
   <string name="ConversationActivity_message_is_empty_exclamation">A mensagem está vazia!</string>
+  <string name="ConversationActivity_group_members">Membros do grupo</string>
   <string name="ConversationActivity_group_conversation">Conversa em grupo</string>
   <string name="ConversationActivity_unnamed_group">Grupo sem nome</string>
   <string name="ConversationActivity_d_recipients_in_group">%d membros</string>
@@ -84,7 +104,14 @@ terá acesso ás mensagens e chaves.</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS insegura</string>
   <string name="ConversationActivity_transport_textsecure">TextSecure</string>
   <string name="ConversationActivity_get_with_it">Alinha: %s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Vamos usar isto para conversar: %s</string>
   <string name="ConversationActivity_error_leaving_group">Erro a abandonar grupo...</string>
+  <string name="ConversationActivity_mms_not_supported_title">MMS não suportadas</string>
+  <string name="ConversationActivity_mms_not_supported_message">Esta mensagem não pode ser enviada pois o seu operador não suporta MMS.</string>
+  <string name="ConversationActivity_specify_recipient">Por favor escolha um contacto</string>
+  <string name="ConversationActivity_unblock_question">Desbloquear?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Tem a certeza que quer desbloquear este contacto?</string>
+  <string name="ConversationActivity_unblock">Desbloquear</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transporte: %1$s\nEnviadas/Recebidas: %2$s</string>
@@ -98,10 +125,14 @@ terá acesso ás mensagens e chaves.</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Não é possível escrever para o armazenamento local!</string>
   <string name="ConversationFragment_saving_attachment">A guardar anexo</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">A guardar anexo para o armazenamento local...</string>
+  <string name="ConversationFragment_pending">Pendente...</string>
+  <string name="ConversationFragment_push">Dados (TextSecure)</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
+  <string name="ConversationFragment_deleting">A apagar</string>
   <string name="ConversationFragment_deleting_messages">A apagar mensagens...</string>
   <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">Procurar...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Apagar conversas?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Tem a certeza que pretende apagar TODAS as conversas seleccionadas?</string>
@@ -110,11 +141,24 @@ terá acesso ás mensagens e chaves.</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
   <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">Usar a opção personalizada: %s</string>
+  <string name="CustomDefaultPreference_using_default">Usar a opção por omissão: %s</string>
   <string name="CustomDefaultPreference_none">Nenhum</string>
   <!--DateUtils-->
   <string name="DateUtils_now">Agora</string>
+  <string name="DateUtils_minutes_ago">%d min</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s">Desligar \'%s\'?</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Ao desligar este dispositivo, vai deixar de enviar ou receber mensagens.</string>
+  <string name="DeviceListActivity_network_connection_failed">A ligação à rede falhou!</string>
+  <string name="DeviceListActivity_try_again">Tente novamente</string>
+  <string name="DeviceListActivity_disconnecting_device">A desligar dispositivo...</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">A desligar dispositivo</string>
+  <string name="DeviceListActivity_network_failed">A rede falhou!</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Dispositivo sem nome</string>
+  <string name="DeviceListItem_created_s">Criado %s</string>
+  <string name="DeviceListItem_last_active_s">Activo pela última vez %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partilhar com</string>
   <!--ExportFragment-->
@@ -172,6 +216,7 @@ Irá perder todas as informações na sua instalação atual do TextSecure, mas
 mensagens de um backup em texto simples. Se você já importou este backup anteriormente,
 importá-lo novamente resultará em mensagens duplicadas.</string>
   <string name="ImportFragment_importing">A importar</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Importar cópia de segurança em texto simples...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Não foi encontrada uma cópia de segurança em texto simples!</string>
   <string name="ImportFragment_error_importing_backup">Erro a importar cópia de segurança!</string>
   <string name="ImportFragment_import_complete">Importação completa!</string>
@@ -184,6 +229,8 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">Instalar o Barcode Scanner?</string>
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">TextSecure necessida do Barcode Scanner para códigos QR.</string>
   <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">O envio falhou</string>
+  <string name="MessageDetailsRecipient_new_identity">Nova identidade</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Erro a armazenar MMS!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">Erro na ligação com o servidor MMS...</string>
@@ -197,6 +244,7 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">As frases-chave não coincidem.</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Frase-chave anterior incorrecta!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Introduza uma nova frase-chave</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Interligar este dispositivo?</string>
   <string name="DeviceProvisioningActivity_cancel">CANCELAR</string>
@@ -207,19 +255,35 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
 - Ler todas as suas mensagens
 \n- Enviar mensagens em seu nome
 </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">A adicionar dispositivo</string>
   <string name="DeviceProvisioningActivity_content_progress_content">A adicionar um novo dispositivo...</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Dispositivo adicionado!</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_registered_already">Lamentamos mas tem demasiados dispositivos registados, tente remover alguns...</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduza palavra-chave</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icon TextSecure</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Enviar frase-chave</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Palavra-chave inválida!</string>
   <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">A sua versão de Google Play Services não está a funcionar correctamente. Por favor reinstale Google Play Services e tente novamente.</string>
   <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">Avalie esta aplicação</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Se gosotu desta aplicação, por favor ajude-nos avaliando-a.</string>
+  <string name="RatingManager_rate_now">Avalie agora!</string>
+  <string name="RatingManager_no_thanks">Não, obrigado</string>
+  <string name="RatingManager_later">Mais tarde</string>
   <!--RecipientPreferencesActivity-->
+  <string name="RecipientPreferenceActivity_block_this_contact_question">Bloquear este contacto?</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Não irá ver mensagens adicionais deste utilizador.</string>
+  <string name="RecipientPreferenceActivity_block">Bloquear</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Desbloquear este contacto?</string>
+  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Tem a certeza que quer desbloquear este contacto?</string>
+  <string name="RecipientPreferenceActivity_unblock">Desbloquear</string>
+  <string name="RecipientPreferenceActivity_enabled">Activo</string>
+  <string name="RecipientPreferenceActivity_disabled">Desactivado</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Conectar-se ao TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Escolha o seu país</string>
@@ -327,6 +391,7 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
   <!--MuteDialog-->
+  <string name="MuteDialog_mute_notifications">Silenciar notificações</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Importação em progresso</string>
   <string name="ApplicationMigrationService_importing_text_messages">A importar mensages de texto</string>
@@ -336,14 +401,21 @@ 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_encrypted_message">Mensagem cifrada...</string>
+  <string name="MessageNotifier_media_message_with_text">Mensagem media: %s</string>
   <string name="MessageNotifier_no_subject">(Sem Assunto)</string>
   <string name="MessageNotifier_message_delivery_failed">A remessa de mensagem falhou.</string>
   <string name="MessageNotifier_failed_to_deliver_message">Falhou a remessa de mensagem.</string>
   <string name="MessageNotifier_error_delivering_message">Erro a remeter a mensagem.</string>
   <string name="MessageNotifier_mark_all_as_read">Marcar todas como lidas</string>
+  <string name="MessageNotifier_mark_read">Marcar como lida</string>
   <string name="MessageNotifier_media_message">Mensagem media</string>
+  <string name="MessageNotifier_reply">Responder</string>
   <!--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>
   <!--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>
@@ -360,9 +432,11 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Seleccionar para</string>
   <!--blocked_contacts_fragment-->
+  <string name="blocked_contacts_fragment__no_blocked_contacts">Sem contactos bloqueados...</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Sem chamadas recentes.</string>
   <!--conversation_title_view-->
+  <string name="conversation_title_view__conversation_muted">Conversa silenciada</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Enviar mensagem TextSecure</string>
   <string name="conversation_activity__type_message_sms_insecure">Enviar SMS insegura</string>
@@ -372,7 +446,10 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="conversation_activity__window_description">Conversa com %1$s</string>
   <string name="conversation_activity__compose_description">Composição da mensagem</string>
   <string name="conversation_activity__emoji_toggle_description">Teclado emoji</string>
+  <string name="conversation_activity__attachment_thumbnail">Antevisão de anexo</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Comutar gaveta de anexos</string>
   <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">A descarregar mensagem media</string>
   <string name="conversation_item__mms_image_description">Mensagem media</string>
   <string name="conversation_item__secure_message_description">Mensagem segura</string>
   <!--conversation_item_sent-->
@@ -392,6 +469,7 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="country_selection_fragment__loading_countries">A carregar lista de países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_paired">Nenhum dispositivo emparelhado...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Não foi possível obter os registos do seu dispositivo. Alternativamente, pode utilizar o ADB para os obter.</string>
   <string name="log_submit_activity__thanks">Obrigado pela sua ajuda!</string>
@@ -423,6 +501,8 @@ Importar uma cópia de segurança de texto simples. Compatível com \'SMSBackup
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">Sem imagens</string>
   <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">VERIFICAR</string>
+  <string name="message_recipients_list_item__resend">REENVIAR</string>
   <!--MmsPreferencesFragment-->
   <string name="MmsPreferencesFragment__manual_mms_settings_are_required">É necessária a configuração manual de MMS para o seu aparelho.</string>
   <string name="MmsPreferencesFragment__enabled">Activo</string>
@@ -440,14 +520,26 @@ Importar uma cópia de segurança de texto simples. Compatível com \'SMSBackup
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">O TextSecure precisa de configurações MMS para transmitir média e mensagens de grupo através da sua operadora. O seu aparelho não disponibiliza essa informação, o que pode ocorrer em aparelhos bloqueados ou com configurações restritivas.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Para enviar média e mensagens de grupo, clique \'OK\' e complete as configurações pedidas. As configurações MMS da sua operadora geralmente podem ser encontradas procurando por \'operadora APN\'. Você só precisará fazer isto uma vez.</string>
   <!--recipient_preferences_activity-->
+  <string name="recipient_preference_activity__blocked">BLOQUEADO</string>
   <!--recipient_preferences-->
+  <string name="recipient_preferences__mute_conversation">Silenciar conversa</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">Desabilitar notificações para esta conversa</string>
+  <string name="recipient_preferences__ringtone">Toque</string>
+  <string name="recipient_preferences__vibrate">Vibrar</string>
+  <string name="recipient_preferences__block">Bloquear</string>
+  <string name="recipient_preferences__color">Cor</string>
+  <string name="recipient_preferences__color_for_this_contact">Cor para este contacto</string>
   <!--registration_activity-->
+  <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
+Verifique o seu número de telefone para contactar com TextSecure
+</string>
   <string name="registration_activity__your_country">PAÍS</string>
   <string name="registration_activity__your_country_code_and_phone_number">PAÍS E
 NÚMERO DE TELEFONE</string>
   <string name="registration_activity__phone_number">TELEFONE</string>
   <string name="registration_activity__register">Registar</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">O registo irá transmitir alguma informação de contacto para o servidor. Esta não é armazenada.</string>
+  <string name="registration_activity__powered_by_twilio">Providenciado por twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Alguns possíveis problemas
 incluem:
@@ -500,6 +592,9 @@ O tempo de espera da mensagem SMS de verificação TextSecure expirou.</string>
 falhou.
 </string>
   <string name="registration_progress_activity__generating_keys">A gerar chaves...</string>
+  <string name="registration_progress_activity__alert">Alerta</string>
+  <string name="registration_progress_activity__telephone">Telefone</string>
+  <string name="registration_progress_activity__check">Verificar</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Introduza um nome ou número</small></string>
   <string name="recipients_panel__add_member">Adicionar novo membro</string>
@@ -507,6 +602,13 @@ falhou.
   <string name="verify_identity_activity__their_identity_they_read">A identidade do destinatário (ele lê):</string>
   <string name="verify_identity_activity__your_identity_you_read">A sua identidade (você lê):</string>
   <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">Alguns problemas requerem a sua atenção.</string>
+  <string name="message_details_header__sent">Enviado</string>
+  <string name="message_details_header__received">Recebido</string>
+  <string name="message_details_header__via">Via</string>
+  <string name="message_details_header__to">Para:</string>
+  <string name="message_details_header__from">De:</string>
+  <string name="message_details_header__with">Com:</string>
   <!--AndroidManifest.xml-->
   <string name="AndroidManifest__create_passphrase">Criar frase-chave</string>
   <string name="AndroidManifest__enter_passphrase">Introduza palavra-chave</string>
@@ -519,9 +621,20 @@ falhou.
   <string name="AndroidManifest__media_preview">Antevisão de média</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_paired_devices">Gerir dispositivos emparelhados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
+  <string name="arrays__use_default">Usar a opção por omissão</string>
+  <string name="arrays__use_custom">Usar a opção personalizada</string>
+  <string name="arrays__mute_for_one_hour">Silenciar por 1 hora</string>
+  <string name="arrays__mute_for_two_hours">Silenciar por 2 horas</string>
+  <string name="arrays__mute_for_one_day">Silenciar por 1 dia</string>
+  <string name="arrays__mute_for_seven_days">Silenciar por 7 dias</string>
+  <string name="arrays__settings_default">Configurações por omissão</string>
+  <string name="arrays__enabled">Activo</string>
+  <string name="arrays__disabled">Desactivado</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -532,6 +645,8 @@ falhou.
   <string name="preferences__sms_mms">SMS e MMS</string>
   <string name="preferences__pref_all_sms_title">Receber todas as SMS</string>
   <string name="preferences__pref_all_mms_title">Receber todas as MMS</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilizar TextSecure para todas as mensagens de texto recebidas</string>
+  <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_multimedia_messages">Utilizar TextSecure para todas as mensagens multimedia recebidas</string>
   <string name="preferences__input_settings">Configurações de introdução</string>
   <string name="preferences__enable_enter_key_title">Habilitar a tecla Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Substituir a tecla \'smiley\' por uma tecla \'Enter\'</string>
@@ -543,8 +658,10 @@ falhou.
   <string name="preferences__change_passphrase">Alterar frase-chave</string>
   <string name="preferences__change_my_passphrase">Mudar a minha frase-chave</string>
   <string name="preferences__enable_passphrase">Activar frase-chave</string>
+  <string name="preferences__passphrase_summary">Frase-chave %s</string>
   <string name="preferences__enable_local_encryption_of_messages_and_keys">Activar cifra local para as mensagens e chaves</string>
   <string name="preferences__screen_security">Segurança de ecrã</string>
+  <string name="preferences__screen_security_summary">Segurança de ecrã %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bloquear captura de ecrã na lista de recentes e dentro da aplicação</string>
   <string name="preferences__forget_passphrase_from_memory_after_some_interval">Esquecer a frase-chave após algum intervalo</string>
   <string name="preferences__timeout_passphrase">Expirar frase-chave</string>
@@ -563,6 +680,14 @@ falhou.
   <string name="preferences__sound">Som</string>
   <string name="preferences__change_notification_sound">Alterar som de notificação</string>
   <string name="preferences__inthread_notifications">Notificações em conversas</string>
+  <string name="preferences__play_inthread_notifications">Activar notificações enquanto segue uma conversa activa</string>
+  <string name="preferences__repeat_alerts">Alertas repetidos</string>
+  <string name="preferences__never">Nunca</string>
+  <string name="preferences__one_time">Uma vez</string>
+  <string name="preferences__two_times">Duas vezes</string>
+  <string name="preferences__three_times">Três vezes</string>
+  <string name="preferences__five_times">Cinco vezes</string>
+  <string name="preferences__ten_times">Dez vezes</string>
   <string name="preferences__vibrate">Vibrar</string>
   <string name="preferences__also_vibrate_when_notified">Vibrar também quando notificado</string>
   <string name="preferences__minutes">minutos</string>
@@ -580,9 +705,16 @@ falhou.
   <string name="preferences__slow">Lento</string>
   <string name="preferences__custom">Personalizado</string>
   <string name="preferences__advanced">Avançado</string>
+  <string name="preferences__privacy">Privacidade</string>
+  <string name="preferences__mms_user_agent">User Agent MMS</string>
   <string name="preferences__advanced_mms_access_point_names">Configuração MMS manual</string>
   <string name="preferences__enable_manual_mms">Utilizar configuração MMS Manual</string>
   <string name="preferences__override_system_mms_settings">Usar a informação abaixo ao invés das configurações MMS do sistema.</string>
+  <string name="preferences__mmsc_url">URL MMSC</string>
+  <string name="preferences__mms_proxy_host">Proxy MMS</string>
+  <string name="preferences__mms_proxy_port">Porta do Proxy MMS</string>
+  <string name="preferences__mmsc_username">Nome de utilizador MMSC</string>
+  <string name="preferences__mmsc_password">Palavra-chave MMSC</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Apagar automaticamente as mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
@@ -594,10 +726,18 @@ falhou.
   <string name="preferences__dark_theme">Escuro</string>
   <string name="preferences__appearance">Aspecto</string>
   <string name="preferences__theme">Tema</string>
+  <string name="preferences__theme_summary">Tema %s</string>
   <string name="preferences__default">Opção por omissão</string>
   <string name="preferences__language">Língua</string>
+  <string name="preferences__language_summary">Língua %s</string>
+  <string name="preferences__textsecure_messages">Mensagens TextSecure</string>
+  <string name="preferences__use_the_data_channel_for_communication_with_other_textsecure_users">
+Mensagens privadas gratuítas para utiliazadores TextSecure e Signal
+</string>
   <string name="preferences__submit_debug_log">Submeter registo de depuração</string>
   <string name="preferences__support_wifi_calling">Modo de compatibilidade \"Chamada WiFi\"</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Active se o seu dispositivo utiliza entrega de SMS/MMS sobre WiFi (apenas active se \'WiFi Calling\' está activo neste dispositivo)</string>
+  <string name="preferences_app_protection__blocked_contacts">Contactos bloqueados</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -622,6 +762,7 @@ falhou.
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Guardar anexo</string>
   <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">Convidar</string>
   <!--conversation_insecure_no_push-->
   <string name="conversation_insecure__menu_start_secure_session">Iniciar sessão segura</string>
   <string name="conversation_insecure__security">Segurança</string>
@@ -631,20 +772,27 @@ falhou.
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Procurar</string>
   <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">Foto de Contacto</string>
+  <string name="conversation_list_item_view__error_alert">Alerta de erro</string>
   <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">Conversa nova</string>
   <!--conversation_secure_verified-->
   <string name="conversation_secure_verified__menu_security">Segurança</string>
   <string name="conversation_secure_verified__menu_verify_identity">Verificar identidade</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Terminar sessão segura</string>
   <!--conversation_muted-->
+  <string name="conversation_muted__unmute">Não silenciar</string>
   <!--conversation_unmuted-->
+  <string name="conversation_unmuted__mute_notifications">Silenciar notificações</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Adicionar anexo</string>
   <string name="conversation__menu_update_group">Actualizar grupo</string>
   <string name="conversation__menu_leave_group">Deixar grupo</string>
   <string name="conversation__menu_delete_thread">Apagar conversa</string>
   <string name="conversation__menu_view_media">Todas as imagens</string>
+  <string name="conversation__menu_conversation_settings">Configurações de conversa</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Expandir alerta</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Adicionar aos contactos</string>
   <!--conversation_group_options-->
@@ -680,8 +828,12 @@ falhou.
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Antevisão de imagem</string>
   <!--Trimmer-->
+  <string name="trimmer__deleting">A apagar</string>
   <string name="trimmer__deleting_old_messages">A apagar mensagens antigas...</string>
   <string name="trimmer__old_messages_successfully_deleted">Mensagens antigas apagadas com sucesso</string>
   <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">Icon de transporte</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Máquina fotográfica indisponível</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index d38b4de15c..d0a1656dbc 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -715,5 +715,6 @@ Operaţiunea iniţiată de TextSecure a expirat în timpul aşteptării primirii
   <string name="trimmer__old_messages_successfully_deleted">Mesajele vechi au fost șterse cu succes</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icoană transport</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f7e6c39930..5b2bf082d6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -17,13 +17,13 @@
 Внимание, вы собираетесь отключить шифрование базы данных, в которой хранятся все ваши сообщения и ключи. При переписке шифрование продолжит работать, однако любой, кто имеет физический доступ к вашему устройству, сможет прочитать ваши сообщения.</string>
   <string name="ApplicationPreferencesActivity_disable">Отключить</string>
   <string name="ApplicationPreferencesActivity_unregistering">Отмена регистрации</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Отмена регистрации в TextSecure...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_textsecure_messages">Отменяем регистрацию в TextSecure...</string>
   <string name="ApplicationPreferencesActivity_disable_textsecure_messages">Выключить общение через TextSecure?</string>
   <string name="ApplicationPreferencesActivity_this_will_disable_textsecure_messages">
-Это отключит сообщения TextSecure, отменив вашу регистрацию на сервере.
-Чтобы в будущем включить сообщения TextSecure, вам нужно будет зарегистрироваться вновь.</string>
+Это отключит пересылку сообщений через TextSecure и отменит вашу регистрацию на сервере.
+Чтобы в будущем включить сообщения TextSecure, вам нужно будет зарегистрировать ваш телефонный номер заново.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Ошибка при соединении с сервером!</string>
-  <string name="ApplicationPreferencesActivity_sms_enabled">SMS доступна</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">SMS включены</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Нажмите для выбора SMS-приложения по умолчанию</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS отключены</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_textsecure_your_default_sms_app">Нажмите, чтобы использовать TextSecure для всех SMS</string>
@@ -33,7 +33,7 @@
   <string name="ApplicationPreferencesActivity_Off">Выключено</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d минут</string>
+  <string name="AppProtectionPreferenceFragment_minutes">%d мин.</string>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(изображение)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(аудио)</string>
@@ -49,7 +49,7 @@
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Заблокированные контакты</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Ключ, идентифицирующий личность %1$s, изменился. Это может означать, что кто-то пытается перехватить вашу переписку, либо что %2$s просто переустановил TextSecure и теперь у него новый личный ключ. </string>
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Ключ, идентифицирующий личность %1$s, изменился. Это может означать, что кто-то пытается перехватить вашу переписку, или что %2$s просто переустановил TextSecure и теперь у него новый личный ключ. </string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Возможно, этого собеседника
 стоит перепроверить.</string>
   <string name="ConfirmIdentityDialog_accept">Принять</string>
@@ -79,8 +79,8 @@
   <string name="ConversationActivity_select_contact_info">Выбрать контакт</string>
   <string name="ConversationActivity_compose_message">Написать сообщение</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Извините, произошла ошибка при обработке вложения.</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Извините, выбранное видео превышает ограничение на размер сообщения (%1$sКБ).</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Извините, выбранное аудио превышает ограничение на размер сообщения (%1$sКБ).</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Извините, выбранное видео превышает ограничение на размер сообщения (%1$s Кб).</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Извините, выбранное аудио превышает ограничение на размер сообщения (%1$s Кб).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Адрес получателя не является ни номером телефона, ни адресом электронной почты.</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Пустое сообщение!</string>
   <string name="ConversationActivity_group_members">Участники группы</string>
@@ -142,7 +142,17 @@
   <string name="DateUtils_now">Только что</string>
   <string name="DateUtils_minutes_ago">%d мин</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s">Отключить «%s»?</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">После отключения это устройство больше не сможет отправлять или принимать сообщения.</string>
+  <string name="DeviceListActivity_network_connection_failed">Ошибка соединения...</string>
+  <string name="DeviceListActivity_try_again">Повторить</string>
+  <string name="DeviceListActivity_disconnecting_device">Отключаем устройство...</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">Отключение устройства</string>
+  <string name="DeviceListActivity_network_failed">Ошибка сети!</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">Устройство без названия</string>
+  <string name="DeviceListItem_created_s">Создано %s</string>
+  <string name="DeviceListItem_last_active_s">Было онлайн %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Поделиться с</string>
   <!--ExportFragment-->
@@ -235,6 +245,7 @@
   <string name="DeviceProvisioningActivity_content_progress_no_device">Устройство не найдено.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Ошибка сети.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Неверный QR-код.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Извините, у вас зарегистрировано слишком много устройств. Попробуйте отключить некоторые из них.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Введите парольную фразу</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Иконка TextSecure</string>
@@ -250,11 +261,13 @@
   <string name="RatingManager_later">Позже</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Заблокировать этот контакт?</string>
-  <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Вы больше не будете видеть сообщения этого пользователя.</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_see_messages_from_this_user">Вы больше не будете видеть сообщения от этого пользователя.</string>
   <string name="RecipientPreferenceActivity_block">Заблокировать</string>
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Разблокировать этот контакт?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Вы уверены, что хотите разблокировать этот контакт?</string>
   <string name="RecipientPreferenceActivity_unblock">Разблокировать</string>
+  <string name="RecipientPreferenceActivity_enabled">Включено</string>
+  <string name="RecipientPreferenceActivity_disabled">Выключено</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_textsecure">Подключение к TextSecure</string>
   <string name="RegistrationActivity_select_your_country">Выберите страну</string>
@@ -357,6 +370,7 @@
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Зашифрованное MMS-сообщение испорчено...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS-сообщение зашифрованно для несуществующей сессии...</string>
   <!--MuteDialog-->
+  <string name="MuteDialog_mute_notifications">Откл. звук уведомлений</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_import_in_progress">Идёт импорт</string>
   <string name="ApplicationMigrationService_importing_text_messages">Импорт текстовых сообщений</string>
@@ -375,8 +389,12 @@
   <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_media_message">MMS-сообщение</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">Быстрые ответы недоступны, когда TextSecure заблокирован!</string>
+  <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">СТАРАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
   <string name="change_passphrase_activity__new_passphrase">НОВАЯ ПАРОЛЬНАЯ ФРАЗА:</string>
@@ -397,6 +415,7 @@
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Нет недавних звонков.</string>
   <!--conversation_title_view-->
+  <string name="conversation_title_view__conversation_muted">Звуки разговора выключены</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Отправить сообщение TextSecure</string>
   <string name="conversation_activity__type_message_sms_insecure">Отправить незащищённое SMS</string>
@@ -428,6 +447,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_paired">Нет привязанных устройств...</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">Не удается получить лог с вашего устройства. Вы можете воспользоваться для этого ADB.</string>
   <string name="log_submit_activity__thanks">Спасибо за помощь!</string>
@@ -475,11 +495,15 @@
   <string name="prompt_mms_activity__textsecure_requires_mms_settings_to_deliver_media_and_group_messages">Приложению TextSecure необходимо знать настройки MMS вашего сотового оператора, чтобы отправлять и получать мультимедийные и групповые сообщения. Ваше устройство не даёт доступа к этой информации — так иногда бывает, если в телефоне запрещена смена SIM-карты и в некоторых иных случаях.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Чтобы отправлять мультимедийные и групповые сообщения, нажмите «ОК» и настройте MMS. Это нужно сделать только один раз. Настройки для вашего оператора можно узнать в службе техподдержки или в интернете по запросу «ваш оператор APN».</string>
   <!--recipient_preferences_activity-->
+  <string name="recipient_preference_activity__blocked">ЗАБЛОКИРОВАН</string>
   <!--recipient_preferences-->
+  <string name="recipient_preferences__mute_conversation">Выключить звуки разговора</string>
   <string name="recipient_preferences__disable_notifications_for_this_conversation">Отключить уведомления для этого разговора</string>
   <string name="recipient_preferences__ringtone">Мелодия</string>
   <string name="recipient_preferences__vibrate">Вибрация</string>
   <string name="recipient_preferences__block">Заблокировать</string>
+  <string name="recipient_preferences__color">Цвет</string>
+  <string name="recipient_preferences__color_for_this_contact">Цвет для этого контакта</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Подтвердите свой номер телефона, чтобы подключиться к TextSecure</string>
@@ -489,6 +513,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>
   <string name="registration_problems__sms_interceptors">Обработчики SMS</string>
@@ -570,11 +595,17 @@ SMS-подтверждения...
   <string name="AndroidManifest__media_overview">Все изображения</string>
   <string name="AndroidManifest__media_overview_named">Все изображения с %1$s</string>
   <string name="AndroidManifest__message_details">Подробности</string>
+  <string name="AndroidManifest_manage_paired_devices">Управление привязанными устройствами</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Импорт / экспорт</string>
   <string name="arrays__my_identity_key">Мой личный ключ</string>
   <string name="arrays__use_default">Использовать настройку по умолчанию</string>
   <string name="arrays__use_custom">Использовать пользовательскую настройку</string>
+  <string name="arrays__mute_for_one_hour">Выкл. звук на 1 час</string>
+  <string name="arrays__mute_for_two_hours">Выкл. звук на 2 часа</string>
+  <string name="arrays__mute_for_one_day">Выкл. звук на 1 день</string>
+  <string name="arrays__mute_for_seven_days">Выкл. звук на 7 дней</string>
+  <string name="arrays__settings_default">Настройки по умолчанию</string>
   <string name="arrays__enabled">Включено</string>
   <string name="arrays__disabled">Отключено</string>
   <!--plurals.xml-->
@@ -624,6 +655,7 @@ SMS-подтверждения...
   <string name="preferences__sound">Мелодия</string>
   <string name="preferences__change_notification_sound">Изменить мелодию уведомления</string>
   <string name="preferences__inthread_notifications">Уведомления при разговоре</string>
+  <string name="preferences__play_inthread_notifications">Проигрывать звук уведомления, даже когда открыт текущий разговор</string>
   <string name="preferences__repeat_alerts">Повторять сигналы</string>
   <string name="preferences__never">Никогда</string>
   <string name="preferences__one_time">Один раз</string>
@@ -649,7 +681,7 @@ SMS-подтверждения...
   <string name="preferences__custom">Настроить...</string>
   <string name="preferences__advanced">Расширенные</string>
   <string name="preferences__privacy">Конфиденциальность</string>
-  <string name="preferences__mms_user_agent">MMS-агент</string>
+  <string name="preferences__mms_user_agent">Клиент MMS</string>
   <string name="preferences__advanced_mms_access_point_names">Ручные настройки MMS</string>
   <string name="preferences__enable_manual_mms">Использовать ручные настройки MMS</string>
   <string name="preferences__override_system_mms_settings">Использовать вместо системных настроек MMS указанную ниже информацию.</string>
@@ -661,7 +693,7 @@ SMS-подтверждения...
   <string name="preferences__sms_delivery_reports">Отчеты о доставке SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запрашивать отчёт о доставке каждого отправленного SMS-сообщения</string>
   <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматически удалять старые сообщения, когда длина разговора превышает заданную</string>
-  <string name="preferences__delete_old_messages">Удалить старые сообщения</string>
+  <string name="preferences__delete_old_messages">Удалять старые сообщения</string>
   <string name="preferences__conversation_length_limit">Ограничение длины разговора</string>
   <string name="preferences__trim_all_threads_now">Обрезать все разговоры</string>
   <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Привести длину всех разговоров в соответствие с заданной</string>
@@ -678,6 +710,7 @@ SMS-подтверждения...
 Бесплатные приватные сообщения пользователям TextSecure и Signal</string>
   <string name="preferences__submit_debug_log">Отправить лог отладки</string>
   <string name="preferences__support_wifi_calling">Совместимость с Wi-Fi звонками</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включите, если ваше устройство отправляет и принимает SMS и MMS через Wi-Fi (и если Wi-Fi звонки включены)</string>
   <string name="preferences_app_protection__blocked_contacts">Заблокированные контакты</string>
   <!--****************************************-->
   <!--menus-->
@@ -722,14 +755,18 @@ SMS-подтверждения...
   <string name="conversation_secure_verified__menu_verify_identity">Подтвердить личность</string>
   <string name="conversation_secure_verified__menu_abort_secure_session">Завершить защищённый сеанс</string>
   <!--conversation_muted-->
+  <string name="conversation_muted__unmute">Вкл. звук</string>
   <!--conversation_unmuted-->
+  <string name="conversation_unmuted__mute_notifications">Откл. звук уведомлений</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Добавить вложение</string>
   <string name="conversation__menu_update_group">Обновить группу</string>
   <string name="conversation__menu_leave_group">Покинуть группу</string>
   <string name="conversation__menu_delete_thread">Удалить разговор</string>
   <string name="conversation__menu_view_media">Все изображения</string>
+  <string name="conversation__menu_conversation_settings">Настройки разговора</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">Расширить</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">Добавить в контакты</string>
   <!--conversation_group_options-->
@@ -770,5 +807,7 @@ SMS-подтверждения...
   <string name="trimmer__old_messages_successfully_deleted">Старые сообщения успешно удалены</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Иконка транспорта</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Камера недоступна</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0fc41ca50a..ff3cc56c94 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -781,5 +781,6 @@ Bezplatné šifrované správy medzi používateľmi TextSecure
   <string name="trimmer__old_messages_successfully_deleted">Staré správy úspešne vymazané</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona prenosu</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 869c3760c1..22a5cb9013 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -146,6 +146,7 @@ preveriti ta stik.</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Z odstranitvijo naprave ta ne bo več mogla pošiljati ali prejemati sporočil.</string>
   <string name="DeviceListActivity_network_connection_failed">Omrežno povezovanje ni bilo uspešno...</string>
   <string name="DeviceListActivity_try_again">Poskusite znova</string>
+  <string name="DeviceListActivity_disconnecting_device">Odstranjujem napravo...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Odklapljam napravo...</string>
   <string name="DeviceListActivity_network_failed">Povezovanje ni uspelo!</string>
   <!--DeviceListItem-->
@@ -384,6 +385,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="MessageNotifier_failed_to_deliver_message">Neuspešna dostava sporočila.</string>
   <string name="MessageNotifier_error_delivering_message">Napaka pri dostavi sporočila.</string>
   <string name="MessageNotifier_mark_all_as_read">Označi vse kot prebrano</string>
+  <string name="MessageNotifier_mark_read">Označi kot prebrano</string>
   <string name="MessageNotifier_media_message">Multiedijsko sporočilo</string>
   <string name="MessageNotifier_reply">Odgovor</string>
   <!--QuickResponseService-->
@@ -493,6 +495,8 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="recipient_preferences__ringtone">Zvonjenje</string>
   <string name="recipient_preferences__vibrate">Vibriranje</string>
   <string name="recipient_preferences__block">Blokiraj</string>
+  <string name="recipient_preferences__color">Barva</string>
+  <string name="recipient_preferences__color_for_this_contact">Barva stika</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Za uporabo sporočil TextSecure potrdite svojo telefonsko številko.</string>
@@ -502,6 +506,7 @@ TELEFONSKA ŠTEVILKA</string>
   <string name="registration_activity__phone_number">TELEFONSKA ŠTEVILKA</string>
   <string name="registration_activity__register">Registriraj</string>
   <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Pri registraciji se nekateri podatki uporabnika začasno posredujejo na strežnik.</string>
+  <string name="registration_activity__powered_by_twilio">Pogon: Twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Nekatere možni razlogi
 za težave:</string>
@@ -748,6 +753,7 @@ Brezplačno zasebno sporočanje za TextSecure in Signal</string>
   <string name="conversation__menu_leave_group">Zapusti skupino</string>
   <string name="conversation__menu_delete_thread">Izbriši pogovor</string>
   <string name="conversation__menu_view_media">Vse slike</string>
+  <string name="conversation__menu_conversation_settings">Nastavitve pogovora</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Odpri pojavno okno</string>
   <!--conversation_callable-->
@@ -790,5 +796,7 @@ Brezplačno zasebno sporočanje za TextSecure in Signal</string>
   <string name="trimmer__old_messages_successfully_deleted">Stara sporočila so bila uspešno izbrisana</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona transporta</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera ni na voljo</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 863dbdd956..68d01d6234 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -151,6 +151,7 @@
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Овај уређај више неће моћи да шаље или прима поруке ако му прекинете везу:</string>
   <string name="DeviceListActivity_network_connection_failed">Повезивање на мрежу није успело...</string>
   <string name="DeviceListActivity_try_again">Покушај поново</string>
+  <string name="DeviceListActivity_disconnecting_device">Прекидам везу са уређајем...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Прекидам везу са уређајем</string>
   <string name="DeviceListActivity_network_failed">Неуспех мреже!</string>
   <!--DeviceListItem-->
@@ -404,6 +405,7 @@
   <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-->
@@ -440,6 +442,7 @@
   <string name="conversation_activity__compose_description">Састављање поруке</string>
   <string name="conversation_activity__emoji_toggle_description">Емоџи тастатура</string>
   <string name="conversation_activity__attachment_thumbnail">Сличица прилога</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">Фиока прилога</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Преузимање мултимедијалне поруке</string>
   <string name="conversation_item__mms_image_description">Мултимедијална порука</string>
@@ -517,6 +520,8 @@
   <string name="recipient_preferences__ringtone">Звоно</string>
   <string name="recipient_preferences__vibrate">Вибрирај</string>
   <string name="recipient_preferences__block">Блокирај</string>
+  <string name="recipient_preferences__color">Боја</string>
+  <string name="recipient_preferences__color_for_this_contact">Боја за контакт</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Потврдите ваш број телефона да бисте се пријавили на Сигурне поруке.
@@ -527,6 +532,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>
@@ -774,6 +780,7 @@
   <string name="conversation__menu_leave_group">Напусти групу</string>
   <string name="conversation__menu_delete_thread">Обриши преписку</string>
   <string name="conversation__menu_view_media">Све слике</string>
+  <string name="conversation__menu_conversation_settings">Поставке преписке</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Рашири прозорче</string>
   <!--conversation_callable-->
@@ -816,5 +823,7 @@
   <string name="trimmer__old_messages_successfully_deleted">Старе поруке успешно обрисане</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Икона преноса</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Камера није доступна</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a8d8457d25..d23e8b9a5c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -151,6 +151,7 @@ verifiera denna kontakt.</string>
   <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">Genom att ta bort denna enhet kommer den inte längre kunna skicka eller få meddelanden.</string>
   <string name="DeviceListActivity_network_connection_failed">Nätverksuppkoppling misslyckades...</string>
   <string name="DeviceListActivity_try_again">Försök igen</string>
+  <string name="DeviceListActivity_disconnecting_device">Tar bort enhet...</string>
   <string name="DeviceListActivity_disconnecting_device_no_ellipse">Tar bort enhet</string>
   <string name="DeviceListActivity_network_failed">Nätverket misslyckades</string>
   <!--DeviceListItem-->
@@ -369,7 +370,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="MmsDatabase_downloading_mms">Laddar ner MMS...</string>
   <string name="MmsDatabase_mms_download_failed">MMS-nedladdning misslyckades!</string>
   <string name="MmsDatabase_downloading">Laddar ner...</string>
-  <string name="MmsDatabase_mms_pending_download">Tappa och ställ in MMS-inställningar för att fortsätta nedladdning.</string>
+  <string name="MmsDatabase_mms_pending_download">Tryck och ställ in MMS-inställningar för att fortsätta nedladdning.</string>
   <string name="MmsDatabase_error_decrypting_message">Fel vid dekryptering av meddelande.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dekrypterar MMS, var vänlig vänta...</string>
@@ -395,6 +396,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="MessageNotifier_failed_to_deliver_message">Kunde inte leverera meddelande.</string>
   <string name="MessageNotifier_error_delivering_message">Fel vid leverans av meddelande.</string>
   <string name="MessageNotifier_mark_all_as_read">Markera alla som lästa</string>
+  <string name="MessageNotifier_mark_read">Markera läst</string>
   <string name="MessageNotifier_media_message">Mediameddelande</string>
   <string name="MessageNotifier_reply">Svara</string>
   <!--QuickResponseService-->
@@ -505,6 +507,8 @@ från systemets standardapp för meddelanden.</string>
   <string name="recipient_preferences__ringtone">Rington</string>
   <string name="recipient_preferences__vibrate">Vibrera</string>
   <string name="recipient_preferences__block">Blockera</string>
+  <string name="recipient_preferences__color">Färg</string>
+  <string name="recipient_preferences__color_for_this_contact">Färg för denna kontakt</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 Verifiera ditt telefonnummer för att ansluta till TextSecure.</string>
@@ -532,7 +536,7 @@ TextSecure fungerar inte med Google Voice-nummer.</string>
   <string name="registration_progress_activity__voice_verification">Röstverifiering</string>
   <string name="registration_progress_activity__textsecure_can_also_call_you_to_verify_your_number">
 TextSecure kan också ringa upp dig för att verifiera ditt telefonnummer. Tryck \'Ring mig\'
- och fyll i den sexsiffriga kod som du hör nedan.</string>
+ och fyll i den sexsiffriga koden som du hör nedan.</string>
   <string name="registration_progress_activity__verify">Verifiera</string>
   <string name="registration_progress_activity__call_me">Ring mig</string>
   <string name="registration_progress_activity__edit_number">Ändra nummer</string>
@@ -541,7 +545,9 @@ TextSecure kan också ringa upp dig för att verifiera ditt telefonnummer. Tryck
 TextSecure kunde inte ansluta till push-tjänsten.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Några möjliga orsaker:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ingen nätverksanslutning.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Din enhet behöver nätverksanslutning för att använda denna funktion. Kontrollera att du är ansluten via mobildata eller trådlöst nätverk.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Din
+enhet behöver nätverksanslutning för att använda denna funktion. Kontrollera att du är ansluten
+via 3G eller trådlöst nätverk.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktiv brandvägg.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Om du är ansluten via trådlöst nätverk är det möjligt att en brandvägg blockerar åtkomst till TextSecure-servern. Prova med ett annat nätverk eller mobil data.</string>
@@ -752,6 +758,7 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <string name="conversation__menu_leave_group">Lämna grupp</string>
   <string name="conversation__menu_delete_thread">Radera tråd</string>
   <string name="conversation__menu_view_media">Alla bilder</string>
+  <string name="conversation__menu_conversation_settings">Konversationsinställningar</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Expandera popup</string>
   <!--conversation_callable-->
@@ -794,5 +801,7 @@ Fria privata meddelanden till användare av TextSecure och Signal</string>
   <string name="trimmer__old_messages_successfully_deleted">Gamla meddelanden har raderats</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Transportikon</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">Kamera otillgänglig</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index f5cfb6bd0e..37016737e0 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -735,5 +735,6 @@ TextSecure சரிபார்ப்பு SMS-செய்திக்கா
   <string name="trimmer__old_messages_successfully_deleted">பழையசெய்திகள் நீக்கப்பட்டது</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">போக்குவரத்து குறும்படம்</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a316213acf..cbe296d323 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -758,5 +758,6 @@ TextSecure ve Signal kullanıcıları ile ücretsiz gizli mesajlaşma</string>
   <string name="trimmer__old_messages_successfully_deleted">Eski mesajlar silindi</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Taşıma simgesi</string>
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 94eb686521..312738e4d2 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -388,5 +388,6 @@
   <!--media_preview_activity-->
   <!--Trimmer-->
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7bcf93034d..04a48385dc 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -471,5 +471,6 @@ TextSecure hết hạn chờ trong lúc đợi tin nhắn SMS xác nhận.</stri
   <!--media_preview_activity-->
   <!--Trimmer-->
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 51d67fec12..d7c42e6cdf 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -142,7 +142,17 @@
   <string name="DateUtils_now">现在</string>
   <string name="DateUtils_minutes_ago">%d 分钟</string>
   <!--DeviceListActivity-->
+  <string name="DeviceListActivity_disconnect_s"> 断开 \'%s\' ？</string>
+  <string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">如果断开此设备的连接，它将不能再接受或发送信息。</string>
+  <string name="DeviceListActivity_network_connection_failed">网络连接失败...</string>
+  <string name="DeviceListActivity_try_again">再试一次</string>
+  <string name="DeviceListActivity_disconnecting_device">正在断开设备连接...</string>
+  <string name="DeviceListActivity_disconnecting_device_no_ellipse">正在断开设备连接</string>
+  <string name="DeviceListActivity_network_failed">网络失败！</string>
   <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">未命名的设备</string>
+  <string name="DeviceListItem_created_s">已创建 %s</string>
+  <string name="DeviceListItem_last_active_s">最后活动  %s</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">共享给</string>
   <!--ExportFragment-->
@@ -236,6 +246,7 @@
   <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_registered_already">抱歉，您已经注册了太多的设备，请先移除一些…</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">输入密钥</string>
   <string name="PassphrasePromptActivity_watermark_content_description">TextSecure 图标</string>
@@ -381,8 +392,12 @@
   <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">当 TextSecure 处于锁定状态时，快速回复不可用！</string>
+  <string name="QuickResponseService_problem_sending_message">发送信息时遇到问题！</string>
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">旧密码：</string>
   <string name="change_passphrase_activity__new_passphrase">新密码：</string>
@@ -414,6 +429,7 @@
   <string name="conversation_activity__compose_description">编写信息</string>
   <string name="conversation_activity__emoji_toggle_description">切换表情键盘</string>
   <string name="conversation_activity__attachment_thumbnail">附件缩略图</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">切换附件抽屉</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">媒体信息正在下载</string>
   <string name="conversation_item__mms_image_description">媒体信息</string>
@@ -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_paired">没有配对的设备…</string>
   <!--log_submit_activity-->
   <string name="log_submit_activity__log_fetch_failed">无法获取您设备上的日志，不过您仍然可以以ADB方式来获得您的调试日志。</string>
   <string name="log_submit_activity__thanks">感谢！</string>
@@ -488,6 +505,8 @@
   <string name="recipient_preferences__ringtone">铃声</string>
   <string name="recipient_preferences__vibrate">振动</string>
   <string name="recipient_preferences__block">屏蔽</string>
+  <string name="recipient_preferences__color">颜色</string>
+  <string name="recipient_preferences__color_for_this_contact">此联系人的颜色</string>
   <!--registration_activity-->
   <string name="registration_activity__textsecure_can_use_instant_messages_to_avoid_sms_charges_when_communicating_with_other_textsecure_users">
 通过验证您的手机号码来连接到 TextSecure 。</string>
@@ -497,6 +516,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>
@@ -579,6 +599,7 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="AndroidManifest__media_overview">所有图片</string>
   <string name="AndroidManifest__media_overview_named">所有图片和%1$s</string>
   <string name="AndroidManifest__message_details">消息详情</string>
+  <string name="AndroidManifest_manage_paired_devices">管理已配对的设备</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">导入/导出</string>
   <string name="arrays__my_identity_key">我的身份密钥</string>
@@ -744,7 +765,9 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="conversation__menu_leave_group">离开群组</string>
   <string name="conversation__menu_delete_thread">删除线程</string>
   <string name="conversation__menu_view_media">所有图片</string>
+  <string name="conversation__menu_conversation_settings">会话设置</string>
   <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">展开弹窗</string>
   <!--conversation_callable-->
   <string name="conversation_add_to_contacts__menu_add_to_contacts">添加到联系人</string>
   <!--conversation_group_options-->
@@ -785,5 +808,7 @@ TextSecure 在等待短信验证时超时。</string>
   <string name="trimmer__old_messages_successfully_deleted">旧信息已被成功删除。</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">传输图标</string>
+  <!--quick_attachment_drawer-->
+  <string name="quick_camera_unavailable">摄像头不可用</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 059ac0d388..6be57ab99b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -598,5 +598,6 @@ TextSecure 等候驗證用的手機簡訊已逾時。</string>
   <string name="trimmer__deleting_old_messages">正在刪除舊訊息...</string>
   <string name="trimmer__old_messages_successfully_deleted">已完成刪除舊訊息。</string>
   <!--transport_selection_list_item-->
+  <!--quick_attachment_drawer-->
   <!--EOF-->
 </resources>