Automatic translation import

Change-Id: I8b172b2cc9bf6c40f36a2d786f4259d50ac92b75

22 files changed, 401 insertions, 275 deletions

diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index ece0f9d28..f031a81ee 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -43,8 +43,6 @@
   <string name="too_large_to_attach_additional">Nun s\'axuntó\'l ficheru. Perpasóse la llende de <xliff:g id="MAXSIZE">%1$s</xliff:g>.</string>
   <string name="generic_attachment_problem">Nun pudo axuntase\'l ficheru.</string>
   <string name="recipient_needed">Amiesta polo menos un destinatariu.</string>
-  <string name="recipient_error_dialog_title">Fallu de destinatariu</string>
-  <string name="confirm_send_title">¿Quies unviar el mensaxe?</string>
   <string name="confirm_send_message_with_no_subject">L\'asuntu del mensaxe ta baleru.</string>
   <string name="confirm_send_message_with_no_body">El cuerpu del mensaxe ta baleru.</string>
   <string name="confirm_send_message">¿Quies unviar esti mensaxe?</string>
@@ -100,9 +98,6 @@
   <string name="attachment_unknown">Ficheru <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g></string>
   <string name="preview_attachment">Vista previa</string>
   <string name="save_attachment">Guardar</string>
-  <string name="cancel_attachment">Encaboxar</string>
-  <string name="open_attachment">Abrir</string>
-  <string name="install_attachment">Instalar</string>
   <string name="download_again">Volver a descargar</string>
   <string name="more_info_attachment">Información</string>
   <string name="no_application_found">Nenguna aplicación pue abrir esti ficheru axuntu.</string>
@@ -126,13 +121,6 @@
   <string name="contextmenu_send_mail">Unviar corréu</string>
   <string name="contextmenu_map">Mapa</string>
   <string name="contextmenu_sharelink">Compartir enllaz</string>
-  <string name="contextmenu_help">Ayuda</string>
-  <string name="contextmenu_feedback">Danos la to opinión</string>
-  <string name="num_selected"><xliff:g id="number" example="7">%d</xliff:g></string>
-  <plurals name="move_conversation">
-    <item quantity="one">Mover una conversación</item>
-    <item quantity="other">Mover <xliff:g id="ID_1">%1$d</xliff:g> conversaciones</item>
-  </plurals>
   <string name="content_description"><xliff:g id="toHeader">%1$s</xliff:g><xliff:g id="participant">%2$s</xliff:g> tocante a <xliff:g id="subject">%3$s</xliff:g>, <xliff:g id="snippet">%4$s</xliff:g> on <xliff:g id="date">%5$s</xliff:g>, <xliff:g id="readstate">%6$s</xliff:g></string>
   <string name="content_description_today"><xliff:g id="toHeader">%1$s</xliff:g><xliff:g id="participant">%2$s</xliff:g> tocante a <xliff:g id="subject">%3$s</xliff:g>, <xliff:g id="snippet">%4$s</xliff:g> at <xliff:g id="time">%5$s</xliff:g>, <xliff:g id="readstate">%6$s</xliff:g></string>
   <string name="read_string">conversación lleída</string>
@@ -170,63 +158,18 @@
   <string name="empty_folder">Nun hai correos equí.</string>
   <string name="getting_messages">Obteniendo mensaxes</string>
   <string name="undo">Desfacer</string>
-  <plurals name="conversation_unstarred">
-    <item quantity="one">Anulando <xliff:g id="COUNT">%1$d</xliff:g> conversación destacada</item>
-    <item quantity="other">Anulando <xliff:g id="COUNT">%1$d</xliff:g> conversaciones destacaes</item>
-  </plurals>
-  <plurals name="conversation_muted">
-    <item quantity="one">Silencióse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación.</item>
-    <item quantity="other">Silenciáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones.</item>
-  </plurals>
-  <plurals name="conversation_spammed">
-    <item quantity="one">Marcóse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como spam.</item>
-    <item quantity="other">Marcáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como spam.</item>
-  </plurals>
-  <plurals name="conversation_not_spam">
-    <item quantity="one">Marcóse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como deseada.</item>
-    <item quantity="other">Marcáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como deseaes.</item>
-  </plurals>
-  <plurals name="conversation_not_important">
-    <item quantity="one">Marcóse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como non importante.</item>
-    <item quantity="other">Marcáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como non importantes.</item>
-  </plurals>
-  <plurals name="conversation_phished">
-    <item quantity="one">Marcóse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación como suplantación d\'identidá.</item>
-    <item quantity="other">Marcáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones como suplantación d\'identidá.</item>
-  </plurals>
-  <plurals name="conversation_archived">
-    <item quantity="one">Archivóse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación.</item>
-    <item quantity="other">Archiváronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones.</item>
-  </plurals>
-  <plurals name="conversation_deleted">
-    <item quantity="one">Desanicióse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversación.</item>
-    <item quantity="other">Desaniciáronse &lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; conversaciones.</item>
-  </plurals>
   <string name="deleted">Desaniciada</string>
   <string name="archived">Archivada</string>
   <string name="folder_removed">Desaniciada de <xliff:g id="FOLDERNAME">%1$s</xliff:g></string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="one">Carpeta cambiada</item>
-    <item quantity="other">Carpetes cambiaes</item>
-  </plurals>
   <string name="conversation_folder_moved">Movida a <xliff:g id="FOLDERNAME">%1$s</xliff:g></string>
   <string name="search_results_header">Resultaos</string>
   <string name="search_unsupported">Esta cuenta nun almite la función de gueta.</string>
   <string name="add_label">Amestar carpeta</string>
-  <string name="new_incoming_messages_one">Amosar mensaxe nuevu de <xliff:g id="sender">%s</xliff:g>.</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="one">Amosar <xliff:g id="count">%1$d</xliff:g> mensaxes nuevos.</item>
-    <item quantity="other">Amosar <xliff:g id="count">%1$d</xliff:g> mensaxes nuevos.</item>
-  </plurals>
   <string name="date_and_view_details"><xliff:g id="date">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Ver detalles&lt;/a&gt;</string>
   <string name="hide_details">Anubrir detalles</string>
   <string name="to_message_header">a <xliff:g id="recipients">%1$s</xliff:g></string>
   <string name="contact_info_string">Amosar información de contautu de <xliff:g id="NAME">%1$s</xliff:g></string>
   <string name="contact_info_string_default">Amosar información de contautu</string>
-  <plurals name="show_messages_read">
-    <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> mensaxe antiguu</item>
-    <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> mensaxes antiguos</item>
-  </plurals>
   <string name="from_heading">De:</string>
   <string name="replyto_heading">Responder a:</string>
   <string name="to_heading">Pa: </string>
@@ -260,10 +203,10 @@
   <string name="previous">Anterior</string>
   <string-array name="sync_status">
     <item>Ensin fallos</item>
-    <item>Ensin conexón</item>
-    <item>Fallu al aniciar sesión</item>
-    <item>Fallu de seguridá</item>
-    <item>Fallu al sincronizar</item>
+    <item>No connection</item>
+    <item>Couldn\'t sign in</item>
+    <item>Security error</item>
+    <item>Couldn\'t sync</item>
     <item>Fallu internu</item>
     <item>Fallu del sirvidor</item>
   </string-array>
@@ -277,7 +220,6 @@
     <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ensin lleer</item>
     <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ensin lleer</item>
   </plurals>
-  <string name="actionbar_large_unread_count">Más de <xliff:g id="COUNT">%1$d</xliff:g> ensin lleer</string>
   <string name="view_more_conversations">Ver más conversaciones</string>
   <string name="loading_conversation">Cargando...</string>
   <string name="activity_mailbox_selection">Esbillar cuenta</string>
@@ -285,7 +227,6 @@
   <string name="folder_shortcut_widget_label">Carpeta de corréu</string>
   <string name="change_folders_selection_dialog_title">Cambiar carpetes</string>
   <string name="move_to_selection_dialog_title">Mover a</string>
-  <string name="search_hint">Guetar mensaxe</string>
   <string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string>
   <string name="network_error">Ensin conexón</string>
   <string name="retry">Reintentar</string>
@@ -348,22 +289,8 @@
   </plurals>
   <string name="single_new_message_notification_title"><xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g></string>
   <string name="silent_ringtone">Silenciu</string>
