Merge "Use the same margin below and above the attachments divider bar." into jb-ub-mail
diff --git a/res/drawable-sw600dp/folder_item.xml b/res/drawable-sw600dp/folder_item.xml
new file mode 100644
index 0000000..7632b33
--- /dev/null
+++ b/res/drawable-sw600dp/folder_item.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2011 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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo" />
+ <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
+ <item android:drawable="@android:color/transparent" />
+</selector>
diff --git a/res/drawable/folder_item.xml b/res/drawable/folder_item.xml
index 7632b33..f047291 100644
--- a/res/drawable/folder_item.xml
+++ b/res/drawable/folder_item.xml
@@ -16,8 +16,8 @@
limitations under the License.
-->
+<!-- On phone we don't want to have an activated state. -->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/list_pressed_holo" />
- <item android:state_activated="true" android:drawable="@drawable/list_activated_holo" />
<item android:drawable="@android:color/transparent" />
</selector>
diff --git a/res/layout/folder_list.xml b/res/layout/folder_list.xml
index 28ea922..19b0e36 100644
--- a/res/layout/folder_list.xml
+++ b/res/layout/folder_list.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.mail.ui.FolderListLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -47,4 +47,4 @@
android:textAppearance="?android:attr/textAppearanceMedium"/>
</RelativeLayout>
-</FrameLayout>
+</com.android.mail.ui.FolderListLayout>
diff --git a/res/layout/one_pane_activity.xml b/res/layout/one_pane_activity.xml
index a4b31d6..07974b7 100644
--- a/res/layout/one_pane_activity.xml
+++ b/res/layout/one_pane_activity.xml
@@ -15,7 +15,8 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.mail.ui.OnePaneRoot xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/one_pane_root"
android:layout_width="match_parent"
android:layout_height="match_parent" >
@@ -30,4 +31,4 @@
android:id="@+id/toast_bar"
style="@style/ToastBarStyle" />
-</FrameLayout>
\ No newline at end of file
+</com.android.mail.ui.OnePaneRoot>
\ No newline at end of file
diff --git a/res/layout/swipe_leavebehind.xml b/res/layout/swipe_leavebehind.xml
index 9406d03..3aa7c40 100644
--- a/res/layout/swipe_leavebehind.xml
+++ b/res/layout/swipe_leavebehind.xml
@@ -32,14 +32,17 @@
<TextView
android:id="@+id/undo_descriptionview"
android:layout_width="0dip"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:singleLine="true"
android:text="@string/no_conversations"
android:textColor="@android:color/white"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingLeft="16dip" />
+ android:paddingLeft="16dip"
+ android:clickable="true"
+ android:layout_gravity="center_vertical"
+ android:gravity="center_vertical" />
<View
android:id="@+id/undo_separator"
@@ -49,31 +52,27 @@
android:layout_marginTop="20dip"
android:background="@android:color/white" />
- <RelativeLayout
+ <ImageView
+ android:id="@+id/undo_icon"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:id="@+id/undo_button"
- android:clickable="true"
- android:background="?android:attr/selectableItemBackground">
- <ImageView
- android:id="@+id/undo_icon"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginLeft="12dip"
- android:layout_marginRight="8dip"
- android:src="@drawable/ic_menu_revert_holo_dark" />
+ android:paddingLeft="12dip"
+ android:paddingRight="8dip"
+ android:src="@drawable/ic_menu_revert_holo_dark"
+ android:background="?android:attr/selectableItemBackground"
+ android:duplicateParentState="true" />
- <TextView
- android:id="@+id/undo_text"
- style="@style/UndoTextStyle"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingRight="16dip"
- android:text="@string/undo"
- android:textAllCaps="true"
- android:gravity="center_vertical"
- android:textColor="@android:color/white"
- android:layout_toRightOf="@id/undo_icon" />
- </RelativeLayout>
+ <TextView
+ android:id="@+id/undo_text"
+ style="@style/UndoTextStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:paddingRight="16dip"
+ android:text="@string/undo"
+ android:textAllCaps="true"
+ android:gravity="center_vertical"
+ android:textColor="@android:color/white"
+ android:background="?android:attr/selectableItemBackground"
+ android:duplicateParentState="true"/>
</LinearLayout>
</com.android.mail.ui.LeaveBehindItem>
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 020f979..fbab6bb 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Wys prente"</string>
<string name="always_show_images" msgid="5966408990164581801">"Wys altyd prente vanaf hierdie sender"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Prente vanaf hierdie sender sal outomaties gewys word."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>&gt via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Boodskap as konsep gestoor."</string>
<string name="sending_message" msgid="2822171587017313151">"Stuur tans boodskap na uitkassie..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Die adres <xliff:g id="WRONGEMAIL">%s</xliff:g> is ongeldig."</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index f5d2559..082ab3d 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"ስዕሎች አሳይ"</string>
<string name="always_show_images" msgid="5966408990164581801">"ሁልጊዜ ከዚህ ላኪ ፎቶዎችን አሳይ"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"የዚህ ላኪ ፎቶዎች በራስ-ሰር ይታያሉ።"</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> በ<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> በኩል"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"መልዕክት እንደረቂቅ ተቀምጧል።"</string>
<string name="sending_message" msgid="2822171587017313151">"መልዕክት ወደ ወጪ መልዕክት ሳጥን በመላክ ላይ…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> አድራሻ ልክ አይደለም።"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index cfcacb8..f2e8548 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"إظهار الصور"</string>
<string name="always_show_images" msgid="5966408990164581801">"عرض صور من هذا المرسل دومًا"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"سيتم عرض الصور من هذا المرسل تلقائيًا."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> عبر <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"تمّ حفظ الرسالة كمسودة."</string>
<string name="sending_message" msgid="2822171587017313151">"جارٍ إرسال رسالة إلى البريد الصادر..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"العنوان <xliff:g id="WRONGEMAIL">%s</xliff:g> غير صالح."</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 59629a1..700b953 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Паказаць выявы"</string>
<string name="always_show_images" msgid="5966408990164581801">"Заўсёды паказваць выявы ад гэтага адпраўніка"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Выявы ад гэтага адпраўніка будуць паказвацца аўтаматычна."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> праз <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Паведамленне захавана як чарнавік."</string>
<string name="sending_message" msgid="2822171587017313151">"Адпраўка паведамленняў у \"Адпраўленыя\""</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Адрас <xliff:g id="WRONGEMAIL">%s</xliff:g> несапраўдны."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9e2a5e3..c822f02 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Показване на снимките"</string>
<string name="always_show_images" msgid="5966408990164581801">"Снимки от този подател: Показване винаги"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Снимките от този подател ще се показват автоматично."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> чрез <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Съобщението е запазено като чернова."</string>
<string name="sending_message" msgid="2822171587017313151">"Съобщението се изпраща към „Изх. поща“…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Адресът <xliff:g id="WRONGEMAIL">%s</xliff:g> е невалиден."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 520437d..4181be1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Mostra imatges"</string>
<string name="always_show_images" msgid="5966408990164581801">"Mostra sempre imatges d\'aquest remitent"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Les imatges d\'aquest remitent es mostraran automàticament."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> a través de <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Missatge desat com a esborrany."</string>
<string name="sending_message" msgid="2822171587017313151">"S\'està enviant el missatge a la bústia de sortida…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"L\'adreça <xliff:g id="WRONGEMAIL">%s</xliff:g> no és vàlida."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index afa79a2..dbc851c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Zobrazit obrázky"</string>
<string name="always_show_images" msgid="5966408990164581801">"Obr. od tohoto odesílatele vždy zobrazit"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Obrázky od tohoto odesílatele se zobrazí automaticky."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> prostřednictvím <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Zpráva byla uložena jako koncept."</string>
<string name="sending_message" msgid="2822171587017313151">"Přesouvání zprávy do pošty k odeslání…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0aac3e7..efd087a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Vis billeder"</string>
<string name="always_show_images" msgid="5966408990164581801">"Vis altid billeder fra denne afsender"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Billeder fra denne afsender vises automatisk."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Meddelelsen er gemt som kladde."</string>
<string name="sending_message" msgid="2822171587017313151">"Sender meddelelse til udbakke..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0a614ad..7f113d9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Bilder anzeigen"</string>
<string name="always_show_images" msgid="5966408990164581801">"Bilder von diesem Absender immer anzeigen"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Bilder von diesem Absender werden automatisch angezeigt."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> über <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Nachricht wurde als Entwurf gespeichert."</string>
<string name="sending_message" msgid="2822171587017313151">"Nachricht wird an Postausgang gesendet…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Die Adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> ist ungültig."</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 76db46c..38cdb3d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Εμφάνιση εικόνων"</string>
<string name="always_show_images" msgid="5966408990164581801">"Πάντα εμφ. εικ. από αυτόν τον αποστολέα"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Αυτ. εμφ. εικ. από αυτόν τον αποστολέα."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> μέσω <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Το μήνυμα αποθηκεύτηκε ως πρόχειρο."</string>
<string name="sending_message" msgid="2822171587017313151">"Αποστολή μηνύματος στα Προς αποστολή…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Η διεύθυνση <xliff:g id="WRONGEMAIL">%s</xliff:g> δεν είναι έγκυρη."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 324ac51..4814a5b 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Show pictures"</string>
<string name="always_show_images" msgid="5966408990164581801">"Always show pictures from this sender"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Pictures from this sender will be shown automatically."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Message saved as draft."</string>
<string name="sending_message" msgid="2822171587017313151">"Sending message to outbox…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"The address <xliff:g id="WRONGEMAIL">%s</xliff:g> is invalid."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 452f528..669e81c 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -203,8 +203,8 @@
<item quantity="other" msgid="2250720080221922267">"Se marcaron <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversaciones como deseadas."</item>
</plurals>
<plurals name="conversation_not_important">
- <item quantity="one" msgid="788387259924027833">"Se marcó <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversación como irrelevante."</item>
- <item quantity="other" msgid="6662213740575340397">"Se marcaron <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversaciones como irrelevantes."</item>
+ <item quantity="one" msgid="788387259924027833">"Se marcó <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversación como no importante."</item>
+ <item quantity="other" msgid="6662213740575340397">"Se marcaron <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversaciones como no importantes."</item>
</plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"Se marcó <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversación como suplantación de identidad."</item>
@@ -280,10 +280,12 @@
<string name="show_images" msgid="1875700481186331432">"Ver imágenes"</string>
<string name="always_show_images" msgid="5966408990164581801">"Mostrar siempre las imágenes de este remitente"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Las imágenes de este remitente se mostrarán automáticamente."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> por <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
- <string name="sending_message" msgid="2822171587017313151">"Enviando mensaje a Enviados..."</string>
+ <string name="sending_message" msgid="2822171587017313151">"Enviando mensaje a Enviados…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Mostrar el texto citado"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Ocultar el texto citado"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3f5ef96..c3dd6c2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Mostrar imágenes"</string>
<string name="always_show_images" msgid="5966408990164581801">"Mostrar siempre imágenes de este remitente"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Las imágenes de este remitente se mostrarán automáticamente."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> vía <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
<string name="sending_message" msgid="2822171587017313151">"Enviando mensaje a bandeja de salida…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"La dirección <xliff:g id="WRONGEMAIL">%s</xliff:g> no es válida."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 2392f02..7329c82 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Kuva pildid"</string>
<string name="always_show_images" msgid="5966408990164581801">"Näita alati selle saatja pilte"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Selle saatja pilte näidatakse automaatselt."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>: <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Sõnum salvestati mustandina."</string>
<string name="sending_message" msgid="2822171587017313151">"Sõnumi väljundkausta saatmine …"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Aadress <xliff:g id="WRONGEMAIL">%s</xliff:g> on kehtetu."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 3071112..bf7bdf2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"نمایش تصاویر"</string>
<string name="always_show_images" msgid="5966408990164581801">"همیشه تصاویر از طرف این فرستنده نشان داده شود"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"تصاویر از طرف این فرستنده به طور خودکار نشان داده خواهد شد."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> از طریق <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"پیام بهعنوان پیشنویس ذخیره شد."</string>
<string name="sending_message" msgid="2822171587017313151">"ارسال پیام به صندوق ارسال..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"آدرس <xliff:g id="WRONGEMAIL">%s</xliff:g> معتبر نیست."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1117b29..b0afd56 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Näytä kuvat"</string>
<string name="always_show_images" msgid="5966408990164581801">"Näytä aina tämän lähettäjän kuvat"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Kuvat tältä lähettäjältä näytetään automaattisesti."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> toimialueelta <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Viesti tallennettu luonnokseksi."</string>
<string name="sending_message" msgid="2822171587017313151">"Lähetetään viestiä lähetettyihin..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Osoite <xliff:g id="WRONGEMAIL">%s</xliff:g> ei kelpaa."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 857babf..7a01a5d 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Afficher les images"</string>
<string name="always_show_images" msgid="5966408990164581801">"Touj. afficher images de cet expéditeur"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Les images provenant de cet expéditeur seront affichées automatiquement."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Brouillon enregistré."</string>
<string name="sending_message" msgid="2822171587017313151">"Envoi du message à la boîte d\'envoi en cours…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"L\'adresse <xliff:g id="WRONGEMAIL">%s</xliff:g> est incorrecte."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5b0fd34..7a56893 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"चित्र दिखाएं"</string>
<string name="always_show_images" msgid="5966408990164581801">"इस प्रेषक के चित्र हमेशा दिखाएं"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"इस प्रेषक के चित्रों को अपने आप दिखाया जाएगा."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> के माध्यम से"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"संदेश ड्राफ़्ट के रूप में सहेजा गया."</string>
<string name="sending_message" msgid="2822171587017313151">"आउटबॉक्स पर संदेश भेज रहा है…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> पता अमान्य है."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c9bf7c5..1878097 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Prikaži slike"</string>
<string name="always_show_images" msgid="5966408990164581801">"Uvijek prikaži slike ovog pošiljatelja"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Slike ovog pošiljatelja automatski će se prikazati."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> preko <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Poruka je spremljena kao skica."</string>
<string name="sending_message" msgid="2822171587017313151">"Slanje poruke u odlaznu poštu…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> nije važeća."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4472a47..83d67a1 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Képek megjelenítése"</string>
<string name="always_show_images" msgid="5966408990164581801">"Mindig jelenjenek meg képek a feladótól"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Az ettől a feladótól származó képek automatikusan megjelennek."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> -- <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Az üzenet mentve piszkozatként."</string>
<string name="sending_message" msgid="2822171587017313151">"Üzenet küldése a kimenő postafiókba..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"A(z) <xliff:g id="WRONGEMAIL">%s</xliff:g> cím érvénytelen."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d63d787..142f2c1 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Tampilkan gambar"</string>
<string name="always_show_images" msgid="5966408990164581801">"Selalu tampilkan gambar dr pengirim ini"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Gambar dari pengirim ini akan ditampilkan secara otomatis."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Pesan disimpan sebagai draf."</string>
<string name="sending_message" msgid="2822171587017313151">"Mengirim pesan ke kotak keluar…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak valid."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index bb48a8b..dc2768a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Mostra immagini"</string>
<string name="always_show_images" msgid="5966408990164581801">"Mostra sempre immagini del mittente"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Le immagini da questo mittente verranno mostrate automaticamente."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> tramite <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Messaggio salvato come bozza."</string>
<string name="sending_message" msgid="2822171587017313151">"Invio del messaggio alla Posta in uscita…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"L\'indirizzo <xliff:g id="WRONGEMAIL">%s</xliff:g> non è valido."</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c7f2169..6fe6be7 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"הצג תמונות"</string>
<string name="always_show_images" msgid="5966408990164581801">"הצג תמיד תמונות משולח זה"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"תמונות משולח זה יוצגו באופן אוטומטי."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> דרך <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"ההודעה נשמרה כטיוטה."</string>
<string name="sending_message" msgid="2822171587017313151">"שולח הודעה לתיבת הדואר היוצא…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"הכתובת <xliff:g id="WRONGEMAIL">%s</xliff:g> אינה חוקית."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 495651a..fa38feb 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"画像を表示"</string>
<string name="always_show_images" msgid="5966408990164581801">"この送信者からの画像を常に表示する"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"この送信者からの画像は自動的に表示されます。"</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>経由の<xliff:g id="NAME">%1$s</xliff:g><<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"メッセージを下書きとして保存しました。"</string>
<string name="sending_message" msgid="2822171587017313151">"送信トレイにメッセージを送信しています…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"アドレス<xliff:g id="WRONGEMAIL">%s</xliff:g>は無効です。"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index aee6416..ae73128 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"사진 표시"</string>
<string name="always_show_images" msgid="5966408990164581801">"이 발신자가 보낸 사진을 항상 표시"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"이 발신자가 보낸 사진이 자동으로 표시됩니다."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>(<xliff:g id="VIA_DOMAIN">%3$s</xliff:g> 경유)"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"메일이 임시보관함에 저장되었습니다."</string>
<string name="sending_message" msgid="2822171587017313151">"보낼편지함에 메일 전송 중…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"주소(<xliff:g id="WRONGEMAIL">%s</xliff:g>)가 잘못되었습니다."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8ccf2f1..68604b6 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Rodyti paveiksl."</string>
<string name="always_show_images" msgid="5966408990164581801">"Visada rodyti iš šio siunt. gaut. pav."</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Iš šio siuntėjo gauti paveikslėliai bus rodomi automatiškai."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> per <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Pranešimas išsaugotas kaip juodraštis."</string>
<string name="sending_message" msgid="2822171587017313151">"Pranešimas siunčiamas į išsiųstuosius…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adresas <xliff:g id="WRONGEMAIL">%s</xliff:g> yra neteisingas."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 0fa325c..1fbb306 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Rādīt attēlus"</string>
<string name="always_show_images" msgid="5966408990164581801">"Vienmēr rādīt attēlus no šī sūtītāja"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Attēli no šī sūtītāja tiks rādīti automātiski."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> caur <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Ziņojums ir saglabāts kā melnraksts."</string>
<string name="sending_message" msgid="2822171587017313151">"Notiek ziņojuma sūtīšana uz izsūtni…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adrese <xliff:g id="WRONGEMAIL">%s</xliff:g> nav derīga."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 47cd961..bd2a4df 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -280,10 +280,12 @@
<string name="show_images" msgid="1875700481186331432">"Tunjukkan gambar"</string>
<string name="always_show_images" msgid="5966408990164581801">"Sentiasa tunjukkan gambar daripada pengirim ini"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Gambar daripada pengirim ini akan ditunjukkan secara automatik."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> melalui <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Mesej disimpan sebagai draf."</string>
- <string name="sending_message" msgid="2822171587017313151">"Menghantar mesej kepada peti keluar..."</string>
+ <string name="sending_message" msgid="2822171587017313151">"Menghantar mesej ke peti keluar..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Alamat <xliff:g id="WRONGEMAIL">%s</xliff:g> tidak sah."</string>
<string name="show_elided" msgid="5255917904110437886">"▶ Tunjukkan teks yang dipetik"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Sembunyikan teks yang dipetik"</string>
@@ -299,7 +301,14 @@
<string name="cancel" msgid="8762981157252199115">"Batal"</string>
<string name="close" msgid="419945428844076406">"Tutup"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Tiada folder ditetapkan untuk akaun ini."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Berjaya"</item>
+ <item msgid="7109065688039971961">"Tiada sambungan."</item>
+ <item msgid="8437496123716232060">"Tidak dapat melog masuk."</item>
+ <item msgid="1651266301325684887">"Ralat keselamatan."</item>
+ <item msgid="1461520171154288533">"Tidak dapat menyegerakkan."</item>
+ <item msgid="4779810016424303449">"Ralat Dalaman"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Sentuh untuk menyediakan"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Untuk melihat perbualan, segerakkan folder ini."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Segerak Folder"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5d72626..7df616f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Vis bilder"</string>
<string name="always_show_images" msgid="5966408990164581801">"Vis alltid bilder fra denne avsenderen"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Bilder fra denne avsenderen blir vist automatisk."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"E-posten er lagret som utkast."</string>
<string name="sending_message" msgid="2822171587017313151">"E-posten sendes til utboksen ..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> er ugyldig."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 5e56ba8..9982ef8 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Afbeeldingen weergeven"</string>
<string name="always_show_images" msgid="5966408990164581801">"Foto\'s van deze afzender altijd tonen"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Foto\'s van deze afzender worden automatisch weergegeven."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Bericht opgeslagen als concept."</string>
<string name="sending_message" msgid="2822171587017313151">"Bericht verzenden naar Postvak UIT…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Het adres \'<xliff:g id="WRONGEMAIL">%s</xliff:g>\' is ongeldig."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f13d54d..fb6f288 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -278,8 +278,10 @@
<string name="show_images" msgid="1875700481186331432">"Pokaż obrazy"</string>
<string name="always_show_images" msgid="5966408990164581801">"Zawsze pokazuj obrazy od tego nadawcy"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Obrazy od tego nadawcy będą pokazywane automatycznie."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> przez <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Wiadomość została zapisana jako wersja robocza."</string>
<string name="sending_message" msgid="2822171587017313151">"Wysyłam wiadomość do skrzynki nadawczej…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adres <xliff:g id="WRONGEMAIL">%s</xliff:g> jest nieprawidłowy."</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 4ec0398..8b1ee94 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Mostrar imagens"</string>
<string name="always_show_images" msgid="5966408990164581801">"Mostrar sempre imagens deste remetente"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"As imagens deste remetente serão mostradas automaticamente."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Mensagem guardada como rascunho."</string>
<string name="sending_message" msgid="2822171587017313151">"A enviar mensagem para caixa de saída..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> não é válido."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 429ceca..27a6d8f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Mostrar imagens"</string>
<string name="always_show_images" msgid="5966408990164581801">"Sempre mostrar fotos desse remetente"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"As imagens desse remetente serão mostradas automaticamente."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> por <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Mensagem salva como rascunho."</string>
<string name="sending_message" msgid="2822171587017313151">"Enviando a mensagem para a caixa de saída..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"O endereço <xliff:g id="WRONGEMAIL">%s</xliff:g> é inválido."</string>
@@ -299,7 +301,14 @@
<string name="cancel" msgid="8762981157252199115">"Cancelar"</string>
<string name="close" msgid="419945428844076406">"Fechar"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"Nenhuma pasta foi definida para esta conta."</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"Êxito"</item>
+ <item msgid="7109065688039971961">"Sem conexão."</item>
+ <item msgid="8437496123716232060">"Falha ao fazer login."</item>
+ <item msgid="1651266301325684887">"Erro de segurança."</item>
+ <item msgid="1461520171154288533">"Não foi possível sincronizar."</item>
+ <item msgid="4779810016424303449">"Erro interno"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"Toque para configurar"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"Para ver as conversações, sincronize esta pasta."</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronizar pasta"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 3d2c97c..b7432b3 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -391,9 +391,9 @@
<skip />
<!-- no translation found for always_show_images_toast (6218061921546973716) -->
<skip />
- <!-- no translation found for address_display_format (7394762772703217683) -->
+ <!-- no translation found for address_display_format (3581303608028992576) -->
<skip />
- <!-- no translation found for address_display_format_with_via_domain (2292171199773526754) -->
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
<skip />
<!-- no translation found for message_saved (7073947895562277576) -->
<skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 821d365..c51e39b 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Afişaţi fotografiile"</string>
<string name="always_show_images" msgid="5966408990164581801">"Afişaţi întot. imag. de la acest exped."</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Imaginile de la acest expeditor vor fi afişate în mod automat."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> prin <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Mesaj salvat ca mesaj nefinalizat."</string>
<string name="sending_message" msgid="2822171587017313151">"Se trimite mesajul în Mesaje de trimis…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> este nevalidă."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a955973..bf279ca 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Показать картинки"</string>
<string name="always_show_images" msgid="5966408990164581801">"Всегда открывать картинки с этого адреса"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Картинки, отправленные с этого адреса, будут всегда показываться."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> из домена <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Черновик сообщения сохранен."</string>
<string name="sending_message" msgid="2822171587017313151">"Отправка сообщения в исходящие…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Недействительный адрес: <xliff:g id="WRONGEMAIL">%s</xliff:g>."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f810457..8852f7c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Zobraziť obrázky"</string>
<string name="always_show_images" msgid="5966408990164581801">"Vždy zobrazovať obrázky od tohto odosielateľa"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Obrázky od tohto odosielateľa sa budú zobrazovať automaticky."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> cez <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Správa bola uložená ako koncept."</string>
<string name="sending_message" msgid="2822171587017313151">"Odosielanie správy do pošty na odoslanie..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adresa <xliff:g id="WRONGEMAIL">%s</xliff:g> je neplatná."</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 45408ed..70094c3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Pokaži slike"</string>
<string name="always_show_images" msgid="5966408990164581801">"Vedno pokaži slike tega pošiljatelja"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Slike tega pošiljatelja bodo samodejno prikazane."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> prek <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Sporočilo shranjeno kot osnutek."</string>
<string name="sending_message" msgid="2822171587017313151">"Pošiljanje sporočil v mapo Odpošlji ..."</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Naslov <xliff:g id="WRONGEMAIL">%s</xliff:g> je neveljaven."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index aa32e7f..ad8c84a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Прикажи слике"</string>
<string name="always_show_images" msgid="5966408990164581801">"Увек приказуј слике овог пошиљаоца"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Слике овог пошиљаоца биће аутоматски приказане."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> преко <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Порука је сачувана као недовршена."</string>
<string name="sending_message" msgid="2822171587017313151">"Слање поруке у директоријум За слање…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> је неважећа."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 24a0d64..1d51499 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Visa bilder"</string>
<string name="always_show_images" msgid="5966408990164581801">"Visa alltid bilder från denna avsändare"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Bilder från den här avsändaren visas automatiskt."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> via <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Meddelande sparat som utkast."</string>
<string name="sending_message" msgid="2822171587017313151">"Meddelandet skickas till utkorgen …"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Adressen <xliff:g id="WRONGEMAIL">%s</xliff:g> är ogiltig."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 852d4d7..151af22 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -203,8 +203,8 @@
<item quantity="other" msgid="2250720080221922267">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> imeripotiwa kuwa siyo barua taka."</item>
</plurals>
<plurals name="conversation_not_important">
- <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> imetiwa alama kama isiyo muhimu."</item>
- <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> imetiwa alama kama isiyo muhimu."</item>
+ <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> imetiwa alama kuwa isiyo muhimu."</item>
+ <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> imetiwa alama kuwa isiyo muhimu."</item>
</plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> imeripotiwa kuwa hadaa."</item>
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Onyesha picha"</string>
<string name="always_show_images" msgid="5966408990164581801">"Daima onyesha picha kutoka kwa mtumaji huyu"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Picha kutoka kwa mtumaji huyu zitaonyeshwa kiotomatiki."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> < <xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> kupitia <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Ujumbe umehifadhiwa kama rasimu."</string>
<string name="sending_message" msgid="2822171587017313151">"Inatuma ujumbe kwenye kikasha ondozi…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Anwani <xliff:g id="WRONGEMAIL">%s</xliff:g> ni batili."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 2226c40..2c3975e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"แสดงรูปภาพ"</string>
<string name="always_show_images" msgid="5966408990164581801">"แสดงรูปภาพจากผู้ส่งรายนี้เสมอ"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"แสดงรูปภาพจากผู้ส่งนี้โดยอัตโนมัติ"</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> ผ่าน <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"บันทึกข้อความเป็นร่างจดหมาย"</string>
<string name="sending_message" msgid="2822171587017313151">"กำลังส่งข้อความไปที่กล่องจดหมายออก…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"ที่อยู่ <xliff:g id="WRONGEMAIL">%s</xliff:g> ไม่ถูกต้อง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e6ce99f..2d9a0ff 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Ipakita ang mga larawan"</string>
<string name="always_show_images" msgid="5966408990164581801">"Lagi pakita larawan mula nagpadalang ito"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Awtomatikong ipapakita ang mga larawan mula sa nagpadalang ito."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> gmit <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Na-save ang mensahe bilang draft."</string>
<string name="sending_message" msgid="2822171587017313151">"Ipinapadala ang mensahe sa outbox…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Ang address na <xliff:g id="WRONGEMAIL">%s</xliff:g> ay di-wasto."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d33bcea..473e434 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Resimleri göster"</string>
<string name="always_show_images" msgid="5966408990164581801">"Bu gönderenden gelen resimleri her zaman göster"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Bu gönderenden gelen resimler otomatik olarak gösterilecek."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>, <xliff:g id="VIA_DOMAIN">%3$s</xliff:g> üzerinden"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"İleti taslak olarak kaydedildi."</string>
<string name="sending_message" msgid="2822171587017313151">"İleti Giden Kutusu\'na gönderiliyor…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"<xliff:g id="WRONGEMAIL">%s</xliff:g> adresi geçersiz."</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 354bde3..9939f7b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Показати зображення"</string>
<string name="always_show_images" msgid="5966408990164581801">"Завжди показ. зображ.від цього відправн."</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Зображення від цього відправника відображатимуться автоматично."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> через <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Повідомлення збережено як чернетку."</string>
<string name="sending_message" msgid="2822171587017313151">"Повідомлення надсилається в папку \"Вихідні\"…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Адреса <xliff:g id="WRONGEMAIL">%s</xliff:g> не дійсна."</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index cd29bc1..197ee78 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Hiển thị ảnh"</string>
<string name="always_show_images" msgid="5966408990164581801">"Luôn hiển thị ảnh từ người gửi này"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Hình ảnh từ người gửi này sẽ được hiển thị tự động."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> qua <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Tin nhắn đã được lưu dưới dạng tin nháp."</string>
<string name="sending_message" msgid="2822171587017313151">"Đang gửi thư tới hộp thư đi…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Địa chỉ <xliff:g id="WRONGEMAIL">%s</xliff:g> không hợp lệ."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 339c2e0..18e823b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -280,10 +280,12 @@
<string name="show_images" msgid="1875700481186331432">"显示图片"</string>
<string name="always_show_images" msgid="5966408990164581801">"总是显示来自此发件人的图片"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"系统会自动显示来自此发件人的图片。"</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> 来自 <xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"邮件已另存为草稿。"</string>
- <string name="sending_message" msgid="2822171587017313151">"正在将邮件发送到发件箱…"</string>
+ <string name="sending_message" msgid="2822171587017313151">"正在将邮件送到发件箱…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 无效。"</string>
<string name="show_elided" msgid="5255917904110437886">"▶ 显示引用文字"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ 隐藏引用文字"</string>
@@ -299,7 +301,14 @@
<string name="cancel" msgid="8762981157252199115">"取消"</string>
<string name="close" msgid="419945428844076406">"关闭"</string>
<string name="folders_activity_instructions" msgid="5237801615196958918">"此帐户尚未设置文件夹。"</string>
- <!-- no translation found for sync_status:5 (4779810016424303449) -->
+ <string-array name="sync_status">
+ <item msgid="2446076619901049026">"成功"</item>
+ <item msgid="7109065688039971961">"无网络连接。"</item>
+ <item msgid="8437496123716232060">"无法登录。"</item>
+ <item msgid="1651266301325684887">"安全错误。"</item>
+ <item msgid="1461520171154288533">"无法同步。"</item>
+ <item msgid="4779810016424303449">"内部错误"</item>
+ </string-array>
<string name="tap_to_configure" msgid="1181356242354390930">"触摸可进行设置"</string>
<string name="non_synced_folder_description" msgid="6059194125558004080">"要查看会话，请同步此文件夹。"</string>
<string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"同步文件夹"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 770221e..23f40f1 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"顯示圖片"</string>
<string name="always_show_images" msgid="5966408990164581801">"一律顯示這位寄件者所傳送的圖片"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"系統會自動顯示這位寄件者所傳送的圖片。"</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g>，<<xliff:g id="EMAIL">%2$s</xliff:g>>，來源網域：<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"已儲存郵件草稿。"</string>
<string name="sending_message" msgid="2822171587017313151">"正在將郵件傳送到寄件匣…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"地址 <xliff:g id="WRONGEMAIL">%s</xliff:g> 無效。"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 7099eae..04c63e2 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -280,8 +280,10 @@
<string name="show_images" msgid="1875700481186331432">"Bonisa izithombe"</string>
<string name="always_show_images" msgid="5966408990164581801">"Njalo bonisa izithombe eziphuma kulo mthumeli"</string>
<string name="always_show_images_toast" msgid="6218061921546973716">"Izithombe eziphuma kulo mthumeli zizoboniswa ngokuzenzakalelayo."</string>
- <string name="address_display_format" msgid="7394762772703217683">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>>"</string>
- <string name="address_display_format_with_via_domain" msgid="2292171199773526754">"<xliff:g id="NAME">%1$s</xliff:g> <<xliff:g id="EMAIL">%2$s</xliff:g>> nge-<xliff:g id="VIA_DOMAIN">%3$s</xliff:g>"</string>
+ <!-- no translation found for address_display_format (3581303608028992576) -->
+ <skip />
+ <!-- no translation found for address_display_format_with_via_domain (2316262813990842490) -->
+ <skip />
<string name="message_saved" msgid="7073947895562277576">"Umlayezo ulondolozwe njengokusalungiswa."</string>
<string name="sending_message" msgid="2822171587017313151">"Ithumela umlayezo ebhokisini lokuphumayo…"</string>
<string name="invalid_recipient" msgid="2161317422860961623">"Ikheli <xliff:g id="WRONGEMAIL">%s</xliff:g> alivumelekile."</string>
diff --git a/src/com/android/mail/browse/ConversationContainer.java b/src/com/android/mail/browse/ConversationContainer.java
index 5fa3b0b..bbee924 100644
--- a/src/com/android/mail/browse/ConversationContainer.java
+++ b/src/com/android/mail/browse/ConversationContainer.java
@@ -37,6 +37,7 @@
import com.android.mail.utils.DequeMap;
import com.android.mail.utils.InputSmoother;
import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
import com.google.common.collect.Lists;
import java.util.List;
@@ -565,6 +566,12 @@
}
@Override
+ public void requestLayout() {
+ Utils.checkRequestLayout(this);
+ super.requestLayout();
+ }
+
+ @Override
protected void dispatchDraw(Canvas canvas) {
super.dispatchDraw(canvas);
diff --git a/src/com/android/mail/providers/MailAppProvider.java b/src/com/android/mail/providers/MailAppProvider.java
index 158287c..fbc2917 100644
--- a/src/com/android/mail/providers/MailAppProvider.java
+++ b/src/com/android/mail/providers/MailAppProvider.java
@@ -39,9 +39,12 @@
import com.android.mail.utils.LogUtils;
import com.android.mail.utils.MatrixCursorWithExtra;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
@@ -168,11 +171,11 @@
extras.putInt(AccountCursorExtraKeys.ACCOUNTS_LOADED, mAccountsFullyLoaded ? 1 : 0);
// Make a copy of the account cache
-
- final Set<AccountCacheEntry> accountList;
+ final List<AccountCacheEntry> accountList = Lists.newArrayList();
synchronized (mAccountCache) {
- accountList = ImmutableSet.copyOf(mAccountCache.values());
+ accountList.addAll(mAccountCache.values());
}
+ Collections.sort(accountList);
final MatrixCursor cursor =
new MatrixCursorWithExtra(resultProjection, accountList.size(), extras);
@@ -366,10 +369,16 @@
}
private void addAccountImpl(Account account, Uri accountsQueryUri, boolean notify) {
+ addAccountImpl(account, accountsQueryUri, mAccountCache.size(), notify);
+ }
+
+ private void addAccountImpl(Account account, Uri accountsQueryUri, int position,
+ boolean notify) {
synchronized (mAccountCache) {
if (account != null) {
LogUtils.v(LOG_TAG, "adding account %s", account);
- mAccountCache.put(account.uri, new AccountCacheEntry(account, accountsQueryUri));
+ mAccountCache.put(account.uri,
+ new AccountCacheEntry(account, accountsQueryUri, position));
}
}
// Explicitly calling this out of the synchronized block in case any of the observers get
@@ -447,16 +456,20 @@
final Set<String> accountsStringSet = preference.getStringSet(ACCOUNT_LIST_KEY, null);
if (accountsStringSet != null) {
+ int pos = 0;
for (String serializedAccount : accountsStringSet) {
try {
+ // TODO (pwestbro): we are creating duplicate AccountCacheEntry objects.
+ // One here, and one in addAccountImpl. We should stop doing that.
final AccountCacheEntry accountEntry =
- new AccountCacheEntry(serializedAccount);
+ new AccountCacheEntry(serializedAccount, pos);
if (accountEntry.mAccount.settings != null) {
- addAccountImpl(accountEntry.mAccount, accountEntry.mAccountsQueryUri,
+ addAccountImpl(accountEntry.mAccount, accountEntry.mAccountsQueryUri, pos,
false /* don't notify */);
} else {
LogUtils.e(LOG_TAG, "Dropping account that doesn't specify settings");
}
+ pos++;
} catch (Exception e) {
// Unable to create account object, skip to next
LogUtils.e(LOG_TAG, e,
@@ -469,10 +482,11 @@
}
private void cacheAccountList() {
- final Set<AccountCacheEntry> accountList;
+ final List<AccountCacheEntry> accountList = Lists.newArrayList();
synchronized (mAccountCache) {
- accountList = ImmutableSet.copyOf(mAccountCache.values());
+ accountList.addAll(mAccountCache.values());
}
+ Collections.sort(accountList);
final Set<String> serializedAccounts = Sets.newHashSet();
for (AccountCacheEntry accountEntry : accountList) {
@@ -521,11 +535,15 @@
accountList = ImmutableSet.copyOf(mAccountCache.values());
}
+ int lastPosition = 0;
// Build a set of the account uris that had been associated with that query
- final Set<Uri> previousQueryUriMap = Sets.newHashSet();
+ final Set<Uri> previousQueryUriSet = Sets.newHashSet();
for (AccountCacheEntry entry : accountList) {
if (accountsQueryUri.equals(entry.mAccountsQueryUri)) {
- previousQueryUriMap.add(entry.mAccount.uri);
+ previousQueryUriSet.add(entry.mAccount.uri);
+ }
+ if (entry.mPosition > lastPosition) {
+ lastPosition = entry.mPosition;
}
}
@@ -536,19 +554,23 @@
mAccountsFullyLoaded = extra.getInt(AccountCursorExtraKeys.ACCOUNTS_LOADED) != 0;
final Set<Uri> newQueryUriMap = Sets.newHashSet();
+
+ // We are relying on the fact that all accounts are added in the order specified in the
+ // cursor. Initially assume that we insert these items to at the end of the list
+ int pos = lastPosition;
while (data.moveToNext()) {
final Account account = new Account(data);
final Uri accountUri = account.uri;
newQueryUriMap.add(accountUri);
- addAccountImpl(account, accountsQueryUri, false /* don't notify */);
+ addAccountImpl(account, accountsQueryUri, pos++, false /* don't notify */);
}
// Remove all of the accounts that are in the new result set
- previousQueryUriMap.removeAll(newQueryUriMap);
+ previousQueryUriSet.removeAll(newQueryUriMap);
// For all of the entries that had been in the previous result set, and are not
// in the new result set, remove them from the cache
- if (previousQueryUriMap.size() > 0 && mAccountsFullyLoaded) {
- removeAccounts(previousQueryUriMap, false /* don't notify */);
+ if (previousQueryUriSet.size() > 0 && mAccountsFullyLoaded) {
+ removeAccounts(previousQueryUriSet, false /* don't notify */);
}
broadcastAccountChange();
}
@@ -557,9 +579,10 @@
* Object that allows the Account Cache provider to associate the account with the content
* provider uri that originated that account.
*/
- private static class AccountCacheEntry {
+ private static class AccountCacheEntry implements Comparable<AccountCacheEntry> {
final Account mAccount;
final Uri mAccountsQueryUri;
+ final int mPosition;
private static final String ACCOUNT_ENTRY_COMPONENT_SEPARATOR = "^**^";
private static final Pattern ACCOUNT_ENTRY_COMPONENT_SEPARATOR_PATTERN =
@@ -567,9 +590,10 @@
private static final int NUMBER_MEMBERS = 2;
- public AccountCacheEntry(Account account, Uri accountQueryUri) {
+ public AccountCacheEntry(Account account, Uri accountQueryUri, int position) {
mAccount = account;
mAccountsQueryUri = accountQueryUri;
+ mPosition = position;
}
/**
@@ -591,7 +615,8 @@
* ignoring the newly created object if the exception is thrown.
* @param serializedString
*/
- public AccountCacheEntry(String serializedString) throws IllegalArgumentException {
+ public AccountCacheEntry(String serializedString, int position)
+ throws IllegalArgumentException {
String[] cacheEntryMembers = TextUtils.split(serializedString,
ACCOUNT_ENTRY_COMPONENT_SEPARATOR_PATTERN);
if (cacheEntryMembers.length != NUMBER_MEMBERS) {
@@ -611,6 +636,12 @@
}
mAccountsQueryUri = !TextUtils.isEmpty(cacheEntryMembers[1]) ?
Uri.parse(cacheEntryMembers[1]) : null;
+ mPosition = position;
+ }
+
+ @Override
+ public int compareTo(AccountCacheEntry o) {
+ return o.mPosition - mPosition;
}
}
}
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 9211f80..daf701a 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -479,37 +479,56 @@
@Override
public void onFolderChanged(Folder folder) {
- if (!Objects.equal(mFolder, folder)) {
- commitDestructiveActions(false);
- }
changeFolder(folder, null);
}
/**
+ * Sets the folder state without changing view mode and without creating a list fragment, if
+ * possible.
+ * @param folder
+ */
+ private void setListContext(Folder folder, String query) {
+ updateFolder(folder);
+ if (query != null) {
+ mConvListContext = ConversationListContext.forSearchQuery(mAccount, mFolder, query);
+ } else {
+ mConvListContext = ConversationListContext.forFolder(mAccount, mFolder);
+ }
+ // Add the folder that we were viewing to the recent folders list.
+ // TODO: this may need to be fine tuned. If this is the signal that is indicating that
+ // the list is shown to the user, this could fire in one pane if the user goes directly
+ // to a conversation
+ updateRecentFolderList();
+ cancelRefreshTask();
+ }
+
+ /**
* Changes the folder to the value provided here. This causes the view mode to change.
* @param folder the folder to change to
* @param query if non-null, this represents the search string that the folder represents.
*/
private void changeFolder(Folder folder, String query) {
+ if (!Objects.equal(mFolder, folder)) {
+ commitDestructiveActions(false);
+ }
if (folder != null && !folder.equals(mFolder)
|| (mViewMode.getMode() != ViewMode.CONVERSATION_LIST)) {
- updateFolder(folder);
- if (query != null) {
- mConvListContext = ConversationListContext.forSearchQuery(mAccount, mFolder, query);
- } else {
- mConvListContext = ConversationListContext.forFolder(mAccount, mFolder);
- }
+ setListContext(folder, query);
showConversationList(mConvListContext);
-
- // Add the folder that we were viewing to the recent folders list.
- // TODO: this may need to be fine tuned. If this is the signal that is indicating that
- // the list is shown to the user, this could fire in one pane if the user goes directly
- // to a conversation
- updateRecentFolderList();
- cancelRefreshTask();
}
}
+ /**
+ * Update the conversation list to {@link #mConvListContext} without creating a new frament if
+ * possible.
+ */
+ protected abstract void updateConversationList();
+
+ private void setFirstFolder(Folder folder, String query) {
+ setListContext(folder, query);
+ updateConversationList();
+ }
+
@Override
public void onFolderSelected(Folder folder) {
onFolderChanged(folder);
@@ -660,11 +679,8 @@
}
if (savedState.containsKey(SAVED_FOLDER)) {
final Folder folder = (Folder) savedState.getParcelable(SAVED_FOLDER);
- if (savedState.containsKey(SAVED_QUERY)) {
- changeFolder(folder, savedState.getString(SAVED_QUERY));
- } else {
- onFolderChanged(folder);
- }
+ final String query = savedState.getString(SAVED_QUERY, null);
+ setFirstFolder(folder, query);
}
} else if (intent != null) {
handleIntent(intent);
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 746ce02..530eec7 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -153,6 +153,8 @@
@Override
public void onResume() {
+ Utils.dumpLayoutRequests("CLF.onResume()", getView());
+
super.onResume();
// Hacky workaround for http://b/6946182
Utils.fixSubTreeLayoutIfOrphaned(getView(), "ConversationListFragment");
@@ -345,11 +347,20 @@
if (conversationListCursor != null && conversationListCursor.isRefreshReady()) {
conversationListCursor.sync();
}
+ Utils.dumpLayoutRequests("CLF.onCreateView()", container);
return rootView;
}
@Override
+ public void onDestroy() {
+ Utils.dumpLayoutRequests("CLF.onDestroy()", getView());
+ super.onDestroy();
+ }
+
+ @Override
public void onDestroyView() {
+ Utils.dumpLayoutRequests("CLF.onDestroyView()", getView());
+
// If this fragment is being retained, onSaveInstance will not be called, so we need to
// manage saving the state ourselves. Unfortunately we don't have a signal indicates that
// this fragment instance will be reused, so we have to save the state in all cases.
@@ -437,6 +448,7 @@
@Override
public void onPause() {
+ Utils.dumpLayoutRequests("CLF.onPause()", getView());
super.onPause();
}
@@ -450,12 +462,14 @@
@Override
public void onStart() {
+ Utils.dumpLayoutRequests("CLF.onStart()", getView());
super.onStart();
mHandler.postDelayed(mUpdateTimestampsRunnable, TIMESTAMP_UPDATE_INTERVAL);
}
@Override
public void onStop() {
+ Utils.dumpLayoutRequests("CLF.onStop()", getView());
super.onStop();
mHandler.removeCallbacks(mUpdateTimestampsRunnable);
}
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 38ffdeb..4cec4f4 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -24,6 +24,7 @@
import android.content.CursorLoader;
import android.content.Loader;
import android.database.Cursor;
+import android.database.DataSetObserver;
import android.net.Uri;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -73,6 +74,15 @@
private View mEmptyView;
+ private FolderObserver mFolderObserver = null;
+ // Listen to folder changes from the controller and update state accordingly.
+ private class FolderObserver extends DataSetObserver {
+ @Override
+ public void onChanged() {
+ mSelectedFolder = mActivity.getFolderController().getFolder();
+ }
+ }
+
/**
* Constructor needs to be public to handle orientation changes and activity lifecycle events.
*/
@@ -82,6 +92,8 @@
@Override
public void onResume() {
+ Utils.dumpLayoutRequests("FLF(" + this + ").onResume()", getView());
+
super.onResume();
// Hacky workaround for http://b/6946182
Utils.fixSubTreeLayoutIfOrphaned(getView(), "FolderListFragment");
@@ -135,6 +147,9 @@
selectInitialFolder(mActivity.getHierarchyFolder());
getLoaderManager().initLoader(FOLDER_LOADER_ID, Bundle.EMPTY, this);
+ // Listen to folder changes in the future
+ mFolderObserver = new FolderObserver();
+ mActivity.getFolderController().registerFolderObserver(mFolderObserver);
}
@Override
@@ -152,14 +167,38 @@
if (mParentFolder != null) {
mSelectedFolder = mParentFolder;
}
+ Utils.dumpLayoutRequests("FLF(" + this + ").onCreateView()", rootView);
return rootView;
}
@Override
+ public void onStart() {
+ Utils.dumpLayoutRequests("FLF(" + this + ").onStart()", getView());
+ super.onStart();
+ }
+
+ @Override
+ public void onStop() {
+ Utils.dumpLayoutRequests("FLF(" + this + ").onStop()", getView());
+ super.onStop();
+ }
+
+ @Override
+ public void onPause() {
+ Utils.dumpLayoutRequests("FLF(" + this + ").onPause()", getView());
+ super.onPause();
+ }
+
+ @Override
public void onDestroyView() {
+ Utils.dumpLayoutRequests("FLF(" + this + ").onDestoryView()", getView());
// Clear the adapter.
setListAdapter(null);
+ if (mFolderObserver != null) {
+ mActivity.getFolderController().unregisterFolderObserver(mFolderObserver);
+ mFolderObserver = null;
+ }
super.onDestroyView();
}
diff --git a/src/com/android/mail/ui/FolderListLayout.java b/src/com/android/mail/ui/FolderListLayout.java
new file mode 100644
index 0000000..0095df9
--- /dev/null
+++ b/src/com/android/mail/ui/FolderListLayout.java
@@ -0,0 +1,41 @@
+package com.android.mail.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
+
+/**
+ * temporary annonated FrameLayout to help find cases of b/6946182
+ */
+public class FolderListLayout extends FrameLayout {
+
+ public FolderListLayout(Context c) {
+ this(c, null);
+ }
+
+ public FolderListLayout(Context c, AttributeSet attrs) {
+ super(c, attrs);
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, "FolderListLayout(%s).onMeasure() called", this);
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, "FolderListLayout(%s).onLayout() called", this);
+ super.onLayout(changed, left, top, right, bottom);
+ }
+
+ @Override
+ public void requestLayout() {
+ Utils.checkRequestLayout(this);
+ super.requestLayout();
+ }
+
+}
diff --git a/src/com/android/mail/ui/LeaveBehindItem.java b/src/com/android/mail/ui/LeaveBehindItem.java
index ebd730d..dcfcd66 100644
--- a/src/com/android/mail/ui/LeaveBehindItem.java
+++ b/src/com/android/mail/ui/LeaveBehindItem.java
@@ -28,7 +28,6 @@
import android.view.View.OnClickListener;
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
-import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.mail.R;
@@ -50,7 +49,6 @@
private View mSwipeableContent;
private static int sShrinkAnimationDuration = -1;
private static int sFadeInAnimationDuration = -1;
- private static int sSwipedBgColor = -1;
public LeaveBehindItem(Context context) {
this(context, null);
@@ -67,7 +65,6 @@
R.integer.shrink_animation_duration);
sFadeInAnimationDuration = context.getResources().getInteger(
R.integer.fade_in_animation_duration);
- sSwipedBgColor = context.getResources().getColor(R.color.swiped_bg_color);
}
}
@@ -75,7 +72,7 @@
public void onClick(View v) {
int id = v.getId();
switch (id) {
- case R.id.undo_button:
+ case R.id.swipeable_content:
if (mAccount.undoUri != null) {
// NOTE: We might want undo to return the messages affected,
// in which case the resulting cursor might be interesting...
@@ -86,6 +83,10 @@
mConversationCursor.undo(getContext(), mAccount.undoUri);
}
break;
+ case R.id.undo_descriptionview:
+ // Essentially, makes sure that tapping description view doesn't highlight
+ // either the undo button icon or text.
+ break;
}
}
@@ -97,10 +98,13 @@
mConversationCursor = (ConversationCursor) adapter.getCursor();
setData(target);
mSwipeableContent = findViewById(R.id.swipeable_content);
+ // Listen on swipeable content so that we can show both the undo icon
+ // and button text as selected since they set duplicateParentState to true
+ mSwipeableContent.setOnClickListener(this);
mText = ((TextView) findViewById(R.id.undo_descriptionview));
mText.setText(Html.fromHtml(mUndoOp
.getSingularDescription(getContext(), folder)));
- findViewById(R.id.undo_button).setOnClickListener(this);
+ mText.setOnClickListener(this);
}
public void commit() {
diff --git a/src/com/android/mail/ui/OnePaneController.java b/src/com/android/mail/ui/OnePaneController.java
index 75b3575..663aac5 100644
--- a/src/com/android/mail/ui/OnePaneController.java
+++ b/src/com/android/mail/ui/OnePaneController.java
@@ -406,6 +406,50 @@
}
}
+ /**
+ * Update the conversation list without creating another fragment, if possible
+ */
+ @Override
+ protected void updateConversationList(){
+ enableCabMode();
+ // TODO(viki): Check if the account has been changed since the previous
+ // time.
+ if (ConversationListContext.isSearchResult(mConvListContext)) {
+ mViewMode.enterSearchResultsListMode();
+ } else {
+ mViewMode.enterConversationListMode();
+ }
+ // TODO(viki): This account transition looks strange in two pane mode.
+ // Revisit as the app is coming together and improve the look and feel.
+ final int transition = mConversationListNeverShown
+ ? FragmentTransaction.TRANSIT_FRAGMENT_FADE
+ : FragmentTransaction.TRANSIT_FRAGMENT_OPEN;
+ Fragment listFragment = getConversationListFragment();
+ if (listFragment == null) {
+ listFragment = ConversationListFragment.newInstance(mConvListContext);
+ if (!inInbox(mAccount, mConvListContext)) {
+ // Maintain fragment transaction history so we can get back to the
+ // fragment used to launch this list.
+ mLastConversationListTransactionId = replaceFragment(listFragment,
+ transition, TAG_CONVERSATION_LIST);
+ } else {
+ // If going to the inbox, clear the folder list transaction history.
+ mInbox = mConvListContext.folder;
+ mLastInboxConversationListTransactionId = replaceFragment(listFragment,
+ transition, TAG_CONVERSATION_LIST);
+ mLastFolderListTransactionId = INVALID_ID;
+
+ // If we ever to to the inbox, we want to unset the transation id for any other
+ // non-inbox folder.
+ mLastConversationListTransactionId = INVALID_ID;
+ }
+ }
+ mConversationListVisible = true;
+ onConversationVisibilityChanged(false);
+ onConversationListVisibilityChanged(true);
+ mConversationListNeverShown = false;
+ }
+
private boolean isTransactionIdValid(int id) {
return id >= 0;
}
diff --git a/src/com/android/mail/ui/OnePaneRoot.java b/src/com/android/mail/ui/OnePaneRoot.java
new file mode 100644
index 0000000..8ffaede
--- /dev/null
+++ b/src/com/android/mail/ui/OnePaneRoot.java
@@ -0,0 +1,45 @@
+package com.android.mail.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+import com.android.mail.utils.LogTag;
+import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
+
+/**
+ * TODO: Insert description here. (generated by ath)
+ */
+public class OnePaneRoot extends FrameLayout {
+
+ private static final String LOG_TAG = LogTag.getLogTag();
+
+ public OnePaneRoot(Context c) {
+ this(c, null);
+ }
+
+ public OnePaneRoot(Context c, AttributeSet attrs) {
+ super(c, attrs);
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, "OnePaneLayout(%s).onMeasure() called", this);
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, "OnePaneLayout(%s).onLayout() START", this);
+ super.onLayout(changed, left, top, right, bottom);
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, "OnePaneLayout(%s).onLayout() FINISH", this);
+ }
+
+ @Override
+ public void requestLayout() {
+ Utils.checkRequestLayout(this);
+ super.requestLayout();
+ }
+
+}
diff --git a/src/com/android/mail/ui/SwipeableListView.java b/src/com/android/mail/ui/SwipeableListView.java
index 745cd37..b9921e1 100644
--- a/src/com/android/mail/ui/SwipeableListView.java
+++ b/src/com/android/mail/ui/SwipeableListView.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.content.res.Configuration;
+import android.graphics.Rect;
import android.net.Uri;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -37,6 +38,7 @@
import com.android.mail.ui.SwipeHelper.Callback;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
import java.util.ArrayList;
import java.util.Collection;
@@ -78,6 +80,23 @@
mSwipeHelper.setPagingTouchSlop(pagingTouchSlop);
}
+ @Override
+ protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyFocusedRect) {
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG,
+ "START CLF-ListView.onFocusChanged layoutRequested=%s root.layoutRequested=%s",
+ isLayoutRequested(), getRootView().isLayoutRequested());
+ super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, new Error(),
+ "FINISH CLF-ListView.onFocusChanged layoutRequested=%s root.layoutRequested=%s",
+ isLayoutRequested(), getRootView().isLayoutRequested());
+ }
+
+ @Override
+ public void requestLayout() {
+ Utils.checkRequestLayout(this);
+ super.requestLayout();
+ }
+
/**
* Enable swipe gestures.
*/
diff --git a/src/com/android/mail/ui/TwoPaneController.java b/src/com/android/mail/ui/TwoPaneController.java
index 953c2a5..b12bad6 100644
--- a/src/com/android/mail/ui/TwoPaneController.java
+++ b/src/com/android/mail/ui/TwoPaneController.java
@@ -121,6 +121,21 @@
initializeConversationListFragment(true);
}
+ /**
+ * Update the conversation list without creating another fragment, if possible
+ */
+ @Override
+ protected void updateConversationList(){
+ exitCabMode();
+ FolderListFragment folderList = getFolderListFragment();
+ if (folderList == null && mViewMode.getMode() == ViewMode.CONVERSATION_LIST) {
+ // Create a folder list fragment if none exists.
+ renderFolderList();
+ folderList = getFolderListFragment();
+ }
+ initializeConversationListFragment(true);
+ }
+
@Override
public void showFolderList() {
// On two-pane layouts, showing the folder list takes you to the top level of the
diff --git a/src/com/android/mail/ui/TwoPaneLayout.java b/src/com/android/mail/ui/TwoPaneLayout.java
index bee4bb9..b703ef1 100644
--- a/src/com/android/mail/ui/TwoPaneLayout.java
+++ b/src/com/android/mail/ui/TwoPaneLayout.java
@@ -748,4 +748,22 @@
mOutstandingAnimator = animator;
animator.start();
}
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, "TPL(%s).onMeasure()", this);
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ @Override
+ protected void onLayout(boolean changed, int l, int t, int r, int b) {
+ LogUtils.w(Utils.VIEW_DEBUGGING_TAG, "TPL(%s).onLayout()", this);
+ super.onLayout(changed, l, t, r, b);
+ }
+
+ @Override
+ public void requestLayout() {
+ Utils.checkRequestLayout(this);
+ super.requestLayout();
+ }
}
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index c262987..366432e 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -87,6 +87,10 @@
public static final String EXTRA_COMPOSE_URI = "composeUri";
public static final String EXTRA_CONVERSATION = "conversationUri";
public static final String EXTRA_FOLDER = "folder";
+
+ /** Extra tag for debugging the blank fragment problem. */
+ public static final String VIEW_DEBUGGING_TAG = "MailBlankFragment";
+
/*
* Notifies that changes happened. Certain UI components, e.g., widgets, can
* register for this {@link Intent} and update accordingly. However, this
@@ -1049,7 +1053,11 @@
* Hacky method to allow invalidating views all the way up the hierarchy.
*/
public static void markDirtyTillRoot(String message, View v) {
- LogUtils.d(LOG_TAG, "%s: markingDirtyTillRoot", message);
+ // During development, we want to log extra debugging information, and disable the
+ // hacky workaround to help diagnose the underlying problem.
+ if (LogUtils.isDebugLoggingEnabled(VIEW_DEBUGGING_TAG)) return;
+
+ LogUtils.d(VIEW_DEBUGGING_TAG, "%s: markingDirtyTillRoot", message);
v.invalidate();
ViewParent parent = v.getParent();
while (parent != null) {
@@ -1058,4 +1066,56 @@
}
}
+ public static void checkRequestLayout(View v) {
+ boolean inLayout = false;
+ final View root = v.getRootView();
+
+ if (root == null) {
+ return;
+ }
+
+ final Error e = new Error();
+ for (StackTraceElement ste : e.getStackTrace()) {
+ if ("android.view.ViewGroup".equals(ste.getClassName())
+ && "layout".equals(ste.getMethodName())) {
+ inLayout = true;
+ break;
+ }
+ }
+ if (inLayout && !v.isLayoutRequested()) {
+ LogUtils.e(VIEW_DEBUGGING_TAG,
+ e, "WARNING: in requestLayout during layout pass, view=%s", v);
+ }
+ }
+
+ /**
+ * Logs extra information about the views to help find the problem with blank fragments.
+ * To turn on this debugging, enable the "MailBlankFragment" tag with
+ * adb shell setprop log.tag.MailBlankFragment VERBOSE
+ * @param message
+ * @param v
+ */
+ public static void dumpLayoutRequests(String message, View v) {
+ LogUtils.w(VIEW_DEBUGGING_TAG, "dumpLayoutRequests: %s", message);
+
+ while (v != null) {
+ LogUtils.w(VIEW_DEBUGGING_TAG,
+ "view item: %s mw/mh=%d/%d w/h=%d/%d layoutRequested=%s vis=%s id=0x%x",
+ v, v.getMeasuredWidth(), v.getMeasuredHeight(), v.getWidth(), v.getHeight(),
+ v.isLayoutRequested(), v.getVisibility(), v.getId());
+
+ ViewParent vp = v.getParent();
+ if (vp instanceof ViewGroup) {
+ v = (ViewGroup) vp;
+ } else {
+ if (vp != null) {
+ // this is the root. can't really get access to this guy
+ LogUtils.w(VIEW_DEBUGGING_TAG,
+ "view item: (ViewRootImpl) isLayoutRequested=%s\n",
+ vp.isLayoutRequested());
+ }
+ v = null;
+ }
+ }
+ }
}