Merge "Hookup search in the UI."
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index bc6cbfa..59c9f7f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniseer en laat weet"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiket-instellings"</string>
<string name="menu_done" msgid="5791134842152855128">"Klaar"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Rekeninginstellings"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Instellings"</string>
<string name="menu_search" msgid="5297197523031943248">"Soek"</string>
<string name="more" msgid="1238344647379009858">"Meer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f0351c0..27bda2b 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -131,12 +131,12 @@
<string name="labels" msgid="1519770547536283663">"መለያዎች"</string>
<string name="show_all_folders" msgid="3281420732307737553">"ሁሉንም አቃፊዎች አሳይ"</string>
<plurals name="confirm_delete_conversation">
- <item quantity="one" msgid="3731948757247905508">"ይሄ ውይይት ሰርዝ?"</item>
+ <item quantity="one" msgid="3731948757247905508">"ይሄ ውይይት ይሰረዝ?"</item>
<item quantity="other" msgid="930334208937121234">"እነዚህ <xliff:g id="COUNT">%1$d</xliff:g> ውይይቶች ይሰረዙ?"</item>
</plurals>
<plurals name="confirm_archive_conversation">
<item quantity="one" msgid="2990537295519552069">"ይሄ ውይይት ይመዝግብ?"</item>
- <item quantity="other" msgid="4713469868399246772">"እነዚህ <xliff:g id="COUNT">%1$d</xliff:g> ውይይቶች ይታቆሩ?"</item>
+ <item quantity="other" msgid="4713469868399246772">"እነዚህ <xliff:g id="COUNT">%1$d</xliff:g> ውይይቶች ይመዝገቡ?"</item>
</plurals>
<string name="confirm_discard_text" msgid="1149834186404614612">"ይሄ መልዕክት ይወገድ?"</string>
<string name="no_conversations" msgid="35400008890372241">"ምንም ውይይቶች የሉም።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index a8553c1..dbd43bd 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"المزامنة والإشعارات"</string>
<string name="menu_label_options" msgid="1811414840489117457">"إعدادات التصنيفات"</string>
<string name="menu_done" msgid="5791134842152855128">"تم"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"إعدادات الحساب"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"إعدادات"</string>
<string name="menu_search" msgid="5297197523031943248">"بحث"</string>
<string name="more" msgid="1238344647379009858">"المزيد"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> من <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index d6f2fc0..bd95ca2 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Сінхранізацыя і апавяшчэнне"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Налады цэтліка"</string>
<string name="menu_done" msgid="5791134842152855128">"Гатова"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Налады ўліковага запісу"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Налады"</string>
<string name="menu_search" msgid="5297197523031943248">"Пошук"</string>
<string name="more" msgid="1238344647379009858">"Дадаткова"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d39e917..c060cff 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizace a upozornění"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Nastavení štítku"</string>
<string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Nastavení účtu"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Nastavení"</string>
<string name="menu_search" msgid="5297197523031943248">"Vyhledat"</string>
<string name="more" msgid="1238344647379009858">"Více"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 944c8d6..3911271 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkroniser og underret"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiketindstillinger"</string>
<string name="menu_done" msgid="5791134842152855128">"Udført"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Kontoindstillinger"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Indstillinger"</string>
<string name="menu_search" msgid="5297197523031943248">"Søg"</string>
<string name="more" msgid="1238344647379009858">"Mere"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ud af <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0812517..208bfea 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchr. & benachrichtigen"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Label-Einstellungen"</string>
<string name="menu_done" msgid="5791134842152855128">"Fertig"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Kontoeinstellungen"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Einstellungen"</string>
<string name="menu_search" msgid="5297197523031943248">"Suche"</string>
<string name="more" msgid="1238344647379009858">"Mehr"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> von <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a60e971..c681513 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Συγχρονισμός και ειδοποίηση"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Ρυθμίσεις ετικέτας"</string>
<string name="menu_done" msgid="5791134842152855128">"Τέλος"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Ρυθμίσεις Λογαριασμού"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Ρυθμίσεις"</string>
<string name="menu_search" msgid="5297197523031943248">"Αναζήτηση"</string>
<string name="more" msgid="1238344647379009858">"Περισσότερα"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> από <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 70eb420..cfc390b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Configuración de la etiqueta"</string>
<string name="menu_done" msgid="5791134842152855128">"Listo"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Configuración de la cuenta"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Configuración"</string>
<string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
<string name="more" msgid="1238344647379009858">"Más"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 88ecedd..dabfbe1 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar y notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Ajustes de etiquetas"</string>
<string name="menu_done" msgid="5791134842152855128">"Listo"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Ajustes de cuenta"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Ajustes"</string>
<string name="menu_search" msgid="5297197523031943248">"Buscar"</string>
<string name="more" msgid="1238344647379009858">"Más"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f098e3a..535fe4d 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sünkroonimine ja teavitamine"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Sildi seaded"</string>
<string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Konto seaded"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Seaded"</string>
<string name="menu_search" msgid="5297197523031943248">"Otsing ..."</string>
<string name="more" msgid="1238344647379009858">"Rohkem"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>-st"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 24301e5..1119fa3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"همگامسازی و اعلان"</string>
<string name="menu_label_options" msgid="1811414840489117457">"تنظیمات برچسب"</string>
<string name="menu_done" msgid="5791134842152855128">"انجام شد"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"تنظیمات حساب"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"تنظیمات"</string>
<string name="menu_search" msgid="5297197523031943248">"جستجو"</string>
<string name="more" msgid="1238344647379009858">"بیشتر"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> از <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5124c6d..2938eda 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronoi ja ilmoita"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Tunnisteen asetukset"</string>
<string name="menu_done" msgid="5791134842152855128">"Valmis"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Tilin asetukset"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Asetukset"</string>
<string name="menu_search" msgid="5297197523031943248">"Haku"</string>
<string name="more" msgid="1238344647379009858">"Lisää"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cbfa8fa..3ef9933 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Le corps du message est vide."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Envoyer ce message ?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Message supprimé."</string>
- <!-- no translation found for signature (7882698047321710252) -->
- <skip />
+ <string name="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
<string name="send" msgid="8242003661397555986">"Envoyer"</string>
<string name="mark_read" msgid="8438349154394313195">"Marquer comme lue"</string>
<string name="mark_unread" msgid="6231373939351125713">"Marquer comme non lue"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 3a9b5d0..e29ec77 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"समन्वयित करें और सूचित करें"</string>
<string name="menu_label_options" msgid="1811414840489117457">"लेबल सेटिंग"</string>
<string name="menu_done" msgid="5791134842152855128">"पूर्ण"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"खाता सेटिंग"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"सेटिंग"</string>
<string name="menu_search" msgid="5297197523031943248">"खोजें"</string>
<string name="more" msgid="1238344647379009858">"अधिक"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g> में से <xliff:g id="COUNT">%1$s</xliff:g>"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index e087d66..3cf19cb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkroniziraj i obavijesti"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Postavke oznake"</string>
<string name="menu_done" msgid="5791134842152855128">"Gotovo"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Postavke računa"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Postavke"</string>
<string name="menu_search" msgid="5297197523031943248">"Pretraživanje"</string>
<string name="more" msgid="1238344647379009858">"Više"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -134,11 +132,11 @@
<string name="show_all_folders" msgid="3281420732307737553">"Prikaži sve mape"</string>
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Izbrisati ovaj razgovor?"</item>
- <item quantity="other" msgid="930334208937121234">"Izbrisati ovoliko razgovora: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+ <item quantity="other" msgid="930334208937121234">"Izbrisati ove razgovore (ukupno <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
</plurals>
<plurals name="confirm_archive_conversation">
<item quantity="one" msgid="2990537295519552069">"Arhivirati ovaj razgovor?"</item>
- <item quantity="other" msgid="4713469868399246772">"Arhivirati ovoliko razgovora: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+ <item quantity="other" msgid="4713469868399246772">"Arhivirati ove razgovore (ukupno <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
</plurals>
<string name="confirm_discard_text" msgid="1149834186404614612">"Odbaciti ovu poruku?"</string>
<string name="no_conversations" msgid="35400008890372241">"Nema razgovora."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 569772e..05c5206 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Szinkronizálás és értesítés"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Címkebeállítások"</string>
<string name="menu_done" msgid="5791134842152855128">"Kész"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Fiókbeállítások"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Beállítások"</string>
<string name="menu_search" msgid="5297197523031943248">"Keresés"</string>
<string name="more" msgid="1238344647379009858">"Egyebek"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g>/<xliff:g id="COUNT">%1$s</xliff:g>"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 06f426f..096ac32 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -25,7 +25,7 @@
<string name="body_hint" msgid="4279864165439577668">"Tulis email"</string>
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_label" msgid="3466026399539734378">"+"</string>
- <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan berkas"</string>
+ <string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan file"</string>
<string name="save_draft" msgid="5555744208032445632">"Simpan konsep"</string>
<string name="discard" msgid="1714960202994370243">"Buang"</string>
<string name="compose" msgid="1473559896062432878">"Tulis"</string>
@@ -38,8 +38,8 @@
<string name="forward_attribution" msgid="1498936339458535158">"---------- Pesan Terusan----------<br> Dari: <xliff:g id="FROM">%1$s</xliff:g><br>Tanggal: <xliff:g id="DATE">%2$s</xliff:g><br>Subjek: <xliff:g id="SUBJECT">%3$s</xliff:g><br>Kepada: <xliff:g id="TO">%4$s</xliff:g><br>"</string>
<string name="cc_attribution" msgid="374493748526504562">"Cc: <xliff:g id="CC">%1$s</xliff:g><br>"</string>
<string name="select_attachment_type" msgid="4711524151968942082">"Pilih jenis lampiran"</string>
- <string name="too_large_to_attach" msgid="6355534239324333583">"Berkas terlalu besar untuk dilampirkan."</string>
- <string name="generic_attachment_problem" msgid="8775959340559458709">"Tidak dapat melampirkan berkas."</string>
+ <string name="too_large_to_attach" msgid="6355534239324333583">"File terlalu besar untuk dilampirkan."</string>
+ <string name="generic_attachment_problem" msgid="8775959340559458709">"Tidak dapat melampirkan file."</string>
<string name="recipient_needed" msgid="999037027358925655">"Tambahkan setidaknya satu penerima."</string>
<string name="recipient_error_dialog_title" msgid="6051694305498669180">"Galat penerima"</string>
<string name="confirm_send_title" msgid="5663602035452564062">"Kirim pesan?"</string>
@@ -70,12 +70,10 @@
<string name="menu_manage_labels" msgid="8618788259638720538">"Kelola label"</string>
<string name="label_list_title" msgid="7948730824763052410">"Label"</string>
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinkronkan & beri tahu"</string>
- <string name="menu_label_options" msgid="1811414840489117457">"Setelan label"</string>
+ <string name="menu_label_options" msgid="1811414840489117457">"Pengaturan label"</string>
<string name="menu_done" msgid="5791134842152855128">"Selesai"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Setelan akun"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Setelan"</string>
<string name="menu_search" msgid="5297197523031943248">"Telusuri"</string>
<string name="more" msgid="1238344647379009858">"Lainnya"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> dari <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -85,7 +83,7 @@
<string name="mark_not_important" msgid="4550967327747977068">"Tandai sebagai tidak penting"</string>
<string name="add_cc_label" msgid="504861315425773180">"Tambahkan Cc/Bcc"</string>
<string name="add_bcc_label" msgid="7432027645493843336">"Tambahkan Bcc"</string>
- <string name="feedback" msgid="79365993169715049">"Kirim umpan balik"</string>
+ <string name="feedback" msgid="79365993169715049">"Kirim masukan"</string>
<string name="help_and_info" msgid="7873089811705257882">"Bantuan"</string>
<string name="quoted_text" msgid="7250749398672037355">"Sertakan teks kutipan"</string>
<string name="quoted_text_label" msgid="541007446961960617">"Kutip teks"</string>
@@ -101,10 +99,10 @@
<string name="attachment_application_vnd_ms_powerpoint" msgid="861348289167216897">"Presentasi"</string>
<string name="attachment_application_vnd_ms_excel" msgid="5861224590731578901">"Spreadsheet"</string>
<string name="attachment_application_pdf" msgid="6922990425001131901">"PDF"</string>
- <string name="attachment_unknown" msgid="6005445955982153931">"Berkas <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
+ <string name="attachment_unknown" msgid="6005445955982153931">"File <xliff:g id="ATTACHMENTEXTENSION">%s</xliff:g>"</string>
<string name="search_hint" msgid="3625734263059221350">"Telusuri email"</string>
<string name="choosertitle_sharevia" msgid="6142681649048665134">"Berbagi melalui"</string>
- <string name="contextmenu_openlink" msgid="2176176524824953775">"Buka di Peramban"</string>
+ <string name="contextmenu_openlink" msgid="2176176524824953775">"Buka di Browser"</string>
<string name="contextmenu_copy" msgid="4604170699444153037">"Salin"</string>
<string name="contextmenu_copylink" msgid="3580131515400610839">"Salin URL tautan"</string>
<string name="contextmenu_dial_dot" msgid="9104426720103729453">"Panggil..."</string>
@@ -114,7 +112,7 @@
<string name="contextmenu_map" msgid="7721544518698532954">"Peta"</string>
<string name="contextmenu_sharelink" msgid="6213520416250245200">"Bagikan tautan"</string>
<string name="contextmenu_help" msgid="4651718679842414097">"Bantuan"</string>
- <string name="contextmenu_feedback" msgid="4429118420169571473">"Kirim umpan balik"</string>
+ <string name="contextmenu_feedback" msgid="4429118420169571473">"Kirim masukan"</string>
<string name="num_selected" msgid="2943309946439316255">"<xliff:g id="NUMBER">%d</xliff:g> dipilih"</string>
<plurals name="move_conversation">
<item quantity="one" msgid="3657821200245019288">"Pindahkan percakapan"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c2b4dc2..eb1b710 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizza e notifica"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Impostazioni etichetta"</string>
<string name="menu_done" msgid="5791134842152855128">"Fine"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Impostazioni account"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Impostazioni"</string>
<string name="menu_search" msgid="5297197523031943248">"Cerca"</string>
<string name="more" msgid="1238344647379009858">"Altre"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> di <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 94568cf..00e147f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"동기화 및 알림"</string>
<string name="menu_label_options" msgid="1811414840489117457">"라벨 설정"</string>
<string name="menu_done" msgid="5791134842152855128">"완료"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"계정 설정"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"설정"</string>
<string name="menu_search" msgid="5297197523031943248">"검색"</string>
<string name="more" msgid="1238344647379009858">"더보기"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="TOTAL">%2$s</xliff:g>개 중 <xliff:g id="COUNT">%1$s</xliff:g>개"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f7c8fb6..a424499 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinchronizuoti ir pranešti"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiketės nustatymai"</string>
<string name="menu_done" msgid="5791134842152855128">"Atlikta"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Paskyros nustatymai"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Nustatymai"</string>
<string name="menu_search" msgid="5297197523031943248">"Paieška"</string>
<string name="more" msgid="1238344647379009858">"Daugiau"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> iš <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 90e33e2..cce3259 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhronizēšana un paziņojumi"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Iezīmes iestatījumi"</string>
<string name="menu_done" msgid="5791134842152855128">"Gatavs"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Konta iestatījumi"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Iestatījumi"</string>
<string name="menu_search" msgid="5297197523031943248">"Meklēt"</string>
<string name="more" msgid="1238344647379009858">"Vairāk"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g>. no <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 79c921e..cb7fd50 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Tiada teks dalam badan mesej."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Hantar mesej ini?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Mesej dibuang."</string>
- <!-- no translation found for signature (7882698047321710252) -->
- <skip />
+ <string name="signature" msgid="7882698047321710252">\n\n"<xliff:g id="SIGNATURE">%s</xliff:g>"</string>
<string name="send" msgid="8242003661397555986">"Hantar"</string>
<string name="mark_read" msgid="8438349154394313195">"Tandakan dibaca"</string>
<string name="mark_unread" msgid="6231373939351125713">"Tandakan tidak dibaca"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a607993..3970001 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -138,7 +138,7 @@
<item quantity="one" msgid="2990537295519552069">"Vil du arkivere denne samtalen?"</item>
<item quantity="other" msgid="4713469868399246772">"Vil du arkivere disse <xliff:g id="COUNT">%1$d</xliff:g> samtalene?"</item>
</plurals>
- <string name="confirm_discard_text" msgid="1149834186404614612">"Vil du forkaste denne meldingen?"</string>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"Vil du forkaste denne e-posten?"</string>
<string name="no_conversations" msgid="35400008890372241">"Ingen samtaler."</string>
<string name="undo" msgid="6070869718469782251">"Angre"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 379ff74..9aba973 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniseren en melden"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Labelinstellingen"</string>
<string name="menu_done" msgid="5791134842152855128">"Gereed"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Accountinstellingen"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Instellingen"</string>
<string name="menu_search" msgid="5297197523031943248">"Zoeken"</string>
<string name="more" msgid="1238344647379009858">"Meer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> van <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 2a86ada..853a3de 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizuj i powiadamiaj"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Ustawienia etykiety"</string>
<string name="menu_done" msgid="5791134842152855128">"Gotowe"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Ustawienia konta"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Ustawienia"</string>
<string name="menu_search" msgid="5297197523031943248">"Szukaj"</string>
<string name="more" msgid="1238344647379009858">"Więcej"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a8dc876..db32a1f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Configurações do marcador"</string>
<string name="menu_done" msgid="5791134842152855128">"Concluído"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Configurações da conta"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Configurações"</string>
<string name="menu_search" msgid="5297197523031943248">"Pesquisar"</string>
<string name="more" msgid="1238344647379009858">"Mais"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 614c74b..864c6ca 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизация и уведомления"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Настройки ярлыка"</string>
<string name="menu_done" msgid="5791134842152855128">"Готово"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Настройки аккаунта"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Настройки"</string>
<string name="menu_search" msgid="5297197523031943248">"Поиск"</string>
<string name="more" msgid="1238344647379009858">"Еще"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> из <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 531334a..b4ee8d7 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchronizovať a upozorniť"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Nastavenia menovky"</string>
<string name="menu_done" msgid="5791134842152855128">"Hotovo"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Nastavenia účtu"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Nastavenia"</string>
<string name="menu_search" msgid="5297197523031943248">"Hľadať"</string>
<string name="more" msgid="1238344647379009858">"Viac"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e0fa44b..a1e564a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sinhroniziraj in obvesti"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Nastavitve oznake"</string>
<string name="menu_done" msgid="5791134842152855128">"Končano"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Nastavitve računa"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Nastavitve"</string>
<string name="menu_search" msgid="5297197523031943248">"Išči"</string>
<string name="more" msgid="1238344647379009858">"Več"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index abdfd9c..fe93fe7 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронизовање и обавештавање"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Подешавања ознаке"</string>
<string name="menu_done" msgid="5791134842152855128">"Готово"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Подешавања налога"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Подешавања"</string>
<string name="menu_search" msgid="5297197523031943248">"Претражи"</string>
<string name="more" msgid="1238344647379009858">"Још"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> од <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4ae5907..feb2e2d 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synka och meddela"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Inställningar för etikett"</string>
<string name="menu_done" msgid="5791134842152855128">"Klar"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Kontoinställningar"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Inställningar"</string>
<string name="menu_search" msgid="5297197523031943248">"Sök"</string>
<string name="more" msgid="1238344647379009858">"Mer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 198c442..68e9b99 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"I-sync at i-notify"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Mga setting ng label"</string>
<string name="menu_done" msgid="5791134842152855128">"Tapos na"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Mga setting ng account"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Mga Setting"</string>
<string name="menu_search" msgid="5297197523031943248">"Maghanap"</string>
<string name="more" msgid="1238344647379009858">"Higit pa"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> ng <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c1920f4..8755516 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Senkronize et ve bildir"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Etiket ayarları"</string>
<string name="menu_done" msgid="5791134842152855128">"Bitti"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Hesap ayarları"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Ayarlar"</string>
<string name="menu_search" msgid="5297197523031943248">"Ara"</string>
<string name="more" msgid="1238344647379009858">"Diğer"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 2fea593..f8253a7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Синхронізація та сповіщення"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Налаштування мітки"</string>
<string name="menu_done" msgid="5791134842152855128">"Готово"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Налаштування облікового запису"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Налаштування"</string>
<string name="menu_search" msgid="5297197523031943248">"Пошук"</string>
<string name="more" msgid="1238344647379009858">"Більше"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> з <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3cc709c..6614a6e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Đ.bộ hóa & t.báo"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Cài đặt nhãn"</string>
<string name="menu_done" msgid="5791134842152855128">"Hoàn tất"</string>
- <!-- no translation found for menu_account_settings (8230989362863431918) -->
- <skip />
- <!-- no translation found for menu_settings (6007027046949837282) -->
- <skip />
+ <string name="menu_account_settings" msgid="8230989362863431918">"Cài đặt tài khoản"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Cài đặt"</string>
<string name="menu_search" msgid="5297197523031943248">"Tìm kiếm"</string>
<string name="more" msgid="1238344647379009858">"Khác"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> trong tổng số <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index 4ea87bc..0fed972 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java
@@ -156,12 +156,12 @@
if (qUri.equals(uri) && !sRefreshRequired && !sRefreshInProgress) {
if (sRefreshReady) {
// If we already have a refresh ready, just sync() it
- LogUtils.d(TAG, "Create: refreshed cursor ready, sync");
+ LogUtils.i(TAG, "Create: refreshed cursor ready, sync");
sConversationCursor.sync();
} else {
// Position the cursor before the first item (as it would be if new), reset
// the cache, and return as new
- LogUtils.d(TAG, "Create: cursor good, reset position and clear map");
+ LogUtils.i(TAG, "Create: cursor good, reset position and clear map");
sConversationCursor.moveToPosition(-1);
sConversationCursor.mPosition = -1;
synchronized (sCacheMapLock) {
@@ -170,14 +170,14 @@
}
} else {
// Set qUri/qProjection these in case they changed
- LogUtils.d(TAG, "Create: new query or refresh needed, query/sync");
+ LogUtils.i(TAG, "Create: new query or refresh needed, query/sync");
sRequeryCursor = doQuery(uri, projection);
sConversationCursor.sync();
}
return sConversationCursor;
}
// Create new ConversationCursor
- LogUtils.d(TAG, "Create: initial creation");
+ LogUtils.i(TAG, "Create: initial creation");
return new ConversationCursor(doQuery(uri, projection), activity, messageListColumn);
}
}
@@ -217,7 +217,7 @@
// Temporary, log time for reset
long startTime = System.currentTimeMillis();
if (DEBUG) {
- LogUtils.d(TAG, "[--resetCursor--]");
+ LogUtils.i(TAG, "[--resetCursor--]");
}
synchronized (sCacheMapLock) {
// Walk through the cache. Here are the cases:
@@ -264,7 +264,7 @@
}
sRefreshRequired = false;
}
- LogUtils.d(TAG, "resetCache time: " + ((System.currentTimeMillis() - startTime)) + "ms");
+ LogUtils.i(TAG, "resetCache time: " + ((System.currentTimeMillis() - startTime)) + "ms");
}
/**
@@ -275,7 +275,7 @@
if (!sListeners.contains(listener)) {
sListeners.add(listener);
} else {
- LogUtils.d(TAG, "Ignoring duplicate add of listener");
+ LogUtils.i(TAG, "Ignoring duplicate add of listener");
}
}
}
@@ -337,7 +337,7 @@
if ((columnName == DELETED_COLUMN) && (map.get(columnName) == null)) {
sDeletedCount++;
if (DEBUG) {
- LogUtils.d(TAG, "Deleted " + uriString);
+ LogUtils.i(TAG, "Deleted " + uriString);
}
}
// ContentValues has no generic "put", so we must test. For now, the only classes of
@@ -357,7 +357,7 @@
map.put(REQUERY_COLUMN, 1);
}
if (DEBUG && (columnName != DELETED_COLUMN)) {
- LogUtils.d(TAG, "Caching value for " + uriString + ": " + columnName);
+ LogUtils.i(TAG, "Caching value for " + uriString + ": " + columnName);
}
}
}
@@ -395,7 +395,7 @@
mCursorObserverRegistered = false;
}
if (DEBUG) {
- LogUtils.d(TAG, "[Notify: onRefreshRequired()]");
+ LogUtils.i(TAG, "[Notify: onRefreshRequired()]");
}
synchronized(sListeners) {
for (ConversationListener listener: sListeners) {
@@ -413,7 +413,7 @@
public void sync() {
synchronized (sCacheMapLock) {
if (DEBUG) {
- LogUtils.d(TAG, "[sync() called]");
+ LogUtils.i(TAG, "[sync() called]");
}
if (sRequeryCursor == null) {
// This can happen during an animated deletion, if the UI isn't keeping track
@@ -440,7 +440,7 @@
*/
public void cancelRefresh() {
if (DEBUG) {
- LogUtils.d(TAG, "[cancelRefresh() called]");
+ LogUtils.i(TAG, "[cancelRefresh() called]");
}
synchronized(sCacheMapLock) {
// Mark the requery closed
@@ -462,7 +462,7 @@
*/
public ArrayList<Integer> getRefreshDeletions () {
if (DEBUG) {
- LogUtils.d(TAG, "[getRefreshDeletions() called]");
+ LogUtils.i(TAG, "[getRefreshDeletions() called]");
}
// It's possible that the requery cursor is null in the case that loadInBackground() causes
// ConversationCursor.create to do a sync() between the time that refreshReady() is called
@@ -515,7 +515,7 @@
deviceCursor.moveToPrevious();
}
}
- LogUtils.d(TAG, "Deletions: " + deleteList);
+ LogUtils.i(TAG, "Deletions: " + deleteList);
return deleteList;
}
@@ -526,7 +526,7 @@
*/
public boolean refresh() {
if (DEBUG) {
- LogUtils.d(TAG, "[refresh() called]");
+ LogUtils.i(TAG, "[refresh() called]");
}
if (sRefreshInProgress) {
return false;
@@ -547,7 +547,7 @@
@Override
public void run() {
if (DEBUG) {
- LogUtils.d(TAG, "[Notify: onRefreshReady()]");
+ LogUtils.i(TAG, "[Notify: onRefreshReady()]");
}
if (sRequeryCursor != null && !sRequeryCursor.isClosed()) {
synchronized (sListeners) {
@@ -735,7 +735,7 @@
// If we're here, then something outside of the UI has changed the data, and we
// must query the underlying provider for that data
if (DEBUG) {
- LogUtils.d(TAG, "Underlying conversation cursor changed; requerying");
+ LogUtils.i(TAG, "Underlying conversation cursor changed; requerying");
}
// It's not at all obvious to me why we must unregister/re-register after the requery
// However, if we don't we'll only get one notification and no more...
diff --git a/src/com/android/mail/compose/AttachmentsView.java b/src/com/android/mail/compose/AttachmentsView.java
index 0ba8c8b..292577f 100644
--- a/src/com/android/mail/compose/AttachmentsView.java
+++ b/src/com/android/mail/compose/AttachmentsView.java
@@ -123,18 +123,6 @@
}
/**
- * See if all the attachments in this view are synced.
- */
- public boolean areAttachmentsSynced() {
- for (Attachment a : mAttachments) {
- if (a.isSynced) {
- return true;
- }
- }
- return false;
- }
-
- /**
* Get the total size of all attachments currently in this view.
*/
public long getTotalAttachmentsSize() {
diff --git a/src/com/android/mail/providers/AccountCacheProvider.java b/src/com/android/mail/providers/AccountCacheProvider.java
index 11c6772..0118897 100644
--- a/src/com/android/mail/providers/AccountCacheProvider.java
+++ b/src/com/android/mail/providers/AccountCacheProvider.java
@@ -302,8 +302,15 @@
if (accountsStringSet != null) {
for (String serializedAccount : accountsStringSet) {
- final Account account = new Account(serializedAccount);
- addAccount(account);
+ try {
+ final Account account = new Account(serializedAccount);
+ addAccount(account);
+ } catch (IllegalArgumentException e) {
+ // Unable to create account object, skip to next
+ LogUtils.e(LOG_TAG,
+ "Unable to create account object from serialized string'%s'",
+ serializedAccount);
+ }
}
}
}
diff --git a/src/com/android/mail/providers/Attachment.java b/src/com/android/mail/providers/Attachment.java
index e448fc1..59607a1 100644
--- a/src/com/android/mail/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -53,10 +53,6 @@
*/
public String partId;
/**
- * isSynced is true if the attachment is available locally on the device.
- */
- public boolean isSynced;
- /**
* Attachment size in kb.
*/
public long size;
@@ -67,7 +63,6 @@
mimeType = in.readString();
contentUri = in.readString();
partId = in.readString();
- isSynced = in.readInt() == 1;
size = in.readLong();
origin = in.readInt();
}
@@ -105,7 +100,6 @@
dest.writeString(mimeType);
dest.writeString(contentUri);
dest.writeString(partId);
- dest.writeInt(isSynced? 1 : 0);
dest.writeLong(size);
dest.writeInt(origin);
}
diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java
index 2aab5f4..0c74022 100644
--- a/src/com/android/mail/providers/UIProvider.java
+++ b/src/com/android/mail/providers/UIProvider.java
@@ -20,6 +20,7 @@
import android.content.ContentProvider;
import android.content.ContentValues;
import android.content.Context;
+import android.content.Intent;
import android.provider.BaseColumns;
import android.text.TextUtils;
import android.net.Uri;
@@ -219,7 +220,7 @@
public static final String URI = "accountUri";
/**
- * This integer column contains a bit field of the possible cabibilities that this account
+ * This integer column contains a bit field of the possible capabilities that this account
* supports.
*/
public static final String CAPABILITIES = "capabilities";
@@ -824,7 +825,6 @@
private MessageColumns() {}
}
- // We define a "folder" as anything that contains a list of conversations.
public static final String ATTACHMENT_LIST_TYPE =
"vnd.android.cursor.dir/vnd.com.android.mail.attachment";
public static final String ATTACHMENT_TYPE =
@@ -835,9 +835,13 @@
AttachmentColumns.NAME,
AttachmentColumns.SIZE,
AttachmentColumns.URI,
- AttachmentColumns.ORIGIN_EXTRAS,
AttachmentColumns.CONTENT_TYPE,
- AttachmentColumns.SYNCED
+ AttachmentColumns.STATE,
+ AttachmentColumns.DESTINATION,
+ AttachmentColumns.DOWNLOADED_SIZE,
+ AttachmentColumns.CONTENT_URI,
+ AttachmentColumns.THUMBNAIL_URI,
+ AttachmentColumns.PREVIEW_INTENT
};
private static final String EMAIL_SEPARATOR_PATTERN = "\n";
public static final int ATTACHMENT_ID_COLUMN = 0;
@@ -848,13 +852,137 @@
public static final int ATTACHMENT_CONTENT_TYPE_COLUMN = 5;
public static final int ATTACHMENT_SYNCED_COLUMN = 6;
+ /**
+ * Valid states for the {@link AttachmentColumns#STATE} column.
+ *
+ */
+ public static final class AttachmentState {
+ /**
+ * The full attachment is not present on device. When used as a command,
+ * setting this state will tell the provider to cancel a download in
+ * progress.
+ * <p>
+ * Valid next states: {@link #DOWNLOADING}
+ */
+ public static final int NOT_SAVED = 0;
+ /**
+ * The most recent attachment download attempt failed. The current UI
+ * design does not require providers to persist this state, but
+ * providers must return this state at least once after a download
+ * failure occurs. This state may not be used as a command.
+ * <p>
+ * Valid next states: {@link #DOWNLOADING}
+ */
+ public static final int FAILED = 1;
+ /**
+ * The attachment is currently being downloaded by the provider.
+ * {@link AttachmentColumns#DOWNLOADED_SIZE} should reflect the current
+ * download progress while in this state. When used as a command,
+ * setting this state will tell the provider to initiate a download to
+ * the accompanying destination in {@link AttachmentColumns#DESTINATION}
+ * .
+ * <p>
+ * Valid next states: {@link #NOT_SAVED}, {@link #FAILED},
+ * {@link #SAVED}
+ */
+ public static final int DOWNLOADING = 2;
+ /**
+ * The attachment was successfully downloaded to the destination in
+ * {@link AttachmentColumns#DESTINATION}. If a provider later detects
+ * that a download is missing, it should reset the state to
+ * {@link #NOT_SAVED}. This state may not be used as a command on its
+ * own. To move a file from cache to external, update
+ * {@link AttachmentColumns#DESTINATION}.
+ * <p>
+ * Valid next states: {@link #NOT_SAVED}
+ */
+ public static final int SAVED = 3;
+
+ private AttachmentState() {}
+ }
+
+ public static final class AttachmentDestination {
+
+ /**
+ * The attachment will be or is already saved to the app-private cache partition.
+ */
+ public static final int CACHE = 0;
+ /**
+ * The attachment will be or is already saved to external shared device storage.
+ */
+ public static final int EXTERNAL = 1;
+
+ private AttachmentDestination() {}
+ }
+
public static final class AttachmentColumns {
+ /**
+ * This string column is the attachment's file name, intended for display in UI. It is not
+ * the full path of the file.
+ */
public static final String NAME = "name";
+ /**
+ * This integer column is the file size of the attachment, in bytes.
+ */
public static final String SIZE = "size";
+ /**
+ * This column is a {@link Uri} that can be queried to monitor download state and progress
+ * for this individual attachment (resulting cursor has one single row for this attachment).
+ */
public static final String URI = "uri";
- public static final String ORIGIN_EXTRAS = "originExtras";
+ /**
+ * This string column is the MIME type of the attachment.
+ */
public static final String CONTENT_TYPE = "contentType";
- public static final String SYNCED = "synced";
+ /**
+ * This integer column is the current downloading state of the
+ * attachment as defined in {@link AttachmentState}.
+ * <p>
+ * Providers must accept updates to {@link URI} with new values of
+ * this column to initiate or cancel downloads.
+ */
+ public static final String STATE = "state";
+ /**
+ * This integer column is the file destination for the current download
+ * in progress (when {@link #STATE} is
+ * {@link AttachmentState#DOWNLOADING}) or the resulting downloaded file
+ * ( when {@link #STATE} is {@link AttachmentState#SAVED}), as defined
+ * in {@link AttachmentDestination}. This value is undefined in any
+ * other state.
+ * <p>
+ * Providers must accept updates to {@link URI} with new values of
+ * this column to move an existing downloaded file.
+ */
+ public static final String DESTINATION = "destination";
+ /**
+ * This integer column is the current number of bytes downloaded when
+ * {@link #STATE} is {@link AttachmentState#DOWNLOADING}. This value is
+ * undefined in any other state.
+ */
+ public static final String DOWNLOADED_SIZE = "downloadedSize";
+ /**
+ * This column is a {@link Uri} that points to the downloaded local file
+ * when {@link #STATE} is {@link AttachmentState#SAVED}. This value is
+ * undefined in any other state.
+ */
+ public static final String CONTENT_URI = "contentUri";
+ /**
+ * This column is a {@link Uri} that points to a local thumbnail file
+ * for the attachment. Providers that do not support downloading
+ * attachment thumbnails may leave this null.
+ */
+ public static final String THUMBNAIL_URI = "thumbnailUri";
+ /**
+ * This column is an {@link Intent} to launch a preview activity that
+ * allows the user to efficiently view an attachment without having to
+ * first download the entire file. Providers that do not support
+ * previewing attachments may leave this null. The intent is represented
+ * as a byte-array blob generated by writing an Intent to a parcel and
+ * then marshaling that parcel.
+ */
+ public static final String PREVIEW_INTENT = "previewIntent";
+
+ private AttachmentColumns() {}
}
public static int getMailMaxAttachmentSize(String account) {