-  <string name="preference_removal_action_title">Archivar y desaniciar</string>
-  <string-array name="prefEntries_removal_action">
-    <item>Amosar namái archivar</item>
-    <item>Amosar namái desaniciar</item>
-    <item>Amosar archivar y desaniciar</item>
-  </string-array>
-  <string-array name="prefSummaries_removal_action_summary">
-    <item>Amosar namái archivar</item>
-    <item>Amosar namái desaniciar</item>
-    <item>Amosar archivar y desaniciar</item>
-  </string-array>
-  <string name="prefDialogTitle_removal_action">Archivar y desaniciar</string>
   <string name="preferences_default_reply_all_title">Responder a toos</string>
   <string name="preferences_default_reply_all_summary_impl">Usar como opción predeterminada pa responder mensaxes</string>
-  <string name="preference_swipe_title_archive">Eslizar p\'archivar</string>
-  <string name="preference_swipe_title_delete">Eslizar pa desaniciar</string>
   <string name="preference_swipe_description">Na llista de conversaciones</string>
   <string name="preference_sender_image_title">Imaxe del remitente</string>
   <string name="preference_sender_image_description">Amosar xunto al nome na llista de conversaciones</string>
@@ -382,18 +309,12 @@
   <string name="folder_icon_desc">Iconu de carpeta</string>
   <string name="add_account">Amestar cuenta</string>
   <string name="dismiss_tip_hover_text">Inorar suxerencia</string>
-  <string name="auto_sync_off">La opción de sincronización automática ta desactivada.</string>
-  <string name="tap_to_enable_sync">Tocar p\'activar.</string>
-  <string name="account_sync_off">La opción de sincronización de cuenta ta desactivada.</string>
-  <string name="enable_sync_in_account_settings">Activar en <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>.</string>
-  <string name="account_settings_param">Axustes de la cuenta</string>
   <string name="unsent_messages_in_outbox"><xliff:g id="NUMBER">%1$s</xliff:g> ensin unviar en <xliff:g id="OUTBOX">%2$s</xliff:g></string>
   <string name="turn_auto_sync_on_dialog_title">¿Quies activar la sincronización automática?</string>
   <string name="turn_auto_sync_on_dialog_body">Los cambeos que faigas en toles aplicaciones y cuentes, non solo en Gmail, van sincronizase na Web, otros de los tos preseos y el to <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>.</string>
   <string name="phone">teléfonu</string>
   <string name="tablet">tableta</string>
   <string name="turn_auto_sync_on_dialog_confirm_btn">Activar</string>
-  <string name="show_n_more_folders">Amosar otres <xliff:g id="NUMBER">%1$s</xliff:g> carpetes</string>
   <string name="hide_folders">Anubrir carpetes</string>
   <string name="print">Imprentar</string>
   <string name="print_all">Impretar too</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index cea37e86a..6c3c59c4d 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Contactes suggerits netejats.</string>
   <string name="clear_suggested_contacts_dialog_title">Vols netejar els contactes suggerits?</string>
   <string name="clear_suggested_contacts_dialog_message">Tots els contactes suggerits prèviament emmagatzemats seran esborrats.</string>
+  <string name="edit_light_settings">Ajustaments de llum de carpeta</string>
+  <string name="pulse_speed_title">Durada i velocitat del parpalleig</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Personalitzat</string>
+  <string name="dialog_delete_title">Esborra</string>
+  <string name="dialog_delete_message">Vols treure l\'element seleccionat?</string>
+  <string name="pref_lights_default">Predeterminat</string>
+  <string name="pulse_length_always_on">Sempre encès</string>
+  <string name="pulse_length_very_short">Molt curt</string>
+  <string name="pulse_length_short">Curt</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Llarg</string>
+  <string name="pulse_length_very_long">Molt llarg</string>
+  <string name="pulse_speed_very_fast">Molt ràpid</string>
+  <string name="pulse_speed_fast">Ràpid</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Lent</string>
+  <string name="pulse_speed_very_slow">Molt lent</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index b8be6db19..bd96d3eae 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Doporučené kontakty vymazány.</string>
   <string name="clear_suggested_contacts_dialog_title">Smazat doporučené kontakty?</string>
   <string name="clear_suggested_contacts_dialog_message">Všechny dříve uložené doporučené kontakty budou odstraněny.</string>
+  <string name="edit_light_settings">Nastavení upozornění světlem</string>
+  <string name="pulse_speed_title">Délka a rychlost pulsu</string>
+  <string name="default_time">Normální</string>
+  <string name="custom_time">Vlastní</string>
+  <string name="dialog_delete_title">Smazat</string>
+  <string name="dialog_delete_message">Odstranit vybranou položku?</string>
+  <string name="pref_lights_default">Výchozí</string>
+  <string name="pulse_length_always_on">Trvale svítící</string>
+  <string name="pulse_length_very_short">Velmi krátká</string>
+  <string name="pulse_length_short">Krátká</string>
+  <string name="pulse_length_normal">Normální</string>
+  <string name="pulse_length_long">Dlouhá</string>
+  <string name="pulse_length_very_long">Velmi dlouhá</string>
+  <string name="pulse_speed_very_fast">Velmi rychle</string>
+  <string name="pulse_speed_fast">Rychle</string>
+  <string name="pulse_speed_normal">Normální</string>
+  <string name="pulse_speed_slow">Pomalu</string>
+  <string name="pulse_speed_very_slow">Velmi pomalu</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index d7ae60dfa..b4e4b3a47 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -29,4 +29,20 @@
   <string name="suggested_contacts_cleared">Vorgeschlagene Kontakte gelöscht.</string>
   <string name="clear_suggested_contacts_dialog_title">Vorgeschlagene Kontakte löschen?</string>
   <string name="clear_suggested_contacts_dialog_message">Alle zuvor gespeicherte, vorgeschlagene Kontakte werden entfernt.</string>
+  <string name="pulse_speed_title">Pulsdauer und Geschwindigkeit</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Benutzerdefiniert</string>
+  <string name="dialog_delete_title">Löschen</string>
+  <string name="pref_lights_default">Standard</string>
+  <string name="pulse_length_always_on">Immer an</string>
+  <string name="pulse_length_very_short">Sehr kurz</string>
+  <string name="pulse_length_short">Kurz</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Lang</string>
+  <string name="pulse_length_very_long">Sehr lang</string>
+  <string name="pulse_speed_very_fast">Sehr schnell</string>
+  <string name="pulse_speed_fast">Schnell</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Langsam</string>
+  <string name="pulse_speed_very_slow">Sehr langsam</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 9cffa83d8..7ba093e5d 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Έγινε εκκαθάριση των προτεινόμενων επαφών.</string>
   <string name="clear_suggested_contacts_dialog_title">Εκκαθάριση των προτεινόμενων επαφών;</string>
   <string name="clear_suggested_contacts_dialog_message">Θα καταργηθούν όλες οι προτεινόμενες επαφές που έχουν αποθηκευτεί προηγουμένως.</string>
+  <string name="edit_light_settings">Ρυθμίσεις φωτισμού φακέλων</string>
+  <string name="pulse_speed_title">Ταχύτητα και μήκος παλμού</string>
+  <string name="default_time">Κανονικό</string>
+  <string name="custom_time">Προσαρμοσμένο</string>
+  <string name="dialog_delete_title">Διαγραφή</string>
+  <string name="dialog_delete_message">Αφαίρεση επιλεγμένου αντικειμένου;</string>
+  <string name="pref_lights_default">Προεπιλογή</string>
+  <string name="pulse_length_always_on">Πάντα ενεργό</string>
+  <string name="pulse_length_very_short">Πολύ σύντομο</string>
+  <string name="pulse_length_short">Σύντομο</string>
+  <string name="pulse_length_normal">Κανονικό</string>
+  <string name="pulse_length_long">Εκτενές</string>
+  <string name="pulse_length_very_long">Πολύ εκτενές</string>
+  <string name="pulse_speed_very_fast">Πολύ γρήγορο</string>
+  <string name="pulse_speed_fast">Γρήγορο</string>
+  <string name="pulse_speed_normal">Κανονικό</string>
+  <string name="pulse_speed_slow">Αργό</string>
+  <string name="pulse_speed_very_slow">Πολύ αργό</string>
 </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..e7156d777
