diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c9e881da16..fb0b03ea68 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -310,7 +310,6 @@
   <string name="AndroidManifest__change_passphrase">غير العبارة السرية</string>
   <string name="AndroidManifest__manage_identity_keys">إدارة مفاتيح الهوية</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">استيراد/تصدير</string>
   <!--preferences.xml-->
   <string name="preferences__general">عام</string>
   <string name="preferences__pref_all_sms_title">إستخدم لإستقبال كل الرسائل النصية القصيرة</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index ba71d89942..d454fa1356 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Медийно съобщение</string>
   <string name="conversation_item__play_button_description">Бутон за възпроизвеждане</string>
-  <string name="conversation_item__secure_message_description">Индикатор за сигурно съобщение</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Изтегли</string>
   <string name="conversation_item_sent__downloading">Изтегля се</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Индикатор за Неуспешно Изпращане</string>
   <string name="conversation_item_sent__pending_approval_description">Очаква Потвърждение</string>
-  <string name="conversation_item_sent__delivered_description">Индикатор за Успешно Доставяне</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Изтегли</string>
   <string name="conversation_item_received__downloading">Изтегля се</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Извърши обмяна на ключове</string>
   <string name="AndroidManifest__log_submit">Изпрати доклад</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Внасяне / Изнасяне</string>
   <string name="arrays__my_identity_key">Моят ключ за самоличност</string>
   <!--preferences.xml-->
   <string name="preferences__general">Общо</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 75ccf7f0ce..8cbc0a475f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -373,7 +373,6 @@
   <string name="AndroidManifest__change_passphrase">Canvia frase contrasenya</string>
   <string name="AndroidManifest__manage_identity_keys">Gestiona claus d\'identitat</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importa / Exporta</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Utilitza TextSecure per veure i emmagatzemar tots els missatges de text entrants</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b02d0cbbfa..d67398010a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -334,7 +334,6 @@
   <string name="AndroidManifest__change_passphrase">Ændre kodeord</string>
   <string name="AndroidManifest__manage_identity_keys">Administrer ID-nøgler</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importer / eksporter</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generelt</string>
   <string name="preferences__pref_all_sms_title">Modtag alle SMS</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 5de87706f2..675748f48c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -341,18 +341,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS senden</string>
   <string name="conversation_activity__send">Senden</string>
   <string name="conversation_activity__remove">Löschen</string>
+  <string name="conversation_activity__window_description">Konversation mit %1$s</string>
+  <string name="conversation_activity__compose_description">Nachricht verfassen</string>
+  <string name="conversation_activity__emoji_toggle_description">Emoji Tastatur aktivieren</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Multimedia Nachricht</string>
   <string name="conversation_item__play_button_description">Wiedergabetaste</string>
-  <string name="conversation_item__secure_message_description">Verschlüsselte Nachricht Symbol</string>
+  <string name="conversation_item__secure_message_description">Sichere Nachricht</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
   <string name="conversation_item_sent__downloading">Herunterladen</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Senden fehlgeschlagen Symbol</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Senden fehlgeschlagen</string>
   <string name="conversation_item_sent__pending_approval_description">Bestätigung ausstehend</string>
-  <string name="conversation_item_sent__delivered_description">Empfangsbenachrichtigung Symbol</string>
+  <string name="conversation_item_sent__delivered_description">Übermittelt</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Download</string>
+  <string name="conversation_item_received__contact_photo_description">Kontaktfoto</string>
   <string name="conversation_item_received__downloading">Herunterladen</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mehrfachauswahl</string>
@@ -481,7 +485,7 @@
   <string name="AndroidManifest__complete_key_exchange">Automatischer Schlüsselaustausch</string>
   <string name="AndroidManifest__log_submit">Übermittle Fehlerprotokolle</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Datensicherung</string>
+  <string name="arrays__import_export">Importieren / Exportieren</string>
   <string name="arrays__my_identity_key">Mein Schlüssel</string>
   <!--preferences.xml-->
   <string name="preferences__general">Allgemein</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ebc7792cc4..a97b70268e 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Μήνυμα πολυμέσων</string>
   <string name="conversation_item__play_button_description">Κουμπί αναπαραγωγής</string>
-  <string name="conversation_item__secure_message_description">Ένδειξη ασφαλούς μηνύματος</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Λήψη</string>
   <string name="conversation_item_sent__downloading">Γίνεται λήψη</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">\'Ενδειξη αποτυχίας αποστολής</string>
   <string name="conversation_item_sent__pending_approval_description">Eκκρεμής έγκριση</string>
-  <string name="conversation_item_sent__delivered_description">\'Ενδειξη παραλαβής</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Λήψη</string>
   <string name="conversation_item_received__downloading">Γίνεται λήψη</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Ολοκλήρωση Ανταλλαγής Κλειδιών</string>
   <string name="AndroidManifest__log_submit">Υποβολή διαγνωστικού αρχείου.</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Εισαγωγή / Εξαγωγή</string>
   <string name="arrays__my_identity_key">Το Κλειδί Ταυτότητάς Μου</string>
   <!--preferences.xml-->
   <string name="preferences__general">Γενικά</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index edf95de870..097093736b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -341,18 +341,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Enviar MMS inseguro</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Eliminar</string>
+  <string name="conversation_activity__window_description">Conversación con %1$s</string>
+  <string name="conversation_activity__compose_description">Composición de mensaje</string>
+  <string name="conversation_activity__emoji_toggle_description">Cambiar a teclado emoji</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Mensaje multimedia</string>
   <string name="conversation_item__play_button_description">Botón de reproducción</string>
-  <string name="conversation_item__secure_message_description">Indicador de mensaje seguro</string>
+  <string name="conversation_item__secure_message_description">Asegurar mensaje</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Descarga</string>
   <string name="conversation_item_sent__downloading">Descargando</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Indicador de envío fallido</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Fallo al enviar</string>
   <string name="conversation_item_sent__pending_approval_description">Pendiente de aprobación</string>
