diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bff7c5bb6..0bc007897 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -191,6 +191,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">انتظر، يتم فك تشفير رسالة الوسائط المتعددة...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">خطأ بالرسالة المشفرة...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">الرسالة مشفرة دون وجود قناة اتصال...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">يتم النقل...</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">يتم الان نقل قواعد بيانات رسائلك القصيرة...</string>
@@ -199,8 +200,8 @@
   <string name="KeyCachingService_passphrase_cached">تم حفظ العبارة السرية مؤقتاً</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) رسائل جديدة</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) رسائل جديدة، آخر رسالة من: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">آخر رسالة من: %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">وصلتك رسالة من شخص لديه القدرة على بدء قناة تشفير. هل تريد بدء قناة تشفير حتى يكون الاتصال سري و آمن؟</string>
   <string name="auto_initiate_activity__initiate_exchange">البدء بتبادل المفاتيح</string>
diff --git a/res/values-bo/strings.xml b/res/values-bo/strings.xml
index b81ada3ec..de3087e1e 100644
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@@ -191,6 +191,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS གསང་གྲོལ་བྱེད་བཞིན་ཡོད། ཅུང་སྒུག་རོགས། </string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">མཁོ་མེད་གསང་སྡོམ་ཅན་གྱི་MMSའཕྲིན་ཐུང་། </string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">སྡེ་ཚན་མི་མངོན་པ་དེའི་ཆེད་དུ་།  MMS འཕྲིན་ཐུང་གསང་སྡོམ་བྱས་འདུག </string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">གནས་སྤོར་བཞིན་ཡོད། </string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">འཕྲིན་ཐུང་མ་ལག་སྤོར་བཞིན་པ། </string>
@@ -199,8 +200,8 @@
   <string name="KeyCachingService_passphrase_cached">གསང་ཚིག་དེ་སྦས།</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) འཕྲིན་ཐུང་གསར་པ་རྣམས།</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) འཕྲིན་ཐུང་གསར་པ་རྣམས་ལས་ཉེ་ཆར་གྱི་མང་ཆེ་བ  %2$s ནས་རེད། </string>
   <string name="MessageNotifier_most_recent_from_s">%s: ནས་ཉེ་ཆར་གྱི་དེ། </string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">འཕྲིན་ཐུང་བདེ་འཇགས་ཀྱི་བདེ་འཇགས་གཏམ་གླེང་ལ་རྒྱབ་སྐྱོར་བྱེད་མཁན་ཞིག་ནས་ཁྱེད་ལ་འཕྲིན་ཐུང་ཅིག་འབྱོར་འདུག ཁོང་གི་ལྷན་དུ་འབྲེལ་བ་བརྟན་པོ་ཡོང་ཆེད་ལྡེ་མིག་བརྗེ་ལེན་རྒྱུ་ཡིན་ནམ།</string>
   <string name="auto_initiate_activity__initiate_exchange">བརྗེ་ལེན་འགོ་ཚུགས། </string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 90cc14cfd..2240e445e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -186,6 +186,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS wird entschlüsselt, bitte warten...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Falsch verschlüsselte MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS wurde für einen nicht existierende Sitzung verschlüsselt...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">Migration</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">SMS werden migriert</string>
@@ -194,8 +195,8 @@
   <string name="KeyCachingService_passphrase_cached">Passwort gecached</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Neue Nachrichten</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) Neue Nachrichten, letzte von: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Letzte Nachricht von: %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Sie haben eine Nachricht von jemand empfangen, der verschlüsselte Sitzungen über TextSecure unterstützt. Wollen Sie jetzt eine sicher Sitzung aufbauen?</string>
   <string name="auto_initiate_activity__initiate_exchange">Austausch initieren</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ce46b86f0..ebd00065d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -191,6 +191,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Descifrando MMS, por favor espere...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensaje MMS mal cifrado</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensaje MMS cifrado para sesión no existente...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">Migrando</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">Migrando los mensajes de texto del sistema</string>
@@ -199,8 +200,8 @@
   <string name="KeyCachingService_passphrase_cached">Frase de contraseña en memoria caché</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nuevos mensajes</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) Nuevos mensajes, el más reciente de: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Mensaje más reciente de: %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Ha recibido un mensaje de alguien que tiene soporte para sesiones cifradas de TextSecure. ¿Desea iniciar una sesión segura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Iniciar intercambio</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 626af90b3..bc5f15536 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -191,6 +191,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Déchiffrage du MMS, veuillez patienter…</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Message MMS mal chiffré…</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Message MMS chiffré pour une session non-existante…</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">Migration</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">Migration des messages texte du système</string>
