Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur9

commit: d60971398fbf6f485a2eabd377129b94edb364ea [log] [tgz]
author: Baligh Uddin <baligh@google.com> Sat May 04 23:47:35 2013 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Sat May 04 23:47:36 2013 +0000
tree: d595ed0974f13d5369a41b45a0ff95a29f25e0b0
parent: d4796d78b3d6994d77edaf91b176fc3c79bb7362 [diff]
parent: 25a3150d2eeb2c600418c1e2984b40fff68b32cc [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 7af1247..115ad8e 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Stuur tans..."</string>
     <string name="send_failed" msgid="750908595144529579">"Boodskap is nie gestuur nie."</string>
     <string name="me" msgid="6480762904022198669">"ek"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Wys alle vouers"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Inkassie"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vee hierdie gesprek uit?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gebruik as verstek vir antwoorde op boodskappe"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Sleep om te verwyder"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In gespreklys"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Trek af om te verfris"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kyk tans vir pos"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Maak asblik leeg"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Maak strooipos leeg"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Maak asblik leeg?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Maak strooipos leeg?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> boodskap sal permanent uitgevee word."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> boodskappe sal permanent uitgevee word."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Maak navigasielaai oop"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Maak navigasielaai toe"</string>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index ebc2b58..d6fe6d4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -121,7 +121,7 @@
     <string name="attachment_type_blocked" msgid="7878184764428642891">"የአጋጣሚ ነገር ሆኖ የዚህ አይነት አባሪ ማስቀመጥ ወይም መክፈት አትችልም።"</string>
     <string name="no_application_found" msgid="1945184804521392093">"ይህንን አባሪ ለማየት ምንም መተግበሪያ ሊከፍት አይችልም።"</string>
     <string name="fetching_attachment" msgid="2599763030649526179">"አባሪ በመፈለግ ላይ"</string>
-    <string name="please_wait" msgid="8797634225088247121">"እባክህ ጠብቅ…"</string>
+    <string name="please_wait" msgid="8797634225088247121">"እባክዎ ይጠብቁ…"</string>
     <string name="saved" msgid="6660844285730790469">"ተቀምጧል፣ <xliff:g id="SIZE">%s</xliff:g>"</string>
     <string name="download_failed" msgid="442019281547315527">"ማውረድ አልተቻለም። ዳግም ለመሞከር ይንኩ።"</string>
     <string name="attachments_header" msgid="6459475590011460229">"ተያያዦች"</string>
@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"በመላክ ላይ…"</string>
     <string name="send_failed" msgid="750908595144529579">"መልዕክት አልተላከም።"</string>
     <string name="me" msgid="6480762904022198669">"እኔ"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"ሁሉንም አቃፊዎች አሳይ"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"ገቢ መልዕክት ሳጥን"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"ይሄ ውይይት ይሰረዝ?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ለመልዕክት ምላሾች እንደ ነባሪ ይጠቀሙ"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"ለማስወገድ ያንሸራትቱ"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"በውይይት ዝርዝር ውስጥ"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"ለማደስ ወደ ታች ያንሸራትቱ"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"መልዕክት በማየት ላይ"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"መጣያውን አጽዳ"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"አይፈለጌ መልዕክትን አጽዳ"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"መጣያውን ይጽዳ?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"አይፈለጌ መልዕክት ይጽዳ?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> መልዕክት እስከመጨረሻው ይሰረዛል።"</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> መልዕክቶች እስከመጨረሻው ይሰረዛሉ።"</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"የአሰሳ መሣቢያውን ክፈት"</string>
     <string name="drawer_close" msgid="2764774620737876943">"የአሰሳ መሣቢያውን ዝጋ"</string>
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index bbcd0af..c6d07d6 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"جارٍ الإرسال…"</string>
     <string name="send_failed" msgid="750908595144529579">"لم يتم إرسال الرسالة."</string>
     <string name="me" msgid="6480762904022198669">"أنا"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"عرض جميع المجلدات"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"البريد الوارد"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"هل تريد حذف هذه المحادثة؟"</item>
@@ -393,18 +392,18 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"الاستخدام كافتراضي مع ردود الرسائل"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"تمرير سريع للإزالة"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"في قائمة المحادثات"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"التمرير لأسفل للتحديث"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"التحقق من وجود بريد"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"إفراغ المهملات"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"إفراغ مجلد الرسائل غير المرغوب فيها"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"هل تريد إفراغ المهملات؟"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"هل تريد إفراغ مجلد الرسائل غير المرغوب فيها؟"</string>
+    <!-- no translation found for empty_folder_dialog_message:one (7530191630810420066) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2182899395748020953) -->
     <string name="drawer_open" msgid="6074646853178471940">"فتح ساحب التنقل"</string>
     <string name="drawer_close" msgid="2764774620737876943">"إغلاق ساحب التنقل"</string>
 </resources>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0df0b1e..e67bd4a 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Адпраўка..."</string>
     <string name="send_failed" msgid="750908595144529579">"Паведамленне не адпраўлена."</string>
     <string name="me" msgid="6480762904022198669">"я"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Паказаць усе тэчкі"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Уваходныя"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Выдаліць размову?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Выкарыстоўваць у якасці адказу на паведамленні па змаўчанні"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Правядзіце, каб выдалiць"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"У спісе гутарак"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Правядзіце ўніз, каб абнавіць"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Праверка пошты"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Ачысціць кошык"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Выдаліць спам"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Ачысціць кошык?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Выдаліць спам?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"Гэта паведамленне (<xliff:g id="COUNT">%1$d</xliff:g>) будзе выдалена назаўсёды."</item>
+    <item quantity="other" msgid="2182899395748020953">"Гэтыя паведамленні (<xliff:g id="COUNT">%1$d</xliff:g>) будуць выдалены назаўсёды."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Адкрыць скрыню навігацыі"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Закрыць скрыню навігацыі"</string>
 </resources>

diff --git a/res/values-bg-sw600dp/strings.xml b/res/values-bg-sw600dp/strings.xml
index 1c9a6e3..8cc9a41 100644
--- a/res/values-bg-sw600dp/strings.xml
+++ b/res/values-bg-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Як/Ск"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Ск"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Управление на папките"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Използване като стандартна опция за отговори на известия за съобщения"</string>
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index e327de2..5d6fc47 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Промяна на папките"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Преместване във:"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Настройки за папките"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Възст. на авт. оразмеряв."</string>
     <string name="message_modified" msgid="2564340197585393687">"(Това съобщение е променено от оригиналната си версия, за да се побере на екрана.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Още"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Изпраща се…"</string>
     <string name="send_failed" msgid="750908595144529579">"Съобщ. не бе изпратено."</string>
     <string name="me" msgid="6480762904022198669">"аз"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Показване на всички папки"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Вх. поща"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Да се изтрие ли тази кореспонденция?"</item>
     <item quantity="other" msgid="930334208937121234">"Да се изтрият ли тези <xliff:g id="COUNT">%1$d</xliff:g> кореспонденции?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Тих режим"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действие при премахване"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Архивиране на кореспонденции"</item>
+    <item msgid="1894624633891654411">"Изтриване на кореспонденции"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Архивиране вместо изтриване на кореспонденциите"</item>
+    <item msgid="6515786566522105643">"Изтриване вместо архивиране на кореспонденциите"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Действие при премахване"</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" msgid="807579971507624260">"Прекарайте пръст, за да премахнете"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"В списък с кореспонденции"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Прекарайте пръст надолу, за да опресните"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверява се за поща"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Изчистване на кошчето"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Изчистване на нежеланата поща"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Да се изчисти ли кошчето?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Да се изчисти ли нежеланата поща?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> съобщение ще бъде изтрито за постоянно."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> съобщения ще бъдат изтрити за постоянно."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Отваряне на слоя за навигация"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Затваряне на чекмеджето за навигация"</string>
 </resources>

diff --git a/res/values-ca-sw600dp/strings.xml b/res/values-ca-sw600dp/strings.xml
index cb21889..f50dfba 100644
--- a/res/values-ca-sw600dp/strings.xml
+++ b/res/values-ca-sw600dp/strings.xml

@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Cco"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Cco"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Gestiona les carpetes"</string>
-    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Fes servir com a predeterminat per a les respostes de les notificacions de missatge"</string>
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Utilitza com a predeterminada  per respondre notificacions de missatge"</string>
 </resources>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 6e27d6b..1dec827 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -76,7 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Canvia les carpetes"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Mou a"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Configuració de la carpeta"</string>
-    <string name="menu_show_original" msgid="4227060689700765828">"Reverteix a mida automàt."</string>
+    <string name="menu_show_original" msgid="4227060689700765828">"Reverteix a mida orginal"</string>
     <string name="message_modified" msgid="2564340197585393687">"(La versió original d\'aquest missatge s\'ha modificat perquè s\'adapti a la pantalla.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Carpetes"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Més"</string>
