diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ec6ef5b219..e5cd60a4ae 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -35,6 +35,7 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">يجب عليك إدخال العبارة السرية قبل استيراد المفاتيح السرية</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">يجب عليك إدخال العبارة السرية قبل ضبط المفاتيح السرية</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">لم تقم بتحديد عبارة سرية بعد!</string>
+  <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <!--AttachmentTypeSelectorAdapter-->
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">حجم الرسالة: %d كيلوبايت</string>
diff --git a/res/values-bo/strings.xml b/res/values-bo/strings.xml
index e48a7fe6f4..b68f373106 100644
--- a/res/values-bo/strings.xml
+++ b/res/values-bo/strings.xml
@@ -36,6 +36,11 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">ཁྱོད་ཀྱིས་ལྡེ་མིག་ནང་འཇུག་མ་བྱས་སྔོན་ལ་གསང་གྲངས་འཇོག་དགོས།</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">ཁྱོད་ཀྱིས་ལྡེ་མིག་དོ་དམ་མ་བྱས་སྔོན་ལ་གསང་གྲངས་འཇོག་དགོས།</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ཁྱོད་ཀྱིས་གསང་ཡིག་བཟོས་མི་འདུག</string>
+  <string name="ApplicationPreferencesActivity_conversation_length_limit">གླེང་མོལ་གྱི་རིང་ཐུང་གི་ཚད། </string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">གླེང་མོལ་རེའི་འཕྲིན་ཐུང་། </string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">ད་ལྟ་རང་འཕྲིན་ཐུང་རྙིང་པ་ཚང་མ་གསུབ་གི་ཡིན་ནམ། </string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">ཁྱེད་ཀྱིས་མྱུར་དུ་ཉེ་འཆར་གྱི་འཕྲིན་ཐུང་དེའི་སླད་དུ་གླེང་མོལ་གྱི་སྐུད་པ་ཚང་མ་གཙང་བཟོ་བྱེད་ཀྱི་ཡིན་ནམ། </string>
+  <string name="ApplicationPreferencesActivity_delete">གསུབ། </string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">འདྲ་པར།</string>
   <string name="AttachmentTypeSelectorAdapter_video">བརྙན་པར།</string>
@@ -79,6 +84,7 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">འཕྲིན་ཐུང་གི་ཞིབ་ཆ།</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">གཏོང་མཁན།:%1$s  དབོར་བ།:%2$s བཏང་།/འབྱོར།:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">གཏོང་མཁན: %1$s⏎ སྐྱེལ་འདྲེན: %2$s⏎ བཏང་ཚར: %3$s⏎ འབྱོར་ཚར:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">འཕྲིན་ཐུང་གསུབ་པ་ངེས་བརྟན་བཟོས། </string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">ཁྱོད་ཀྱིས་དངོས་གནས་འཕྲིན་ཐུང་འདི་གཏན་དུ་གསུབ་རྒྱུ་ཡིན་ནམ།</string>
   <!--ConversationListAdapter-->
@@ -319,6 +325,23 @@
   <string name="preferences__normal">འཆར་ཅན།</string>
   <string name="preferences__slow">དལ་བོ། </string>
   <string name="preferences__custom">ཡུལ་སྲོལ། </string>