--- /dev/null
+++ b/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CyanogenMod 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>
+  <string name="prefDialogTitle_suggestedContactsMode">Modo</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Desactivado</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">La función de contactos sugeridos está desactivada</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Recientes</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Solamente serán seleccionables los contactos sugeridos recientes</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Todos</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Todos los contactos sugeridos serán seleccionables</string>
+  <string name="preference_header_suggested_contacts">Contactos sugeridos</string>
+  <string name="preference_suggested_contacts_mode">Modo de contactos sugeridos</string>
+  <string name="preference_suggested_contacts_clear_all">Limpiar contactos sugeridos</string>
+  <string name="suggested_contacts_cleared">Se limpiaron los contactos sugeridos.</string>
+  <string name="clear_suggested_contacts_dialog_title">¿Limpiar contactos sugeridos?</string>
+  <string name="clear_suggested_contacts_dialog_message">Se quitarán todos los contactos sugeridos almacenados previamente.</string>
+</resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
new file mode 100644
index 000000000..181fa0580
--- /dev/null
+++ b/res/values-eu-rES/cm_strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CyanogenMod 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>
+  <string name="prefDialogTitle_suggestedContactsMode">Modua</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Ezgaituta</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Iradokitako kontaktuen ezaugarria ezgaituta dago</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Oraintsukoak</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Berriki proposatutako kontaktuak besterik ezin izango dira hautatu</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Guztiak</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Iradokitako kontaktu guztiak hautatu ahal izango dira</string>
+  <string name="preference_header_suggested_contacts">Iradokitako kontaktuak</string>
+  <string name="preference_suggested_contacts_mode">Iradokitako kontaktuen modua</string>
+  <string name="preference_suggested_contacts_clear_all">Garbitu iradokitako kontaktuak</string>
+  <string name="suggested_contacts_cleared">Iradokitako kontaktuak garbitu dira.</string>
+  <string name="clear_suggested_contacts_dialog_title">Garbitu iradokitako kontaktuak?</string>
+  <string name="clear_suggested_contacts_dialog_message">Aurretik gordetako iradokitako kontaktu guztiak ezabatuko dira.</string>
+  <string name="dialog_delete_title">Ezabatu</string>
+  <string name="pref_lights_default">Lehenetsia</string>
+  <string name="pulse_length_always_on">Beti piztuta</string>
+  <string name="pulse_length_long">Luzea</string>
+  <string name="pulse_length_very_long">Oso luzea</string>
+  <string name="pulse_speed_very_fast">Oso azkarra</string>
+  <string name="pulse_speed_fast">Azkarra</string>
+  <string name="pulse_speed_slow">Motela</string>
+</resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 1285ecd48..6ba2ce82c 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Ehdotetut yhteystiedot tyhjennetty.</string>
   <string name="clear_suggested_contacts_dialog_title">Tyhjennä ehdotetut yhteystiedot?</string>
   <string name="clear_suggested_contacts_dialog_message">Kaikki aiemmin tallennetut ehdotetut yhteystiedot poistetaan.</string>
+  <string name="edit_light_settings">Kansion valoasetukset</string>
+  <string name="pulse_speed_title">Vilkunnan kesto ja nopeus</string>
+  <string name="default_time">Normaali</string>
+  <string name="custom_time">Muokattu</string>
+  <string name="dialog_delete_title">Poista</string>
+  <string name="dialog_delete_message">Poista valittu kohde?</string>
+  <string name="pref_lights_default">Oletus</string>
+  <string name="pulse_length_always_on">Aina päällä</string>
+  <string name="pulse_length_very_short">Erittäin lyhyt</string>
+  <string name="pulse_length_short">Lyhyt</string>
+  <string name="pulse_length_normal">Normaali</string>
+  <string name="pulse_length_long">Pitkä</string>
+  <string name="pulse_length_very_long">Erittäin pitkä</string>
+  <string name="pulse_speed_very_fast">Erittäin nopea</string>
+  <string name="pulse_speed_fast">Nopea</string>
+  <string name="pulse_speed_normal">Normaali</string>
+  <string name="pulse_speed_slow">Hidas</string>
+  <string name="pulse_speed_very_slow">Erittäin hidas</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index c037c6c10..fe6e97350 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -17,6 +17,16 @@
 -->
 <resources>
   <string name="prefDialogTitle_suggestedContactsMode">Mode</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Désactivé</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">La suggestion des contacts est désactivée</string>
   <string name="prefDialogTitle_suggestedContactsMode_recents">Récents</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Uniquement les contacts récemment suggérés seront sélectionnables</string>
   <string name="prefDialogTitle_suggestedContactsMode_all">Tous</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Tous les contacts suggérés seront sélectionnables</string>
+  <string name="preference_header_suggested_contacts">Contacts suggérés</string>
+  <string name="preference_suggested_contacts_mode">Mode contacts suggérés</string>
+  <string name="preference_suggested_contacts_clear_all">Effacer les contacts suggérés</string>
+  <string name="suggested_contacts_cleared">Contacts suggérés effacés.</string>
+  <string name="clear_suggested_contacts_dialog_title">Effacer les contacts suggérés ?</string>
+  <string name="clear_suggested_contacts_dialog_message">Tous les contacts suggérés précédemment stockés seront supprimés.</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 1abc89e63..266927bac 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Javasolt névjegyek törölve.</string>
   <string name="clear_suggested_contacts_dialog_title">Biztosan törli a javasolt névjegyeket?</string>
   <string name="clear_suggested_contacts_dialog_message">A korábban tárolt javasolt névjegyek eltávolításra kerülnek.</string>
+  <string name="edit_light_settings">Mappa fény értesítési beállítások</string>
+  <string name="pulse_speed_title">Impulzus hossza és sebessége</string>
+  <string name="default_time">Normál</string>
+  <string name="custom_time">Egyéni</string>
+  <string name="dialog_delete_title">Törlés</string>
+  <string name="dialog_delete_message">Biztosan törli a kiválasztott elemet?</string>
+  <string name="pref_lights_default">Alapértelmezett</string>
+  <string name="pulse_length_always_on">Mindig bekapcsolva</string>
+  <string name="pulse_length_very_short">Nagyon rövid</string>
+  <string name="pulse_length_short">Rövid</string>
+  <string name="pulse_length_normal">Normál</string>
+  <string name="pulse_length_long">Hosszú</string>
+  <string name="pulse_length_very_long">Nagyon hosszú</string>
+  <string name="pulse_speed_very_fast">Nagyon gyors</string>
+  <string name="pulse_speed_fast">Gyors</string>
+  <string name="pulse_speed_normal">Normál</string>
+  <string name="pulse_speed_slow">Lassú</string>
+  <string name="pulse_speed_very_slow">Nagyon lassú</string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
new file mode 100644
index 000000000..ab15dcd02
--- /dev/null
+++ b/res/values-in/cm_strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CyanogenMod 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>
+  <string name="prefDialogTitle_suggestedContactsMode">Mode</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Dinonaktifkan</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Fitur kontak disarankan dinonaktifkan</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Baru saja</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Hanya kontak yang disarankan baru saja yang dapat dipilih</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Semua</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Semua kontak yang disarankan akan dapat dipilih</string>
+  <string name="preference_header_suggested_contacts">Kontak yang disarankan</string>
+  <string name="preference_suggested_contacts_mode">Modus kontak yang disarankan</string>
+  <string name="preference_suggested_contacts_clear_all">Hapus kontak yang disarankan</string>
+  <string name="suggested_contacts_cleared">Kontak yang disarankan telah dibersihkan.</string>
+  <string name="clear_suggested_contacts_dialog_title">Hapus kontak yang disarankan?</string>
+  <string name="clear_suggested_contacts_dialog_message">Semua kontak yang disarankan yang tersimpan sebelumnya akan dihapus.</string>
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index da9df7ae1..bc0b32fa8 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Contatti suggeriti  eliminati.</string>
   <string name="clear_suggested_contacts_dialog_title">Pulire i contatti suggeriti?</string>
   <string name="clear_suggested_contacts_dialog_message">Verranno rimossi tutti i contatti suggeriti precedentemente memorizzati.</string>
+  <string name="edit_light_settings">Impostazioni luci della cartella</string>
+  <string name="pulse_speed_title">Durata e velocità del lampeggio</string>
+  <string name="default_time">Normale</string>
+  <string name="custom_time">Personalizzato</string>
+  <string name="dialog_delete_title">Elimina</string>
+  <string name="dialog_delete_message">Rimuovere l\'oggetto selezionato?</string>
+  <string name="pref_lights_default">Predefinito</string>
+  <string name="pulse_length_always_on">Sempre acceso</string>
+  <string name="pulse_length_very_short">Molto breve</string>
+  <string name="pulse_length_short">Breve</string>
+  <string name="pulse_length_normal">Normale</string>
+  <string name="pulse_length_long">Lungo</string>
+  <string name="pulse_length_very_long">Molto lungo</string>
+  <string name="pulse_speed_very_fast">Molto veloce</string>
+  <string name="pulse_speed_fast">Veloce</string>
+  <string name="pulse_speed_normal">Normale</string>
+  <string name="pulse_speed_slow">Lento</string>
+  <string name="pulse_speed_very_slow">Molto lento</string>
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 444f45fb2..375d97e4b 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -42,8 +42,6 @@
   <string name="too_large_to_attach_additional">پەڕگە نەلکێنرا. <xliff:g id="maxSize">%1$s</xliff:g> سنور بە دەست گەیشتووە.</string>
   <string name="generic_attachment_problem">ناتوانرا پەڕگە بلکێنرێت.</string>
   <string name="recipient_needed">لانیکەم یەک وەرگر زێدە بکە.</string>