@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"S\'està enviant…"</string>
     <string name="send_failed" msgid="750908595144529579">"No s\'ha enviat el missatge."</string>
     <string name="me" msgid="6480762904022198669">"jo"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Mostra totes les carpetes"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Safata d\'entrada"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vols suprimir aquesta conversa?"</item>
@@ -390,9 +389,13 @@
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Suprimeix l\'acció"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Respon a tots"</string>
-    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilitza com a valor predeterminat per a les respostes a missatges"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilitza com predeterminada per respondre els missatges"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Fes lliscar el dit per suprimir"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"A la llista de converses"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fes lliscar el dit cap avall per actualitzar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"S\'està comprovant si hi ha correu."</string>
     <string name="empty_trash" msgid="652435297593538512">"Buida la paperera"</string>
@@ -400,8 +403,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vols buidar la paperera?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vols buidar el correu brossa?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Aquest missatge (<xliff:g id="COUNT">%1$d</xliff:g>) se suprimirà permanentment."</item>
-    <item quantity="other" msgid="2473439906075355840">"Aquests <xliff:g id="COUNT">%1$d</xliff:g> missatges se suprimiran permanentment."</item>
+    <item quantity="one" msgid="7530191630810420066">"Se suprimirà <xliff:g id="COUNT">%1$d</xliff:g> missatge de manera permanent."</item>
+    <item quantity="other" msgid="2182899395748020953">"Se suprimiran <xliff:g id="COUNT">%1$d</xliff:g> missatges de manera permanent."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Obre el calaix de navegació"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tanca el calaix de navegació"</string>

diff --git a/res/values-cs-sw600dp/strings.xml b/res/values-cs-sw600dp/strings.xml
index 5417f66..8140e83 100644
--- a/res/values-cs-sw600dp/strings.xml
+++ b/res/values-cs-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kopie/skrytá"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skrytá kopie"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Správa složek"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Použít jako výchozí pro odpovědi na oznámení zpráv"</string>
 </resources>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3f9781a..4c5471a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Změnit složky"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Přesunout do"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Nastavení složek"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Původní velikost"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Zpráva byla oproti původní verzi upravena tak, aby se vešla na tuto obrazovku.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Složky"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Další"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Odesílání..."</string>
     <string name="send_failed" msgid="750908595144529579">"Zpráva nebyla odeslána."</string>
     <string name="me" msgid="6480762904022198669">"já"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Zobrazit všechny složky"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Doručená pošta"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Smazat tuto konverzaci?"</item>
     <item quantity="other" msgid="930334208937121234">"Smazat tyto konverzace (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akce odstranění"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archivovat konverzace"</item>
+    <item msgid="1894624633891654411">"Smazat konverzace"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Konverzace nemazat, pouze je archivovat"</item>
+    <item msgid="6515786566522105643">"Konverzace mazat, a nikoliv archivovat"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Odebrat akci"</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" msgid="807579971507624260">"Přejetím prstem odstranit"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"V seznamu konverzací"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Seznam aktualizujete posunutím dolů."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Vysypat koš"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Vyprázdnit složku se spamem"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Chcete vysypat koš?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Chcete vyprázdnit složku se spamem?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"Tato <xliff:g id="COUNT">%1$d</xliff:g> zpráva bude trvale smazána."</item>
+    <item quantity="other" msgid="2182899395748020953">"Tyto zprávy (celkem <xliff:g id="COUNT">%1$d</xliff:g>) budou trvale smazány."</item>
+  </plurals>
     <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>
 </resources>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 07ad570..bfff844 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Sender…"</string>
     <string name="send_failed" msgid="750908595144529579">"Besked ikke sendt."</string>
     <string name="me" msgid="6480762904022198669">"mig"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Indbakke"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtale?"</item>
@@ -393,6 +392,10 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Brug som standardsvar på meddelelser"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Stryg med fingeren for at fjerne"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"På samtaleliste"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Stryg ned for at opdatere"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tjekker for e-mails"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tøm papirkurv"</string>
@@ -400,8 +403,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Skal papirkurven tømmes?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Skal spammappen tømmes?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Denne <xliff:g id="COUNT">%1$d</xliff:g> meddelelse vil blive slettet permanent."</item>
-    <item quantity="other" msgid="2473439906075355840">"Disse <xliff:g id="COUNT">%1$d</xliff:g> meddelelser vil blive slettet permanent."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> meddelelse vil blive slettet permanent."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> meddelelser vil blive slettet permanent."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Åbn navigationsskuffen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Luk navigationsskuffen"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 127044f..4f212e5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Senden..."</string>
     <string name="send_failed" msgid="750908595144529579">"Nicht gesendet"</string>
     <string name="me" msgid="6480762904022198669">"Mich"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Alle Ordner anzeigen"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Posteingang"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Diese Konversation löschen?"</item>
@@ -393,6 +392,8 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Als Standard für Antworten verwenden"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Zum Entfernen wischen"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In einer Unterhaltungsliste"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Bild des Absenders"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Neben Namen in der Konversationsliste anzeigen"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Zum Aktualisieren nach unten wischen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Nachrichten werden abgerufen..."</string>
     <string name="empty_trash" msgid="652435297593538512">"Papierkorb leeren"</string>
@@ -400,8 +401,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Papierkorb leeren?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Spam-Ordner leeren?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Nachricht wird endgültig gelöscht."</item>
-    <item quantity="other" msgid="2473439906075355840">"Diese <xliff:g id="COUNT">%1$d</xliff:g> Nachrichten werden endgültig gelöscht."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> Nachricht wird endgültig gelöscht."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> Nachrichten werden endgültig gelöscht."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Navigationsleiste öffnen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigationsleiste schließen"</string>

diff --git a/res/values-el-sw600dp/strings.xml b/res/values-el-sw600dp/strings.xml
index 13f36be..e8af7b1 100644
--- a/res/values-el-sw600dp/strings.xml
+++ b/res/values-el-sw600dp/strings.xml

@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Κοιν./Κρ.κοιν."</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Κρυφή κοιν."</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Διαχείριση φακέλων"</string>
-    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Χρήση ως προεπιλογής για απαντήσεις σε ειδοποιήσεις μηνυμάτων"</string>
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Χρήση ως προεπιλογή για απαντήσεις σε ειδοποιήσεις μηνυμάτων"</string>
 </resources>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index c37c792..d65fcb3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Γίνεται αποστολή…"</string>
     <string name="send_failed" msgid="750908595144529579">"Μήνυμα δεν εστάλη."</string>
     <string name="me" msgid="6480762904022198669">"εγώ"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Εμφάνιση όλων των φακέλων"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Εισερχόμενα"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Να διαγραφεί αυτή η συνομιλία;"</item>
@@ -390,9 +389,11 @@
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Κατάργηση ενέργειας"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Απάντηση σε όλους"</string>
-    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Χρήση ως προεπιλογής για απαντήσεις μηνυμάτων"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Χρήση ως προεπιλογή για απαντήσεις μηνυμάτων"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Σύρετε για να καταργήσετε"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Στη λίστα συνομιλιών"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Εικόνα αποστολέα"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Εμφάνιση δίπλα στο όνομα στη λίστα συνομιλιών"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Σύρετε προς τα κάτω για ανανέωση"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Γίνεται έλεγχος για αλληλογραφία"</string>
     <string name="empty_trash" msgid="652435297593538512">"Άδειασμα κάδου απορριμάτων"</string>
@@ -400,8 +401,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Άδειασμα κάδου απορριμάτων;"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Άδειασμα ανεπιθύμητων μηνυμάτων;"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Αυτό το μήνυμα <xliff:g id="COUNT">%1$d</xliff:g> θα διαγραφεί οριστικά."</item>
-    <item quantity="other" msgid="2473439906075355840">"Αυτά τα μηνύματα <xliff:g id="COUNT">%1$d</xliff:g> θα διαγραφούν οριστικά."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> μήνυμα θα διαγραφεί οριστικά."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> μηνύματα θα διαγραφούν οριστικά."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Άνοιγμα συρταριού πλοήγησης"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Κλείσιμο συρταριού πλοήγησης"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 36d408d..131c705 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Sending…"</string>
     <string name="send_failed" msgid="750908595144529579">"Message wasn\'t sent."</string>
     <string name="me" msgid="6480762904022198669">"me"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Show all folders"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Inbox"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Delete this conversation?"</item>