+  <string name="preferences__advanced_mms_access_point_names">རྒྱ་བསྐྱེད་པ། MMS Access Point ཡི་མིང་ཐོ་ཁག </string>
+  <string name="preferences__enable_fallback_mmsc">དེ་བསྐྱར་དུ་བྱེད་ནུས་ཅན་བཟོས། </string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">APN ཡི་མ་ལག་གི་བརྡ་ལན་དེ་མི་རྙེད་དུས། MMSC ཡི་བརྡ་ལན་སྡེབ་སྒྲིག་བྱས་བ་དེ་བེད་སྤྱོད་ཐོངས། </string>
+  <string name="preferences__mmsc_url_required">MMSC URL(དགོས་ངེས་ཅན) </string>
+  <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (གདམ་ཀ་ཅན) </string>
+  <string name="preferences__mms_proxy_port_optional">MMS Proxy Port (གདམ་ཀ་ཅན) </string>
+  <string name="preferences__delivery_reports">སྙན་ཐོ་སྐྱེལ། </string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ཁྱེད་ཀྱིས་གཏོང་བའི་SMSའཕྲིན་ཐུང་རེ་རེར་སྙན་ཐོ་སྐྱེལ་བའི་རེ་སྐུལ་བྱོས། </string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">ཁྱེད་ཀྱིས་གཏོང་བའི་MMSའཕྲིན་ཐུང་རེ་རེར་སྙན་ཐོ་སྐྱེལ་བའི་རེ་སྐུལ་བྱོས། </string>
+  <string name="preferences__mms_delivery_reports">MMS ཡི་སྙན་ཐོ་སྐྱེལ། </string>
+  <string name="preferences__sms_delivery_reports">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__storage">ཉར་ས། </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>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4f7de22a96..90cc14cfdf 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -27,6 +27,7 @@
   <string name="ApplicationMigrationManager_copy">Kopieren</string>
   <string name="ApplicationMigrationManager_dont_copy">Nicht kopieren</string>
   <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Momentan: %s</string>
   <string name="ApplicationPreferenceActivity_not_found_exclamation">Nicht gefunden!</string>
   <string name="ApplicationPreferenceActivity_no_valid_identity_key_was_found_in_the_specified_contact">Es wurde kein gültiger Schlüssel zur Identifizierung für den ausgewählten Kontakt gefunden.</string>
   <string name="ApplicationPreferenceActivity_you_don_t_have_an_identity_key_exclamation">Sie haben keinen persönlichen Schlüssel!</string>
@@ -35,6 +36,7 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Bevor Sie Schlüssel importieren können, müssen Sie ihr Passwort eingeben...</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Bevor Sie Schlüssel verwalten können, müssen Sie ihr Passwort eingeben...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
+  <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bild</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -72,6 +74,9 @@
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Der angegeben Empfänger ist keine gültige SMS oder E-Mail Adresse!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Die Nachricht ist leer!</string>
   <string name="ConversationActivity_forward_message_prefix">Weiterleiten</string>
+  <string name="ConversationActivity_group_conversation_recipients">Teilnehmer in Gruppengespräch</string>
+  <string name="ConversationActivity_group_conversation">Gruppengespräch</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d Teilnehmer in Gruppe</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Nachrichtendetails</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Sender: %1$s Transport: %2$s Gesendet/Empfangen:%3$s</string>
@@ -211,8 +216,10 @@
   <string name="conversation_activity__remove">Löschen</string>
   <!--conversation_item_sent-->
   <string name="conversation_item_sent__download">Download</string>
+  <string name="conversation_item_sent__downloading">Herunterladen</string>
   <!--conversation_item_received-->
   <string name="conversation_item_received__download">Download</string>
+  <string name="conversation_item_received__downloading">Herunterladen</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Mehrfachauswahl</string>
   <!--create_passphrase_activity-->
@@ -348,6 +355,7 @@
   <string name="conversation__menu_delete_thread">Thread löschen</string>
   <string name="conversation__menu_compare">Vergleichen</string>
   <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Teilnehmerliste</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Vergleichen</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Zum Vergleich eingelesen werden</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 75b7289c5d..ce46b86f0b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">TextSecure</string>
-  <string name="yes">Si</string>
+  <string name="yes">Sí</string>
   <string name="no">No</string>
   <string name="delete">Borrar</string>
   <!--ApplicationExportManager-->
@@ -20,22 +20,31 @@
   <string name="ApplicationExportManager_import">Importar</string>
   <string name="ApplicationExportManager_export">Exportar</string>
   <!--ApplicationMigrationManager-->