-  <string name="conversation_item_sent__delivered_description">Indicador de entregado</string>
+  <string name="conversation_item_sent__delivered_description">Entregado</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Descarga</string>
+  <string name="conversation_item_received__contact_photo_description">Foto de contacto</string>
   <string name="conversation_item_received__downloading">Descargando</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modo de selección por lotes</string>
@@ -481,7 +485,7 @@
   <string name="AndroidManifest__complete_key_exchange">Completar intercambio de claves</string>
   <string name="AndroidManifest__log_submit">Enviar registros (logs) de depuración</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importar / Exportar</string>
+  <string name="arrays__import_export">Importar / exportar</string>
   <string name="arrays__my_identity_key">Mi clave de identidad</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b93ef53100..cd304f5eaf 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Mediaviesti</string>
   <string name="conversation_item__play_button_description">Play -nappi</string>
-  <string name="conversation_item__secure_message_description">Salattu viesti indikaattori</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Lataa</string>
   <string name="conversation_item_sent__downloading">Ladataan</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Lähetys epäonnistui indikaattori</string>
   <string name="conversation_item_sent__pending_approval_description">Odottaa hyväksyntää</string>
-  <string name="conversation_item_sent__delivered_description">Toimitettu indikaattori</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Lataa</string>
   <string name="conversation_item_received__downloading">Ladataan</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Suorita avaimenvaihto</string>
   <string name="AndroidManifest__log_submit">Lähetä virheenkorjausloki</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Tuonti / Vienti</string>
   <string name="arrays__my_identity_key">Oma tunnisteavain</string>
   <!--preferences.xml-->
   <string name="preferences__general">Yleistä</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 90af283c39..8bf36eb139 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Message média</string>
   <string name="conversation_item__play_button_description">Bouton play</string>
-  <string name="conversation_item__secure_message_description">Indicateur de Message Sécurisé</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Télécharger</string>
   <string name="conversation_item_sent__downloading">Téléchargement</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Indicateur d\'Échec d’Envoi</string>
   <string name="conversation_item_sent__pending_approval_description">En Attente d’Acceptation</string>
-  <string name="conversation_item_sent__delivered_description">Indicateur de Réception</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Télécharger</string>
   <string name="conversation_item_received__downloading">Téléchargement</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Finaliser l’échange de clés</string>
   <string name="AndroidManifest__log_submit">Soumettre un rapport de débogage</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importer / Exporter</string>
   <string name="arrays__my_identity_key">Ma clé d\'identité</string>
   <!--preferences.xml-->
   <string name="preferences__general">Général</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 8263530ee5..1ed9a1d32c 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -260,7 +260,6 @@
   <string name="AndroidManifest__change_passphrase">שנה סיסמה</string>
   <string name="AndroidManifest__manage_identity_keys">נהל מפתחות זהות</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">יבא / יצא</string>
   <!--preferences.xml-->
   <string name="preferences__general">כללי</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">השתמש ב-TextSecure לצפייה ואחסון של כל הודעות הטקסט</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 53cf4da9b4..efc5961c71 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Média üzenet</string>
   <string name="conversation_item__play_button_description">Lejátszás gomb</string>
-  <string name="conversation_item__secure_message_description">Biztonságos üzenet jelző</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Letölt</string>
   <string name="conversation_item_sent__downloading">Letöltés</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">\"Küldés sikertelen\" jelzése</string>
   <string name="conversation_item_sent__pending_approval_description">Jóváhagyás függőben</string>
-  <string name="conversation_item_sent__delivered_description">\"Kézbesítve\" jelzése</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Letölt</string>
   <string name="conversation_item_received__downloading">Letöltés</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Teljes kulcs-csere</string>
   <string name="AndroidManifest__log_submit">Hibakeresési napló küldése</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__my_identity_key">Saját azonosító kulcs</string>
   <!--preferences.xml-->
   <string name="preferences__general">Általános</string>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
index 3eeabb15a9..997f39fae4 100644
--- a/res/values-id/strings.xml
+++ b/res/values-id/strings.xml
@@ -367,7 +367,6 @@
   <string name="AndroidManifest__change_passphrase">Ganti Kata Kunci</string>
   <string name="AndroidManifest__manage_identity_keys">Kelola Kunci Identitas</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Import / Export</string>
   <!--preferences.xml-->
   <string name="preferences__general">Umum</string>
   <string name="preferences__pref_all_sms_title">Terima semua SMS</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f9cf86de9a..9f1a2cf974 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Messaggio multimediale</string>
   <string name="conversation_item__play_button_description">Pulsante Play</string>
-  <string name="conversation_item__secure_message_description">Indicatore di messaggio sicuro</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Scarica</string>
   <string name="conversation_item_sent__downloading">Caricamento in corso</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Indicatore di Invio Fallito</string>
   <string name="conversation_item_sent__pending_approval_description">In attesa di approvazione</string>
-  <string name="conversation_item_sent__delivered_description">Indicatore di ricezione</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Scarica</string>
   <string name="conversation_item_received__downloading">Caricamento in corso</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Completa lo scambio di chiavi</string>
   <string name="AndroidManifest__log_submit">Invia log di debug</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importa/Esporta</string>
   <string name="arrays__my_identity_key">La chiave della mia identità</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generale</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 256ebabf78..ca522433b2 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -17,7 +17,17 @@
   <string name="ApplicationPreferencesActivity_warning_this_will_disable_storage_encryption_for_all_messages">\n警告、この作業によって、携帯端末に保存されるすべてのメッセージと鍵の暗号化が無効になります！\n通信上（セッション）の暗号化は引き続き行われますが、お使いの携帯端末それ自体に、誰かが物理的な接触を試みた場合、メッセージや鍵などの情報が入手されてしまう可能性があります。</string>
   <string name="ApplicationPreferencesActivity_disable">無効</string>
   <string name="ApplicationPreferencesActivity_unregistering">登録破棄中…</string>
