Merge "Add touch feedback to undo area of leave behind." into jb-ub-mail
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c879ca3..2f0ec80 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -148,8 +148,7 @@
<item quantity="one" msgid="3657821200245019288">"نقل المحادثة"</item>
<item quantity="other" msgid="1685896770174368261">"نقل <xliff:g id="ID_1">%1$d</xliff:g> من المحادثات"</item>
</plurals>
- <!-- no translation found for content_description (175899621885107464) -->
- <skip />
+ <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> أرسل <xliff:g id="SUBJECT">%2$s</xliff:g> في <xliff:g id="DATE">%3$s</xliff:g>"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
<plurals name="draft">
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index a7a66a3..7ddc8e8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -26,10 +26,8 @@
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Přiložit soubor"</string>
- <!-- no translation found for add_photo_attachment (8548176514426323119) -->
- <skip />
- <!-- no translation found for add_video_attachment (4284457799113546464) -->
- <skip />
+ <string name="add_photo_attachment" msgid="8548176514426323119">"Připojit obrázek"</string>
+ <string name="add_video_attachment" msgid="4284457799113546464">"Připojit video"</string>
<string name="save_draft" msgid="5555744208032445632">"Uložit koncept"</string>
<string name="discard" msgid="1714960202994370243">"Zahodit"</string>
<string name="compose" msgid="1473559896062432878">"Napsat"</string>
@@ -150,8 +148,7 @@
<item quantity="one" msgid="3657821200245019288">"Přesunout konverzaci"</item>
<item quantity="other" msgid="1685896770174368261">"Přesunutí <xliff:g id="ID_1">%1$d</xliff:g> konverzací"</item>
</plurals>
- <!-- no translation found for content_description (175899621885107464) -->
- <skip />
+ <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> dne <xliff:g id="DATE">%3$s</xliff:g> odeslal(a) zprávu <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> – <xliff:g id="ID_2">%s</xliff:g>"</string>
<plurals name="draft">
@@ -205,8 +202,10 @@
<item quantity="one" msgid="7361303622131552596">"Konverzace, které nebyly nahlášeny jako spam: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
<item quantity="other" msgid="2250720080221922267">"Konverzace, které nebyly nahlášeny jako spam: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
</plurals>
- <!-- no translation found for conversation_not_important:one (788387259924027833) -->
- <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+ <plurals name="conversation_not_important">
+ <item quantity="one" msgid="788387259924027833">"Počet konverzací označených jako nedůležité: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
+ <item quantity="other" msgid="6662213740575340397">"Počet konverzací označených jako nedůležité: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
+ </plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"Konverzace nahlášené jako phishing: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
<item quantity="other" msgid="3678624994662639442">"Konverzace nahlášené jako phishing: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
@@ -284,8 +283,7 @@
<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>
<string name="message_saved" msgid="7073947895562277576">"Zpráva byla uložena jako koncept."</string>
- <!-- no translation found for sending_message (2822171587017313151) -->
- <skip />
+ <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>
<string name="show_elided" msgid="5255917904110437886">"▶ Zobrazit citovaný text"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Skrýt citovaný text"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8e0adf7..02d083f 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -26,10 +26,8 @@
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Adjuntar un archivo"</string>
- <!-- no translation found for add_photo_attachment (8548176514426323119) -->
- <skip />
- <!-- no translation found for add_video_attachment (4284457799113546464) -->
- <skip />
+ <string name="add_photo_attachment" msgid="8548176514426323119">"Adjuntar imagen"</string>
+ <string name="add_video_attachment" msgid="4284457799113546464">"Adjuntar video"</string>
<string name="save_draft" msgid="5555744208032445632">"Guardar como borrador"</string>
<string name="discard" msgid="1714960202994370243">"Descartar"</string>
<string name="compose" msgid="1473559896062432878">"Redactar"</string>
@@ -205,8 +203,10 @@
<item quantity="one" msgid="7361303622131552596">"Se marcó <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversación como deseada."</item>
<item quantity="other" msgid="2250720080221922267">"Se marcaron <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversaciones como deseadas."</item>
</plurals>
- <!-- no translation found for conversation_not_important:one (788387259924027833) -->
- <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+ <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>
+ </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>
<item quantity="other" msgid="3678624994662639442">"Se marcaron <b><xliff:g id="COUNT">%1$d</xliff:g></b> conversaciones como suplantación de identidad."</item>
@@ -284,8 +284,7 @@
<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>
<string name="message_saved" msgid="7073947895562277576">"Mensaje guardado como borrador"</string>
- <!-- no translation found for sending_message (2822171587017313151) -->
- <skip />
+ <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-fa/strings.xml b/res/values-fa/strings.xml
index d751c44..9034218 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -148,8 +148,7 @@
<item quantity="one" msgid="3657821200245019288">"انتقال مکالمه"</item>
<item quantity="other" msgid="1685896770174368261">"انتقال <xliff:g id="ID_1">%1$d</xliff:g> مکالمه"</item>
</plurals>
- <!-- no translation found for content_description (175899621885107464) -->
- <skip />
+ <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> <xliff:g id="SUBJECT">%2$s</xliff:g> را در تاریخ <xliff:g id="DATE">%3$s</xliff:g> ارسال کرد"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
<plurals name="draft">
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 883e91b..2aff237 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -26,10 +26,8 @@
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Priloži datoteku"</string>
- <!-- no translation found for add_photo_attachment (8548176514426323119) -->
- <skip />
- <!-- no translation found for add_video_attachment (4284457799113546464) -->
- <skip />
+ <string name="add_photo_attachment" msgid="8548176514426323119">"Priloži sliku"</string>
+ <string name="add_video_attachment" msgid="4284457799113546464">"Priloži videozapis"</string>
<string name="save_draft" msgid="5555744208032445632">"Spremi skicu"</string>
<string name="discard" msgid="1714960202994370243">"Odbaci"</string>
<string name="compose" msgid="1473559896062432878">"Nova poruka"</string>
@@ -205,8 +203,10 @@
<item quantity="one" msgid="7361303622131552596">"Prijavljeno da nije neželjeni sadržaj: <b><xliff:g id="COUNT">%1$d</xliff:g></b>."</item>
<item quantity="other" msgid="2250720080221922267">"Prijavljeno da nije neželjeni sadržaj: <b><xliff:g id="COUNT">%1$d</xliff:g></b>."</item>
</plurals>
- <!-- no translation found for conversation_not_important:one (788387259924027833) -->
- <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+ <plurals name="conversation_not_important">
+ <item quantity="one" msgid="788387259924027833">"Označeno kao nevažno: <b><xliff:g id="COUNT">%1$d</xliff:g></b>."</item>
+ <item quantity="other" msgid="6662213740575340397">"Označeno kao nevažno: <b><xliff:g id="COUNT">%1$d</xliff:g></b>."</item>
+ </plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"Prijavljeno kao krađa identiteta: <b><xliff:g id="COUNT">%1$d</xliff:g></b>."</item>
<item quantity="other" msgid="3678624994662639442">"Prijavljeno kao krađa identiteta: <b><xliff:g id="COUNT">%1$d</xliff:g></b>."</item>
@@ -284,8 +284,7 @@
<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>
<string name="message_saved" msgid="7073947895562277576">"Poruka je spremljena kao skica."</string>
- <!-- no translation found for sending_message (2822171587017313151) -->
- <skip />
+ <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>
<string name="show_elided" msgid="5255917904110437886">"▶ Prikaži citirani tekst"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Sakrij citirani tekst"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0056e6b..b3814b9 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -26,10 +26,8 @@
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"צרף קובץ"</string>
- <!-- no translation found for add_photo_attachment (8548176514426323119) -->
- <skip />
- <!-- no translation found for add_video_attachment (4284457799113546464) -->
- <skip />
+ <string name="add_photo_attachment" msgid="8548176514426323119">"צרף תמונה"</string>
+ <string name="add_video_attachment" msgid="4284457799113546464">"צרף סרטון"</string>
<string name="save_draft" msgid="5555744208032445632">"שמור טיוטה"</string>
<string name="discard" msgid="1714960202994370243">"מחק"</string>
<string name="compose" msgid="1473559896062432878">"כתוב"</string>
@@ -150,8 +148,7 @@
<item quantity="one" msgid="3657821200245019288">"העבר שיחה"</item>
<item quantity="other" msgid="1685896770174368261">"העבר <xliff:g id="ID_1">%1$d</xliff:g> שיחות"</item>
</plurals>
- <!-- no translation found for content_description (175899621885107464) -->
- <skip />
+ <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> שלח את <xliff:g id="SUBJECT">%2$s</xliff:g> בתאריך <xliff:g id="DATE">%3$s</xliff:g>"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
<plurals name="draft">
@@ -205,8 +202,10 @@
<item quantity="one" msgid="7361303622131552596">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> דווחו שאינן דואר זבל."</item>
<item quantity="other" msgid="2250720080221922267">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> דווחו שאינן דואר זבל."</item>
</plurals>
- <!-- no translation found for conversation_not_important:one (788387259924027833) -->
- <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+ <plurals name="conversation_not_important">
+ <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> סומנה כלא חשובה."</item>
+ <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> סומנה כלא חשובה."</item>
+ </plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> דווחו כהתחזות."</item>
<item quantity="other" msgid="3678624994662639442">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> דווחו כהתחזות."</item>
@@ -284,8 +283,7 @@
<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>
<string name="message_saved" msgid="7073947895562277576">"ההודעה נשמרה כטיוטה."</string>
- <!-- no translation found for sending_message (2822171587017313151) -->
- <skip />
+ <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>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 717b336..c515c94 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -150,8 +150,7 @@
<item quantity="one" msgid="3657821200245019288">"Alih perbualan"</item>
<item quantity="other" msgid="1685896770174368261">"Alih <xliff:g id="ID_1">%1$d</xliff:g> perbualan"</item>
</plurals>
- <!-- no translation found for content_description (175899621885107464) -->
- <skip />
+ <string name="content_description" msgid="175899621885107464">"<xliff:g id="SENDER">%1$s</xliff:g> menghantar <xliff:g id="SUBJECT">%2$s</xliff:g> pada <xliff:g id="DATE">%3$s</xliff:g>"</string>
<string name="filtered_tag" msgid="6470627954465675488">"[<xliff:g id="TAG">%1$s</xliff:g>]<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
<string name="subject_and_snippet" msgid="7884124651812798896">"<xliff:g id="ID_1">%s</xliff:g> — <xliff:g id="ID_2">%s</xliff:g>"</string>
<plurals name="draft">
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 8a6515c..596af08 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -26,10 +26,8 @@
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Pripojiť súbor"</string>
- <!-- no translation found for add_photo_attachment (8548176514426323119) -->
- <skip />
- <!-- no translation found for add_video_attachment (4284457799113546464) -->
- <skip />
+ <string name="add_photo_attachment" msgid="8548176514426323119">"Pripojiť obrázok"</string>
+ <string name="add_video_attachment" msgid="4284457799113546464">"Pripojiť video"</string>
<string name="save_draft" msgid="5555744208032445632">"Uložiť koncept"</string>
<string name="discard" msgid="1714960202994370243">"Zahodiť"</string>
<string name="compose" msgid="1473559896062432878">"Napísať správu"</string>
@@ -205,8 +203,10 @@
<item quantity="one" msgid="7361303622131552596">"Počet konverzácií, ktoré boli nahlásené ako Nie je to spam: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
<item quantity="other" msgid="2250720080221922267">"Počet konverzácií, ktoré boli nahlásené ako Nie je to spam: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
</plurals>
- <!-- no translation found for conversation_not_important:one (788387259924027833) -->
- <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+ <plurals name="conversation_not_important">
+ <item quantity="one" msgid="788387259924027833">"Konverzácie boli označené ako nedôležité (počet: <b><xliff:g id="COUNT">%1$d</xliff:g></b>)."</item>
+ <item quantity="other" msgid="6662213740575340397">"Konverzácie boli označené ako nedôležité (počet: <b><xliff:g id="COUNT">%1$d</xliff:g></b>)."</item>
+ </plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"Počet konverzácií nahlásených ako phishing: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
<item quantity="other" msgid="3678624994662639442">"Počet konverzácií nahlásených ako phishing: <b><xliff:g id="COUNT">%1$d</xliff:g></b>"</item>
@@ -284,8 +284,7 @@
<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>
<string name="message_saved" msgid="7073947895562277576">"Správa bola uložená ako koncept."</string>
- <!-- no translation found for sending_message (2822171587017313151) -->
- <skip />
+ <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>
<string name="show_elided" msgid="5255917904110437886">"▶ Zobraziť citovaný text"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Skryť citovaný text"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 75bbd68..daa986e 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -26,10 +26,8 @@
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Приложи датотеку"</string>
- <!-- no translation found for add_photo_attachment (8548176514426323119) -->
- <skip />
- <!-- no translation found for add_video_attachment (4284457799113546464) -->
- <skip />
+ <string name="add_photo_attachment" msgid="8548176514426323119">"Приложи слику"</string>
+ <string name="add_video_attachment" msgid="4284457799113546464">"Приложи видео"</string>
<string name="save_draft" msgid="5555744208032445632">"Сачувај недовршену поруку"</string>
<string name="discard" msgid="1714960202994370243">"Одбаци"</string>
<string name="compose" msgid="1473559896062432878">"Нова порука"</string>
@@ -205,8 +203,10 @@
<item quantity="one" msgid="7361303622131552596">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> преписка је пријављена да није непожељна."</item>
<item quantity="other" msgid="2250720080221922267">"Преписке (<b><xliff:g id="COUNT">%1$d</xliff:g></b>) су пријављене да нису непожељне."</item>
</plurals>
- <!-- no translation found for conversation_not_important:one (788387259924027833) -->
- <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+ <plurals name="conversation_not_important">
+ <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> преписка је означена као неважна."</item>
+ <item quantity="other" msgid="6662213740575340397">"Преписке (<b><xliff:g id="COUNT">%1$d</xliff:g></b>) су означене као неважне."</item>
+ </plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> преписка је пријављена као „пецање“."</item>
<item quantity="other" msgid="3678624994662639442">"Преписке (<b><xliff:g id="COUNT">%1$d</xliff:g></b>) су пријављене као „пецање“."</item>
@@ -284,8 +284,7 @@
<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>
<string name="message_saved" msgid="7073947895562277576">"Порука је сачувана као недовршена."</string>
- <!-- no translation found for sending_message (2822171587017313151) -->
- <skip />
+ <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>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 1646e95..b3c0d6b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -26,10 +26,8 @@
<string name="plus_cc_label" msgid="6986556712069681038">"+"</string>
<string name="plus_bcc_folder" msgid="4756816436930806526">"+"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Dosya ekleyin"</string>
- <!-- no translation found for add_photo_attachment (8548176514426323119) -->
- <skip />
- <!-- no translation found for add_video_attachment (4284457799113546464) -->
- <skip />
+ <string name="add_photo_attachment" msgid="8548176514426323119">"Resim Ekle"</string>
+ <string name="add_video_attachment" msgid="4284457799113546464">"Video Ekle"</string>
<string name="save_draft" msgid="5555744208032445632">"Taslağı kaydet"</string>
<string name="discard" msgid="1714960202994370243">"Sil"</string>
<string name="compose" msgid="1473559896062432878">"E-posta yaz"</string>
@@ -205,8 +203,10 @@
<item quantity="one" msgid="7361303622131552596">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisinin spam olmadığı bildirildi."</item>
<item quantity="other" msgid="2250720080221922267">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisinin spam olmadığı bildirildi."</item>
</plurals>
- <!-- no translation found for conversation_not_important:one (788387259924027833) -->
- <!-- no translation found for conversation_not_important:other (6662213740575340397) -->
+ <plurals name="conversation_not_important">
+ <item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisi önemsiz olarak işaretlendi."</item>
+ <item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisi önemsiz olarak işaretlendi."</item>
+ </plurals>
<plurals name="conversation_phished">
<item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisi kimlik avı olarak bildirildi."</item>
<item quantity="other" msgid="3678624994662639442">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> ileti dizisi kimlik avı olarak bildirildi."</item>
@@ -284,8 +284,7 @@
<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>
<string name="message_saved" msgid="7073947895562277576">"İleti taslak olarak kaydedildi."</string>
- <!-- no translation found for sending_message (2822171587017313151) -->
- <skip />
+ <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>
<string name="show_elided" msgid="5255917904110437886">"▶ Alıntılanan metni göster"</string>
<string name="hide_elided" msgid="8907305605854960737">"▼ Alıntılanan metni gizle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3d8d5a0..f47a967 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -354,7 +354,7 @@
<string name="info" msgid="6009817562073541204">"Інформація"</string>
<string name="report" msgid="5417082746232614958">"Повідомити"</string>
<string name="sync_error" msgid="7368819509040597851">"Не вдалося синхронізувати."</string>
- <string name="sync_error_message" msgid="5367907194753034375">"У вашого пристрою недостатній обсяг пам’яті для синхронізації."</string>
+ <string name="sync_error_message" msgid="5367907194753034375">"У вашому пристрої не вистачає пам’яті для синхронізації."</string>
<string name="storage" msgid="3262760336059073446">"Пам’ять"</string>
<string name="hierarchical_folder_parent_top" msgid="3304098729588424059">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
<string name="hierarchical_folder_parent_top_ellip" msgid="4733427814906262914">"<xliff:g id="TOPLEVELPARENT">%1$s</xliff:g>∕…∕<xliff:g id="PARENT_0">%2$s</xliff:g>∕"</string>
diff --git a/src/com/android/mail/browse/ConversationListFooterView.java b/src/com/android/mail/browse/ConversationListFooterView.java
index 25f0195..0fb7418 100644
--- a/src/com/android/mail/browse/ConversationListFooterView.java
+++ b/src/com/android/mail/browse/ConversationListFooterView.java
@@ -17,8 +17,6 @@
package com.android.mail.browse;
-import android.app.DialogFragment;
-import android.app.FragmentManager;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -32,22 +30,25 @@
import com.android.mail.R;
import com.android.mail.providers.Folder;
import com.android.mail.providers.UIProvider;
-import com.android.mail.ui.AbstractActivityController;
-import com.android.mail.ui.AsyncRefreshTask;
import com.android.mail.ui.ViewMode;
import com.android.mail.utils.Utils;
public class ConversationListFooterView extends LinearLayout implements View.OnClickListener {
+
+ public interface FooterViewClickListener {
+ void onFooterViewErrorActionClick(Folder folder, int errorStatus);
+ void onFooterViewLoadMoreClick(Folder folder);
+ }
+
private View mLoading;
private View mNetworkError;
private View mLoadMore;
private Button mErrorActionButton;
private TextView mErrorText;
- private AsyncRefreshTask mFolderSyncTask;
private Folder mFolder;
private Uri mLoadMoreUri;
private int mErrorStatus;
- private FragmentManager mFragmentManager;
+ private FooterViewClickListener mClickListener;
private boolean mTabletDevice;
// Backgrounds for different states.
private static Drawable sWideBackground;
@@ -71,58 +72,22 @@
mErrorText = (TextView)findViewById(R.id.error_text);
}
- public void setFragmentManager(FragmentManager manager) {
- mFragmentManager = manager;
+ public void setClickListener(FooterViewClickListener listener) {
+ mClickListener = listener;
}
public void onClick(View v) {
- // TODO(pwestbro): use the implementation in the activity controller
int id = v.getId();
Folder f = (Folder) v.getTag();
Uri uri = null;
switch (id) {
case R.id.error_action_button:
- switch (mErrorStatus) {
- case UIProvider.LastSyncResult.CONNECTION_ERROR:
- if (f != null && f.refreshUri != null) {
- uri = f.refreshUri;
- }
- break;
- case UIProvider.LastSyncResult.AUTH_ERROR:
- // TODO - open sign-in page here
- return;
- case UIProvider.LastSyncResult.SECURITY_ERROR:
- return; // Currently we do nothing for security errors.
- case UIProvider.LastSyncResult.STORAGE_ERROR:
- DialogFragment fragment = (DialogFragment)
- mFragmentManager.findFragmentByTag(
- AbstractActivityController.SYNC_ERROR_DIALOG_FRAGMENT_TAG);
- if (fragment == null) {
- fragment = SyncErrorDialogFragment.newInstance();
- }
- fragment.show(mFragmentManager,
- AbstractActivityController.SYNC_ERROR_DIALOG_FRAGMENT_TAG);
- return;
- case UIProvider.LastSyncResult.INTERNAL_ERROR:
- // TODO - open report feedback code
- return;
- default:
- return;
- }
+ mClickListener.onFooterViewErrorActionClick(f, mErrorStatus);
break;
case R.id.load_more:
- if (f != null && f.loadMoreUri != null) {
- uri = f.loadMoreUri;
- }
+ mClickListener.onFooterViewLoadMoreClick(f);
break;
}
- if (uri != null) {
- if (mFolderSyncTask != null) {
- mFolderSyncTask.cancel(true);
- }
- mFolderSyncTask = new AsyncRefreshTask(getContext(), uri);
- mFolderSyncTask.execute();
- }
}
public void setFolder(Folder folder) {
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index cc8736c..ce24a08 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -2421,11 +2421,7 @@
final Uri uri = folder.refreshUri;
if (uri != null) {
- if (mFolderSyncTask != null) {
- mFolderSyncTask.cancel(true);
- }
- mFolderSyncTask = new AsyncRefreshTask(mActivity.getActivityContext(), uri);
- mFolderSyncTask.execute();
+ startAsyncRefreshTask(uri);
}
}
};
@@ -2446,16 +2442,20 @@
return new ActionClickedListener() {
@Override
public void onActionClicked() {
- DialogFragment fragment = (DialogFragment)
- mFragmentManager.findFragmentByTag(SYNC_ERROR_DIALOG_FRAGMENT_TAG);
- if (fragment == null) {
- fragment = SyncErrorDialogFragment.newInstance();
- }
- fragment.show(mFragmentManager, SYNC_ERROR_DIALOG_FRAGMENT_TAG);
+ showStorageErrorDialog();
}
};
}
+ private void showStorageErrorDialog() {
+ DialogFragment fragment = (DialogFragment)
+ mFragmentManager.findFragmentByTag(SYNC_ERROR_DIALOG_FRAGMENT_TAG);
+ if (fragment == null) {
+ fragment = SyncErrorDialogFragment.newInstance();
+ }
+ fragment.show(mFragmentManager, SYNC_ERROR_DIALOG_FRAGMENT_TAG);
+ }
+
private ActionClickedListener getInternalErrorClickedListener() {
return new ActionClickedListener() {
@Override
@@ -2465,4 +2465,49 @@
}
};
}
+
+ @Override
+ public void onFooterViewErrorActionClick(Folder folder, int errorStatus) {
+ Uri uri = null;
+ switch (errorStatus) {
+ case UIProvider.LastSyncResult.CONNECTION_ERROR:
+ if (folder != null && folder.refreshUri != null) {
+ uri = folder.refreshUri;
+ }
+ break;
+ case UIProvider.LastSyncResult.AUTH_ERROR:
+ // TODO - open sign-in page here
+ return;
+ case UIProvider.LastSyncResult.SECURITY_ERROR:
+ return; // Currently we do nothing for security errors.
+ case UIProvider.LastSyncResult.STORAGE_ERROR:
+ showStorageErrorDialog();
+ return;
+ case UIProvider.LastSyncResult.INTERNAL_ERROR:
+ Utils.sendFeedback(
+ mActivity.getActivityContext(), mAccount, true /* reportingProblem */);
+ return;
+ default:
+ return;
+ }
+
+ if (uri != null) {
+ startAsyncRefreshTask(uri);
+ }
+ }
+
+ @Override
+ public void onFooterViewLoadMoreClick(Folder folder) {
+ if (folder != null && folder.loadMoreUri != null) {
+ startAsyncRefreshTask(folder.loadMoreUri);
+ }
+ }
+
+ private void startAsyncRefreshTask(Uri uri) {
+ if (mFolderSyncTask != null) {
+ mFolderSyncTask.cancel(true);
+ }
+ mFolderSyncTask = new AsyncRefreshTask(mActivity.getActivityContext(), uri);
+ mFolderSyncTask.execute();
+ }
}
diff --git a/src/com/android/mail/ui/ActivityController.java b/src/com/android/mail/ui/ActivityController.java
index 55bc047..524ad76 100644
--- a/src/com/android/mail/ui/ActivityController.java
+++ b/src/com/android/mail/ui/ActivityController.java
@@ -30,6 +30,7 @@
import com.android.mail.ConversationListContext;
import com.android.mail.browse.ConversationCursor.ConversationListener;
+import com.android.mail.browse.ConversationListFooterView;
import com.android.mail.providers.Account;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
@@ -46,7 +47,7 @@
ConversationSetObserver, ConversationListener,
FolderListFragment.FolderListSelectionListener, HelpCallback, UndoListener,
ConversationUpdater, ErrorListener, FolderController, AccountController,
- ConversationPositionTracker.Callbacks{
+ ConversationPositionTracker.Callbacks, ConversationListFooterView.FooterViewClickListener {
// As far as possible, the methods here that correspond to Activity lifecycle have the same name
// as their counterpart in the Activity lifecycle.
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index 05b3998..25c3abc 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -342,6 +342,7 @@
if (conv.position >= startPosition && conv.position <= endPosition) {
mFadeLeaveBehindItems.put(conv.id, mLeaveBehindItem);
}
+ mLeaveBehindItem.commit();
clearLeaveBehind(conv.id);
}
if (!mLastDeletingItems.isEmpty()) {
diff --git a/src/com/android/mail/ui/ControllableActivity.java b/src/com/android/mail/ui/ControllableActivity.java
index 9ad5cab..d4046a6 100644
--- a/src/com/android/mail/ui/ControllableActivity.java
+++ b/src/com/android/mail/ui/ControllableActivity.java
@@ -17,6 +17,7 @@
package com.android.mail.ui;
+import com.android.mail.browse.ConversationListFooterView;
import com.android.mail.providers.Conversation;
import com.android.mail.providers.Folder;
import com.android.mail.ui.ViewMode.ModeChangeListener;
@@ -26,7 +27,8 @@
* able to attach the various view fragments and delegate the method calls between them.
*/
public interface ControllableActivity extends HelpCallback, RestrictedActivity,
- FolderItemView.DropHandler, UndoListener, AnimatedAdapter.Listener {
+ FolderItemView.DropHandler, UndoListener, AnimatedAdapter.Listener,
+ ConversationListFooterView.FooterViewClickListener {
/**
* Returns the ViewMode the activity is updating.
* @see com.android.mail.ui.ViewMode
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index be1f013..6f9922c 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -249,7 +249,7 @@
mFooterView = (ConversationListFooterView) LayoutInflater.from(
mActivity.getActivityContext()).inflate(R.layout.conversation_list_footer_view,
null);
- mFooterView.setFragmentManager(getFragmentManager());
+ mFooterView.setClickListener(mActivity);
mListAdapter = new AnimatedAdapter(mActivity.getApplicationContext(), -1,
getConversationListCursor(), mActivity.getSelectedSet(), mActivity, mListView);
mListAdapter.addFooter(mFooterView);
diff --git a/src/com/android/mail/ui/FolderSelectionActivity.java b/src/com/android/mail/ui/FolderSelectionActivity.java
index 9c7cd80..1843d65 100644
--- a/src/com/android/mail/ui/FolderSelectionActivity.java
+++ b/src/com/android/mail/ui/FolderSelectionActivity.java
@@ -331,4 +331,14 @@
// Unsupported
return null;
}
+
+ @Override
+ public void onFooterViewErrorActionClick(Folder folder, int errorStatus) {
+ // Unsupported
+ }
+
+ @Override
+ public void onFooterViewLoadMoreClick(Folder folder) {
+ // Unsupported
+ }
}
diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index 125c3a4..0418f8d 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java
@@ -413,4 +413,14 @@
public AccountController getAccountController() {
return mController;
}
+
+ @Override
+ public void onFooterViewErrorActionClick(Folder folder, int errorStatus) {
+ mController.onFooterViewErrorActionClick(folder, errorStatus);
+ }
+
+ @Override
+ public void onFooterViewLoadMoreClick(Folder folder) {
+ mController.onFooterViewLoadMoreClick(folder);
+ }
}