@@ -393,6 +392,8 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Use as default for message replies"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Swipe to remove"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In conversation list"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Sender image"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Show beside name in conversation list"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swipe down to refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Checking for mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Empty Trash"</string>
@@ -400,8 +401,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Empty Trash?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Empty Spam?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"This <xliff:g id="COUNT">%1$d</xliff:g> message will be permanently deleted."</item>
-    <item quantity="other" msgid="2473439906075355840">"These <xliff:g id="COUNT">%1$d</xliff:g> messages will be permanently deleted."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> message will be permanently deleted."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> messages will be permanently deleted."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Open navigation drawer"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Close navigation drawer"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index c926cd0..6b4e637 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Enviando..."</string>
     <string name="send_failed" msgid="750908595144529579">"No se envió el mensaje."</string>
     <string name="me" msgid="6480762904022198669">"yo"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Recibidos"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"¿Deseas eliminar esta conversación?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"En lista de conversaciones"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Desliza el dedo hacia abajo para actualizar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico…"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Vaciar papelera"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Vaciar carpeta de spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"¿Vaciar papelera?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"¿Vaciar carpeta de spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje se eliminará de forma permanente."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes se eliminarán de forma permanente."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Abrir panel de navegación"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Cerrar panel de navegación"</string>
 </resources>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 5bca6b5..ec4e821 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Enviando..."</string>
     <string name="send_failed" msgid="750908595144529579">"No se ha enviado el mensaje."</string>
     <string name="me" msgid="6480762904022198669">"yo"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas las carpetas"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Bandeja de entrada"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"¿Eliminar esta conversación?"</item>
@@ -393,18 +392,18 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"En la lista de conversaciones"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Imagen del remitente"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostrar junto al nombre en la lista de conversaciones"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslizar hacia abajo para actualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Buscando correo electrónico..."</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Vaciar papelera"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Vaciar carpeta de spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"¿Vaciar papelera?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"¿Vaciar carpeta de spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> mensaje se eliminará de forma permanente."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes se eliminarán de forma permanente."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Abrir control de navegación"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Cerrar control de navegación"</string>
 </resources>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index bb93ebb..2c0b040 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Saatmine ..."</string>
     <string name="send_failed" msgid="750908595144529579">"Sõnumit ei saadetud."</string>
     <string name="me" msgid="6480762904022198669">"mina"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Kuva kõik kaustad"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Postkast"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Kas kustutada see meilivestlus?"</item>
@@ -385,26 +384,26 @@
     <item msgid="1894624633891654411">"Kustuta vestlused"</item>
   </string-array>
   <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Kustutamise asemel arhiivite vestlused"</item>
-    <item msgid="6515786566522105643">"Arhiivimise asemel kustutate vestlused"</item>
+    <item msgid="6388312490146989386">"Kustutamise asemel arhiivite meilivestlused"</item>
+    <item msgid="6515786566522105643">"Arhiivimise asemel kustutate meilivestlused"</item>
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eemalda toiming"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Vasta kõigile"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Kasuta vaikeseadena sõnumitele vastamisel"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Pühkige eemaldamiseks"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Meilivestluste loendis"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Saatja pilt"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Kuvatakse vestluste loendis nime kõrval"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Värskendamiseks pühkige alla"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-posti kontrollimine"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Tühjenda prügikast"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Tühjenda rämpspostikaust"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Kas tühjendada prügikast?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Kas tühjendada rämpspostikaust?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> sõnum kustutatakse jäädavalt."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> sõnumit kustutatakse jäädavalt."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Ava navigeerimissahtel"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Sule navigeerimissahtel"</string>
 </resources>

diff --git a/res/values-fa-sw600dp/strings.xml b/res/values-fa-sw600dp/strings.xml
index 12c4b26..0bdb119 100644
--- a/res/values-fa-sw600dp/strings.xml
+++ b/res/values-fa-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ گیرندهٔ کپی/گیرنده مخفی"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ گیرنده مخفی"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"مدیریت پوشه‌ها"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"به عنوان پیش‌فرض برای پاسخ به اعلان‌های پیام استفاده شود"</string>
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 551163c..cd25269 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"تغییر پوشه‌ها"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"انتقال به"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"تنظیمات پوشه"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"برگرداندن اندازه خودکار"</string>
     <string name="message_modified" msgid="2564340197585393687">"(نسخه اصلی این پیام برای اندازه شدن در این صفحه تغییر داده شده است.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"پوشه‌ها"</string>
     <string name="folder_list_more" msgid="537172187223133825">"بیشتر"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"در حال ارسال..."</string>
     <string name="send_failed" msgid="750908595144529579">"پیام ارسال نشد."</string>
     <string name="me" msgid="6480762904022198669">"من"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"نمایش همه پوشه‌ها"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"صندوق ورودی"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"این مکالمه حذف شود؟"</item>
     <item quantity="other" msgid="930334208937121234">"این <xliff:g id="COUNT">%1$d</xliff:g> مکالمه حذف شوند؟"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"بیصدا"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"عملکرد حذف"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"بایگانی کردن مکالمات"</item>
+    <item msgid="1894624633891654411">"حذف مکالمات"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"مکالمات به جای حذف شدن بایگانی شوند"</item>
+    <item msgid="6515786566522105643">"مکالمات به جای بایگانی شدن حذف شوند"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"عملکرد حذف"</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" msgid="807579971507624260">"برای حذف انگشت خود را روی صفحه بکشید"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"در لیست مکالمه"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"برای بازخوانی، صفحه را با انگشت به سمت پایین بکشید"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"در حال بررسی برای ایمیل"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"خالی کردن پوشه حذف‌ شده‌ها"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"خالی کردن پوشه هرزنامه"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"خالی کردن پوشه حذف‌ شده‌ها؟"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"خالی کردن پوشه هرزنامه؟"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> پیام به طور دائم حذف خواهد شد."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> پیام به طور دائم حذف خواهند شد."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"باز کردن کشوی پیمایش"</string>
     <string name="drawer_close" msgid="2764774620737876943">"بستن کشوی پیمایش"</string>
 </resources>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b1590d0..5d79e58 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Lähetetään…"</string>
     <string name="send_failed" msgid="750908595144529579">"Viestiä ei lähetetty."</string>
     <string name="me" msgid="6480762904022198669">"minä"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Näytä kaikki kansiot"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Postilaatikko"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Poistetaanko tämä keskustelu?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Käytä oletuksena vastauksissa"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Poista liu\'uttamalla sormea"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Keskusteluluettelossa"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Päivitä liu\'uttamalla alas"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tarkistetaan sähköposteja"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Tyhjennä roskakori"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Tyhjennä roskaposti"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Tyhjennetäänkö roskakori?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Tyhjennetäänkö roskaposti?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> viesti poistetaan pysyvästi."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> viestiä poistetaan pysyvästi."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Avaa navigointipalkki"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Sulje navigointipalkki"</string>
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8e05721..9b5c886 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Envoi en cours…"</string>
     <string name="send_failed" msgid="750908595144529579">"Échec de l\'envoi."</string>
     <string name="me" msgid="6480762904022198669">"moi"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Afficher tous les dossiers"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Boîte de réception"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Supprimer cette conversation ?"</item>
@@ -393,18 +392,20 @@
     <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" msgid="807579971507624260">"Faire glisser l\'élément pour le supprimer"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dans la liste des conversations"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Faire glisser le doigt vers le bas pour actualiser"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Vérification des e-mails en cours…"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Vider la corbeille"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Vider le dossier de spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vider la corbeille ?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vider le dossier de spam ?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> message va être supprimé de manière définitive."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> messages vont être supprimés de manière définitive."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Ouvrir le panneau de navigation"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Fermer le panneau de navigation"</string>
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 4b51103..b79acf4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"भेज रहा है…"</string>
     <string name="send_failed" msgid="750908595144529579">"संदेश नहीं भेजा गया था."</string>
     <string name="me" msgid="6480762904022198669">"मुझे"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"सभी फ़ोल्‍डर दिखाएं"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"इनबॉक्स"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"इस बातचीत को हटाएं?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"संदेश के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"निकालने के लिए स्वाइप करें"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"बातचीत की सूची में"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"रीफ्रेश करने के लिए नीचे स्वाइप करें"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"मेल के लिए जांच की जा रही है"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"ट्रैश रिक्त करें"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"स्पैम रिक्त करें"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"ट्रैश रिक्त करें?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"स्पैम रिक्त करें?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> संदेश स्थायी रूप हटा दिया जाएगा."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> संदेश स्थायी रूप से हटा दिए जाएंगे."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"नेविगेशन ड्रॉवर खोलें"</string>
     <string name="drawer_close" msgid="2764774620737876943">"नेविगेशन ड्रॉवर बंद करें"</string>
 </resources>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 65e30c3..1c8b60e 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Slanje…"</string>
     <string name="send_failed" msgid="750908595144529579">"Poruka nije poslana."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Prikaži sve mape"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Pristigla pošta"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Izbrisati ovaj razgovor?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Upotrijebi kao zadano za odgovore na poruke"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Prijeđite prstom da biste uklonili"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na popisu razgovora"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje za osvježivanje"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Provjeravanje pošte"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Pražnjenje otpada"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Pražnjenje neželjenih sadržaja"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Želite li isprazniti otpad?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Želite li isprazniti neželjene sadržaje?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> poruka izbrisat će se zauvijek."</item>
