diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 8c5101b55..3e0aca6e2 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -20,18 +20,9 @@
   <string name="permission_access_provider_label">Acceder a los datos del fornidor de corréu electrónicu</string>
   <string name="permission_access_provider_desc">Permite que l\'aplicación acceda a la base de datos del to corréu electrónicu, incluyíos los mensaxes recibíos, los mensaxes unviaos, los nomes d\'usuariu y les contraseñes.</string>
   <string name="app_name">Corréu</string>
-  <string name="debug_title">Depurar</string>
   <string name="create_action">Crear nueva</string>
   <string name="quick_responses_empty_view">Nun hai rempuestes rápides.</string>
   <string name="account_settings_action">Axustes de la cuenta</string>
-  <string name="status_network_error">Fallu de conexón</string>
-  <plurals name="move_messages">
-    <item quantity="one">Mover mensaxe</item>
-    <item quantity="other">Mover mensaxes</item>
-  </plurals>
-  <string name="cannot_move_protocol_not_supported_toast">Les cuentes POP3 nun permiten mover mensaxes.</string>
-  <string name="cannot_move_multiple_accounts_toast">Nun pue movese porque la seleición contién varies cuentes.</string>
-  <string name="cannot_move_special_mailboxes_toast">Nun puen movese los mensaxes de les carpetes Borradores, Por Unviar nin Unviaos.</string>
   <string name="mailbox_name_display_inbox">Recibíos</string>
   <string name="mailbox_name_display_outbox">Por Unviar</string>
   <string name="mailbox_name_display_drafts">Borradores</string>
@@ -40,37 +31,17 @@
   <string name="mailbox_name_display_junk">Corréu puxarra</string>
   <string name="mailbox_name_display_starred">Destacaos</string>
   <string name="mailbox_name_display_unread">Ensin lleer</string>
-  <string name="account_folder_list_summary_inbox">Recibíos</string>
-  <string name="account_folder_list_summary_starred">Destacaos</string>
-  <string name="account_folder_list_summary_drafts">Borradores</string>
-  <string name="account_folder_list_summary_outbox">Por Unviar</string>
+  <string name="debug_title">Depurar</string>
   <string name="mailbox_list_account_selector_combined_view">Vista combinada</string>
   <string name="message_compose_fwd_header_fmt">\n\n\"-------- Mensaxe Orixinal --------\nAsuntu: <xliff:g id="SUBJECT">%1$s</xliff:g>\nDe: <xliff:g id="SENDER">%2$s</xliff:g>\nPa: <xliff:g id="TO">%3$s</xliff:g>\nCc: <xliff:g id="CC_0">%4$s</xliff:g>\n\n</string>
   <string name="message_compose_insert_quick_response_list_title">Usar rempuesta rápida</string>
   <string name="message_compose_insert_quick_response_menu_title">Usar rempuesta rápida</string>
   <string name="message_view_attachment_background_load">Ún o dellos de los ficheros axuntos del mensaxe reunviáu van descargase enantes d\'unviase.</string>
-  <string name="attachment_not_found">Nun pudo descargase\'l ficheru axuntu.</string>
   <string name="message_decode_error">Hebo un fallu al decodificar el mensaxe.</string>
   <string name="forward_download_failed_ticker">Fallu al unviar ún o varios ficheros axuntos</string>
   <string name="forward_download_failed_title">Ficheru axuntu non reunviáu</string>
   <string name="login_failed_ticker">Fallu al aniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g></string>
   <string name="login_failed_title">Fallu al aniciar sesión</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one"><xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B</item>
-    <item quantity="other"><xliff:g id="SIZE_IN_BYTES">%d</xliff:g> B</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one"><xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB</item>
-    <item quantity="other"><xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g> KB</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one"><xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB</item>
-    <item quantity="other"><xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one"><xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB</item>
-    <item quantity="other"><xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g> GB</item>
-  </plurals>
   <string name="account_setup_basics_title">Axustes de la cuenta</string>
   <string name="oauth_authentication_title">Solicitando autorización</string>
   <string name="sign_in_title">Aniciar sesión</string>
@@ -92,22 +63,17 @@
   <string name="account_setup_username_password_toast">Introduz una direición de corréu-e y una contraseña válides.</string>
   <string name="account_duplicate_dlg_title">Cuenta duplicada</string>
   <string name="account_duplicate_dlg_message_fmt">Yá tas usando esti nome d\'usuariu pa la cuenta \"<xliff:g id="DUPLICATE">%s</xliff:g>\".</string>
-  <string name="account_password_spaces_error">Esta contraseña contién ún o varios espacios al entamu o al final. Munchos sirvidores nun almiten contraseñes con espacios.</string>
   <string name="account_setup_check_settings_retr_info_msg">Recuperando la información de la cuenta...</string>
   <string name="account_setup_check_settings_check_incoming_msg">Validando los axustes del sirvidor…</string>
   <string name="account_setup_check_settings_check_outgoing_msg">Validando los axustes de SMTP…</string>
   <string name="account_setup_creating_account_msg">Creando cuenta…</string>
   <string name="account_setup_ab_headline">Confirmar triba de cuenta</string>
   <string name="account_setup_ab_instructions_format">Indicasti <xliff:g id="email">%1$s</xliff:g> uses <xliff:g id="userProtocol">%2$s</xliff:g>, pero la cuenta pue usar <xliff:g id="providerProtocol">%3$s</xliff:g></string>
-  <string name="account_setup_names_title">Axustes de la cuenta</string>
   <string name="account_setup_names_headline">La to cuenta yá ta configurada y vas ver el to corréu de secute.</string>
   <string name="account_setup_names_account_name_label">Da-y un nome a esta cuenta (opcional)</string>
   <string name="account_setup_names_user_name_label">El to nome (como va vese nos mensaxes unviaos)</string>
-  <string name="account_setup_names_user_name_empty_error">Esti campu nun pue dexase baleru.</string>
-  <string name="account_setup_account_type_title">Axustes de la cuenta</string>
   <string name="account_setup_account_type_headline">Tipu de cuenta</string>
   <string name="account_setup_account_type_instructions">¿Qué tipu de cuenta tienes?</string>
-  <string name="account_setup_incoming_title">Axustes de la cuenta</string>
   <string name="account_setup_incoming_headline">Axustes del sirvidor d\'entrada</string>
   <string name="account_setup_incoming_username_label">NOME USUARIU</string>
   <string name="account_setup_incoming_password_label">CONTRASEÑA</string>
@@ -125,21 +91,18 @@
   <string name="account_setup_incoming_delete_policy_delete_label">Al desaniciar mensaxes</string>
   <string name="account_setup_incoming_imap_path_prefix_label">Prefixu de ruta IMAP</string>
   <string name="account_setup_incoming_imap_path_prefix_hint">Opcional</string>
-  <string name="account_setup_outgoing_title">Axustes de la cuenta</string>
   <string name="account_setup_outgoing_headline">Axustes del sirvidor de salida</string>
   <string name="account_setup_outgoing_smtp_server_label">SIRVIDOR SMTP</string>
   <string name="account_setup_outgoing_port_label">PUERTU</string>
   <string name="account_setup_outgoing_security_label">TRIBA DE SEGURIDÁ</string>
   <string name="account_setup_outgoing_require_login_label">Solicitar aniciu de sesión</string>
   <string name="account_setup_outgoing_username_label">NOME USUARIU</string>
-  <string name="account_setup_outgoing_password_label">CONTRASEÑA</string>
   <string name="account_setup_exchange_certificate_title">CERTIFICÁU DE VECERU</string>
   <string name="account_setup_exchange_select_certificate">Seleicionar</string>
   <string name="account_setup_exchange_use_certificate">Usar certificáu de veceru</string>
   <string name="account_setup_exchange_remove_certificate">Desaniciar</string>
   <string name="account_setup_exchange_no_certificate">Nengún</string>
   <string name="account_setup_exchange_device_id_label">ID DEL PRESÉU MÓVIL</string>
-  <string name="account_setup_options_title">Axustes de la cuenta</string>
   <string name="account_setup_options_headline">Opciones de cuenta</string>
   <string name="account_setup_options_mail_check_frequency_label">Frecuencia de sincronización:</string>
   <string name="account_setup_options_mail_check_frequency_never">Enxamás</string>
@@ -165,7 +128,6 @@
   <string name="account_setup_options_mail_window_all">Too</string>
   <string name="account_setup_options_mail_window_default">Usar valores predeterminaos de la cuenta</string>
   <string name="account_setup_failed_dlg_auth_message">Nome d\'usuariu o contraseña incorreutos</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Fallu d\'aniciu de sesión\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
   <string name="account_setup_autodiscover_dlg_authfail_title">Problema al configurar la cuenta</string>
   <string name="account_setup_autodiscover_dlg_authfail_message">Los axustes de cuenta, contraseña y nome d\'usuariu de confirmación son correutos.</string>
   <string name="account_setup_failed_dlg_certificate_message">Nun pue afitase una conexón de mou seguru col sirvidor.</string>
@@ -184,7 +146,6 @@
   <string name="account_setup_security_required_title">Alministración de seguridá remota</string>
   <string name="account_setup_security_policies_required_fmt">Ye necesario que permitas que\'l sirvidor <xliff:g id="SERVER">%s</xliff:g> remane de mou remotu dalgunes funciones de seguridá del to preséu Android. ¿Quies terminar de configurar esta cuenta?</string>
   <string name="account_setup_failed_security_policies_unsupported">Esti sirvidor requier funciones de seguridá que nun son compatibles col to preséu Android (por exemplu: <xliff:g id="ERROR">%s</xliff:g>).</string>
-  <string name="account_setup_username_uneditable_error">Nun pues modificar el nome d\'usuariu d\'una cuenta. P\'amestar una cuenta con otru nome d\'usuariu, toca Amestar cuenta.</string>
   <string name="disable_admin_warning">AVISU: si desactives el permisu de l\'aplicación Corréu p\'alministrar el to preséu, van desaniciase toles cuentes d\'esta aplicación que requieran el so usu, asina como les direiciones de corréu-e, los contautos, los eventos de calendariu y otra mena de datos.</string>
   <string name="account_security_dialog_title">Anovamientu de seguridá</string>
   <string name="account_security_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> necesita qu\'anueves la configuración de seguridá.</string>
@@ -206,9 +167,6 @@
   <string name="password_expired_dialog_title">Contraseña bloquéu caducada</string>
   <string name="password_expired_dialog_content_fmt">Los datos de <xliff:g id="ACCOUNT">%s</xliff:g> tán desaniciándose del preséu. Pa restauralos, modifica la contraseña o\'l PIN de la pantalla de bloquéu. ¿Quies camudalos agora?</string>
   <string name="account_settings_exit_server_settings">¿Quies descartar los cambeos non guardaos?</string>