-  <string name="recipient_error_dialog_title">وەرگر هەڵەیە</string>
-  <string name="confirm_send_title">نامە ئەنێری؟</string>
   <string name="confirm_send_message_with_no_subject">لە بابەتی نامەکەدا هیچ نووسراوەیەک نییە.</string>
   <string name="confirm_send_message_with_no_body">لە پەیکەری نامەکەدا هیچ نووسراوەیەک نییە.</string>
   <string name="confirm_send_message">ئەم نامەیە ئەنێری؟</string>
@@ -97,7 +95,6 @@
   <string name="attachment_unknown"><xliff:g id="attachmentExtension">%s</xliff:g> په‌ڕگه‌</string>
   <string name="preview_attachment">پێشبینین</string>
   <string name="save_attachment">پاشەکەوتکردن</string>
-  <string name="cancel_attachment">هەڵوەشاندنەوە</string>
   <string name="download_again">دووباره‌ داگرتن</string>
   <string name="more_info_attachment">زانیاری</string>
   <string name="no_application_found">به‌بێ هیچ به‌رنامه‌یه‌ک ئه‌توانرێ بکرێته‌وه‌.</string>
@@ -119,13 +116,6 @@
   <string name="contextmenu_send_mail">ناردنی پۆستی ئەلەکترۆنی</string>
   <string name="contextmenu_map">نەخشە</string>
   <string name="contextmenu_sharelink">هاوبەشکردنی بەستەر</string>
-  <string name="contextmenu_help">یارمەتی</string>
-  <string name="contextmenu_feedback">ناردنی ڕەخنە و پێشنیار</string>
-  <string name="num_selected"><xliff:g id="number" example="7">%d</xliff:g></string>
-  <plurals name="move_conversation">
-    <item quantity="one">گواستنەوەی گفتوگۆ</item>
-    <item quantity="other">گواستنەوەی<xliff:g>%1$d</xliff:g> گفتوگۆکان</item>
-  </plurals>
   <string name="read_string">وتووێژ خوێندرایه‌وه‌</string>
   <string name="unread_string">وتووێژ نه‌خوێنراوه‌ته‌وه‌</string>
   <string name="filtered_tag"> [<xliff:g id="tag">%1$s</xliff:g>]<xliff:g id="subject">%2$s</xliff:g></string>
@@ -138,17 +128,9 @@
   <string name="confirm_discard_text">وازهێنان له‌م نامه‌یه‌؟</string>
   <string name="loading_conversations">بارکردن\u2026</string>
   <string name="undo">پاشگەزبوونەوە</string>
-  <plurals name="conversation_not_spam">
-    <item quantity="one">وlt;bوgt;<xliff:g id="count">%1$d</xliff:g>وlt;/bوgt; وەک زبڵ پەرچدرایەوە.</item>
-    <item quantity="other">وlt;bوgt;<xliff:g id="count">%1$d</xliff:g>وlt;/bوgt; وەک زبڵ بەرپەرچنەدرایەوە.</item>
-  </plurals>
   <string name="deleted">سڕایەوە</string>
   <string name="archived">ئه‌رشیفکراو</string>
   <string name="folder_removed">لابرا له‌ <xliff:g id="folderName">%1$s</xliff:g></string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="one">خونچە گۆڕڕا.</item>
-    <item quantity="other">خونچەکان گۆڕڕا.</item>
-  </plurals>
   <string name="conversation_folder_moved">جوڵێنرا بۆ <xliff:g id="folderName">%1$s</xliff:g></string>
   <string name="search_results_header">ئه‌نجامه‌کان</string>
   <string name="search_unsupported">گه‌ڕان نه‌گونجاوه‌ بۆ ئه‌م هه‌ژماره‌.</string>
@@ -178,10 +160,10 @@
   <string name="clear">پاککردن</string>
   <string-array name="sync_status">
     <item>سەرکەوتن</item>
-    <item>هيچ پەيوەندى.</item>
-    <item>نەیتوانی بچێتە ژوورەوە.</item>
-    <item>هەڵەی پاراستن.</item>
-    <item>نەیتوانی هاوکاتسازی بکات.</item>
+    <item>No connection</item>
+    <item>Couldn\'t sign in</item>
+    <item>Security error</item>
+    <item>Couldn\'t sync</item>
     <item>هەڵەی ناوەکی</item>
     <item>Server Error</item>
   </string-array>
@@ -189,7 +171,6 @@
   <string name="non_synced_folder_description">بۆ بینینی وتووێژ. ئه‌م بوخچه‌یه‌ ڕاگواستنی بۆ بکه‌.</string>
   <string name="tap_to_configure_folder_sync">ڕاگواستنی بوخچه‌</string>
   <string name="widget_large_unread_count">%d+</string>
-  <string name="actionbar_large_unread_count"><xliff:g id="count">%1$d</xliff:g>+ نه‌خوێنراوه‌</string>
   <string name="view_more_conversations">وتووێژی زیاتر نییە</string>
   <string name="loading_conversation">بارکردن\u2026</string>
   <string name="activity_mailbox_selection">هەژمار هەڵبژێرە</string>
@@ -197,7 +178,6 @@
   <string name="folder_shortcut_widget_label">بوخچه‌ی پۆستی ئه‌لیکترۆنی</string>
   <string name="change_folders_selection_dialog_title">گۆڕینی بۆخچەکان</string>
   <string name="move_to_selection_dialog_title">گواستنەوە بۆ</string>
-  <string name="search_hint">گەڕانی پۆستی ئه‌لیکترۆنی</string>
   <string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string>
   <string name="network_error">بەستنەوە نییە</string>
   <string name="retry">هەوڵدانەوە</string>
@@ -255,21 +235,7 @@
   <string name="label_notification_ticker">"<xliff:g id="label">%s</xliff:g>: <xliff:g id="notification">%s</xliff:g>"</string>
   <string name="single_new_message_notification_title"><xliff:g id="sender">%1$s</xliff:g>: <xliff:g id="subject">%2$s</xliff:g></string>
   <string name="silent_ringtone">بێدەنگ</string>
-  <string name="preference_removal_action_title">ئه‌رشیف وamp; سڕینه‌وه‌ی کار</string>
-  <string-array name="prefEntries_removal_action">
-    <item>تەنها پیشاندانی ئەرشیف</item>
-    <item>تەنها سڕینەوە پیشانبدە</item>
-    <item>پیشاندانی ئەرشیف وamp; سڕینەوە</item>
-  </string-array>
-  <string-array name="prefSummaries_removal_action_summary">
-    <item>تەنها پیشاندانی ئەرشیف</item>
-    <item>تەنها سڕینەوە پیشانبدە</item>
-    <item>پیشاندانی ئەرشیف وamp; سڕینەوە</item>
-  </string-array>
-  <string name="prefDialogTitle_removal_action">ئه‌رشیف &amp; سڕینه‌وه‌ی چالاکییەکان</string>
   <string name="preferences_default_reply_all_title">وەڵامدانەوەی هەموو</string>
-  <string name="preference_swipe_title_archive">سوین بۆ ئەرشیف</string>
-  <string name="preference_swipe_title_delete">سوین بۆ سڕینەوە</string>
   <string name="preference_swipe_description">لە ڕیزبەدنی گفتوگۆ</string>
   <string name="preference_sender_image_title">وێنەی نێرەر</string>
   <string name="preference_sender_image_description">پیشاندانی لە پاڵ ناو لە ڕیزبەندی گفتوگۆ</string>
@@ -284,11 +250,6 @@
   <string name="folder_icon_desc">وێنۆچکەی خونچە</string>
   <string name="add_account">زیاکردنی هەژمار</string>
   <string name="dismiss_tip_hover_text">لەبیرکردنی نووک</string>
-  <string name="auto_sync_off">خۆکارانه‌ ڕاگواستن چالاک نییه‌.</string>
-  <string name="tap_to_enable_sync">تاپ بکه‌ بۆ چالاککردن.</string>
-  <string name="account_sync_off">ناردنی هەژمار داخرا.</string>
-  <string name="enable_sync_in_account_settings">چالاککردنی لەسەر <xliff:g id="account_settings">%1$s</xliff:g>.</string>
-  <string name="account_settings_param">ڕێکخستنەکانی هەژمار</string>
   <string name="unsent_messages_in_outbox"><xliff:g id="number">%1$s</xliff:g>
     دانه‌نراوه‌ له‌ <xliff:g id="outbox">%2$s</xliff:g></string>
   <string name="turn_auto_sync_on_dialog_title">چالاککردنی خۆکارانه‌ ڕاگواستن؟</string>