+    <item quantity="other" msgid="2182899395748020953">"Sljedeći broj poruka izbrisat će se zauvijek: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Otvaranje pretinca za navigaciju"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zatvaranje pretinca za navigaciju"</string>
 </resources>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1a15e37..1344261 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Küldés…"</string>
     <string name="send_failed" msgid="750908595144529579">"Nincs elküldve"</string>
     <string name="me" msgid="6480762904022198669">"saját magam"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Összes mappa megjelenítése"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Beérkező levelek"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Törli ezt a beszélgetést?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Használat alapértelmezettként válaszüzenetekhez"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Csúsztassa gyorsan az ujját az eltávolításhoz"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Beszélgetéslistában"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Frissítéshez húzza le"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-mail ellenőrzése"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Kuka ürítése"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Spam mappa ürítése"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Kiüríti a kukát?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Kiüríti a spam mappát?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> üzenet véglegesen törölve lesz."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> üzenet véglegesen törölve lesz."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Navigációs fiók kinyitása"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigációs fiók bezárása"</string>
 </resources>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d789178..99be6a1 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Mengirim…"</string>
     <string name="send_failed" msgid="750908595144529579">"Pesan tidak dikirim."</string>
     <string name="me" msgid="6480762904022198669">"saya"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Tampilkan semua folder"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Kotak Masuk"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Hapus percakapan ini?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gunakan sebagai default untuk balasan pesan"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Gesek untuk menghapus"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam daftar percakapan"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Gesek ke bawah untuk menyegarkan"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Memeriksa email"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Kosongkan Sampah"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Kosongkan Spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Kosongkan Sampah?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Kosongkan Spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> pesan akan dihapus selamanya."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> pesan akan dihapus selamanya."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
 </resources>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 54ad535..97c0382 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Invio..."</string>
     <string name="send_failed" msgid="750908595144529579">"Messaggio non inviato."</string>
     <string name="me" msgid="6480762904022198669">"me"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Visualizza tutte le cartelle"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Posta in arrivo"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Eliminare questa conversazione?"</item>
@@ -393,6 +392,8 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usa come predefinito per le risposte ai messaggi"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Fai scorrere per rimuovere"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In elenco di conversazioni"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Immagine mittente"</string>
+    <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>
@@ -400,8 +401,8 @@
     <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>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Il messaggio <xliff:g id="COUNT">%1$d</xliff:g> verrà eliminato definitivamente."</item>
-    <item quantity="other" msgid="2473439906075355840">"I messaggi <xliff:g id="COUNT">%1$d</xliff:g> verranno eliminati definitivamente."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> messaggio verrà eliminato definitivamente."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> messaggi verranno eliminati definitivamente."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Apri riquadro di navigazione"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Chiudi riquadro di navigazione"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 8f5cde3..427c306 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"שולח…"</string>
     <string name="send_failed" msgid="750908595144529579">"ההודעה לא נשלחה."</string>
     <string name="me" msgid="6480762904022198669">"אני"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"הצג את כל התיקיות"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"תיבת דואר נכנס"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"האם למחוק שיחה זו?"</item>
@@ -393,6 +392,10 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"השתמש כברירת מחדל עבור תשובה להודעות"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"החלק כדי להסיר"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"ברשימת השיחות"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"החלק מטה לביצוע רענון"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"בודק אם יש דואר"</string>
     <string name="empty_trash" msgid="652435297593538512">"רוקן את האשפה"</string>
@@ -400,8 +403,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"האם לרוקן את האשפה?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"האם לרוקן את דואר הזבל?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"הודעה <xliff:g id="COUNT">%1$d</xliff:g> זו תימחק לצמיתות."</item>
-    <item quantity="other" msgid="2473439906075355840">"<xliff:g id="COUNT">%1$d</xliff:g> ההודעות האלה יימחקו לצמיתות."</item>
+    <item quantity="one" msgid="7530191630810420066">"הודעה <xliff:g id="COUNT">%1$d</xliff:g> תימחק לצמיתות."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות יימחקו לצמיתות."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"פתח את חלונית הניווט"</string>
     <string name="drawer_close" msgid="2764774620737876943">"סגור את חלונית הניווט"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 6d25b43..29c768b 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -170,8 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"送信しています…"</string>
     <string name="send_failed" msgid="750908595144529579">"送信に失敗しました。"</string>
     <string name="me" msgid="6480762904022198669">"自分"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"すべてのフォルダを表示"</string>
-    <string name="inbox_folders_heading" msgid="3960094746248976565">"受信ボックス"</string>
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"受信トレイ"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"このスレッドを削除しますか？"</item>
     <item quantity="other" msgid="930334208937121234">"<xliff:g id="COUNT">%1$d</xliff:g>件のスレッドを削除しますか？"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"返信時のデフォルトとして使用する"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"スワイプして削除"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"スレッドリスト内"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下にスワイプして更新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"メールを確認しています"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"ゴミ箱を空にする"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"迷惑メールフォルダを空にする"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"ゴミ箱を空にしますか？"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"迷惑メールフォルダを空にしますか？"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g>件のメッセージが完全に削除されます。"</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g>件のメッセージが完全に削除されます。"</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"ナビゲーションドロワーを開く"</string>
     <string name="drawer_close" msgid="2764774620737876943">"ナビゲーションドロワーを閉じる"</string>
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 22e22eb..92bc185 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"전송 중..."</string>
     <string name="send_failed" msgid="750908595144529579">"메일이 전송되지 않았습니다."</string>
     <string name="me" msgid="6480762904022198669">"나"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"모든 폴더 표시"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"받은편지함"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"대화를 삭제하시겠습니까?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"메일 답장 시 기본값으로 사용"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"스와이프하여 삭제"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"대화 목록"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"아래로 스와이프하여 새로고침"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"메일 확인 중"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"휴지통 비우기"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"스팸 비우기"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"휴지통을 비우시겠습니까?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"스팸을 비우시겠습니까?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"메시지 <xliff:g id="COUNT">%1$d</xliff:g>개가 완전히 삭제됩니다."</item>
+    <item quantity="other" msgid="2182899395748020953">"메시지 <xliff:g id="COUNT">%1$d</xliff:g>개가 완전히 삭제됩니다."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"내비게이션 폴더 열기"</string>
     <string name="drawer_close" msgid="2764774620737876943">"내비게이션 폴더 닫기"</string>
 </resources>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c7b252a..f63e626 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Siunčiama…"</string>
     <string name="send_failed" msgid="750908595144529579">"Pranešimas neišsiųstas."</string>
     <string name="me" msgid="6480762904022198669">"man"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Rodyti visus aplankus"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Gautieji"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Ištrinti šį pokalbį?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Naudoti kaip numatytąjį atsakant į pranešimus"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Jei norite pašalinti, perbraukite"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Pokalbių sąraše"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Perbraukite žemyn, kad atnaujintumėte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ieškoma laiškų"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Išvalyti šiukšliadėžę"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Išvalyti šlamšto aplanką"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Išvalyti šiukšliadėžę?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Išvalyti šlamšto aplanką?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"Visam laikui bus ištrinta pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="2182899395748020953">"Visam laikui bus ištrinta pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Atidaryti naršymo juostą"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Uždaryti naršymo juostą"</string>
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9e18528..72d279f 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Notiek sūtīšana…"</string>
     <string name="send_failed" msgid="750908595144529579">"Ziņoj. nav nosūtīts."</string>
     <string name="me" msgid="6480762904022198669">"man"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Rādīt visas mapes"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Iesūtne"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vai dzēst šo sarunu?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Izmantot kā noklusējumu, atbildot uz ziņojumiem"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Vilkt, lai noņemtu"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sarunu sarakstā"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Lai atsvaidzinātu, velciet uz leju."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Notiek e-pasta pārbaude"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Iztukšot atkritni"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Iztukšot mēstuļu mapi"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vai iztukšot atkritni?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vai iztukšot mēstuļu mapi?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> ziņojums tiks neatgriezeniski dzēsts."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> ziņojumi tiks neatgriezeniski dzēsti."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Atvērt navigācijas paneli"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Aizvērt navigācijas paneli"</string>
 </resources>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 82cc922..2c21dc4 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Tukar folder"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Alih ke"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Tetapan folder"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Kembalikan auto saiz"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Mesej ini telah diubah suai daripada versi asal agar muat dalam skrin ini.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Lagi"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Menghantar…"</string>
     <string name="send_failed" msgid="750908595144529579">"Mesej tidak dihantar."</string>
     <string name="me" msgid="6480762904022198669">"saya"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Tunjukkan semua folder"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Peti Masuk"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Padamkan perbualan ini?"</item>
     <item quantity="other" msgid="930334208937121234">"Padamkan <xliff:g id="COUNT">%1$d</xliff:g> perbualan ini?"</item>