@@ -199,8 +200,8 @@
   <string name="KeyCachingService_passphrase_cached">Phrase de passe en cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nouveaux messages</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) Nouveaux messages, le dernier est de : %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Dernier de : %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Vous avez reçu un message de quelqu\'un qui utilise les sessions chiffrées TextSecure. Voulez vous commencer une session chiffrée avec lui?</string>
   <string name="auto_initiate_activity__initiate_exchange">Commencer l\'échange</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b900dc3fd..4e7babbe1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -177,6 +177,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Decifratura MMS in corso, attendere...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Cifratura MMS invalida..</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Messaggio MMS cifrato per una sessione non esistente</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">Spostamento</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">Cambio sistema di messaggio di testo</string>
@@ -185,8 +186,8 @@
   <string name="KeyCachingService_passphrase_cached">Password salvata in cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nuovi messaggi</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) Nuovi messaggio, il più recente da %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Più recente da: %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Hai ricevuto un messaggio da qualcuno che supporta una sessione cifrata di TextSecure. Vuoi iniziare una sessione sicura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Inizio scambio delle chiavi</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7c64fddc4..e6f178063 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -194,6 +194,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS ontsleutelen, een moment...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Verkeerd versleuteld MMS-bericht...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS-bericht versleuteld voor niet bestaande sessie...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">Migreren</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">Migreren Systeem Tekstberichten</string>
@@ -202,8 +203,8 @@
   <string name="KeyCachingService_passphrase_cached">Wachtwoord In Cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nieuwe berichten</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) Nieuwe berichten, meest recente van: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Meest recente van: %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">U heeft een bericht ontvangen van iemand die versleutelde TextSecure sessies ondersteunt. Wilt u een beveiligde sessie initiëren?</string>
   <string name="auto_initiate_activity__initiate_exchange">Initieer Uitwisseling</string>
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index b7cca8985..767d6aa46 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -81,6 +81,7 @@
   <string name="ConversationActivity_group_conversation_recipients">Mottakere i gruppen</string>
   <string name="ConversationActivity_group_conversation">Gruppesamtale</string>
   <string name="ConversationActivity_d_recipients_in_group">%d mottakere i gruppen</string>
+  <string name="ConversationActivity_saving_draft">Lagrer utkast...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meldingsdetaljer</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s⏎ Transport: %2$s⏎ Sendt/Mottatt:%3$s</string>
@@ -93,6 +94,8 @@
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_delete_threads_question">Slette trådene?</string>
   <string name="ConversationListFragment_are_you_sure_you_wish_to_delete_all_selected_conversation_threads">Er du sikker på at du vil slette ALLE valgte samtaletråder?</string>
+  <string name="ConversationListFragment_deleting">Sletter</string>
+  <string name="ConversationListFragment_deleting_selected_threads">Sletter utvalgte tråder...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Nøkkelutvekslingsmelding...</string>
   <!--KeyScanningActivity-->
@@ -191,6 +194,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Dekrypterer MMS, vennligst vent...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Ugyldig kryptert MMS...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS kryptert for en ikke-eksisterende sesjon...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">Migrerer</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">Migrerer systemets SMS meldinger</string>
@@ -199,8 +203,12 @@
   <string name="KeyCachingService_passphrase_cached">Passord bufret</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) Nye meldinger</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) Nye meldinger, sist mottatt fra: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Sist mottatt fra: %s</string>
+  <string name="MessageNotifier_key_exchange">Nøkkelutveksling...</string>
+  <string name="MessageNotifier_encrypted_message">Kryptert melding...</string>
+  <string name="MessageNotifier_corrupted_ciphertext">Korrumpert chiffertext</string>
+  <string name="MessageNotifier_no_subject">(Mangler emne)</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Du har mottatt en melding fra noen som støtter TextSecure krypterte sesjoner. Ønsker du å initiere en sikker sesjon?</string>
   <string name="auto_initiate_activity__initiate_exchange">Start nøkkelutveksling</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 1a23c0e85..a734f884b 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -194,6 +194,8 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">A decifrar MMS, por favor aguarde...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