@@ -298,7 +259,6 @@
   <string name="phone">مۆبایل</string>
   <string name="tablet">تاتەبژمێر</string>
   <string name="turn_auto_sync_on_dialog_confirm_btn">هەڵکردن</string>
-  <string name="show_n_more_folders">پێشاندانی <xliff:g id="number">%1$s</xliff:g> پوخچەکانی زیاتر</string>
   <string name="hide_folders">شاردنەوەی بوخچە</string>
   <string name="help_and_info">یارمەتی</string>
   <string name="feedback">ناردنی تێبینی</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 3a4a6e8dd..0cf5c72e4 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Virgeschloe Kontakter geläscht.</string>
   <string name="clear_suggested_contacts_dialog_title">Virgeschloe Kontakter läschen?</string>
   <string name="clear_suggested_contacts_dialog_message">All déi bis elo virgeschloe Kontakter gi geläscht.</string>
+  <string name="edit_light_settings">Luuchtastellunge vum Dossier</string>
+  <string name="pulse_speed_title">Pulsdauer a -geschwindegkeet</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Personaliséiert</string>
+  <string name="dialog_delete_title">Läschen</string>
+  <string name="dialog_delete_message">Ausgewielt Element läschen?</string>
+  <string name="pref_lights_default">Standard</string>
+  <string name="pulse_length_always_on">Ëmmer un</string>
+  <string name="pulse_length_very_short">Ganz kuerz</string>
+  <string name="pulse_length_short">Kuerz</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Laang</string>
+  <string name="pulse_length_very_long">Ganz laang</string>
+  <string name="pulse_speed_very_fast">Ganz séier</string>
+  <string name="pulse_speed_fast">Séier</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Lues</string>
+  <string name="pulse_speed_very_slow">Ganz lues</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 338e92421..4f68212ef 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -43,8 +43,6 @@
   <string name="too_large_to_attach_additional">Fichier net ugehaangen. <xliff:g id="maxSize">%1$s</xliff:g>-Limitt erreecht.</string>
   <string name="generic_attachment_problem">Konnt de Fichier net drunhänken.</string>
   <string name="recipient_needed">Setz op d\'mannst een Empfänger dobäi.</string>
-  <string name="recipient_error_dialog_title">Empfänger-Feeler</string>
-  <string name="confirm_send_title">Message schécken?</string>
   <string name="confirm_send_message_with_no_subject">De Sujet ass eidel.</string>
   <string name="confirm_send_message_with_no_body">Den Text ass eidel.</string>
   <string name="confirm_send_message">Dëse Message schécken?</string>
@@ -100,9 +98,6 @@
   <string name="attachment_unknown"><xliff:g id="attachmentExtension">%s</xliff:g> Fichier</string>
   <string name="preview_attachment">Virschau</string>
   <string name="save_attachment">Späicheren</string>
-  <string name="cancel_attachment">Ofbriechen</string>
-  <string name="open_attachment">Opmaachen</string>
-  <string name="install_attachment">Installéieren</string>
   <string name="download_again">Erëm eroflueden</string>
   <string name="more_info_attachment">Info</string>
   <string name="no_application_found">Et gëtt keng App fir dësen Unhang.</string>
@@ -126,13 +121,6 @@
   <string name="contextmenu_send_mail">E-Mail schécken</string>
   <string name="contextmenu_map">Kaart</string>
   <string name="contextmenu_sharelink">Link deelen</string>
-  <string name="contextmenu_help">Hëllef</string>
-  <string name="contextmenu_feedback">Feedback schécken</string>
-  <string name="num_selected"><xliff:g id="number" example="7">%d</xliff:g></string>
-  <plurals name="move_conversation">
-    <item quantity="one">Konversatioun réckelen</item>
-    <item quantity="other"><xliff:g>%1$d</xliff:g> Konversatioune réckelen</item>
-  </plurals>
   <string name="content_description"><xliff:g id="toHeader">%1$s</xliff:g><xliff:g id="participant">%2$s</xliff:g> iwwer <xliff:g id="subject">%3$s</xliff:g>, <xliff:g id="snippet">%4$s</xliff:g> um <xliff:g id="time">%5$s</xliff:g>, <xliff:g id="readstate">%6$s</xliff:g></string>
   <string name="content_description_today"><xliff:g id="toHeader">%1$s</xliff:g><xliff:g id="participant">%2$s</xliff:g> iwwer <xliff:g id="subject">%3$s</xliff:g>, <xliff:g id="snippet">%4$s</xliff:g> um <xliff:g id="time">%5$s</xliff:g>, <xliff:g id="readstate">%6$s</xliff:g></string>
   <string name="read_string">Konversatioun gelies</string>
@@ -170,63 +158,18 @@
   <string name="empty_folder">Keng E-Mailen hei.</string>
   <string name="getting_messages">Messagë gi gelueden</string>
   <string name="undo">Réckgängeg maachen</string>
-  <plurals name="conversation_unstarred">
-    <item quantity="one">Stär bei <xliff:g id="count">%1$d</xliff:g> Konversatioun ewechgeholl.</item>
-    <item quantity="other">Stär bei <xliff:g id="count">%1$d</xliff:g> Konversatiounen ewechgeholl.</item>
-  </plurals>
-  <plurals name="conversation_muted">
-    <item quantity="one">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; roueg geschalt.</item>
-    <item quantity="other">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; roueg geschalt.</item>
-  </plurals>
-  <plurals name="conversation_spammed">
-    <item quantity="one">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als Spam gemellt.</item>
-    <item quantity="other">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als Spam gemellt.</item>
-  </plurals>
-  <plurals name="conversation_not_spam">
-    <item quantity="one">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als net Spam gemellt.</item>
-    <item quantity="other">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als net Spam gemellt.</item>
-  </plurals>
-  <plurals name="conversation_not_important">
-    <item quantity="one">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als wichteg markéiert.</item>
-    <item quantity="other">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als wichteg markéiert.</item>
-  </plurals>
-  <plurals name="conversation_phished">
-    <item quantity="one">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als Phishing gemellt.</item>
-    <item quantity="other">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; als Phishing gemellt.</item>
-  </plurals>
-  <plurals name="conversation_archived">
-    <item quantity="one">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; archivéiert.</item>
-    <item quantity="other">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; archivéiert.</item>
-  </plurals>
-  <plurals name="conversation_deleted">
-    <item quantity="one">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; geläscht.</item>
-    <item quantity="other">&lt;b&gt;<xliff:g id="count">%1$d</xliff:g>&lt;/b&gt; geläscht.</item>
-  </plurals>
   <string name="deleted">Geläscht</string>
   <string name="archived">Archivéiert</string>
   <string name="folder_removed">Aus <xliff:g id="folderName">%1$s</xliff:g> geläscht</string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="one">Dossier gewiesselt.</item>
-    <item quantity="other">Dossiere gewiesselt.</item>
-  </plurals>
   <string name="conversation_folder_moved">Geréckelt an den Dossier <xliff:g id="folderName">%1$s</xliff:g></string>
   <string name="search_results_header">Resultater</string>
   <string name="search_unsupported">D\'Sich ass op dësem Kont net ënnerstëtzt.</string>
   <string name="add_label">Dossier dobäisetzen</string>
-  <string name="new_incoming_messages_one">Nei Messagë vum <xliff:g id="sender">%s</xliff:g> uweisen.</string>
-  <plurals name="new_incoming_messages_many">
-    <item quantity="one"><xliff:g id="count">%1$d</xliff:g> neie Message uweisen.</item>
-    <item quantity="other"><xliff:g id="count">%1$d</xliff:g> nei Messagen uweisen.</item>
-  </plurals>
   <string name="date_and_view_details"><xliff:g id="date">%1$s</xliff:g> &lt;a href=\'http://www.example.com\'&gt;Detailer uweisen&lt;/a&gt;</string>
   <string name="hide_details">Detailer verstoppen</string>
   <string name="to_message_header">un: <xliff:g id="recipients">%1$s</xliff:g></string>
   <string name="contact_info_string">Kontakt-Informatioun fir <xliff:g id="name">%1$s</xliff:g> uweisen</string>
   <string name="contact_info_string_default">Kontakt-Informatioun uweisen</string>