@@ -382,30 +379,35 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Senyap"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alih keluar tindakan"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arkibkan perbualan"</item>
+    <item msgid="1894624633891654411">"Padam perbualan"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arkibkan bukannya padam perbualan"</item>
+    <item msgid="6515786566522105643">"Padam bukannya arkibkan perbualan"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Alih keluar tindakan"</string>
     <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
     <skip />
     <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
     <skip />
     <string name="preference_swipe_title" msgid="807579971507624260">"Leret untuk mengalih keluar"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam senarai perbualan"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Leret ke bawah untuk memuat semula"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Menyemak mel"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Kosongkan Sampah"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Kosongkan Spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Kosongkan Sampah?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Kosongkan Spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> mesej akan dipadam secara kekal."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> mesej akan dipadam secara kekal."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
 </resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index eba505f..04a3de8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Sender …"</string>
     <string name="send_failed" msgid="750908595144529579">"E-post ikke sendt."</string>
     <string name="me" msgid="6480762904022198669">"meg"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Vis alle mapper"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Innboks"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vil du slette denne samtalen?"</item>
@@ -390,9 +389,11 @@
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Handling for fjerning"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Svar alle"</string>
-    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Bruk som standard for e-postsvar"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Bruk som standard for e-postvarsler"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Sveip for å fjerne"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"I samtalelister"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Avsenderbilder"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Vis ved siden av navnet i samtalelisten"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Sveip ned for å laste inn på nytt"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ser etter e-post"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tøm papirkurven"</string>
@@ -400,8 +401,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vil du tømme papirkurven?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vil du fjerne nettsøppelet?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"<xliff:g id="COUNT">%1$d</xliff:g> melding slettes permanent."</item>
-    <item quantity="other" msgid="2473439906075355840">"Disse <xliff:g id="COUNT">%1$d</xliff:g> meldingene slettes permanent."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> melding slettes permanent."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> meldinger slettes permanent."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Åpne navigasjonsskuffen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Lukk navigasjonsskuffen"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2e48a50..dc0adff 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -76,7 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Mappen wijzigen"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Verplaatsen naar"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mapinstellingen"</string>
-    <string name="menu_show_original" msgid="4227060689700765828">"Autom. formaat terugzttn"</string>
+    <string name="menu_show_original" msgid="4227060689700765828">"Oorspr. versie herstellen"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Dit bericht is een aangepaste versie van het oorspronkelijke bericht, zodat het op het scherm past.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mappen"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Meer"</string>
@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Verzenden..."</string>
     <string name="send_failed" msgid="750908595144529579">"Niet verzonden."</string>
     <string name="me" msgid="6480762904022198669">"ik"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Alle mappen weergeven"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Postvak IN"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Deze conversatie verwijderen?"</item>
@@ -393,6 +392,10 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gebruiken als standaard voor beantwoorden"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Vegen om te verwijderen"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In conversatielijst"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Veeg omlaag om te vernieuwen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controleren op e-mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Prullenbak leegmaken"</string>
@@ -400,8 +403,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Prullenbak leegmaken?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Spammap leegmaken?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Dit <xliff:g id="COUNT">%1$d</xliff:g> bericht wordt permanent verwijderd."</item>
-    <item quantity="other" msgid="2473439906075355840">"Deze <xliff:g id="COUNT">%1$d</xliff:g> berichten worden permanent verwijderd."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> bericht wordt permanent verwijderd."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> berichten worden permanent verwijderd."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Navigatielade openen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigatielade sluiten"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 63477f9..263a905 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -168,7 +168,6 @@
     <string name="sending" msgid="8214361929125649771">"Wysyłanie..."</string>
     <string name="send_failed" msgid="750908595144529579">"Wiadomość nie została wysłana."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Pokaż wszystkie foldery"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Odebrane"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Usunąć wątek?"</item>
@@ -383,26 +382,28 @@
     <item msgid="1894624633891654411">"Usuń wątki"</item>
   </string-array>
   <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Archiwizuj wątki, zamiast je usuwać"</item>
-    <item msgid="6515786566522105643">"Usuwaj wątki, zamiast je archiwizować"</item>
+    <item msgid="6388312490146989386">"Archiwizuj wątki zamiast je usuwać"</item>
+    <item msgid="6515786566522105643">"Usuwaj wątki zamiast je archiwizować"</item>
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Usuń czynność"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Odpowiedz wszystkim"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Używaj domyślnie podczas odpowiadania na wiadomości"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Przesuń palcem, by usunąć"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na liście wątków"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Przesuń w dół, by odświeżyć"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Sprawdzam pocztę"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Opróżnij kosz"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Opróżnij spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Opróżnić kosz?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Opróżnić spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> wiadomość zostanie trwale usunięta."</item>
+    <item quantity="other" msgid="2182899395748020953">"Liczba wiadomości, które zostaną trwale usunięte: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Otwórz szufladę nawigacji"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zamknij szufladę nawigacji"</string>
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index acd0f4a..0747fe1 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"A enviar..."</string>
     <string name="send_failed" msgid="750908595144529579">"Mensagem não enviada."</string>
     <string name="me" msgid="6480762904022198669">"utilizador"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Caixa de Entrada"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Eliminar esta conversa?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilizar como predefinição para respostas a mensagens"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar rapidamente para remover"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize rapidamente para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"A verificar a existência de correio"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Esvaziar Lixo"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Esvaziar Spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Esvaziar Lixo?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Esvaziar Spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem será eliminada permanentemente."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens serão eliminadas permanentemente."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Abrir separador de navegação"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Fechar separador de navegação"</string>
 </resources>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5abb5e7..046e0cf 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Alterar pastas"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Mover para"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Configurações de pastas"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Reverter dimens. automát."</string>
     <string name="message_modified" msgid="2564340197585393687">"A versão original desta mensagem foi modificada para caber nesta tela."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Pastas"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Mais"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Enviando..."</string>
     <string name="send_failed" msgid="750908595144529579">"A mensagem não foi enviada."</string>
     <string name="me" msgid="6480762904022198669">"eu"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Mostrar todas as pastas"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Caixa de entrada"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Excluir esta conversa?"</item>
     <item quantity="other" msgid="930334208937121234">"Excluir estas <xliff:g id="COUNT">%1$d</xliff:g> conversas?"</item>
@@ -382,18 +379,25 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ação de remoção"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arquivar conversas"</item>
+    <item msgid="1894624633891654411">"Excluir conversas"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arquivar conversas em vez de excluí-las"</item>
+    <item msgid="6515786566522105643">"Excluir conversas em vez de arquivá-las"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Ação de remoção"</string>
     <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
     <skip />
     <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
     <skip />
     <string name="preference_swipe_title" msgid="807579971507624260">"Deslize para remover"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Verificando e-mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Esvaziar lixeira"</string>
@@ -401,8 +405,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Esvaziar a lixeira?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Esvaziar o spam?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem será excluída permanentemente."</item>
-    <item quantity="other" msgid="2473439906075355840">"Estas <xliff:g id="COUNT">%1$d</xliff:g> mensagens serão excluídas permanentemente."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> mensagem será excluída permanentemente."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens serão excluídas permanentemente."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Abrir gaveta de navegação"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Fechar gaveta de navegação"</string>

diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 0aeb0d4..36d592c 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml

@@ -289,8 +289,6 @@
     <skip />
     <!-- no translation found for me (6480762904022198669) -->
     <skip />
-    <!-- no translation found for show_all_folders (3281420732307737553) -->
-    <skip />
     <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
     <skip />
     <!-- no translation found for confirm_delete_conversation:one (3731948757247905508) -->
@@ -608,6 +606,10 @@
     <skip />
     <!-- no translation found for preference_swipe_description (5132683510510041028) -->
     <skip />
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <!-- no translation found for swipe_down_to_refresh (6401908905820786227) -->
     <skip />
     <!-- no translation found for checking_for_mail (2301797903350897130) -->
@@ -620,8 +622,8 @@
     <skip />
     <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
     <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <!-- no translation found for empty_folder_dialog_message:one (7530191630810420066) -->