-  <string name="ApplicationMigrationManager_migrating_database">MIgrando la base de datos</string>
+  <string name="ApplicationMigrationManager_migrating_database">Migrando la base de datos</string>
   <string name="ApplicationMigrationManager_migrating_text_message_database">Migrando la base de datos de mensajes de texto...</string>
   <string name="ApplicationMigrationManager_copy_system_text_message_database_question">¿Desea copiar la base de datos de mensajes de texto del sistema?</string>
   <string name="ApplicationMigrationManager_copy_system_text_message_database_explanation">TextSecure usa una base de datos cifrada, separa de la base de datos predeterminada por el sistema.  ¿Le gustaría copiar sus mensajes de texto existentes en la base cifrada de TextSecure? Su base de datos predeterminada en el sistema no será afectada. </string>
   <string name="ApplicationMigrationManager_copy">Copiar</string>
   <string name="ApplicationMigrationManager_dont_copy">No copiar</string>
   <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">Actualmente: %s</string>
   <string name="ApplicationPreferenceActivity_not_found_exclamation">¡No encontrado!</string>
   <string name="ApplicationPreferenceActivity_no_valid_identity_key_was_found_in_the_specified_contact">No se ha encontrado una clave de identidad válida en el contacto especificado.</string>
   <string name="ApplicationPreferenceActivity_you_don_t_have_an_identity_key_exclamation">¡Aún no tiene una clave de identidad!</string>
   <string name="ApplicationPreferenceActivity_you_have_not_yet_defined_a_contact_for_yourself">No ha definido aún un contacto para usted mismo. Seleccione uno en el menú de Preferencias</string>
-  <string name="ApplicationPreferenceActivity_exported_to_contacts_database">Exportado a la base de datos de contactos</string>
+  <string name="ApplicationPreferenceActivity_exported_to_contacts_database">¡Exportado a la base de datos de contactos!</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Necesita ingresar una frase de contraseña antes de importar claves...</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Necesita ingresar su frase de contraseña antes de gestionar sus claves...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">¡No ha elegido aún una frase de contraseña!</string>
+  <string name="ApplicationPreferencesActivity_conversation_length_limit">Límite de tamaño de la conversación</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">mensajes por conversación</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">¿Eliminar todos los mensajes viejos ahora?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">¿Estás seguro de que te gustaría recortar inmediatamente todos los hilos de conversación a los %s últimos mensajes?</string>
+  <string name="ApplicationPreferencesActivity_delete">Eliminar</string>
   <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_picture">Fotografía</string>
+  <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Tamaño del mensaje: %d KB</string>
   <string name="ConversationItem_expires_s">Expira: %s</string>
@@ -68,9 +77,14 @@
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Lo sentimos, el audio seleccionado excede las restricciones de tamaño del mensaje.</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">El destinatario no es un SMS o correo electrónico válido</string>
   <string name="ConversationActivity_message_is_empty_exclamation">¡El mensaje está vacío!</string>
+  <string name="ConversationActivity_forward_message_prefix">FWD</string>
+  <string name="ConversationActivity_group_conversation_recipients">Receptores de Conversación en Grupo</string>
+  <string name="ConversationActivity_group_conversation">Conversación en Grupo</string>
+  <string name="ConversationActivity_d_recipients_in_group">%d receptores en grupo</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalles del mensaje</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Remitente: %1$s\nTransporte: %2$s\nEnviado/Recibido:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Emisor: %1$s⏎ Transporte: %2$s⏎ Enviado: %3$s⏎ Recibido:%4$s\n</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmar borrado del mensaje</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">¿Está seguro que desea borrar permanentemente este mensaje?</string>
   <!--ConversationListAdapter-->
@@ -205,6 +219,12 @@
   <string name="conversation_activity__type_message">Escribir mensaje</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Eliminar</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">Descarga</string>
+  <string name="conversation_item_sent__downloading">Descargando</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">Descarga</string>
+  <string name="conversation_item_received__downloading">Descargando</string>
   <!--conversation_fragment_cab-->
   <string name="conversation_fragment_cab__batch_selection_mode">Modo de selección múltiple</string>
   <!--create_passphrase_activity-->
@@ -305,6 +325,23 @@
   <string name="preferences__normal">Normal</string>
   <string name="preferences__slow">Despacio</string>
   <string name="preferences__custom">Personalizado</string>