-  <plurals name="show_messages_read">
-    <item quantity="one"><xliff:g id="count" example="4">%1$d</xliff:g> méi ale Message</item>
-    <item quantity="other"><xliff:g id="count" example="4">%1$d</xliff:g> méi al Messagen</item>
-  </plurals>
   <string name="from_heading">Vun:</string>
   <string name="replyto_heading">Äntwert-un:</string>
   <string name="to_heading">Un:\u0020</string>
@@ -260,10 +203,10 @@
   <string name="previous">Zréck</string>
   <string-array name="sync_status">
     <item>Erfollegräich</item>
-    <item>Keng Connectioun.</item>
-    <item>Alogge war net méiglech.</item>
-    <item>Sécherheetsfeeler.</item>
-    <item>Konnt net synchroniséieren.</item>
+    <item>No connection</item>
+    <item>Couldn\'t sign in</item>
+    <item>Security error</item>
+    <item>Couldn\'t sync</item>
     <item>Interne Feeler</item>
     <item>Serverfeeler</item>
   </string-array>
@@ -277,7 +220,6 @@
     <item quantity="one"><xliff:g id="count" example="4">%1$d</xliff:g> ongelies</item>
     <item quantity="other"><xliff:g id="count" example="4">%1$d</xliff:g> ongelies</item>
   </plurals>
-  <string name="actionbar_large_unread_count"><xliff:g id="count">%1$d</xliff:g>+ ongelies</string>
   <string name="view_more_conversations">Méi Konversatiounen uweisen</string>
   <string name="loading_conversation">Gëtt gelueden\u2026</string>
   <string name="activity_mailbox_selection">Kont auswielen</string>
@@ -285,7 +227,6 @@
   <string name="folder_shortcut_widget_label">E-Mail-Dossier</string>
   <string name="change_folders_selection_dialog_title">Dossiere wiesselen</string>
   <string name="move_to_selection_dialog_title">An den Dossier réckelen</string>
-  <string name="search_hint">E-Mail sichen</string>
   <string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string>
   <string name="network_error">Keng Connectioun</string>
   <string name="retry">Nees probéieren</string>
@@ -348,22 +289,8 @@
   </plurals>
   <string name="single_new_message_notification_title"><xliff:g id="sender">%1$s</xliff:g>: <xliff:g id="subject">%2$s</xliff:g></string>
   <string name="silent_ringtone">Roueg</string>
-  <string name="preference_removal_action_title">Aktioun beim Archivéieren a Läschen</string>
-  <string-array name="prefEntries_removal_action">
-    <item>Just \"Archivéieren\" uweisen</item>
-    <item>Just \"Läschen\" uweisen</item>
-    <item>\"Archivéieren\" a \"Läschen\" uweisen</item>
-  </string-array>
-  <string-array name="prefSummaries_removal_action_summary">
-    <item>Just \"Archivéieren\" uweisen</item>
-    <item>Just \"Läschen\" uweisen</item>
-    <item>\"Archivéieren\" a \"Läschen\" uweisen</item>
-  </string-array>
-  <string name="prefDialogTitle_removal_action">Aktioun beim Archivéieren a Läschen</string>
   <string name="preferences_default_reply_all_title">Allen Äntwerten</string>
   <string name="preferences_default_reply_all_summary_impl">Als Standard fir Äntwerte benotzen</string>
-  <string name="preference_swipe_title_archive">Wësche fir z\'archivéieren</string>
-  <string name="preference_swipe_title_delete">Wësche fir ze läschen</string>
   <string name="preference_swipe_description">An der Konversatiounslëscht</string>
   <string name="preference_sender_image_title">Ofsender-Bild</string>
   <string name="preference_sender_image_description">Nieft dem Numm an der Konversatiounslëscht uweisen</string>
@@ -382,18 +309,12 @@
   <string name="folder_icon_desc">Dossierssymbol</string>
   <string name="add_account">Kont dobäisetzen</string>
   <string name="dismiss_tip_hover_text">Tipp verwerfen</string>
-  <string name="auto_sync_off">Auto-Sync ass aus.</string>
-  <string name="tap_to_enable_sync">Drécke fir unzeschalten.</string>
-  <string name="account_sync_off">Kontesynchronisatioun ass aus.</string>
-  <string name="enable_sync_in_account_settings">Uschalten ënner <xliff:g id="account_settings">%1$s</xliff:g>.</string>
-  <string name="account_settings_param">Kontenastellungen</string>
   <string name="unsent_messages_in_outbox"><xliff:g id="number">%1$s</xliff:g> net verschéckt am Dossier <xliff:g id="outbox">%2$s</xliff:g></string>
   <string name="turn_auto_sync_on_dialog_title">Automatesch Synchroniséierung uschalten?</string>
   <string name="turn_auto_sync_on_dialog_body">Ännerungen déi s du bei all Appen a Konten - net just Gmail - méchs, ginn tëscht dem Internet, dengen aneren Apparater an dengem <xliff:g id="phone_or_tablet">%1$s</xliff:g> synchroniséiert.</string>
   <string name="phone">Telefon</string>
   <string name="tablet">Tablet</string>
   <string name="turn_auto_sync_on_dialog_confirm_btn">Uschalten</string>
-  <string name="show_n_more_folders"><xliff:g id="number">%1$s</xliff:g> weider Dossieren uweisen</string>
   <string name="hide_folders">Dossiere verstoppen</string>
   <string name="print">Drécken</string>
   <string name="print_all">All drécken</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index bd8613a00..2d9dd3aa4 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Siūlomi kontaktai išvalyti.</string>
   <string name="clear_suggested_contacts_dialog_title">Išvalyti siūlomus kontaktus?</string>
   <string name="clear_suggested_contacts_dialog_message">Visi anksčiau išsaugoti siūlomi kontaktai bus pašalinti.</string>
+  <string name="edit_light_settings">Aplanko šviesos nustatymai</string>
+  <string name="pulse_speed_title">Pulsavimo trukmė ir greitis</string>
+  <string name="default_time">Normalus</string>
+  <string name="custom_time">Priskirtas</string>
+  <string name="dialog_delete_title">Ištrinti</string>
+  <string name="dialog_delete_message">Pašalinti pasirinktą elementą?</string>
+  <string name="pref_lights_default">Numatytasis</string>
+  <string name="pulse_length_always_on">Visada įjungta</string>
+  <string name="pulse_length_very_short">Labai trumpas</string>
+  <string name="pulse_length_short">Trumpas</string>
+  <string name="pulse_length_normal">Normalus</string>
+  <string name="pulse_length_long">Ilgas</string>
+  <string name="pulse_length_very_long">Labai ilgas</string>
+  <string name="pulse_speed_very_fast">Labai greitas</string>
+  <string name="pulse_speed_fast">Greitas</string>
+  <string name="pulse_speed_normal">Normalus</string>
+  <string name="pulse_speed_slow">Lėtas</string>
+  <string name="pulse_speed_very_slow">Labai lėtas</string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index ff235c12a..c78f3b654 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -29,4 +29,21 @@
   <string name="suggested_contacts_cleared">Sugerowane kontakty wyczyszczone.</string>
   <string name="clear_suggested_contacts_dialog_title">Wyczyścić sugerowane kontakty?</string>
   <string name="clear_suggested_contacts_dialog_message">Wszystkie sugerowane kontakty wcześniej zapisane zostaną usunięte.</string>
+  <string name="pulse_speed_title">Długość i szybkość migania</string>
+  <string name="default_time">Normalna</string>
+  <string name="custom_time">Własna</string>
+  <string name="dialog_delete_title">Usuń</string>
+  <string name="dialog_delete_message">Usunąć wybraną pozycję?</string>
+  <string name="pref_lights_default">Domyślna</string>
+  <string name="pulse_length_always_on">Zawsze włączona</string>
+  <string name="pulse_length_very_short">Bardzo krótko</string>
+  <string name="pulse_length_short">Krótko</string>
+  <string name="pulse_length_normal">Normalnie</string>
+  <string name="pulse_length_long">Długo</string>
+  <string name="pulse_length_very_long">Bardzo długo</string>
+  <string name="pulse_speed_very_fast">Bardzo szybko</string>
+  <string name="pulse_speed_fast">Szybko</string>
+  <string name="pulse_speed_normal">Normalnie</string>
+  <string name="pulse_speed_slow">Wolno</string>
+  <string name="pulse_speed_very_slow">Bardzo wolno</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 7336a172f..8f2155a53 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Contatos sugeridos foram limpados.</string>
   <string name="clear_suggested_contacts_dialog_title">Limpar contatos sugeridos?</string>
   <string name="clear_suggested_contacts_dialog_message">Todos os contatos sugeridos anteriormente guardados serão removidos.</string>