+    <!-- no translation found for empty_folder_dialog_message:other (2182899395748020953) -->
     <!-- no translation found for drawer_open (6074646853178471940) -->
     <skip />
     <!-- no translation found for drawer_close (2764774620737876943) -->

diff --git a/res/values-ro-sw600dp/strings.xml b/res/values-ro-sw600dp/strings.xml
index 52c0d71..9ac2992 100644
--- a/res/values-ro-sw600dp/strings.xml
+++ b/res/values-ro-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Gestionaţi dosarele"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Utilizați ca prestabilit pentru răspunsurile la notificările de mesaje"</string>
 </resources>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7067773..4123d0d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Modificaţi dosarele"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Mutați în"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Setări pentru dosare"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Anulați dimensionarea"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Acest mesaj a fost modificat față de versiunea sa inițială, pentru a se potrivi în acest ecran.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Dosare"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Mai multe"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Se trimite..."</string>
     <string name="send_failed" msgid="750908595144529579">"Mesaj netrimis."</string>
     <string name="me" msgid="6480762904022198669">"eu"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Afişaţi toate dosarele"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Mesaje primite"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Ștergeţi această conversaţie?"</item>
     <item quantity="other" msgid="930334208937121234">"Ștergeţi aceste <xliff:g id="COUNT">%1$d</xliff:g> (de) conversaţii?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silențios"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminați"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arhivați conversațiile"</item>
+    <item msgid="1894624633891654411">"Ștergeți conversațiile"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arhivați, nu ștergeți conversațiile"</item>
+    <item msgid="6515786566522105643">"Ștergeți, nu arhivați conversațiile"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eliminați"</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" msgid="807579971507624260">"Glisați pentru a elimina"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"În lista de conversații"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Glisați în jos pentru actualizare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Se verifică e-mailurile"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Goliți coșul de gunoi"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Ștergeți mesajele spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Goliți coșul de gunoi?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Ștergeți mesajele spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> mesaj va fi șters definitiv."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> mesaje vor fi șterse definitiv."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Deschideți panoul de navigare"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Închideți panoul de navigare"</string>
 </resources>

diff --git a/res/values-ru-sw600dp/strings.xml b/res/values-ru-sw600dp/strings.xml
index 0b004e8..130f614 100644
--- a/res/values-ru-sw600dp/strings.xml
+++ b/res/values-ru-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"Копия"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"Скрытая копия"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Управление папками"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Использовать по умолчанию для всех уведомлений"</string>
 </resources>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e937284..105d42d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Изменить папки"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Переместить в"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Настройки папок"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Показать исходный размер"</string>
     <string name="message_modified" msgid="2564340197585393687">"Сообщение было изменено, чтобы оно поместилось на экране."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Папки"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Ещё"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Отправка…"</string>
     <string name="send_failed" msgid="750908595144529579">"Не отправлено."</string>
     <string name="me" msgid="6480762904022198669">"мне"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Показать все почтовые ящики"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Входящие"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Удалить эту цепочку?"</item>
     <item quantity="other" msgid="930334208937121234">"Удалить эти цепочки (<xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Без звука"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действия при удалении"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Архивировать цепочки"</item>
+    <item msgid="1894624633891654411">"Удалять цепочки"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Архивировать, а не удалять цепочки"</item>
+    <item msgid="6515786566522105643">"Удалять, а не архивировать цепочки"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Действия при удалении"</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" msgid="807579971507624260">"Удаление при смахивании"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"В списке цепочек"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Пролистните вниз, чтобы обновить"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверка почты…"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Очистить корзину"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Удалить спам"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Очистить корзину?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Удалить спам?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> сообщение будет удалено без возможности восстановления."</item>
+    <item quantity="other" msgid="2182899395748020953">"Сообщения (<xliff:g id="COUNT">%1$d</xliff:g>) будут удалены без возможности восстановления."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Открыть панель навигации"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Закрыть панель навигации"</string>
 </resources>

diff --git a/res/values-sk-sw600dp/strings.xml b/res/values-sk-sw600dp/strings.xml
index 424036d..11a8d00 100644
--- a/res/values-sk-sw600dp/strings.xml
+++ b/res/values-sk-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ kópia/skr.kópia"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ skrytá kópia"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Správa priečinkov"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Použiť ako predvolenú možnosť pre odpovede na upozornenia na správy"</string>
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9512d6d..03649de 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Zmeniť priečinky"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Presunúť do"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Nastavenia priečinka"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Zrušiť automatickú úpravu veľkosti"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Táto správa bola oproti pôvodnej verzii upravená tak, aby sa vošla na túto obrazovku.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Priečinky"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Ďalšie"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Odosielanie..."</string>
     <string name="send_failed" msgid="750908595144529579">"Správa nebola odoslaná."</string>
     <string name="me" msgid="6480762904022198669">"ja"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Zobraziť všetky priečinky"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Doručená pošta"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Odstrániť túto konverzáciu?"</item>
     <item quantity="other" msgid="930334208937121234">"Odstrániť tieto konverzácie (počet: <xliff:g id="COUNT">%1$d</xliff:g>)?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akcia odstránenia"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Archivácia konverzácií"</item>
+    <item msgid="1894624633891654411">"Odstrániť konverzácie"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Konverzácie radšej archivovať, neodstrániť"</item>
+    <item msgid="6515786566522105643">"Konverzácie radšej odstrániť, nearchivovať"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Akcia odstránenia"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Odpovedať všetkým"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Použiť ako predvolenú možnosť pre odpovede na správy"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Odstrániť posunutím"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"V zozname konverzácií"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Potiahnutím nadol obnovte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Vyprázdniť kôš"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Vyprázdniť priečinok s nevyžiadanou poštou"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vyprázdniť kôš"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vyprázdniť priečinok s nevyžiadanou poštou?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> správa sa natrvalo odstráni."</item>
+    <item quantity="other" msgid="2182899395748020953">"Správy (počet: <xliff:g id="COUNT">%1$d</xliff:g>) sa natrvalo odstránia."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Otvoriť priečinok s navigáciou"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zavrieť priečinok s navigáciou"</string>
 </resources>

diff --git a/res/values-sl-sw600dp/strings.xml b/res/values-sl-sw600dp/strings.xml
index 373ce61..2508527 100644
--- a/res/values-sl-sw600dp/strings.xml
+++ b/res/values-sl-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Kp/Skp"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skp"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Upravljanje map"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Uporabi kot privzeto za odgovore na obvestila o sporočilih"</string>
 </resources>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 69f2c9a..0069c07 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Spremenite mape"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Premakni v"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Nastavitve mape"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Razveljavi sam. velikost"</string>
     <string name="message_modified" msgid="2564340197585393687">"(To sporočilo je bilo zaradi prilagajanja temu zaslonu spremenjeno iz prvotne oblike.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Mape"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Več"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Pošiljanje…"</string>
     <string name="send_failed" msgid="750908595144529579">"Sporočilo ni bilo poslano."</string>
     <string name="me" msgid="6480762904022198669">"jaz"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Pokaži vse mape"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Prejeto"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Želite izbrisati ta pogovor?"</item>
     <item quantity="other" msgid="930334208937121234">"Želite izbrisati toliko pogovorov: <xliff:g id="COUNT">%1$d</xliff:g>?"</item>
@@ -382,18 +379,23 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tiho"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Dejanje odstranitve"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Arhiviranje pogovorov"</item>
+    <item msgid="1894624633891654411">"Brisanje pogovorov"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Arhiviranje pogovorov, ne brisanje"</item>
+    <item msgid="6515786566522105643">"Brisanje pogovorov, ne arhiviranje"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Dejanje odstranitve"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Odgovori vsem"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Uporabi kot privzeto za odgovore na sporočila"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Povlecite za odstranitev"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na seznamu pogovorov"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Za osvežitev povlecite navzdol"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Preverjanje pošte"</string>
     <string name="empty_trash" msgid="652435297593538512">"Izprazni smetnjak"</string>
@@ -401,8 +403,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Želite izprazniti smetnjak?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Želite izprazniti mapo z vsiljeno pošto?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Št. sporočil, ki bodo trajno izbrisana: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
-    <item quantity="other" msgid="2473439906075355840">"Št. sporočil, ki bodo trajno izbrisana: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="one" msgid="7530191630810420066">"Št. sporočil, ki bodo trajno izbrisana: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
+    <item quantity="other" msgid="2182899395748020953">"Št. sporočil, ki bodo trajno izbrisana: <xliff:g id="COUNT">%1$d</xliff:g>."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Odpri predal za navigacijo"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zapri predal za navigacijo"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4340dea..f4d9570 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Слање..."</string>
     <string name="send_failed" msgid="750908595144529579">"Порука није послата."</string>
     <string name="me" msgid="6480762904022198669">"мени"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Прикажи све директоријуме"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Примљене"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Желите ли да избришете ову преписку?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Коришћење ове опције као подразумеване за одговоре на поруке"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Превуците да бисте уклонили"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"На листи преписки"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Листајте надоле да бисте освежили"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверавање поште"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Пражњење директоријума за отпад"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Пражњење директоријума са непожељним порукама"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Желите ли да испразните директоријум за отпад?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Желите ли да испразните директоријум са непожељним порукама?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> порука ће бити трајно избрисана."</item>