+  <string name="ApplicationPreferencesActivity_unregistering_for_data_based_communication">データ通信を行うために登録を取消しています</string>
+  <string name="ApplicationPreferencesActivity_disable_push_messages">プッシュメッセージを無効化しますか？</string>
+  <string name="ApplicationPreferencesActivity_this_will_disable_push_messages">\nサーバーから登録を取消し、プッシュメッセージを無効化します。\n再びプッシュメッセージを使用するには、</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">サーバー接続中にエラーが発生しました！</string>
+  <string name="ApplicationPreferencesActivity_you_are_not_registered_with_the_push_service">あなたはプッシュサービスに登録していません。</string>
+  <string name="ApplicationPreferencesActivity_updating_directory">ダイレクトリーを更新しています</string>
+  <string name="ApplicationPreferencesActivity_updating_push_directory">プッシュダイレクトリーを更新中…</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">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>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">写真</string>
   <string name="AttachmentTypeSelectorAdapter_video">動画</string>
@@ -31,27 +41,56 @@
   <string name="ConversationItem_received_and_processed_key_exchange_message">鍵交換のメッセージを受信、処理しました。</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">エラー、古い鍵交換のメッセージを受信してしまいました。</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">鍵交換のメッセージを受信しました。クリックして実行してください。</string>
+  <string name="ConversationItem_received_plaintext_message_click_to_terminate">セキュア・セッションが開いた状態で平文SMSを受信しました。開いてもセキュア・セッションが開いていなければ、あなたが送信するメッセージは読めません。クリックしてセキュア・セッションを終了します。</string>
+  <string name="ConversationItem_group_action_left">%1$sがグループを抜けました。</string>
+  <string name="ConversationItem_group_action_joined">%1$sがグループに参加しました。</string>
   <string name="ConversationItem_group_action_modify">%1$sがグループを更新しました。</string>
+  <string name="ConversationItem_click_to_approve_sms">タップすれば代替としてSMSを使います。</string>
+  <string name="ConversationItem_click_to_approve_mms">タップすれば代替としてMMSを使います。</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">タップすれば代替として不安全通信を使います。</string>
+  <string name="ConversationItem_click_to_approve_sms_dialog_title">代替としてSMSに切り替わりますか？</string>
+  <string name="ConversationItem_click_to_approve_mms_dialog_title">代替としてMMSに切り替わりますか？</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">代替として暗号化されていないSMSに切り替わりますか？</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">代替として暗号化されていないMMSに切り替わりますか？</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">セキュア・セッションが構築できなかったため、このメッセージは暗号化<b>されません</b>。\n\n暗号化されていないメッセージを送信しますか?</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_initiate_secure_session_question">セキュア・セッションを開始しますか？</string>
   <string name="ConversationActivity_initiate_secure_session_with_s_question">%sさんとセキュア・セッションを開始しますか？</string>
+  <string name="ConversationActivity_abort_secure_session_confirmation">セキュア・セッション終了の確認</string>
+  <string name="ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question">このセキュア・セッションを本当に終了しますか？</string>
+  <string name="ConversationActivity_delete_thread_confirmation">スレッド削除確認</string>
   <string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">この会話を完全に削除してもよろしいですか？</string>
   <string name="ConversationActivity_add_attachment">添付</string>
   <string name="ConversationActivity_select_contact_info">連絡先情報を選択</string>
+  <string name="ConversationActivity_compose_message">メッセージ作成</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">添付中にエラーが発生しました。</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">選択された動画は容量を超えています。</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">選択された音声ファイルは容量を超えています。</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">受信先のSMS又はEメールアドレスが有効ではありません。</string>
   <string name="ConversationActivity_message_is_empty_exclamation">メッセージが空です。</string>
+  <string name="ConversationActivity_group_conversation_recipients">グループチャットの宛先</string>
+  <string name="ConversationActivity_group_conversation">グループチャット</string>
+  <string name="ConversationActivity_unnamed_group">無名グループ</string>
   <string name="ConversationActivity_d_recipients_in_group">参加者%d人</string>
   <string name="ConversationActivity_d_recipients_in_group_singular">参加者1人</string>
+  <string name="ConversationActivity_saved_draft">下書き</string>
   <string name="ConversationActivity_invalid_recipient">受信先が無効です。</string>
+  <string name="ConversationActivity_calls_not_supported">通話は対応されていません</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">お使いの端末は、ダイヤル機能に対応していないようです。</string>
+  <string name="ConversationActivity_leave_group">グループを抜けますか？</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">このグループを本当に抜けますか？</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">メッセージの詳細</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">通信: %1$s\n送受信: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">送信者: %1$s\n通信: %2$s\n送信: %3$s\n受信: %4$s</string>
+  <string name="ConversationFragment_confirm_message_delete">メッセージ削除の確認</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">このメッセージを完全に削除してもよろしいですか？</string>
+  <string name="ConversationFragment_save_to_sd_card">SDカードに保存しますか？</string>
   <string name="ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning">このファイルは暗号化されたデータベースに保存されています。SDカードに保存される方のバージョンは暗号化されませんが、この作業を続けますか？</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">SDカードへの添付ファイル保存中にエラーが起きました。</string>
   <string name="ConversationFragment_success_exclamation">成功しました。</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">SDカードに書き込めませんでした。</string>
+  <string name="ConversationFragment_saving_attachment">添付ファイルを保存しています</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">SDカードに添付ファイルを保存中…</string>
   <!--ConversationListAdapter-->
   <string name="ConversationListAdapter_key_exchange_message">鍵交換のメッセージ…</string>
@@ -63,9 +102,12 @@
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">鍵交換のメッセージ…</string>
   <!--ShareActivity-->
+  <string name="ShareActivity_share_with">共有</string>
   <!--ExportFragment-->
