Merge "Move support for settings menu to UnifiedEmail" into jb-ub-mail-ur10
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index c001cfd..499231e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -394,8 +394,7 @@
<item msgid="2967059853409454648">"Паказаць архіў і выдаленне"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Архіў і выдаленыя дзеянні"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Усталяваць архіў і выдаліць наладку"\n"(змяненне агульных налад)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Адказаць усім"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Выкарыстоўваць у якасці адказу на паведамленні па змаўчанні"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Перайсцi ў архiў"</string>
@@ -416,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Адкрыць скрыню навігацыі"</string>
<string name="drawer_close" msgid="2764774620737876943">"Закрыць скрыню навігацыі"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Націсніце на малюнак адпраўніка малюнак, каб выбраць размову."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Значок тэчкі"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 2f6ede1..549994e 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -394,8 +394,7 @@
<item msgid="2967059853409454648">"Показване на архивирането и изтриването"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Действия за архивиране и изтриване"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Задаване на предпочитание за архивиране и изтриване"\n"(промяна от общите настройки)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Отговор до всички"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Използване като стандартна опция при отговор на съобщения"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Прекарайте пръст, за да архивирате"</string>
@@ -416,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Отваряне на слоя за навигация"</string>
<string name="drawer_close" msgid="2764774620737876943">"Затваряне на чекмеджето за навигация"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Докоснете изображението на подателя, за да изберете съответната кореспонденция."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Икона на папката"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3bd0d83..6095064 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Po smazání zobrazit starší konverzaci"</item>
<item msgid="2189929276292165301">"Po smazání zobrazit seznam konverzací"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Vymazat schválení obrázků"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vymazat schválení obrázků?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Přestat zobrazovat vložené obrázky od odesílatelů, u kterých jste to dříve povolili."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Obrázky se nebudou zobrazovat automaticky."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Novinky"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odpovědět"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odpovědět všem"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Zobrazit archivaci i smazání"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Akce archivace a smazání"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Nastavení archivace a mazání"\n"(lze změnit v části Obecná nastavení)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Odpovědět všem"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Použít jako výchozí pro odpovědi na zprávy"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Archivace přejetím prstem"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Otevřít navigační složku"</string>
<string name="drawer_close" msgid="2764774620737876943">"Zavřít navigační složku"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Klepnutím na obrázek odesílatele vyberete příslušnou konverzaci."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Ikona složky"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0a35d06..c6d826b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -394,8 +394,7 @@
<item msgid="2967059853409454648">"Vis arkiverede og slettede"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arkiverede og slettede handlinger"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Indstil arkiv, og slet præferencer"\n"(ændring i Generelle indstillinger)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Svar alle"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Brug som standardsvar på meddelelser"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Stryg med fingeren for at arkivere"</string>
@@ -416,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Åbn navigationsskuffen"</string>
<string name="drawer_close" msgid="2764774620737876943">"Luk navigationsskuffen"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Tryk på et afsenderbillede for at vælge den samtale."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Mappeikon"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index cab7a88..61c5393 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Mostrar la conversación más antigua luego de la eliminación"</item>
<item msgid="2189929276292165301">"Mostrar la lista de conversaciones luego de la eliminación"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Borrar aprobaciones de imágenes"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"¿Borrar aprobaciones de imágenes?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Dejar de mostrar imágenes intercaladas de remitentes que permitiste anteriormente"</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Las imágenes no se mostrarán automáticamente."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Novedades"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Responder a todos"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Mostrar archivar y eliminar"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Acciones de archivar y eliminar"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Establecer preferencia para archivar y eliminar"\n"(cambiar desde la configuración general)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Deslizar para archivar"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Abrir panel de navegación"</string>
<string name="drawer_close" msgid="2764774620737876943">"Cerrar panel de navegación"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Toca la imagen de un remitente para seleccionar esa conversación."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Ícono de carpeta"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index f2c8fb8..c306541 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"بعد از حذف مکالمه قدیمیتر را نشان میدهد"</item>
<item msgid="2189929276292165301">"بعد از حذف فهرست مکالمات را نشان میدهد"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"پاک کردن تأییدیههای مربوط به عکس"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"تأییدیههای مربوط به عکس پاک شود؟"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"توقف نمایش تصاویر درون برنامهای از فرستندگانی که قبلاً اجازه داده بودید."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"عکسها به صورت خودکار نشان داده نخواهند شد."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"ویژگی جدید چیست"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"پاسخ"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"پاسخ به همه"</string>
@@ -398,7 +394,7 @@
<item msgid="2967059853409454648">"نمایش بایگانی و حذف"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"عملکردهای بایگانی و حذف"</string>
- <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"تنظیم بایگانی و حذف تنظیمات برگزیده"\n"(تغییر در تنظیمات کلی)"</string>
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"تنظیم تنظیمات برگزیده بایگانی و حذف"\n"(تغییر در تنظیمات کلی)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"پاسخ به همه"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"به عنوان پیشفرض برای پاسخ پیام استفاده شود"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"کشیدن انگشت روی صفحه برای بایگانی کردن"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 72d8977..ad9bc7f 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Näytä vanhempi keskustelu poistamisen jälkeen"</item>
<item msgid="2189929276292165301">"Näytä keskusteluluettelo poistamisen jälkeen"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Tyhjennä kuvien näyttöluvat"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Tyhjennetäänkö kuvien näyttöluvat?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Lopeta upotettujen kuvien näyttäminen aiemmin sallituilta lähettäjiltä."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Kuvia ei näytetä automaattisesti."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Uutuudet"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Vastaa"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Vastaa kaikille"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Näytä arkistointi ja poisto"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arkistointi- ja poistotoiminnot"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Määritä arkistointi/poisto-asetus"\n"(vaihda yleisasetuksissa)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Vastaa kaikille"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Käytä oletuksena vastauksissa"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Arkistoi liu\'uttamalla"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Avaa navigointipalkki"</string>
<string name="drawer_close" msgid="2764774620737876943">"Sulje navigointipalkki"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Valitse keskustelu koskettamalla lähettäjän kuvaa."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Kansiokuvake"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index daa3f5f..f7fcc5e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Afficher les conversations plus anciennes après suppression"</item>
<item msgid="2189929276292165301">"Afficher la liste des conversations après suppression"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Supprimer les autorisations liées aux images"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Supprimer les autorisations liées aux images ?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Les images intégrées ne seront plus affichées pour les expéditeurs que vous aviez autorisés."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Les images ne s\'afficheront pas automatiquement."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Nouveautés"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Répondre"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Répondre à tous"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Afficher les boutons \"Archiver\" et \"Supprimer\""</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Actions d\'archivage et de suppression"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Définir la préférence relative à l\'action d\'archivage et de suppression"\n"(modification dans \"Paramètres généraux\")"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Répondre à tous"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utiliser ce paramètre par défaut pour les réponses"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Faire glisser les éléments pour les archiver"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Ouvrir le panneau de navigation"</string>
<string name="drawer_close" msgid="2764774620737876943">"Fermer le panneau de navigation"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Appuyez sur l\'image d\'un expéditeur pour sélectionner cette conversation."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Icône Dossier"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0014215..df50ceb 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Prikaz starijeg razgovora nakon brisanja"</item>
<item msgid="2189929276292165301">"Prikaz popisa razgovora nakon brisanja"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Brisanje odobrenja za slike"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Želite li izbrisati odobrenja za slike?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Prestani prikazivati slike u tekstu od pošiljatelja koji su prethodno bili dopušteni."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Slike se neće prikazivati automatski."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Što je novo"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odgovori svima"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d90df33..6caf6db 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Tampilkan percakapan lama setelah menghapus"</item>
<item msgid="2189929276292165301">"Tampilkan daftar percakapan setelah menghapus"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Hapus persetujuan gambar"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Hapus persetujuan gambar?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Berhenti menampilkan gambar sebaris dari pengirim yang sebelumnya Anda izinkan."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Gambar tidak akan ditampilkan secara otomatis."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Yang baru"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Balas ke semua"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 41472d8..0584bbe 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -404,7 +404,7 @@
<string name="preference_sender_image_description" msgid="7126493917536558232">"Mostra accanto al nome nell\'elenco di conversazioni"</string>
<string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fai scorrere verso il basso per aggiornare"</string>
<string name="checking_for_mail" msgid="2301797903350897130">"Controllo della posta"</string>
- <string name="empty_trash" msgid="652435297593538512">"Cestino vuoto"</string>
+ <string name="empty_trash" msgid="652435297593538512">"Svuota cestino"</string>
<string name="empty_spam" msgid="6064497180615519589">"Cartella spam vuota"</string>
<string name="empty_trash_dialog_title" msgid="3248644791068595150">"Svuotare il cestino?"</string>
<string name="empty_spam_dialog_title" msgid="8091014690336479280">"Svuotare la cartella spam?"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2631e3f..3338a6f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"削除後に古いスレッドを表示する"</item>
<item msgid="2189929276292165301">"削除後にスレッドリストを表示する"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"写真の許可の取り消し"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"写真の許可を取り消しますか？"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"以前許可した送信者からのインライン画像の表示を停止します。"</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"画像が自動的に表示されることはありません。"</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"新機能"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"返信"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"全員に返信"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b29206d..42792b4 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"삭제 후 이전 대화 표시"</item>
<item msgid="2189929276292165301">"삭제 후 대화 목록 표시"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"이미지 승인 취소"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"이미지 승인을 취소하시겠습니까?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"이전에 이미지 표시를 허용했던 발신자가 보낸 이메일의 이미지를 표시하지 않습니다."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"사진이 자동으로 표시되지 않습니다."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"새로운 기능"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"답장"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"전체답장"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"보관처리 및 삭제 모두 표시"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"보관처리 및 삭제 작업"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"보관 설정 및 환경설정 삭제"\n"(일반 설정에서 변경)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"전체답장"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"메일 답장 시 기본값으로 사용"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"스와이프하여 보관처리"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"내비게이션 폴더 열기"</string>
<string name="drawer_close" msgid="2764774620737876943">"내비게이션 폴더 닫기"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"대화를 선택하려면 발신자 이미지를 터치합니다."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"폴더 아이콘"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 8e44b43..c38c4a3 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Ištrynus rodyti senesnį pokalbį"</item>
<item msgid="2189929276292165301">"Ištrynus rodyti pokalbių sąrašą"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Išvalyti nuotraukų patvirtinimus"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Išvalyti nuotraukų patvirtinimus?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Nebepateikti įterptųjų vaizdų iš anksčiau leistų siuntėjų."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Nuotraukos nebus rodomos automatiškai."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Kas naujo?"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Atsakyti"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Atsakyti visiems"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index cb9adba..70cdeb6 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -361,10 +361,10 @@
<item msgid="732746454445519134">"Rādīt vecāku sarunu pēc dzēšanas"</item>
<item msgid="2189929276292165301">"Rādīt sarunu sarakstu pēc dzēšanas"</item>
</string-array>
- <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Attēlu rādīšanas apstiprinājumu notīrīšana"</string>
- <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vai notīrīt attēlu rādīšanas apstiprinājumus?"</string>
- <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Pārtraukt iekļauto attēlu rādīšanu no sūtītājiem, no kuriem iepriekš tā bija atļauta"</string>
- <string name="sender_whitelist_cleared" msgid="917434007919176024">"Attēli netiks rādīti automātiski."</string>
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Attēlu rādīšanas apstiprinājumu atcelšana"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vai atcelt attēlu rādīšanas apstiprinājumus?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Vairs nerādīt iekļautos attēlus no sūtītājiem, kuriem iepriekš tas bija atļauts"</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Attēli netiks automātiski rādīti."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Jaunumi"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Atbildēt"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Atbildēt visiem"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 6c96686..8e74e37 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Tunjukkan perbualan yang lebih lama selepas memadamkan"</item>
<item msgid="2189929276292165301">"Tunjukkan senarai perbualan selepas memadamkan"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Padam bersih kebenaran gambar"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Padam bersih kebenaran gambar?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Berhenti memaparkan imej sebaris daripada penghantar yang anda benarkan sebelum ini."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Gambar tidak akan ditunjukkan secara automatik."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Apa yang baharu"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Balas"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Balas kepada semua"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Tunjukkan arkib & padam"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arkib & padam tindakan"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Tetapkan arkib & padam pilihan"\n"(tukar dalam tetapan Umum)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Balas kepada semua"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gunakan sebagai tetapan lalai untuk balasan mesej"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Leret untuk mengarkib"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
<string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Sentuh imej penghantar untuk memilih perbualan itu."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Ikon folder"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 09830f1..2466908 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Vis eldre samtaler etter du har slettet"</item>
<item msgid="2189929276292165301">"Vis samtaleliste etter du har slettet"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Fjern bildegodkjenninger"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vil du fjerne bildegodkjenninger?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Slutt å vise innebygde bilder fra avsendere du tidligere har godkjent."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Bilder vises ikke automatisk."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Dette er nytt"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Svar"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Svar alle"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 145a265..236e09d 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -394,8 +394,7 @@
<item msgid="2967059853409454648">"Mostrar arquivar e eliminar"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arquivar e eliminar ações"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Definir preferência de arquivar e eliminar"\n"(alterar nas Definições gerais)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilizar como predefinição para respostas a mensagens"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Deslize rapidamente para arquivar"</string>
@@ -416,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Abrir separador de navegação"</string>
<string name="drawer_close" msgid="2764774620737876943">"Fechar separador de navegação"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Toque numa imagem de remetente para selecionar essa conversa."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Ícone de pasta"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 2ca5d72..3a2fbde 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -363,7 +363,7 @@
</string-array>
<string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Limpar aprovações de fotos"</string>
<string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Limpar aprovações de fotos?"</string>
- <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Não mostrar mais imagens in-line de remetentes que você autorizou anteriormente."</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Não mostrar mais imagens inline de remetentes que você autorizou anteriormente."</string>
<string name="sender_whitelist_cleared" msgid="917434007919176024">"As imagens não serão exibidas automaticamente."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"O que há de novo"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Responder"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 08bf770..537c29a 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Afişaţi conversaţia mai veche după ce ştergeţi"</item>
<item msgid="2189929276292165301">"Afişaţi lista de conversaţii după ce ştergeţi"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Ștergeți aprobările pentru imagini"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Ștergeți aprobările pentru imagini?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Nu mai afișați imaginile inline de la expeditori acceptați anterior."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Imaginile nu vor fi afișate în mod automat."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Ce este nou"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Răspundeți"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Răspundeți tuturor"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Afișați opțiunile Arhivați și Ștergeți"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arhivați și Ștergeți"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Setați preferințele pentru arhivare și ștergere"\n"(modificați din Setări generale)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Răspundeți tuturor"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilizați ca setare prestabilită pentru răspunsurile la mesaje"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Glisați pentru a arhiva"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Deschideți panoul de navigare"</string>
<string name="drawer_close" msgid="2764774620737876943">"Închideți panoul de navigare"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Atingeți imaginea unui expeditor pentru a selecta respectiva conversație."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Pictogramă dosar"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5a7c073..3ee15b9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Показывать более раннюю цепочку после удаления текущей"</item>
<item msgid="2189929276292165301">"Показывать список цепочек после удаления текущей цепочки"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Запретить показ изображений"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Запретить показ изображений?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Изображения от ранее одобренных отправителей показываться не будут."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Автоматический показ изображений отключен."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Что нового"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Ответить"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Ответить всем"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Архивировать или удалять"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Архивация и удаление"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Настройки архивации и удаления"\n"(в разделе \"Общие\")"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Отвечать всем"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Использовать по умолчанию для всех ответов"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Быстрая архивация"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Открыть панель навигации"</string>
<string name="drawer_close" msgid="2764774620737876943">"Закрыть панель навигации"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Чтобы открыть цепочку писем, нажмите на фото отправителя."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Значок папки"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index adc0d17..2217abe 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Po odstránení zobraziť staršiu konverzáciu"</item>
<item msgid="2189929276292165301">"Po odstránení zobraziť zoznam konverzácií"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Vymazať schválenia obrázkov"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Chcete vymazať schválenia obrázkov?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Zastaví sa zobrazovanie vložených obrázkov od odosielateľov, pre ktorých ste to predtým povolili."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Obrázky sa nebudú zobrazovať automaticky."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Novinky"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odpovedať"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Odpovedať všetkým"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 17e1d57..9ae4c13 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -363,7 +363,7 @@
</string-array>
<string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Izbriši odobritve slik"</string>
<string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Želite izbrisati odobritve slik?"</string>
- <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Nehaj prikazovati slike v sporočilih pošiljateljev, za katere ste to odobrili."</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Prenehanje prikazovanja slik v sporočilih pošiljateljev, za katere ste to v preteklosti odobrili."</string>
<string name="sender_whitelist_cleared" msgid="917434007919176024">"Slike ne bodo samodejno prikazane."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Kaj je novega?"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Odgovori"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 399965e..27e7ea9 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Приказ старије преписке након брисања"</item>
<item msgid="2189929276292165301">"Приказ листе преписки након брисања"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Обриши одобрења за слике"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Желите ли да обришете одобрења за слике?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Престаните да приказујете уметнуте слике пошиљалаца које сте раније одобрили."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Слике неће бити аутоматски приказиване."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Шта је ново"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Одговори"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Одговори свима"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8f27d48..51f318b 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Visa en äldre konversation efter borttagning"</item>
<item msgid="2189929276292165301">"Visa konversationslistan efter borttagning"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Ta bort godkännanden av bilder"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Vill du ta bort godkännanden av bilder?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Sluta visa infogade bilder från avsändare vars bilder du tidigare har godkänt."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Bilder kommer inte att visas automatiskt."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Nyheter"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Svara"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Svara alla"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Visa arkivera och ta bort"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Åtgärderna arkivera och ta bort"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Konfigurera inställningar för arkivering och radering"\n"(ändras i Allmänna inställningar)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Svara alla"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Använd som standard för svar på meddelanden"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Dra om du vill ta bort"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Öppna navigeringsmenyn"</string>
<string name="drawer_close" msgid="2764774620737876943">"Stäng navigeringsmenyn"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Tryck på avsändarens bild om du vill välja den konversationen."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Mappikon"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2ab0659..aff2c26 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -362,8 +362,8 @@
<item msgid="2189929276292165301">"Onyesha orodha ya mazungumzo baada ya kufuta"</item>
</string-array>
<string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Futa uidhinishaji wa picha"</string>
- <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Futa uidhinishaji wa picha?"</string>
- <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Acha kuonyesha picha za mistari ya ndani kutoka kwa watumaji uliowaruhusu hapo awali."</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Ungependa kufuta uidhinishaji wa picha?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Acha kuonyesha picha zinazolingana na maandishi kutoka kwa watumaji uliowaruhusu hapo awali."</string>
<string name="sender_whitelist_cleared" msgid="917434007919176024">"Picha hazitaonyeshwa kiotomatiki."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Nini kipya"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Jibu"</string>
@@ -394,8 +394,7 @@
<item msgid="2967059853409454648">"Onyesha kumbukumbu na futa"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Kuweka kwenye kumbukumbu na kufuta"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Weka kumbukumbu na futa mapendeleo"\n"(badilisha katika mipangilio ya Jumla)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Jibu wote"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Tumia kama chaguo-msingi la majibu ya ujumbe"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Telezesha ili uweke kwenye kumbukumbu"</string>
@@ -416,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Fungua menyu"</string>
<string name="drawer_close" msgid="2764774620737876943">"Funga menyu"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Gusa picha ya mtumaji ili uchague mazungumzo hayo."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Ikoni ya folda"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index d73fb4e..9907515 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"แสดงการสนทนาที่เก่ากว่าหลังจากลบ"</item>
<item msgid="2189929276292165301">"แสดงรายการสนทนาหลังจากลบ"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"ล้างการอนุมัติภาพ"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"ล้างการอนุมัติภาพไหม"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"หยุดการแสดงภาพในบรรทัดจากผู้ส่งที่คุณอนุญาตไว้ก่อนหน้านี้"</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"รูปภาพจะไม่แสดงโดยอัตโนมัติ"</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"มีอะไรใหม่"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"ตอบ"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"ตอบทั้งหมด"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 9196102..cc86cbc 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Magpakita ng mas lumang pag-uusap pagkatapos mong magtanggal"</item>
<item msgid="2189929276292165301">"Ipakita ang listahan ng pag-uusap pagkatapos mong magtanggal"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"I-clear ang mga pag-apruba sa larawan"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"I-clear ang mga pag-apruba sa larawan?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Huminto sa pagpapakita ng mga inline na larawan mula sa mga nagpadalang dati mong pinayagan."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Hindi awtomatikong ipapakita ang mga larawan."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Ano\'ng bago"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Tumugon"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Tumugon sa lahat"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 17b48ca..189ae2a 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Sildikten sonra daha eski ileti dizisini göster"</item>
<item msgid="2189929276292165301">"Sildikten sonra ileti dizisi listesini göster"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Resim onaylarını temizle"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Resim onayları temizlensin mi?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Önceden izin verdiğiniz gönderenlerden gelen satır içi resimleri görüntülemeyi durdur"</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Resimler otomatik olarak gösterilmeyecek."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Yenilikler"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Yanıtla"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Tümünü yanıtla"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"Arşivlemeyi ve silmeyi göster"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arşivleme ve silme işlemleri"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Arşivle ve silme tercihini ayarlayın"\n"(Genel ayarlardan değiştirin)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Yanıtı tüm alıcılara gönder"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"İleti yanıtlarında varsayılan olarak kullan"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Arşivlemek için hızlıca kaydırın"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Gezinme menüsünü aç"</string>
<string name="drawer_close" msgid="2764774620737876943">"Gezinme menüsünü kapat"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"İlgili ileti dizisini seçmek için gönderenin resmine dokunun."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Klasör simgesi"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7d017fe..633eefd 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -361,9 +361,9 @@
<item msgid="732746454445519134">"Показувати старішу бесіду після видалення"</item>
<item msgid="2189929276292165301">"Показувати список бесід після видалення"</item>
</string-array>
- <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Очистити схвалення зображень"</string>
- <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Очистити схвалення зображень?"</string>
- <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Не показувати раніше дозволені вставлені зображення від відправників."</string>
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Очистити дозволи для зображень"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Очистити дозволи для зображень?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Не показувати вставлені зображення від відправників, дозволені раніше."</string>
<string name="sender_whitelist_cleared" msgid="917434007919176024">"Зображення не показуватимуться автоматично."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Новинки"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Відповісти"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8088d66..ab38ab4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"Hiển thị cuộc hội thoại cũ hơn sau khi bạn xóa"</item>
<item msgid="2189929276292165301">"Hiển thị danh sách cuộc hội thoại sau khi bạn xóa"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"Xóa phê duyệt ảnh"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"Xóa phê duyệt ảnh?"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"Dừng hiển thị các hình ảnh nội tuyến từ người gửi bạn đã cho phép trước đó."</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"Hình ảnh sẽ không được tự động hiển thị."</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"Tính năng mới"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"Trả lời"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"Trả lời tất cả"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5900800..4a861c1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"在您执行删除操作后显示较旧的前一个会话"</item>
<item msgid="2189929276292165301">"在您执行删除操作后显示会话列表"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"清除图片显示许可"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"清除图片显示许可？"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"对于您之前允许显示其邮件内嵌图片的发件人，停止显示其邮件内的图片。"</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"图片不会自动显示。"</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"新功能"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"回复"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"全部回复"</string>
@@ -398,8 +394,7 @@
<item msgid="2967059853409454648">"显示归档和删除"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"归档和删除操作"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"设置归档和删除偏好设置"\n"（在“常规”设置中更改）"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"全部回复"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"用作默认的邮件回复方式"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"滑动即可归档"</string>
@@ -420,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航栏"</string>
<string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航栏"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"触摸发件人头像即可选择该会话。"</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"文件夹图标"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 2197cd2..8d49bb6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -361,14 +361,10 @@
<item msgid="732746454445519134">"在刪除動作完成後顯示較舊的會話群組"</item>
<item msgid="2189929276292165301">"在刪除動作完成後顯示會話群組清單"</item>
</string-array>
- <!-- no translation found for clear_display_images_whitelist_title (7120575487854245735) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_title (3190704164490442683) -->
- <skip />
- <!-- no translation found for clear_display_images_whitelist_dialog_message (1169152185612117654) -->
- <skip />
- <!-- no translation found for sender_whitelist_cleared (917434007919176024) -->
- <skip />
+ <string name="clear_display_images_whitelist_title" msgid="7120575487854245735">"取消圖片許可"</string>
+ <string name="clear_display_images_whitelist_dialog_title" msgid="3190704164490442683">"要取消圖片許可嗎？"</string>
+ <string name="clear_display_images_whitelist_dialog_message" msgid="1169152185612117654">"不再顯示先前許可的寄件者寄來的郵件內置圖片。"</string>
+ <string name="sender_whitelist_cleared" msgid="917434007919176024">"系統不會自動顯示圖片。"</string>
<string name="whats_new_dialog_title" msgid="4230806739326698666">"新功能"</string>
<string name="notification_action_reply" msgid="6015299134424685297">"回覆"</string>
<string name="notification_action_reply_all" msgid="20020468410400912">"回覆所有人"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 39a9f13..b9240fe 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -394,8 +394,7 @@
<item msgid="2967059853409454648">"Bonisa ingobo yomlando nokususa"</item>
</string-array>
<string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Izenzo zokufaka kungobo yomlando nokususa"</string>
- <!-- no translation found for prefDialogTitle_removal_action_first_time (2355955859546346363) -->
- <skip />
+ <string name="prefDialogTitle_removal_action_first_time" msgid="2355955859546346363">"Setha ingobo yomlando uphinde ususe okuncamelayo"\n"(shintsha kwizilungiselelo ezijwayelekile)"</string>
<string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Phendula konke"</string>
<string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Sebenzisa njengokuzenzakalelayo kuzimpendulo zomlayezo"</string>
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Swayipha ukuze ufake kungobo yomlando"</string>
@@ -416,6 +415,5 @@
<string name="drawer_open" msgid="6074646853178471940">"Vula ukuzulazula kwekhabethe"</string>
<string name="drawer_close" msgid="2764774620737876943">"Vala ukuzulazula kwekhabethe"</string>
<string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Thinta isithombe somthumeli ukuze ukhethe ingxoxo."</string>
- <!-- no translation found for folder_icon_desc (1500547397347480618) -->
- <skip />
+ <string name="folder_icon_desc" msgid="1500547397347480618">"Isithonjana sefolda"</string>
</resources>
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 346b645..8e09513 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -579,6 +579,7 @@
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
startTimer(PERF_TAG_LAYOUT);
+ Utils.traceBeginSection("CIVC.layout");
super.onLayout(changed, left, top, right, bottom);
@@ -599,6 +600,7 @@
sTimer = new Timer();
sLayoutCount = 0;
}
+ Utils.traceEndSection();
}
private void setContentDescription() {
@@ -633,7 +635,7 @@
updateBackground(isUnread);
mHeader.sendersDisplayText = new SpannableStringBuilder();
- mHeader.styledSendersString = new SpannableStringBuilder();
+ mHeader.styledSendersString = null;
// Parse senders fragments.
if (mHeader.conversation.conversationInfo != null) {
@@ -782,7 +784,7 @@
private void createSubject(final boolean isUnread) {
final String subject = filterTag(mHeader.conversation.subject);
final String snippet = mHeader.conversation.getSnippet();
- final SpannableStringBuilder displayedStringBuilder = new SpannableStringBuilder(
+ final Spannable displayedStringBuilder = new SpannableString(
Conversation.getSubjectAndSnippetForDisplay(mContext, subject, snippet));
// since spans affect text metrics, add spans to the string before measure/layout or fancy
@@ -1088,6 +1090,7 @@
@Override
protected void onDraw(Canvas canvas) {
+ Utils.traceBeginSection("CIVC.draw");
// Contact photo
if (mGadgetMode == ConversationItemViewCoordinates.GADGET_CONTACT_PHOTO) {
canvas.save();
@@ -1190,6 +1193,7 @@
final int y = (getHeight() - VISIBLE_CONVERSATION_CARET.getHeight()) / 2;
canvas.drawBitmap(VISIBLE_CONVERSATION_CARET, x, y, null);
}
+ Utils.traceEndSection();
}
private void drawContactImages(Canvas canvas) {
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index ce7dced..a6c02ac 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -48,6 +48,7 @@
import com.android.mail.ui.SwipeableListView.ListItemsRemovedListener;
import com.android.mail.utils.LogTag;
import com.android.mail.utils.LogUtils;
+import com.android.mail.utils.Utils;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
@@ -460,6 +461,8 @@
return specialView;
}
+ Utils.traceBeginSection("AA.getView");
+
final ConversationCursor cursor = (ConversationCursor) getItem(position);
final Conversation conv = cursor.getConversation();
@@ -511,8 +514,10 @@
} else if (convertView != null) {
((SwipeableConversationItemView) convertView).reset();
}
- return createConversationItemView((SwipeableConversationItemView) convertView, mContext,
- conv);
+ final View v = createConversationItemView((SwipeableConversationItemView) convertView,
+ mContext, conv);
+ Utils.traceEndSection();
+ return v;
}
private boolean hasLeaveBehinds() {