+    <item quantity="other" msgid="2182899395748020953">"Поруке (<xliff:g id="COUNT">%1$d</xliff:g>) ће бити трајно избрисане."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Отвори фиоку за навигацију"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Затвори фиоку за навигацију"</string>
 </resources>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4c8be07..095e5be 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Skickar ..."</string>
     <string name="send_failed" msgid="750908595144529579">"E-post skickades ej."</string>
     <string name="me" msgid="6480762904022198669">"jag"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Visa alla mappar"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Inkorg"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Vill du ta bort konversationen?"</item>
@@ -385,14 +384,18 @@
     <item msgid="1894624633891654411">"Ta bort konversationer"</item>
   </string-array>
   <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Ta bort i stället för att arkivera samtal"</item>
-    <item msgid="6515786566522105643">"Ta bort i stället för att arkivera samtal"</item>
+    <item msgid="6388312490146989386">"Ta bort i stället för att arkivera konversationer"</item>
+    <item msgid="6515786566522105643">"Ta bort i stället för att arkivera konversationer"</item>
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Ta bort åtgärd"</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" msgid="807579971507624260">"Ta bort genom att dra"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"I konversationslista"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Dra nedåt om du vill uppdatera"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Söker efter e-post"</string>
     <string name="empty_trash" msgid="652435297593538512">"Töm papperskorgen"</string>
@@ -400,8 +403,8 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Vill du tömma papperskorgen?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Vill du tömma spammappen?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="462609766565707217">"Det här meddelandet (<xliff:g id="COUNT">%1$d</xliff:g>) tas bort permanent"</item>
-    <item quantity="other" msgid="2473439906075355840">"Dessa <xliff:g id="COUNT">%1$d</xliff:g> meddelanden tas bort permanent."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> meddelande tas bort permanent."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> meddelanden tas bort permanent."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Öppna navigeringsmenyn"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Stäng navigeringsmenyn"</string>

diff --git a/res/values-sw-sw600dp/strings.xml b/res/values-sw-sw600dp/strings.xml
index 742a036..c1e39c6 100644
--- a/res/values-sw-sw600dp/strings.xml
+++ b/res/values-sw-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Nakala kwa/Nakala fiche kwa"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Nakala fiche kwa"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Dhibiti folda"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Tumia kama chaguo-msingi ya majibu ya ujumbe wa arifa"</string>
 </resources>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a1be449..e69ba60 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Badilisha folda"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Hamisha hadi"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Mipangilio ya folda"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Rejesha ukubwa wa kiotomatiki"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Ujumbe huu umerekebishwa kutoka kwa toleo lake asili ili kutoshea kwenye skrini hii.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folda"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Zaidi"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Inatuma…"</string>
     <string name="send_failed" msgid="750908595144529579">"Ujumbe haukutumwa."</string>
     <string name="me" msgid="6480762904022198669">"mimi"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Onyesha folda zote"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Kikasha"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Mazungumzo haya yafutwe?"</item>
     <item quantity="other" msgid="930334208937121234">"Mazungumzo haya <xliff:g id="COUNT">%1$d</xliff:g> yafutwe?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Kimya"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ondoa kitendo"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Mazungumzo yaliyo kwenye kumbukumbu"</item>
+    <item msgid="1894624633891654411">"Futa mazungumzo"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Jalidi badala ya kufuta mazungumzo"</item>
+    <item msgid="6515786566522105643">"Futa badala ya kuweka kwenye kumbukumbu za mazungumzo"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Ondoa kitendo"</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 au majibu ya ujumbe"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Papasa ili uondoe"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Papasa kwa kasi kwenda chini ili kuonyesha upya"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Inaangalia barua pepe"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Safisha Tupio"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Ondoa Barua taka"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Je, ungependa Kusafisha Tupio?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Je, ungependa Kuondoa Barua taka"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> utafutwa kabisa."</item>
+    <item quantity="other" msgid="2182899395748020953">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> utafutwa kabisa."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Fungua menyu"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Funga menyu"</string>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 0751342..a24ebdb 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"กำลังส่ง…"</string>
     <string name="send_failed" msgid="750908595144529579">"ไม่ได้ส่งข้อความ"</string>
     <string name="me" msgid="6480762904022198669">"ฉัน"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"แสดงโฟลเดอร์ทั้งหมด"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"กล่องจดหมาย"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"ลบการสนทนานี้หรือไม่"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ใช้เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"กวาดนิ้วเพื่อนำออก"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"ในรายการการสนทนา"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"กวาดลงเพื่อรีเฟรช"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"กำลังตรวจดูจดหมาย"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"ลบทุกอย่างในถังขยะ"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"ลบทุกอย่างในสแปม"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"ลบทุกอย่างในถังขยะหรือไม่"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"ลบทุกอย่างในสแปมหรือไม่"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความจะถูกลบออกอย่างถาวร"</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความจะถูกลบออกอย่างถาวร"</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"เปิดช่องการนำทาง"</string>
     <string name="drawer_close" msgid="2764774620737876943">"ปิดช่องการนำทาง"</string>
 </resources>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index cba94fb..25d8354 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Ipinapadala…"</string>
     <string name="send_failed" msgid="750908595144529579">"Di pinadala mensahe."</string>
     <string name="me" msgid="6480762904022198669">"ako"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Ipakita ang lahat ng folder"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Inbox"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Tanggalin ang pag-uusap na ito?"</item>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gamitin bilang default para sa mga tugon sa mensahe"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Mag-swipe upang alisin"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sa listahan ng pag-uusap"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Mag-swipe pababa upang mag-refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tumitingin ng mail"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Alisan ng Laman ang Basurahan"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Alisan ng Laman ang Spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Alisan ng Laman ang Basurahan?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Alisan ng Laman ang Spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"Permanenteng tatanggalin ang <xliff:g id="COUNT">%1$d</xliff:g> (na) mensahe."</item>
+    <item quantity="other" msgid="2182899395748020953">"Permanenteng tatanggalin ang <xliff:g id="COUNT">%1$d</xliff:g> (na) mensahe."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Buksan ang drawer ng nabigasyon"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Isara ang drawer ng nabigasyon"</string>
 </resources>

diff --git a/res/values-tr-sw600dp/strings.xml b/res/values-tr-sw600dp/strings.xml
index f8e6581..53cf759 100644
--- a/res/values-tr-sw600dp/strings.xml
+++ b/res/values-tr-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Klasörleri yönet"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"İleti bildirimlerine yanıt için varsayılan olarak kullan"</string>
 </resources>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a481965..58bcbd6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Klasörleri değiştir"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Taşı"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Klasör ayarları"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"Otomatik boyutlandırmayı geri çevir"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Bu ileti, bu ekrana sığacak şekilde orijinalinden farklı hale getirilmiştir.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Klasörler"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Diğer"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Gönderiliyor..."</string>
     <string name="send_failed" msgid="750908595144529579">"İleti gönderilmedi."</string>
     <string name="me" msgid="6480762904022198669">"ben"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Tüm klasörleri göster"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Gelen Kutusu"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Bu ileti dizisi silinsin mi?"</item>
     <item quantity="other" msgid="930334208937121234">"Bu <xliff:g id="COUNT">%1$d</xliff:g> ileti dizisi silinsin mi?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Sessiz"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Kaldırma işlemi"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"İleti dizilerini arşivle"</item>
+    <item msgid="1894624633891654411">"İleti dizilerini sil"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"İleti dizilerini silmek yerine arşivleyin"</item>
+    <item msgid="6515786566522105643">"İleti dizilerini arşivlemek yerine silin"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Kaldırma işlemi"</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" msgid="807579971507624260">"Kaldırmak için hızlıca kaydırın"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"İleti dizisi listesinde"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Yenilemek için aşağı hızlıca kaydırın"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Posta kontrol ediliyor"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Çöp Kutusunu Boşalt"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Spam Klasörünü Boşalt"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Çöp Kutusu boşaltılsın mı?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Spam Klasörü boşaltılsın mı?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> ileti kalıcı olarak silinecek."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> ileti kalıcı olarak silinecek."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Gezinme menüsünü aç"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Gezinme menüsünü kapat"</string>
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bfa9aa7..6fd397e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Надсилання…"</string>
     <string name="send_failed" msgid="750908595144529579">"Повідомл. не надісл."</string>
     <string name="me" msgid="6480762904022198669">"я"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Показати всі папки"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Вхідні"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Видалити цю бесіду?"</item>