+  <string name="ExportFragment_export_to_sd_card">SDカードへエクスポート</string>
   <string name="ExportFragment_this_will_export_your_encrypted_keys_settings_and_messages">これで、あなたの暗号化された鍵、設定、及びメッセージはSDカードへエクスポートされますが、よろしいですか？</string>
   <string name="ExportFragment_export">エクスポート</string>
+  <string name="ExportFragment_export_plaintext_to_sd_card">SDカードへエクスポートしますか？</string>
   <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">警告：この作業によって、あなたのTextSecureメッセージは、暗号化されていない状態でSDカードへとエクスポートされます！</string>
   <string name="ExportFragment_cancel">中止</string>
   <string name="ExportFragment_exporting">エクスポート中…</string>
@@ -75,16 +117,32 @@
   <string name="ExportFragment_success">成功しました。</string>
   <string name="ExportFragment_exporting_keys_settings_and_messages">暗号化されたキー、設定及びメッセージをエクスポート中…</string>
   <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">新規グループ</string>
+  <string name="GroupCreateActivity_actionbar_update_title">グループを更新する</string>
+  <string name="GroupCreateActivity_group_name_hint">グループ名</string>
+  <string name="GroupCreateActivity_actionbar_mms_title">新規MMSグループ</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">TextSecureのグループに対応していない連絡先を選択しましたので、このグループはMMSで通信を行います。</string>
+  <string name="GroupCreateActivity_you_dont_support_push">あなたがデータチャンネルを使用する登録をしていないので、TextSecureグループは無効です。</string>
+  <string name="GroupCreateActivity_contacts_mms_exception">予期せぬエラーが発生したため、グループ作成が失敗しました。</string>
+  <string name="GroupCreateActivity_contacts_no_members">最低一人でもグループに参加する必要があります！</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">グループ参加者一人の電話番号が解読できません。番号を訂正するか、その宛先をグループから削除してください。</string>
+  <string name="GroupCreateActivity_file_io_exception">ファイルI/Oエラーが発生したため、一時イメージファイルが作成できませんでした。</string>
+  <string name="GroupCreateActivity_avatar_content_description">グループアバター</string>
+  <string name="GroupCreateActivity_menu_create_title">グループ作成</string>
   <string name="GroupCreateActivity_creating_group">%1$sを作成中...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">既存のTextSecureグループに非TextSecure連絡先は追加できません。</string>
   <!--ImportExportActivity-->
   <string name="ImportExportActivity_import">インポート</string>
   <string name="ImportExportActivity_export">エクスポート</string>
   <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">システムのSMSデータベースをインポートしますか？</string>
   <string name="ImportFragment_this_will_import_messages_from_the_system">これで、携帯端末の既定SMSデータベースにあるメッセージがTextSecureにインポートされます。以前にこの作業を行ったことがあれば、メッセージが重複する場合があります。</string>
   <string name="ImportFragment_import">インポート</string>
   <string name="ImportFragment_cancel">中止</string>
+  <string name="ImportFragment_restore_encrypted_backup">暗号化されたバックアップを復元しますか？</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">\n暗号化されたバックアップ・ファイルを復元すると、現在のキー、設定、及びメッセージは完全に上書きされます。現在のTextSecureインストール環境は上書きされますが、バックアップ・ファイルは残ります。</string>
   <string name="ImportFragment_restore">復元</string>
+  <string name="ImportFragment_import_plaintext_backup">平文のバックアップをインポートしますか？</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">暗号化されていないテキストのバックアップ・ファイルからメッセージをインポートします。以前に同じバックアップ・ファイルをインポートしたことがある場合、メッセージが重複することになります。</string>
   <string name="ImportFragment_importing">インポート中…</string>
   <string name="ImportFragment_import_plaintext_backup_elipse">非暗号テキストのバックアップ・ファイルをインポート中…</string>
@@ -101,9 +159,13 @@
   <string name="MmsDownloader_no_connectivity_available_for_mms_download_try_again_later">MMSをダウンロードするための接続ができません、後でもう一度試してください…</string>
   <string name="MmsDownloader_error_storing_mms">MMS保存中にエラーがありました。</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">MMSのプロバイダー接続中にエラーが発生しました…</string>
+  <string name="MmsDownloader_error_reading_mms_settings">無線プロバイダーのMMS設定が見つかりませんでした。</string>
   <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">マルチメディアーメッセージ</string>
   <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">対応されていない古いバージョンのTextSecureから暗号化されたメッセージを受信しました。最新バージョンに更新して、再び送信するよう伝えてください</string>
   <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">合言葉が一致していません！</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">古いパスワードが正しくありません。</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">パスワード入力</string>
@@ -216,6 +278,7 @@
   <!--contact_selection_list_activity-->
   <string name="contact_selection_group_activity__no_contacts">連絡先はありません。</string>
   <!--single_contact_selection_activity-->
+  <string name="SingleContactSelectionActivity_updating_directory">ダイレクトリーを更新しています</string>
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">選択</string>
   <!--contact_selection_recent_activity-->
@@ -306,7 +369,6 @@
   <string name="AndroidManifest__change_passphrase">パスワードの変更</string>
   <string name="AndroidManifest__manage_identity_keys">認証キーを管理</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">インポート／エクスポート</string>
   <!--preferences.xml-->
   <string name="preferences__general">一般設定</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">受信する全てのSMS（テキストメッセージ）の表示、及び保存にTextSecureを使用します</string>
@@ -394,6 +456,7 @@
   <string name="conversation_secure_verified__menu_security">セキュリティ</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">添付</string>
+  <string name="conversation__menu_update_group">グループを更新する</string>
   <string name="conversation__menu_add_contact_info">連絡先情報を追加する</string>
   <string name="conversation__menu_delete_thread">スレッドを削除</string>
   <!--conversation_group_options-->
