Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_UnifiedEmail into cm-12.1staging/cm-12.1

Change-Id: I5747c11f6fe68a9ecf9320ac018d1cc96150ed90

19 files changed, 423 insertions, 10 deletions

diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
new file mode 100644
index 000000000..cea37e86a
--- /dev/null
+++ b/res/values-ca/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">Deshabilitat</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">La característica de contactes suggerits està deshabilitada</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Recents</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Només els contactes suggerits recentment seran seleccionables</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Tots</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Tots els contactes suggerits seran seleccionables</string>
+  <string name="preference_header_suggested_contacts">Contactes suggerits</string>
+  <string name="preference_suggested_contacts_mode">Mode de contactes suggerits</string>
+  <string name="preference_suggested_contacts_clear_all">Neteja els contactes suggerits</string>
+  <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>
+</resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
new file mode 100644
index 000000000..6ec4ee426
--- /dev/null
+++ b/res/values-de/cm_strings.xml
@@ -0,0 +1,22 @@
+<?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_none">Deaktiviert</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Alle</string>
+  <string name="preference_header_suggested_contacts">Vorgeschlagene Kontakte</string>
+</resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
new file mode 100644
index 000000000..9cffa83d8
--- /dev/null
+++ b/res/values-el/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">Λειτουργία</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>
+</resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
new file mode 100644
index 000000000..433b6bc48
--- /dev/null
+++ b/res/values-en-rIN/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">Disabled</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Suggested contacts feature is disabled</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Recents</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Only recently suggested contacts will be selectable</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">All</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">All suggested contacts will be selectable</string>
+  <string name="preference_header_suggested_contacts">Suggested contacts</string>
+  <string name="preference_suggested_contacts_mode">Suggested contacts mode</string>
+  <string name="preference_suggested_contacts_clear_all">Clear suggested contacts</string>
+  <string name="suggested_contacts_cleared">Suggested contacts cleared.</string>
+  <string name="clear_suggested_contacts_dialog_title">Clear suggested contacts?</string>
+  <string name="clear_suggested_contacts_dialog_message">All the suggested contacts previously stored will be removed.</string>
+</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
new file mode 100644
index 000000000..540ebea2b
--- /dev/null
+++ b/res/values-es/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">Deshabilitado</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">La función de contactos sugeridos está deshabilitada</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Recientes</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Solamente los contactos sugeridos recientes serán seleccionables</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">Contactos sugeridos limpiados.</string>
+  <string name="clear_suggested_contacts_dialog_title">¿Limpiar contactos sugeridos?</string>
+  <string name="clear_suggested_contacts_dialog_message">Todos los contactos sugeridos almacenados previamente serán quitados.</string>
+</resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
new file mode 100644
index 000000000..1285ecd48
--- /dev/null
+++ b/res/values-fi/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">Tila</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Pois käytöstä</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Ehdotetut yhteystiedot-toiminto on poistettu käytöstä</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Viimeisimmät</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Vain viimeksi ehdotetut yhteystiedot on valittavissa</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Kaikki</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Kaikki yhteystiedot on valittavissa</string>
+  <string name="preference_header_suggested_contacts">Ehdotetut yhteystiedot</string>
+  <string name="preference_suggested_contacts_mode">Ehdotetut yhteystiedot-tila</string>
+  <string name="preference_suggested_contacts_clear_all">Tyhjennä ehdotetut yhteystiedot</string>
+  <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>
+</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
new file mode 100644
index 000000000..64722bb58
--- /dev/null
+++ b/res/values-it/cm_strings.xml
@@ -0,0 +1,28 @@
+<?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">Modalità</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Disattivato</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Modalità suggerimento contatti disattivata</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Recenti</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Solo i contatti suggeriti recentemente sono selezionabili</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Tutti</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Tutti i contatti suggeriti saranno selezionabili</string>
+  <string name="preference_header_suggested_contacts">Contatti suggeriti</string>
+  <string name="preference_suggested_contacts_mode">Modalità suggerimento contatti</string>
+</resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
new file mode 100644
index 000000000..6ea297d90
--- /dev/null
+++ b/res/values-iw/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">מצב</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>
+</resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 2c600d98d..338e92421 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -468,7 +468,7 @@
   <string name="preference_confirm_before_archive_title">Virum Archivéiere bestätegen</string>
   <string name="preference_confirm_before_send_title">Virum Schécke bestätegen</string>
   <string name="preferences_conversation_mode_title">Messagen automatesch upassen</string>