@@ -393,18 +392,18 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Використовувати за умовчанням для відповідей на повідомлення"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Проведіть пальцем, щоб вилучити"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"У списку бесід"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Зображення відправника"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Показувати біля імені в списку бесід"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Проведіть пальцем униз, щоб оновити"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Перевірка пошти"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Очистити кошик"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Очистити папку для спаму"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Очистити кошик?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Очистити папку для спаму?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> повідомлення буде видалено назавжди."</item>
+    <item quantity="other" msgid="2182899395748020953">"Повідомлення (<xliff:g id="COUNT">%1$d</xliff:g>) буде видалено назавжди."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Висунути навігаційну панель"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Сховати навігаційну панель"</string>
 </resources>

diff --git a/res/values-vi-sw600dp/strings.xml b/res/values-vi-sw600dp/strings.xml
index a55d608..c4bf465 100644
--- a/res/values-vi-sw600dp/strings.xml
+++ b/res/values-vi-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Cc/Bcc"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Bcc"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Quản lý thư mục"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Sử dụng làm mặc định để trả lời các thông báo thư"</string>
 </resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a652909..e4e6b9e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -76,8 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Thay đổi thư mục"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Di chuyển tới"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Cài đặt thư mục"</string>
-    <!-- no translation found for menu_show_original (4227060689700765828) -->
-    <skip />
+    <string name="menu_show_original" msgid="4227060689700765828">"H.nguyên về t.động đặt cỡ"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Thư này đã được sửa đổi từ phiên bản gốc để vừa với màn hình này)."</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Thư mục"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Thêm"</string>
@@ -171,9 +170,7 @@
     <string name="sending" msgid="8214361929125649771">"Đang gửi…"</string>
     <string name="send_failed" msgid="750908595144529579">"Thư chưa được gửi."</string>
     <string name="me" msgid="6480762904022198669">"tôi"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Hiển thị tất cả thư mục"</string>
-    <!-- no translation found for inbox_folders_heading (3960094746248976565) -->
-    <skip />
+    <string name="inbox_folders_heading" msgid="3960094746248976565">"Hộp thư đến"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Xóa cuộc hội thoại này?"</item>
     <item quantity="other" msgid="930334208937121234">"Xóa <xliff:g id="COUNT">%1$d</xliff:g> cuộc hội thoại này?"</item>
@@ -382,30 +379,33 @@
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Im lặng"</string>
     <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Xóa tác vụ"</string>
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
+  <string-array name="prefEntries_archive_vs_delete">
+    <item msgid="7861611617238166527">"Lưu trữ các cuộc trò chuyện"</item>
+    <item msgid="1894624633891654411">"Xóa các cuộc trò chuyện"</item>
+  </string-array>
+  <string-array name="prefSummaries_archive_vs_delete_summary">
+    <item msgid="6388312490146989386">"Lưu trữ thay vì xóa các cuộc trò chuyện"</item>
+    <item msgid="6515786566522105643">"Xóa thay vì lưu trữ các cuộc trò chuyện"</item>
+  </string-array>
+    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Xóa tác vụ"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Trả lời tất cả"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Sử dụng làm mặc định cho trả lời thư"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Vuốt để xóa"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Trong danh sách cuộc hội thoại"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Vuốt xuống để làm mới"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Đang kiểm tra thư"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Xóa sạch thùng rác"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Xóa sạch spam"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Xóa sạch thùng rác?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Xóa sạch spam?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn này sẽ bị xóa vĩnh viễn."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn này sẽ bị xóa vĩnh viễn."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Mở ngăn kéo điều hướng"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Đóng ngăn kéo điều hướng"</string>
 </resources>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a444938..af592da 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"正在发送..."</string>
     <string name="send_failed" msgid="750908595144529579">"邮件发送失败。"</string>
     <string name="me" msgid="6480762904022198669">"我"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"显示所有文件夹"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"收件箱"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"要删除此会话吗？"</item>
@@ -385,7 +384,7 @@
     <item msgid="1894624633891654411">"删除会话"</item>
   </string-array>
   <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"归档会话（而不是删除）"</item>
+    <item msgid="6388312490146989386">"将会话归档（而不是删除）"</item>
     <item msgid="6515786566522105643">"删除会话（而不是归档）"</item>
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"删除操作"</string>
@@ -393,18 +392,20 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"用作默认的邮件回复方式"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"滑动即可删除"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"在会话列表中"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下拉即可刷新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"清空已删除邮件"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"清空垃圾邮件"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"要清空已删除邮件吗？"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"要清空垃圾邮件吗？"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将遭到永久删除。"</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将遭到永久删除。"</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航栏"</string>
     <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航栏"</string>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7eacb5d..22a5efb 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"傳送中…"</string>
     <string name="send_failed" msgid="750908595144529579">"郵件未傳送。"</string>
     <string name="me" msgid="6480762904022198669">"我"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"顯示所有資料夾"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"收件匣"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"刪除這個會話群組？"</item>
@@ -385,26 +384,28 @@
     <item msgid="1894624633891654411">"刪除會話群組"</item>
   </string-array>
   <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"封存會話群組，而不要進行刪除"</item>
-    <item msgid="6515786566522105643">"刪除會話群組，而不要進行封存"</item>
+    <item msgid="6388312490146989386">"封存會話群組 (不刪除)"</item>
+    <item msgid="6515786566522105643">"刪除會話群組 (不封存)"</item>
   </string-array>
     <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"移除動作"</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" msgid="807579971507624260">"滑動即可移除"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"在會話群組清單中"</string>
+    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <skip />
+    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <skip />
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑動即可重新整理"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在檢查郵件"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"清空垃圾筒"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"清空垃圾郵件"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"清空垃圾筒？"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"清空垃圾郵件？"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> 封郵件將遭到永久刪除。"</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> 封郵件將遭到永久刪除。"</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"開啟導覽匣"</string>
     <string name="drawer_close" msgid="2764774620737876943">"關閉導覽匣"</string>
 </resources>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index ae3877c..aa93cf1 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -170,7 +170,6 @@
     <string name="sending" msgid="8214361929125649771">"Iyathumela..."</string>
     <string name="send_failed" msgid="750908595144529579">"Umlayezo awuthunyelwanga."</string>
     <string name="me" msgid="6480762904022198669">"mina"</string>
-    <string name="show_all_folders" msgid="3281420732307737553">"Bonisa onke amafolda"</string>
     <string name="inbox_folders_heading" msgid="3960094746248976565">"Ibhokisi lokungenayo"</string>
   <plurals name="confirm_delete_conversation">
     <item quantity="one" msgid="3731948757247905508">"Susa le ngxoxo?"</item>
@@ -393,18 +392,18 @@
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Sebenzisa njengokuzenzakalelayo kuzimpendulo zomlayezo"</string>
     <string name="preference_swipe_title" msgid="807579971507624260">"Swayipha ukuze ususe"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Ohlwini lengxoxo"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Isithombe somthumeli"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Bonisa eduze kwegama kuhlu lwengxoxo"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Swayiphela phansi ukuze uqale kabusha"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ihlolela imeyili"</string>
-    <!-- no translation found for empty_trash (652435297593538512) -->
-    <skip />
-    <!-- no translation found for empty_spam (6064497180615519589) -->
-    <skip />
-    <!-- no translation found for empty_trash_dialog_title (3248644791068595150) -->
-    <skip />
-    <!-- no translation found for empty_spam_dialog_title (8091014690336479280) -->
-    <skip />
-    <!-- no translation found for empty_folder_dialog_message:one (462609766565707217) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2473439906075355840) -->
+    <string name="empty_trash" msgid="652435297593538512">"Sula konke kudoti"</string>
+    <string name="empty_spam" msgid="6064497180615519589">"Sula konke kugaxekile"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Sula konke kudoti?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Sula konke kugaxekile?"</string>
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> umlayezo ozosuswa ngonaphakade."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo ezosuswa ngonaphakade."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Vula ukuzulazula kwekhabethe"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Vala ukuzulazula kwekhabethe"</string>
 </resources>
commit	d60971398fbf6f485a2eabd377129b94edb364ea	[log] [tgz]
author	Baligh Uddin <baligh@google.com>	Sat May 04 23:47:35 2013 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Sat May 04 23:47:36 2013 +0000
tree	d595ed0974f13d5369a41b45a0ff95a29f25e0b0
parent	d4796d78b3d6994d77edaf91b176fc3c79bb7362 [diff]
parent	25a3150d2eeb2c600418c1e2984b40fff68b32cc [diff]