@@ -408,6 +471,7 @@
   <!--text_secure_locked-->
   <string name="text_secure_locked__menu_unlock">ロック解除</string>
   <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_group">新規グループ</string>
   <string name="text_secure_normal__menu_settings">設定</string>
   <string name="text_secure_normal__menu_clear_passphrase">ロック</string>
   <!--verify_keys-->
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index f5abe9a39c..488018166a 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -322,13 +322,10 @@
   <string name="conversation_activity__send">ಕಳುಹಿಸು</string>
   <string name="conversation_activity__remove">ತೆಗೆದುಹಾಕಿ</string>
   <!--conversation_item-->
-  <string name="conversation_item__secure_message_description">ಸುರಕ್ಷಿತ ಸಂದೇಶದ ಸೂಚಕ</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">ಡೌನ್ಲೋಡ್</string>
   <string name="conversation_item_sent__downloading">ಡೌನ್ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">ವಿಫಲವಾದ ಸೂಚಕವನ್ನು ಕಳುಹಿಸಿ</string>
   <string name="conversation_item_sent__pending_approval_description">ಅನುಮೋದನೆಗೆ ಬಾಕಿ ಉಳಿದಿದೆ</string>
-  <string name="conversation_item_sent__delivered_description">ವಿತರಣೆ ಸೂಚಕ</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">ಡೌನ್ಲೋಡ್</string>
   <string name="conversation_item_received__downloading">ಡೌನ್ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
@@ -447,7 +444,6 @@
   <string name="AndroidManifest__verify_identity">ಗುರುತನ್ನು ಪರಿಶೀಲಿಸಿ</string>
   <string name="AndroidManifest__manage_identity_keys">ಗುರುತಿನ ಕೀಲಿಗಳನ್ನು ನಿರ್ವಹಿಸಿ</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">ಆಮದು / ರಫ್ತು</string>
   <!--preferences.xml-->
   <string name="preferences__general">ಸಾಮಾನ್ಯ</string>
   <string name="preferences__pref_all_sms_title">ಎಲ್ಲಾ ಎಸ್ ಎಂ ಎಸ್ ಪಡೆಯುವಿರಿ</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 93e9e792ad..03a866fd1f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -341,18 +341,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Verstuur onveilige MMS</string>
   <string name="conversation_activity__send">Verstuur</string>
   <string name="conversation_activity__remove">Verwijder</string>
+  <string name="conversation_activity__window_description">Gesprek met %1$s</string>
+  <string name="conversation_activity__compose_description">Bericht samenstelling</string>
+  <string name="conversation_activity__emoji_toggle_description">Wissel emoji toetsenbord</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Mediabericht</string>
   <string name="conversation_item__play_button_description">Afspeelknop</string>
-  <string name="conversation_item__secure_message_description">Beveiligd bericht indicator</string>
+  <string name="conversation_item__secure_message_description">Beveiligd bericht</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
   <string name="conversation_item_sent__downloading">Downloaden</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Verzenden Mislukt Indicator</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Verzenden is mislukt</string>
   <string name="conversation_item_sent__pending_approval_description">In afwachting van goedkeuring</string>
-  <string name="conversation_item_sent__delivered_description">Afgeleverd Indicator</string>
+  <string name="conversation_item_sent__delivered_description">Bezorgd </string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Download</string>
+  <string name="conversation_item_received__contact_photo_description">Contact Foto</string>
   <string name="conversation_item_received__downloading">Downloaden</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode"> Meerdere tegelijk selecteren</string>
@@ -481,7 +485,7 @@
   <string name="AndroidManifest__complete_key_exchange">Sleuteluitwisseling voltooien</string>
   <string name="AndroidManifest__log_submit">Debug logs indienen</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importeer / Exporteer</string>
+  <string name="arrays__import_export">Impoteer / exporteer </string>
   <string name="arrays__my_identity_key">Mijn identiteitssleutel</string>
   <!--preferences.xml-->
   <string name="preferences__general">Algemeen</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index c367f85a65..275f277d10 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -341,18 +341,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Send usikret MMS</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slett</string>
+  <string name="conversation_activity__window_description">Samtale med %1$s</string>
+  <string name="conversation_activity__compose_description">Meldingssammensetning</string>
+  <string name="conversation_activity__emoji_toggle_description">Emoji tastatur av/på</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Multimediamelding</string>
   <string name="conversation_item__play_button_description">Avspill knapp</string>
-  <string name="conversation_item__secure_message_description">Indikator for sikret melding</string>
+  <string name="conversation_item__secure_message_description">Sikret melding</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Last ned</string>
   <string name="conversation_item_sent__downloading">Laster ned</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Indikator for feilet melding</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Send mislyktes</string>
   <string name="conversation_item_sent__pending_approval_description">Avventer godkjenning</string>
-  <string name="conversation_item_sent__delivered_description">Indikator for levert melding</string>
+  <string name="conversation_item_sent__delivered_description">Levert</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Last ned</string>
+  <string name="conversation_item_received__contact_photo_description">Kontaktbilde</string>
   <string name="conversation_item_received__downloading">Laster ned</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Batch valg modus</string>
@@ -481,7 +485,7 @@
   <string name="AndroidManifest__complete_key_exchange">Fullfør nøkkelutveksling</string>
   <string name="AndroidManifest__log_submit">Send debug logger</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importer / eksporter</string>
+  <string name="arrays__import_export">Importere / eksportere</string>
   <string name="arrays__my_identity_key">Min ID-nøkkel</string>
   <!--preferences.xml-->
   <string name="preferences__general">Generelt</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 030c63d013..333c63d9dc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Wiadomość multimedialna</string>
   <string name="conversation_item__play_button_description">Przycisk Play</string>
-  <string name="conversation_item__secure_message_description">Wskaźnik bezpiecznej wiadomości</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Pobierz</string>
   <string name="conversation_item_sent__downloading">Pobieranie</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Wskaźnik nieudanej próby wysyłania</string>
   <string name="conversation_item_sent__pending_approval_description">Oczekuję akceptacji</string>
