Merge "use the drawer on small tablets. general tablet layout love." into jb-ub-mail-ur9
diff --git a/res/layout/account_item.xml b/res/layout/account_item.xml
index 1781761..9db0f9c 100644
--- a/res/layout/account_item.xml
+++ b/res/layout/account_item.xml
@@ -37,33 +37,26 @@
android:src="@drawable/account_radio_button"
android:layout_centerVertical="true"/>
- <LinearLayout
+ <TextView
+ android:id="@+id/name"
android:layout_height="wrap_content"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_toRightOf="@id/account_radio_button"
android:layout_alignWithParentIfMissing="true"
android:layout_marginLeft="@dimen/account_item_left_margin"
android:layout_marginRight="@dimen/account_item_right_margin"
- android:layout_centerVertical="true" >
+ android:layout_centerVertical="true"
+ android:includeFontPadding="false"
+ android:singleLine="true"
+ android:ellipsize="end"
+ android:textColor="@color/account_item_text_color"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView
- android:id="@+id/name"
- android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_marginRight="@dimen/account_item_right_margin"
- android:includeFontPadding="false"
- android:singleLine="true"
- android:ellipsize="end"
- android:textColor="@color/account_item_text_color"
- android:textAppearance="?android:attr/textAppearanceMedium" />
-
- <TextView
- android:id="@+id/unread"
- style="@style/UnreadCount"
- android:layout_alignWithParentIfMissing="true"
- android:layout_alignParentRight="true"
- android:textColor="@color/account_item_text_color" />
- </LinearLayout>
+ <TextView
+ android:id="@+id/unread"
+ style="@style/UnreadCount"
+ android:layout_marginRight="@dimen/account_item_right_margin"
+ android:layout_alignParentRight="true"
+ android:textColor="@color/account_item_text_color" />
</com.android.mail.ui.AccountItemView>
diff --git a/res/layout/drawer_empty_view.xml b/res/layout/drawer_empty_view.xml
index f125b76..788debd 100644
--- a/res/layout/drawer_empty_view.xml
+++ b/res/layout/drawer_empty_view.xml
@@ -25,18 +25,20 @@
android:layout_height="match_parent"
android:gravity="center_horizontal">
- <ProgressBar android:id="@+id/progress"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"/>
+ <ProgressBar
+ android:id="@+id/progress"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"/>
+
<TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/progress"
- android:layout_centerVertical="true"
- android:text="@string/wait_for_sync_title"
- android:textColor="@android:color/white"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_toRightOf="@id/progress"
+ android:layout_centerVertical="true"
+ android:text="@string/wait_for_sync_title"
+ android:textColor="@color/dark_gray_text_color"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
</RelativeLayout>
diff --git a/res/layout/folder_item.xml b/res/layout/folder_item.xml
index ae4890a..40f952e 100644
--- a/res/layout/folder_item.xml
+++ b/res/layout/folder_item.xml
@@ -46,44 +46,32 @@
android:layout_marginLeft="@dimen/folder_list_item_left_margin"
android:visibility="gone" />
- <LinearLayout
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/name"
android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/folder_icon"
android:layout_alignWithParentIfMissing="true"
android:layout_marginLeft="@dimen/folder_list_item_left_margin"
android:layout_marginRight="@dimen/folder_list_item_right_margin"
- android:layout_marginTop="@dimen/folder_swatch_height"
- android:layout_marginBottom="@dimen/folder_swatch_height">
+ android:includeFontPadding="false"
+ android:maxLines="2"
+ android:ellipsize="end"
+ android:textColor="@color/folder_item_text_color"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView
- android:id="@+id/name"
- android:layout_height="wrap_content"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_marginRight="@dimen/folder_list_item_right_margin"
- android:includeFontPadding="false"
- android:maxLines="2"
- android:ellipsize="end"
- android:textColor="@color/folder_item_text_color"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ <TextView
+ android:id="@+id/unread"
+ style="@style/UnreadCount"
+ android:layout_marginRight="@dimen/folder_list_item_right_margin"
+ android:layout_alignParentRight="true"
+ android:textColor="@color/folder_item_text_color" />
- <TextView
- android:id="@+id/unread"
- style="@style/UnreadCount"
- android:layout_alignWithParentIfMissing="true"
- android:layout_alignParentRight="true"
- android:layout_alignBaseline="@id/name"
- android:textColor="@color/folder_item_text_color" />
-
- <TextView
- android:id="@+id/unseen"
- style="@style/UnseenCount"
- android:layout_alignWithParentIfMissing="true"
- android:layout_alignParentRight="true"
- android:layout_alignBaseline="@id/name" />
-
- </LinearLayout>
+ <TextView
+ android:id="@+id/unseen"
+ style="@style/UnseenCount"
+ android:layout_marginRight="@dimen/folder_list_item_right_margin"
+ android:layout_alignParentRight="true"/>
</com.android.mail.ui.FolderItemView>
diff --git a/res/layout/widget.xml b/res/layout/widget.xml
index 128f45a..aebc6c9 100644
--- a/res/layout/widget.xml
+++ b/res/layout/widget.xml
@@ -79,13 +79,6 @@
android:layout_gravity="center_vertical"
android:contentDescription="@string/compose" />
</LinearLayout>
- <ListView
- android:id="@+id/conversation_list"
- android:layout_width="match_parent"
- android:layout_height="0dip"
- android:layout_weight="1"
- android:cacheColorHint="#00000000"
- android:background="@drawable/gradient_bg_widget_holo" />
<LinearLayout
android:id="@+id/widget_configuration"
android:layout_width="match_parent"
@@ -107,6 +100,13 @@
android:textSize="16sp"
android:textStyle="bold"/>
</LinearLayout>
+ <ListView
+ android:id="@+id/conversation_list"
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:layout_weight="1"
+ android:cacheColorHint="#00000000"
+ android:background="@drawable/gradient_bg_widget_holo" />
<TextView
android:id="@+id/empty_conversation_list"
android:layout_width="match_parent"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2f11a74..baff994 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Boodskap is nie gestuur nie."</string>
<string name="me" msgid="6480762904022198669">"ek"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Wys alle vouers"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Vee hierdie gesprek uit?"</item>
<item quantity="other" msgid="930334208937121234">"Vee hierdie <xliff:g id="COUNT">%1$d</xliff:g> gesprekke uit?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwyder handeling"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Vee gesprekke uit eerder as om te argiveer"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 341aa66..75b2edb 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"መልዕክት አልተላከም።"</string>
<string name="me" msgid="6480762904022198669">"እኔ"</string>
<string name="show_all_folders" msgid="3281420732307737553">"ሁሉንም አቃፊዎች አሳይ"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"ፀጥታ"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"እርምጃ አስወግድ"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"ውይይቶች በማህደር ከማስቀመጥ ይልቅ ሰርዝ"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index eaf52ef..2fdebf4 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"لم يتم إرسال الرسالة."</string>
<string name="me" msgid="6480762904022198669">"أنا"</string>
<string name="show_all_folders" msgid="3281420732307737553">"عرض جميع المجلدات"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"صامت"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"إجراء الإزالة"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"حذف المحادثات بدلاً من وضعها في الأرشيف"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 216a693..73e7e8e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Паведамленне не адпраўлена."</string>
<string name="me" msgid="6480762904022198669">"я"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Паказаць усе тэчкі"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Ціхі рэжым"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Выдаліць дзеянне"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Выдаляць, а не архіваваць размовы"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7c59538..f16ec2b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Съобщ. не бе изпратено."</string>
<string name="me" msgid="6480762904022198669">"аз"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Показване на всички папки"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Тих режим"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действие при премахване"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Изтриване вместо архивиране на кореспонденциите"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
@@ -393,6 +400,6 @@
<string name="checking_for_mail" msgid="2301797903350897130">"Проверява се за поща"</string>
<string name="empty_trash" msgid="5042310780353359729">"Изчистване на кошчето"</string>
<string name="empty_spam" msgid="930744491746508050">"Изчистване на нежеланата поща"</string>
- <string name="drawer_open" msgid="6074646853178471940">"Отваряне на чекмеджето за навигация"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Отваряне на слоя за навигация"</string>
<string name="drawer_close" msgid="2764774620737876943">"Затваряне на чекмеджето за навигация"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 654b413..44d350d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"No s\'ha enviat el missatge."</string>
<string name="me" msgid="6480762904022198669">"jo"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Mostra totes les carpetes"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Vols suprimir aquesta conversa?"</item>
<item quantity="other" msgid="930334208937121234">"Vols suprimir aquestes <xliff:g id="COUNT">%1$d</xliff:g> converses?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silenci"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Suprimeix l\'acció"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Suprimeix les converses en comptes d\'arxivar-les"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 89207bf..f627cda 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Zpráva nebyla odeslána."</string>
<string name="me" msgid="6480762904022198669">"já"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Zobrazit všechny složky"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Smazat tuto konverzaci?"</item>
<item quantity="other" msgid="930334208937121234">"Smazat tyto konverzace (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akce odstranění"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Konverzace mazat, a nikoliv archivovat"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 895b9a4..0a9fee5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Besked ikke sendt."</string>
<string name="me" msgid="6480762904022198669">"mig"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtale?"</item>
<item quantity="other" msgid="930334208937121234">"Vil du slette disse <xliff:g id="COUNT">%1$d</xliff:g> samtaler?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Lydløs"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Fjern handling"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Slet i stedet for at arkivere samtaler"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 092321f..1fe1bb7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Nicht gesendet"</string>
<string name="me" msgid="6480762904022198669">"Mich"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Alle Ordner anzeigen"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Diese Konversation löschen?"</item>
<item quantity="other" msgid="930334208937121234">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Konversationen löschen?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Lautlos"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Aktion entfernen"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Konversationen lieber löschen als archivieren"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 940f960..3ba0078 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Μήνυμα δεν εστάλη."</string>
<string name="me" msgid="6480762904022198669">"εγώ"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Εμφάνιση όλων των φακέλων"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Σίγαση"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Κατάργηση ενέργειας"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Διαγραφή αντί για αρχειοθέτηση συνομιλιών"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 62eab8a..58cf966 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Message wasn\'t sent."</string>
<string name="me" msgid="6480762904022198669">"me"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Show all folders"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Delete this conversation?"</item>
<item quantity="other" msgid="930334208937121234">"Delete these <xliff:g id="COUNT">%1$d</xliff:g> conversations?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silent"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remove action"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Delete rather than archive conversations"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 4598baa..a55e8f2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"No se envió el mensaje."</string>
<string name="me" msgid="6480762904022198669">"yo"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"¿Deseas eliminar esta conversación?"</item>
<item quantity="other" msgid="930334208937121234">"¿Deseas eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
@@ -381,8 +383,13 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
- <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminar acción"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Eliminar en lugar de archivar conversaciones"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Acción de eliminar"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8097c4f..77c455d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"No se ha enviado el mensaje."</string>
<string name="me" msgid="6480762904022198669">"yo"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"¿Eliminar esta conversación?"</item>
<item quantity="other" msgid="930334208937121234">"¿Eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversaciones?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminar acción"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Eliminar las conversaciones en lugar de archivarlas"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index ae2a143..7031420 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Sõnumit ei saadetud."</string>
<string name="me" msgid="6480762904022198669">"mina"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Kuva kõik kaustad"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Kas kustutada see meilivestlus?"</item>
<item quantity="other" msgid="930334208937121234">"Kas kustutada need <xliff:g id="COUNT">%1$d</xliff:g> meilivestlust?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Hääletu"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eemalda toiming"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Kustuta vestlused arhiveerimise asemel"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0feb125..2e20f6c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -78,8 +78,7 @@
<string name="menu_manage_folders" msgid="6755623004628177492">"تنظیمات پوشه"</string>
<!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <!-- no translation found for message_modified (2564340197585393687) -->
- <skip />
+ <string name="message_modified" msgid="2564340197585393687">"(نسخه اصلی این پیام برای اندازه شدن در این صفحه تغییر داده شده است.)"</string>
<string name="folder_list_title" msgid="4276644062440415214">"پوشهها"</string>
<string name="folder_list_more" msgid="537172187223133825">"بیشتر"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"حسابهای بیشتر"</string>
@@ -173,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"پیام ارسال نشد."</string>
<string name="me" msgid="6480762904022198669">"من"</string>
<string name="show_all_folders" msgid="3281420732307737553">"نمایش همه پوشهها"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -295,10 +296,8 @@
<string name="non_synced_folder_description" msgid="6059194125558004080">"برای مشاهده مکالمات، این پوشه همگام شود."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"همگامسازی پوشه"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
- <!-- no translation found for actionbar_unread_messages (3805594795629836031) -->
- <skip />
- <!-- no translation found for actionbar_large_unread_count (2780005218279965391) -->
- <skip />
+ <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> مورد خوانده نشده"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"بیش از <xliff:g id="COUNT">%1$d</xliff:g> مورد خوانده نشده"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"مشاهده مکالمات بیشتر"</string>
<string name="loading_conversation" msgid="489160038366067983">"در حال بارگیری..."</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"انتخاب حساب"</string>
@@ -384,9 +383,12 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"بیصدا"</string>
- <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
- <skip />
- <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"عملکرد حذف"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
<skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
@@ -396,12 +398,8 @@
<string name="preference_swipe_description" msgid="5132683510510041028">"در لیست مکالمه"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"برای بازخوانی، صفحه را با انگشت به سمت پایین بکشید"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"در حال بررسی برای ایمیل"</string>
- <!-- no translation found for empty_trash (5042310780353359729) -->
- <skip />
- <!-- no translation found for empty_spam (930744491746508050) -->
- <skip />
- <!-- no translation found for drawer_open (6074646853178471940) -->
- <skip />
- <!-- no translation found for drawer_close (2764774620737876943) -->
- <skip />
+ <string name="empty_trash" msgid="5042310780353359729">"خالی کردن پوشه حذفشدهها"</string>
+ <string name="empty_spam" msgid="930744491746508050">"خالی کردن پوشه هرزنامه"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"باز کردن کشوی پیمایش"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"بستن کشوی پیمایش"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index dfeb2d5..54dd458 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Viestiä ei lähetetty."</string>
<string name="me" msgid="6480762904022198669">"minä"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Näytä kaikki kansiot"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Poistetaanko tämä keskustelu?"</item>
<item quantity="other" msgid="930334208937121234">"Poistetaanko nämä <xliff:g id="COUNT">%1$d</xliff:g> keskustelua?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Äänetön"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Poista toiminto"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Poista keskustelut arkistoinnin sijaan"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 32d128a..8d4e643 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Échec de l\'envoi."</string>
<string name="me" msgid="6480762904022198669">"moi"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Afficher tous les dossiers"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Supprimer cette conversation ?"</item>
<item quantity="other" msgid="930334208937121234">"Supprimer ces <xliff:g id="COUNT">%1$d</xliff:g> conversations ?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g> : <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Mode silencieux"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Supprimer"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Supprimer les conversations au lieu de les archiver"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
@@ -392,7 +399,7 @@
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Faire glisser le doigt vers le bas pour actualiser"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Vérification des e-mails en cours…"</string>
<string name="empty_trash" msgid="5042310780353359729">"Vider la corbeille"</string>
- <string name="empty_spam" msgid="930744491746508050">"Vider le spam"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Vider le dossier de spam"</string>
<string name="drawer_open" msgid="6074646853178471940">"Ouvrir le panneau de navigation"</string>
<string name="drawer_close" msgid="2764774620737876943">"Fermer le panneau de navigation"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index bcd6368..e3a2a97 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"संदेश नहीं भेजा गया था."</string>
<string name="me" msgid="6480762904022198669">"मुझे"</string>
<string name="show_all_folders" msgid="3281420732307737553">"सभी फ़ोल्डर दिखाएं"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"मौन"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"निकालने की कार्यवाही"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"बातचीतों को संगृहीत करने के बजाए हटाएं"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8c51387..92852b4 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Poruka nije poslana."</string>
<string name="me" msgid="6480762904022198669">"ja"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Prikaži sve mape"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Izbrisati ovaj razgovor?"</item>
<item quantity="other" msgid="930334208937121234">"Izbrisati ove razgovore (ukupno <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Bešumno"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Uklanjanje radnje"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Brišite razgovore, nemojte ih arhivirati"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
@@ -393,6 +400,6 @@
<string name="checking_for_mail" msgid="2301797903350897130">"Provjeravanje pošte"</string>
<string name="empty_trash" msgid="5042310780353359729">"Pražnjenje otpada"</string>
<string name="empty_spam" msgid="930744491746508050">"Pražnjenje neželjenih sadržaja"</string>
- <string name="drawer_open" msgid="6074646853178471940">"Otvaranje povlakača navigacije"</string>
- <string name="drawer_close" msgid="2764774620737876943">"Zatvaranje povlakača navigacije"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Otvaranje pretinca za navigaciju"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Zatvaranje pretinca za navigaciju"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 184deae..6780e56 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Nincs elküldve"</string>
<string name="me" msgid="6480762904022198669">"saját magam"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Összes mappa megjelenítése"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Törli ezt a beszélgetést?"</item>
<item quantity="other" msgid="930334208937121234">"Törli ezt a(z) <xliff:g id="COUNT">%1$d</xliff:g> beszélgetést?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Néma"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eltávolítási művelet"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"A beszélgetések törlése archiválás helyett"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4e74f59..4e910c4 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Pesan tidak dikirim."</string>
<string name="me" msgid="6480762904022198669">"saya"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Tampilkan semua folder"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -381,8 +383,13 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tidak Berbunyi"</string>
- <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Hapus tindakan"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Hapus, bukan arsipkan percakapan"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Tindakan penghapusan"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 782bccd..aeb5cbf 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Messaggio non inviato."</string>
<string name="me" msgid="6480762904022198669">"me"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Visualizza tutte le cartelle"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Eliminare questa conversazione?"</item>
<item quantity="other" msgid="930334208937121234">"Eliminare queste <xliff:g id="COUNT">%1$d</xliff:g> conversazioni?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silenzioso"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Azione rimozione"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Elimina anziché archiviare le conversazioni"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
@@ -393,6 +400,6 @@
<string name="checking_for_mail" msgid="2301797903350897130">"Controllo della posta"</string>
<string name="empty_trash" msgid="5042310780353359729">"Cestino vuoto"</string>
<string name="empty_spam" msgid="930744491746508050">"Cartella spam vuota"</string>
- <string name="drawer_open" msgid="6074646853178471940">"Apri cassetto navigazione"</string>
- <string name="drawer_close" msgid="2764774620737876943">"Chiudi cassetto navigazione"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"Apri riquadro di navigazione"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"Chiudi riquadro di navigazione"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f62088a..52598a2 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"ההודעה לא נשלחה."</string>
<string name="me" msgid="6480762904022198669">"אני"</string>
<string name="show_all_folders" msgid="3281420732307737553">"הצג את כל התיקיות"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"שקט"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"פעולת הסרה"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"מחק הודעות במקום להעביר אותן לארכיון"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 150c79d..b564128 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"送信に失敗しました。"</string>
<string name="me" msgid="6480762904022198669">"自分"</string>
<string name="show_all_folders" msgid="3281420732307737553">"すべてのフォルダを表示"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -381,8 +383,13 @@
<string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</string>
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"マナーモード"</string>
- <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"操作を除外する"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"スレッドをアーカイブせずに削除する"</string>
+ <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"削除操作"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4944886..0ddae9e 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"메일이 전송되지 않았습니다."</string>
<string name="me" msgid="6480762904022198669">"나"</string>
<string name="show_all_folders" msgid="3281420732307737553">"모든 폴더 표시"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"무음"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"삭제 작업"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"대화를 보관처리하지 않고 삭제"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index a19391a..4f61034 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Pranešimas neišsiųstas."</string>
<string name="me" msgid="6480762904022198669">"man"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Rodyti visus aplankus"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Ištrinti šį pokalbį?"</item>
<item quantity="other" msgid="930334208937121234">"Ištrinti šiuos <xliff:g id="COUNT">%1$d</xliff:g> pokalb.?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tylus"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Pašalinti veiksmą"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Pokalbius ištrinti, o ne archyvuoti"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index d23575e..8f42a03 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Ziņoj. nav nosūtīts."</string>
<string name="me" msgid="6480762904022198669">"man"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Rādīt visas mapes"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Vai dzēst šo sarunu?"</item>
<item quantity="other" msgid="930334208937121234">"Vai dzēst šīs sarunas (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Klusums"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Noņemšanas darbība"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Dzēst, nevis arhivēt sarunas"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 9a6b55e..70857fb 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Mesej tidak dihantar."</string>
<string name="me" msgid="6480762904022198669">"saya"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Tunjukkan semua folder"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Senyap"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alih keluar tindakan"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Padam bukannya arkibkan perbualan"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index cbac769..e1b094b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"E-post ikke sendt."</string>
<string name="me" msgid="6480762904022198669">"meg"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtalen?"</item>
<item quantity="other" msgid="930334208937121234">"Vil du slette disse <xliff:g id="COUNT">%1$d</xliff:g> samtalene?"</item>
@@ -295,7 +297,7 @@
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Synkroniser mappen"</string>
<string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
<string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> uleste"</string>
- <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ uleste"</string>
+ <string name="actionbar_large_unread_count" msgid="2780005218279965391">"<xliff:g id="COUNT">%1$d</xliff:g>+ uleste"</string>
<string name="view_more_conversations" msgid="3151067626309674344">"Se flere samtaler"</string>
<string name="loading_conversation" msgid="489160038366067983">"Laster inn …"</string>
<string name="activity_mailbox_selection" msgid="6876105223659297603">"Velg konto"</string>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Stille"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Handling for fjerning"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Slett samtaler i stedet for å arkivere dem"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 46c566f..9a9302f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Niet verzonden."</string>
<string name="me" msgid="6480762904022198669">"ik"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Alle mappen weergeven"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Deze conversatie verwijderen?"</item>
<item quantity="other" msgid="930334208937121234">"Deze <xliff:g id="COUNT">%1$d</xliff:g> conversaties verwijderen?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwijderen"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Conversaties verwijderen in plaats van deze te archiveren"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index baefb53..faba254 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -170,6 +170,8 @@
<string name="send_failed" msgid="750908595144529579">"Wiadomość nie została wysłana."</string>
<string name="me" msgid="6480762904022198669">"ja"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Pokaż wszystkie foldery"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Usunąć wątek?"</item>
<item quantity="other" msgid="930334208937121234">"Usunąć wątki (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -380,7 +382,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Cichy"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Usuń czynność"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Usuwaj wątki, zamiast je archiwizować"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 46e9059..34d603a 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Mensagem não enviada."</string>
<string name="me" msgid="6480762904022198669">"utilizador"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Eliminar esta conversa?"</item>
<item quantity="other" msgid="930334208937121234">"Eliminar estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remover ação"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Eliminar conversas em vez de as arquivar"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5472348..d6a5b58 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -78,7 +78,7 @@
<string name="menu_manage_folders" msgid="6755623004628177492">"Configurações de pastas"</string>
<!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <string name="message_modified" msgid="2564340197585393687">"(A versão original desta mensagem foi modificada para caber nesta tela.)"</string>
+ <string name="message_modified" msgid="2564340197585393687">"A versão original desta mensagem foi modificada para caber nesta tela."</string>
<string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
<string name="folder_list_more" msgid="537172187223133825">"Mais"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"Mais contas"</string>
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"A mensagem não foi enviada."</string>
<string name="me" msgid="6480762904022198669">"eu"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Excluir esta conversa?"</item>
<item quantity="other" msgid="930334208937121234">"Excluir estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ação de remoção"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Excluir conversas em vez de arquivá-las"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index ff399a0..91ed74a 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -291,6 +291,8 @@
<skip />
<!-- no translation found for show_all_folders (3281420732307737553) -->
<skip />
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<!-- 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) -->
@@ -596,7 +598,11 @@
<skip />
<!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
<skip />
- <!-- no translation found for preference_archive_vs_delete_text (3219537390825170783) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
<skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 99a9ae1..404231b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Mesaj netrimis."</string>
<string name="me" msgid="6480762904022198669">"eu"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Afişaţi toate dosarele"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Silențios"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminați"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Ștergeți, nu arhivați conversațiile"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0fafcf8..e6355ed 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Не отправлено."</string>
<string name="me" msgid="6480762904022198669">"мне"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Показать все почтовые ящики"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Без звука"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действия при удалении"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Удалять цепочки, не архивируя"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 4031bfd..0a3b2f3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Správa nebola odoslaná."</string>
<string name="me" msgid="6480762904022198669">"ja"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Zobraziť všetky priečinky"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Odstrániť túto konverzáciu?"</item>
<item quantity="other" msgid="930334208937121234">"Odstrániť tieto konverzácie (počet: <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akcia odstránenia"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Konverzácie skôr odstrániť než archivovať"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a114661..2ee97e0 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Sporočilo ni bilo poslano."</string>
<string name="me" msgid="6480762904022198669">"jaz"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Pokaži vse mape"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Želite izbrisati ta pogovor?"</item>
<item quantity="other" msgid="930334208937121234">"Želite izbrisati toliko pogovorov: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tiho"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Dejanje odstranitve"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Brisanje pogovorov, ne arhiviranje"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 038850c..e3a5c80 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Порука није послата."</string>
<string name="me" msgid="6480762904022198669">"мени"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Прикажи све директоријуме"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Нечујно"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Радња уклањања"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Брисање уместо архивирања преписки"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index d39c5dc..17398a3 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"E-post skickades ej."</string>
<string name="me" msgid="6480762904022198669">"jag"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Visa alla mappar"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Vill du ta bort konversationen?"</item>
<item quantity="other" msgid="930334208937121234">"Vill du ta bort de här <xliff:g id="COUNT">%1$d</xliff:g> konversationerna?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Tyst"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ta bort åtgärd"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Ta bort i stället för att arkivera samtal"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 065a716..92ae0c3 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Ujumbe haukutumwa."</string>
<string name="me" msgid="6480762904022198669">"mimi"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Onyesha folda zote"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Mazungumzo haya yafutwe?"</item>
<item quantity="other" msgid="930334208937121234">"Mazungumzo haya <xliff:g id="COUNT">%1$d</xliff:g> yafutwe?"</item>
@@ -382,12 +384,17 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Kimya"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ondoa kitendo"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Futa badala ya kuweka kwenye kumbukumbu za mazungumzo"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
<skip />
- <string name="preference_swipe_title" msgid="807579971507624260">"Papasa ili kuondoa"</string>
+ <string name="preference_swipe_title" msgid="807579971507624260">"Papasa ili uondoe"</string>
<string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Papasa kwa kasi kwenda chini ili kuonyesha upya"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Inaangalia barua pepe"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 956d9e0..8556d8b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"ไม่ได้ส่งข้อความ"</string>
<string name="me" msgid="6480762904022198669">"ฉัน"</string>
<string name="show_all_folders" msgid="3281420732307737553">"แสดงโฟลเดอร์ทั้งหมด"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"เงียบ"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"ลบการทำงาน"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"ลบการสนทนาแทนการเก็บถาวร"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index bbbbe61..1bd1e5c 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Di pinadala mensahe."</string>
<string name="me" msgid="6480762904022198669">"ako"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Ipakita ang lahat ng folder"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Tanggalin ang pag-uusap na ito?"</item>
<item quantity="other" msgid="930334208937121234">"Tanggalin ang <xliff:g id="COUNT">%1$d</xliff:g> (na) pag-uusap na ito?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Naka-silent"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alisin ang pagkilos"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Tanggalin sa halip na i-archive ang mga pag-uusap"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 96d7fe0..0117980 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"İleti gönderilmedi."</string>
<string name="me" msgid="6480762904022198669">"ben"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Tüm klasörleri göster"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Bu ileti dizisi silinsin mi?"</item>
<item quantity="other" msgid="930334208937121234">"Bu <xliff:g id="COUNT">%1$d</xliff:g> ileti dizisi silinsin mi?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Sessiz"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Kaldırma işlemi"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"İleti dizilerini arşivlemek yerine silin"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5007280..92d4d9f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Повідомл. не надісл."</string>
<string name="me" msgid="6480762904022198669">"я"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Показати всі папки"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Без звуку"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Вилучити дію"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Видаляйте, а не архівуйте бесіди"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 70828dd..8f60c8a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Thư chưa được gửi."</string>
<string name="me" msgid="6480762904022198669">"tôi"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Hiển thị tất cả thư mục"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Xóa cuộc hội thoại này?"</item>
<item quantity="other" msgid="930334208937121234">"Xóa <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại này?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Im lặng"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Xóa tác vụ"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Xóa chứ không lưu trữ cuộc hội thoại"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
@@ -391,8 +398,8 @@
<string name="preference_swipe_description" msgid="5132683510510041028">"Trong danh sách cuộc hội thoại"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Vuốt xuống để làm mới"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Đang kiểm tra thư"</string>
- <string name="empty_trash" msgid="5042310780353359729">"Thùng rác trống"</string>
- <string name="empty_spam" msgid="930744491746508050">"Spam trống"</string>
+ <string name="empty_trash" msgid="5042310780353359729">"Làm rỗng thùng rác"</string>
+ <string name="empty_spam" msgid="930744491746508050">"Làm rỗng Spam"</string>
<string name="drawer_open" msgid="6074646853178471940">"Mở ngăn kéo điều hướng"</string>
<string name="drawer_close" msgid="2764774620737876943">"Đóng ngăn kéo điều hướng"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index dec2ecb..eb30bb3 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -78,7 +78,7 @@
<string name="menu_manage_folders" msgid="6755623004628177492">"文件夹设置"</string>
<!-- no translation found for menu_show_original (4227060689700765828) -->
<skip />
- <string name="message_modified" msgid="2564340197585393687">"（系统已对此邮件的原始版本进行了调整，使其适合此屏幕的大小。）"</string>
+ <string name="message_modified" msgid="2564340197585393687">"（系统对此邮件进行了调整，使其适合此屏幕的大小。）"</string>
<string name="folder_list_title" msgid="4276644062440415214">"文件夹"</string>
<string name="folder_list_more" msgid="537172187223133825">"更多"</string>
<string name="folder_list_show_all_accounts" msgid="8054807182336991835">"更多帐户"</string>
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"邮件发送失败。"</string>
<string name="me" msgid="6480762904022198669">"我"</string>
<string name="show_all_folders" msgid="3281420732307737553">"显示所有文件夹"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"静音"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"删除操作"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"删除（而不是归档）会话"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
@@ -393,6 +400,6 @@
<string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
<string name="empty_trash" msgid="5042310780353359729">"清空已删除邮件"</string>
<string name="empty_spam" msgid="930744491746508050">"清空垃圾邮件"</string>
- <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航"</string>
- <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航栏"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航栏"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7aa4584..310942d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"郵件未傳送。"</string>
<string name="me" msgid="6480762904022198669">"我"</string>
<string name="show_all_folders" msgid="3281420732307737553">"顯示所有資料夾"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <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>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"靜音"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"移除動作"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"刪除會話群組，而不要進行封存"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
@@ -393,6 +400,6 @@
<string name="checking_for_mail" msgid="2301797903350897130">"正在檢查郵件"</string>
<string name="empty_trash" msgid="5042310780353359729">"清空垃圾筒"</string>
<string name="empty_spam" msgid="930744491746508050">"清空垃圾郵件"</string>
- <string name="drawer_open" msgid="6074646853178471940">"開啟導覽列"</string>
- <string name="drawer_close" msgid="2764774620737876943">"關閉導覽列"</string>
+ <string name="drawer_open" msgid="6074646853178471940">"開啟導覽匣"</string>
+ <string name="drawer_close" msgid="2764774620737876943">"關閉導覽匣"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 85206c2..1a90b7a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -172,6 +172,8 @@
<string name="send_failed" msgid="750908595144529579">"Umlayezo awuthunyelwanga."</string>
<string name="me" msgid="6480762904022198669">"mina"</string>
<string name="show_all_folders" msgid="3281420732307737553">"Bonisa onke amafolda"</string>
+ <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
+ <skip />
<plurals name="confirm_delete_conversation">
<item quantity="one" msgid="3731948757247905508">"Susa le ngxoxo?"</item>
<item quantity="other" msgid="930334208937121234">"Susa lezi zingxoxo ezingu-<xliff:g id="COUNT">%1$d</xliff:g>?"</item>
@@ -382,7 +384,12 @@
<string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="silent_ringtone" msgid="5856834572357761687">"Thulile"</string>
<string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Susa isenzo"</string>
- <string name="preference_archive_vs_delete_text" msgid="3219537390825170783">"Susa kunokuthi ufake kungobo yomlando izingxoxo"</string>
+ <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
+ <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
+ <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
+ <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+ <skip />
<!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
<skip />
<!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 84bfa4f..3eca8f0 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -98,9 +98,6 @@
<!-- Whether or not to use a nice transition when showing the folder list fragment; used in 2-pane layouts -->
<integer name="use_folder_list_fragment_transition">1</integer>
- <!-- Whether or not to prompt the user to enable auto-fit the first time they encounter a wide message. TODO: Remove this when the email setting is added. -->
- <integer name="prompt_auto_fit_on_first_wide_message">0</integer>
-
<!-- The timeout, in milliseconds, before the "Undo" notification is removed. -->
<integer name="undo_notification_timeout">6000</integer>
diff --git a/res/values/dimen.xml b/res/values/dimen.xml
index 01b8438..3bff4f9 100644
--- a/res/values/dimen.xml
+++ b/res/values/dimen.xml
@@ -73,6 +73,7 @@
<dimen name="folder_list_popup_width">200dip</dimen>
<dimen name="folder_list_folder_color_width">36dip</dimen>
<dimen name="folder_list_item_minimum_height">48dip</dimen>
+ <dimen name="folder_list_item_left_offset">9dp</dimen>
<dimen name="account_item_left_margin">14dp</dimen>
<dimen name="account_item_right_margin">8dp</dimen>
<dimen name="account_item_minimum_height">48dip</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0759db9..87a10af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -800,11 +800,6 @@
<!-- Dialog title for the What's New dialog. [CHAR LIMIT=50] -->
<string name="whats_new_dialog_title">What\'s new</string>
- <!-- Dialog title for the Auto-fit messages dialog. [CHAR LIMIT=50] -->
- <string name="auto_fit_messages_dialog_title">Auto-fit messages?</string>
- <!-- Dialog message for the Auto-fit messages dialog. -->
- <string name="auto_fit_messages_dialog_message">Shrink wide messages to fit your screen and allow zooming in. To turn off this option, go to Settings > General\u00A0settings.</string>
-
<!-- Notification action for replying to a message. [CHAR LIMIT=20] -->
<string name="notification_action_reply">Reply</string>
<!-- Notification action for replying-all to a message. [CHAR LIMIT=20] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9fafa2d..cd4f70b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -152,9 +152,10 @@
<style name="UnreadCount">
<item name="android:layout_width">44dp</item>
<item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_centerVertical">true</item>
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
- <item name="android:includeFontPadding">false</item>
+ <item name="android:includeFontPadding">true</item>
<item name="android:textSize">14sp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">4dp</item>
@@ -181,6 +182,7 @@
<style name="UnseenCount">
<item name="android:layout_width">44dp</item>
<item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_centerVertical">true</item>
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:includeFontPadding">false</item>
diff --git a/src/com/android/mail/adapter/DrawerItem.java b/src/com/android/mail/adapter/DrawerItem.java
index a372fdc..0991f68 100644
--- a/src/com/android/mail/adapter/DrawerItem.java
+++ b/src/com/android/mail/adapter/DrawerItem.java
@@ -362,7 +362,7 @@
}
folderItemView.bind(mFolder, mActivity);
Folder.setFolderBlockColor(mFolder, folderItemView.findViewById(R.id.color_block));
- Folder.setIcon(mFolder, (ImageView) folderItemView.findViewById(R.id.folder_icon));
+ folderItemView.setIcon(mFolder);
return folderItemView;
}
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 9c1b3ca..e62a97c 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -1378,9 +1378,9 @@
}
private boolean isTouchInContactPhoto(float x) {
- // Everything before senders and include a touch slop.
+ // Everything before the right edge of contact photo
return (mHeader.gadgetMode == ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO
- && x < mCoordinates.sendersX + sTouchSlop);
+ && x < (mCoordinates.contactImagesX + mCoordinates.contactImagesWidth));
}
private boolean isTouchInStar(float x, float y) {
diff --git a/src/com/android/mail/providers/FolderWatcher.java b/src/com/android/mail/providers/FolderWatcher.java
index ddfbe92..e6a8524 100644
--- a/src/com/android/mail/providers/FolderWatcher.java
+++ b/src/com/android/mail/providers/FolderWatcher.java
@@ -18,13 +18,13 @@
package com.android.mail.providers;
import android.app.LoaderManager;
-import android.content.CursorLoader;
import android.content.Loader;
-import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.widget.BaseAdapter;
+import com.android.mail.content.ObjectCursor;
+import com.android.mail.content.ObjectCursorLoader;
import com.android.mail.ui.AbstractActivityController;
import com.android.mail.ui.RestrictedActivity;
import com.android.mail.utils.LogUtils;
@@ -44,8 +44,8 @@
public static final String FOLDER_URI = "FOLDER-URI";
/** List of URIs that are watched. */
private final List<Uri> mUris = new ArrayList<Uri>();
- /** Map returning the most recent unread count for each URI */
- private final Map<Uri, Integer> mUnreadCount = new HashMap<Uri, Integer>();
+ /** Map returning the default inbox folder for each URI */
+ private final Map<Uri, Folder> mInbox = new HashMap<Uri, Folder>();
private final RestrictedActivity mActivity;
/** Handles folder callbacks and reads unread counts. */
private final UnreadLoads mUnreadCallback = new UnreadLoads();
@@ -105,8 +105,8 @@
private void startWatching(Uri uri) {
final int location = insertAtNextEmptyLocation(uri);
LogUtils.d(LOG_TAG, "Watching %s, at position %d.", uri, location);
- // No unread count yet, put a safe placeholder for now.
- mUnreadCount.put(uri, 0);
+ // No inbox folder yet, put a safe placeholder for now.
+ mInbox.put(uri, null);
final LoaderManager lm = mActivity.getLoaderManager();
final Bundle args = new Bundle();
args.putString(FOLDER_URI, uri.toString());
@@ -160,7 +160,7 @@
// Destroy the loader before removing references to the object.
final LoaderManager lm = mActivity.getLoaderManager();
lm.destroyLoader(getLoaderFromPosition(id));
- mUnreadCount.remove(uri);
+ mInbox.remove(uri);
mUris.add(id, null);
}
@@ -173,51 +173,60 @@
* #updateAccountList(Account[])}. Zero otherwise.
*/
public final int getUnreadCount(Account account) {
- final Uri uri = account.settings.defaultInbox;
- if (mUnreadCount.containsKey(uri)) {
- final Integer count = mUnreadCount.get(uri);
- if (count != null) {
- return count;
- }
+ final Folder f = getDefaultInbox(account);
+ if (f != null) {
+ return f.unreadCount;
}
return 0;
}
+ public final Folder getDefaultInbox(Account account) {
+ final Uri uri = account.settings.defaultInbox;
+ if (mInbox.containsKey(uri)) {
+ final Folder candidate = mInbox.get(uri);
+ if (candidate != null) {
+ return candidate;
+ }
+ }
+ return null;
+ }
+
/**
* Class to perform {@link LoaderManager.LoaderCallbacks} for populating unread counts.
*/
- private class UnreadLoads implements LoaderManager.LoaderCallbacks<Cursor> {
+ private class UnreadLoads implements LoaderManager.LoaderCallbacks<ObjectCursor<Folder>> {
// TODO(viki): Fix http://b/8494129 and read only the URI and unread count.
/** Only interested in the folder unread count, but asking for everything due to
* bug 8494129. */
private final String[] projection = UIProvider.FOLDERS_PROJECTION;
@Override
- public Loader<Cursor> onCreateLoader(int id, Bundle args) {
+ public Loader<ObjectCursor<Folder>> onCreateLoader(int id, Bundle args) {
final Uri uri = Uri.parse(args.getString(FOLDER_URI));
- return new CursorLoader(mActivity.getActivityContext(), uri, projection,
- null, null, null);
+ return new ObjectCursorLoader<Folder>(mActivity.getActivityContext(), uri, projection,
+ Folder.FACTORY);
}
@Override
- public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
+ public void onLoadFinished(Loader<ObjectCursor<Folder>> loader, ObjectCursor<Folder> data) {
if (data == null || data.getCount() <= 0 || !data.moveToFirst()) {
return;
}
- final Uri uri = Uri.parse(data.getString(UIProvider.FOLDER_URI_COLUMN));
- final int unreadCount = data.getInt(UIProvider.FOLDER_UNREAD_COUNT_COLUMN);
- final Integer prevUnreadCount = mUnreadCount.get(uri);
- final boolean changed = prevUnreadCount == null ||
- unreadCount != prevUnreadCount.intValue();
- mUnreadCount.put(uri, unreadCount);
+ final Folder f = data.getModel();
+ final Uri uri = f.uri;
+ final int unreadCount = f.unreadCount;
+ final Folder previousFolder = mInbox.get(uri);
+ final boolean unreadCountChanged = previousFolder == null
+ || unreadCount != previousFolder.unreadCount;
+ mInbox.put(uri, f);
// Once we have updated data, we notify the parent class that something new appeared.
- if (changed) {
+ if (unreadCountChanged) {
mConsumer.notifyDataSetChanged();
}
}
@Override
- public void onLoaderReset(Loader<Cursor> loader) {
+ public void onLoaderReset(Loader<ObjectCursor<Folder>> loader) {
// Do nothing.
}
}
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index e66e96f..22c635c 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -217,6 +217,8 @@
/** List of all accounts currently known to the controller. This is never null. */
private Account[] mAllAccounts = new Account[0];
+ private FolderWatcher mFolderWatcher;
+
/**
* Interface for actions that are deferred until after a load completes. This is for handling
* user actions which affect cursors (e.g. marking messages read or unread) that happen before
@@ -745,17 +747,31 @@
return mRecentFolderList;
}
- // TODO(mindyp): set this up to store a copy of the folder as a transient
- // field in the account.
@Override
public void loadAccountInbox() {
- restartOptionalLoader(LOADER_ACCOUNT_INBOX, mFolderCallbacks, Bundle.EMPTY);
+ boolean handled = false;
+ if (mFolderWatcher != null) {
+ final Folder inbox = mFolderWatcher.getDefaultInbox(mAccount);
+ if (inbox != null) {
+ onFolderChanged(inbox);
+ handled = true;
+ }
+ }
+ if (!handled) {
+ LogUtils.w(LOG_TAG, "Starting a LOADER_ACCOUNT_INBOX for %s", mAccount);
+ restartOptionalLoader(LOADER_ACCOUNT_INBOX, mFolderCallbacks, Bundle.EMPTY);
+ }
final int mode = mViewMode.getMode();
if (mode == ViewMode.UNKNOWN || mode == ViewMode.WAITING_FOR_ACCOUNT_INITIALIZATION) {
mViewMode.enterConversationListMode();
}
}
+ @Override
+ public void setFolderWatcher(FolderWatcher watcher) {
+ mFolderWatcher = watcher;
+ }
+
/**
* Marks the {@link #mFolderChanged} value if the newFolder is different from the existing
* {@link #mFolder}. This should be called immediately <b>before</b> assigning newFolder to
diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java
index 61d54d0..bb7c8cc 100644
--- a/src/com/android/mail/ui/AbstractConversationViewFragment.java
+++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java
@@ -598,8 +598,6 @@
}
}
activity.getListHandler().onConversationSeen(mConversation);
-
- showAutoFitPrompt();
}
protected ConversationViewState getNewViewState() {
@@ -792,33 +790,6 @@
}
- private static boolean isConversationViewModeSet(final Account acct) {
- return acct.settings.conversationViewMode != UIProvider.ConversationViewMode.UNDEFINED;
- }
-
- private void showAutoFitPrompt() {
- // If the user has never set a conversation view mode, and they view a wide message, we
- // should prompt them to turn on auto-fit
- final boolean enablePrompt =
- getResources().getInteger(R.integer.prompt_auto_fit_on_first_wide_message) == 1;
- // TODO: Enable this dialog for Email and ensure it saves the setting properly, and remove
- // R.integer.prompt_auto_fit_on_first_wide_message
- if (enablePrompt && isUserVisible() && !isConversationViewModeSet(mAccount)) {
- final boolean isWideContent =
- getWebView().canScrollHorizontally(1) || getWebView().canScrollHorizontally(-1);
-
- final boolean dialogShowing =
- getFragmentManager().findFragmentByTag(AutoFitPromptDialogFragment.FRAGMENT_TAG)
- != null;
-
- if (isWideContent && !dialogShowing) {
- // Not everything fits, so let's prompt them to set an auto-fit value
- AutoFitPromptDialogFragment.newInstance(mAccount.updateSettingsUri)
- .show(getFragmentManager(), AutoFitPromptDialogFragment.FRAGMENT_TAG);
- }
- }
- }
-
public void onDetachedModeEntered() {
// If we have no messages, then we have nothing to display, so leave this view.
// Otherwise, just set the detached flag.
diff --git a/src/com/android/mail/ui/AccountController.java b/src/com/android/mail/ui/AccountController.java
index 32465c8..a34b5ea 100644
--- a/src/com/android/mail/ui/AccountController.java
+++ b/src/com/android/mail/ui/AccountController.java
@@ -22,6 +22,7 @@
import com.android.mail.providers.Account;
import com.android.mail.providers.AccountObserver;
+import com.android.mail.providers.FolderWatcher;
import com.android.mail.utils.VeiledAddressMatcher;
/**
@@ -96,4 +97,9 @@
* or account, false otherwise.
*/
void closeDrawer(boolean hasNewFolderOrAccount);
+
+ /**
+ * Set the folderWatcher
+ */
+ void setFolderWatcher(FolderWatcher watcher);
}
diff --git a/src/com/android/mail/ui/AutoFitPromptDialogFragment.java b/src/com/android/mail/ui/AutoFitPromptDialogFragment.java
deleted file mode 100644
index a7cc433..0000000
--- a/src/com/android/mail/ui/AutoFitPromptDialogFragment.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc.
- * Licensed to The Android Open Source Project.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.mail.ui;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.net.Uri;
-import android.os.Bundle;
-
-import com.android.mail.R;
-import com.android.mail.providers.UIProvider;
-import com.android.mail.providers.UIProvider.AccountColumns;
-
-public class AutoFitPromptDialogFragment extends DialogFragment {
- public static final String FRAGMENT_TAG = "AutoFitPromptDialogFragment";
-
- private static final String ARG_UPDATE_SETTINGS_URI = "updateSettingsUri";
-
- public static AutoFitPromptDialogFragment newInstance(final Uri updateSettingsUri) {
- final AutoFitPromptDialogFragment fragment = new AutoFitPromptDialogFragment();
-
- final Bundle args = new Bundle(1);
- args.putParcelable(ARG_UPDATE_SETTINGS_URI, updateSettingsUri);
- fragment.setArguments(args);
-
- return fragment;
- }
-
- @Override
- public Dialog onCreateDialog(final Bundle savedInstanceState) {
- return new AlertDialog.Builder(getActivity()).setTitle(
- R.string.auto_fit_messages_dialog_title)
- .setMessage(R.string.auto_fit_messages_dialog_message)
- .setPositiveButton(R.string.yes, new OnClickListener() {
- @Override
- public void onClick(final DialogInterface dialog, final int which) {
- // Change the setting to enable auto-fit
- saveAutoFitSetting(UIProvider.ConversationViewMode.OVERVIEW);
- }
- })
- .setNegativeButton(R.string.no, new OnClickListener() {
- @Override
- public void onClick(final DialogInterface dialog, final int which) {
- // Change the setting to disable auto-fit
- saveAutoFitSetting(UIProvider.ConversationViewMode.READING);
- }
- })
- .create();
- }
-
- @Override
- public void onCancel(final DialogInterface dialog) {
- super.onCancel(dialog);
-
- // Change the setting to disable auto-fit
- saveAutoFitSetting(UIProvider.ConversationViewMode.READING);
- }
-
- private void saveAutoFitSetting(final int conversationViewMode) {
- final Context context = getActivity();
-
- if (context == null) {
- return;
- }
-
- final ContentValues values = new ContentValues(1);
- values.put(AccountColumns.SettingsColumns.CONVERSATION_VIEW_MODE, conversationViewMode);
-
- final ContentResolver resolver = context.getContentResolver();
- resolver.update(
- (Uri) getArguments().getParcelable(ARG_UPDATE_SETTINGS_URI), values, null, null);
- }
-}
diff --git a/src/com/android/mail/ui/ConversationListView.java b/src/com/android/mail/ui/ConversationListView.java
index 1117847..16fc4ea 100644
--- a/src/com/android/mail/ui/ConversationListView.java
+++ b/src/com/android/mail/ui/ConversationListView.java
@@ -298,12 +298,15 @@
Window window = mActivity.getWindow();
window.getDecorView().getWindowVisibleDisplayFrame(rect);
int statusBarHeight = rect.top;
- int contentViewTop=
- window.findViewById(Window.ID_ANDROID_CONTENT).getTop();
- int titleBarHeight= contentViewTop - statusBarHeight;
+
+ final TypedArray actionBarSize = mActivity.obtainStyledAttributes(
+ new int[] { android.R.attr.actionBarSize });
+ int actionBarHeight = actionBarSize.getDimensionPixelSize(0, 0);
+ actionBarSize.recycle();
+
WindowManager.LayoutParams params = new WindowManager.LayoutParams(
WindowManager.LayoutParams.MATCH_PARENT,
- titleBarHeight,
+ actionBarHeight,
WindowManager.LayoutParams.TYPE_APPLICATION_PANEL,
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
PixelFormat.TRANSLUCENT);
diff --git a/src/com/android/mail/ui/FolderItemView.java b/src/com/android/mail/ui/FolderItemView.java
index 1d9d857..329f59f 100644
--- a/src/com/android/mail/ui/FolderItemView.java
+++ b/src/com/android/mail/ui/FolderItemView.java
@@ -161,6 +161,23 @@
}
/**
+ * Sets the icon, if any. If the image view's visibility is set to gone, the text view will
+ * be moved over to account for the change.
+ */
+ public void setIcon(final Folder folder) {
+ final ImageView folderIconView = (ImageView) findViewById(R.id.folder_icon);
+ Folder.setIcon(folder, folderIconView);
+ if (folderIconView.getVisibility() == View.GONE) {
+ mFolderTextView.setPadding(getContext()
+ .getResources().getDimensionPixelSize(R.dimen.folder_list_item_left_offset),
+ 0, 0, 0 /* No top, right, bottom padding needed */);
+ } else {
+ // View recycling case
+ mFolderTextView.setPadding(0, 0, 0, 0);
+ }
+ }
+
+ /**
* Sets the unread count, taking care to hide/show the textview if the count is zero/non-zero.
*/
private void setUnreadCount(int count) {
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index c93ffab..5821f9e 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -20,20 +20,10 @@
import android.app.Activity;
import android.app.ListFragment;
import android.app.LoaderManager;
-import android.content.ContentResolver;
-import android.content.ContentUris;
-import android.content.Context;
import android.content.Loader;
import android.database.Cursor;
-import android.graphics.Bitmap;
import android.net.Uri;
-import android.os.AsyncTask;
import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.Data;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.provider.ContactsContract.Contacts.Photo;
-import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -45,10 +35,8 @@
import com.android.mail.R;
import com.android.mail.adapter.DrawerItem;
-import com.android.mail.browse.LetterTileUtils;
import com.android.mail.content.ObjectCursor;
import com.android.mail.content.ObjectCursorLoader;
-import com.android.mail.photomanager.BitmapUtil;
import com.android.mail.providers.Account;
import com.android.mail.providers.AccountObserver;
import com.android.mail.providers.AllAccountObserver;
@@ -61,16 +49,11 @@
import com.android.mail.providers.UIProvider.FolderType;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
-import com.google.common.collect.ImmutableSet;
import com.android.mail.utils.Utils;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
/**
* The folder list UI component.
@@ -609,6 +592,7 @@
private ObjectCursor<Folder> mCursor = null;
/** Watcher for tracking and receiving unread counts for mail */
private FolderWatcher mFolderWatcher = null;
+ private boolean mRegistered = false;
/**
* Creates a {@link FolderListAdapter}.This is a list of all the accounts and folders.
@@ -630,6 +614,11 @@
@Override
public void notifyAllAccountsChanged() {
+ if (!mRegistered && mAccountChanger != null) {
+ // TODO(viki): Round-about way of setting the watcher. http://b/8750610
+ mAccountChanger.setFolderWatcher(mFolderWatcher);
+ mRegistered = true;
+ }
mFolderWatcher.updateAccountList(getAllAccounts());
recalculateList();
}
diff --git a/src/com/android/mail/ui/FolderSelectionActivity.java b/src/com/android/mail/ui/FolderSelectionActivity.java
index 71a7e40..2acee60 100644
--- a/src/com/android/mail/ui/FolderSelectionActivity.java
+++ b/src/com/android/mail/ui/FolderSelectionActivity.java
@@ -36,6 +36,7 @@
import com.android.mail.R;
import com.android.mail.providers.Account;
import com.android.mail.providers.Folder;
+import com.android.mail.providers.FolderWatcher;
import com.android.mail.ui.FolderListFragment.FolderListSelectionListener;
import com.android.mail.ui.ViewMode.ModeChangeListener;
import com.android.mail.utils.LogTag;
@@ -136,6 +137,11 @@
public void closeDrawer(final boolean hasNewFolderOrAccount) {
mDrawerObservers.notifyChanged();
}
+
+ @Override
+ public void setFolderWatcher(FolderWatcher watcher) {
+ // Unsupported.
+ }
};
@Override
@@ -446,4 +452,5 @@
// Unsupported
return null;
}
+
}
diff --git a/src/com/android/mail/widget/BaseWidgetProvider.java b/src/com/android/mail/widget/BaseWidgetProvider.java
index b4b85c7..9dde2bb 100644
--- a/src/com/android/mail/widget/BaseWidgetProvider.java
+++ b/src/com/android/mail/widget/BaseWidgetProvider.java
@@ -60,6 +60,8 @@
protected static final String ACTION_UPDATE_WIDGET = "com.android.mail.ACTION_UPDATE_WIDGET";
+ protected static final String
+ ACTION_VALIDATE_ALL_WIDGETS = "com.android.mail.ACTION_VALIDATE_ALL_WIDGETS";
protected static final String EXTRA_WIDGET_ID = "widgetId";
private static final String LOG_TAG = LogTag.getLogTag();
@@ -132,6 +134,8 @@
updateWidgetInternal(context, widgetId, account, folderType, folderUri,
folderConversationListUri, folderDisplayName);
}
+ } else if (ACTION_VALIDATE_ALL_WIDGETS.equals(action)) {
+ validateAllWidgetInformation(context);
} else if (Utils.ACTION_NOTIFY_DATASET_CHANGED.equals(action)) {
// Receive notification for a certain account.
final Bundle extras = intent.getExtras();
@@ -299,6 +303,12 @@
context.sendBroadcast(updateWidgetIntent);
}
+ public static void validateAllWidgets(Context context, String accountMimeType) {
+ final Intent migrateAllWidgetsIntent = new Intent(ACTION_VALIDATE_ALL_WIDGETS);
+ migrateAllWidgetsIntent.setType(accountMimeType);
+ context.sendBroadcast(migrateAllWidgetsIntent);
+ }
+
protected void updateWidgetInternal(Context context, int appWidgetId, Account account,
final int folderType, final Uri folderUri, final Uri folderConversationListUri,
final String folderDisplayName) {
@@ -348,6 +358,23 @@
return false;
}
+ protected boolean isFolderValid(Context context, Uri folderUri) {
+ if (folderUri != null) {
+ final Cursor folderCursor =
+ context.getContentResolver().query(folderUri,
+ UIProvider.FOLDERS_PROJECTION, null, null, null);
+
+ try {
+ if (folderCursor.moveToFirst()) {
+ return true;
+ }
+ } finally {
+ folderCursor.close();
+ }
+ }
+ return false;
+ }
+
protected void configureValidAccountWidget(Context context, RemoteViews remoteViews,
int appWidgetId, Account account, final int folderType, final Uri folderUri,
final Uri folderConversationListUri, String folderDisplayName) {
@@ -371,6 +398,36 @@
}
}
+ private final void validateAllWidgetInformation(Context context) {
+ final int[] widgetIds = getCurrentWidgetIds(context);
+ for (int widgetId : widgetIds) {
+ final String accountFolder = MailPrefs.get(context).getWidgetConfiguration(widgetId);
+ String accountUri = null;
+ Uri folderUri = null;
+ if (!TextUtils.isEmpty(accountFolder)) {
+ final String[] parsedInfo = TextUtils.split(accountFolder,
+ ACCOUNT_FOLDER_PREFERENCE_SEPARATOR);
+ if (parsedInfo.length == 2) {
+ accountUri = parsedInfo[0];
+ folderUri = Uri.parse(parsedInfo[1]);
+ } else {
+ accountUri = accountFolder;
+ folderUri = Uri.EMPTY;
+ }
+ }
+
+ Account account = null;
+ if (!TextUtils.isEmpty(accountUri)) {
+ account = getAccountObject(context, accountUri);
+ }
+
+ // unconfigure the widget if it is not valid
+ if (!isAccountValid(context, account) || !isFolderValid(context, folderUri)) {
+ updateWidgetInternal(context, widgetId, null, FolderType.DEFAULT, null, null, null);
+ }
+ }
+ }
+
/**
* Abstract method allowing extending classes to perform widget migration
*/