Automatic translation import

Change-Id: I8f12eab6eb3d524a8967ad1bb0a4d048bd100bc8

106 files changed, 5163 insertions, 5 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index ad08de657..515d2a3b7 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Verwyder rekening</string>
   <string name="delete_account_confirmation_msg">Hierdie sal alle instellings en e-posse verwyder van die volgende rekening <xliff:g id="account">%s</xliff:g>. Hierdie aksie kan nie ontdoen word nie.\n\nGaan voort?</string>
   <string name="deleting_account_msg">Verwydering van rekening\u2026</string>
   <string name="delete_account_failed">Kon nie rekening verwyder nie</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Kennisgewing instellings</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Kennisgewing instellings (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Vouer kennisgewing instellings</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Liggies</string>
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-am/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 7cc0eeccc..188e50d4b 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">خيارات الإشعارات</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">خيارات الإشعارات (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">إعدادات إشعارات المجلدات</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">أضواء</string>
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-as-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index d28ce7231..d50e23794 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Desaniciar cuenta</string>
   <string name="delete_account_confirmation_msg">Esto va desaniciar tolos axustes y los correos de la cuenta <xliff:g id="account">%s</xliff:g>. Esta operación nun pue desfacese.\n\n¿Continuar?</string>
   <string name="deleting_account_msg">Desaniciando cuenta\u2026</string>
   <string name="delete_account_failed">Nun pudo desaniciase la cuenta</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opciones d\'avisos</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opciones d\'avisos (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Axustes d\'avisos de carpeta</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Lluces</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 3e0aca6e2..749db1fa2 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -15,180 +15,411 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
   <string name="permission_read_attachment_label">Lleer ficheros axuntos de correos-e</string>
+  <!-- Permissions description for reading attachments -->
   <string name="permission_read_attachment_desc">Permite que l\'aplicación consulte los ficheros axuntos de los correos electrónicos.</string>
+  <!-- Permissions label for accessing the main provider -->
   <string name="permission_access_provider_label">Acceder a los datos del fornidor de corréu electrónicu</string>
+  <!-- Permissions description for accessing the main provider -->
   <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>
+  <!-- Name of application on Home screen -->
   <string name="app_name">Corréu</string>
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
   <string name="create_action">Crear nueva</string>
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
   <string name="quick_responses_empty_view">Nun hai rempuestes rápides.</string>
+  <!-- Menu item -->
   <string name="account_settings_action">Axustes de la cuenta</string>
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
   <string name="mailbox_name_display_inbox">Recibíos</string>
+  <!-- In the UI, the outbox will be displayed with this name -->
   <string name="mailbox_name_display_outbox">Por Unviar</string>
+  <!-- In the UI, the drafts will be displayed with this name -->
   <string name="mailbox_name_display_drafts">Borradores</string>
+  <!-- In the UI, the trash will be displayed with this name -->
   <string name="mailbox_name_display_trash">Papelera</string>
+  <!-- In the UI, the sent will be displayed with this name -->
   <string name="mailbox_name_display_sent">Unviaos</string>
+  <!-- In the UI, the junk will be displayed with this name -->
   <string name="mailbox_name_display_junk">Corréu puxarra</string>
+  <!-- In the UI, the starred will be displayed with this name -->
   <string name="mailbox_name_display_starred">Destacaos</string>
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
   <string name="mailbox_name_display_unread">Ensin lleer</string>
+  <!-- Title of debug screen -->
   <string name="debug_title">Depurar</string>
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
   <string name="mailbox_list_account_selector_combined_view">Vista combinada</string>
+  <!-- Header for forwarded original messages -->
   <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>
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_list_title">Usar rempuesta rápida</string>
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_menu_title">Usar rempuesta rápida</string>
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
   <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 used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
   <string name="message_decode_error">Hebo un fallu al decodificar el mensaxe.</string>
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
   <string name="forward_download_failed_ticker">Fallu al unviar ún o varios ficheros axuntos</string>
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
   <string name="forward_download_failed_title">Ficheru axuntu non reunviáu</string>
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
   <string name="login_failed_ticker">Fallu al aniciar sesión en <xliff:g id="ACCOUNT_NAME">%s</xliff:g></string>
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
   <string name="login_failed_title">Fallu al aniciar sesión</string>
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
   <string name="account_setup_basics_title">Axustes de la cuenta</string>
+  <!-- Title of screen when trying to get oauth authentication -->
   <string name="oauth_authentication_title">Solicitando autorización</string>
+  <!-- Title of screen to choose with authentication to use -->
   <string name="sign_in_title">Aniciar sesión</string>
+  <!-- Warning if there is a problem authenticating with oauth -->
   <string name="oauth_error_description">Nun pudo autenticase</string>
+  <!-- Warning label displayed when the email address or password are incorrect -->
   <string name="password_warning_label">Corréu-e o contraseña incorreutos</string>
+  <!-- Label displayed to confirm what email address we are trying to validate -->
   <string name="email_confirmation_label">Direición de corréu-e:</string>
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
   <string name="account_setup_basics_headline">Cuenta de corréu-e</string>
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
   <string name="accounts_welcome">Pues configurar la to cuenta en pocos pasos.</string>
+  <!-- On "Set up email" screen, hint for account email address text field -->
   <string name="account_setup_basics_email_label">Direición de corréu-e</string>
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
   <string name="or_label">O</string>
+  <!-- Label for signing in with Google using OAuth -->
   <string name="sign_in_with_google">Aniciar sesión con Google</string>
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
   <string name="account_setup_basics_password_label">CONTRASEÑA</string>
+  <!-- hint for account email password text field -->
   <string name="password_hint">Contraseña</string>
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
   <string name="signed_in_with_service_label">Coneutáu con %s</string>
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
   <string name="authentication_label">AUTENTICACIÓN</string>
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
   <string name="add_authentication_label">Amestar autenticación</string>
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
   <string name="clear_authentication_label">Llimpiar autenticación</string>
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
   <string name="account_setup_basics_manual_setup_action">Axustes manuales</string>
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
   <string name="account_setup_username_password_toast">Introduz una direición de corréu-e y una contraseña válides.</string>
+  <!-- Title of dialog shown when a duplicate account is created -->
   <string name="account_duplicate_dlg_title">Cuenta duplicada</string>
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
   <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>
+  <!-- On check-settings screen, this is the initially-displayed message. -->
   <string name="account_setup_check_settings_retr_info_msg">Recuperando la información de la cuenta...</string>
+  <!-- Appears on screen while system is checking incoming server settings -->
   <string name="account_setup_check_settings_check_incoming_msg">Validando los axustes del sirvidor…</string>
+  <!-- Appears on screen while system is checking outgoing server settings -->
   <string name="account_setup_check_settings_check_outgoing_msg">Validando los axustes de SMTP…</string>
+  <!-- Appears on screen while system is creating the account -->
   <string name="account_setup_creating_account_msg">Creando cuenta…</string>
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
   <string name="account_setup_ab_headline">Confirmar triba de cuenta</string>
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
   <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>
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
   <string name="account_setup_names_headline">La to cuenta yá ta configurada y vas ver el to corréu de secute.</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_account_name_label">Da-y un nome a esta cuenta (opcional)</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_user_name_label">El to nome (como va vese nos mensaxes unviaos)</string>
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
   <string name="account_setup_account_type_headline">Tipu de cuenta</string>
+  <!-- "Add new email account" screen, text that appears on screen -->
   <string name="account_setup_account_type_instructions">¿Qué tipu de cuenta tienes?</string>
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_incoming_headline">Axustes del sirvidor d\'entrada</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_username_label">NOME USUARIU</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_password_label">CONTRASEÑA</string>
+  <!-- "Incoming server settings" screen, label for text field -->
   <string name="account_setup_password_subheading">Contraseña</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_server_label">SIRVIDOR</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_port_label">PUERTU</string>
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
   <string name="account_setup_incoming_security_label">TRIBA DE SEGURIDÁ</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
   <string name="account_setup_incoming_security_none_label">Nenguna</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_ssl_trust_certificates_label">SSL/TLS (aceutar tolos certif.)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
   <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_tls_trust_certificates_label">STARTTLS (aceutar tolos certif.)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
   <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
   <string name="account_setup_incoming_delete_policy_label">Desaniciar corréu-e del sirvidor</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_never_label">Enxamás</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_delete_label">Al desaniciar mensaxes</string>
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_label">Prefixu de ruta IMAP</string>
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_hint">Opcional</string>
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_outgoing_headline">Axustes del sirvidor de salida</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_outgoing_smtp_server_label">SIRVIDOR SMTP</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_outgoing_port_label">PUERTU</string>
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
   <string name="account_setup_outgoing_security_label">TRIBA DE SEGURIDÁ</string>
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
   <string name="account_setup_outgoing_require_login_label">Solicitar aniciu de sesión</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
   <string name="account_setup_outgoing_username_label">NOME USUARIU</string>
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
   <string name="account_setup_exchange_certificate_title">CERTIFICÁU DE VECERU</string>
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_select_certificate">Seleicionar</string>
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_use_certificate">Usar certificáu de veceru</string>
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_remove_certificate">Desaniciar</string>
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
   <string name="account_setup_exchange_no_certificate">Nengún</string>
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
   <string name="account_setup_exchange_device_id_label">ID DEL PRESÉU MÓVIL</string>
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
   <string name="account_setup_options_headline">Opciones de cuenta</string>
+  <!-- In Account setup options screen, label for email check frequency selector -->
   <string name="account_setup_options_mail_check_frequency_label">Frecuencia de sincronización:</string>
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_never">Enxamás</string>
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_push">Comprobación automática</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_5min">Cada 5 minutos</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_10min">Cada 10 minutos</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_15min">Cada 15 minutos</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_30min">Cada 30 minutos</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_1hour">Cada hora</string>
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
   <string name="account_setup_options_notify_label">Notificame cuando aporte un corréu</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_contacts_label">Sincronizar contautos d\'esta cuenta</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_calendar_label">Sincronizar calendariu d\'esta cuenta</string>
+  <!-- In Account setup options screen, check box to sync email -->
   <string name="account_setup_options_sync_email_label">Sincronizar corréu d\'esta cuenta</string>
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
   <string name="account_setup_options_background_attachments_label">Descargar axuntos automáticamente al coneutar a una rede Wi-Fi</string>
+  <!-- Dialog title when "setup" could not finish -->
   <string name="account_setup_failed_dlg_title">Fallu al completar la configuración</string>
+  <!-- In Account setup options screen, label for email lookback selector -->
   <string name="account_setup_options_mail_window_label">Sincronizar correos dende:</string>
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
   <string name="account_setup_options_mail_window_auto">Automática</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1day">Caberu día</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_3days">Los caberos trés díes</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1week">La cabera pasada</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_2weeks">Les caberes dos selmanes</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1month">El mes pasáu</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_all">Too</string>
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
   <string name="account_setup_options_mail_window_default">Usar valores predeterminaos de la cuenta</string>
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
   <string name="account_setup_failed_dlg_auth_message">Nome d\'usuariu o contraseña incorreutos</string>
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
   <string name="account_setup_autodiscover_dlg_authfail_title">Problema al configurar la cuenta</string>
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
   <string name="account_setup_autodiscover_dlg_authfail_message">Los axustes de cuenta, contraseña y nome d\'usuariu de confirmación son correutos.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message">Nun pue afitase una conexón de mou seguru col sirvidor.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message_fmt">Nun pue afitase conexón de mou seguru col sirvidor.\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_required">Necesítase un certificáu de veceru. ¿Quies coneutate al sirvidor con un certificáu de veceru?</string>
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_inaccessible">El certificáu nun ye válidu o nun pue accedese a él.</string>
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
   <string name="account_setup_failed_check_credentials_message">El sirvidor devolvió un fallu. Comprueba\'l nome d\'usuariu y la to contraseña y vuelvi a intentalo.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
   <string name="account_setup_failed_dlg_server_message">Nun pue afitase conexón col sirvidor.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
   <string name="account_setup_failed_dlg_server_message_fmt">Nun pue afitase conexón col sirvidor.\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
   <string name="account_setup_failed_tls_required">El protocolu TLS ye obligatoriu, pero\'l sirvidor nun lu almite.</string>
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
   <string name="account_setup_failed_auth_required">El sirvidor nun almite métodos d\'autenticación.</string>
+  <!-- Additional diagnostic text when server connection failed due to security error -->
   <string name="account_setup_failed_security">Nun pudo afitase conexón col sirvidor por un fallu de seguranza.</string>
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
   <string name="account_setup_failed_ioerror">Nun pudo afitase conexón col sirvidor.</string>
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
   <string name="account_setup_failed_protocol_unsupported">Introduxisti una direición de sirvidor incorreuta o\'l sirvidor requier una versión de protocolu non compatible con l\'aplicación Corréu.</string>
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
   <string name="account_setup_failed_access_denied">Nun tienes permisu pa facer la sincronización con esti sirvidor. Pa obtener más información, ponte en contautu col alministrador del sirvidor.</string>
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
   <string name="account_setup_security_required_title">Alministración de seguridá remota</string>
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
   <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>
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
   <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>
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
   <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>
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
   <string name="account_security_dialog_title">Anovamientu de seguridá</string>
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
   <string name="account_security_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> necesita qu\'anueves la configuración de seguridá.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_unsupported_ticker_fmt">Los requisitos de seguridá de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" nun permiten la sincronización.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_needed_ticker_fmt">Ye necesario anovar la configuración de seguridá de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\".</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_changed_ticker_fmt">Modificóse la configuración de seguridá de la cuenta \"<xliff:g id="ACCOUNT">%s</xliff:g>\" (nun fai falta l\'intervención del usuariu).</string>
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
   <string name="security_notification_content_update_title">Anovamientu seguridá necesariu</string>
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
   <string name="security_notification_content_change_title">Polítiques de seguridá modificaes</string>
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
   <string name="security_notification_content_unsupported_title">Fallu al cumplir polítiques seguridá</string>
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
   <string name="account_security_title">Seguridá del preséu</string>
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
   <string name="account_security_policy_explanation_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.</string>
+  <!-- "Setup could not finish" dialog action button -->
   <string name="account_setup_failed_dlg_edit_details_action">Editar detalles</string>
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
   <string name="password_expire_warning_ticker_fmt">\"<xliff:g id="ACCOUNT">%s</xliff:g>\" necesita que modifiques la contraseña o\'l PIN de la pantalla de bloquéu.</string>
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
   <string name="password_expire_warning_content_title">Contraseña bloquéu pantalla va caducar</string>
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
   <string name="password_expired_ticker">La contraseña o\'l PIN de la pantalla de bloquéu caducó.</string>
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
   <string name="password_expired_content_title">Contraseña bloquéu caducada</string>
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
   <string name="password_expire_warning_dialog_title">Contraseña bloquéu pantalla va caducar</string>
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
   <string name="password_expire_warning_dialog_content_fmt">Vas tener de modificar la contraseña o\'l PIN de la pantalla de bloquéu aína, o van desaniciase los datos de <xliff:g id="ACCOUNT">%s</xliff:g>. ¿Quies camudala agora?</string>
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
   <string name="password_expired_dialog_title">Contraseña bloquéu caducada</string>
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
   <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>
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
   <string name="account_settings_exit_server_settings">¿Quies descartar los cambeos non guardaos?</string>
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
   <string name="account_settings_background_attachments_label">Descargar axuntos</string>
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
   <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>
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
   <string name="account_settings_summary">Frecuencia de sincronización, notificaciones, etc.</string>
+  <!-- On Settings screen, setting summary text -->
   <string name="account_settings_notify_summary">Unviar notificación cuando aporte un corréu-e</string>
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
   <string name="account_settings_mail_check_frequency_label">Frecuencia de sincronización</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_incoming_label">Axustes d\'entrada</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_incoming_summary">Nome d\'usuariu, contraseña y otros axustes del sirvidor d\'entrada</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_outgoing_label">Axustes de salida</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_outgoing_summary">Nome d\'usuariu, contraseña y otros axustes del sirvidor de salida</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_enforced_label">Polítiques aplicaes</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_enforced_summary">Nengún</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_unsupported_label">Polítiques non almitíes</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_unsupported_summary">Nengún</string>
+  <!-- On Settings screen, label for button that attempts to sync the account -->
   <string name="account_settings_retry_label">Intentar sincronización</string>
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
   <string name="account_settings_retry_summary">Toca pa sincronizar esta cuenta.</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_description_label">Nome de la cuenta</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_name_label">El to nome</string>
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
   <string name="account_settings_edit_quick_responses_label">Rempuestes rápides</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_edit_quick_responses_summary">Testu qu\'uses nos tos correos</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_notifications">Axustes de notificaciones</string>
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
   <string name="account_settings_data_usage">Usu de datos</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_policies">Polítiques de seguridá</string>
   <string name="system_folders_title">Carpetes del sistema</string>
   <string name="system_folders_trash_title">Carpeta de la papelera</string>
@@ -197,42 +428,95 @@
   <string name="system_folders_sent_title">Carpeta d\'elementos unviaos</string>
   <string name="system_folders_sent_summary">Esbillar la to carpeta d\'elementos unviaos del sirvidor</string>
   <string name="system_folders_sent_dlg">Esbillar la to carpeta d\'elementos unviaos del sirvidor</string>
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
   <string name="edit_quick_response_dialog">Rempuestes rápides</string>
+  <!-- On settings screen, edit quick response dialog's "save" button -->
   <string name="save_action">Guardar</string>
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_contacts_enable">Sincronizar contautos</string>
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_contacts_summary">Sincronizar contautos d\'esta cuenta</string>
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_calendar_enable">Sincronizar calendariu</string>
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
   <string name="account_settings_sync_calendar_summary">Sincronizar eventos de calendariu pa esta cuenta</string>
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_email_enable">Sincronizar corréu</string>
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_email_summary">Sincronizar corréu d\'esta cuenta</string>
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_ringtone">Esbillar tonu</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_servers">Axustes del sirvidor</string>
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title">Axustes de sincronización</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title_with_mailbox">Axustes de sincronización (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)</string>
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
   <string name="mailbox_settings_sync_enabled_label">Sincronizar esta carpeta</string>
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
   <string name="mailbox_settings_sync_enabled_summary">Los mensaxes van descargase automáticamente al coneutate</string>
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
   <string name="mailbox_settings_mailbox_sync_window_label">Díes pa sincronizar corréu</string>
+  <!-- Message that appears when adding a T-Online account -->
   <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>
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
   <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
   <string name="system_account_create_failed">Nun pudo crease la cuenta. Inténtalo de nueves.</string>
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
   <string name="device_admin_label">Corréu-e</string>
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
   <string name="device_admin_description">Permite les polítiques de seguridá especificaes pol sirvidor.</string>
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
   <string name="policy_dont_allow_camera">Nun permitir usar cámara del preséu</string>
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
   <string name="policy_require_password">Solicitar contraseña del preséu</string>
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
   <string name="policy_password_history">Restrinxir nuevu usu contraseñes recientes</string>
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
   <string name="policy_password_expiration">Forciar vencimientu de contraseñes</string>
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
   <string name="policy_screen_timeout">Preséu inactivu necesariu pa bloquéu</string>
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
   <string name="policy_calendar_age">Llendar númberu d\'eventos que se sincronicen</string>
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
   <string name="policy_email_age">Llendar númberu de correos que se sincronicen</string>
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_1">¡Gracies!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_2">Paezme bien, ¡gracies!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_3">Lléolo dempués y respuéndote.</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_4">Hai de facer una reunión pa falar d\'esti tema.</string>
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
   <string name="confirm_response">Unviando rempuesta&#8230;</string>
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
   <string name="trash_folder_selection_title">Esbilla la papelera del sirvidor de <xliff:g id="ACCOUNT">%s</xliff:g></string>
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
   <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>
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
   <string name="no_quick_responses">Nenguna disponible</string>
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
   <string name="gmail_name">Gmail</string>
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
   <string name="folder_sync_settings_pref_title">Axustes de sync de carpetes</string>
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 9d4312175..b4be5df78 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Hesabı sil</string>
   <string name="delete_account_confirmation_msg"><xliff:g id="account">%s</xliff:g> hesabının bütün tənzimləmələri və e-poçtları silinəcək. Bu əməliyyatın geri dönüşü yoxdur.\n\nDavam edilsin?</string>
   <string name="deleting_account_msg">Hesab silinir\u2026</string>
   <string name="delete_account_failed">Hesab silinmədi</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Bildiriş seçimləri</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Bildiriş seçimləri (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Qovluq bildiriş tənzimləmələri</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">İşıqlar</string>
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 31c8c622e..f27f42034 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Паведамленні</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Паведамленні (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Паведамленні для тэчак</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Індыкатар падзей</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 9ab5c8d34..c940f7c17 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <string name="mailbox_notify_settings_activity_title">Настройки за известия</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <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>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <string name="folder_notify_settings_pref_title">Известия за папки</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
+  <string name="label_notification_lights_title">Светлини индикации</string>
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-bn-rBD/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-br-rFR/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-br-rFR/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 4e247fd60..53de86fb4 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Esborra el compte</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opcions de notificació</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcions de notificació (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Ajustaments de les notificacions de carpeta</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <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 91c9f97cc..b6f212f9e 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Smazat účet</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Možnosti oznámení</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Možnosti oznámení (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Nastavení složky oznámení</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Světla</string>
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-cy/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-cy/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 6d7764312..b605b425b 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Slet konto</string>
   <string name="delete_account_confirmation_msg">Dette vil slette alle indstillinger og e-mails fra kontoen <xliff:g id="account">%s</xliff:g>. Denne handling kan ikke fortrydes.\n\nFortsæt?</string>
   <string name="deleting_account_msg">Sletter konto\u2026</string>
   <string name="delete_account_failed">Kunne ikke slette kontoen</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Notifikationsindstillinger</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Notifikationsindstillinger (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Notifikationsindstillinger for mappe</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Lys</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index fd521f753..c185a81fd 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Konto löschen</string>
   <string name="delete_account_confirmation_msg">Diese Aktion löscht alle Einstellungen und E-Mails des Kontos <xliff:g id="account">%s</xliff:g>. Dieser Vorgang 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">Das Konto konnte nicht gelöscht werden.</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Benachrichtigungsoptionen</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Benachrichtigungsoptionen (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Benachrichtigungseinstellungen für Ordner</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">LEDs</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 0b0dde40d..83ed8ec06 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Επιλογές ειδοποιήσεων</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Επιλογές ειδοποιήσεων (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Ρυθμίσεις ειδοποιήσεων φακέλου</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Φωτισμός</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-en-rAU/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-en-rGB/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 5895af7ce..533379df0 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Delete account</string>
   <string name="delete_account_confirmation_msg">This will delete all the settings and emails of the account <xliff:g id="account">%s</xliff:g>. This operation cannot be undone.\n\nContinue?</string>
   <string name="deleting_account_msg">Deleting account\u2026</string>
   <string name="delete_account_failed">Couldn\'t delete the account</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Notification options</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Notification options (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Folder notification settings</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Lights</string>
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-en-rPT/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-en-rPT/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 25973a72b..c0b267c34 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Forigi konton</string>
   <string name="delete_account_confirmation_msg">Tio forigos agordojn kaj retmesaĝojn de la konto <xliff:g id="account">%s</xliff:g>. Tio NE malfareblas.\n\nĈu daŭrigi?</string>
   <string name="deleting_account_msg">Forigado de konto\u2026</string>
   <string name="delete_account_failed">Ne eblas forigi tiun konton</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opciaj atentigoj</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opciaj atentigoj (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Agordoj de dosierujaj atentigoj</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Heleco</string>
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-eo/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-es-rMX/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-es-rMX/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 000000000..80c27c35a
--- /dev/null
+++ b/res/values-es-rUS/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">
+  <!-- Delete account -->
+  <string name="delete_account">Eliminar cuenta</string>
+  <string name="delete_account_confirmation_msg">Esto eliminará todas las opciones y correos de la cuenta <xliff:g id="account">%s</xliff:g>. Esta operación no se puede deshacer.\n\n¿Continuar?</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+  <string name="label_notification_lights_title">Luces</string>
+</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 366db8a8b..2b79469dd 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Eliminar cuenta</string>
   <string name="delete_account_confirmation_msg">Esto eliminará todos los ajustes y mensajes de la cuenta <xliff:g id="account">%s</xliff:g>. Esta operación no se puede deshacer.\n\n¿Continuar?</string>
   <string name="deleting_account_msg">Eliminando cuenta\u2026</string>
   <string name="delete_account_failed">No ha sido posible eliminar la cuenta</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opciones de notificación</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opciones de notificación de (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Ajustes de notificación de carpeta</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Luces</string>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index f084a8120..053605847 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Kustuta konto</string>
   <string name="delete_account_confirmation_msg">See kustutab konto <xliff:g id="account">%s</xliff:g> kõik e-kirjad  ja sätted. Seda tegevust ei saa tagasi võtta.\n\nJätka?</string>
   <string name="deleting_account_msg">Konto\u2026 kustutamine</string>
   <string name="delete_account_failed">Konto kustutamine ebaõnnestus</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Teadete valikud</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Teadete valikud: (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Kausta teatamise sätted</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Tuled</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index c0b978ee7..b349a7b77 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Jakinarazpen aukerak</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Jakinarazpenen aukerak (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Karpeta jakinarazpen ezarpenak</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Argiak</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 1d98289a9..dd2fc7446 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">گزینه‌های اعلان</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">گزینه‌های اعلان (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">تنظیمات اعلان پوشه</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">چراغ‌ها</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 8c6b72d5b..b8cea3385 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Poista tili</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Ilmoitusasetukset</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Ilmoitusasetukset (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Kansion ilmoitusasetukset</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Valot</string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-fil-rPH/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-fr-rCA/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index bdf8233c1..542a37cd3 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -16,13 +16,18 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Options de notification</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Options de notification (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Paramètres de notification de dossier</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Voyants</string>
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-fy-rNL/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-fy-rNL/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-gd-rGB/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-gd-rGB/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index dab12be6d..9e1f87163 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Eliminar conta</string>
   <string name="delete_account_confirmation_msg">Eliminaranse todos os axustes e os correos da conta <xliff:g id="account">%s</xliff:g>. Esta operación non se pode desfacer.\n\nContinuar?</string>
   <string name="deleting_account_msg">Eliminando a conta\u2026</string>
   <string name="delete_account_failed">Non se puido eliminar a conta</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opcións das notificacións</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcións das notificacións (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Configuración das notificacións do cartafol</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Luces</string>
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-gu-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index a3062c2e0..c99c835bd 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">अधिसूचना विकल्प</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">अधिसूचना विकल्प (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">फ़ोल्डर अधिसूचना सेटिंग</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">रोशनी</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 0b1346239..d8b261682 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="delete_account">Izbriši račun</string>
+  <!-- Delete account -->
+  <string name="delete_account">Obriši račun</string>
   <string name="delete_account_confirmation_msg">Izbrisat će sve postavke i poruke e-pošte računa <xliff:g id="account"> %s </xliff:g>. Ovaj postupak se ne može poništiti.\n\nNastaviti?</string>
   <string name="deleting_account_msg">Brisanje računa\u2026</string>
   <string name="delete_account_failed">Nije moguće izbrisati račun</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opcije obavijesti</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcije obavijesti (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Postavke obavijesti mape</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Svjetla</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index dcd52c42b..4a3f5d136 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Fiók törlése</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Értesítési beállítások</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <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>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Mappa értesítési beállítások</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Fények</string>
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-hy-rAM/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index f1e7ba86c..0b9925c68 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Pilihan pemberitahuan</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Pilihan pemberitahuan (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Pengaturan pemberitahuan folder</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Lampu</string>
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-is-rIS/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 27fd26e71..850a718de 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Elimina account</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opzioni notifica</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opzioni notifica (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Impostazioni notifica cartella</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Luci</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index f3a6adcf0..2ed7a2511 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">אפשרויות התראה</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">אפשרויות התראה (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">הגדרות התראה של התיקייה</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">תאורת התראות</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 75ae8165e..97bbc80f1 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">通知オプション</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">通知オプション（<xliff:g id="mailbox_name" example="Family">%s</xliff:g>）</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">フォルダの通知の設定</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">ライト</string>
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ka-rGE/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-kk-rKZ/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-km-rKH/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index c56c4e2e9..af70e603a 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">ಅಧಿಸೂಚನೆ ಆಯ್ಕೆಗಳು</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">ಅಧಿಸೂಚನೆ ಆಯ್ಕೆಗಳು (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">ಫೋಲ್ಡರ್ ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್ಸ್</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">ಬೆಳಕುಗಳು</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index be913cc4e..f031df33b 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">알림 옵션</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">알림 옵션 (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">폴더 알림 설정</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">알림 표시등</string>
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index e17b7801a..c458561ee 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -16,8 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 0073d82a5..12be68956 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -15,205 +15,436 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
   <string name="permission_read_attachment_label">خوێندنه‌وه‌ی هاوپێچی پۆستی ئه‌لیکترۆنی</string>
+  <!-- Permissions description for reading attachments -->
   <string name="permission_read_attachment_desc">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی پۆستی ئه‌لیکترۆنی
         هاوپێچ.</string>
+  <!-- Permissions label for accessing the main provider -->
   <string name="permission_access_provider_label">چونه‌ناو به‌کارخه‌ری داتای پۆستی ئه‌لیکترۆنی</string>
+  <!-- Permissions description for accessing the main provider -->
   <string name="permission_access_provider_desc">ڕێگه‌دان به‌ به‌رنامه‌ بۆ چونه‌ناو به‌کارخه‌ری داتای پۆستی ئه‌لیکترۆنی
          داتابه‌یس، که‌ نامه‌ی هاتوو وه‌ ڕۆشتوو وه‌ ناو و تێپه‌ڕه‌وشه‌ی تێدایه‌.</string>
+  <!-- Name of application on Home screen -->
   <string name="app_name">پۆستی ئەلەکترۆنی</string>
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
   <string name="create_action">دروستکردنی دانه‌یه‌کی نوێ</string>
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
   <string name="quick_responses_empty_view">هیچ وه‌ڵامێکی خێرا نییه‌.</string>
+  <!-- Menu item -->
   <string name="account_settings_action">ڕێکخستنەکانی هەژمار</string>
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
   <string name="mailbox_name_display_inbox">نامە هاتووەکان</string>
+  <!-- In the UI, the outbox will be displayed with this name -->
   <string name="mailbox_name_display_outbox">ده‌رسندوق</string>
+  <!-- In the UI, the drafts will be displayed with this name -->
   <string name="mailbox_name_display_drafts">ڕه‌شنووسه‌کان</string>
+  <!-- In the UI, the trash will be displayed with this name -->
   <string name="mailbox_name_display_trash">سه‌له‌ی خۆڵ</string>
+  <!-- In the UI, the sent will be displayed with this name -->
   <string name="mailbox_name_display_sent">نێردرا</string>
+  <!-- In the UI, the junk will be displayed with this name -->
   <string name="mailbox_name_display_junk">زبڵ</string>
+  <!-- In the UI, the starred will be displayed with this name -->
   <string name="mailbox_name_display_starred">ئه‌ستێره‌دار</string>
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
   <string name="mailbox_name_display_unread">نه‌خوێنراوه‌</string>
+  <!-- Title of debug screen -->
   <string name="debug_title">هەڵەدۆز</string>
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
   <string name="mailbox_list_account_selector_combined_view">بینینی تێکه‌ڵکراو</string>
+  <!-- Header for forwarded original messages -->
   <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>
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_list_title">هاورده‌کردنی وه‌ڵامی خێرا</string>
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_menu_title">تێخستنی وەڵامی خێرا</string>
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
   <string name="message_view_attachment_background_load">دانه‌یه‌ک یان زیاتر له‌
          نامه‌ی به‌دواداکه‌وتوو داده‌گیرێت بۆ ناردن.</string>
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
   <string name="message_decode_error">هه‌ڵه‌یه‌ک هه‌یه‌ له‌کاتی هه‌ڵوه‌شاندنی نامه‌که‌.</string>
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
   <string name="forward_download_failed_ticker">نه‌توانرا به‌دوادوابکه‌وێت دانه‌یه‌ک یان زیاتر.</string>
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
   <string name="forward_download_failed_title">هاوپێچ به‌دوادانه‌که‌وت</string>
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
   <string name="login_failed_ticker">
         <xliff:g id="account_name">%s</xliff:g> چوونه‌ژووره‌وه‌ سه‌رکه‌وتوونه‌بوو.</string>
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
   <string name="login_failed_title">نەتوانرا بچێتەژورەوە</string>
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
   <string name="account_setup_basics_title">دامه‌زراندنی هه‌ژمار</string>
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
   <string name="account_setup_basics_headline">هه‌ژماری پۆستی ئه‌لیکترۆنی</string>
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
   <string name="accounts_welcome">ئه‌توانی هه‌ژماره‌که‌ت دابمه‌زرێنی به‌ چه‌ند هه‌نگاوێک.
         </string>
+  <!-- On "Set up email" screen, hint for account email address text field -->
   <string name="account_setup_basics_email_label">پۆست</string>
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
   <string name="account_setup_basics_manual_setup_action">دامه‌زراندنی ده‌ستی</string>
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
   <string name="account_setup_username_password_toast">
         پۆستی ئه‌لیکترۆنی ڕاست و وشه‌ی نهێنی ڕاست بنووسه‌.</string>
+  <!-- Title of dialog shown when a duplicate account is created -->
   <string name="account_duplicate_dlg_title">هه‌ژماری دووباره‌</string>
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
   <string name="account_duplicate_dlg_message_fmt">
         تۆ پێشتر ئه‌م ناوه‌ت به‌کارهێناوه‌ بۆ ئه‌م هه‌ژماره‌<xliff:g id="duplicate">%s</xliff:g>
     </string>
+  <!-- On check-settings screen, this is the initially-displayed message. -->
   <string name="account_setup_check_settings_retr_info_msg">
     وه‌رگرتنی زانیاری هه‌ژمار\u2026</string>
+  <!-- Appears on screen while system is checking incoming server settings -->
   <string name="account_setup_check_settings_check_incoming_msg">
     ڕاستکردنه‌وه‌ی ڕێکخستنی ڕاژه‌\u2026</string>
+  <!-- Appears on screen while system is checking outgoing server settings -->
   <string name="account_setup_check_settings_check_outgoing_msg">
     ڕاستکردنه‌وه‌ی ڕێکخستنی smtp \u2026</string>
+  <!-- Appears on screen while system is creating the account -->
   <string name="account_setup_creating_account_msg">
     دروستکردنی هه‌ژمار\u2026</string>
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
   <string name="account_setup_names_headline">
         هه‌ژماره‌که‌ت دامه‌زرا و پۆستی ئه‌لیکترۆنی له‌ ڕێگایه‌!</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_account_name_label">
         ناوێک بۆ هه‌ژماره‌که‌ دابنێ (ئاره‌زوومه‌ندانه‌یه‌)</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_user_name_label">
         ناوت(له‌ کاتی نامه‌ ڕۆشتن به‌دیده‌کرێت)</string>
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
   <string name="account_setup_account_type_headline">جۆری هه‌ژمار</string>
+  <!-- "Add new email account" screen, text that appears on screen -->
   <string name="account_setup_account_type_instructions">چی جۆرێک له‌ هه‌ژمار له‌مه‌دایه‌؟</string>
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_incoming_headline">ڕێکخستنی ڕاژه‌ی هاتن</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
   <string name="account_setup_incoming_security_none_label">هیچیان</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_ssl_trust_certificates_label">
         SSL/TLS (وه‌رگرتنی هه‌موو ناسنامه‌کان)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
   <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_tls_trust_certificates_label">
         STARTTLS (وه‌رگرتنی هه‌موو ناسنامه‌کان)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
   <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
   <string name="account_setup_incoming_delete_policy_label">سڕینه‌وه‌ی پۆسته‌که‌ له‌ ڕاژه‌</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_never_label">هیچکات</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_delete_label">
         کاتێک ده‌یسڕمه‌وه‌ له‌ سندوقی نامه‌ هاتووه‌کان</string>
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_label">پێشگری ڕێڕه‌وی IMAP</string>
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_hint">ئاره‌زوومه‌ندانه‌</string>
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_outgoing_headline">ڕێکخستنی ڕاژه‌ی ڕۆشتن</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
   <string name="account_setup_outgoing_require_login_label">پێویستی به‌ چوونه‌ژووره‌وه‌یه‌</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_select_certificate">دەست نیشان کردن</string>
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_use_certificate">به‌کارهێنانی ناسنامه‌ی ڕاژه‌خواز</string>
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_remove_certificate">لابردن</string>
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
   <string name="account_setup_exchange_no_certificate">هیچیان</string>
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
   <string name="account_setup_options_headline">ڕێکخستنی هەژمار</string>
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_never">هیچکات</string>
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_push">خۆکارانه‌ (پاڵنان)</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_5min">هه‌ر 5 خوله‌کێک</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_10min">هه‌ر 10 خوله‌کێک</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_15min">هه‌ر ١٥ خوله‌کێک</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_30min">هه‌ر 30 خوله‌کێک</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_1hour">هه‌ر کاژێرێک</string>
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
   <string name="account_setup_options_notify_label">ئاگادارم بکه‌ره‌وه‌ کاتێک پۆستی ئه‌لیکترۆنی ده‌گات</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_contacts_label">گواستنه‌وه‌ی په‌یوه‌ندی له‌م هه‌ژماره‌وه‌</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_calendar_label">گواستنه‌وه‌ی ڕۆژژمێر له‌م هه‌ژماره‌وه‌</string>
+  <!-- In Account setup options screen, check box to sync email -->
   <string name="account_setup_options_sync_email_label">گواستنه‌وه‌ی پۆستی ئه‌لیکترۆنی له‌م هه‌ژماره‌وه‌</string>
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
   <string name="account_setup_options_background_attachments_label">
         خۆکارانه‌ داگرتنی هاوپێچ کاتێک په‌یوه‌ندی هه‌یه‌ له‌گه‌ڵ Wi-Fi</string>
+  <!-- Dialog title when "setup" could not finish -->
   <string name="account_setup_failed_dlg_title">نه‌توانرا ته‌واوبکرێت</string>
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
   <string name="account_setup_options_mail_window_auto">خۆکارانە</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1day">ڕۆژی کۆتایی</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_3days">سێ رۆژی کۆتایی</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1week">هه‌فته‌ی کۆتایی</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_2weeks">دوو هه‌فته‌ی کۆتایی</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1month">مانگی دوایین</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_all">هه‌موو</string>
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
   <string name="account_setup_options_mail_window_default">به‌کارهێنانی هه‌ژماری بنێڕه‌تی</string>
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
   <string name="account_setup_failed_dlg_auth_message">ناو و وشه‌ی نهێنی هه‌ڵه‌یه‌.</string>
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
   <string name="account_setup_autodiscover_dlg_authfail_title">هه‌ڵه‌ هه‌یه‌ له‌کاتی دامه‌زراندنی هه‌ژمار</string>
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
   <string name="account_setup_autodiscover_dlg_authfail_message">چه‌سپاندنی ناو، وشه‌ی نهێنی، وه‌ ڕێکخستنی هه‌ژمار ڕاسته‌.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message">نه‌توانرا به‌ سه‌لامه‌تی په‌یوه‌ندی بکرێت به‌ ڕاژه‌وه‌.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message_fmt">نه‌توانرا به‌ سه‌لامه‌تی په‌یوه‌ندی بکرێت به‌ ڕاژه‌وه‌.\n<xliff:g id="error">%s</xliff:g></string>
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_required">ناسنامه‌ی ڕاژه‌خواز پێویسته‌. ئه‌ته‌وێ په‌یوه‌ندی بکه‌یت به‌ ڕاژه‌وه‌ له‌گه‌ڵ ناسنامه‌ی ڕاژه‌خواز؟</string>
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_inaccessible">ناسنامه‌ ڕاست نییه‌ یان نه‌گونجاوه‌.</string>
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
   <string name="account_setup_failed_check_credentials_message">
          ڕاژه‌که‌ وه‌لامی هه‌ڵه‌ی هه‌یه‌.تکایه‌ ناو و وشه‌ی نهێنی دڵنیابکه‌ره‌وه‌ و هه‌وڵبده‌ره‌وه‌.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
   <string name="account_setup_failed_dlg_server_message">نه‌توانرا په‌یوه‌ندی بکرێت به‌ ڕاژه‌.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
   <string name="account_setup_failed_dlg_server_message_fmt">نه‌توانرا په‌یوه‌ندی بکرێت به‌ ڕاژه‌.\n<xliff:g id="error">%s</xliff:g></string>
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
   <string name="account_setup_failed_tls_required">TLS پێویسته‌ به‌ڵام گونجاو نییه‌ بۆ ڕاژه‌که‌</string>
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
   <string name="account_setup_failed_auth_required">ڕێگاکانی ناساندن نه‌گونجاون بۆ ڕاژه‌که‌.</string>
+  <!-- Additional diagnostic text when server connection failed due to security error -->
   <string name="account_setup_failed_security">نه‌توانرا په‌یوه‌ندی بکرێته‌وه‌ له‌کاتی ڕاژه‌ و هه‌ڵه‌ی پاراستن.</string>
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
   <string name="account_setup_failed_ioerror">نه‌توانرا په‌یوه‌ندی بکرێته‌وه‌ بۆ ڕاژه‌.</string>
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
   <string name="account_setup_failed_protocol_unsupported">
          تۆ ناونیشانی ڕاژه‌یه‌کی هه‌ڵه‌ت نوسیوه‌ یان ڕاژه‌که‌ پێویستی به‌ پرۆتۆکۆله‌ که‌ وه‌شانه‌که‌ی
          پۆستی ئه‌لیکترۆنی نه‌گونجاوه‌.</string>
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
   <string name="account_setup_failed_access_denied">
          تۆ ده‌سته‌ڵاتت نییه‌ بۆ گواستنه‌وه‌ی ڕاژه‌. په‌یوه‌ندی بکه‌ به‌ ڕاژه‌کانه‌وه‌
          ده‌سته‌ڵاتدار بۆ زانیاری زیاتر.</string>
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
   <string name="account_setup_security_required_title">ده‌سته‌ڵاتی دووری پارێزگاری</string>
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
   <string name="account_setup_security_policies_required_fmt">
          ڕاژه‌که‌<xliff:g id="server">%s</xliff:g>پێویسته‌ ڕه‌زامه‌ندی هه‌بێت بۆ سه‌رپه‌رشتیکردی دووری
          هه‌ندێک پاراستن بۆ ئه‌ندرۆیده‌که‌ت.ئه‌ته‌وێ ته‌واوی بکه‌یت 
          له‌سه‌ر هه‌ژمار؟</string>
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
   <string name="account_setup_failed_security_policies_unsupported">
          ئه‌م ڕاژه‌یه‌ پێویستی به‌ خزمه‌تگوزاری پاراستنه‌ که‌ ئه‌ندرۆیده‌که‌ت ناگونجێت،
           که‌ تێیدایه‌:<xliff:g id="error">%s</xliff:g></string>
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
   <string name="disable_admin_warning">ئاگاداربه‌:ناچالاککردنی به‌رنامه‌ی پۆستی ئه‌لیکترۆنی
          بۆ ده‌سته‌ڵاتی ئامێره‌که‌ت هه‌موو پۆسته‌ ئه‌لیکترۆنییه‌کان ده‌سڕێته‌وه‌ که‌ پێویستێتی، وه‌ له‌گه‌ڵ
          پۆسته‌ ئه‌لیکترۆنییه‌کان،په‌یوه‌ندییه‌کان.ڕوداوه‌کانی ڕۆژژمێر، وه‌داتاکانی تر.</string>
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
   <string name="account_security_dialog_title">نوێکردنه‌وه‌ی پارێزگاری</string>
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
   <string name="account_security_dialog_content_fmt">
          <xliff:g id="account">%s</xliff:g> پیویستی به‌ تازه‌کردنه‌وه‌یه‌ بۆ پارێزگاری
          ڕێکخستن.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_unsupported_ticker_fmt">
             هه‌ژمار<xliff:g id="account">%s</xliff:g>ناتوانرێ بگوێزرێته‌وه‌ له‌کاتی پارێزگاری
     پێویست.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_needed_ticker_fmt">
             هه‌ژمار <xliff:g id="account">%s</xliff:g> پێویستی به‌ نوێکردنه‌وه‌ی ڕێکخستن هه‌یه‌
     </string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_changed_ticker_fmt">
             هه‌ژمار <xliff:g id="account">%s</xliff:g> گۆڕدرا بۆ پارێزگاری ڕێکخستن؛ هیچ به‌کارهێنه‌رێک
             پێویست نییه‌
     </string>
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
   <string name="security_notification_content_update_title">نوێکردنه‌وه‌ی پارێزگاری پێویسته‌</string>
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
   <string name="security_notification_content_change_title">پارێزه‌ره‌کانی پارێزگاری 
          گۆڕدران</string>
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
   <string name="security_notification_content_unsupported_title">پارێزه‌ری پارێزگارییه‌کان نه‌توانرا
          بناسرێن</string>
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
   <string name="account_security_title">پارێزگاری ئامێر</string>
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
   <string name="account_security_policy_explanation_fmt">
                   ڕاژه‌که‌<xliff:g id="server">%s</xliff:g>پێویستی به‌ ڕێگه‌دان هه‌یه‌ بۆ سه‌رپه‌رشتی دوور
          هه‌ندێ پارێزگاری بۆ ئه‌ندرۆیده‌که‌ت.</string>
+  <!-- "Setup could not finish" dialog action button -->
   <string name="account_setup_failed_dlg_edit_details_action">ده‌ستکاریکردنی ڕوونکردنه‌وه‌کان</string>
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
   <string name="password_expire_warning_ticker_fmt">
             <xliff:g id="account">%s</xliff:g>پێویستی به‌ گۆڕان هه‌یه‌ له‌ قوفڵی ڕوونما
             پی ئای ئێن یان وشه‌ی نهێنی.</string>
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
   <string name="password_expire_warning_content_title">وشه‌ی نهێنی قوفڵی ڕوونما و کات به‌سه‌رچوونی</string>
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
   <string name="password_expired_ticker">قوفڵی ڕوونمات PIN یان وشه‌ی نهێنییه‌که‌ی به‌سه‌رچووه‌.</string>
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
   <string name="password_expired_content_title">قوفڵی ڕوونمای پاسۆرد به‌سه‌رچووه‌</string>
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
   <string name="password_expire_warning_dialog_title">تێپەڕەوشەی داخەری ڕوونما بەرەو بەسەرچوون دەڕوات</string>
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
   <string name="password_expire_warning_dialog_content_fmt">
          پێویسته‌ قوفڵه‌ ڕوونما بگۆڕیت به‌ زویی، ئه‌گه‌ر نا زانیارییه‌کانت بۆ
          <xliff:g id="account">%s</xliff:g> ئه‌سڕدرێنه‌وه‌، ئه‌ته‌وێ بیگۆڕیت؟</string>
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
   <string name="password_expired_dialog_title">تێپەڕەوشەی داخەری ڕوونما بەسەرچوو</string>
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
   <string name="password_expired_dialog_content_fmt">
          زانیاری بۆ <xliff:g id="account">%s</xliff:g> ده‌سڕدرێته‌وه‌ له‌ ئامێره‌که‌ت.
          ئه‌توانی بیهێنیه‌ته‌وه‌ به‌ گۆڕینی قوفڵی ڕوونما.ئه‌ته‌وێ بیگۆڕی؟</string>
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
   <string name="account_settings_exit_server_settings">پاشه‌که‌وتنه‌کردنی گۆڕانه‌کان؟</string>
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
   <string name="account_settings_background_attachments_label">
         هاوپێچی داگرتن</string>
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
   <string name="account_settings_background_attachments_summary">
         خۆکارانه‌-داگرتنی هاوپێچ بۆ نامه‌کان له‌لایه‌ن Wi-Fi</string>
   <string name="account_settings_notify_label">ئاگاداری پۆستی ئه‌لیکترۆنی</string>
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
   <string name="account_settings_summary">فریکوێنسی گواستنه‌وه‌، ئاگاداری، هتد.</string>
+  <!-- On Settings screen, setting summary text -->
   <string name="account_settings_notify_summary">ناردنی ئاگاداری کاتێک پۆستی ئه‌لیکترۆنی گه‌شت</string>
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
   <string name="account_settings_mail_check_frequency_label">فریکوێنسی گواستنه‌وه‌</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_incoming_label">ڕێکخستنی وه‌رگرتن</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_incoming_summary">ناو، وشه‌ی نهێنی، وه‌ هاتنه‌کانی تر و ڕێکخستنه‌کانی</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_outgoing_label">ڕێکخستنی ڕۆشتن</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_outgoing_summary">
         ناو، وشه‌ی نهێنی، وه‌ هاتنه‌کانی تر و ڕێکخستنه‌کانی</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_enforced_label">به‌زۆرکردنی پارێزه‌ر</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_enforced_summary">هیچیان</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_unsupported_label">پارێزه‌ر نه‌گونجاوه‌</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_unsupported_summary">هیچیان</string>
+  <!-- On Settings screen, label for button that attempts to sync the account -->
   <string name="account_settings_retry_label">هه‌ولدانی گواستنه‌وه‌</string>
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
   <string name="account_settings_retry_summary">ئێره‌ بکه‌ بۆ گواستنه‌وه‌ی هه‌ژمار</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_description_label">ناوی هه‌ژمار</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_name_label">ناوی خۆت</string>
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
   <string name="account_settings_edit_quick_responses_label">وه‌ڵامە خێراکان</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_edit_quick_responses_summary">
         ده‌ستکاریکردنی ده‌ق که‌ له‌م کۆتاییه‌دا هاورده‌ت کردوه‌ به‌ پۆستی ئه‌لیکترۆنی</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_notifications">ڕێکخستنی ئاگادارییه‌کان</string>
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
   <string name="account_settings_data_usage">به‌کارهێنانی داتا</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_policies">پارێزه‌ری پارێزگارییه‌کان</string>
   <string name="system_folders_title">بوخچه‌ی سیسته‌م</string>
   <string name="system_folders_trash_title">بوخچه‌ی زیاده‌کان</string>
@@ -222,39 +453,92 @@
   <string name="system_folders_sent_title">ناردنی دانه‌کانی بوخچه‌</string>
   <string name="system_folders_sent_summary">بوخچه‌ی ڕاژه‌ی نێردراو دیاری بکه‌</string>
   <string name="system_folders_sent_dlg">بوخچەی بڕگە نێردراوەکانی ڕاژەکارەکەت دیاری بکە</string>
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
   <string name="edit_quick_response_dialog">وه‌ڵامدانەوەی خێرا</string>
+  <!-- On settings screen, edit quick response dialog's "save" button -->
   <string name="save_action">پاشەکەوتکردن</string>
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_contacts_enable">گواستنەوەی پەیوەندیەکان</string>
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_contacts_summary">گواستنەوەی پەیوەندیەکان لەم هەژمارەوە</string>
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_calendar_enable">هاوکاتسازیی ڕۆژژمێر</string>
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
   <string name="account_settings_sync_calendar_summary">گواستنه‌وه‌ی ڕۆژژمێر و ڕوداوه‌کانی بۆ ئه‌م هه‌ژماره‌</string>
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_email_enable">گواستنەوەی پۆستی ئه‌لیکترۆنی</string>
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_email_summary">گواستنەوەی پۆستی ئه‌لیکترۆنی لەم هەژمارەوە</string>
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_ringtone">هەڵبژاردنی زەنگ</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_servers">رێکخستنەکانی سێرڤەر</string>
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title">بەربژاردەکانی هاوکاتسازی</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title_with_mailbox">هەڵبژاردەکانی یەکخستن (<xliff:g id="mailboxx_name" example="Family">%s</xliff:g>)</string>
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
   <string name="mailbox_settings_sync_enabled_label">گواستنەوەی ئەم بوخچە</string>
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
   <string name="mailbox_settings_sync_enabled_summary">نامەکان کاتێ پەیوەندی بەسترا دا دەبەزێنرێن</string>
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
   <string name="mailbox_settings_mailbox_sync_window_label">رۆژەکانی هاوتاکردنی ئیمێڵ</string>
+  <!-- Message that appears when adding a T-Online account -->
   <string name="provider_note_t_online">پێش دروستکردنی ئەم ئەژمارە ،سەردانی مالپەری T-Online بکەو وشەی نهێنی بۆ POP دروست بکە بۆ گەیشتن بە ئیمەیڵ</string>
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
   <string name="exchange_name_alternate">گواستنه‌وه‌ی گۆڕینه‌وه‌ی مایکرۆسۆفت</string>
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
   <string name="system_account_create_failed">نەتوانرا ئەژمارەکە دروست بکرێت .دوبارەی بکەوە</string>
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
   <string name="device_admin_label">پۆستی ئه‌لەکترۆنی</string>
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
   <string name="device_admin_description">چالاککردنی ڕاژه‌ی دیاریکراو بۆ پارێزگاری پارێزه‌ران</string>
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
   <string name="policy_dont_allow_camera">ڕێگه‌پێنه‌دانی به‌کارهێنانی کامێرای ئامێره‌که‌ت</string>
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
   <string name="policy_require_password">پێویستی به‌ وشه‌ی نهێنی ئامێره‌</string>
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
   <string name="policy_password_history">دیاریکردنی وشه‌ی نهێنی دووباره‌ی نوێ</string>
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
   <string name="policy_password_expiration">پێویستی به‌ وشه‌ی نهێنییه‌ بۆ به‌سه‌رچوو</string>
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
   <string name="policy_screen_timeout">پێویستی به‌ باری بێ کار هه‌یه‌ بۆ داخستنی ڕوونما</string>
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
   <string name="policy_calendar_age">سنوردارکردنی ژماره‌ی ڕووداوه‌کانی ڕۆژژمێر که‌ گواستراونه‌ته‌وه‌</string>
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
   <string name="policy_email_age">سنوردارکردنی ژماره‌ی پۆسته‌ ئه‌لیکترۆنییه‌کان که‌ گواستراونه‌ته‌وه‌</string>
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_1">سوپاس!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_2">ده‌نگ باشه‌ بۆ من!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_3">من ئه‌مه‌ دواتر ده‌خوێنمه‌وه‌ و ده‌گه‌ڕێمه‌وه‌ بۆ لای تۆ.</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_4">با به‌یه‌کناساندن دابمه‌زرێنین و گفت و گۆی له‌سه‌ربکه‌ین.</string>
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
   <string name="confirm_response">ناردنی وه‌ڵام&#8230;</string>
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
   <string name="trash_folder_selection_title">دیاریکردنی زبڵی ڕاژه‌ بۆ بوخچه‌ی <xliff:g id="account">%s</xliff:g></string>
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
   <string name="sent_folder_selection_title">دیاریکردنی ڕاژه‌ی ناردن بۆ بوخچه‌ی <xliff:g id="account">%s</xliff:g></string>
   <string name="account_waiting_for_folders_msg">نیشاندانی لیستی بوخچه‌کان&#8230;</string>
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ky-rKG/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 215863564..b6e6e23f4 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Kont läschen</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Notifikatiounsoptiounen</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Notifikatiounsoptiounen (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Astellunge fir Dossiersnotifikatiounen</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Beliichtung</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index bfef54a78..ea0b62fc0 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -15,182 +15,413 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
   <string name="permission_read_attachment_label">E-Mail-Unhäng liesen</string>
+  <!-- Permissions description for reading attachments -->
   <string name="permission_read_attachment_desc">Erlaabt der App, E-Mail-Unhäng ze liesen.</string>
+  <!-- Permissions label for accessing the main provider -->
   <string name="permission_access_provider_label">Op Date vum E-Mail-Provider zougräifen</string>
+  <!-- Permissions description for accessing the main provider -->
   <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>
+  <!-- Name of application on Home screen -->
   <string name="app_name">E-Mail</string>
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
   <string name="create_action">Nei erstellen</string>
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
   <string name="quick_responses_empty_view">Keng séier Äntwerten.</string>
+  <!-- Menu item -->
   <string name="account_settings_action">Kontenastellungen</string>
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
   <string name="mailbox_name_display_inbox">Agank</string>
+  <!-- In the UI, the outbox will be displayed with this name -->
   <string name="mailbox_name_display_outbox">Ausgank</string>
+  <!-- In the UI, the drafts will be displayed with this name -->
   <string name="mailbox_name_display_drafts">Brouillonen</string>
+  <!-- In the UI, the trash will be displayed with this name -->
   <string name="mailbox_name_display_trash">Poubelle</string>
+  <!-- In the UI, the sent will be displayed with this name -->
   <string name="mailbox_name_display_sent">Geschéckt</string>
+  <!-- In the UI, the junk will be displayed with this name -->
   <string name="mailbox_name_display_junk">Knascht</string>
+  <!-- In the UI, the starred will be displayed with this name -->
   <string name="mailbox_name_display_starred">Markéiert</string>
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
   <string name="mailbox_name_display_unread">Ongelies</string>
+  <!-- Title of debug screen -->
   <string name="debug_title">Debuggen</string>
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
   <string name="mailbox_list_account_selector_combined_view">Kombinéiert Usiicht</string>
+  <!-- Header for forwarded original messages -->
   <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>
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_list_title">Séier Äntwert asetzen</string>
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_menu_title">Séier Äntwert asetzen</string>
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
   <string name="message_view_attachment_background_load">Een oder méi Unhäng an dengem weidergeleete Message gi virum Verschécken erofgelueden.</string>
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
   <string name="message_decode_error">Et gouf e Feeler beim decodéiere vum Message.</string>
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
   <string name="forward_download_failed_ticker">Kann een oder méi Unhäng net weiderleeden.</string>
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
   <string name="forward_download_failed_title">Unhang net weidergeleet</string>
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
   <string name="login_failed_ticker">Alogge mat <xliff:g id="account_name">%s</xliff:g> feelgeschloen.</string>
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
   <string name="login_failed_title">Alogge war net méiglech</string>
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
   <string name="account_setup_basics_title">Kontenariichtung</string>
+  <!-- Title of screen when trying to get oauth authentication -->
   <string name="oauth_authentication_title">Autoriséierung gëtt ugefrot</string>
+  <!-- Title of screen to choose with authentication to use -->
   <string name="sign_in_title">Aloggen</string>
+  <!-- Warning if there is a problem authenticating with oauth -->
   <string name="oauth_error_description">Kann net authentifizéieren</string>
+  <!-- Warning label displayed when the email address or password are incorrect -->
   <string name="password_warning_label">E-Mail-Adress oder Passwuert sinn inkorrekt</string>
+  <!-- Label displayed to confirm what email address we are trying to validate -->
   <string name="email_confirmation_label">E-Mail-Adress:</string>
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
   <string name="account_setup_basics_headline">E-Mail-Kont</string>
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
   <string name="accounts_welcome">Du kanns däi Kont a just e puer Schrëtter astellen.</string>
+  <!-- On "Set up email" screen, hint for account email address text field -->
   <string name="account_setup_basics_email_label">E-Mail-Adress</string>
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
   <string name="or_label">ODER</string>
+  <!-- Label for signing in with Google using OAuth -->
   <string name="sign_in_with_google">Mat Google aloggen</string>
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
   <string name="account_setup_basics_password_label">PASSWUERT</string>
+  <!-- hint for account email password text field -->
   <string name="password_hint">Passwuert</string>
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
   <string name="signed_in_with_service_label">Ageloggt mat %s</string>
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
   <string name="authentication_label">AUTHENTIFIZÉIERUNG</string>
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
   <string name="add_authentication_label">Authentifizéierung dobäisetzen</string>
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
   <string name="clear_authentication_label">Authentifizéierung ewechhuelen</string>
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
   <string name="account_setup_basics_manual_setup_action">Manuell Konfiguratioun</string>
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
   <string name="account_setup_username_password_toast">Gëff eng gëlteg E-Mail-Adress an e gëltegt Passwuert an.</string>
+  <!-- Title of dialog shown when a duplicate account is created -->
   <string name="account_duplicate_dlg_title">Kont duplizéieren</string>
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
   <string name="account_duplicate_dlg_message_fmt">Du benotz dëse Benotzernumm scho fir de Kont \"<xliff:g id="duplicate">%s</xliff:g>\".</string>
+  <!-- On check-settings screen, this is the initially-displayed message. -->
   <string name="account_setup_check_settings_retr_info_msg">Kontendate ginn ausgelies\u2026</string>
+  <!-- Appears on screen while system is checking incoming server settings -->
   <string name="account_setup_check_settings_check_incoming_msg">D\'Serverastellunge gi validéiert\u2026</string>
+  <!-- Appears on screen while system is checking outgoing server settings -->
   <string name="account_setup_check_settings_check_outgoing_msg">D\'SMTP-Astellunge gi validéiert\u2026</string>
+  <!-- Appears on screen while system is creating the account -->
   <string name="account_setup_creating_account_msg">Kont gëtt erstallt\u2026</string>
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
   <string name="account_setup_ab_headline">Kontentyp bestätegen</string>
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
   <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>
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
   <string name="account_setup_names_headline">Däi Kont ass konfiguréiert an d\'Emaile sinn ënnerwee!</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_account_name_label">Gëff dësem Kont en Numm (optional)</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_user_name_label">Däin Numm (gëtt op erausgoend Messagen ugewisen)</string>
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
   <string name="account_setup_account_type_headline">Kontentyp</string>
+  <!-- "Add new email account" screen, text that appears on screen -->
   <string name="account_setup_account_type_instructions">Ëm wéi en Typ Kont handelt et sech?</string>
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_incoming_headline">Astellunge fir den erakommende Server</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_username_label">BENOTZERNUMM</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_password_label">PASSWUERT</string>
+  <!-- "Incoming server settings" screen, label for text field -->
   <string name="account_setup_password_subheading">Passwuert</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_server_label">SERVER</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_incoming_port_label">PORT</string>
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
   <string name="account_setup_incoming_security_label">SÉCHERHEETSTYP</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
   <string name="account_setup_incoming_security_none_label">Keen</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_ssl_trust_certificates_label">
         SSL/TLS (All Zertifikater acceptéieren)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
   <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_tls_trust_certificates_label">
         STARTTLS (all Zertifikater acceptéieren)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
   <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
   <string name="account_setup_incoming_delete_policy_label">E-Mail vum Server läschen</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_never_label">Ni</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_delete_label">Wann ech aus dem Agank läschen</string>
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_label">Prefix vum IMAP-Path</string>
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_hint">Optional</string>
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_outgoing_headline">Astellunge fir den erausgoende Server</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_outgoing_smtp_server_label">SMTP-SERVER</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
   <string name="account_setup_outgoing_port_label">PORT</string>
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
   <string name="account_setup_outgoing_security_label">SÉCHERHEETSTYP</string>
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
   <string name="account_setup_outgoing_require_login_label">Alogge verlaangen</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
   <string name="account_setup_outgoing_username_label">BENOTZERNUMM</string>
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
   <string name="account_setup_exchange_certificate_title">CLIENT-ZERTIFIKAT</string>
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_select_certificate">Auswielen</string>
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_use_certificate">Clientszertifikat benotzen</string>
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_remove_certificate">Ewechhuelen</string>
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
   <string name="account_setup_exchange_no_certificate">Keen</string>
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
   <string name="account_setup_exchange_device_id_label">ID VUM MOBILEN APPARAT</string>
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
   <string name="account_setup_options_headline">Kontenoptiounen</string>
+  <!-- In Account setup options screen, label for email check frequency selector -->
   <string name="account_setup_options_mail_check_frequency_label">Sync-Frequenz:</string>
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_never">Ni</string>
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_push">Automatesch (Push)</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_5min">All 5 Minutten</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_10min">All 10 Minutten</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_15min">All 15 Minutten</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_30min">All 30 Minutten</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_1hour">All Stonn</string>
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
   <string name="account_setup_options_notify_label">Bei neien E-Mailen notifiéieren</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_contacts_label">Kontakter fir dëse Kont synchroniséieren</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_calendar_label">Kalenner fir dëse Kont synchroniséieren</string>
+  <!-- In Account setup options screen, check box to sync email -->
   <string name="account_setup_options_sync_email_label">E-Maile vun dësem Kont synchroniséieren</string>
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
   <string name="account_setup_options_background_attachments_label">Unhäng bei aktiver WLAN-Connectioun automatesch eroflueden</string>
+  <!-- Dialog title when "setup" could not finish -->
   <string name="account_setup_failed_dlg_title">Konnt net ofschléissen</string>
+  <!-- In Account setup options screen, label for email lookback selector -->
   <string name="account_setup_options_mail_window_label">Synchroniséier E-Maile vun:</string>
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
   <string name="account_setup_options_mail_window_auto">Automatesch</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1day">Leschten Dag</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_3days">Lescht dräi Deeg</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1week">Lescht Woch</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_2weeks">Lescht zwou Wochen</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1month">Leschte Mount</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_all">All</string>
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
   <string name="account_setup_options_mail_window_default">Standardwäerter fir dëse Kont benotzen</string>
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
   <string name="account_setup_failed_dlg_auth_message">De Benotzernumm oder d\'Passwuert sinn net korrekt.</string>
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
   <string name="account_setup_autodiscover_dlg_authfail_title">Problem mat der Konfiguratioun vum Kont</string>
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
   <string name="account_setup_autodiscover_dlg_authfail_message">Bestäteg datt de Benotzernumm, d\'Passwuert an d\'Kontenastellunge korrekt sinn.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message">Ka keng sécher Connectioun mam Server hierstellen.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message_fmt">Ka keng sécher Connectioun mam Server hierstellen.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_required">E Clientszertifikat ass néideg. Wëlls du däi Clientszertifikat fir d\'Connectioun mam Server benotzen?</string>
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_inaccessible">Den Zertifikat ass ongëlteg oder net accessibel.</string>
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
   <string name="account_setup_failed_check_credentials_message">De Server huet mat engem Feeler geäntwert. Kontrolléier däi Benotzernumm a Passwuert, a probéier nees.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
   <string name="account_setup_failed_dlg_server_message">Kann net mam Server connectéieren.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
   <string name="account_setup_failed_dlg_server_message_fmt">Kann net mam Server connectéieren.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
   <string name="account_setup_failed_tls_required">TLS ass néideg mä gëtt net vum Server ënnerstëtzt.</string>
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
   <string name="account_setup_failed_auth_required">Keng vun den Authentifizéierungsmethode gëtt vum Server ënnerstëtzt.</string>
+  <!-- Additional diagnostic text when server connection failed due to security error -->
   <string name="account_setup_failed_security">Kann d\'Connectioun mam Server wéinst engem Sécherheetsfeeler net opmaachen.</string>
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
   <string name="account_setup_failed_ioerror">Kann d\'Connectioun mam Server net opmaachen.</string>
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
   <string name="account_setup_failed_protocol_unsupported">Du hues eng ongëlteg Serveradress aginn, oder de Server verlaangt eng Protokollversioun déi d\'E-Mail-App net ënnerstëtzt.</string>
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
   <string name="account_setup_failed_access_denied">Du hues keng Berechtegung fir mat dësem Server ze synchroniséieren. Kontaktéier däi Serveradministrator fir méi Informatiounen.</string>
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
   <string name="account_setup_security_required_title">Sécherheetsverwaltung op Distanz</string>
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
   <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>
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
   <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>
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
   <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>
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
   <string name="account_security_dialog_title">Sécherheetsaktualiséierung</string>
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
   <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>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_unsupported_ticker_fmt">De Kont \"<xliff:g id="account">%s</xliff:g>\" ka wéinst Sécherheetsufuerderungen net synchroniséiert ginn.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_needed_ticker_fmt">De Kont \"<xliff:g id="account">%s</xliff:g>\" verlaangt Ännerungen un de Sécherheetsastellungen.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_changed_ticker_fmt">De Kont \"<xliff:g id="account">%s</xliff:g>\" huet seng Sécherheetsastellunge geännert; keng Benotzeraktioun néideg.</string>
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
   <string name="security_notification_content_update_title">Sécherheetsaktualiséierung néideg</string>
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
   <string name="security_notification_content_change_title">D\'Sécherheetsrichtlinne goufe geännert</string>
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
   <string name="security_notification_content_unsupported_title">Richtlinnen net z\'erfëllen</string>
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
   <string name="account_security_title">Sécherheet vum Apparat</string>
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
   <string name="account_security_policy_explanation_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.</string>
+  <!-- "Setup could not finish" dialog action button -->
   <string name="account_setup_failed_dlg_edit_details_action">Detailer änneren</string>
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
   <string name="password_expire_warning_ticker_fmt">\"<xliff:g id="account">%s</xliff:g>\" verlaangt datt s du de PIN oder d\'Passwuert fir däi Spärschierm änners.</string>
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
   <string name="password_expire_warning_content_title">D\'Spärschierm-Passwuert leeft of</string>
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
   <string name="password_expired_ticker">Däi Spärschierm-PIN oder -Passwuert ass ofgelaf.</string>
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
   <string name="password_expired_content_title">Passwuert vum Spärschierm ofgelaf</string>
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
   <string name="password_expire_warning_dialog_title">D\'Spärschierm-Passwuert leeft of</string>
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
   <string name="password_expire_warning_dialog_content_fmt">Du muss däi Spärschierm-PIN oder -Passwuert geschwënn änneren, oder d\'Date fir <xliff:g id="account">%s</xliff:g> gi geläscht. Wëlls du et elo änneren?</string>
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
   <string name="password_expired_dialog_title">Passwuert vum Spärschierm ofgelaf</string>
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
   <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>
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
   <string name="account_settings_exit_server_settings">Ongespäichert Ännerunge verwerfen?</string>
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
   <string name="account_settings_background_attachments_label">Unhäng eroflueden</string>
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
   <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>
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
   <string name="account_settings_summary">Synchroniséierungsfrequenz, Notifikatiounen, etc.</string>
+  <!-- On Settings screen, setting summary text -->
   <string name="account_settings_notify_summary">Eng Notifikatioun schécke wann E-Mailen ukommen</string>
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
   <string name="account_settings_mail_check_frequency_label">Sync-Frequenz</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_incoming_label">Erakommend Astellungen</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_incoming_summary">Benotzernumm, Passwuert an aner erakommend Serverastellungen</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_outgoing_label">Erausgoend Astellungen</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_outgoing_summary">Benotzernumm, Passwuert an aner erausgoend Serverastellungen</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_enforced_label">Richtlinnen erzwongen</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_enforced_summary">Keen</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_unsupported_label">Net ënnerstëtzt Richtlinnen</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_unsupported_summary">Keen</string>
+  <!-- On Settings screen, label for button that attempts to sync the account -->
   <string name="account_settings_retry_label">Sync versichen</string>
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
   <string name="account_settings_retry_summary">Hei drécke fir de Kont ze synchroniséieren</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_description_label">Kontennumm</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_name_label">Däin Numm</string>
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
   <string name="account_settings_edit_quick_responses_label">Séier Äntwerten</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_edit_quick_responses_summary">Text änneren deen s de beim Schreiwen dacks an E-Mailen asetz</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_notifications">Notifikatiounsastellungen</string>
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
   <string name="account_settings_data_usage">Dateverbrauch</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_policies">Sécherheetsrichtlinnen</string>
   <string name="system_folders_title">Systemdossieren</string>
   <string name="system_folders_trash_title">Poubellesdossier</string>
@@ -199,45 +430,98 @@
   <string name="system_folders_sent_title">Dossier \"Verschéckt Elementer\"</string>
   <string name="system_folders_sent_summary">Dossier \"Verschéckt Elementer\" vum Server auswielen</string>
   <string name="system_folders_sent_dlg">Dossier \"Verschéckt Elementer\" vum Server auswielen</string>
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
   <string name="edit_quick_response_dialog">Séier Äntwert</string>
+  <!-- On settings screen, edit quick response dialog's "save" button -->
   <string name="save_action">Späicheren</string>
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_contacts_enable">Kontakter synchroniséieren</string>
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_contacts_summary">Kontakter fir dëse Kont synchroniséieren</string>
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_calendar_enable">Kalenner synchroniséieren</string>
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
   <string name="account_settings_sync_calendar_summary">Kalenner-Rendezvouse fir dëse Kont synchroniséieren</string>
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_email_enable">E-Mail synchroniséieren</string>
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_email_summary">E-Maile vum Kont synchroniséieren</string>
+  <!-- On Settings screen, vibrate pop-up menu label -->
   <string name="label_notification_vibrate_title">Vibréieren</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_ringtone">Schelltoun auswielen</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_servers">Serverastellungen</string>
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title">Sync-Optiounen</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title_with_mailbox">Synchroniséierungsoptiounen (<xliff:g id="mailboxx_name" example="Family">%s</xliff:g>)</string>
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
   <string name="mailbox_settings_sync_enabled_label">Dësen Dossier synchroniséieren</string>
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
   <string name="mailbox_settings_sync_enabled_summary">Bei enger aktiver Connectioun ginn d\'Messagen erofgelueden</string>
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
   <string name="mailbox_settings_mailbox_sync_window_label">Deeg fir déi synchroniséiert soll ginn</string>
+  <!-- Message that appears when adding a T-Online account -->
   <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>
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
   <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
   <string name="system_account_create_failed">Konnt de Kont net erstellen. Probéier nees.</string>
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
   <string name="device_admin_label">E-Mail</string>
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
   <string name="device_admin_description">Aktivéiert serverspezifesch Sécherheetsrichtlinnen</string>
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
   <string name="policy_dont_allow_camera">D\'Benotzung vun der Kamera net erlaben</string>
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
   <string name="policy_require_password">Passwuert vum Apparat erfuerderlech</string>
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
   <string name="policy_password_history">Asaz vun de leschte Passwierder aschränken</string>
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
   <string name="policy_password_expiration">Oflaf vun de Passwierder erfuerderlech</string>
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
   <string name="policy_screen_timeout">Schiermspär bei inaktivem Apparat </string>
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
   <string name="policy_calendar_age">D\'Rendezvouse limitéieren déi synchroniséiert ginn</string>
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
   <string name="policy_email_age">D\'Emaile limitéieren déi synchroniséiert ginn</string>
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_1">Merci!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_2">Kléngt gutt fir mech!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_3">Ech liesen dat méi spéit a kommen op dech zréck.</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_4">Looss eis e Rendezvous festleeë fir dat ze diskutéieren.</string>
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
   <string name="confirm_response">Äntwert gëtt geschéckt&#8230;</string>
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
   <string name="imap_name">Privat (IMAP)</string>
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
   <string name="pop3_name">Privat (POP3)</string>
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
   <string name="trash_folder_selection_title">Wiel de Poubellesdossier fir <xliff:g id="account">%s</xliff:g> aus</string>
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
   <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>
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
   <string name="no_quick_responses">Keng disponibel</string>
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
   <string name="gmail_name">Gmail</string>
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
   <string name="folder_sync_settings_pref_title">Synchroniséierungsastellunge vum Dossier</string>
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-lo-rLA/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 2be046337..9b5fc8e6e 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Ištrinti paskyrą</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Pranešimo parinktys</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Pranešimo parinktys (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Aplanko pranešimo nustatymai</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Šviesos</string>
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-lv/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-mk-rMK/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ml-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-mn-rMN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-mr-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ms-rMY/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-my-rMM/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 518dcfd50..c6fd80552 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Slett konto</string>
   <string name="delete_account_confirmation_msg">Dette vil slette alle innstillingene og e-post for kontoen <xliff:g id="account">%s</xliff:g>. Denne operasjonen kan ikke være omgjøres.\n\nVil du fortsette?</string>
   <string name="deleting_account_msg">Sletter konto\u2026</string>
   <string name="delete_account_failed">Kan ikke slette kontoen</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Varslingsalternativer</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Varslingsalternativer (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Mappe varslingsinnstillinger</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Lys</string>
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ne-rNP/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index f599337b8..2f46acd90 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Account verwijderen</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Instellingen meldingen</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Instellingen meldingen (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Instellingen mapmeldingen</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Meldingsled</string>
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-oc-rFR/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
new file mode 100644
index 000000000..a0b51b8e1
--- /dev/null
+++ b/res/values-oc-rFR/strings.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2008 The Android Open Source 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">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
+  <!-- Permissions description for reading attachments -->
+  <!-- Permissions label for accessing the main provider -->
+  <!-- Permissions description for accessing the main provider -->
+  <!-- Name of application on Home screen -->
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
+  <!-- Menu item -->
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
+  <!-- In the UI, the outbox will be displayed with this name -->
+  <!-- In the UI, the drafts will be displayed with this name -->
+  <!-- In the UI, the trash will be displayed with this name -->
+  <!-- In the UI, the sent will be displayed with this name -->
+  <!-- In the UI, the junk will be displayed with this name -->
+  <!-- In the UI, the starred will be displayed with this name -->
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
+  <!-- Title of debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
+  <!-- Header for forwarded original messages -->
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
+  <!-- On "Set up email" screen, hint for account email address text field -->
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
+  <!-- Title of dialog shown when a duplicate account is created -->
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
+  <!-- On check-settings screen, this is the initially-displayed message. -->
+  <!-- Appears on screen while system is checking incoming server settings -->
+  <!-- Appears on screen while system is checking outgoing server settings -->
+  <!-- Appears on screen while system is creating the account -->
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- On "Set up email" screen, label of text field -->
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
+  <!-- "Add new email account" screen, text that appears on screen -->
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
+  <!-- In Account setup options screen, check box to sync email -->
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
+  <!-- Dialog title when "setup" could not finish -->
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
+  <!-- Additional diagnostic text when server connection failed due to security error -->
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
+  <!-- "Setup could not finish" dialog action button -->
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
+  <!-- On Settings screen, setting summary text -->
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, label for button that attempts to sync the account -->
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
+  <!-- On Settings screen, section heading -->
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
+  <!-- On settings screen, edit quick response dialog's "save" button -->
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
+  <!-- On Settings screen, section heading -->
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
+  <!-- Message that appears when adding a T-Online account -->
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
+</resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-or-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-pa-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index d5618739d..aac4b7849 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Usuń konto</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opcje powiadomień</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcje powiadomień (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Ustawienia folderów powiadomień</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <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 5b8fb2650..4d2771d97 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Apagar a conta</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opções de notificação</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <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>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Configurações de notificação de pasta</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <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 1d762e9ab..a902812a9 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Apagar a conta</string>
   <string name="delete_account_confirmation_msg">Isto vai apagar todas as definições 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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opções de notificação</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <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>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Definições de notificação da pasta</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Luzes</string>
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-rm/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 44562a434..2ba6138ae 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -16,11 +16,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Ștergere cont</string>
   <string name="delete_account_confirmation_msg">Se vor șterge toate setările și email-urile contului <xliff:g id="account">%s</xliff:g>. Această operație nu poate fi anulată.\n\nContinuați?</string>
   <string name="deleting_account_msg">Se șterge contul\u2026</string>
   <string name="delete_account_failed">Contul nu a putut fi șters</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Opțiuni de notificare</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opțiuni de notificare (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Lumini</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index ef2c26975..cde48528d 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Уведомления</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Уведомления (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Уведомления для папок</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Индикатор событий</string>
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-si-rLK/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 927dd395d..4a6ae1192 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Vymazať účet</string>
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Možnosti oznámenia</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Možnosti oznámení (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Nastavenia oznámení priečinkov</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Svetlá</string>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 488901162..a7965bb4f 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Izbriši račun</string>
   <string name="delete_account_confirmation_msg">To bo izbrisalo vse nastavitve in e-pošto računa <xliff:g id="account">%s</xliff:g>. Tega opravila se ne da razveljaviti.\n\nNadaljuj?</string>
   <string name="deleting_account_msg">Brisanje računa \u2026</string>
   <string name="delete_account_failed">Računa ni bilo mogoče izbrisati</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Možnosti za obvestila</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Možnosti za obvestila (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Nastavitve obvestil mape</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Lučke</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-sq-rAL/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index abe5027f0..7006c1754 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Опције обавештења</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Опције обавештења (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Фолдер опција обавештења</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Светла</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 61d0ab054..13609c210 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Ta bort konto</string>
   <string name="delete_account_confirmation_msg">Detta kommer att ta bort alla inställningar och e-post på kontot <xliff:g id="account">%s</xliff:g>. Denna åtgärd kan inte ångras.\n\nFortsätt?</string>
   <string name="deleting_account_msg">Tar bort konto\u2026</string>
   <string name="delete_account_failed">Kunde inte ta bort kontot</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Meddelandeaviseringar</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Meddelandeaviseringar (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Aviseringsinställningar för mapp</string>
-  <string name="label_notification_lights_title">Ljus</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
+  <string name="label_notification_lights_title">Tänds</string>
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-sw/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ta-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-te-rIN/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 1a59e7421..373ae0c62 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">ตัวเลือกการแจ้งเตือน</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">ตัวเลือกการแจ้งเตือน (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">ตั้งค่าการแจ้งเตือนโฟลเดอร์</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">แสง</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 02afcce02..09b09ee22 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Hesabı sil</string>
   <string name="delete_account_confirmation_msg"><xliff:g id="account">%s</xliff:g> hesabının tüm ayarları ve e-postaları silinecek. Bu işlem geri alınamaz.\n\nDevam edilsin mi?</string>
   <string name="deleting_account_msg">Hesap siliniyor\u2026</string>
   <string name="delete_account_failed">Hesap silinemedi</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Bildirim seçenekleri</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Bildirim seçenekleri (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Klasör bildirim ayarları</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Işıklar</string>
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ug/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 27e8b0a50..c9cbc084a 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -15,151 +15,382 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Names of packages and authorities that are common to all apps
+    and read from resources -->
+  <!-- Permissions label for reading attachments -->
   <string name="permission_read_attachment_label">تورخەت قوشۇمچىسىنى كۆرسەت</string>
+  <!-- Permissions description for reading attachments -->
   <string name="permission_read_attachment_desc">بۇ ئەپنىڭ تورخەت قوشۇمچىسىنى ئوقۇشىغا يول قويىدۇ.</string>
+  <!-- Permissions label for accessing the main provider -->
   <string name="permission_access_provider_label">تورخەت تەمىنلىگۈچى سانلىق مەلۇماتىنى زىيارەت</string>
+  <!-- Permissions description for accessing the main provider -->
   <string name="permission_access_provider_desc">بۇ ئەپنىڭ تورخەت ساندانىنى زىيارەت قىلىشقا يول قويىدۇ، قوبۇللىغان، يوللىغان تورخەتلەر، ئىشلەتكۈچى ئاتى ۋە ئىمنى ئۆز ئىچىگە ئالىدۇ.</string>
+  <!-- Name of application on Home screen -->
   <string name="app_name">تورخەت</string>
+  <!-- Actions will be used as buttons and in menu items -->
+  <!--  Menu item used to create a new quick response [CHAR_LIMIT=16] -->
   <string name="create_action">يېڭىدىن قۇر</string>
+  <!-- Message informing user when a list that would contain quick responses
+            is empty [CHAR_LIMIT=80] -->
   <string name="quick_responses_empty_view">تېز جاۋاب يوق.</string>
+  <!-- Menu item -->
   <string name="account_settings_action">ھېسابات تەڭشەكلەر</string>
+  <!-- The next set of strings are used in local display and may be localized. -->
+  <!-- In the UI, the inbox will be displayed with this name -->
   <string name="mailbox_name_display_inbox">قوبۇللاش ساندۇقى</string>
+  <!-- In the UI, the outbox will be displayed with this name -->
   <string name="mailbox_name_display_outbox">يوللاش ساندۇقى</string>
+  <!-- In the UI, the drafts will be displayed with this name -->
   <string name="mailbox_name_display_drafts">دەسلەپكى نۇسخا</string>
+  <!-- In the UI, the trash will be displayed with this name -->
   <string name="mailbox_name_display_trash">ئەخلەتخانا</string>
+  <!-- In the UI, the sent will be displayed with this name -->
   <string name="mailbox_name_display_sent">ئەۋەتىلگەن خەتلەر</string>
+  <!-- In the UI, the junk will be displayed with this name -->
   <string name="mailbox_name_display_junk">ئەخلەت</string>
+  <!-- In the UI, the starred will be displayed with this name -->
   <string name="mailbox_name_display_starred">يۇلتۇزلۇق</string>
+  <!-- In the UI, the unread will be displayed with this name [CHAR LIMIT=15] -->
   <string name="mailbox_name_display_unread">ئوقۇلمىغان</string>
+  <!-- Title of debug screen -->
   <string name="debug_title">سازلا</string>
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown only on debug screen -->
+  <!-- Do Not Translate.  Button label, shown only on debug screen -->
+  <!-- Do Not Translate. Button label. Shown only on debug screen -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Do Not Translate.  Checkbox label, shown on debug screen. -->
+  <!-- Label shown in the account selector to select "Combined view", which contains
+         Combined Inbox, Combined Outbox, etc. [CHAR LIMIT=30] -->
   <string name="mailbox_list_account_selector_combined_view">بىرلەشمە كۆرۈنۈش</string>
+  <!-- Header for forwarded original messages -->
   <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>
+  <!-- Title for dialog containing list of quick responses that user may insert
+            into message body. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_list_title">تېز جاۋاب قىستۇر</string>
+  <!-- Menu item for inserting quick responses into email compose activity. [CHAR_LIMIT=30] -->
   <string name="message_compose_insert_quick_response_menu_title">تېز جاۋاب قىستۇر</string>
+  <!-- Toast upon using "send" when one or more attachments will need to be background loaded
+      [CHAR LIMIT=none]-->
   <string name="message_view_attachment_background_load">ئۇلاپ يوللايدىغان تورخېتىڭىزدە بىر ياكى بىر قانچە قوشۇمچە توردىن چۈشۈرۈلۈپ ئاندىن يوللىنىدۇ.</string>
+  <!-- String used in place of a message that could not be properly decoded (e.g. bad base64
+         data was received.) [CHAR LIMIT=none] -->
   <string name="message_decode_error">خەت كودىنى يېشىۋاتقاندا خاتالىق كۆرۈلدى.</string>
+  <!-- Notification ticker when a forwarded attachment couldn't be sent [CHAR LIMIT=none] -->
   <string name="forward_download_failed_ticker">بىر ياكى بىر قانچە قوشۇمچىنى ئۇلاپ يوللىيالمايدۇ.</string>
+  <!-- Notification title when a forwarded attachment couldn't be sent [CHAR LIMIT=30]-->
   <string name="forward_download_failed_title">قوشۇمچە ئۇلاپ يوللانمىدى</string>
+  <!-- Notification ticker when email account authentication fails [CHAR LIMIT=none] -->
   <string name="login_failed_ticker"><xliff:g id="ACCOUNT_NAME">%s</xliff:g> تىزىمغا كىرەلمىدى.</string>
+  <!-- Notification title when email account authentication fails [CHAR LIMIT=30]-->
   <string name="login_failed_title">تىزىمغا كىرەلمىدى</string>
+  <!-- Title of screen when setting up new email account [CHAR LIMIT=45] -->
   <string name="account_setup_basics_title">ھېسابات تەڭشەك</string>
+  <!-- Title of screen when trying to get oauth authentication -->
+  <!-- Title of screen to choose with authentication to use -->
+  <!-- Warning if there is a problem authenticating with oauth -->
+  <!-- Warning label displayed when the email address or password are incorrect -->
+  <!-- Label displayed to confirm what email address we are trying to validate -->
+  <!-- Headline of screen when setting up new email account (large text over divider)
+        [CHAR LIMIT=none] -->
   <string name="account_setup_basics_headline">تورخەت ھېسابات</string>
+  <!-- On "Set up email" screen, enthusiastic welcome message. -->
   <string name="accounts_welcome">سىز بىر قانچە قەدەم ئىجرا قىلىپلا ھېساباتىڭىزنى تەڭشىيەلەيسىز.</string>
+  <!-- On "Set up email" screen, hint for account email address text field -->
   <string name="account_setup_basics_email_label">تورخەت ئادرېس</string>
+  <!-- Label between OAuth and password authentication, indicating the user must do one or the other [CHAR LIMIT=40] -->
+  <!-- Label for signing in with Google using OAuth -->
+  <!-- On "Set up email" screen, hint for account email password text field, should be uppercase where applicable -->
+  <!-- hint for account email password text field -->
+  <!--  On the "Setup up email" screen, label indicating what service we are signed in with [CHAR LIMIT=40] -->
+  <!-- Label for the authentication section, should be uppercase where applicable [CHAR LIMIT=20] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Label for the add authentication icon [CHAR LIMIT=40] -->
+  <!-- Button name on "Set up email" screen, with action underlined using html [CHAR LIMIT=20] -->
   <string name="account_setup_basics_manual_setup_action">قولدا تەڭشەش</string>
+  <!-- Toast when we can't build a URI from the given email & password -->
+  <!-- Note, the error message in the toast is purposefully vague, because I *don't* know
+        exactly what's wrong. -->
   <string name="account_setup_username_password_toast">ئىناۋەتلىك تورخەت ئادرېسى ۋە ئىم كىرگۈزۈڭ.</string>
+  <!-- Title of dialog shown when a duplicate account is created -->
   <string name="account_duplicate_dlg_title">تەكرار ھېسابات</string>
+  <!-- Message of dialog shown when a duplicate account is created.  The display name of
+         the duplicate account is displayed. -->
   <string name="account_duplicate_dlg_message_fmt">\"<xliff:g id="DUPLICATE">%s</xliff:g>\" ھېسابات ئۈچۈن بۇ ئىشلەتكۈچى ئاتىنى ئىشلەتتىڭىز.</string>
+  <!-- On check-settings screen, this is the initially-displayed message. -->
   <string name="account_setup_check_settings_retr_info_msg">ھېسابات ئۇچۇرىنى ئىزدەۋاتىدۇ…</string>
+  <!-- Appears on screen while system is checking incoming server settings -->
   <string name="account_setup_check_settings_check_incoming_msg">مۇلازىمېتىر تەڭشەكلىرىنى دەلىللەۋاتىدۇ…</string>
+  <!-- Appears on screen while system is checking outgoing server settings -->
   <string name="account_setup_check_settings_check_outgoing_msg">\"smtp تەڭشەكلىرىنى دەلىللەۋاتىدۇ…\"</string>
+  <!-- Appears on screen while system is creating the account -->
   <string name="account_setup_creating_account_msg">ھېسابات قۇرۇۋاتىدۇ…</string>
+  <!-- Headline text that appears on "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Explanatory text that appears on the "Confirm account type" screen [CHAR LIMIT=none] -->
+  <!-- Text that appears on "Set up email" screen after successfully setting up an account
+        [CHAR LIMIT=none] -->
   <string name="account_setup_names_headline">ھېساباتىڭىز تەڭشەلدى، تورخەتنى ئىشلەتسىڭىز بولىدۇ!</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_account_name_label">بۇ ھېساباتقا ئات قويۇش (تاللاشچان)</string>
+  <!-- On "Set up email" screen, label of text field -->
   <string name="account_setup_names_user_name_label">ئاتىڭىز(يوللىغان تورخەتتە كۆرۈنىدۇ)</string>
+  <!-- Headline for the the account type selector (IMAP or POP3 or EAS) [CHAR LIMIT=none] -->
   <string name="account_setup_account_type_headline">ھېسابات تىپى</string>
+  <!-- "Add new email account" screen, text that appears on screen -->
   <string name="account_setup_account_type_instructions">بۇ قانداق تۈردىكى ھېسابات؟</string>
+  <!-- "Incoming server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_incoming_headline">قوبۇللاش مۇلازىمېتىر تەڭشىكى</string>
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an unencrypted session -->
   <string name="account_setup_incoming_security_none_label">يوق</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_ssl_trust_certificates_label">SSL/TLS (ھەممە گۇۋاھنامىگە يول قوي)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session on the selected port, including SSL certificate
+        checks -->
   <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session using the selected
+        port, accepting all SSL certificates -->
   <string name="account_setup_incoming_security_tls_trust_certificates_label">STARTTLS (ھەممە گۇۋاھنامىگە يول قوي)</string>
+  <!-- "Incoming server settings" screen, option for "Security type" pop-up menu indicating
+        the desire for an encrypted session overlaid on a plain text session on the selected
+        port, including SSL certificate checks -->
   <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
+  <!-- "Incoming server settings" screen, label for pop-up menu -->
   <string name="account_setup_incoming_delete_policy_label">مۇلازىمېتىردىن تورخەتنى ئۆچۈر</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_never_label">ھەرگىز</string>
+  <!-- "Incoming server settings" screen, options in pop-up menu for Delete email from server: -->
   <string name="account_setup_incoming_delete_policy_delete_label">قوبۇللاش ساندۇقىدىن ئۆچۈرگەندە</string>
+  <!-- "Incoming server settings" screen, label for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_label">IMAP يولى ئالدى قوشۇلغۇچى</string>
+  <!-- "Incoming server settings" screen, hint for setting IMAP path prefix: -->
   <string name="account_setup_incoming_imap_path_prefix_hint">تاللاشچان</string>
+  <!-- "Outgoing server settings" screen, headline (text over divider) [CHAR LIMIT=none] -->
   <string name="account_setup_outgoing_headline">يوللاش مۇلازىمېتىر تەڭشىكى</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for pop-up menu, should be uppercase where applicable -->
+  <!-- On "Outgoing server settings" screen, label for check box, should be uppercase where applicable -->
   <string name="account_setup_outgoing_require_login_label">تىزىمغا كىرىش زۆرۈر</string>
+  <!-- On "Outgoing server settings" screen, label for text field, should be uppercase where applicable-->
+  <!-- On "Exchange" setup screen, a heading title for the current client certificate, should be uppercase where applicable [CHAR LIMIT=50] -->
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_select_certificate">تاللاڭ</string>
+  <!-- On "Exchange" setup screen, a button label to include a client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_use_certificate">خېرىدار گۇۋاھنامىسى ئىشلەت</string>
+  <!-- On "Exchange" setup screen, a button label to remove the currently used client certificate [CHAR LIMIT=35] -->
   <string name="account_setup_exchange_remove_certificate">چىقىرىۋەت</string>
+  <!-- On "Exchange" setup screen, placeholder text to indicate no client
+         certificate is used [CHAR LIMIT=50] -->
   <string name="account_setup_exchange_no_certificate">يوق</string>
+  <!-- On "Exchange" setup screen, the exchange device-id label, should be uppercase where applicable [CHAR LIMIT=30] -->
+  <!-- In Account setup options screen, Activity headline [CHAR LIMIT=none] -->
   <string name="account_setup_options_headline">ھېسابات تاللانما</string>
+  <!-- In Account setup options screen, label for email check frequency selector -->
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_never">ھەرگىز</string>
+  <!-- In Account setup options & Account Settings screens, label for email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_push">ئاپتوماتىك (ئىتتىرىش)</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_5min">ھەر 5 مىنۇتتا</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_10min">ھەر 10 مىنۇتتا</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_15min">ھەر 15 مىنۇتتا</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_30min">ھەر 30 مىنۇتتا</string>
+  <!-- In Account setup options & Account Settings screens, email check frequency option -->
   <string name="account_setup_options_mail_check_frequency_1hour">ھەر سائەتتە</string>
+  <!-- In Account setup options & Account Settings screens, check box for new-mail notification -->
   <string name="account_setup_options_notify_label">تورخەت كەلگەندە ماڭا ئۇقتۇر.</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_contacts_label">بۇ ھېساباتنىڭ ئالاقەداشلىرىنى قەدەمداشلايدۇ</string>
+  <!-- In Account setup options screen, optional check box to also sync contacts -->
   <string name="account_setup_options_sync_calendar_label">بۇ ھېساباتنىڭ يىلنامەسىنى قەدەمداشلايدۇ</string>
+  <!-- In Account setup options screen, check box to sync email -->
   <string name="account_setup_options_sync_email_label">بۇ ھېساباتنىڭ تورخەتلىرىنى قەدەمداشلايدۇ</string>
+  <!-- In Account setup options screen, check box to auto-download attachments  [CHAR LIMIT=none] -->
   <string name="account_setup_options_background_attachments_label">Wi-Fi تورىغا باغلانغاندا قوشۇمچىنى ئۆزلۈكىدىن چۈشۈر</string>
+  <!-- Dialog title when "setup" could not finish -->
   <string name="account_setup_failed_dlg_title">تاماملىيالمىدى</string>
+  <!-- In Account setup options screen, label for email lookback selector -->
+  <!-- In account setup options & account settings screens (exchange), sync window length; this
+        implies loading a 'reasonable' number of messages [CHAR LIMIT=25] -->
   <string name="account_setup_options_mail_window_auto">ئاپتوماتىك</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1day">ئاخىرقى بىر كۈن</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_3days">ئاخىرقى ئۈچ كۈن\"</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1week">ئۆتكەن ھەپتە</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_2weeks">ئۆتكەن ئىككى ھەپتە</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_1month">ئالدىنقى ئاي</string>
+  <!-- A sync window length setting (i.e. load messages this far back) [CHAR LIMIT=25]  -->
   <string name="account_setup_options_mail_window_all">ھەممىسى</string>
+  <!-- Per-mailbox sync window setting.  This means "use the account's sync window setting" [CHAR LIMIT=40] -->
   <string name="account_setup_options_mail_window_default">ھېساباتنىڭ كۆڭۈلدىكى تەڭشىكىنى ئىشلەت</string>
+  <!-- "Setup could not finish" dialog text; e.g., Username or password incorrect -->
   <string name="account_setup_failed_dlg_auth_message">ئىشلەتكۈچى ئاتىڭىز ياكى ئىمىڭىز ناتوغرا.</string>
+  <!-- Account setup autodiscover auth failure dialog title. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=40] -->
   <string name="account_setup_autodiscover_dlg_authfail_title">ھېسابات سەپلەش مەسىلىسى</string>
+  <!-- Account setup autodiscover auth failure dialog message. This is shown when autodiscover hits
+        an "access denied" server error, which could imply incorrect username/password or that no
+        autodiscover service has been configured for the domain [CHAR LIMIT=NONE] -->
   <string name="account_setup_autodiscover_dlg_authfail_message">ئىشلەتكۈچى ئىسمى، ئىم ۋە ھېسابات تەڭشەكلىرىنىڭ توغرىلىقىنى جەزملەڭ.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message">مۇلازىمېتىرغا بىخەتەر باغلىنالمايدۇ.</string>
+  <!-- An error message presented to the user when the server's identity
+         cannot be established or trusted [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_dlg_certificate_message_fmt">مۇلازىمېتىرغا بىخەتەر باغلىنالمايدۇ.\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
+  <!-- An error message presented to the user when the server requires a
+         client certificate to connect [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_required">خېرىدار گۇۋاھنامەسى زۆرۈر. خېرىدار گۇۋاھنامىسى بىلەن مۇلازىمېتىرغا باغلىنامسىز؟</string>
+  <!-- An error message presented to the user when the certificate they
+         specified for connecting to a server is inaccessible [CHAR LIMIT=NONE] -->
   <string name="account_setup_failed_certificate_inaccessible">بۇ گۇۋاھنامە ئىناۋەتسىز ياكى زىيارەت قىلالمايدۇ.</string>
+  <!-- Dialog text for ambiguous setup failure; server error/bad credentials [CHAR LIMIT=none] -->
   <string name="account_setup_failed_check_credentials_message">مۇلازىمېتىر خاتا ئىنكاس قايتۇردى. ئىشلەتكۈچى ئاتى ۋە ئىمنى تەكشۈرۈپ ئاندىن قايتا سىناڭ.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server -->
   <string name="account_setup_failed_dlg_server_message">مۇلازىمېتىرغا باغلىنالمايدۇ.</string>
+  <!-- "Setup could not finish" dialog text; e.g., Cannot connect to server\n(Connection timed out) -->
   <string name="account_setup_failed_dlg_server_message_fmt">مۇلازىمېتىرغا باغلىنالمايدۇ.\n(<xliff:g id="ERROR">%s</xliff:g>)</string>
+  <!-- Additional diagnostic text when TLS was required but the server doesn't support it -->
   <string name="account_setup_failed_tls_required">TLS زۆرۈر ئەمما مۇلازىمېتىر TLS قوللىمايدۇ.</string>
+  <!-- Additional diagnostic text when server does not support any of our authentication methods -->
   <string name="account_setup_failed_auth_required">مۇلازىمېتىر سالاھىيەت دەلىللەش ئۇسۇلىنى قوللىمايدۇ.</string>
+  <!-- Additional diagnostic text when server connection failed due to security error -->
   <string name="account_setup_failed_security">بىخەتەرلىك خاتالىقى سەۋەبىدىن مۇلازىمېتىر بىلەن باغلىنالمايدۇ.</string>
+  <!-- Additional diagnostic text when server connection failed due to io error (connection) -->
   <string name="account_setup_failed_ioerror">مۇلازىمېتىر بىلەن باغلىنالمايدۇ.</string>
+  <!-- Additional diagnostic text when server connection failed due to our inability to support a
+         required EAS protocol version [CHAR LIMIT=none] -->
   <string name="account_setup_failed_protocol_unsupported">سىز كىرگۈزگەن مۇلازىمېتىر ئادرېسى خاتا ياكى مۇلازىمېتىر تەلەپ قىلغان كېلىشىم نەشرىنى تورخەت مۇلازىمېتىر قوللىمايدۇ</string>
+  <!-- Additional diagnostic text when server access was denied; the user should contact the
+         administrator of the server for more information [CHAR LIMIT=none] -->
   <string name="account_setup_failed_access_denied">بۇ مۇلازىمېتىر بىلەن قەدەمداشلاش ھوقۇقىڭىز يوق. تەپسىلاتى ئۈچۈن مۇلازىمېتىر باشقۇرغۇچى بىلەن ئالاقە قىلىڭ.</string>
+  <!-- Dialog title when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing -->
   <string name="account_setup_security_required_title">يىراقتىكى بىخەتەرلىك باشقۇرۇش</string>
+  <!-- Additional diagnostic text when validation requires security provisioning (e.g. support
+         for device lock PIN, or remote wipe.) and we ask the user permission before continuing.
+         [CHAR LIMIT=none] -->
   <string name="account_setup_security_policies_required_fmt">بۇ <xliff:g id="SERVER">%s</xliff:g> مۇلازىمېتىر ئاندىرويىد ئۈسكۈنىدىكى بەزى بىخەتەرلىك ئىقتىدارلىرىنى يىراقتىن باشقۇرۇشقا يول قويۇشنى تەلەپ قىلىدۇ. بۇ ھېساباتنىڭ تەڭشىكىنى تاماملامسىز؟</string>
+  <!-- Additional diagnostic text when validation failed due to required provisioning not
+         being supported [CHAR LIMIT=none] -->
   <string name="account_setup_failed_security_policies_unsupported">سىزنىڭ ئاندىرويىد ئۈسكۈنىڭىز بۇ مۇلازىمېتىر تەلەپ قىلغان بىخەتەرلىك ئىقتىدارىنى قوللىمايدۇ، ئۇنىڭ ئىچىدە: <xliff:g id="ERROR">%s</xliff:g></string>
+  <!-- Warning given to users when they request disabling device administration (i.e. that their
+         administered accounts will be deleted) [CHAR LIMIT=none] -->
   <string name="disable_admin_warning">ئاگاھلاندۇرۇش: تورخەت ئەپ دەلىللەشنىڭ ئۈسكۈنىڭىزنى باشقۇرۇش ھوقۇقىنى بىكار قىلسىڭىز، بۇ ھوقۇققا ئېھتىياجلىق بارلىق تورخەت ھېساباتى ۋە شۇ ھېساباتتىكى تورخەت، ئالاقەداشلار، يىلنامە پائالىيىتى ۋە باشقا ئۇچۇرلارنىڭ ھەممىسى ئۆچۈرۈلىدۇ.</string>
+  <!-- Dialog shown when the account requires some amount of device security provisioning,
+         just before jumping into system settings such as Device Policy grant, PIN/password,
+         or encryption setup.  [CHAR_LIMIT=40] -->
   <string name="account_security_dialog_title">بىخەتەرلىك يېڭىلانمىسى</string>
+  <!-- Additional diagnostic text when the account requires some amount of device security
+         provisioning, just before jumping into system settings such as Device Policy grant,
+         PIN/password, or encryption setup.  [CHAR LIMIT=none] -->
   <string name="account_security_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> بىخەتەرلىك تەڭشىكىڭىزنى يېڭىلىشىڭىزنى تەلەپ قىلىدۇ.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_unsupported_ticker_fmt">بىخەتەرلىك سەۋەبىدىن \"<xliff:g id="ACCOUNT">%s</xliff:g>\" ھېساباتنى قەدەمداشلىيالمايدۇ.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_needed_ticker_fmt">\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ھېسابات بىخەتەرلىك تەڭشىكىنى يېڭىلاش زۆرۈر.</string>
+  <!-- Notification ticker when device security required (note: unused in Holo XL) -->
   <string name="security_changed_ticker_fmt">\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ھېسابات بىخەتەرلىك تەڭشىكىنى ئۆزگەرتتى؛ ئىشلەتكۈچى ھېچقانداق مەشغۇلات قىلىش ھاجەتسىز.</string>
+  <!-- Notification content title when device security required [CHAR_LIMIT=30] -->
   <string name="security_notification_content_update_title">بىخەتەرلىك تەڭشىكى يېڭىلاشنى تەلەپ قىلىدۇ.</string>
+  <!-- Notification content title when device security policies have changed [CHAR_LIMIT=36] -->
   <string name="security_notification_content_change_title">بىخەتەرلىك تەدبىرى ئۆزگەردى</string>
+  <!-- Notification content title when device security policies cannot be met [CHAR_LIMIT=30] -->
   <string name="security_notification_content_unsupported_title">بىخەتەرلىك تەدبىرىنىڭ تەلىپىنى قاندۇرالمايدۇ</string>
+  <!-- Title of the activity that dispatches changes to device security.  Not normally seen. -->
   <string name="account_security_title">ئۈسكۈنە بىخەتەرلىكى</string>
+  <!-- Additional diagnostic text when the email app asserts control of the phone.
+        [CHAR LIMIT=none] -->
   <string name="account_security_policy_explanation_fmt"><xliff:g id="SERVER">%s</xliff:g> مۇلازىمېتىر ئاندىرويىد ئۈسكۈنىدىكى بەزى بىخەتەرلىك ئىقتىدارلىرىنى يىراقتىن باشقۇرۇشقا يول قويۇشنى تەلەپ قىلىدۇ.</string>
+  <!-- "Setup could not finish" dialog action button -->
   <string name="account_setup_failed_dlg_edit_details_action">تەپسىلات تەھرىر</string>
+  <!-- Notification ticker when device password is getting ready to expire [CHAR_LIMIT=80] -->
   <string name="password_expire_warning_ticker_fmt">\"<xliff:g id="ACCOUNT">%s</xliff:g>\" ئېكران قۇلۇپلاش PIN ياكى ئىم ئۆزگەرتىشنى تەلەپ قىلىدۇ.</string>
+  <!-- Notification content title when device password is getting ready to expire
+            [CHAR_LIMIT=30] -->
   <string name="password_expire_warning_content_title">ئېكران قۇلۇپلاش ئىمنىڭ مۆھلىتى</string>
+  <!-- Notification ticker when device password has expired [CHAR_LIMIT=80] -->
   <string name="password_expired_ticker">ئېكران قۇلۇپلاش PIN ياكى ئىمنىڭ ۋاقتى ئۆتتى.</string>
+  <!-- Notification content title when device password has expired [CHAR_LIMIT=28] -->
   <string name="password_expired_content_title">ئېكران قۇلۇپلاش ئىمنىڭ ۋاقتى ئۆتتى.</string>
+  <!-- Dialog title if device pin/password is going to expire soon. [CHAR_LIMIT=40] -->
   <string name="password_expire_warning_dialog_title">ئېكران قۇلۇپلاش ئىمنىڭ مۆھلىتى</string>
+  <!-- Dialog content device pin/password is going to expire soon. [CHAR_LIMIT=none] -->
   <string name="password_expire_warning_dialog_content_fmt">ئېكران قۇلۇپلاش PIN ياكى ئىمنى تېز پۇرسەتتە ئۆزگەرتىڭ بولمىسا سىستېما <xliff:g id="ACCOUNT">%s</xliff:g> نىڭ سانلىق مەلۇماتىنى ئۆچۈرۈۋېتىدۇ. ھازىرلا ئۆزگەرتەمسىز؟</string>
+  <!-- Dialog title if device pin/password has already expired. [CHAR_LIMIT=40] -->
   <string name="password_expired_dialog_title">ئېكران قۇلۇپلاش ئىمنىڭ ۋاقتى ئۆتتى.</string>
+  <!-- Dialog content device pin/password has already expired. [CHAR_LIMIT=none] -->
   <string name="password_expired_dialog_content_fmt"><xliff:g id="ACCOUNT">%s</xliff:g> نىڭ سانلىق مەلۇماتى ئۈسكۈنىڭىزدىن ئۆچۈرۈلدى. سىز ئېكران قۇلۇپلاش PIN ياكى ئىمنى ئۆزگەرتىپ بۇ سانلىق مەلۇماتلارنى ئەسلىگە كەلتۈرەلەيسىز. ھازىرلا ئۆزگەرتەمسىز؟</string>
+  <!-- On AccountSettingsXL, dialog text if you try to exit in/out/eas fragment (server settings)
+         without checking/saving [CHAR LIMIT=none]-->
   <string name="account_settings_exit_server_settings">ساقلىمىغان ئۆزگەرتىشلەرنى تاشلىۋېتەمدۇ؟</string>
+  <!-- On Settings screen, setting option name -->
+  <!-- Title of account preference for downloading attachments in background [CHAR LIMIT=32] -->
   <string name="account_settings_background_attachments_label">قوشۇمچىلارنى چۈشۈر</string>
+  <!-- Summary of account preference for downloading attachments in background [CHAR LIMIT=64] -->
   <string name="account_settings_background_attachments_summary">يېقىنقى خەت ۋە قوشۇمچىلارنى Wi-Fi ئارقىلىق ئۆزلۈكىدىن چۈشۈرىدۇ</string>
   <string name="account_settings_notify_label">تورخەت ئۇقتۇرۇشى</string>
+  <!-- On Settings screen, summary line when called via AccountManager for Exchange accounts
+        [CHAR LIMIT=50] -->
   <string name="account_settings_summary">قەدەمداش چاستوتاسى، ئۇقتۇرۇش قاتارلىق.</string>
+  <!-- On Settings screen, setting summary text -->
   <string name="account_settings_notify_summary">تورخەت كەلگەندە ئۇقتۇرۇش يوللا</string>
+  <!-- On Settings screen, setting option name and title of dialog box that opens -->
   <string name="account_settings_mail_check_frequency_label">قەدەمداش چاستوتىسى</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_incoming_label">قوبۇللاش تەڭشىكى</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_incoming_summary">ئىشلەتكۈچى ئاتى، ئىم ۋە باشقا قوبۇللاش مۇلازىمېتىر تەڭشىكى</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_outgoing_label">يوللاش تەڭشىكى</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_outgoing_summary">ئىشلەتكۈچى ئاتى، ئىم ۋە باشقا يوللاش مۇلازىمېتىر تەڭشىكى</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_enforced_label">تەدبىرلەر ئىجرا قىلىندى</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_enforced_summary">يوق</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_unsupported_label">قوللىمايدىغان تەدبىرلەر</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_unsupported_summary">يوق</string>
+  <!-- On Settings screen, label for button that attempts to sync the account -->
   <string name="account_settings_retry_label">قەدەمداشنى سىناش</string>
+  <!-- On Settings screen, summmary for button that attempts to sync an account [CHAR LIMIT=64] -->
   <string name="account_settings_retry_summary">بۇ جاي چېكىلسە بۇ ھېساباتنى قەدەمداشلايدۇ</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_description_label">ھېسابات ئاتى</string>
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_name_label">ئاتىڭىز</string>
+  <!-- On Settings screen, setting option name. Allows user to modify saved quick responses
+        for insertion in message body. [CHAR_LIMIT=24]-->
   <string name="account_settings_edit_quick_responses_label">تېز جاۋابلار</string>
+  <!-- On Settings screen, setting option summary [CHAR LIMIT=64] -->
   <string name="account_settings_edit_quick_responses_summary">تورخەت يازغاندا دائىم قىستۇرىدىغان تېكىسنى تەھرىرلەڭ</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_notifications">ئوقتۇرۇش تەڭشىكى </string>
+  <!-- On Settings screen, section heading for data usage [CHAR LIMIT=70] -->
   <string name="account_settings_data_usage">سانلىق مەلۇمات ئىشلىتىلىشى</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_policies">بىخەتەرلىك تەدبىرلىرى</string>
   <string name="system_folders_title">سىستېما قىسقۇچلىرى</string>
   <string name="system_folders_trash_title">ئەخلەتخانا</string>
@@ -168,39 +399,92 @@
   <string name="system_folders_sent_title">ئەۋەتىلگەنلەر قىسقۇچى</string>
   <string name="system_folders_sent_summary">مۇلازىمېتىرىڭىزنىڭ ئەۋەتىلگەن تۈرلەر قىسقۇچىنى تاللاڭ</string>
   <string name="system_folders_sent_dlg">مۇلازىمېتىرىڭىزنىڭ ئەۋەتىلگەن تۈرلەر قىسقۇچىنى تاللاڭ</string>
+  <!-- On settings screen, dialog heading informing user to create or edit a quick response -->
   <string name="edit_quick_response_dialog">تېز جاۋاب</string>
+  <!-- On settings screen, edit quick response dialog's "save" button -->
   <string name="save_action">ساقلا</string>
+  <!-- On settings screen, sync contacts check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_contacts_enable">ئالاقەداش قەدەمداش</string>
+  <!-- On settings screen, sync contacts summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_contacts_summary">بۇ ھېساباتنىڭ ئالاقەداشلىرىنى قەدەمداشلا</string>
+  <!-- On settings screen, sync calendar check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_calendar_enable">يىلنامە قەدەمداشلا</string>
+  <!-- On settings screen, sync calendar summary text [CHAR LIMIT=50] -->
   <string name="account_settings_sync_calendar_summary">بۇ ھېساباتنىڭ يىلنامە پائالىيەتلىرىنى قەدەمداشلايدۇ</string>
+  <!-- On settings screen, sync email check box label [CHAR LIMIT=20]-->
   <string name="account_settings_sync_email_enable">تورخەت قەدەمداشلا</string>
+  <!-- On settings screen, sync email summary text [CHAR LIMIT=35] -->
   <string name="account_settings_sync_email_summary">بۇ ھېساباتنىڭ تورخەتلىرىنى قەدەمداشلا</string>
+  <!-- On Settings screen, vibrate pop-up menu label -->
+  <!-- On Settings screen, setting option name -->
   <string name="account_settings_ringtone">قوڭغۇراقنى تاللاڭ</string>
+  <!-- On Settings screen, section heading -->
   <string name="account_settings_servers">مۇلازىمېتىر تەڭشىكى</string>
+  <!-- Mailbox settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title">قەدەمداش تاللانما</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_settings_activity_title_with_mailbox">قەدەمداش تاللانما (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)</string>
+  <!-- On mailbox settings screen: Whether to sync this mailbox when the account syncs. -->
   <string name="mailbox_settings_sync_enabled_label">بۇ قىسقۇچنى قەدەمداشلا</string>
+  <!-- On mailbox settings screen: Explanatory text for what it means to "sync this folder". -->
   <string name="mailbox_settings_sync_enabled_summary">تورغا باغلانغاندا تورخەت ئۇچۇرلارنى چۈشۈرىدۇ</string>
+  <!-- On mailbox settings screen: Mailbox sync window (the number of days to synchronize email for) setting label [CHAR LIMIT=none] -->
   <string name="mailbox_settings_mailbox_sync_window_label">قەدەمداشلايدىغان تور خەتلەرنىڭ كۈن سانى</string>
+  <!-- Message that appears when adding a T-Online account -->
   <string name="provider_note_t_online">بۇ تورخەت ھېساباتىنى تەڭشەشتىن ئىلگىرى، T-Online تورتۇرانى زىيارەت قىلىپ، بۇ ھېساباتنىڭ POP3 تورخەت زىيارىتى ئۈچۈن ئىم قۇرۇڭ.</string>
+  <!-- Short name of Microsoft Exchange account type; used by AccountManager -->
+  <!-- Long name of Microsoft Exchange account type; used by AccountManager -->
   <string name="exchange_name_alternate">Microsoft Exchange ActiveSync</string>
+  <!-- Message that appears if the AccountManager cannot create the system Account -->
   <string name="system_account_create_failed">ھېسابات قۇرالمىدى. قايتا سىناڭ.</string>
+  <!-- Strings that support the DeviceAdmin / DevicePolicyManager API -->
+  <!-- Name of the DeviceAdmin (seen in settings & in user confirmation screen) -->
   <string name="device_admin_label">تورخەت</string>
+  <!-- Long-form description of the DeviceAdmin (2nd line in settings & in user conf. screen) -->
   <string name="device_admin_description">بەلگىلەنگەن مۇلازىمېتىرنىڭ بىخەتەرلىك تاكتىكىسى قوزغىتىلدى</string>
+  <!-- A policy disallowing the user of the device's camera [CHAR LIMIT=50] -->
   <string name="policy_dont_allow_camera">ئۈسكۈنە كامېراسىنى ئىشلىتىشكە يول قويمايدۇ</string>
+  <!-- A policy requiring a device lock screen password [CHAR LIMIT=50] -->
   <string name="policy_require_password">ئۈسكۈنە ئىم زۆرۈر</string>
+  <!-- A policy disallowing the reuse of recent passwords [CHAR LIMIT=50] -->
   <string name="policy_password_history">يېقىندا ئىشلەتكەن ئىمنى قايتا ئىشلىتىشنى چەكلەيدۇ</string>
+  <!-- A policy that forces a password to expire after a set period of time [CHAR LIMIT=50] -->
   <string name="policy_password_expiration">مەلۇم مەزگىلدىن كېيىن ئىمنىڭ ۋاقتى مەجبۇرىي توشىدۇ</string>
+  <!-- A policy requiring a maximum amount of time the device can sit idle before the lock screen
+        is activated [CHAR LIMIT=50] -->
   <string name="policy_screen_timeout">ئۈسكۈنە بوش بولغاندا ئېكراننى قۇلۇپلاش زۆرۈر</string>
+  <!-- A policy limiting the number of old calendar events synced [CHAR LIMIT=50] -->
   <string name="policy_calendar_age">قەدەمداشلايدىغان يىلنامە پائالىيىتىنىڭ سانىنى چەكلەيدۇ</string>
+  <!-- A policy limiting the number of emails synced [CHAR LIMIT=50] -->
   <string name="policy_email_age">\"قەدەمداشلايدىغان تورخەت سانىنى چەكلەيدۇ\"</string>
+  <!-- The four strings below represent "quick responses" which the user can insert into a
+        message being composed with just a couple of taps.  These four responses MUST be defined,
+        but need not include a string (i.e. they are optional).  Further, the responses can be
+        customized as necessary by the translator, in case one or more of these is inappropriate in
+        a particular locale or if there are better options available. -->
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_1">كۆپ رەھمەت!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_2">مېنىڭچە ياخشى!</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_3">بۇ خەتنى سەل تۇرۇپ ئوقۇپ، سىزگە جاۋاب يازىمەن.</string>
+  <!-- A "quick response", i.e. a quick reply to a received mail [CHAR LIMIT=NONE] -->
   <string name="quick_4">بىز يىغىندىن بىرنى ئورۇنلاشتۇرۇپ، بۇ مەسىلىنى مۇزاكىرە قىلايلى.</string>
+  <!-- This is shown when a user responds to a meeting invitation [CHAR LIMIT=none]-->
   <string name="confirm_response">جاۋاب يوللاۋاتىدۇ&#8230;</string>
+  <!-- Used by AccountManager -->
+  <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
+  <!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
+  <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
   <string name="trash_folder_selection_title"><xliff:g id="ACCOUNT">%s</xliff:g> ئۈچۈن ئەخلەتخانا قىسقۇچىنى تاللاڭ</string>
+  <!-- Displayed when the user must pick his server's sent items folder from a list [CHAR LIMIT 30]-->
   <string name="sent_folder_selection_title"><xliff:g id="ACCOUNT">%s</xliff:g> ئۈچۈن يوللانغان تۈرلەر قىسقۇچىنى تاللاڭ</string>
   <string name="account_waiting_for_folders_msg">قىسقۇچ تىزىمىنى يۈكلەۋاتىدۇ&#8230;</string>
+  <!-- Feedback uri to be used when feedback is enabled -->
+  <!-- Content Provider Authority for Eml Attachments -->
+  <!-- Provider name for widgets -->
+  <!-- This message indicates no quick responses exist to choose from -->
+  <!-- Activity name of the compose activity that should be reconciled -->
+  <!-- Gmail name for redirecting during account setup -->
+  <!-- Name for preference entry which leads to the per-folder sync settings activity -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 5c7070e05..59cafc076 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Параметри сповіщень</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Параметри сповіщень (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Налаштування сповіщень для папки</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Індикація</string>
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-ur-rPK/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-uz-rUZ/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index b9897cb0e..2d13c834c 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <string name="delete_account">Xoá tài khoản</string>
   <string name="delete_account_confirmation_msg">Việc này sẽ xoá tất cả cài đặt và tài khoản email <xliff:g id="account">%s</xliff:g>. Thao tác này không thể hoàn tác.\n\nTiếp tục?</string>
   <string name="deleting_account_msg">Đang xoá tài khoản\u2026</string>
   <string name="delete_account_failed">Không thể xoá tài khoản</string>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">Tùy chọn thông báo</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Tùy chọn thông báo (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">Thư mục cài đặt thông báo</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">Đèn</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index aa874f784..01c75be83 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">通知选项</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">通知选项（<xliff:g id="mailbox_name" example="Family">%s</xliff:g>）</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">文件夹通知设置</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">指示灯</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-zh-rHK/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 990e77cfd..4e0eaa718 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,12 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Delete account -->
   <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>
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title">通知選項</string>
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
   <string name="mailbox_notify_settings_activity_title_with_mailbox">通知選項 (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
   <string name="folder_notify_settings_pref_title">資料夾通知設置</string>
+  <!-- On Settings screen, notification lights pop-up menu label -->
   <string name="label_notification_lights_title">指示燈</string>
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
new file mode 100644
index 000000000..a1e9f76b9
--- /dev/null
+++ b/res/values-zu/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">
+  <!-- Delete account -->
+  <!-- Mailbox notification settings activity title [CHAR LIMIT=none] -->
+  <!-- Mailbox settings activity title, with the target folder name [CHAR LIMIT=none] -->
+  <!-- Name for preference entry which leads to the per-folder notification settings activity -->
+  <!-- On Settings screen, notification lights pop-up menu label -->
+</resources>