+  <string name="preferences__advanced_mms_access_point_names">Avanzado: Nombres de Puntos de Acceso MMS</string>
+  <string name="preferences__enable_fallback_mmsc">Activar Fallback MMSC</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Usar la información MMSC configurada aquí cuando el sistema de información APN no está disponible.</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (Requerido)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Opcional)</string>
+  <string name="preferences__mms_proxy_port_optional">Puerto de Proxy MMS (Opcional)</string>
+  <string name="preferences__delivery_reports">Noticias de entrega</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pide una noticia de entrega por cada mensaje SMS que envías</string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">Pide una noticia de entrega por cada mensaje MMS que envías</string>
+  <string name="preferences__mms_delivery_reports">Noticias de entrega de MMS</string>
+  <string name="preferences__sms_delivery_reports">Noticias de entrega de SMS</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automáticamente los mensajes más viejos una vez el hilo de conversación excede el límite de longitud</string>
+  <string name="preferences__delete_old_messages">Eliminar mensajes viejos</string>
+  <string name="preferences__storage">Almacenamiento</string>
+  <string name="preferences__conversation_length_limit">Límite de longitud de la conversación</string>
+  <string name="preferences__trim_all_threads_now">Recorta todos los hilos ahora</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Búsqueda a través de todos los hilos de conversación y fuerza los límites de longitud de la misma</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -340,6 +377,7 @@
   <string name="conversation__menu_delete_thread">Borrar conversación</string>
   <string name="conversation__menu_compare">Comparar</string>
   <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">Lista de receptores</string>
   <!--key_scanning-->
   <string name="key_scanning__menu_compare">Comparar</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Escanear mi clave para comparar</string>
@@ -356,5 +394,6 @@
   <!--verify_keys-->
   <string name="verify_keys__menu_verified">Verificado</string>
   <!--Misc. piggybacking-->
+  <string name="PlayStoreListing">TextSecure es una aplicacion de mensajería de texto con énfasis en la seguridad que sirve de reemplazo a la aplicación de mensajería de texto por defecto. Los mensajes enviados a otros usuarios de TextSecure están cifrados al vuelo, y todos los mensajes de texto están cifrados en una base de datos en el dispositivo. Si tu teléfono se pierde o es robado, tus mensajes estarán seguros, y la comunicación con otros usuarios de TextSecure no será monitorizada en el aire.</string>
   <!--EOF-->
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8ff2c2b76d..626af90b38 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -36,6 +36,11 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Il est nécessaire d’avoir entré votre phrase de passe avant d’importer des clés…</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Il est nécessaire d’avoir entré votre phrase de passe avant de gérer les clés…</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Vous n’avez pas encore défini de phrase de passe !</string>
+  <string name="ApplicationPreferencesActivity_conversation_length_limit">Limite de longueur de conversation</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">Messages par conversation</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Supprimer tous les anciens messages maintenant ?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sur de vouloir réduire toutes les conversations aux %s messages les plus récents ?</string>
+  <string name="ApplicationPreferencesActivity_delete">Supprimer</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Image</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vidéo</string>
@@ -79,6 +84,7 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Détails du message</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Expéditeur : %1$s\nTransport : %2$s\nEnvoyé / Reçu : %3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Expéditeur : %1$s\nTransport : %2$s\nEnvoyé : %3$s\nReçu : %4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirmer la suppression du message</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Êtes-vous sûr de vouloir supprimer définitivement ce message ?</string>
   <!--ConversationListAdapter-->
@@ -320,10 +326,22 @@
   <string name="preferences__slow">Lent</string>
   <string name="preferences__custom">Personnalisé</string>
   <string name="preferences__advanced_mms_access_point_names">Avancé : Noms des Points d’Accès MMS</string>
-  <string name="preferences__enable_local_apns">Activer les NPAs locaux</string>
-  <string name="preferences__use_apn_information_configured_here_when_system_apn_information_is_unavailable">Utiliser les informations NPA configurées ici quand les informations NPA du système ne sont pas disponibles.</string>
+  <string name="preferences__enable_fallback_mmsc">Activer le MMSC par défaut</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Utiliser les informations MMSC configurée ici lorsque les informations APN ne sont pas disponibles</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Obligatoire)</string>
-  <string name="preferences__mms_proxy_optional">Proxy MMS (Facultatif)</string>
+  <string name="preferences__mms_proxy_host_optional">Hôte Proxy MMS (Optionnel)</string>
+  <string name="preferences__mms_proxy_port_optional">Port Proxy MMS (Optionnel)</string>
+  <string name="preferences__delivery_reports">Accusés de réception</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">Demander un accusé de réception pour chaque MMS envoyé</string>
+  <string name="preferences__mms_delivery_reports">Accusés de réception MMS</string>
+  <string name="preferences__sms_delivery_reports">Accusés de réception SMS</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatique les anciens messages lorsque la conversation dépasse un certaine taille d\'échange.</string>
+  <string name="preferences__delete_old_messages">Supprimer les anciens messages</string>
+  <string name="preferences__storage">Stockage</string>
+  <string name="preferences__conversation_length_limit">Limite de taille de conversation</string>
+  <string name="preferences__trim_all_threads_now">Réduire toutes les conversations maintenant</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Chercher à travers toutes les conversations et appliquer la limite de taille de conversation</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f896b3f277..b900dc3fda 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -308,7 +308,6 @@
   <string name="preferences__slow">Lento</string>
   <string name="preferences__custom">Personalizzato</string>
   <string name="preferences__mmsc_url_required">URL MMSC (Richiesto)</string>