-  <string name="preferences_conversation_mode_summary">Messagë verklengeren, fir datt se op de Schierm passen</string>
+  <string name="preferences_conversation_mode_summary">Messagë verklengeren, fir datt s\'op de Schierm passen</string>
   <string name="preferences_disable_snap_headers_title">Messagenaktiounen</string>
   <string-array name="prefSummaries_snapHeader">
     <item>Messagenaktiounen ëmmer uewen um Schierm uweisen</item>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
new file mode 100644
index 000000000..7336a172f
--- /dev/null
+++ b/res/values-pt-rBR/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">Desativado</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Recurso de sugestão de contatos está desativado</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Recentes</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Somente os contatos recentemente sugeridos serão selecionáveis</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Todos</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Todos os contatos sugeridos serão selecionáveis</string>
+  <string name="preference_header_suggested_contacts">Contatos sugeridos</string>
+  <string name="preference_suggested_contacts_mode">Modo de contatos sugeridos</string>
+  <string name="preference_suggested_contacts_clear_all">Limpar contatos sugeridos</string>
+  <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>
+</resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
new file mode 100644
index 000000000..e3ffd4d15
--- /dev/null
+++ b/res/values-pt-rPT/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">Desativado</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">O recurso dos contactos sugeridos está desativado</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Recentes</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Só contactos sugeridos recentemente serão selecionáveis</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Todos</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Todos os contatos sugeridos serão selecionáveis</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">Limpar os contactos sugeridos</string>
+  <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>
+</resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
new file mode 100644
index 000000000..25343ef64
--- /dev/null
+++ b/res/values-sk/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">Režim</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Zakázané</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Funkcia navrhované kontakty je zakázaná</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Nedávne</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Len nedávno navrhnuté kontakty budú vyberateľné</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Všetko</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Všetky navrhnované kontakty budú vyberateľné</string>
+  <string name="preference_header_suggested_contacts">Navrhnované kontakty</string>
+  <string name="preference_suggested_contacts_mode">Režim navrhovaných kontaktov</string>
+  <string name="preference_suggested_contacts_clear_all">Vymazať navrhované kontakty</string>
+  <string name="suggested_contacts_cleared">Navrhované kontakty boli vymazané.</string>
+  <string name="clear_suggested_contacts_dialog_title">Vymazať navrhnované kontakty?</string>
+  <string name="clear_suggested_contacts_dialog_message">Všetky navrhované kontakty sa odstránia.</string>
+</resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
new file mode 100644
index 000000000..f00b060b6
--- /dev/null
+++ b/res/values-tr/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">Mod</string>
+  <string name="prefDialogTitle_suggestedContactsMode_none">Devre dışı</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_none">Önerilen kişiler özelliği devre dışı bırakıldı</string>
+  <string name="prefDialogTitle_suggestedContactsMode_recents">Son kişiler</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Sadece önceden önerilen kişiler seçilebilir</string>
+  <string name="prefDialogTitle_suggestedContactsMode_all">Tümü</string>
+  <string name="prefDialogTitle_suggestedContactsMode_summary_all">Tüm önerilen kişiler seçilebilecek</string>
+  <string name="preference_header_suggested_contacts">Önerilen kişiler</string>
+  <string name="preference_suggested_contacts_mode">Önerilen kişiler modu</string>
+  <string name="preference_suggested_contacts_clear_all">Önerilen kişileri temizle</string>
+  <string name="suggested_contacts_cleared">Önerilen kişiler temizlendi.</string>
+  <string name="clear_suggested_contacts_dialog_title">Önerilen kişiler temizlensin mi?</string>
+  <string name="clear_suggested_contacts_dialog_message">Önceden kayıtlı tüm önerilen kişiler silinecek.</string>
+</resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
new file mode 100644
index 000000000..b7fdbcbce
--- /dev/null
+++ b/res/values-zh-rCN/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">模式</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>
+</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index fbea162b5..7e0c4a48e 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -21,9 +21,9 @@
     <string name="prefDialogTitle_suggestedContactsMode_none">Disabled</string>
     <string name="prefDialogTitle_suggestedContactsMode_summary_none">Suggested contacts feature is disabled</string>
     <string name="prefDialogTitle_suggestedContactsMode_recents">Recents</string>