+  <string name="edit_light_settings">Configurações de luz</string>
+  <string name="pulse_speed_title">Duração e velocidade da pulsação</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Personalizado</string>
+  <string name="dialog_delete_title">Apagar</string>
+  <string name="dialog_delete_message">Remover o item selecionado?</string>
+  <string name="pref_lights_default">Padrão</string>
+  <string name="pulse_length_always_on">Sempre ligado</string>
+  <string name="pulse_length_very_short">Muito curto</string>
+  <string name="pulse_length_short">Curto</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Longo</string>
+  <string name="pulse_length_very_long">Muito longo</string>
+  <string name="pulse_speed_very_fast">Muito rápido</string>
+  <string name="pulse_speed_fast">Rápido</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Devagar</string>
+  <string name="pulse_speed_very_slow">Muito devagar</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index e3ffd4d15..0f3616866 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -29,4 +29,22 @@
   <string name="suggested_contacts_cleared">Contactos sugeridos foram limpos.</string>
   <string name="clear_suggested_contacts_dialog_title">Limpar os contactos sugeridos?</string>
   <string name="clear_suggested_contacts_dialog_message">Todos os contactos sugeridos anteriormente armazenados serão removidos.</string>
+  <string name="edit_light_settings">Definições de luzes das pastas</string>
+  <string name="pulse_speed_title">Duração e velocidade da luz ao piscar</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Personalizado</string>
+  <string name="dialog_delete_title">Eliminar</string>
+  <string name="dialog_delete_message">Eliminar o item selecionado?</string>
+  <string name="pref_lights_default">Padrão</string>
+  <string name="pulse_length_always_on">Sempre ligado</string>
+  <string name="pulse_length_very_short">Muito curto</string>
+  <string name="pulse_length_short">Curto</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Longo</string>
+  <string name="pulse_length_very_long">Muito longo</string>
+  <string name="pulse_speed_very_fast">Muito rápido</string>
+  <string name="pulse_speed_fast">Rápido</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Lento</string>
+  <string name="pulse_speed_very_slow">Muito lento</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
new file mode 100644
index 000000000..ff7f0dc0f
--- /dev/null
+++ b/res/values-th/cm_strings.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2015 The CyanogenMod 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>
+  <string name="prefDialogTitle_suggestedContactsMode">รูปแบบ</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">ปิด</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">ความสามารถรายชื่อที่แนะนำถูกปิดใช้งาน</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">ล่าสุด</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">เฉพาะรายชื่อล่าสุดเท่านั้นที่สามารถเลือกได้</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">ทั้งหมด</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">รายชื่อที่แนะนำทั้งหมดสามารถเลือกได้</string>
+  <string name="preference_header_suggested_contacts">รายชื่อที่แนะนำ</string>
+  <string name="preference_suggested_contacts_mode">รูปแบบรายชื่อที่แนะนำ</string>
+  <string name="preference_suggested_contacts_clear_all">ล้างรายชื่อที่แนะนำ</string>
+  <string name="suggested_contacts_cleared">รายชื่อที่แนะถูกล้างแล้ว</string>
+  <string name="clear_suggested_contacts_dialog_title">ล้างรายชื่อที่แนะนำไหม?</string>
+  <string name="clear_suggested_contacts_dialog_message">รายชื่อแนะนำที่ถูกเก็บไว้ทั้งหมดจะถูกล้าง</string>
+  <string name="edit_light_settings">ตั้งแค่แสงของโฟลเดอร์</string>
+  <string name="pulse_speed_title">ระยะเวลาและความยาวการกระพริบ</string>
+  <string name="default_time">ปกติ</string>
+  <string name="custom_time">กำหนดเอง</string>
+  <string name="dialog_delete_title">ลบ</string>
+  <string name="dialog_delete_message">ลบสิ่งที่เลือก?</string>
+  <string name="pref_lights_default">ค่าเริ่มต้น</string>
+  <string name="pulse_length_always_on">เปิดตลอด</string>
+  <string name="pulse_length_very_short">สั้นมาก</string>
+  <string name="pulse_length_short">สั้น</string>
+  <string name="pulse_length_normal">ปกติ</string>
+  <string name="pulse_length_long">ยาว</string>
+  <string name="pulse_length_very_long">ยาวมาก</string>
+  <string name="pulse_speed_very_fast">เร็วมาก</string>
+  <string name="pulse_speed_fast">เร็ว</string>
+  <string name="pulse_speed_normal">ปกติ</string>
+  <string name="pulse_speed_slow">ช้า</string>
+  <string name="pulse_speed_very_slow">ช้ามาก</string>
+</resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index d0892a543..8c31ce060 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -42,8 +42,6 @@
   <string name="too_large_to_attach_additional">ھۆججەتنى قوشالمىدى. يۇقىرى چېكى <xliff:g id="MAXSIZE">%1$s</xliff:g> گە يەتتى.</string>
   <string name="generic_attachment_problem">ھۆججەتنى قوشالمايدۇ.</string>
   <string name="recipient_needed">ئاز دېگەندە بىر قوبۇللىغۇچىنى قوشۇڭ.</string>
-  <string name="recipient_error_dialog_title">قوبۇللىغۇچى خاتالىقى</string>
-  <string name="confirm_send_title">ئۇچۇر يوللامدۇ؟</string>
   <string name="confirm_send_message_with_no_subject">ئۇچۇر تېمىسىدا تېكىست يوق.</string>
   <string name="confirm_send_message_with_no_body">ئۇچۇر گەۋدىسىدە تېكىست يوق.</string>
   <string name="confirm_send_message">بۇ ئۇچۇرنى يوللامدۇ؟</string>
@@ -97,7 +95,6 @@
   <string name="attachment_unknown"><xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g> ھۆججەت</string>
   <string name="preview_attachment">ئالدىن كۆزەت</string>
   <string name="save_attachment">ساقلا</string>
-  <string name="cancel_attachment">ۋاز كەچ</string>
   <string name="download_again">قايتا چۈشۈر</string>
   <string name="more_info_attachment">ئۇچۇر</string>
   <string name="no_application_found">بۇ خىل قوشۇلمىنى ئېچىپ كۆرەلەيدىغان ھېچقانداق ئەپ يوق.</string>
@@ -119,12 +116,6 @@
   <string name="contextmenu_send_mail">تورخەت يوللا</string>
   <string name="contextmenu_map">خەرىتە</string>
   <string name="contextmenu_sharelink">ئۇلانما ھەمبەھىر</string>
-  <string name="contextmenu_help">ياردەم</string>
-  <string name="contextmenu_feedback">قايتۇرما ئىنكاس يوللا</string>
-  <string name="num_selected"><xliff:g id="number" example="7">%d</xliff:g></string>
-  <plurals name="move_conversation">
-    <item quantity="other">سۆزلىشىشنى يۆتكە</item>
-  </plurals>
   <string name="read_string">ئوقۇلغان سۆزلىشىش</string>
   <string name="unread_string">ئوقۇلمىغان سۆزلىشىش</string>
   <string name="filtered_tag">[<xliff:g id="TAG">%1$s</xliff:g>] <xliff:g id="SUBJECT">%2$s</xliff:g></string>
@@ -142,45 +133,15 @@
   <string name="confirm_discard_text">بۇ ئۇچۇرنى تاشلىۋېتەمدۇ؟</string>
   <string name="loading_conversations">يۈكلەۋاتىدۇ…</string>
   <string name="undo">يېنىۋال</string>
-  <plurals name="conversation_unstarred">
-    <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> سۆزلىشىشنىڭ يۇلتۇزىنى بىكار قىلىۋاتىدۇ.</item>
-  </plurals>
-  <plurals name="conversation_muted">
-    <item quantity="other">&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; سۆزلىشىشكە پەرۋا قىلمىدى.</item>
-  </plurals>
-  <plurals name="conversation_spammed">
-    <item quantity="other">&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; سۆزلىشىشنى ئەخلەت خەت دەپ دوكلات قىلدى.</item>
-  </plurals>
-  <plurals name="conversation_not_spam">
-    <item quantity="other">&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; سۆزلىشىشنى ئەخلەت خەت ئەمەس دەپ دوكلات قىلدى.</item>
-  </plurals>
-  <plurals name="conversation_not_important">
-    <item quantity="other">&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; سۆزلىشىشكە مۇھىم ئەمەس دەپ بەلگە سالدى.</item>
-  </plurals>
-  <plurals name="conversation_phished">
-    <item quantity="other">&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; سۆزلىشىشنى ئالدامچى دەپ دوكلات قىلدى.</item>
-  </plurals>
-  <plurals name="conversation_archived">
-    <item quantity="other">&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; سۆزلىشىش ئارخىپلاندى.</item>
-  </plurals>
-  <plurals name="conversation_deleted">
-    <item quantity="other">&lt;b&gt;<xliff:g id="COUNT">%1$d</xliff:g>&lt;/b&gt; سۆزلىشىش ئۆچۈرۈلدى.</item>
-  </plurals>
   <string name="deleted">ئۆچۈرۈلدى</string>
   <string name="archived">ئارخىپلاندى</string>
   <string name="folder_removed"><xliff:g id="FOLDERNAME">%1$s</xliff:g> دىن چىقىرىۋەتتى</string>
