Merge "Added query parameters for search"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 3b36c5b..bc6cbfa 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Daar is geen teks in die boodskaplyf nie."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Stuur hierdie boodskap?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Boodskap weggegooi."</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">"Stuur"</string>
<string name="mark_read" msgid="8438349154394313195">"Merk as gelees"</string>
<string name="mark_unread" msgid="6231373939351125713">"Merk as ongelees"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2a9acc4..f0351c0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/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-bg/strings.xml b/res/values-bg/strings.xml
index e9acd74..2abad56 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Съобщението е празно. Не сте въвели нищо."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Да се изпрати ли това съобщение?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Съобщението е отхвърлено."</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">"Изпращане"</string>
<string name="mark_read" msgid="8438349154394313195">"Означаване като прочетено"</string>
<string name="mark_unread" msgid="6231373939351125713">"Означаване като непрочетено"</string>
@@ -133,12 +132,15 @@
<string name="me" msgid="6480762904022198669">"аз"</string>
<string name="labels" msgid="1519770547536283663">"Етикети"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Показване на всички папки"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <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>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"Да се отхвърли ли това съобщение?"</string>
<string name="no_conversations" msgid="35400008890372241">"Няма кореспонденции."</string>
<string name="undo" msgid="6070869718469782251">"Отмяна"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fbc61f8..10ffaab 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronitza i notifica"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Configuració de l\'etiqueta"</string>
<string name="menu_done" msgid="5791134842152855128">"Fet"</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ó del compte"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Configuració"</string>
<string name="menu_search" msgid="5297197523031943248">"Cerca"</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-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index d7f657b..dcf7010 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sync & notify"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Label settings"</string>
<string name="menu_done" msgid="5791134842152855128">"Finished"</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">"Account settings"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Settings"</string>
<string name="menu_search" msgid="5297197523031943248">"Search"</string>
<string name="more" msgid="1238344647379009858">"More"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> of <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 23fdf97..24301e5 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -132,12 +132,15 @@
<string name="me" msgid="6480762904022198669">"من"</string>
<string name="labels" msgid="1519770547536283663">"برچسبها"</string>
<string name="show_all_folders" msgid="3281420732307737553">"نمایش همه پوشهها"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <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>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"از این پیام صرفنظر شود؟"</string>
<string name="no_conversations" msgid="35400008890372241">"مکالمهای موجود نیست."</string>
<string name="undo" msgid="6070869718469782251">"لغو"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 39376a3..cbfa8fa 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -73,10 +73,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synchroniser et signaler"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Paramètres du libellé"</string>
<string name="menu_done" msgid="5791134842152855128">"OK"</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">"Paramètres de compte"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Paramètres"</string>
<string name="menu_search" msgid="5297197523031943248">"Rechercher"</string>
<string name="more" msgid="1238344647379009858">"Plus"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ba67cd8..06f426f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -132,12 +132,15 @@
<string name="me" msgid="6480762904022198669">"saya"</string>
<string name="labels" msgid="1519770547536283663">"Label"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Tampilkan semua map"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <item quantity="one" msgid="3731948757247905508">"Hapus percakapan ini?"</item>
+ <item quantity="other" msgid="930334208937121234">"Hapus <xliff:g id="COUNT">%1$d</xliff:g> percakapan ini?"</item>
+ </plurals>
+ <plurals name="confirm_archive_conversation">
+ <item quantity="one" msgid="2990537295519552069">"Arsipkan percakapan ini?"</item>
+ <item quantity="other" msgid="4713469868399246772">"Arsipkan <xliff:g id="COUNT">%1$d</xliff:g> percakapan ini?"</item>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"Buang pesan ini?"</string>
<string name="no_conversations" msgid="35400008890372241">"Tidak ada percakapan."</string>
<string name="undo" msgid="6070869718469782251">"Urungkan"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f2ef916..89d2f87 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/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-ja/strings.xml b/res/values-ja/strings.xml
index 88fa20b..224cd5c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"メールの本文が入力されていません。"</string>
<string name="confirm_send_message" msgid="3221546155385562874">"このメールを送信しますか？"</string>
<string name="message_discarded" msgid="5079975378884765445">"メッセージを破棄しました。"</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">"送信"</string>
<string name="mark_read" msgid="8438349154394313195">"既読にする"</string>
<string name="mark_unread" msgid="6231373939351125713">"未読にする"</string>
@@ -133,12 +132,15 @@
<string name="me" msgid="6480762904022198669">"自分"</string>
<string name="labels" msgid="1519770547536283663">"ラベル"</string>
<string name="show_all_folders" msgid="3281420732307737553">"すべてのフォルダを表示"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <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>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"このメールを破棄しますか？"</string>
<string name="no_conversations" msgid="35400008890372241">"スレッドがありません。"</string>
<string name="undo" msgid="6070869718469782251">"元に戻す"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9114e92..79c921e 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -133,12 +133,15 @@
<string name="me" msgid="6480762904022198669">"saya"</string>
<string name="labels" msgid="1519770547536283663">"Label"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Tunjukkan semua folder"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <item quantity="one" msgid="3731948757247905508">"Padamkan perbualan ini?"</item>
+ <item quantity="other" msgid="930334208937121234">"Padamkan <xliff:g id="COUNT">%1$d</xliff:g> perbualan ini?"</item>
+ </plurals>
+ <plurals name="confirm_archive_conversation">
+ <item quantity="one" msgid="2990537295519552069">"Arkibkan perbualan ini?"</item>
+ <item quantity="other" msgid="4713469868399246772">"Arkibkan <xliff:g id="COUNT">%1$d</xliff:g> perbualan ini?"</item>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"Buang mesej ini?"</string>
<string name="no_conversations" msgid="35400008890372241">"Tiada perbualan."</string>
<string name="undo" msgid="6070869718469782251">"Buat asal"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index fda0bb5..a607993 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Synkronisering og varsling"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Innstillinger for etikett"</string>
<string name="menu_done" msgid="5791134842152855128">"Ferdig"</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">"Kontoinnstillinger"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Innstillinger"</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-pl/strings.xml b/res/values-pl/strings.xml
index dd25804..2a86ada 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Brak tekstu w treści wiadomości."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Wysłać tę wiadomość?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Wiadomość została odrzucona."</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">"Wyślij"</string>
<string name="mark_read" msgid="8438349154394313195">"Oznacz jako przeczytane"</string>
<string name="mark_unread" msgid="6231373939351125713">"Oznacz jako nieprzeczytane"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6280d7f..f150da6 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Sincronizar e notificar"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Definições de etiquetas"</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">"Definições da conta"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Definiçõ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-ro/strings.xml b/res/values-ro/strings.xml
index ff54eb8..55a9ff5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Nu există text în corpul mesajului."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Trimiteţi acest mesaj?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Mesaj refuzat."</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">"Trimiteţi"</string>
<string name="mark_read" msgid="8438349154394313195">"Marcaţi drept citită"</string>
<string name="mark_unread" msgid="6231373939351125713">"Marcaţi drept necitită"</string>
@@ -133,12 +132,15 @@
<string name="me" msgid="6480762904022198669">"eu"</string>
<string name="labels" msgid="1519770547536283663">"Etichete"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Afişaţi toate dosarele"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <item quantity="one" msgid="3731948757247905508">"Ştergeţi această conversaţie?"</item>
+ <item quantity="other" msgid="930334208937121234">"Ştergeţi aceste <xliff:g id="COUNT">%1$d</xliff:g> (de) conversaţii?"</item>
+ </plurals>
+ <plurals name="confirm_archive_conversation">
+ <item quantity="one" msgid="2990537295519552069">"Arhivaţi această conversaţie?"</item>
+ <item quantity="other" msgid="4713469868399246772">"Arhivaţi aceste <xliff:g id="COUNT">%1$d</xliff:g> (de) conversaţii?"</item>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"Renunţaţi la acest mesaj?"</string>
<string name="no_conversations" msgid="35400008890372241">"Nicio conversaţie."</string>
<string name="undo" msgid="6070869718469782251">"Anulaţi"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 80763fa..614c74b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Введите текст сообщения."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Отправить это сообщение?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Черновик удален."</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">"Отправить"</string>
<string name="mark_read" msgid="8438349154394313195">"Отметить как прочитанное"</string>
<string name="mark_unread" msgid="6231373939351125713">"Отметить как непрочитанное"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 42122d0..531334a 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"V tele správy nie je žiaden text."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Chcete odoslať túto správu?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Správa bola zahodená."</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">"Poslať"</string>
<string name="mark_read" msgid="8438349154394313195">"Označiť ako prečítané"</string>
<string name="mark_unread" msgid="6231373939351125713">"Označiť ako neprečítané"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b30d2f2..88b03de 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"Hakuna maandishi katika kiini cha ujumbe."</string>
<string name="confirm_send_message" msgid="3221546155385562874">"Tuma ujumbe huu?"</string>
<string name="message_discarded" msgid="5079975378884765445">"Ujumbe umetupwa."</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">"Tuma"</string>
<string name="mark_read" msgid="8438349154394313195">"Weka alama kuwa imesomwa"</string>
<string name="mark_unread" msgid="6231373939351125713">"Tia alama kuwa haijasomwa"</string>
@@ -133,12 +132,15 @@
<string name="me" msgid="6480762904022198669">"mimi"</string>
<string name="labels" msgid="1519770547536283663">"Lebo"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Onyesha folda zote"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <item quantity="one" msgid="3731948757247905508">"Futa mazungumzo haya?"</item>
+ <item quantity="other" msgid="930334208937121234">"Futa mazungumzo haya <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+ </plurals>
+ <plurals name="confirm_archive_conversation">
+ <item quantity="one" msgid="2990537295519552069">"Jalidi mazungumzo haya?"</item>
+ <item quantity="other" msgid="4713469868399246772">"Jalidi mazungumzo haya <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"Tupa ujumbe huu?"</string>
<string name="no_conversations" msgid="35400008890372241">"Hakuna mazungumzo."</string>
<string name="undo" msgid="6070869718469782251">"Tengua"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index efdf1bb..9d7c0a5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -47,8 +47,7 @@
<string name="confirm_send_message_with_no_body" msgid="4606328514693368953">"邮件正文中没有文字。"</string>
<string name="confirm_send_message" msgid="3221546155385562874">"要发送此邮件吗？"</string>
<string name="message_discarded" msgid="5079975378884765445">"邮件已舍弃。"</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">"发送"</string>
<string name="mark_read" msgid="8438349154394313195">"标记为已读"</string>
<string name="mark_unread" msgid="6231373939351125713">"标记为未读"</string>
@@ -133,12 +132,15 @@
<string name="me" msgid="6480762904022198669">"我"</string>
<string name="labels" msgid="1519770547536283663">"标签"</string>
<string name="show_all_folders" msgid="3281420732307737553">"显示所有文件夹"</string>
- <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
- <!-- no translation found for confirm_delete_conversation:other (930334208937121234) -->
- <!-- no translation found for confirm_archive_conversation:one (2990537295519552069) -->
- <!-- no translation found for confirm_archive_conversation:other (4713469868399246772) -->
- <!-- no translation found for confirm_discard_text (1149834186404614612) -->
- <skip />
+ <plurals name="confirm_delete_conversation">
+ <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>
+ </plurals>
+ <string name="confirm_discard_text" msgid="1149834186404614612">"要舍弃此邮件吗？"</string>
<string name="no_conversations" msgid="35400008890372241">"无会话。"</string>
<string name="undo" msgid="6070869718469782251">"撤消"</string>
<plurals name="conversation_marking_read">
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cc564a4..c8b422d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -72,10 +72,8 @@
<string name="manage_labels_subtitle" msgid="8802709983773098505">"Ukuvumelanisa & ukuqaphelisa"</string>
<string name="menu_label_options" msgid="1811414840489117457">"Izilungiselelo zelebuli"</string>
<string name="menu_done" msgid="5791134842152855128">"Kwenziwe"</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">"Izilungiselelo ze-akhawunti"</string>
+ <string name="menu_settings" msgid="6007027046949837282">"Izilungiselelo"</string>
<string name="menu_search" msgid="5297197523031943248">"Sesha"</string>
<string name="more" msgid="1238344647379009858">"Okuningi"</string>
<string name="message_count" msgid="1032500151281269302">"<xliff:g id="COUNT">%1$s</xliff:g> koku-<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
diff --git a/src/com/android/mail/ConversationListContext.java b/src/com/android/mail/ConversationListContext.java
index 5356370..fa6bbb0 100644
--- a/src/com/android/mail/ConversationListContext.java
+++ b/src/com/android/mail/ConversationListContext.java
@@ -25,6 +25,7 @@
import android.os.Bundle;
import com.android.mail.providers.Account;
import com.android.mail.providers.Folder;
+import com.android.mail.providers.Settings;
import com.android.mail.providers.UIProvider;
import java.util.ArrayList;
@@ -82,26 +83,36 @@
}
/**
- * Builds a context for a view to a Gmail folder. Note that folder may be null, in which case
- * the context defaults to a view of the inbox.
+ * Builds a context for a view to a Gmail folder. Note that folder may be
+ * null, in which case the context defaults to a view of the user's default
+ * inbox. Should only be called from an async task when the folder is null.
*/
- public static ConversationListContext forFolder(
- Context context, Account account, Folder folder) {
+ public static ConversationListContext forFolder(Context context, Account account, Folder folder) {
if (folder == null) {
- // TODO (mindyp): when getAccountInbox is setup, use the setting to get it.
- // folder = account.getAccountInbox();
Cursor cursor = null;
+ Cursor folderCursor = null;
try {
- cursor = context.getContentResolver().query(account.folderListUri,
- UIProvider.FOLDERS_PROJECTION, null, null, null);
+ cursor = context.getContentResolver().query(account.settingsQueryUri,
+ UIProvider.SETTINGS_PROJECTION, null, null, null);
if (cursor != null) {
cursor.moveToFirst();
- folder = new Folder(cursor);
+ Settings settings = new Settings(cursor);
+ if (settings != null) {
+ folderCursor = context.getContentResolver().query(settings.defaultInbox,
+ UIProvider.FOLDERS_PROJECTION, null, null, null);
+ if (folderCursor != null) {
+ folderCursor.moveToFirst();
+ folder = new Folder(folderCursor);
+ }
+ }
}
} finally {
if (cursor != null) {
cursor.close();
}
+ if (folderCursor != null) {
+ folderCursor.close();
+ }
}
}
return new ConversationListContext(account, null, folder);
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 37b7f5c..0bf375b 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -290,7 +290,7 @@
@Override
public void onFolderChanged(Folder folder) {
- if (!folder.equals(mFolder)) {
+ if (folder != null && !folder.equals(mFolder)) {
setFolder(folder);
mConvListContext = ConversationListContext.forFolder(mContext, mAccount, mFolder);
showConversationList(mConvListContext);
@@ -299,11 +299,13 @@
private void setFolder(Folder folder) {
// Start watching folder for sync status.
- if (!folder.equals(mFolder)) {
+ if (folder != null && !folder.equals(mFolder)) {
mRefreshInProgress = false;
mFolder = folder;
mActionBarView.setFolder(mFolder);
mActivity.getLoaderManager().restartLoader(FOLDER_CURSOR_LOADER, null, this);
+ } else if (folder == null) {
+ LogUtils.wtf(LOG_TAG, "Folder in setFolder is null");
}
}