-    <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Only recent suggested contacts will be selectables</string>
+    <string name="prefDialogTitle_suggestedContactsMode_summary_recents">Only recently suggested contacts will be selectable</string>
     <string name="prefDialogTitle_suggestedContactsMode_all">All</string>
-    <string name="prefDialogTitle_suggestedContactsMode_summary_all">All suggested contacts will be selectables</string>
+    <string name="prefDialogTitle_suggestedContactsMode_summary_all">All suggested contacts will be selectable</string>
     <string name="preference_header_suggested_contacts">Suggested contacts</string>
     <string name="preference_suggested_contacts_mode">Suggested contacts mode</string>
     <string name="preference_suggested_contacts_clear_all">Clear suggested contacts</string>
diff --git a/src/com/android/mail/compose/RecipientAdapter.java b/src/com/android/mail/compose/RecipientAdapter.java
index d11e88440..a34cdc27c 100644
--- a/src/com/android/mail/compose/RecipientAdapter.java
+++ b/src/com/android/mail/compose/RecipientAdapter.java
@@ -105,7 +105,7 @@ implements OnSharedPreferenceChangeListener {
             if (recentsMode) {
                 Calendar c = Calendar.getInstance(Locale.getDefault());
                 c.add(Calendar.DAY_OF_YEAR, MAX_DAYS_FOR_RECENTS_SUGGESTED_CONTACTS);
-                selection += SuggestedContact.LAST_SEEN + " >= ? ";
+                selection += " and " + SuggestedContact.LAST_SEEN + " >= ? ";
                 args[2] = String.valueOf(c.getTimeInMillis());
             }
 
diff --git a/src/com/android/mail/providers/Settings.java b/src/com/android/mail/providers/Settings.java
index b17923948..ddb18ab3e 100644
--- a/src/com/android/mail/providers/Settings.java
+++ b/src/com/android/mail/providers/Settings.java
@@ -48,9 +48,9 @@ public class Settings implements Parcelable {
 
     static final Settings EMPTY_SETTINGS = new Settings();
 
-    // Max size for attachments (5 megs). Will be overridden by an account
+    // Max size for attachments (25 megs). Will be overridden by an account
     // setting, if found.
-    private static final int DEFAULT_MAX_ATTACHMENT_SIZE = 5 * 1024 * 1024;
+    private static final int DEFAULT_MAX_ATTACHMENT_SIZE = 25 * 1024 * 1024;
 
     public static final int SWIPE_SETTING_ARCHIVE = 0;
     public static final int SWIPE_SETTING_DELETE = 1;
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index a7de33b60..5bd20982d 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -4302,6 +4302,20 @@ public abstract class AbstractActivityController implements ActivityController,
                 }
             }
 
+            // If we're sliding, we always want to show the burger (but we need a bit of space
+            // before do it)
+            if (slideOffset > 0.15f) {
+                mDrawerToggle.setDrawerIndicatorEnabled(true /* enable */);
+            } else {
+                if (mOldSlideOffset < slideOffset || (slideOffset == 0f && mOldSlideOffset > 0f)) {
+                    final int mode = mViewMode.getMode();
+                    final boolean isTopLevel = Folder.isRoot(mFolder);
+                    mDrawerToggle.setDrawerIndicatorEnabled(
+                            getShouldShowDrawerIndicator(mode, isTopLevel));
+                }
+            }
+            mDrawerContainer.clearFocus();
+
             mOldSlideOffset = slideOffset;
 
             for (DrawerLayout.DrawerListener l : mObservers) {
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 0f52cc705..0ccfb8233 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -1255,10 +1255,7 @@ public class ConversationViewFragment extends AbstractConversationViewFragment i
 
             // Finally we handle the special keys
             if (keyCode == KeyEvent.KEYCODE_BACK && id != R.id.conversation_topmost_overlay) {
-                if (isActionUp) {
-                    mTopmostOverlay.requestFocus();
-                }
-                return true;
+                return mTopmostOverlay.requestFocus();
             } else if (keyCode == KeyEvent.KEYCODE_ENTER &&
                     id == R.id.conversation_topmost_overlay) {
                 if (isActionUp) {