-  <plurals name="conversation_folder_changed">
-    <item quantity="other">قىسقۇچ ئۆزگەردى.</item>
-  </plurals>
   <string name="conversation_folder_moved"><xliff:g id="FOLDERNAME">%1$s</xliff:g> غا يۆتكىدى</string>
   <string name="search_results_header">نەتىجىلەر</string>
   <string name="search_unsupported">بۇ ھېسابات ئىزدەشنى قوللىمايدۇ.</string>
   <string name="add_label">قىسقۇچ قوش</string>
   <string name="contact_info_string"><xliff:g id="NAME">%s</xliff:g> نىڭ ئالاقەداش ئۇچۇرىنى كۆرسەت</string>
   <string name="contact_info_string_default">ئالاقەداش ئۇچۇرىنى كۆرسەت</string>
-  <plurals name="show_messages_read">
-    <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> كونا ئۇچۇر</item>
-  </plurals>
   <string name="to_heading">قوبۇللىغۇچى:</string>
   <string name="show_images">رەسىملەرنى كۆرسەت</string>
   <string name="always_show_images">بۇ ئەۋەتكۈچىنىڭ رەسىملىرىنى ھەمىشە كۆرسەت</string>
@@ -204,10 +165,10 @@
   <string name="clear">تازىلا</string>
   <string-array name="sync_status">
     <item>مۇۋەپپەقىيەتلىك</item>
-    <item>باغلىنىش يوق.</item>
-    <item>تىزىمغا كىرەلمىدى.</item>
-    <item>بىخەتەرلىك خاتالىقى</item>
-    <item>قەدەمداشلىيالمىدى.</item>
+    <item>No connection</item>
+    <item>Couldn\'t sign in</item>
+    <item>Security error</item>
+    <item>Couldn\'t sync</item>
     <item>ئىچكى خاتالىق</item>
     <item>Server Error</item>
   </string-array>
@@ -218,7 +179,6 @@
   <plurals name="actionbar_unread_messages">
     <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ئۇقۇلمىدى</item>
   </plurals>
-  <string name="actionbar_large_unread_count"><xliff:g id="COUNT">%1$d</xliff:g>+ ئۇقۇلمىدى</string>
   <string name="view_more_conversations">تېخىمۇ كۆپ سۆزلىشىشلەرنى كۆرسەت</string>
   <string name="loading_conversation">يۈكلەۋاتىدۇ…</string>
   <string name="activity_mailbox_selection">ھېسابات تاللاڭ</string>
@@ -226,7 +186,6 @@
   <string name="folder_shortcut_widget_label">تورخەت قىسقۇچ</string>
   <string name="change_folders_selection_dialog_title">قىسقۇچ ئۆزگەرت</string>
   <string name="move_to_selection_dialog_title">يۆتكەش ئورنى</string>
-  <string name="search_hint">تورخەت ئىزدە</string>
   <string name="search_results_loaded"><xliff:g id="searchCount">%1$d</xliff:g></string>
   <string name="network_error">باغلىنىش يوق</string>
   <string name="retry">قايتا سىنا</string>
@@ -283,21 +242,7 @@
   <string name="label_notification_ticker">"<xliff:g id="LABEL">%s</xliff:g>:<xliff:g id="NOTIFICATION">%s</xliff:g>"</string>
   <string name="single_new_message_notification_title"><xliff:g id="SENDER">%1$s</xliff:g>:<xliff:g id="SUBJECT">%2$s</xliff:g></string>
   <string name="silent_ringtone">ئۈنسىز</string>
-  <string name="preference_removal_action_title">ئارخىپلاش ۋە ئۆچۈرۈش مەشغۇلاتى</string>
-  <string-array name="prefEntries_removal_action">
-    <item>ئارخىپنىلا كۆرسەت</item>
-    <item>ئۆچۈرگەننىلا كۆرسەت</item>
-    <item>ئارخىپ ۋە ئۆچۈرگەننى كۆرسەت</item>
-  </string-array>
-  <string-array name="prefSummaries_removal_action_summary">
-    <item>ئارخىپنىلا كۆرسەت</item>
-    <item>ئۆچۈرگەننىلا كۆرسەت</item>
-    <item>ئارخىپ ۋە ئۆچۈرگەننى كۆرسەت</item>
-  </string-array>
-  <string name="prefDialogTitle_removal_action">ئارخىپلاش ۋە ئۆچۈرۈش مەشغۇلاتى</string>
   <string name="preferences_default_reply_all_title">ھەممىگە جاۋاپ</string>
-  <string name="preference_swipe_title_archive">سۈرۈلسە ئارخىپقا قوشىدۇ.</string>
-  <string name="preference_swipe_title_delete">سۈرۈلسە ئۆچۈرىدۇ.</string>
   <string name="preference_swipe_description">سۆزلىشىش تىزىمىدا</string>
   <string name="preference_sender_image_title">يوللىغۇچى سۈرىتى</string>
   <string name="preference_sender_image_description">سۆزلىشىش تىزىمىدىكى ئىسىمنىڭ يېنىدا كۆرسىتىدۇ</string>
@@ -315,18 +260,12 @@
   <string name="folder_icon_desc">قىسقۇچ سىنبەلگە</string>
   <string name="add_account">ھېسابات قوش</string>
   <string name="dismiss_tip_hover_text">ئەسكەرتىشكە پەرۋا قىلما</string>
-  <string name="auto_sync_off">ئۆزلۈكىدىن قەدەمداش تاقاق.</string>
-  <string name="tap_to_enable_sync">چېكىلسە ئاچىدۇ.</string>
-  <string name="account_sync_off">ھېسابات قەدەمداش تاقاق</string>
-  <string name="enable_sync_in_account_settings"><xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g> دا ئاچىدۇ.</string>
-  <string name="account_settings_param">ھېسابات تەڭشەكلەر</string>
   <string name="unsent_messages_in_outbox"><xliff:g id="OUTBOX">%2$s</xliff:g> دىكى <xliff:g id="NUMBER">%1$s</xliff:g> يوللانمىغان خەت</string>
   <string name="turn_auto_sync_on_dialog_title">ئۆزلۈكىدىن قەدەمداش ئىقتىدارىنى ئاچامدۇ؟</string>
   <string name="turn_auto_sync_on_dialog_body">ھەممە ئەپ ۋە Gmail ھېساباتىڭىزلا ئەمەس بەلكى ھەممە ھېساباتلىرىڭىزنىڭ ئۆزگەرتىشلىرى تور، باشقا ئۈسكۈنە ۋە   <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g> ئارىسىدا قەدەمداشلىنىدۇ.</string>
   <string name="phone">تېلېفون</string>
   <string name="tablet">تاختا كومپيۇتېر</string>
   <string name="turn_auto_sync_on_dialog_confirm_btn">ئاچ</string>
-  <string name="show_n_more_folders">باشقا <xliff:g id="NUMBER">%1$s</xliff:g> قىسقۇچنى كۆرسەت</string>
   <string name="hide_folders">قىسقۇچلارنى يوشۇر</string>
   <string name="help_and_info">ياردەم</string>
   <string name="feedback">قايتۇرما ئىنكاس يوللا</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index b7fdbcbce..cee808cf9 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -29,4 +29,12 @@
   <string name="suggested_contacts_cleared">已清空建议的联系人。</string>
   <string name="clear_suggested_contacts_dialog_title">清除建议的联系人？</string>
   <string name="clear_suggested_contacts_dialog_message">所有之前存储的建议联系人将被移除。</string>
+  <string name="custom_time">自定义</string>
+  <string name="dialog_delete_title">删除</string>
+  <string name="pref_lights_default">默认</string>
+  <string name="pulse_length_always_on">始终开启</string>
+  <string name="pulse_speed_fast">较快</string>
+  <string name="pulse_speed_normal">正常</string>
+  <string name="pulse_speed_slow">较慢</string>
+  <string name="pulse_speed_very_slow">非常慢</string>
 </resources>