-  <string name="account_settings_login_dialog_title">Fallu al aniciar sesión</string>
-  <string name="account_settings_login_dialog_content_fmt">El nome d\'usuariu o la contraseña de <xliff:g id="ACCOUNT">%s</xliff:g> son incorreutos. ¿Quies anovalos agora?</string>
-  <string name="account_settings_login_dialog_reason_fmt">Hebo un fallu al aniciar sesión en <xliff:g id="ACCOUNT">%s</xliff:g>. Respuesta del servidor: <xliff:g id="REASON">%s</xliff:g>. ¿Quies anovar el to nome d\'usuariu o la contraseña?</string>
   <string name="account_settings_background_attachments_label">Descargar axuntos</string>
   <string name="account_settings_background_attachments_summary">Descargar automáticamente axuntos de correos recientes por Wi-Fi</string>
   <string name="account_settings_notify_label">Notificaciones de corréu</string>
@@ -247,7 +205,6 @@
   <string name="account_settings_sync_calendar_summary">Sincronizar eventos de calendariu pa esta cuenta</string>
   <string name="account_settings_sync_email_enable">Sincronizar corréu</string>
   <string name="account_settings_sync_email_summary">Sincronizar corréu d\'esta cuenta</string>
-  <string name="account_settings_vibrate_when_label">Vibrar</string>
   <string name="account_settings_ringtone">Esbillar tonu</string>
   <string name="account_settings_servers">Axustes del sirvidor</string>
   <string name="mailbox_settings_activity_title">Axustes de sincronización</string>
@@ -255,20 +212,11 @@
   <string name="mailbox_settings_sync_enabled_label">Sincronizar esta carpeta</string>
   <string name="mailbox_settings_sync_enabled_summary">Los mensaxes van descargase automáticamente al coneutate</string>
   <string name="mailbox_settings_mailbox_sync_window_label">Díes pa sincronizar corréu</string>
-  <string name="prefDialogTitle_conversationListIcon">Imaxe del remitente</string>
-  <string name="provider_note_live">Namái dalgunes cuentes \"Plus\" inclúin accesu POP pa permitir qu\'esti programa se coneute. Si nun pues acceder cola to direición de corréu-e y contraseña, ye dable que nun tengas una cuenta \"Plus\" de pagu. Usa\'l restolador web p\'acceder a estes cuentes de corréu.</string>
   <string name="provider_note_t_online">Pa configurar esta cuenta de corréu-e, accedi al sitiu web de T-Online y crea una contraseña p\'acceder al corréu electrónicu POP3.</string>
-  <string name="exchange_name">Cuenta de trabayu</string>
   <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
   <string name="system_account_create_failed">Nun pudo crease la cuenta. Inténtalo de nueves.</string>
   <string name="device_admin_label">Corréu-e</string>
   <string name="device_admin_description">Permite les polítiques de seguridá especificaes pol sirvidor.</string>
-  <string name="settings_activity_title">Axustes</string>
-  <string name="header_label_general_preferences">Axustes xenerales</string>
-  <string name="general_preference_confirm_delete_label">Confirmar pa desaniciar</string>
-  <string name="general_preference_confirm_send_label">Confirmar pa unviar</string>
-  <string name="more_than_999">+999</string>
-  <string name="search_hint">Guetar corréu</string>
   <string name="policy_dont_allow_camera">Nun permitir usar cámara del preséu</string>
   <string name="policy_require_password">Solicitar contraseña del preséu</string>
   <string name="policy_password_history">Restrinxir nuevu usu contraseñes recientes</string>
@@ -280,12 +228,7 @@
   <string name="quick_2">Paezme bien, ¡gracies!</string>
   <string name="quick_3">Lléolo dempués y respuéndote.</string>
   <string name="quick_4">Hai de facer una reunión pa falar d\'esti tema.</string>
-  <string name="require_manual_sync_message">Inhabilitóse la sincronización en segundu planu d\'esta cuenta n\'itinerancia.</string>
   <string name="confirm_response">Unviando rempuesta&#8230;</string>
-  <string name="no_conversations">Nun hai nengún mensaxe.</string>
-  <string name="imap_name">IMAP</string>
-  <string name="pop3_name">POP3</string>
-  <string name="folder_picker_title">Seleutor de carpetes</string>
   <string name="trash_folder_selection_title">Esbilla la papelera del sirvidor de <xliff:g id="ACCOUNT">%s</xliff:g></string>
   <string name="sent_folder_selection_title">Esbillar carpeta sirvidor de <xliff:g id="ACCOUNT">%s</xliff:g></string>
   <string name="account_waiting_for_folders_msg">Cargando llista de carpetes&#8230;</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 2d2d3fb5a..4e247fd60 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Això esborrarà totes les configuracions i els correus electrònics del compte <xliff:g id="account">%s</xliff:g>. Aquesta operació no es pot desfer.\n\nVols continuar?</string>
   <string name="deleting_account_msg">S\'està esborrant el compte\u2026</string>
   <string name="delete_account_failed">No s\'ha pogut esborrar el compte</string>