-  <string name="conversation_item_sent__delivered_description">Wskaźnik dostarczenia</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Pobierz</string>
   <string name="conversation_item_received__downloading">Pobieranie</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Ukończ wymianę kluczy</string>
   <string name="AndroidManifest__log_submit">Wyślij logi debugowania</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Import / Eksport</string>
   <string name="arrays__my_identity_key">Mój klucz tożsamości</string>
   <!--preferences.xml-->
   <string name="preferences__general">Ogólne</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 5b3b05abed..24502158b5 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -341,18 +341,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Enviar MMS inseguro</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
+  <string name="conversation_activity__window_description">Conversa com %1$s</string>
+  <string name="conversation_activity__compose_description">Composição de mensagem</string>
+  <string name="conversation_activity__emoji_toggle_description">Alternar teclado emoji</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Mensagem multimídia</string>
   <string name="conversation_item__play_button_description">Botão Tocar</string>
-  <string name="conversation_item__secure_message_description">Indicador de mensagem segura</string>
+  <string name="conversation_item__secure_message_description">Mensagem segura</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Transferir</string>
   <string name="conversation_item_sent__downloading">A transferir</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Indicador de falha de envio</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Envio falhou</string>
   <string name="conversation_item_sent__pending_approval_description">Aprovação pendente</string>
-  <string name="conversation_item_sent__delivered_description">Indicador de entrega</string>
+  <string name="conversation_item_sent__delivered_description">Entregue</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Transferir</string>
+  <string name="conversation_item_received__contact_photo_description">Foto do contato</string>
   <string name="conversation_item_received__downloading">A transferir</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modo de seleção em grupo</string>
@@ -481,7 +485,7 @@
   <string name="AndroidManifest__complete_key_exchange">Completar troca de chaves</string>
   <string name="AndroidManifest__log_submit">Enviar logs de depuração</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importar / Exportar</string>
+  <string name="arrays__import_export">Importar / exportar</string>
   <string name="arrays__my_identity_key">Minha chave de identidade</string>
   <!--preferences.xml-->
   <string name="preferences__general">Geral</string>
@@ -652,5 +656,7 @@
   <string name="reminder_header_sms_default_text">O TextSecure não é atualmente o seu app SMS padrão.</string>
   <string name="reminder_header_sms_import_title">Importar mensagens SMS do sistema?</string>
   <string name="reminder_header_sms_import_text">O TextSecure pode copiar as mensagens SMS do seu dispositivo para a base de dados criptografada do TextSecure.</string>
+  <string name="reminder_header_push_title">Habilitar mensagens TextSecure?</string>
+  <string name="reminder_header_push_text">Entrega imediata, maior privacidade e sem despesas de SMS.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 97f9f2c06f..ae89a582b8 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Mensagem media</string>
   <string name="conversation_item__play_button_description">Botão play</string>
-  <string name="conversation_item__secure_message_description">Indicador de mensagem segura</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Transferir</string>
   <string name="conversation_item_sent__downloading">A transferir</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Indicador de falha de envio</string>
   <string name="conversation_item_sent__pending_approval_description">Pendente de aprovação</string>
-  <string name="conversation_item_sent__delivered_description">Indicador de entrega</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Transferir</string>
   <string name="conversation_item_received__downloading">A transferir</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Completar troca de chaves</string>
   <string name="AndroidManifest__log_submit">Submeter registo de depuração</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__my_identity_key">A minha chave de identidade</string>
   <!--preferences.xml-->
   <string name="preferences__general">Geral</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index da13c8394e..4c03051dd3 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -281,9 +281,7 @@
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Descarca</string>
   <string name="conversation_item_sent__downloading">Se descarca</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Indicator Transmisie Eşuată</string>
   <string name="conversation_item_sent__pending_approval_description">Aprobare În Curs</string>
-  <string name="conversation_item_sent__delivered_description">Indicator Transmis</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Descarca</string>
   <string name="conversation_item_received__downloading">Se descarca</string>
@@ -389,7 +387,6 @@
   <string name="AndroidManifest__change_passphrase">Schimbă parola</string>
   <string name="AndroidManifest__manage_identity_keys">Administrează cheile de identitate</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importă / Exportă</string>
   <!--preferences.xml-->
   <string name="preferences__general">General</string>
   <string name="preferences__push_sms_category">Push și SMS</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index ffe762ce9a..95bed98dee 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">MMS-сообщение</string>
   <string name="conversation_item__play_button_description">Воспроизведение</string>
-  <string name="conversation_item__secure_message_description">Индикатор защищённого сообщения</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Скачать</string>
   <string name="conversation_item_sent__downloading">Скачивание</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Индикатор ошибки при отправке</string>
   <string name="conversation_item_sent__pending_approval_description">Ожидается одобрение</string>
-  <string name="conversation_item_sent__delivered_description">Индикатор успешной доставки</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Скачать</string>
   <string name="conversation_item_received__downloading">Скачивание</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Завершить обмен ключами</string>
   <string name="AndroidManifest__log_submit">Отправить журнал отладки</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Импорт и экспорт</string>
   <string name="arrays__my_identity_key">Мой ключ</string>
   <!--preferences.xml-->
   <string name="preferences__general">Общие</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 96a5beb18a..f99c864e7a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -283,13 +283,10 @@
   <string name="conversation_activity__remove">Odstrániť</string>
   <!--conversation_item-->
   <string name="conversation_item__play_button_description">Prehrávacie tlačidlo</string>
-  <string name="conversation_item__secure_message_description">Bezpečný ukazovateľ správ</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Stiahnuť</string>
   <string name="conversation_item_sent__downloading">Sťahujem</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Ukazovateľ chybného poslania</string>
   <string name="conversation_item_sent__pending_approval_description">Čaká na schválenie</string>
-  <string name="conversation_item_sent__delivered_description">Ukazovateľ doručenia</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Stiahnuť</string>
   <string name="conversation_item_received__downloading">Sťahujem</string>