-  <string name="preferences__mms_proxy_optional">Proxy MMS (Facoltativo)</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index addd7e73dc..251b593295 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -79,6 +79,7 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Bericht details</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Verzender: %1$s\nTransport: %2$s\nVerstuurd/Ontvangen:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Verzender: %1$s\nMedium: %2$s\nVerzonden: %3$s\nOntvangen:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Bevestig Bericht Verwijdering</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Weet u zeker dat u dit bericht permanent wilt verwijderen?</string>
   <!--ConversationListAdapter-->
@@ -320,10 +321,11 @@
   <string name="preferences__slow">Langzaam</string>
   <string name="preferences__custom">Aangepast</string>
   <string name="preferences__advanced_mms_access_point_names">Geavanceerd: MMS Toegangspuntnamen</string>
-  <string name="preferences__enable_local_apns">Lokale APNs gebruiken</string>
-  <string name="preferences__use_apn_information_configured_here_when_system_apn_information_is_unavailable">Gebruik de hier ingestelde APN informatie wanneer de de APN informatie van het systeem niet beschikbaar is.</string>
+  <string name="preferences__enable_fallback_mmsc">Fallback MMSC Activeren</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Gebruik de hier ingestelde MMSC informatie wanneer de APN informatie van het systeem niet beschikbaar is.</string>
   <string name="preferences__mmsc_url_required">MMSC URL (Vereist)</string>
-  <string name="preferences__mms_proxy_optional">MMS Proxy (Optioneel)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS Proxy Host (Optioneel)</string>
+  <string name="preferences__mms_proxy_port_optional">MMS Proxy Poort (Optioneel)</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-no/strings.xml b/res/values-no/strings.xml
index 78e62b74a0..b7cca8985d 100644
--- a/res/values-no/strings.xml
+++ b/res/values-no/strings.xml
@@ -36,6 +36,11 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Du må taste inn passordet før du importerer nøkler...</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Du må taste inn passordet før du administrerer nøkler...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har ikke definert et passord ennå!</string>
+  <string name="ApplicationPreferencesActivity_conversation_length_limit">Begrense samtalelengde</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">meldinger per samtale</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slette alle gamle meldinger nå?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på at du ønsker å umiddelbart trimme alle samtaletrådene til de siste %s meldinger?</string>
+  <string name="ApplicationPreferencesActivity_delete">Slett</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Bilde</string>
   <string name="AttachmentTypeSelectorAdapter_video">Video</string>
@@ -79,6 +84,7 @@
   <!--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>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Avsender: %1$s⏎ Transport: %2$s⏎ Sendt: %3$s⏎ Mottatt:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Bekreft sletting av melding</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Er du sikker på at du ønsker å slette denne meldingen?</string>
   <!--ConversationListAdapter-->
@@ -320,10 +326,22 @@
   <string name="preferences__slow">Sakte</string>
   <string name="preferences__custom">Tilpasset</string>
   <string name="preferences__advanced_mms_access_point_names">Avansert: MMS Aksesspunkt navn (APN)</string>
