merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index fae1776..484231a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sinkroniseeropsies"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Merk as ongelees"</string>
<string name="move_action" msgid="3059189775933985898">"Skuif"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Jonger"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ouer"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Voeg Cc/Bcc by"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Heg lêer aan"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1380d35..c76dc85 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"አስምር አማራጮች"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"እንዳልተነበበ ምልክት አድርግ"</string>
<string name="move_action" msgid="3059189775933985898">"አንቀሳቅስ"</string>
+ <string name="newer_action" msgid="8950909456802330593">"አዲስ"</string>
+ <string name="older_action" msgid="4504015635360605471">"የቆየ"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ካርቦን ቅጂ/ስውር ቅጂ"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"ካርቦን ቅጂ (ካቅ) / ስውር ቅጂ አክል"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"ፋይል አያይዝ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 40ccf84..cb41a1e 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"خيارات المزامنة"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"تعليمها بـ \"غير مقروءة\""</string>
<string name="move_action" msgid="3059189775933985898">"نقل"</string>
+ <string name="newer_action" msgid="8950909456802330593">"أحدث"</string>
+ <string name="older_action" msgid="4504015635360605471">"أقدم"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+نسخة إلى/ مخفية"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"إضافة نسخة/ مخفية"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"إرفاق ملف"</string>
@@ -414,7 +416,7 @@
<string name="exchange_name" msgid="1190783774800310346">"الشركة"</string>
<string name="exchange_name_alternate" msgid="5772529644749041052">"Microsoft Exchange ActiveSync"</string>
<string name="system_account_create_failed" msgid="3673792980526246177">"تعذر إنشاء الحساب. أعد المحاولة."</string>
- <string name="device_admin_label" msgid="8680224994637869414">"إرسال رسالة إلكترونية"</string>
+ <string name="device_admin_label" msgid="8680224994637869414">"بريد إلكتروني"</string>
<string name="device_admin_description" msgid="426727923791430306">"لتمكين سياسات الأمان الخاصة بالخادم"</string>
<string name="gal_searching_fmt" msgid="6140450617663543464">"جارِ البحث <xliff:g id="DOMAIN">%s</xliff:g>…"</string>
<plurals name="gal_completed_fmt">
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5607894..c276ad9 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Параметры сінхранізацыі"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Пазначыць як непрачытанае"</string>
<string name="move_action" msgid="3059189775933985898">"Перанесці"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Навей"</string>
+ <string name="older_action" msgid="4504015635360605471">"Старэй"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Копія/УК"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Дадаць Копію/УК"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Далучыць файл"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 038ab66..549fa8c 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Опции за синхронизиране"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Непрочетено"</string>
<string name="move_action" msgid="3059189775933985898">"Местене"</string>
+ <string name="newer_action" msgid="8950909456802330593">"По-ново"</string>
+ <string name="older_action" msgid="4504015635360605471">"По-старо"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Як/Ск"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Добавяне на Як:/Ск:"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Прикачване на файл"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d351ead..eda9ca9 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opcions de sincronització"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marca com a no llegit"</string>
<string name="move_action" msgid="3059189775933985898">"Mou"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Més recent"</string>
+ <string name="older_action" msgid="4504015635360605471">"Més antic"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Afegeix Cc/Cco"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Adjunta un fitxer"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 8c6830f..7e4dd7c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti synchronizace"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označit jako nepřečtené"</string>
<string name="move_action" msgid="3059189775933985898">"Přesunout"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novější"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starší"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kopie/skrytá"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Přidat kopii/skrytou kopii"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Přiložit soubor"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 61b2034..eb23493 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Indstillinger for synkronisering"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markér som ulæst"</string>
<string name="move_action" msgid="3059189775933985898">"Flyt"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nyere"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ældre"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Tilføj Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Vedhæft fil"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index db10033..32b1875 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synchronisierungsoptionen"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Als ungelesen markieren"</string>
<string name="move_action" msgid="3059189775933985898">"Verschieben"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Neuere"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ältere"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc hinzufügen"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Datei anhängen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 65d5cbf..b4ad068 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Επιλογές συγχρονισμού"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Επισήμανση ως μη αναγνωσμένα"</string>
<string name="move_action" msgid="3059189775933985898">"Μετακίνηση"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Νεότερο"</string>
+ <string name="older_action" msgid="4504015635360605471">"Παλαιότερο"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Κοιν./Κρ.κοιν."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Προσθ.Κοιν./Κρ.κοιν."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Επισύναψη αρχείου"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 2183cb9..49f5442 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sync options"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Mark as unread"</string>
<string name="move_action" msgid="3059189775933985898">"Move"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Newer"</string>
+ <string name="older_action" msgid="4504015635360605471">"Older"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Add Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Attach file"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 704b126..32ee6a6 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leídos"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nuevos"</string>
+ <string name="older_action" msgid="4504015635360605471">"Antiguos"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ CC/CCO"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Agregar CC/CCO"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar un archivo"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 2659695..11dd9f2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opciones de sincronización"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como no leído"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Más reciente"</string>
+ <string name="older_action" msgid="4504015635360605471">"Más antiguo"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Añadir Cc/Cco"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar archivo"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index fbd275b..f4523ba 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sünkroonimisvalikud"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Märgi mitteloetuks"</string>
<string name="move_action" msgid="3059189775933985898">"Teisalda"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Uuemad"</string>
+ <string name="older_action" msgid="4504015635360605471">"Vanemad"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ koopia/pimek."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Lisa koopia/pimekoopia väli"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Manusta fail"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bec3ba1..40f0f77 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"گزینههای همگامسازی"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"علامتگذاری بهعنوان خوانده نشده"</string>
<string name="move_action" msgid="3059189775933985898">"انتقال"</string>
+ <string name="newer_action" msgid="8950909456802330593">"جدیدتر"</string>
+ <string name="older_action" msgid="4504015635360605471">"قدیمیتر"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ گیرندهٔ کپی/گیرنده مخفی"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"افزودن گیرندهٔ کپی/گیرندهٔ کپی مخفی"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"پیوست کردن فایل"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5e1a482..e0244cc 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synkronointiasetukset"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Merkitse lukemattomaksi"</string>
<string name="move_action" msgid="3059189775933985898">"Siirrä"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Uudemmat"</string>
+ <string name="older_action" msgid="4504015635360605471">"Vanhemmat"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kopio/piilok."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Lisää kopio/piilok."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Liitä tiedosto"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f1cc8c1..543f03f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Options de synchronisation"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marquer comme non lu"</string>
<string name="move_action" msgid="3059189775933985898">"Déplacer"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Plus récent"</string>
+ <string name="older_action" msgid="4504015635360605471">"Plus ancien"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cci"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Ajouter Cc/Cci"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Joindre un fichier"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 12603d9..dac7591 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"समन्वयन विकल्प"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"बिना पढ़ी के रूप में चिह्नित करें"</string>
<string name="move_action" msgid="3059189775933985898">"ले जाएं"</string>
+ <string name="newer_action" msgid="8950909456802330593">"नया"</string>
+ <string name="older_action" msgid="4504015635360605471">"पुराना"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bcc जोड़ें"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc जोड़ें"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"फ़ाइल अनुलग्न करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1140abb..42a3e99 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opcije sinkronizacije"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kao nepročitano"</string>
<string name="move_action" msgid="3059189775933985898">"Premjesti"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novije"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starije"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kop/skr.kop."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj kopiju/skrivenu kopiju"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteku"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index e61ee35..5a77070 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Szinkronizálási beállítások"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Megjelölés olvasatlanként"</string>
<string name="move_action" msgid="3059189775933985898">"Áthelyezés"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Újabb"</string>
+ <string name="older_action" msgid="4504015635360605471">"Korábbi"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Másolatmezők"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Másolatmezők is"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Fájl csatolása"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 67cd545..a0aeeb2 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opsi sinkronisasi"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Tandai belum dibaca"</string>
<string name="move_action" msgid="3059189775933985898">"Pindahkan"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Lebih baru"</string>
+ <string name="older_action" msgid="4504015635360605471">"Lebih lama"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Tambahkan Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan file"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index cbe5eb0..6dad0c1 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opzioni di sincronizzazione"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Segna come da leggere"</string>
<string name="move_action" msgid="3059189775933985898">"Sposta"</string>
+ <string name="newer_action" msgid="8950909456802330593">"+ recente"</string>
+ <string name="older_action" msgid="4504015635360605471">"- recente"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Ccn"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Aggiungi Cc/Ccn"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Allega file"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2dce2da..c9f1a52 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"אפשרויות סינכרון"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"סמן כלא נקרא"</string>
<string name="move_action" msgid="3059189775933985898">"העבר"</string>
+ <string name="newer_action" msgid="8950909456802330593">"חדש יותר"</string>
+ <string name="older_action" msgid="4504015635360605471">"ישן יותר"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ עותק/עותק מוסתר"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"הוסף עותק/עותק מוסתר"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"צרף קובץ"</string>
@@ -62,7 +64,7 @@
<string name="move_to_folder_dialog_title" msgid="2614318192482193898">"העבר אל"</string>
<string name="status_loading_messages" msgid="6552307237621292344">"טוען הודעות..."</string>
<string name="status_network_error" msgid="2611654064403817391">"בעיה בחיבור."</string>
- <string name="error_loading_message_body" msgid="6775234299515596760">"לא ניתן לטעון את טקסט ההודעה. ייתכן שההודעה גדולה מדי להצגה."</string>
+ <string name="error_loading_message_body" msgid="6775234299515596760">"לא ניתן להעלות את טקסט ההודעה. ייתכן שההודעה גדולה מדי להצגה."</string>
<plurals name="move_messages">
<item quantity="one" msgid="320885379869442589">"העבר הודעה"</item>
<item quantity="other" msgid="371256717624461324">"העבר הודעות"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a679af5..ff80379 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"同期オプション"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"未読にする"</string>
<string name="move_action" msgid="3059189775933985898">"移動"</string>
+ <string name="newer_action" msgid="8950909456802330593">"前"</string>
+ <string name="older_action" msgid="4504015635360605471">"次"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"Cc/Bccを追加"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bccを追加"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"ファイルを添付"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7a46585..ed96d4c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"동기화 옵션"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"읽지않음으로 표시"</string>
<string name="move_action" msgid="3059189775933985898">"이동"</string>
+ <string name="newer_action" msgid="8950909456802330593">"다음"</string>
+ <string name="older_action" msgid="4504015635360605471">"이전"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"참조/숨은참조 추가"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"참조/숨은참조 추가"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"파일 첨부"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c550eb7..c12e7e7 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sinchronizavimo parinktys"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Pažymėti kaip neskaitytą"</string>
<string name="move_action" msgid="3059189775933985898">"Perkelti"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Naujesnis"</string>
+ <string name="older_action" msgid="4504015635360605471">"Senesnis"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ kop. / nemat. kop."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Pridėti Cc / Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Pridėti failą"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2355ac1..92e0f48 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Sinhronizācijas opcijas"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Atzīmēt kā nelasītu"</string>
<string name="move_action" msgid="3059189775933985898">"Pārvietot"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Jaunāki"</string>
+ <string name="older_action" msgid="4504015635360605471">"Vecāki"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kopija/d. kop."</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Piev. kop./d. kop."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Pievienot failu"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2a687fa..e9ee2de 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Pilihan segerak"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Tandakan belum dibaca"</string>
<string name="move_action" msgid="3059189775933985898">"Alih"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Lebih baharu"</string>
+ <string name="older_action" msgid="4504015635360605471">"Lebih lama"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Sk/Skt"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Tambah Sk/Skt"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Lampirkan fail"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 1d5fc1c..44941d2 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synkroniseringsalternativer"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Merk som ulest"</string>
<string name="move_action" msgid="3059189775933985898">"Flytt"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nyere"</string>
+ <string name="older_action" msgid="4504015635360605471">"Eldre"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ kopi/blindkopi"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Legg til Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Legg ved fil"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e51bde0..b7996b9 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synchronisatieopties"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markeren als ongelezen"</string>
<string name="move_action" msgid="3059189775933985898">"Verpl."</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nieuwer"</string>
+ <string name="older_action" msgid="4504015635360605471">"Ouder"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc toevoegen"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Bestand bijvoegen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index da6b011..67def9f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opcje synchronizacji"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Oznacz jako nieprzeczytane"</string>
<string name="move_action" msgid="3059189775933985898">"Przenieś"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nowsze"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starsze"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ DW/UDW"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj DW/UDW"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Załącz plik"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index dd52ef3..afc508b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opções de sincronização"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mais recente"</string>
+ <string name="older_action" msgid="4504015635360605471">"Mais antigo"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adicionar Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Anexar ficheiro"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f42a4fc..e6c7814 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opções de sincronização"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar como não lida"</string>
<string name="move_action" msgid="3059189775933985898">"Mover"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Recente"</string>
+ <string name="older_action" msgid="4504015635360605471">"Antiga"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Cco"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adicionar Cc/Cco"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Anexar arquivo"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 6968f92..428d07c 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -67,6 +67,10 @@
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcar sco nunlegì"</string>
<!-- no translation found for move_action (3059189775933985898) -->
<skip />
+ <!-- no translation found for newer_action (8950909456802330593) -->
+ <skip />
+ <!-- no translation found for older_action (4504015635360605471) -->
+ <skip />
<!-- no translation found for plus_cc_label (3365150001259912183) -->
<skip />
<!-- no translation found for add_cc_bcc_menu (4757145078498200242) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 454f59b..e3ddd23 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Opţiuni de sincronizare"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Marcaţi drept necitit"</string>
<string name="move_action" msgid="3059189775933985898">"Mutaţi"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mai noi"</string>
+ <string name="older_action" msgid="4504015635360605471">"Mai vechi"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Adăugaţi Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Ataşaţi un fişier"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 83491c9..5072dad 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Параметры синхронизации"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Отметить как непрочитанное"</string>
<string name="move_action" msgid="3059189775933985898">"Переместить"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Следующее"</string>
+ <string name="older_action" msgid="4504015635360605471">"Предыдущее"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"Добавить копию"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Копия/скрытая"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Прикрепить файл"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 096d19a..06abbd9 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti synchronizácie"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označiť ako neprečítané"</string>
<string name="move_action" msgid="3059189775933985898">"Presunúť"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novšie"</string>
+ <string name="older_action" msgid="4504015635360605471">"Staršie"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+Kópia/skr.kópia"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Pridať kópiu/skr.k."</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Pripojiť súbor"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e5d71a1..e986652 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Možnosti sinhronizacije"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Označi kot neprebrano"</string>
<string name="move_action" msgid="3059189775933985898">"Premakni"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Novejše"</string>
+ <string name="older_action" msgid="4504015635360605471">"Starejše"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Kp/Skp"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Dodaj Kp/Skp"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteko"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index be05d06..e60095f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Опције синхронизације"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Означи као непрочитано"</string>
<string name="move_action" msgid="3059189775933985898">"Премести"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Новија"</string>
+ <string name="older_action" msgid="4504015635360605471">"Старијa"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Додај Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Приложи датотеку"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index fbc5f6f..f755b38 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Synkroniseringsalternativ"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markera som oläst"</string>
<string name="move_action" msgid="3059189775933985898">"Flytta"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Nyare"</string>
+ <string name="older_action" msgid="4504015635360605471">"Äldre"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+kopia/heml kop"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Lägg till kopia/hemlig kopia"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Bifoga fil"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 818f1d5..6515cc0 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Chaguo za kusawazisha"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Tia alama kuwa haijasomwa"</string>
<string name="move_action" msgid="3059189775933985898">"Hamisha"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mpya zaidi"</string>
+ <string name="older_action" msgid="4504015635360605471">"Nzee zaidi"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Nakala kwa/Nakala fiche kwa"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Ongeza Nakala kwa/Nakala fiche kwa"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Ambatisha faili"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2502e85..d9d659b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"ตัวเลือกการซิงค์"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"ทำเครื่องหมายว่ายังไม่ได้อ่าน"</string>
<string name="move_action" msgid="3059189775933985898">"ย้าย"</string>
+ <string name="newer_action" msgid="8950909456802330593">"ใหม่กว่า"</string>
+ <string name="older_action" msgid="4504015635360605471">"เก่ากว่า"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ สำเนา/สำเนาลับ"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"เพิ่มสำเนา/สำเนาลับ"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"แนบไฟล์"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index f927ff7..6a1ec3b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Mga pagpipilian sa pag-sync"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Markahan bilang hindi pa nababasa"</string>
<string name="move_action" msgid="3059189775933985898">"Ilipat"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mas Bago"</string>
+ <string name="older_action" msgid="4504015635360605471">"Mas Luma"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Magdagdag ng Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Mag-attach ng file"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f4bf51b..8d75772 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Senkronizasyon seçenekleri"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Okunmadı olarak işaretle"</string>
<string name="move_action" msgid="3059189775933985898">"Taşı"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Daha yeni"</string>
+ <string name="older_action" msgid="4504015635360605471">"Daha eski"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Cc/Bcc Ekle"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Dosya ekleyin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 69dde3c..d2501b6 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Параметри синхронізації"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Позн. як непрочит."</string>
<string name="move_action" msgid="3059189775933985898">"Переміст."</string>
+ <string name="newer_action" msgid="8950909456802330593">"Новіші"</string>
+ <string name="older_action" msgid="4504015635360605471">"Старіші"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+Копія/прихована"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Копія/прихов. копія"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Вкласти файл"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 379c025..8012fc1 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Tùy chọn đồng bộ hóa"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Đánh dấu là chưa đọc"</string>
<string name="move_action" msgid="3059189775933985898">"Di chuyển"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Mới hơn"</string>
+ <string name="older_action" msgid="4504015635360605471">"Cũ hơn"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Thêm Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Đính kèm tệp"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index e96f686..146a701 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"同步选项"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"标记为未读"</string>
<string name="move_action" msgid="3059189775933985898">"移动"</string>
+ <string name="newer_action" msgid="8950909456802330593">"后一封邮件"</string>
+ <string name="older_action" msgid="4504015635360605471">"前一封邮件"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+抄送/密送"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"添加抄送/密送地址"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"添加附件"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e4dbd85..6f58b57 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"同步處理選項"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"標示為未讀取"</string>
<string name="move_action" msgid="3059189775933985898">"移動"</string>
+ <string name="newer_action" msgid="8950909456802330593">"較新"</string>
+ <string name="older_action" msgid="4504015635360605471">"較舊"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"新增副本/密件副本"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"新增副本/密件副本"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"附加檔案"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f09335c..2fbd9df 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -53,6 +53,8 @@
<string name="mailbox_settings_action" msgid="8008375875310554776">"Vumelanisa okukhethwa kukho"</string>
<string name="mark_as_unread_action" msgid="3766298115778767554">"Maka njengokungafundiwe"</string>
<string name="move_action" msgid="3059189775933985898">"Khipha"</string>
+ <string name="newer_action" msgid="8950909456802330593">"Okushanyana"</string>
+ <string name="older_action" msgid="4504015635360605471">"Okudadlana"</string>
<string name="plus_cc_label" msgid="3365150001259912183">"+ Cc/Bcc"</string>
<string name="add_cc_bcc_menu" msgid="4757145078498200242">"Engeza Cc/Bcc"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Namathisela ifayela"</string>
diff --git a/src/com/android/email/NotificationController.java b/src/com/android/email/NotificationController.java
index 073e1a4..2331f5a 100644
--- a/src/com/android/email/NotificationController.java
+++ b/src/com/android/email/NotificationController.java
@@ -463,7 +463,7 @@
intent = Welcome.createOpenAccountInboxIntent(mContext, accountId);
} else {
intent = Welcome.createOpenMessageIntent(
- mContext, accountId, mailboxId, newestMessageId, false);
+ mContext, accountId, mailboxId, newestMessageId);
}
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK |
Intent.FLAG_ACTIVITY_TASK_ON_HOME);
diff --git a/src/com/android/email/activity/EmailActivity.java b/src/com/android/email/activity/EmailActivity.java
index ebb3abd..f823b4b 100644
--- a/src/com/android/email/activity/EmailActivity.java
+++ b/src/com/android/email/activity/EmailActivity.java
@@ -57,7 +57,6 @@
public static final String EXTRA_ACCOUNT_ID = "ACCOUNT_ID";
public static final String EXTRA_MAILBOX_ID = "MAILBOX_ID";
public static final String EXTRA_MESSAGE_ID = "MESSAGE_ID";
- public static final String EXTRA_FROM_KEYGUARD = "FROM_KEYGUARD";
public static final String EXTRA_QUERY_STRING = "QUERY_STRING";
/** Loader IDs starting with this is safe to use from UIControllers. */
@@ -85,12 +84,10 @@
*
* @param accountId If -1, default account will be used.
*/
- public static Intent createOpenAccountIntent(Activity fromActivity, long accountId,
- boolean fromKeyguard) {
+ public static Intent createOpenAccountIntent(Activity fromActivity, long accountId) {
Intent i = IntentUtilities.createRestartAppIntent(fromActivity, EmailActivity.class);
if (accountId != -1) {
i.putExtra(EXTRA_ACCOUNT_ID, accountId);
- i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
}
return i;
}
@@ -103,14 +100,13 @@
* {@link Mailbox#QUERY_ALL_INBOXES}) don't work.
*/
public static Intent createOpenMailboxIntent(Activity fromActivity, long accountId,
- long mailboxId, boolean fromKeyguard) {
+ long mailboxId) {
if (accountId == -1 || mailboxId == -1) {
throw new IllegalArgumentException();
}
Intent i = IntentUtilities.createRestartAppIntent(fromActivity, EmailActivity.class);
i.putExtra(EXTRA_ACCOUNT_ID, accountId);
i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
- i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
return i;
}
@@ -123,7 +119,7 @@
* @param messageId must not be -1.
*/
public static Intent createOpenMessageIntent(Activity fromActivity, long accountId,
- long mailboxId, long messageId, boolean fromKeyguard) {
+ long mailboxId, long messageId) {
if (accountId == -1 || mailboxId == -1 || messageId == -1) {
throw new IllegalArgumentException();
}
@@ -131,7 +127,6 @@
i.putExtra(EXTRA_ACCOUNT_ID, accountId);
i.putExtra(EXTRA_MAILBOX_ID, mailboxId);
i.putExtra(EXTRA_MESSAGE_ID, messageId);
- i.putExtra(EXTRA_FROM_KEYGUARD, fromKeyguard);
return i;
}
@@ -194,16 +189,6 @@
super.onCreate(savedInstanceState);
ActivityHelper.debugSetWindowFlags(this);
-
- final Intent intent = getIntent();
- boolean fromKeyguard = intent.getBooleanExtra(EXTRA_FROM_KEYGUARD, false);
- if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
- Log.d(Logging.LOG_TAG, "FLAG_DISMISS_KEYGUARD " + fromKeyguard);
- }
- if (fromKeyguard) {
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
- }
-
setContentView(mUIController.getLayoutId());
mUIController.onActivityViewReady();
@@ -224,6 +209,7 @@
if (savedInstanceState != null) {
mUIController.onRestoreInstanceState(savedInstanceState);
} else {
+ final Intent intent = getIntent();
final MessageListContext viewContext = MessageListContext.forIntent(this, intent);
if (viewContext == null) {
// This might happen if accounts were deleted on another thread, and there aren't
@@ -329,16 +315,6 @@
}
}
- @Override
- public void onWindowFocusChanged(boolean hasFocus) {
- if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
- Log.d(Logging.LOG_TAG, "FLAG_DISMISS_KEYGUARD onWindowFocusChanged " + hasFocus);
- }
- if (hasFocus) {
- getWindow().clearFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
- }
- }
-
/**
* Force dismiss the error banner.
*/
diff --git a/src/com/android/email/activity/ShortcutPicker.java b/src/com/android/email/activity/ShortcutPicker.java
index d80ecf1..94d6f05 100644
--- a/src/com/android/email/activity/ShortcutPicker.java
+++ b/src/com/android/email/activity/ShortcutPicker.java
@@ -143,7 +143,7 @@
// TODO if we add meta-mailboxes/accounts to the database, remove this special case
if (account.mId == Account.ACCOUNT_ID_COMBINED_VIEW) {
shortcutIntent = Welcome.createOpenMessageIntent(
- myActivity, account.mId, mailboxId, Message.NO_MESSAGE, false);
+ myActivity, account.mId, mailboxId, Message.NO_MESSAGE);
} else {
String uuid = account.mCompatibilityUuid;
shortcutIntent = Welcome.createAccountShortcutIntent(myActivity, uuid, mailboxId);
diff --git a/src/com/android/email/activity/Welcome.java b/src/com/android/email/activity/Welcome.java
index a2a0fa1..062ca22 100644
--- a/src/com/android/email/activity/Welcome.java
+++ b/src/com/android/email/activity/Welcome.java
@@ -86,7 +86,7 @@
*/
private static final String EXTRA_DEBUG_PANE_MODE = "DEBUG_PANE_MODE";
- private static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
+ public static final String VIEW_MAILBOX_INTENT_URL_PATH = "/view/mailbox";
private final EmailAsyncTask.Tracker mTaskTracker = new EmailAsyncTask.Tracker();
@@ -95,7 +95,6 @@
private long mAccountId;
private long mMailboxId;
private long mMessageId;
- private boolean mFromKeyguard;
private String mAccountUuid;
private MailboxFinder mInboxFinder;
@@ -125,15 +124,13 @@
* Create an Intent to open a message.
*/
public static Intent createOpenMessageIntent(Context context, long accountId,
- long mailboxId, long messageId, boolean fromKeyguard) {
+ long mailboxId, long messageId) {
final Uri.Builder b = IntentUtilities.createActivityIntentUrlBuilder(
VIEW_MAILBOX_INTENT_URL_PATH);
IntentUtilities.setAccountId(b, accountId);
IntentUtilities.setMailboxId(b, mailboxId);
IntentUtilities.setMessageId(b, messageId);
- Intent i = IntentUtilities.createRestartAppIntent(b.build());
- i.putExtra(EmailActivity.EXTRA_FROM_KEYGUARD, fromKeyguard);
- return i;
+ return IntentUtilities.createRestartAppIntent(b.build());
}
/**
@@ -192,7 +189,6 @@
mAccountId = IntentUtilities.getAccountIdFromIntent(intent);
mMailboxId = IntentUtilities.getMailboxIdFromIntent(intent);
mMessageId = IntentUtilities.getMessageIdFromIntent(intent);
- mFromKeyguard = intent.getBooleanExtra(EmailActivity.EXTRA_FROM_KEYGUARD, false);
mAccountUuid = IntentUtilities.getAccountUuidFromIntent(intent);
UiUtilities.setDebugPaneMode(getDebugPaneMode(intent));
@@ -380,12 +376,11 @@
private void startEmailActivity() {
final Intent i;
if (mMessageId != Message.NO_MESSAGE) {
- i = EmailActivity.createOpenMessageIntent(this, mAccountId, mMailboxId, mMessageId,
- mFromKeyguard);
+ i = EmailActivity.createOpenMessageIntent(this, mAccountId, mMailboxId, mMessageId);
} else if (mMailboxId != Mailbox.NO_MAILBOX) {
- i = EmailActivity.createOpenMailboxIntent(this, mAccountId, mMailboxId, mFromKeyguard);
+ i = EmailActivity.createOpenMailboxIntent(this, mAccountId, mMailboxId);
} else {
- i = EmailActivity.createOpenAccountIntent(this, mAccountId, mFromKeyguard);
+ i = EmailActivity.createOpenAccountIntent(this, mAccountId);
}
startActivity(i);
finish();
diff --git a/src/com/android/email/provider/WidgetProvider.java b/src/com/android/email/provider/WidgetProvider.java
index 0f6731b..7ac09c7 100644
--- a/src/com/android/email/provider/WidgetProvider.java
+++ b/src/com/android/email/provider/WidgetProvider.java
@@ -110,10 +110,6 @@
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
- if (intent.getData() != null) {
- // EmailWidget creates intents, so it knows how to handle them.
- EmailWidget.processIntent(this, intent);
- }
return Service.START_NOT_STICKY;
}
diff --git a/src/com/android/email/widget/EmailWidget.java b/src/com/android/email/widget/EmailWidget.java
index 4856305..6496ef9 100644
--- a/src/com/android/email/widget/EmailWidget.java
+++ b/src/com/android/email/widget/EmailWidget.java
@@ -221,57 +221,26 @@
* @param baseUri the base uri for the command
* @param args any arguments to the command
*/
- private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String ... args) {
- Intent intent = new Intent();
- Builder builder = baseUri.buildUpon();
- for (String arg: args) {
- builder.appendPath(arg);
+ private void setFillInIntent(RemoteViews views, int viewId, Uri baseUri, String messageId,
+ String mailboxId) {
+ Intent intent = null;
+ try {
+ intent = getOpenMessageIntent(mContext, Long.parseLong(messageId),
+ Long.parseLong(mailboxId));
+ } catch (NumberFormatException e) {
+ if (Logging.DEBUG_LIFECYCLE && Email.DEBUG) {
+ Log.d(TAG, "#setFillInIntent(); invalid messageId: " + messageId +
+ " or mailboxId: " + mailboxId);
+ }
}
- intent.setDataAndType(builder.build(), WIDGET_DATA_MIME_TYPE);
views.setOnClickFillInIntent(viewId, intent);
}
- /**
- * Called back by {@link com.android.email.provider.WidgetProvider.WidgetService} to
- * handle intents created by remote views.
- */
- public static boolean processIntent(Context context, Intent intent) {
- final Uri data = intent.getData();
- if (data == null) {
- return false;
- }
- List<String> pathSegments = data.getPathSegments();
- // Our path segments are <command>, <arg1> [, <arg2>]
- // First, a quick check of Uri validity
- if (pathSegments.size() < 2) {
- throw new IllegalArgumentException();
- }
- String command = pathSegments.get(0);
- // Ignore unknown action names
- try {
- final long arg1 = Long.parseLong(pathSegments.get(1));
- if (EmailWidget.COMMAND_NAME_VIEW_MESSAGE.equals(command)) {
- // "view", <message id>, <mailbox id>
- openMessage(context, Long.parseLong(pathSegments.get(2)), arg1);
- }
- } catch (NumberFormatException e) {
- // Shouldn't happen as we construct all of the Uri's
- return false;
- }
- return true;
- }
-
- private static void openMessage(final Context context, final long mailboxId,
- final long messageId) {
- EmailAsyncTask.runAsyncParallel(new Runnable() {
- @Override
- public void run() {
- Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
- if (mailbox == null) return;
- context.startActivity(Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
- mailboxId, messageId, true));
- }
- });
+ private Intent getOpenMessageIntent(final Context context, final long messageId,
+ final long mailboxId) {
+ Mailbox mailbox = Mailbox.restoreMailboxWithId(context, mailboxId);
+ return Welcome.createOpenMessageIntent(context, mailbox.mAccountKey,
+ mailboxId, messageId);
}
private void setTextViewTextAndDesc(RemoteViews views, final int id, String text) {
@@ -344,8 +313,8 @@
}
// Use a bare intent for our template; we need to fill everything in
- intent = new Intent(mContext, WidgetService.class);
- PendingIntent pendingIntent = PendingIntent.getService(mContext, 0, intent,
+ intent = new Intent(mContext, Welcome.class);
+ PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
PendingIntent.FLAG_UPDATE_CURRENT);
views.setPendingIntentTemplate(R.id.message_list, pendingIntent);