@@ -398,7 +395,6 @@
   <string name="AndroidManifest__complete_key_exchange">Dokončiť vzájomnú výmenu kľúčov</string>
   <string name="AndroidManifest__log_submit">Odošli ladiaci log</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Import / Export</string>
   <string name="arrays__my_identity_key">Môj kľúč totožnosti</string>
   <!--preferences.xml-->
   <string name="preferences__general">Všeobecné</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 684a97b38a..9318dc9e1c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -341,18 +341,22 @@
   <string name="conversation_activity__type_message_mms_insecure">Pošlji nezavarovan MMS</string>
   <string name="conversation_activity__send">Pošlji</string>
   <string name="conversation_activity__remove">Odstrani</string>
+  <string name="conversation_activity__window_description">Pogovor: %1$s</string>
+  <string name="conversation_activity__compose_description">Sestavljanje sporočila</string>
+  <string name="conversation_activity__emoji_toggle_description">Vklop tipkovnice emoji</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Multiedijsko sporočilo</string>
   <string name="conversation_item__play_button_description">Gumb za predvajanje</string>
-  <string name="conversation_item__secure_message_description">Šifrirano sporočilo</string>
+  <string name="conversation_item__secure_message_description">Zavarovano sporočilo</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Prenos</string>
   <string name="conversation_item_sent__downloading">Prenašam</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Neuspelo pošiljanje</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">Pošiljanje ni uspelo</string>
   <string name="conversation_item_sent__pending_approval_description">Potrdilo o oddaji</string>
-  <string name="conversation_item_sent__delivered_description">Dostavljeno sporočilo</string>
+  <string name="conversation_item_sent__delivered_description">Dostavljeno</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Prenos</string>
+  <string name="conversation_item_received__contact_photo_description">Fotografija stika</string>
   <string name="conversation_item_received__downloading">Prenašam</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Skupinski način izbire</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index cdfaf34967..af60332bb4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -37,7 +37,7 @@
   <string name="ConversationItem_expires_s">Går ut: %s</string>
   <string name="ConversationItem_error_sending_message">Det gick inte att skicka meddelandet</string>
   <string name="ConversationItem_view_secure_media_question">Visa skyddad fil?</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denna mediefil har lagrats krypterat. För att öppna den i en en extern visare måste den tillfälligt dekrypteras och skrivas till disk. Är du säker på att du vill göra detta?</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Denna fil har lagrats i en krypterad databas. För att öppna den med en extern visare behöver informationen tyvärr tillfälligt dekrypteras och skrivas till disken. Är du säker på att du vill göra detta?</string>
   <string name="ConversationItem_received_and_processed_key_exchange_message">Tog emot och bearbetade meddelande för nyckelutbyte.</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Ett fel uppstod. Mottog ett gammalt meddelande för nyckelutbyte.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Tog emot meddelande för nyckelutbyte, tryck för att behandla.</string>
@@ -341,16 +341,15 @@
   <string name="conversation_activity__type_message_mms_insecure">Skicka okrypterat MMS</string>
   <string name="conversation_activity__send">Skicka</string>
   <string name="conversation_activity__remove">Ta bort</string>
+  <string name="conversation_activity__window_description">Meddelanden med %1$s</string>
+  <string name="conversation_activity__compose_description">Skapa meddelande</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Mediameddelande</string>
   <string name="conversation_item__play_button_description">Playknapp</string>
-  <string name="conversation_item__secure_message_description">Säkert Meddelande-indikator</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Ladda ner</string>
   <string name="conversation_item_sent__downloading">Laddar ner</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Försändelse Misslyckades-indikator</string>
   <string name="conversation_item_sent__pending_approval_description">Avvaktar godkännande</string>
-  <string name="conversation_item_sent__delivered_description">Försändelse Lyckades-indikator</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Ladda ner</string>
   <string name="conversation_item_received__downloading">Laddar ner</string>
@@ -481,7 +480,6 @@
   <string name="AndroidManifest__complete_key_exchange">Slutför nyckelutbyte</string>
   <string name="AndroidManifest__log_submit">Skicka in loggarna</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Importera / Exportera</string>
   <string name="arrays__my_identity_key">Min identitetsnyckel</string>
   <!--preferences.xml-->
   <string name="preferences__general">Allmänt</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