+  <!--MmsSender-->
+  <string name="MmsSender_currently_unable_to_send_your_mms_message">Mensagem MMS não pôde ser enviada agora. Será enviada quando o serviço estiver disponível.</string>
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">A migrar</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">A migrar mensagens de texto do sistema</string>
@@ -202,8 +204,16 @@
   <string name="KeyCachingService_passphrase_cached">Frase-chave guardada em cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) novas mensagens</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) novas mensagens, a mais recente de: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Mais recente de: %s</string>
+  <string name="MessageNotifier_key_exchange">Troca de chave...</string>
+  <string name="MessageNotifier_encrypted_message">Mensagem criptografada...</string>
+  <string name="MessageNotifier_corrupted_ciphertext">Texto encriptado corrompido</string>
+  <string name="MessageNotifier_no_subject">(Sem Assunto)</string>
+  <string name="MessageNotifier_message_delivery_failed">Envio de mensagem falhou.</string>
+  <string name="MessageNotifier_failed_to_deliver_message">Falha ao enviar mensagem.</string>
+  <string name="MessageNotifier_error_delivering_message">Erro ao enviar mensagem.</string>
+  <!--SmsReceiver-->
+  <string name="SmsReceiver_currently_unable_to_send_your_sms_message">Mensagem SMS não pôde ser enviada agora. Será enviada quando o serviço estiver disponível.</string>
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Recebeu uma mensagem de alguém que suporta sessões cifradas TextSecure. Deseja iniciar uma sessão segura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Iniciar intercâmbio</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 20b60aef5..46291308d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -191,6 +191,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">A decifrar MMS, por favor aguarde...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Mensagem MMS cifrada corrompida...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">Mensagem MMS cifrada para sessão inexistente...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">A migrar</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">A migrar mensagens de texto do sistema</string>
@@ -199,8 +200,8 @@
   <string name="KeyCachingService_passphrase_cached">Frase-chave guardada em cache</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) novas mensagens</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) novas mensagens, a mais recente de: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Mais recente de: %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Recebeu uma mensagem de alguém que suporta sessões cifradas TextSecure. Deseja iniciar uma sessão segura?</string>
   <string name="auto_initiate_activity__initiate_exchange">Iniciar intercâmbio</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 946078ba4..c1db033e0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -191,6 +191,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Prosím čakaj, dekryptujem MMS...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">Nesprávne kryptovaná MMS správa...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS správa zakryptovaná pre neexistujúcu session...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">Presúvam</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">Presúvam systémové textové správy</string>
@@ -199,8 +200,8 @@
   <string name="KeyCachingService_passphrase_cached">Heslo kešované</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) nových správ</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) nových správ, najnovšia od: %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">Najnovšia od: %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">Dostali ste správu od klienta podporujúceho TextSecure bezpečnú session.  Želáte si vytvoriť bezpečnú session?</string>
   <string name="auto_initiate_activity__initiate_exchange">Začni vzájomnú výmenu</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 03946c0ea..9974525fe 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -185,6 +185,7 @@
   <string name="MmsMessageRecord_decrypting_mms_please_wait">正在解密彩信，请稍后...</string>
   <string name="MmsMessageRecord_bad_encrypted_mms_message">加密彩信消息错误...</string>
   <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">已为不存在的会话加密彩信消息...</string>
+  <!--MmsSender-->
   <!--ApplicationMigrationService-->
   <string name="ApplicationMigrationService_migrating">正在迁移</string>
   <string name="ApplicationMigrationService_migrating_system_text_messages">正在迁移系统文本消息</string>
@@ -193,8 +194,8 @@
   <string name="KeyCachingService_passphrase_cached">密码已缓存</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages">(%d) 新邮件</string>
-  <string name="MessageNotifier_d_new_messages_most_recent_from_s">(%1$d) 新邮件，最新邮件来自： %2$s</string>
   <string name="MessageNotifier_most_recent_from_s">最新邮件来自： %s</string>
+  <!--SmsReceiver-->
   <!--auto_initiate_activity-->
   <string name="auto_initiate_activity__you_have_received_a_message_from_someone_who_supports_textsecure_encrypted_sessions_would_you_like_to_initiate_a_secure_session">您收到一条支持 TextSecure 加密会话的人发送的消息。  是否要启动安全会话？</string>
   <string name="auto_initiate_activity__initiate_exchange">启动交换</string>