-  <string name="preferences__enable_local_apns">Aktiver lokale APN\'er</string>
-  <string name="preferences__use_apn_information_configured_here_when_system_apn_information_is_unavailable">Benytt APN informasjonen som er konfigurert her når systemets APN informasjon er utilgjengelig.</string>
-  <string name="preferences__mmsc_url_required">MMSC URL (Påkrevd)</string>
-  <string name="preferences__mms_proxy_optional">MMS Proxy (Opsjon)</string>
+  <string name="preferences__enable_fallback_mmsc">Aktiver alternativ MMSC</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Benytt MMSC informasjonen konfigurert her når systemets APN informasjon er utilgjengelig.</string>
+  <string name="preferences__mmsc_url_required">MMSC URL (påkrevd)</string>
+  <string name="preferences__mms_proxy_host_optional">MMS proxy host (valgfritt)</string>
+  <string name="preferences__mms_proxy_port_optional">MMS proxy port (valgfritt)</string>
+  <string name="preferences__delivery_reports">Leveringsrapporter</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Be om en leveringsrapport for hver SMS-melding du sender</string>
+  <string name="preferences__request_a_delivery_report_for_each_mms_message_you_send">Be om en leveringsrapport for hver MMS-melding du sender</string>
+  <string name="preferences__mms_delivery_reports">Leveringsrapport for MMS</string>
+  <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slett eldre meldinger automatisk når en samtale tråd overskrider en spesifisert lengde</string>
+  <string name="preferences__delete_old_messages">Slett gamle meldinger</string>
+  <string name="preferences__storage">Lagring</string>
+  <string name="preferences__conversation_length_limit">Grense på samtalelengde</string>
+  <string name="preferences__trim_all_threads_now">Trimme alle samtaletråder nå</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanne gjennom alle samtaletrådene og håndheve grensen på samtalelengde </string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 4e36a23d4c..20b60aef5d 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -36,6 +36,11 @@
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_importing_keys">Necessita de inserir a frase-chave antes de importar chaves...</string>
   <string name="ApplicationPreferenceActivity_you_need_to_have_entered_your_passphrase_before_managing_keys">Necessita de inserir a frase-chave antes de gerir chaves...</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
+  <string name="ApplicationPreferencesActivity_conversation_length_limit">Tamanho máximo de conversa</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">Mensagens por conversa</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Deletar todas mensagens antigas agora?</string>
+  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
+  <string name="ApplicationPreferencesActivity_delete">Deletar</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_picture">Imagem</string>
   <string name="AttachmentTypeSelectorAdapter_video">Vídeo</string>
@@ -79,6 +84,7 @@
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalhes da mensagem</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_received_s">Remetente: %1$s⏎ Transporte: %2$s⏎ Enviadas/Recebidas:%3$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Transmissor: %1$s\nTransporte: %2$s\nEnviado: %3$s\nRecebido:%4$s</string>
   <string name="ConversationFragment_confirm_message_delete">Confirme apagar a mensagem</string>
   <string name="ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message">Tem a certeza que pretende apagar permanentemente esta mensagem?</string>
   <!--ConversationListAdapter-->
@@ -320,10 +326,22 @@
   <string name="preferences__slow">Lento</string>
   <string name="preferences__custom">Personalizado</string>
   <string name="preferences__advanced_mms_access_point_names">Avançado: APN de MMS</string>
-  <string name="preferences__enable_local_apns">Habilitar APNs locais</string>
-  <string name="preferences__use_apn_information_configured_here_when_system_apn_information_is_unavailable">Usar informação de APN configurada aqui caso informação de APN do sistema não esteja disponível.</string>
+  <string name="preferences__enable_fallback_mmsc">Habilitar MMSC de reseva</string>
+  <string name="preferences__use_mmsc_information_configured_here_when_system_apn_information_is_unavailable">Usar esta informação de MMSC quando APN do sistema estiver indisponível.</string>
   <string name="preferences__mmsc_url_required">URL do MMSC (Necessário)</string>
-  <string name="preferences__mms_proxy_optional">Proxy MMS (Opcional)</string>
+  <string name="preferences__mms_proxy_host_optional">Proxy MMS (Opcional)</string>
+  <string name="preferences__mms_proxy_port_optional">Porta do Proxy MMS (Opcional)</string>
+  <string name="preferences__delivery_reports">Avisos de entrega</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__request_a_delivery_report_for_each_mms_message_you_send">Pedir um aviso de entrega para cada MMS enviado</string>
+  <string name="preferences__mms_delivery_reports">Avisos de entrega de MMS</string>
+  <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente deletar mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
+  <string name="preferences__delete_old_messages">Deletar mensagens antigas</string>
+  <string name="preferences__storage">Armazenamento</string>
+  <string name="preferences__conversation_length_limit">Tamanho máximo de conversa</string>
+  <string name="preferences__trim_all_threads_now">Apagar todas conversas agora</string>
+  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verificar todas conversas e aplicar tamanho máximo de conversa</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->