new file mode 100644
index 0000000000..a6c3d048b1
--- /dev/null
+++ b/res/values-sw/strings.xml
@@ -0,0 +1,98 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--ApplicationPreferencesActivity-->
+  <!--AttachmentTypeSelectorAdapter-->
+  <!--ConversationItem-->
+  <!--ConversationActivity-->
+  <!--ConversationFragment-->
+  <!--ConversationListAdapter-->
+  <!--ConversationListFragment-->
+  <!--ConversationListItem-->
+  <!--ShareActivity-->
+  <!--ExportFragment-->
+  <!--GroupCreateActivity-->
+  <!--ImportExportActivity-->
+  <!--ImportFragment-->
+  <!--KeyScanningActivity-->
+  <!--MmsDownloader-->
+  <!--NotificationMmsMessageRecord-->
+  <!--MessageRecord-->
+  <!--PassphraseChangeActivity-->
+  <!--PassphrasePromptActivity-->
+  <!--PromptMmsActivity-->
+  <!--ReceiveKeyActivity-->
+  <!--RegistrationActivity-->
+  <!--RegistrationProblemsActivity-->
+  <!--RegistrationProgressActivity-->
+  <!--RegistrationService-->
+  <!--SmsMessageRecord-->
+  <!--ThreadRecord-->
+  <!--VerifyIdentityActivity-->
+  <!--VerifyKeysActivity-->
+  <!--ViewIdentityActivity-->
+  <!--KeyExchangeInitiator-->
+  <!--MessageDisplayHelper-->
+  <!--MmsDatabase-->
+  <!--MmsMessageRecord-->
+  <!--MmsSender-->
+  <!--ApplicationMigrationService-->
+  <!--KeyCachingService-->
+  <!--MessageNotifier-->
+  <!--ViewLocalIdentityActivity-->
+  <!--SmsReceiver-->
+  <!--QuickResponseService-->
+  <!--auto_initiate_activity-->
+  <!--change_passphrase_activity-->
+  <!--contact_selection_group_activity-->
+  <!--contact_selection_list_activity-->
+  <!--single_contact_selection_activity-->
+  <!--ContactSelectionListFragment-->
+  <!--contact_selection_recent_activity-->
+  <!--conversation_activity-->
+  <!--conversation_item-->
+  <!--conversation_item_sent-->
+  <!--conversation_item_received-->
+  <!--conversation_fragment_cab-->
+  <!--country_selection_fragment-->
+  <!--create_passphrase_activity-->
+  <!--log_submit_activity-->
+  <!--database_migration_activity-->
+  <!--database_upgrade_activity-->
+  <!--mms_preferences_activity-->
+  <!--prompt_passphrase_activity-->
+  <!--prompt_mms_activity-->
+  <!--receive_key_activity-->
+  <!--registration_activity-->
+  <!--registration_problems-->
+  <!--registration_progress_activity-->
+  <!--recipients_panel-->
+  <!--review_identities-->
+  <!--verify_identity_activity-->
+  <!--verify_import_identity_activity-->
+  <!--verify_keys_activity-->
+  <!--AndroidManifest.xml-->
+  <!--arrays.xml-->
+  <!--preferences.xml-->
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <!--contact_selection-->
+  <!--refreshing push directory from menu-->
+  <!--conversation_button_context-->
+  <!--conversation_callable-->
+  <!--conversation_context-->
+  <!--conversation_context_image-->
+  <!--conversation_insecure-->
+  <!--conversation_list_batch-->
+  <!--conversation_list-->
+  <!--conversation_secure_verified-->
+  <!--conversation-->
+  <!--conversation_group_options-->
+  <!--key_scanning-->
+  <!--text_secure_locked-->
+  <!--text_secure_normal-->
+  <!--verify_keys-->
+  <!--reminder_header-->
+  <!--EOF-->
+</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 93aebc89f6..85988f77b2 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -344,13 +344,10 @@
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">Medya mesajı</string>
   <string name="conversation_item__play_button_description">Oynat butonu</string>
-  <string name="conversation_item__secure_message_description">Güvenli mesaj göstergesi</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">İndir</string>
   <string name="conversation_item_sent__downloading">İndiriliyor</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Başarısız Gönderi Göstergesi</string>
   <string name="conversation_item_sent__pending_approval_description">Bekleyen Onaylama</string>
-  <string name="conversation_item_sent__delivered_description">Ulaştırılma Göstergesi</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">İndir</string>
   <string name="conversation_item_received__downloading">İndiriliyor</string>
@@ -481,7 +478,6 @@
   <string name="AndroidManifest__complete_key_exchange">Anahtar değişimini tamamla</string>
   <string name="AndroidManifest__log_submit">Hata ayıklama kayıtlarını gönder</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">İçeri / Dışarı Aktar</string>
   <string name="arrays__my_identity_key">Kimlik anahtarım</string>
   <!--preferences.xml-->
   <string name="preferences__general">Genel</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bfec93b8ed..1f570f6ff4 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -350,7 +350,6 @@
   <string name="AndroidManifest__change_passphrase">Змінити фразу-ключ</string>
   <string name="AndroidManifest__manage_identity_keys">Керування ключами ідентифікації</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Імпортування / Експортування</string>
   <!--preferences.xml-->
   <string name="preferences__general">Загальні</string>
   <string name="preferences__use_textsecure_for_viewing_and_storing_all_incoming_text_messages">Використовувати TextSecure для перегляду та зберігання всіх вхідних текстових повідомлень</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 909b0ccb34..56f0b97d86 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -320,9 +320,7 @@
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Tải xuống</string>
   <string name="conversation_item_sent__downloading">Đang tải xuống</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">Dấu Chỉ Gửi Thất Bại</string>
   <string name="conversation_item_sent__pending_approval_description">Chờ Chấp Thuận</string>
-  <string name="conversation_item_sent__delivered_description">Dấu Chỉ Phân Phối</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Tải xuống</string>
   <string name="conversation_item_received__downloading">Đang tải xuống</string>
@@ -430,7 +428,6 @@
   <string name="AndroidManifest__change_passphrase">Đổi mật khẩu</string>
   <string name="AndroidManifest__manage_identity_keys">Quản trị chìa khóa nhận diện</string>
   <!--arrays.xml-->
-  <string name="arrays__import_export">Nhập / Xuất</string>
   <!--preferences.xml-->
   <string name="preferences__general">Tổng quát</string>
   <string name="preferences__push_sms_category">Đẩy và SMS</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index c464e28c1e..cfb546b727 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -341,18 +341,22 @@
   <string name="conversation_activity__type_message_mms_insecure">发送不安全的彩信</string>
   <string name="conversation_activity__send">发送</string>
   <string name="conversation_activity__remove">删除</string>
+  <string name="conversation_activity__window_description">与 %1$s 的对话</string>
+  <string name="conversation_activity__compose_description">编写信息</string>
+  <string name="conversation_activity__emoji_toggle_description">切换表情键盘</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_image_description">媒体信息</string>
   <string name="conversation_item__play_button_description">播放按钮</string>
-  <string name="conversation_item__secure_message_description">安全信息指示器</string>
+  <string name="conversation_item__secure_message_description">安全信息</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">下载</string>
   <string name="conversation_item_sent__downloading">下载中</string>
-  <string name="conversation_item_sent__send_failed_indicator_description">发送失败指示灯</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">发送失败</string>
   <string name="conversation_item_sent__pending_approval_description">等待批准</string>
-  <string name="conversation_item_sent__delivered_description">送达指示灯</string>
+  <string name="conversation_item_sent__delivered_description">已送达</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">下载</string>
+  <string name="conversation_item_received__contact_photo_description">联系人照片</string>
   <string name="conversation_item_received__downloading">下载中</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">批量选择模式</string>