+  <string name="mailbox_notify_settings_activity_title">Opcions de notificació</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcions de notificació (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Ajustaments de les notificacions de carpeta</string>
+  <string name="label_notification_lights_title">Llums</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 957c6e044..91c9f97cc 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Tímto odstraníte všechna nastavení a emaily z účtu „<xliff:g id="account">%s</xliff:g>“. Tuto operaci nelze vzít zpět.\n\nPokračovat?</string>
   <string name="deleting_account_msg">Mazání účtu\u2026</string>
   <string name="delete_account_failed">Účet nelze smazat</string>
+  <string name="mailbox_notify_settings_activity_title">Možnosti oznámení</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Možnosti oznámení (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Nastavení složky oznámení</string>
+  <string name="label_notification_lights_title">Světla</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index c8c2a33b6..44ea6388b 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -20,4 +20,7 @@
   <string name="delete_account_confirmation_msg">DIese Aktion löscht alle Einstellungen und E-Mails des Kontos <xliff:g id="account">%s</xliff:g>. Dies kann nicht rückgängig gemacht werden.\n\nFortfahren?</string>
   <string name="deleting_account_msg">Konto wird gelöscht\u2026</string>
   <string name="delete_account_failed">Konto konnte nicht gelöscht werden</string>
+  <string name="mailbox_notify_settings_activity_title">Benachrichtigungsoptionen</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Benachrichtigungsoptionen (<xliff:g id="mailbox_name" example="Familie">%s</xliff:g>)</string>
+  <string name="label_notification_lights_title">LED</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index fab81a187..0b0dde40d 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Αυτό θα διαγράψει όλες τις ρυθμίσεις και τα μηνύματα ηλεκτρονικού ταχυδρομείου από το λογαριασμό <xliff:g id="account">%s</xliff:g>. Αυτή η λειτουργία είναι μη αναστρέψιμη.\n\nΣυνέχεια;</string>
   <string name="deleting_account_msg">Διαγραφή λογαριασμού\u2026</string>
   <string name="delete_account_failed">Δεν ήταν δυνατή η διαγραφή του λογαριασμού</string>
+  <string name="mailbox_notify_settings_activity_title">Επιλογές ειδοποιήσεων</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Επιλογές ειδοποιήσεων (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Ρυθμίσεις ειδοποιήσεων φακέλου</string>
+  <string name="label_notification_lights_title">Φωτισμός</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
new file mode 100644
index 000000000..4e8498784
--- /dev/null
+++ b/res/values-eu-rES/cm_strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CaynogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="delete_account">Ezabatu kontua</string>
+  <string name="delete_account_confirmation_msg">Honek <xliff:g id="account">%s</xliff:g> kontuko ezarpen eta mezu guztiak ezabatuko ditu. Eragiketa hau ezin da desegin.\n\nJarraitu?</string>
+  <string name="deleting_account_msg">Kontua ezabatzen\u2026</string>
+  <string name="delete_account_failed">Ezin izan da kontua ezabatu</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Jakinarazpenen aukerak (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+</resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index d7c2514e6..8c6b72d5b 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Tämä poistaa kaikki asetukset ja sähköpostit tililtä <xliff:g id="account">%s</xliff:g>. Toimintoa ei voi peruuttaa.\n\nJatketaanko?</string>
   <string name="deleting_account_msg">Poistetaan tiliä\u2026</string>
   <string name="delete_account_failed">Tiliä ei voitu poistaa</string>
+  <string name="mailbox_notify_settings_activity_title">Ilmoitusasetukset</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Ilmoitusasetukset (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Kansion ilmoitusasetukset</string>
+  <string name="label_notification_lights_title">Valot</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index c09d24056..c174d38b2 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -17,5 +17,8 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="delete_account">Supprimer le compte</string>
+  <string name="delete_account_confirmation_msg">Cela supprimera tous les paramètres et les e-mails du compte <xliff:g id="account">%s</xliff:g>.
+Cette opération ne peut pas être annulée.\n\nContinuer ?</string>
   <string name="deleting_account_msg">Suppression du compte\u2026</string>
+  <string name="delete_account_failed">Impossible de supprimer le compte</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 673c03ffa..dcd52c42b 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Törölni fog minden beállítást és az e-maileket ebből a fiókból: <xliff:g id="account">%s</xliff:g>. Ezt a műveletet nem lehet visszavonni.\n\nFolytatja?</string>
   <string name="deleting_account_msg">Fiók törlése\u2026</string>
   <string name="delete_account_failed">Nem lehet törölni a fiókot</string>
+  <string name="mailbox_notify_settings_activity_title">Értesítési beállítások</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Értesítési beállítások (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Mappa értesítési beállítások</string>
+  <string name="label_notification_lights_title">Fények</string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
new file mode 100644
index 000000000..2813e71e4
--- /dev/null
+++ b/res/values-in/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CaynogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="delete_account">Hapus akun</string>
+  <string name="delete_account_confirmation_msg">Ini akan menghapus semua pengaturan dan email dari akun <xliff:g id="account">%s</xliff:g>. Operasi ini tidak dapat dibatalkan.\n\nLanjutkan?</string>
+  <string name="deleting_account_msg">Menghapus akun\u2026</string>
+  <string name="delete_account_failed">Tidak dapat menghapus akun</string>
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 8d76e8eb8..27fd26e71 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Questa operazione cancellerà tutte le impostazioni e le email dell\'account <xliff:g id="account">%s</xliff:g>. Questa operazione è irreversibile.\n\nContinuare?</string>
   <string name="deleting_account_msg">Eliminazione account\u2026</string>
   <string name="delete_account_failed">Impossibile eliminare l\'account</string>
+  <string name="mailbox_notify_settings_activity_title">Opzioni notifica</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opzioni notifica (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Impostazioni notifica cartella</string>
+  <string name="label_notification_lights_title">Luci</string>
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
new file mode 100644
index 000000000..e17b7801a
--- /dev/null
+++ b/res/values-ku/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CaynogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="delete_account">سڕینەوەی هەژمار</string>
+  <string name="delete_account_confirmation_msg">ئەمە هەموو ڕێکخستنەکان و پەیامە ئەلکترۆنیەکانی هەژماری <xliff:g id="account">%s</xliff:g>. ئەسڕیتەوە، ئەم فرمانە ناتوانرێت بگەڕێنرێتەوە.\n\nبەردەوامبوون؟?</string>
+  <string name="deleting_account_msg">سڕینەوەی هەژماری\u2026</string>
+  <string name="delete_account_failed">هەژمار ناتوانرێت بسڕدرێتەوە</string>
+</resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 65dc58dd9..0073d82a5 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -22,20 +22,9 @@
   <string name="permission_access_provider_desc">ڕێگه‌دان به‌ به‌رنامه‌ بۆ چونه‌ناو به‌کارخه‌ری داتای پۆستی ئه‌لیکترۆنی
          داتابه‌یس، که‌ نامه‌ی هاتوو وه‌ ڕۆشتوو وه‌ ناو و تێپه‌ڕه‌وشه‌ی تێدایه‌.</string>
   <string name="app_name">پۆستی ئەلەکترۆنی</string>
-  <string name="debug_title">هەڵەدۆز</string>
   <string name="create_action">دروستکردنی دانه‌یه‌کی نوێ</string>
   <string name="quick_responses_empty_view">هیچ وه‌ڵامێکی خێرا نییه‌.</string>
   <string name="account_settings_action">ڕێکخستنەکانی هەژمار</string>
-  <string name="status_network_error">کێشه‌ی په‌یوه‌ندی.</string>
-  <plurals name="move_messages">
-    <item quantity="one">جوڵانی نامه‌</item>
-    <item quantity="other">جوڵانی نامه‌کان</item>
-  </plurals>
-  <string name="cannot_move_protocol_not_supported_toast">جوڵاندن نه‌گونجاوه‌ بۆ هه‌ژماری POP3</string>
-  <string name="cannot_move_multiple_accounts_toast">ناتوانرێ بجوڵێ له‌به‌ر خۆکاری دیاریکردنی له‌ دوو زیاتر
-        هه‌ژمار.</string>
-  <string name="cannot_move_special_mailboxes_toast">نامه‌کان له‌ ڕه‌شنووس، ده‌رسندوق، وه‌ نێدراوه‌کان ناتوانرێت
-         جوڵان.</string>
   <string name="mailbox_name_display_inbox">نامە هاتووەکان</string>
   <string name="mailbox_name_display_outbox">ده‌رسندوق</string>
   <string name="mailbox_name_display_drafts">ڕه‌شنووسه‌کان</string>
@@ -44,39 +33,19 @@
   <string name="mailbox_name_display_junk">زبڵ</string>
   <string name="mailbox_name_display_starred">ئه‌ستێره‌دار</string>
   <string name="mailbox_name_display_unread">نه‌خوێنراوه‌</string>
-  <string name="account_folder_list_summary_inbox">نامەدان</string>
-  <string name="account_folder_list_summary_starred">ئه‌ستێره‌دار</string>
-  <string name="account_folder_list_summary_drafts">ڕەشنووسەکان</string>
-  <string name="account_folder_list_summary_outbox">سنووقی دەرچوو</string>
+  <string name="debug_title">هەڵەدۆز</string>
   <string name="mailbox_list_account_selector_combined_view">بینینی تێکه‌ڵکراو</string>
   <string name="message_compose_fwd_header_fmt">\n\n-----نامه‌ی بنێڕه‌ت ------\nسه‌ردێڕ:<xliff:g id="subject">%1$s</xliff:g>\nله‌لایه‌ن:<xliff:g id="sender">%2$s</xliff:g>\nبۆ:<xliff:g id="to">%3$s</xliff:g>\nوه‌:<xliff:g id="cc">%4$s</xliff:g>\n</string>
   <string name="message_compose_insert_quick_response_list_title">هاورده‌کردنی وه‌ڵامی خێرا</string>
   <string name="message_compose_insert_quick_response_menu_title">تێخستنی وەڵامی خێرا</string>
   <string name="message_view_attachment_background_load">دانه‌یه‌ک یان زیاتر له‌
          نامه‌ی به‌دواداکه‌وتوو داده‌گیرێت بۆ ناردن.</string>
-  <string name="attachment_not_found">نه‌توانرا هاوپێچی نامه‌که‌ دابگیرێت.</string>
   <string name="message_decode_error">هه‌ڵه‌یه‌ک هه‌یه‌ له‌کاتی هه‌ڵوه‌شاندنی نامه‌که‌.</string>
   <string name="forward_download_failed_ticker">نه‌توانرا به‌دوادوابکه‌وێت دانه‌یه‌ک یان زیاتر.</string>
   <string name="forward_download_failed_title">هاوپێچ به‌دوادانه‌که‌وت</string>
   <string name="login_failed_ticker">
         <xliff:g id="account_name">%s</xliff:g> چوونه‌ژووره‌وه‌ سه‌رکه‌وتوونه‌بوو.</string>
   <string name="login_failed_title">نەتوانرا بچێتەژورەوە</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one"><xliff:g id="size_in_bytes" example="1">%d</xliff:g>B</item>
-    <item quantity="other"><xliff:g id="size_in_bytes" example="279">%d</xliff:g>B</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one"><xliff:g id="size_in_kilobytes" example="1">%d</xliff:g>KB</item>
-    <item quantity="other"><xliff:g id="size_in_kilobytes" example="279">%d</xliff:g>KB</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one"><xliff:g id="size_in_megabytes" example="1">%d</xliff:g>MB</item>
-    <item quantity="other"><xliff:g id="size_in_megabytes" example="279">%d</xliff:g>MB</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one"><xliff:g id="size_in_gigabytes" example="1">%d</xliff:g>GB</item>
-    <item quantity="other"><xliff:g id="size_in_gigabytes" example="279">%d</xliff:g>GB</item>
-  </plurals>
   <string name="account_setup_basics_title">دامه‌زراندنی هه‌ژمار</string>
   <string name="account_setup_basics_headline">هه‌ژماری پۆستی ئه‌لیکترۆنی</string>
   <string name="accounts_welcome">ئه‌توانی هه‌ژماره‌که‌ت دابمه‌زرێنی به‌ چه‌ند هه‌نگاوێک.
@@ -89,8 +58,6 @@
   <string name="account_duplicate_dlg_message_fmt">
         تۆ پێشتر ئه‌م ناوه‌ت به‌کارهێناوه‌ بۆ ئه‌م هه‌ژماره‌<xliff:g id="duplicate">%s</xliff:g>
     </string>
-  <string name="account_password_spaces_error">ئه‌م وشه‌نهێنییه‌ به‌ ده‌ستپێکردن یان کۆتایی هێنان به‌ یه‌کێک یان زیاتر
-        هێمای بۆشایی ده‌بێت. زۆربه‌ی ڕاژه‌کان کارناکه‌ن له‌گه‌ڵ وشه‌ی نهێنی بۆشایی.</string>
   <string name="account_setup_check_settings_retr_info_msg">
     وه‌رگرتنی زانیاری هه‌ژمار\u2026</string>
   <string name="account_setup_check_settings_check_incoming_msg">
@@ -99,18 +66,14 @@
     ڕاستکردنه‌وه‌ی ڕێکخستنی smtp \u2026</string>
   <string name="account_setup_creating_account_msg">
     دروستکردنی هه‌ژمار\u2026</string>
-  <string name="account_setup_names_title">دامه‌زراندنی هه‌ژمار</string>
   <string name="account_setup_names_headline">
         هه‌ژماره‌که‌ت دامه‌زرا و پۆستی ئه‌لیکترۆنی له‌ ڕێگایه‌!</string>
   <string name="account_setup_names_account_name_label">
         ناوێک بۆ هه‌ژماره‌که‌ دابنێ (ئاره‌زوومه‌ندانه‌یه‌)</string>
   <string name="account_setup_names_user_name_label">
         ناوت(له‌ کاتی نامه‌ ڕۆشتن به‌دیده‌کرێت)</string>
-  <string name="account_setup_names_user_name_empty_error">ئه‌م بۆشاییه‌ ناکرێ به‌تاڵ بێت.</string>
-  <string name="account_setup_account_type_title">دامه‌زراندنی هه‌ژمار</string>
   <string name="account_setup_account_type_headline">جۆری هه‌ژمار</string>
   <string name="account_setup_account_type_instructions">چی جۆرێک له‌ هه‌ژمار له‌مه‌دایه‌؟</string>
-  <string name="account_setup_incoming_title">دامه‌زراندنی هه‌ژمار</string>
   <string name="account_setup_incoming_headline">ڕێکخستنی ڕاژه‌ی هاتن</string>
   <string name="account_setup_incoming_security_none_label">هیچیان</string>
   <string name="account_setup_incoming_security_ssl_trust_certificates_label">
@@ -125,14 +88,12 @@
         کاتێک ده‌یسڕمه‌وه‌ له‌ سندوقی نامه‌ هاتووه‌کان</string>
   <string name="account_setup_incoming_imap_path_prefix_label">پێشگری ڕێڕه‌وی IMAP</string>
   <string name="account_setup_incoming_imap_path_prefix_hint">ئاره‌زوومه‌ندانه‌</string>
-  <string name="account_setup_outgoing_title">دامه‌زراندنی هه‌ژمار</string>
   <string name="account_setup_outgoing_headline">ڕێکخستنی ڕاژه‌ی ڕۆشتن</string>
   <string name="account_setup_outgoing_require_login_label">پێویستی به‌ چوونه‌ژووره‌وه‌یه‌</string>
   <string name="account_setup_exchange_select_certificate">دەست نیشان کردن</string>
   <string name="account_setup_exchange_use_certificate">به‌کارهێنانی ناسنامه‌ی ڕاژه‌خواز</string>
   <string name="account_setup_exchange_remove_certificate">لابردن</string>
   <string name="account_setup_exchange_no_certificate">هیچیان</string>
-  <string name="account_setup_options_title">ڕێکخستنەکانی هەژمار</string>
   <string name="account_setup_options_headline">ڕێکخستنی هەژمار</string>
   <string name="account_setup_options_mail_check_frequency_never">هیچکات</string>
   <string name="account_setup_options_mail_check_frequency_push">خۆکارانه‌ (پاڵنان)</string>
@@ -157,7 +118,6 @@
   <string name="account_setup_options_mail_window_all">هه‌موو</string>
   <string name="account_setup_options_mail_window_default">به‌کارهێنانی هه‌ژماری بنێڕه‌تی</string>
   <string name="account_setup_failed_dlg_auth_message">ناو و وشه‌ی نهێنی هه‌ڵه‌یه‌.</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">چونه‌ژوره‌وه‌ هه‌ڵه‌یه‌.\n<xliff:g id="error">%s</xliff:g></string>
   <string name="account_setup_autodiscover_dlg_authfail_title">هه‌ڵه‌ هه‌یه‌ له‌کاتی دامه‌زراندنی هه‌ژمار</string>
   <string name="account_setup_autodiscover_dlg_authfail_message">چه‌سپاندنی ناو، وشه‌ی نهێنی، وه‌ ڕێکخستنی هه‌ژمار ڕاسته‌.</string>
   <string name="account_setup_failed_dlg_certificate_message">نه‌توانرا به‌ سه‌لامه‌تی په‌یوه‌ندی بکرێت به‌ ڕاژه‌وه‌.</string>
@@ -186,8 +146,6 @@
   <string name="account_setup_failed_security_policies_unsupported">
          ئه‌م ڕاژه‌یه‌ پێویستی به‌ خزمه‌تگوزاری پاراستنه‌ که‌ ئه‌ندرۆیده‌که‌ت ناگونجێت،
           که‌ تێیدایه‌:<xliff:g id="error">%s</xliff:g></string>
-  <string name="account_setup_username_uneditable_error">ناتوانی ناوی به‌کارهێنه‌ری هه‌ژماره‌که‌ بگۆڕی.
-         بۆ زیادکردنی هه‌ژمار به‌ ناوێکی تر،تاپ بکه‌ بۆ زیادکردنی هه‌ژمار.</string>
   <string name="disable_admin_warning">ئاگاداربه‌:ناچالاککردنی به‌رنامه‌ی پۆستی ئه‌لیکترۆنی
          بۆ ده‌سته‌ڵاتی ئامێره‌که‌ت هه‌موو پۆسته‌ ئه‌لیکترۆنییه‌کان ده‌سڕێته‌وه‌ که‌ پێویستێتی، وه‌ له‌گه‌ڵ
          پۆسته‌ ئه‌لیکترۆنییه‌کان،په‌یوه‌ندییه‌کان.ڕوداوه‌کانی ڕۆژژمێر، وه‌داتاکانی تر.</string>
@@ -230,13 +188,6 @@
          زانیاری بۆ <xliff:g id="account">%s</xliff:g> ده‌سڕدرێته‌وه‌ له‌ ئامێره‌که‌ت.
          ئه‌توانی بیهێنیه‌ته‌وه‌ به‌ گۆڕینی قوفڵی ڕوونما.ئه‌ته‌وێ بیگۆڕی؟</string>
   <string name="account_settings_exit_server_settings">پاشه‌که‌وتنه‌کردنی گۆڕانه‌کان؟</string>
-  <string name="account_settings_login_dialog_title">نەتوانرا بچێتە ژوورەوە</string>
-  <string name="account_settings_login_dialog_content_fmt">
-         ناوی به‌کارهێنه‌ر و وشه‌ی نهێنی بۆ <xliff:g id="account">%s</xliff:g> هه‌ڵه‌یه‌.
-         ئه‌ته‌وێ نوێیان بکه‌یته‌وه‌؟</string>
-  <string name="account_settings_login_dialog_reason_fmt">
-         چوونه‌ژووره‌وه‌ت بۆ <xliff:g id="account">%s</xliff:g> نه‌کرا؛ ڕاژه‌که‌ ده‌ڵێ: <xliff:g id="reason">%s</xliff:g>
-         ئه‌ته‌وێ ناو و وشه‌ی نهێنی نوێبکه‌یته‌وه‌؟</string>
   <string name="account_settings_background_attachments_label">
         هاوپێچی داگرتن</string>
   <string name="account_settings_background_attachments_summary">
@@ -279,7 +230,6 @@
   <string name="account_settings_sync_calendar_summary">گواستنه‌وه‌ی ڕۆژژمێر و ڕوداوه‌کانی بۆ ئه‌م هه‌ژماره‌</string>
   <string name="account_settings_sync_email_enable">گواستنەوەی پۆستی ئه‌لیکترۆنی</string>
   <string name="account_settings_sync_email_summary">گواستنەوەی پۆستی ئه‌لیکترۆنی لەم هەژمارەوە</string>
-  <string name="account_settings_vibrate_when_label">له‌رینه‌وه‌</string>
   <string name="account_settings_ringtone">هەڵبژاردنی زەنگ</string>
   <string name="account_settings_servers">رێکخستنەکانی سێرڤەر</string>
   <string name="mailbox_settings_activity_title">بەربژاردەکانی هاوکاتسازی</string>
@@ -287,23 +237,11 @@
   <string name="mailbox_settings_sync_enabled_label">گواستنەوەی ئەم بوخچە</string>
   <string name="mailbox_settings_sync_enabled_summary">نامەکان کاتێ پەیوەندی بەسترا دا دەبەزێنرێن</string>
   <string name="mailbox_settings_mailbox_sync_window_label">رۆژەکانی هاوتاکردنی ئیمێڵ</string>
-  <string name="prefDialogTitle_conversationListIcon">وێنەی نێرەر</string>
-  <string name="provider_note_live">تەنها هەندێ لە ئەژمارە (plus)ەکان تایبەتمەندی POP یان هەیە
-        ڕێگە بەم بەرنامەیە دەدا .ئەگەر ناتوانی پێی داخڵ بیت
-        بە ناونیشانی تەواو و وشەی نهێنیەکەتەوە، لەوانەیە ئەژمارێکی 
-        بە پارەت نەبێت، وێبگەڕەکە بکەرەوە بۆ گەیشتن بەم ئەژماری ئیمەیڵانە.</string>
   <string name="provider_note_t_online">پێش دروستکردنی ئەم ئەژمارە ،سەردانی مالپەری T-Online بکەو وشەی نهێنی بۆ POP دروست بکە بۆ گەیشتن بە ئیمەیڵ</string>
-  <string name="exchange_name">هاوبەشی</string>
   <string name="exchange_name_alternate">گواستنه‌وه‌ی گۆڕینه‌وه‌ی مایکرۆسۆفت</string>
   <string name="system_account_create_failed">نەتوانرا ئەژمارەکە دروست بکرێت .دوبارەی بکەوە</string>
   <string name="device_admin_label">پۆستی ئه‌لەکترۆنی</string>
   <string name="device_admin_description">چالاککردنی ڕاژه‌ی دیاریکراو بۆ پارێزگاری پارێزه‌ران</string>
-  <string name="settings_activity_title">ڕێکخستنه‌کان</string>
-  <string name="header_label_general_preferences">ڕێکخستنە گشتییەکان</string>
-  <string name="general_preference_confirm_delete_label">چه‌سپاندن پێش سڕینه‌وه‌</string>
-  <string name="general_preference_confirm_send_label">پشتڕاستکردنەوە لە پێش ناردن</string>
-  <string name="more_than_999">+٩٩٩</string>
-  <string name="search_hint">گەڕانی پۆستی ئه‌لیکترۆنی</string>
   <string name="policy_dont_allow_camera">ڕێگه‌پێنه‌دانی به‌کارهێنانی کامێرای ئامێره‌که‌ت</string>
   <string name="policy_require_password">پێویستی به‌ وشه‌ی نهێنی ئامێره‌</string>
   <string name="policy_password_history">دیاریکردنی وشه‌ی نهێنی دووباره‌ی نوێ</string>
@@ -315,13 +253,7 @@
   <string name="quick_2">ده‌نگ باشه‌ بۆ من!</string>
   <string name="quick_3">من ئه‌مه‌ دواتر ده‌خوێنمه‌وه‌ و ده‌گه‌ڕێمه‌وه‌ بۆ لای تۆ.</string>
   <string name="quick_4">با به‌یه‌کناساندن دابمه‌زرێنین و گفت و گۆی له‌سه‌ربکه‌ین.</string>
-  <string name="require_manual_sync_message">گواستنه‌وه‌ی پشت بۆ ئه‌م هه‌ژماره‌ که‌ له‌کارخراوه‌ له‌کاتی/
-     سوڕاوه‌نه‌یی.</string>
   <string name="confirm_response">ناردنی وه‌ڵام&#8230;</string>
-  <string name="no_conversations">هیچ پەیامێک نیە.</string>
-  <string name="imap_name">IMAP</string>
-  <string name="pop3_name">POP3</string>
-  <string name="folder_picker_title">بوخچه‌گر</string>
   <string name="trash_folder_selection_title">دیاریکردنی زبڵی ڕاژه‌ بۆ بوخچه‌ی <xliff:g id="account">%s</xliff:g></string>
   <string name="sent_folder_selection_title">دیاریکردنی ڕاژه‌ی ناردن بۆ بوخچه‌ی <xliff:g id="account">%s</xliff:g></string>
   <string name="account_waiting_for_folders_msg">نیشاندانی لیستی بوخچه‌کان&#8230;</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index e69dd603c..215863564 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Dës Aktioun läscht all d\'Astellungen an E-Maile vum Kont <xliff:g id="account">%s</xliff:g>. Dat kann net réckgängeg gemaach ginn.\n\nWeidermaachen?</string>
   <string name="deleting_account_msg">Kont gëtt geläscht\u2026</string>
   <string name="delete_account_failed">Kont konnt net geläscht ginn</string>
+  <string name="mailbox_notify_settings_activity_title">Notifikatiounsoptiounen</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Notifikatiounsoptiounen (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Astellunge fir Dossiersnotifikatiounen</string>
+  <string name="label_notification_lights_title">Beliichtung</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index c77f2c1ca..081b2ab81 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -20,18 +20,9 @@
   <string name="permission_access_provider_label">Op Date vum E-Mail-Provider zougräifen</string>
   <string name="permission_access_provider_desc">Erlaabt der App, op deng E-Mail-Datebank zouzegräifen, inklusiv empfaange Messagen, geschéckt Messagen, Benotzernimm a Passwierder.</string>
   <string name="app_name">E-Mail</string>
-  <string name="debug_title">Debuggen</string>
   <string name="create_action">Nei erstellen</string>
   <string name="quick_responses_empty_view">Keng séier Äntwerten.</string>
   <string name="account_settings_action">Kontenastellungen</string>
-  <string name="status_network_error">Connectiounsproblem.</string>
-  <plurals name="move_messages">
-    <item quantity="one">Message réckelen</item>
-    <item quantity="other">Messagë réckelen</item>
-  </plurals>
-  <string name="cannot_move_protocol_not_supported_toast">Réckelen gëtt op POP3-Konten net ënnerstëtzt.</string>
-  <string name="cannot_move_multiple_accounts_toast">Kann net réckele well d\'Auswiel verschidde Konten huet.</string>
-  <string name="cannot_move_special_mailboxes_toast">Messagen an den Dossieren \"Brouillonen\", \"Ausgank\" a \"verschéckt Elementer\" kënnen net geréckelt ginn.</string>
   <string name="mailbox_name_display_inbox">Agank</string>
   <string name="mailbox_name_display_outbox">Ausgank</string>
   <string name="mailbox_name_display_drafts">Brouillonen</string>
@@ -40,37 +31,17 @@
   <string name="mailbox_name_display_junk">Knascht</string>
   <string name="mailbox_name_display_starred">Markéiert</string>
   <string name="mailbox_name_display_unread">Ongelies</string>
-  <string name="account_folder_list_summary_inbox">Agank</string>
-  <string name="account_folder_list_summary_starred">Markéiert</string>
-  <string name="account_folder_list_summary_drafts">Brouillonen</string>
-  <string name="account_folder_list_summary_outbox">Ausgank</string>
+  <string name="debug_title">Debuggen</string>
   <string name="mailbox_list_account_selector_combined_view">Kombinéiert Usiicht</string>
   <string name="message_compose_fwd_header_fmt">\n\n-------- Original-Message --------\nSujet: <xliff:g id="subject">%1$s</xliff:g>\nVun: <xliff:g id="sender">%2$s</xliff:g>\nUn: <xliff:g id="to">%3$s</xliff:g>\nCC: <xliff:g id="cc">%4$s</xliff:g>\n\n</string>
   <string name="message_compose_insert_quick_response_list_title">Séier Äntwert asetzen</string>
   <string name="message_compose_insert_quick_response_menu_title">Séier Äntwert asetzen</string>
   <string name="message_view_attachment_background_load">Een oder méi Unhäng an dengem weidergeleete Message gi virum Verschécken erofgelueden.</string>
-  <string name="attachment_not_found">Konnt den Unhang net eroflueden.</string>
   <string name="message_decode_error">Et gouf e Feeler beim decodéiere vum Message.</string>
   <string name="forward_download_failed_ticker">Kann een oder méi Unhäng net weiderleeden.</string>
   <string name="forward_download_failed_title">Unhang net weidergeleet</string>
   <string name="login_failed_ticker">Alogge mat <xliff:g id="account_name">%s</xliff:g> feelgeschloen.</string>
   <string name="login_failed_title">Alogge war net méiglech</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="one"><xliff:g id="size_in_bytes" example="1">%d</xliff:g>B</item>
-    <item quantity="other"><xliff:g id="size_in_bytes" example="279">%d</xliff:g>B</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="one"><xliff:g id="size_in_kilobytes" example="1">%d</xliff:g> kB</item>
-    <item quantity="other"><xliff:g id="size_in_kilobytes" example="279">%d</xliff:g> kB</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="one"><xliff:g id="size_in_megabytes" example="1">%d</xliff:g> MB</item>
-    <item quantity="other"><xliff:g id="size_in_megabytes" example="279">%d</xliff:g> MB</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="one"><xliff:g id="size_in_gigabytes" example="1">%d</xliff:g> GB</item>
-    <item quantity="other"><xliff:g id="size_in_gigabytes" example="279">%d</xliff:g> GB</item>
-  </plurals>
   <string name="account_setup_basics_title">Kontenariichtung</string>
   <string name="oauth_authentication_title">Autoriséierung gëtt ugefrot</string>
   <string name="sign_in_title">Aloggen</string>
@@ -92,22 +63,17 @@
   <string name="account_setup_username_password_toast">Gëff eng gëlteg E-Mail-Adress an e gëltegt Passwuert an.</string>
   <string name="account_duplicate_dlg_title">Kont duplizéieren</string>
   <string name="account_duplicate_dlg_message_fmt">Du benotz dëse Benotzernumm scho fir de Kont \"<xliff:g id="duplicate">%s</xliff:g>\".</string>
-  <string name="account_password_spaces_error">D\'Passwuert fänkt un oder hält op mat engem oder méi Espacen. Vill Serveren ënnerstëtze Passwierder mat Espacen net.</string>
   <string name="account_setup_check_settings_retr_info_msg">Kontendate ginn ausgelies\u2026</string>
   <string name="account_setup_check_settings_check_incoming_msg">D\'Serverastellunge gi validéiert\u2026</string>
   <string name="account_setup_check_settings_check_outgoing_msg">D\'SMTP-Astellunge gi validéiert\u2026</string>
   <string name="account_setup_creating_account_msg">Kont gëtt erstallt\u2026</string>
   <string name="account_setup_ab_headline">Kontentyp bestätegen</string>
   <string name="account_setup_ab_instructions_format">Du hues uginn datt <xliff:g id="email">%1$s</xliff:g> <xliff:g id="userProtocol">%2$s</xliff:g> benotzt, mä de Kont kéint <xliff:g id="providerProtocol">%3$s</xliff:g> benotzen</string>
-  <string name="account_setup_names_title">Kontenariichtung</string>
   <string name="account_setup_names_headline">Däi Kont ass konfiguréiert an d\'Emaile sinn ënnerwee!</string>
   <string name="account_setup_names_account_name_label">Gëff dësem Kont en Numm (optional)</string>
   <string name="account_setup_names_user_name_label">Däin Numm (gëtt op erausgoend Messagen ugewisen)</string>
-  <string name="account_setup_names_user_name_empty_error">Dëst Feld kann net eidel sinn.</string>
-  <string name="account_setup_account_type_title">Kontenariichtung</string>
   <string name="account_setup_account_type_headline">Kontentyp</string>
   <string name="account_setup_account_type_instructions">Ëm wéi en Typ Kont handelt et sech?</string>
-  <string name="account_setup_incoming_title">Kontenariichtung</string>
   <string name="account_setup_incoming_headline">Astellunge fir den erakommende Server</string>
   <string name="account_setup_incoming_username_label">BENOTZERNUMM</string>
   <string name="account_setup_incoming_password_label">PASSWUERT</string>
@@ -127,21 +93,18 @@
   <string name="account_setup_incoming_delete_policy_delete_label">Wann ech aus dem Agank läschen</string>
   <string name="account_setup_incoming_imap_path_prefix_label">Prefix vum IMAP-Path</string>
   <string name="account_setup_incoming_imap_path_prefix_hint">Optional</string>
-  <string name="account_setup_outgoing_title">Kontenariichtung</string>
   <string name="account_setup_outgoing_headline">Astellunge fir den erausgoende Server</string>
   <string name="account_setup_outgoing_smtp_server_label">SMTP-SERVER</string>
   <string name="account_setup_outgoing_port_label">PORT</string>
   <string name="account_setup_outgoing_security_label">SÉCHERHEETSTYP</string>
   <string name="account_setup_outgoing_require_login_label">Alogge verlaangen</string>
   <string name="account_setup_outgoing_username_label">BENOTZERNUMM</string>
-  <string name="account_setup_outgoing_password_label">PASSWUERT</string>
   <string name="account_setup_exchange_certificate_title">CLIENT-ZERTIFIKAT</string>
   <string name="account_setup_exchange_select_certificate">Auswielen</string>
   <string name="account_setup_exchange_use_certificate">Clientszertifikat benotzen</string>
   <string name="account_setup_exchange_remove_certificate">Ewechhuelen</string>
   <string name="account_setup_exchange_no_certificate">Keen</string>
   <string name="account_setup_exchange_device_id_label">ID VUM MOBILEN APPARAT</string>
-  <string name="account_setup_options_title">Kontenastellungen</string>
   <string name="account_setup_options_headline">Kontenoptiounen</string>
   <string name="account_setup_options_mail_check_frequency_label">Sync-Frequenz:</string>
   <string name="account_setup_options_mail_check_frequency_never">Ni</string>
@@ -167,7 +130,6 @@
   <string name="account_setup_options_mail_window_all">All</string>
   <string name="account_setup_options_mail_window_default">Standardwäerter fir dëse Kont benotzen</string>
   <string name="account_setup_failed_dlg_auth_message">De Benotzernumm oder d\'Passwuert sinn net korrekt.</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Alogge feelgeschloen.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_autodiscover_dlg_authfail_title">Problem mat der Konfiguratioun vum Kont</string>
   <string name="account_setup_autodiscover_dlg_authfail_message">Bestäteg datt de Benotzernumm, d\'Passwuert an d\'Kontenastellunge korrekt sinn.</string>
   <string name="account_setup_failed_dlg_certificate_message">Ka keng sécher Connectioun mam Server hierstellen.</string>
@@ -186,7 +148,6 @@
   <string name="account_setup_security_required_title">Sécherheetsverwaltung op Distanz</string>
   <string name="account_setup_security_policies_required_fmt">De Server <xliff:g id="server">%s</xliff:g> verlaangt datt s du him erlaabs op Distanz eng Rei Sécherheetsfunktiounen op dengem Android-Apparat ze kontrolléieren. Wëlls du dëse Kont fäerdeg astellen?</string>
   <string name="account_setup_failed_security_policies_unsupported">De Server verlaangt Sécherheetsfunktiounen déi däin Android-Apparat net ënnerstëtzt, dorënner: <xliff:g id="error">%s</xliff:g></string>
-  <string name="account_setup_username_uneditable_error">Du kanns de Benotzernumm vun engem Kont net änneren. Dréck \"Kont dobäisetzen\" fir en neie Kont mat engem anere Benotzernumm dobäizesetzen.</string>
   <string name="disable_admin_warning">WARNUNG: Wann s du d\'Berechtegung vun der E-Mail-App fir d\'Verwaltung vum Apparat desaktivéiers, ginn all d\'E-Mail-Konten déi dës Berechtegung brauche geläscht - mat allen E-Mailen, Kontakter, Rendezvousen an aneren Daten.</string>
   <string name="account_security_dialog_title">Sécherheetsaktualiséierung</string>
   <string name="account_security_dialog_content_fmt">De Kont <xliff:g id="account">%s</xliff:g> verlaangt datt s de deng Sécherheetsastellungen aktualiséiers.</string>
@@ -208,10 +169,6 @@
   <string name="password_expired_dialog_title">Passwuert vum Spärschierm ofgelaf</string>
   <string name="password_expired_dialog_content_fmt">D\'Date fir <xliff:g id="account">%s</xliff:g> gi vum Apparat geläscht. Du kanns s\'erëmhierstellen andeem s du däi Spärschierm-PIN oder -Passwuert änners. Wëlls du en/et elo änneren?</string>
   <string name="account_settings_exit_server_settings">Ongespäichert Ännerunge verwerfen?</string>
-  <string name="account_settings_login_dialog_title">Alogge war net méiglech</string>
-  <string name="account_settings_login_dialog_content_fmt">De Benotzernumm oder d\'Passwuert fir <xliff:g id="account">%s</xliff:g> sinn inkorrekt. Wëlls du s\'elo aktualiséieren?</string>
-  <string name="account_settings_login_dialog_reason_fmt">Deng Umellung bei <xliff:g id="account">%s</xliff:g> ass feelgeschloen; de Server seet: <xliff:g id="reason">%s</xliff:g>
-Wëlls du däi Benotzernumm an/oder däi Passwuert aktualiséieren?</string>
   <string name="account_settings_background_attachments_label">Unhäng eroflueden</string>
   <string name="account_settings_background_attachments_summary">Unhäng fir rezent Messagë bei aktiver WLAN-Connectioun automatesch eroflueden</string>
   <string name="account_settings_notify_label">E-Mail-Notifikatiounen</string>
@@ -250,7 +207,6 @@ Wëlls du däi Benotzernumm an/oder däi Passwuert aktualiséieren?</string>
   <string name="account_settings_sync_calendar_summary">Kalenner-Rendezvouse fir dëse Kont synchroniséieren</string>
   <string name="account_settings_sync_email_enable">E-Mail synchroniséieren</string>
   <string name="account_settings_sync_email_summary">E-Maile vum Kont synchroniséieren</string>
-  <string name="account_settings_vibrate_when_label">Vibréieren</string>
   <string name="account_settings_ringtone">Schelltoun auswielen</string>
   <string name="account_settings_servers">Serverastellungen</string>
   <string name="mailbox_settings_activity_title">Sync-Optiounen</string>
@@ -258,20 +214,11 @@ Wëlls du däi Benotzernumm an/oder däi Passwuert aktualiséieren?</string>
   <string name="mailbox_settings_sync_enabled_label">Dësen Dossier synchroniséieren</string>
   <string name="mailbox_settings_sync_enabled_summary">Bei enger aktiver Connectioun ginn d\'Messagen erofgelueden</string>
   <string name="mailbox_settings_mailbox_sync_window_label">Deeg fir déi synchroniséiert soll ginn</string>
-  <string name="prefDialogTitle_conversationListIcon">Ofsenderbild</string>
-  <string name="provider_note_live">Just e puer \"Plus\"-Konten erlabe POP-Zougrëff wouduerch dëse Programm drop zougräife kann. Wann s du dech net mat denger korrekter E-Mail-Adress an dengem Passwuert kanns umellen, dann hues du méiglecherweis kee bezuelte \"Plus\"-Kont. Féier däi Web-Browser aus fir Zougrëff op deng E-Mail-Konten ze kréien.</string>
   <string name="provider_note_t_online">Stell op der T-Online-Internetsäit e Passwuert fir POP3-Zougank an, ier s de den E-Mail-Kont erstells.</string>
-  <string name="exchange_name">Firma</string>
   <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
   <string name="system_account_create_failed">Konnt de Kont net erstellen. Probéier nees.</string>
   <string name="device_admin_label">E-Mail</string>
   <string name="device_admin_description">Aktivéiert serverspezifesch Sécherheetsrichtlinnen</string>
-  <string name="settings_activity_title">Astellungen</string>
-  <string name="header_label_general_preferences">Allgemeng Astellungen</string>
-  <string name="general_preference_confirm_delete_label">Virum Läsche bestätegen</string>
-  <string name="general_preference_confirm_send_label">Virum Schécke bestätegen</string>
-  <string name="more_than_999">999+</string>
-  <string name="search_hint">E-Mail sichen</string>
   <string name="policy_dont_allow_camera">D\'Benotzung vun der Kamera net erlaben</string>
   <string name="policy_require_password">Passwuert vum Apparat erfuerderlech</string>
   <string name="policy_password_history">Asaz vun de leschte Passwierder aschränken</string>
@@ -283,12 +230,7 @@ Wëlls du däi Benotzernumm an/oder däi Passwuert aktualiséieren?</string>
   <string name="quick_2">Kléngt gutt fir mech!</string>
   <string name="quick_3">Ech liesen dat méi spéit a kommen op dech zréck.</string>
   <string name="quick_4">Looss eis e Rendezvous festleeë fir dat ze diskutéieren.</string>
-  <string name="require_manual_sync_message">Hannergrondsynchroniséierung ass fir dëse Kont während dem Roaming desaktivéiert.</string>
   <string name="confirm_response">Äntwert gëtt geschéckt&#8230;</string>
-  <string name="no_conversations">Keng Messagen.</string>
-  <string name="imap_name">IMAP</string>
-  <string name="pop3_name">POP3</string>
-  <string name="folder_picker_title">Dossiersauswiel</string>
   <string name="trash_folder_selection_title">Wiel de Poubellesdossier fir <xliff:g id="account">%s</xliff:g> aus</string>
   <string name="sent_folder_selection_title">Dossier \"Verschéckt Elementer\" vum Server fir <xliff:g id="ACCOUNT">%s</xliff:g> auswielen</string>
   <string name="account_waiting_for_folders_msg">D\'Lëscht vun den Dossiere gëtt gelueden&#8230;</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index ef84346eb..2be046337 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Bus ištrinti visi <xliff:g id="account">%s</xliff:g> paskyros nustatymai ir el. laiškai. Ši operacija negali būti atšaukta.\n\nTęsti?</string>
   <string name="deleting_account_msg">Paskyra ištrinama\u2026</string>
   <string name="delete_account_failed">Nepavyko ištrinti paskyros</string>
+  <string name="mailbox_notify_settings_activity_title">Pranešimo parinktys</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Pranešimo parinktys (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Aplanko pranešimo nustatymai</string>
+  <string name="label_notification_lights_title">Šviesos</string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 58cfe59f3..f599337b8 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Dit zal alle instellingen en berichten van account <xliff:g id="account">%s</xliff:g> verwijderen. Deze actie kan niet ongedaan worden gemaakt.\n\nDoorgaan?</string>
   <string name="deleting_account_msg">Account verwijderen\u2026</string>
   <string name="delete_account_failed">Kan account niet verwijderen</string>
+  <string name="mailbox_notify_settings_activity_title">Instellingen meldingen</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Instellingen meldingen (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Instellingen mapmeldingen</string>
+  <string name="label_notification_lights_title">Meldingsled</string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 9596be661..d5618739d 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Zostaną usunięte wszystkie ustawienia i e-maile konta <xliff:g id="account">%s</xliff:g>. Ta operacja nie może zostać cofnięta.\n\nKontynuować?</string>
   <string name="deleting_account_msg">Usuwanie konta\u2026</string>
   <string name="delete_account_failed">Nie można usunąć konta</string>
+  <string name="mailbox_notify_settings_activity_title">Opcje powiadomień</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcje powiadomień (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Ustawienia folderów powiadomień</string>
+  <string name="label_notification_lights_title">Dioda powiadomień</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index fd1fd6e34..5b8fb2650 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Isto apagará todas as configurações e e-mails da conta <xliff:g id="account">%s</xliff:g>. Esta operação não pode ser desfeita.\n\nDeseja continuar?</string>
   <string name="deleting_account_msg">Apagando a conta\u2026</string>
   <string name="delete_account_failed">Não foi possível apagar a conta</string>
+  <string name="mailbox_notify_settings_activity_title">Opções de notificação</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opções de notificação (<xliff:g id="mailbox_name" example="Familia">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Configurações de notificação de pasta</string>
+  <string name="label_notification_lights_title">Luzes</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index ec4c8dc91..84d27c07f 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Vai apagar todas as definiçoes e e-mails da conta <xliff:g id="account">%s</xliff:g>. Esta operação não pode ser desfeita.\n\nContinuar?</string>
   <string name="deleting_account_msg">A apagar a conta\u2026</string>
   <string name="delete_account_failed">Não foi possível apagar a conta</string>
+  <string name="mailbox_notify_settings_activity_title">Opções de notificação</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opções de notificação (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Definições de notificação da pasta</string>
+  <string name="label_notification_lights_title">Luzes</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 77c56670e..3738150af 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Это действие удалит все настройки и письма аккаунта «<xliff:g id="account">%s</xliff:g>». Эта операция не может быть отменена.\n\nПродолжить?</string>
   <string name="deleting_account_msg">Удаление аккаунта\u2026</string>
   <string name="delete_account_failed">Не удалось удалить аккаунт</string>
+  <string name="mailbox_notify_settings_activity_title">Уведомления</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Уведомления (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Уведомления для папок</string>
+  <string name="label_notification_lights_title">Индикатор событий</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index bbaacb9e5..927dd395d 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Vymažú sa všetky nastavenia a e-maily účtu <xliff:g id="account">%s</xliff:g>. Túto operáciu nemožno vrátiť späť.\n\nPokračovať?</string>
   <string name="deleting_account_msg">Vymazávanie účtu\u2026</string>
   <string name="delete_account_failed">Nemožno vymazať účet</string>
+  <string name="mailbox_notify_settings_activity_title">Možnosti oznámenia</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Možnosti oznámení (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Nastavenia oznámení priečinkov</string>
+  <string name="label_notification_lights_title">Svetlá</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
new file mode 100644
index 000000000..5b8d52d03
--- /dev/null
+++ b/res/values-th/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CaynogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="delete_account">ลบบัญชีผู้ใช้</string>
+  <string name="delete_account_confirmation_msg">นี่จะลบการตั้งค่าและอีเมลทั้งหมดของบัญชี <xliff:g id="account">%s</xliff:g> การกระทำนี้ไม่สาราถรยกเลิกได้ \n\nดำเนินการต่อ?</string>
+  <string name="deleting_account_msg">กำลังลบบัญชีผู้ใช้\u2026</string>
+  <string name="delete_account_failed">ไม่สามารถลบบัญชีผู้ใช้ได้</string>
+  <string name="mailbox_notify_settings_activity_title">ตัวเลือกการแจ้งเตือน</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">ตัวเลือกการแจ้งเตือน (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">ตั้งค่าการแจ้งเตือนโฟลเดอร์</string>
+  <string name="label_notification_lights_title">แสง</string>
+</resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index a0ec9e238..27e8b0a50 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -20,17 +20,9 @@
   <string name="permission_access_provider_label">تورخەت تەمىنلىگۈچى سانلىق مەلۇماتىنى زىيارەت</string>
   <string name="permission_access_provider_desc">بۇ ئەپنىڭ تورخەت ساندانىنى زىيارەت قىلىشقا يول قويىدۇ، قوبۇللىغان، يوللىغان تورخەتلەر، ئىشلەتكۈچى ئاتى ۋە ئىمنى ئۆز ئىچىگە ئالىدۇ.</string>
   <string name="app_name">تورخەت</string>
-  <string name="debug_title">سازلا</string>
   <string name="create_action">يېڭىدىن قۇر</string>
   <string name="quick_responses_empty_view">تېز جاۋاب يوق.</string>
   <string name="account_settings_action">ھېسابات تەڭشەكلەر</string>
-  <string name="status_network_error">باغلىنىش مەسىلىسى.</string>
-  <plurals name="move_messages">
-    <item quantity="other">ئۇچۇر يۆتكە</item>
-  </plurals>
-  <string name="cannot_move_protocol_not_supported_toast">POP3 ھېساباتى يۆتكەشنى قوللىمايدۇ.</string>
-  <string name="cannot_move_multiple_accounts_toast">يۆتكىيەلمەيدۇ چۈنكى تاللانغان مەزمۇن كۆپ ھېساباتنىڭ تورخەتلىرىنى ئۆز ئىچىگە ئالىدۇ.</string>
-  <string name="cannot_move_special_mailboxes_toast">دەسلەپكى نۇسخا، يوللاش ساندۇقى ۋە ئەۋەتكەن خەتلەردىكى تورخەتلەرنى يۆتكىيەلمەيدۇ.</string>
   <string name="mailbox_name_display_inbox">قوبۇللاش ساندۇقى</string>
   <string name="mailbox_name_display_outbox">يوللاش ساندۇقى</string>
   <string name="mailbox_name_display_drafts">دەسلەپكى نۇسخا</string>
@@ -39,33 +31,17 @@
   <string name="mailbox_name_display_junk">ئەخلەت</string>
   <string name="mailbox_name_display_starred">يۇلتۇزلۇق</string>
   <string name="mailbox_name_display_unread">ئوقۇلمىغان</string>
-  <string name="account_folder_list_summary_inbox">قوبۇللاش ساندۇقى</string>
-  <string name="account_folder_list_summary_starred">يۇلتۇزلۇق</string>
-  <string name="account_folder_list_summary_drafts">دەسلەپكى نۇسخا</string>
-  <string name="account_folder_list_summary_outbox">يوللاش ساندۇقى</string>
+  <string name="debug_title">سازلا</string>
   <string name="mailbox_list_account_selector_combined_view">بىرلەشمە كۆرۈنۈش</string>
   <string name="message_compose_fwd_header_fmt">\n\n-------- ئەسلى ئۇچۇر --------\nتېما: <xliff:g id="SUBJECT">%1$s</xliff:g>\nيوللىغۇچى: <xliff:g id="SENDER">%2$s</xliff:g>\nقوبۇللىغۇچى: <xliff:g id="TO">%3$s</xliff:g>\nكۆچۈرۈپ يوللانغۇچى: <xliff:g id="CC_0">%4$s</xliff:g>\n\n</string>
   <string name="message_compose_insert_quick_response_list_title">تېز جاۋاب قىستۇر</string>
   <string name="message_compose_insert_quick_response_menu_title">تېز جاۋاب قىستۇر</string>
   <string name="message_view_attachment_background_load">ئۇلاپ يوللايدىغان تورخېتىڭىزدە بىر ياكى بىر قانچە قوشۇمچە توردىن چۈشۈرۈلۈپ ئاندىن يوللىنىدۇ.</string>
-  <string name="attachment_not_found">قوشۇمچىنى چۈشۈرەلمەيدۇ.</string>
   <string name="message_decode_error">خەت كودىنى يېشىۋاتقاندا خاتالىق كۆرۈلدى.</string>
   <string name="forward_download_failed_ticker">بىر ياكى بىر قانچە قوشۇمچىنى ئۇلاپ يوللىيالمايدۇ.</string>
   <string name="forward_download_failed_title">قوشۇمچە ئۇلاپ يوللانمىدى</string>
   <string name="login_failed_ticker"><xliff:g id="ACCOUNT_NAME">%s</xliff:g> تىزىمغا كىرەلمىدى.</string>
   <string name="login_failed_title">تىزىمغا كىرەلمىدى</string>
-  <plurals name="message_view_attachment_bytes">
-    <item quantity="other"><xliff:g id="SIZE_IN_BYTES">%d</xliff:g>B</item>
-  </plurals>
-  <plurals name="message_view_attachment_kilobytes">
-    <item quantity="other"><xliff:g id="SIZE_IN_KILOBYTES">%d</xliff:g>KB</item>
-  </plurals>
-  <plurals name="message_view_attachment_megabytes">
-    <item quantity="other"><xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB</item>
-  </plurals>
-  <plurals name="message_view_attachment_gigabytes">
-    <item quantity="other"><xliff:g id="SIZE_IN_GIGABYTES">%d</xliff:g>GB</item>
-  </plurals>
   <string name="account_setup_basics_title">ھېسابات تەڭشەك</string>
   <string name="account_setup_basics_headline">تورخەت ھېسابات</string>
   <string name="accounts_welcome">سىز بىر قانچە قەدەم ئىجرا قىلىپلا ھېساباتىڭىزنى تەڭشىيەلەيسىز.</string>
@@ -74,20 +50,15 @@
   <string name="account_setup_username_password_toast">ئىناۋەتلىك تورخەت ئادرېسى ۋە ئىم كىرگۈزۈڭ.</string>
   <string name="account_duplicate_dlg_title">تەكرار ھېسابات</string>
   <string name="account_duplicate_dlg_message_fmt">\"<xliff:g id="DUPLICATE">%s</xliff:g>\" ھېسابات ئۈچۈن بۇ ئىشلەتكۈچى ئاتىنى ئىشلەتتىڭىز.</string>
-  <string name="account_password_spaces_error">بۇ ئىمنىڭ باش ياكى ئاخىرىدا بىر ياكى بىر قانچە بوشلۇق بار. كۆپ قىسىم مۇلازىمېتىرلار بوشلۇق بار ئىمنى قوللىمايدۇ.</string>
   <string name="account_setup_check_settings_retr_info_msg">ھېسابات ئۇچۇرىنى ئىزدەۋاتىدۇ…</string>
   <string name="account_setup_check_settings_check_incoming_msg">مۇلازىمېتىر تەڭشەكلىرىنى دەلىللەۋاتىدۇ…</string>
   <string name="account_setup_check_settings_check_outgoing_msg">\"smtp تەڭشەكلىرىنى دەلىللەۋاتىدۇ…\"</string>
   <string name="account_setup_creating_account_msg">ھېسابات قۇرۇۋاتىدۇ…</string>
-  <string name="account_setup_names_title">ھېسابات تەڭشەك</string>
   <string name="account_setup_names_headline">ھېساباتىڭىز تەڭشەلدى، تورخەتنى ئىشلەتسىڭىز بولىدۇ!</string>
   <string name="account_setup_names_account_name_label">بۇ ھېساباتقا ئات قويۇش (تاللاشچان)</string>
   <string name="account_setup_names_user_name_label">ئاتىڭىز(يوللىغان تورخەتتە كۆرۈنىدۇ)</string>
-  <string name="account_setup_names_user_name_empty_error">بۇ سۆز بۆلىكى بوش قالمايدۇ.</string>
-  <string name="account_setup_account_type_title">ھېسابات تەڭشەك</string>
   <string name="account_setup_account_type_headline">ھېسابات تىپى</string>
   <string name="account_setup_account_type_instructions">بۇ قانداق تۈردىكى ھېسابات؟</string>
-  <string name="account_setup_incoming_title">ھېسابات تەڭشەك</string>
   <string name="account_setup_incoming_headline">قوبۇللاش مۇلازىمېتىر تەڭشىكى</string>
   <string name="account_setup_incoming_security_none_label">يوق</string>
   <string name="account_setup_incoming_security_ssl_trust_certificates_label">SSL/TLS (ھەممە گۇۋاھنامىگە يول قوي)</string>
@@ -99,14 +70,12 @@
   <string name="account_setup_incoming_delete_policy_delete_label">قوبۇللاش ساندۇقىدىن ئۆچۈرگەندە</string>
   <string name="account_setup_incoming_imap_path_prefix_label">IMAP يولى ئالدى قوشۇلغۇچى</string>
   <string name="account_setup_incoming_imap_path_prefix_hint">تاللاشچان</string>
-  <string name="account_setup_outgoing_title">ھېسابات تەڭشەك</string>
   <string name="account_setup_outgoing_headline">يوللاش مۇلازىمېتىر تەڭشىكى</string>
   <string name="account_setup_outgoing_require_login_label">تىزىمغا كىرىش زۆرۈر</string>
   <string name="account_setup_exchange_select_certificate">تاللاڭ</string>
   <string name="account_setup_exchange_use_certificate">خېرىدار گۇۋاھنامىسى ئىشلەت</string>
   <string name="account_setup_exchange_remove_certificate">چىقىرىۋەت</string>
   <string name="account_setup_exchange_no_certificate">يوق</string>
-  <string name="account_setup_options_title">ھېسابات تەڭشەكلەر</string>
   <string name="account_setup_options_headline">ھېسابات تاللانما</string>
   <string name="account_setup_options_mail_check_frequency_never">ھەرگىز</string>
   <string name="account_setup_options_mail_check_frequency_push">ئاپتوماتىك (ئىتتىرىش)</string>
@@ -130,7 +99,6 @@
   <string name="account_setup_options_mail_window_all">ھەممىسى</string>
   <string name="account_setup_options_mail_window_default">ھېساباتنىڭ كۆڭۈلدىكى تەڭشىكىنى ئىشلەت</string>
   <string name="account_setup_failed_dlg_auth_message">ئىشلەتكۈچى ئاتىڭىز ياكى ئىمىڭىز ناتوغرا.</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">تىزىمغا كىرەلمىدى:\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
   <string name="account_setup_autodiscover_dlg_authfail_title">ھېسابات سەپلەش مەسىلىسى</string>
   <string name="account_setup_autodiscover_dlg_authfail_message">ئىشلەتكۈچى ئىسمى، ئىم ۋە ھېسابات تەڭشەكلىرىنىڭ توغرىلىقىنى جەزملەڭ.</string>
   <string name="account_setup_failed_dlg_certificate_message">مۇلازىمېتىرغا بىخەتەر باغلىنالمايدۇ.</string>
@@ -149,7 +117,6 @@
   <string name="account_setup_security_required_title">يىراقتىكى بىخەتەرلىك باشقۇرۇش</string>
   <string name="account_setup_security_policies_required_fmt">بۇ <xliff:g id="SERVER">%s</xliff:g> مۇلازىمېتىر ئاندىرويىد ئۈسكۈنىدىكى بەزى بىخەتەرلىك ئىقتىدارلىرىنى يىراقتىن باشقۇرۇشقا يول قويۇشنى تەلەپ قىلىدۇ. بۇ ھېساباتنىڭ تەڭشىكىنى تاماملامسىز؟</string>
   <string name="account_setup_failed_security_policies_unsupported">سىزنىڭ ئاندىرويىد ئۈسكۈنىڭىز بۇ مۇلازىمېتىر تەلەپ قىلغان بىخەتەرلىك ئىقتىدارىنى قوللىمايدۇ، ئۇنىڭ ئىچىدە: <xliff:g id="ERROR">%s</xliff:g></string>
-  <string name="account_setup_username_uneditable_error">ھېساباتنىڭ ئىشلەتكۈچى ئاتىنى ئۆزگەرتەلمەيسىز. باشقا ئاتتىكى ئىشلەتكۈچى ھېساباتى قوشۇشتا، ھېسابات قوشنى چېكىڭ.</string>
   <string name="disable_admin_warning">ئاگاھلاندۇرۇش: تورخەت ئەپ دەلىللەشنىڭ ئۈسكۈنىڭىزنى باشقۇرۇش ھوقۇقىنى بىكار قىلسىڭىز، بۇ ھوقۇققا ئېھتىياجلىق بارلىق تورخەت ھېساباتى ۋە شۇ ھېساباتتىكى تورخەت، ئالاقەداشلار، يىلنامە پائالىيىتى ۋە باشقا ئۇچۇرلارنىڭ ھەممىسى ئۆچۈرۈلىدۇ.</string>
   <string name="account_security_dialog_title">بىخەتەرلىك يېڭىلانمىسى</string>
   <string name="account_security_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> بىخەتەرلىك تەڭشىكىڭىزنى يېڭىلىشىڭىزنى تەلەپ قىلىدۇ.</string>
@@ -171,9 +138,6 @@
   <string name="password_expired_dialog_title">ئېكران قۇلۇپلاش ئىمنىڭ ۋاقتى ئۆتتى.</string>
   <string name="password_expired_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> نىڭ سانلىق مەلۇماتى ئۈسكۈنىڭىزدىن ئۆچۈرۈلدى. سىز ئېكران قۇلۇپلاش PIN ياكى ئىمنى ئۆزگەرتىپ بۇ سانلىق مەلۇماتلارنى ئەسلىگە كەلتۈرەلەيسىز. ھازىرلا ئۆزگەرتەمسىز؟</string>
   <string name="account_settings_exit_server_settings">ساقلىمىغان ئۆزگەرتىشلەرنى تاشلىۋېتەمدۇ؟</string>
-  <string name="account_settings_login_dialog_title">تىزىمغا كىرەلمىدى</string>
-  <string name="account_settings_login_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> نىڭ ئىشلەتكۈچى ئاتى ياكى ئىم خاتا. دەرھال يېڭىلامسىز؟</string>
-  <string name="account_settings_login_dialog_reason_fmt">سىز <xliff:g id="ACCOUNT">%s</xliff:g> تىزىمغا كىرەلمىدىڭىز؛ مۇلازىمېتىر ئەسكەرتىشى: <xliff:g id="REASON">%s</xliff:g> ئىشلەتكۈچى ئاتى ۋە ياكى ئىمنى يېڭىلامسىز؟</string>
   <string name="account_settings_background_attachments_label">قوشۇمچىلارنى چۈشۈر</string>
   <string name="account_settings_background_attachments_summary">يېقىنقى خەت ۋە قوشۇمچىلارنى Wi-Fi ئارقىلىق ئۆزلۈكىدىن چۈشۈرىدۇ</string>
   <string name="account_settings_notify_label">تورخەت ئۇقتۇرۇشى</string>
@@ -212,7 +176,6 @@
   <string name="account_settings_sync_calendar_summary">بۇ ھېساباتنىڭ يىلنامە پائالىيەتلىرىنى قەدەمداشلايدۇ</string>
   <string name="account_settings_sync_email_enable">تورخەت قەدەمداشلا</string>
   <string name="account_settings_sync_email_summary">بۇ ھېساباتنىڭ تورخەتلىرىنى قەدەمداشلا</string>
-  <string name="account_settings_vibrate_when_label">تىترەت</string>
   <string name="account_settings_ringtone">قوڭغۇراقنى تاللاڭ</string>
   <string name="account_settings_servers">مۇلازىمېتىر تەڭشىكى</string>
   <string name="mailbox_settings_activity_title">قەدەمداش تاللانما</string>
@@ -220,19 +183,11 @@
   <string name="mailbox_settings_sync_enabled_label">بۇ قىسقۇچنى قەدەمداشلا</string>
   <string name="mailbox_settings_sync_enabled_summary">تورغا باغلانغاندا تورخەت ئۇچۇرلارنى چۈشۈرىدۇ</string>
   <string name="mailbox_settings_mailbox_sync_window_label">قەدەمداشلايدىغان تور خەتلەرنىڭ كۈن سانى</string>
-  <string name="prefDialogTitle_conversationListIcon">يوللىغۇچى سۈرىتى</string>
-  <string name="provider_note_live">پەقەت بەزى \"Plus\" ھېساباتلا POP زىيارەتنى قوللاپ بۇ پىروگراممىنىڭ باغلىنىشىغا يول قويىدۇ. ئەگەر توغرا تورخەت ئادرېسى ۋە ئىم بىلەن تىزىمغا كىرەلمىسىڭىز ئۇنداقتا ھەقلىق \"Plus\" ھېساباتىنى ئاچقۇزماپسىز. توركۆرگۈنى قوزغىتىپ بۇ تورخەت ھېساباتلىرىنىڭ زىيارەت ھوقۇقىغا ئېرىشىڭ.</string>
   <string name="provider_note_t_online">بۇ تورخەت ھېساباتىنى تەڭشەشتىن ئىلگىرى، T-Online تورتۇرانى زىيارەت قىلىپ، بۇ ھېساباتنىڭ POP3 تورخەت زىيارىتى ئۈچۈن ئىم قۇرۇڭ.</string>
-  <string name="exchange_name">شىركەت</string>
   <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
   <string name="system_account_create_failed">ھېسابات قۇرالمىدى. قايتا سىناڭ.</string>
   <string name="device_admin_label">تورخەت</string>
   <string name="device_admin_description">بەلگىلەنگەن مۇلازىمېتىرنىڭ بىخەتەرلىك تاكتىكىسى قوزغىتىلدى</string>
-  <string name="settings_activity_title">تەڭشەكلەر</string>
-  <string name="header_label_general_preferences">ئادەتتىكى تەڭشەكلەر</string>
-  <string name="general_preference_confirm_delete_label">ئۆچۈرۈشتىن ئىلگىرى جەزملەش</string>
-  <string name="general_preference_confirm_send_label">يوللاشتىن ئىلگىرى جەزملەش</string>
-  <string name="search_hint">تورخەت ئىزدە</string>
   <string name="policy_dont_allow_camera">ئۈسكۈنە كامېراسىنى ئىشلىتىشكە يول قويمايدۇ</string>
   <string name="policy_require_password">ئۈسكۈنە ئىم زۆرۈر</string>
   <string name="policy_password_history">يېقىندا ئىشلەتكەن ئىمنى قايتا ئىشلىتىشنى چەكلەيدۇ</string>
@@ -244,12 +199,7 @@
   <string name="quick_2">مېنىڭچە ياخشى!</string>
   <string name="quick_3">بۇ خەتنى سەل تۇرۇپ ئوقۇپ، سىزگە جاۋاب يازىمەن.</string>
   <string name="quick_4">بىز يىغىندىن بىرنى ئورۇنلاشتۇرۇپ، بۇ مەسىلىنى مۇزاكىرە قىلايلى.</string>
-  <string name="require_manual_sync_message">كەزمە ھالەتتە بۇ ھېساباتنىڭ ئارقا سۇپا قەدەمداش چەكلەنگەن</string>
   <string name="confirm_response">جاۋاب يوللاۋاتىدۇ&#8230;</string>
-  <string name="no_conversations">ئۇچۇر يوق</string>
-  <string name="imap_name">IMAP</string>
-  <string name="pop3_name">POP3</string>
-  <string name="folder_picker_title">قىسقۇچ تاللىغۇچ</string>
   <string name="trash_folder_selection_title"><xliff:g id="ACCOUNT">%s</xliff:g> ئۈچۈن ئەخلەتخانا قىسقۇچىنى تاللاڭ</string>
   <string name="sent_folder_selection_title"><xliff:g id="ACCOUNT">%s</xliff:g> ئۈچۈن يوللانغان تۈرلەر قىسقۇچىنى تاللاڭ</string>
   <string name="account_waiting_for_folders_msg">قىسقۇچ تىزىمىنى يۈكلەۋاتىدۇ&#8230;</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 862296ccd..5c7070e05 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -20,4 +20,8 @@
   <string name="delete_account_confirmation_msg">Будуть видалені всі налаштування і електронні листи облікового запису <xliff:g id="account">%s</xliff:g>. Ця операція не може бути скасована.\n\nПродовжити?</string>
   <string name="deleting_account_msg">Видалення облікового запису\u2026</string>
   <string name="delete_account_failed">Не вдалося видалити обліковий запис</string>
+  <string name="mailbox_notify_settings_activity_title">Параметри сповіщень</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Параметри сповіщень (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <string name="folder_notify_settings_pref_title">Налаштування сповіщень для папки</string>
+  <string name="label_notification_lights_title">Індикація</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 2c47bc832..ac5c75b61 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -20,4 +20,5 @@
   <string name="delete_account_confirmation_msg">这将删除 <xliff:g id="account">%s</xliff:g> 帐户所有的设置和邮件。此操作不能撤销。\n\n要继续吗？</string>
   <string name="deleting_account_msg">正在删除帐户\u2026</string>
   <string name="delete_account_failed">无法删除该帐户</string>
+  <string name="mailbox_notify_settings_activity_title">通知选项</string>
 </resources>