Merge "Smaller stars" into jb-ub-mail-ur9

commit: a9430830dcc0e3edcc99298b5c6d25dcc0eda784 [log] [tgz]
author: Vikram Aggarwal <viki@google.com> Thu May 09 20:24:57 2013 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Thu May 09 20:24:58 2013 +0000
tree: 3c1b88670dc9d3dd6dfebb2153793d434c32ea6f
parent: e8a7c4c94cc2e391c6d2b5ade74ca842bc6b3a84 [diff]
parent: 5b62a95abaefd7cc1d58b71a90edc6e5f26691ec [diff]
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 51f2e93..d6fcd04 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nuwe boodskappe"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Argiveer en vee handelinge uit"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Wys net argiveer"</item>
+    <item msgid="5737880287951287278">"Wys net uitvee"</item>
+    <item msgid="4279948809971752573">"Wys argiveer en uitvee"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Wys net argiveer"</item>
+    <item msgid="8350973578419775975">"Wys net uitvee"</item>
+    <item msgid="2967059853409454648">"Wys argiveer en uitvee"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Argiveer en vee handelinge uit"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Antwoord almal"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gebruik as verstek vir antwoorde op boodskappe"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Sleep om te argiveer"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Sleep om uit te vee"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In gespreklys"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Stuurderprent"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Wys langs naam in gespreklys"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Maak navigasielaai oop"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Maak navigasielaai toe"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Raak \'n stuurderbeeld om daardie gesprek te kies."</string>
 </resources>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 7b6215e..9c5175c 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> አዲስ መልዕክቶች"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"ፀጥታ"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"በማህደር የማስቀመጥ እና የመሰረዝ እርምጃዎች"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"በማህደር አስቀምጥ ብቻ አሳይ"</item>
+    <item msgid="5737880287951287278">"ሰርዝ ብቻ አሳይ"</item>
+    <item msgid="4279948809971752573">"በማህደር አስቀምጥ እና ሰርዝ አሳይ"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"በማህደር አስቀምጥ ብቻ አሳይ"</item>
+    <item msgid="8350973578419775975">"ሰርዝ ብቻ አሳይ"</item>
+    <item msgid="2967059853409454648">"በማህደር አስቀምጥ እና ሰርዝ አሳይ"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"በማህደር የማስቀመጥ እና የመሰረዝ እርምጃዎች"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"ለሁሉም ምላሽ ይስጡ"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ለመልዕክት ምላሾች እንደ ነባሪ ይጠቀሙ"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"በማህደር ለማስቀመጥ ያንሸራትቱ"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"ለመሰረዝ ያንሸራቱ"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"የአሰሳ መሣቢያውን ክፈት"</string>
     <string name="drawer_close" msgid="2764774620737876943">"የአሰሳ መሣቢያውን ዝጋ"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"ያንን ውይይት ለመምረጥ የላኪ ምስል ይንኩ።"</string>
 </resources>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c450d55..a2cb65c 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> من الرسائل الجديدة"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"صامت"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"إجراءات الأرشيف والحذف"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"عرض الأرشيف فقط"</item>
+    <item msgid="5737880287951287278">"عرض الحذف فقط"</item>
+    <item msgid="4279948809971752573">"عرض الأرشيف والحذف"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"عرض الأرشيف فقط"</item>
+    <item msgid="8350973578419775975">"عرض الحذف فقط"</item>
+    <item msgid="2967059853409454648">"عرض الأرشيف والحذف"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"إجراءات الأرشيف والحذف"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"الرد على الكل"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"الاستخدام كافتراضي مع ردود الرسائل"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"مرر بسرعة لإجراء أرشفة"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"مرر بسرعة لإجراء حذف"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"فتح ساحب التنقل"</string>
     <string name="drawer_close" msgid="2764774620737876943">"إغلاق ساحب التنقل"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"المس صورة أحد المرسلين لتحديد تلك المحادثة."</string>
 </resources>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 3eafb29..d3d63b1 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Новых паведамленняў: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Ціхі рэжым"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Архіў і выдаленыя дзеянні"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Паказаць толькі архiў"</item>
+    <item msgid="5737880287951287278">"Паказаць толькі выдаленне"</item>
+    <item msgid="4279948809971752573">"Паказаць архіў і выдаленне"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Паказаць толькі архiў"</item>
+    <item msgid="8350973578419775975">"Паказаць толькі выдаленне"</item>
+    <item msgid="2967059853409454648">"Паказаць архіў і выдаленне"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Архіў і выдаленыя дзеянні"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Адказаць усім"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Выкарыстоўваць у якасці адказу на паведамленні па змаўчанні"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Перайсцi ў архiў"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Прагарнiце, каб выдалiць"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"У спісе гутарак"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Выява адпраўнiка"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Паказваць побач з імем у спісе размоў"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Адкрыць скрыню навігацыі"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Закрыць скрыню навігацыі"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Націсніце на малюнак адпраўніка малюнак, каб выбраць размову."</string>
 </resources>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index a0cee42..6da960b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> нови съобщения"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Тих режим"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Действия за архивиране и изтриване"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Показване само на архивирането"</item>
+    <item msgid="5737880287951287278">"Показване само на изтриването"</item>
+    <item msgid="4279948809971752573">"Показване на архивирането и изтриването"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Показване само на архивирането"</item>
+    <item msgid="8350973578419775975">"Показване само на изтриването"</item>
+    <item msgid="2967059853409454648">"Показване на архивирането и изтриването"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Действия за архивиране и изтриване"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Отговор до всички"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Използване като стандартна опция при отговор на съобщения"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Прекарайте пръст, за да архивирате"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Прекарайте пръст, за да изтриете"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Отваряне на слоя за навигация"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Затваряне на чекмеджето за навигация"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Докоснете изображението на подателя, за да изберете съответната кореспонденция."</string>
 </resources>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index fdf3c14..1b69253 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -290,7 +290,7 @@
     <item msgid="4779810016424303449">"Error intern"</item>
   </string-array>
     <string name="tap_to_configure" msgid="1181356242354390930">"Toca per configurar"</string>
-    <string name="non_synced_folder_description" msgid="6059194125558004080">"Sincron. la carpeta per veure conv."</string>
+    <string name="non_synced_folder_description" msgid="6059194125558004080">"Sincronitza la carpeta per veure converses."</string>
     <string name="tap_to_configure_folder_sync" msgid="3846898229180591661">"Sincronitza la carpeta"</string>
     <string name="widget_large_unread_count" msgid="5668393672379294516">"%d+"</string>
     <string name="actionbar_unread_messages" msgid="3805594795629836031">"<xliff:g id="COUNT">%1$d</xliff:g> no llegits"</string>
@@ -320,7 +320,7 @@
     <string name="wait_for_sync_body" msgid="7718316938173643688">"El correu electrònic apareixerà aviat."</string>
     <string name="not_synced_title" msgid="794279749170198599">"El compte no s\'ha sincronitzat"</string>
     <string name="wait_for_manual_sync_body" msgid="2003192935254244968">"Aquest compte no està configurat per sincronitzar automàticament."\n"Toca "<b>"Sincronitza ara"</b>" per sincronitzar el correu una vegada o bé "<b>"Canvia la configuració de sincronització"</b>" per configurar aquest compte per sincronitzar el correu de manera automàtica."</string>
-    <string name="manual_sync" msgid="6743983544685622800">"Sincron. ara"</string>
+    <string name="manual_sync" msgid="6743983544685622800">"Sincronitza ara"</string>
     <string name="change_sync_settings" msgid="5514293926214426577">"Canvia config. sincronització"</string>
     <string name="no_new_messages" msgid="2315965287002311844">"No hi ha cap missatge nou"</string>
     <string name="photo_load_failed" msgid="8811324070219403896">"No s\'ha pogut carr. la imatge"</string>
@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> missatges nous"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silenci"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Accions d\'arxivament i de supressió"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Mostra només l\'arxivament"</item>
+    <item msgid="5737880287951287278">"Mostra només la supressió"</item>
+    <item msgid="4279948809971752573">"Mostra l\'arxivament i la supressió"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Mostra només l\'arxivament"</item>
+    <item msgid="8350973578419775975">"Mostra només la supressió"</item>
+    <item msgid="2967059853409454648">"Mostra l\'arxivament i la supressió"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Accions d\'arxivament i de supressió"</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 predeterminada per respondre els missatges"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Fes lliscar el dit per arxivar"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Fes lliscar el dit per suprimir"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"A la llista de converses"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imatge del remitent"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostra al costat del nom a la llista de converses"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Toca la imatge d\'un remitent per seleccionar-ne la conversa."</string>
 </resources>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 0fa7bca..4a879d8 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Počet nových zpráv: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Akce archivace a smazání"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Zobrazit pouze archivaci"</item>
+    <item msgid="5737880287951287278">"Zobrazit pouze smazání"</item>
+    <item msgid="4279948809971752573">"Zobrazit archivaci i smazání"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Zobrazit pouze archivaci"</item>
+    <item msgid="8350973578419775975">"Zobrazit pouze smazání"</item>
+    <item msgid="2967059853409454648">"Zobrazit archivaci i smazání"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Akce archivace a smazání"</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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Archivace přejetím prstem"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Mazat po přejetí prstem"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"V seznamu konverzací"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Obrázek odesílatele"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Zobrazit vedle jména v seznamu konverzací"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Klepnutím na obrázek odesílatele vyberete příslušnou konverzaci."</string>
 </resources>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1a21cd4..4720e83 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nye beskeder"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Lydløs"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arkiverede og slettede handlinger"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Vis kun arkiverede"</item>
+    <item msgid="5737880287951287278">"Vis kun slettede"</item>
+    <item msgid="4279948809971752573">"Vis arkiverede og slettede"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Vis kun arkiverede"</item>
+    <item msgid="8350973578419775975">"Vis kun slettede"</item>
+    <item msgid="2967059853409454648">"Vis arkiverede og slettede"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arkiverede og slettede handlinger"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Svar alle"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Brug som standardsvar på meddelelser"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Stryg med fingeren for at arkivere"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Stryg med fingeren for at slette"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"På samtaleliste"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Afsenderbillede"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Vis ved siden af navnet i samtalelisten"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Åbn navigationsskuffen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Luk navigationsskuffen"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Tryk på et afsenderbillede for at vælge den samtale."</string>
 </resources>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1a91001..421361b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> neue Nachrichten"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Lautlos"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Aktionen \"Archivieren\" und \"Löschen\""</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Nur \"Archivieren\" anzeigen"</item>
+    <item msgid="5737880287951287278">"Nur \"Löschen\" anzeigen"</item>
+    <item msgid="4279948809971752573">"\"Archivieren\" und \"Löschen\" anzeigen"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Nur \"Archivieren\" anzeigen"</item>
+    <item msgid="8350973578419775975">"Nur \"Löschen\" anzeigen"</item>
+    <item msgid="2967059853409454648">"\"Archivieren\" und \"Löschen\" anzeigen"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Aktionen \"Archivieren\" und \"Löschen\""</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Allen antworten"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Als Standard für Antworten verwenden"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Zum Archivieren wischen"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Zum Löschen 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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Navigationsleiste öffnen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigationsleiste schließen"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Absenderbild berühren, um die entsprechende Konversation auszuwählen"</string>
 </resources>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index a113cf9..0aec99b 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> νέα μηνύματα"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Σίγαση"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Ενέργειες αρχειοθέτησης και διαγραφής"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Εμφάνιση μόνο αρχειοθέτησης"</item>
+    <item msgid="5737880287951287278">"Εμφάνιση μόνο διαγραφής"</item>
+    <item msgid="4279948809971752573">"Εμφάνιση αρχειοθέτησης και διαγραφής"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Εμφάνιση μόνο αρχειοθέτησης"</item>
+    <item msgid="8350973578419775975">"Εμφάνιση μόνο διαγραφής"</item>
+    <item msgid="2967059853409454648">"Εμφάνιση αρχειοθέτησης και διαγραφής"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Ενέργειες αρχειοθέτησης και διαγραφής"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Απάντηση σε όλους"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Χρήση ως προεπιλογή για απαντήσεις μηνυμάτων"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Σύρετε για αρχειοθέτηση"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Ολίσθηση για διαγραφή"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Άνοιγμα συρταριού πλοήγησης"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Κλείσιμο συρταριού πλοήγησης"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Αγγίξτε την εικόνα ενός αποστολέα για να επιλέξετε αυτήν τη συνομιλία."</string>
 </resources>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 240c3b8..bff512c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> new messages"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silent"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Archive &amp; delete actions"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Show archive only"</item>
+    <item msgid="5737880287951287278">"Show delete only"</item>
+    <item msgid="4279948809971752573">"Show archive &amp; delete"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Show archive only"</item>
+    <item msgid="8350973578419775975">"Show delete only"</item>
+    <item msgid="2967059853409454648">"Show archive &amp; delete"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Archive &amp; delete actions"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Reply all"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Use as default for message replies"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Swipe to archive"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Swipe to delete"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Open navigation drawer"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Close navigation drawer"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Touch a sender image to select that conversation."</string>
 </resources>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index f1733f7..21b07aa 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Acciones de archivar y eliminar"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Mostrar solo archivar"</item>
+    <item msgid="5737880287951287278">"Mostrar solo eliminar"</item>
+    <item msgid="4279948809971752573">"Mostrar archivar y eliminar"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Mostrar solo archivar"</item>
+    <item msgid="8350973578419775975">"Mostrar solo eliminar"</item>
+    <item msgid="2967059853409454648">"Mostrar archivar y eliminar"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Acciones de archivar y eliminar"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Deslizar para archivar"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Deslizar para eliminar"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"En 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 al lado del nombre en la lista de conversaciones"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Toca la imagen de un remitente para seleccionar esa conversación."</string>
 </resources>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6c9cbb8..8eb67d2 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensajes nuevos"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencio"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Archivar y eliminar"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Mostrar solo mensajes archivados"</item>
+    <item msgid="5737880287951287278">"Mostrar solo mensajes eliminados"</item>
+    <item msgid="4279948809971752573">"Mostrar mensajes archivados y eliminados"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Mostrar solo mensajes archivados"</item>
+    <item msgid="8350973578419775975">"Mostrar solo mensajes eliminados"</item>
+    <item msgid="2967059853409454648">"Mostrar mensajes archivados y eliminados"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Archivar y eliminar"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Deslizar para archivar"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"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>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Toca la imagen de un remitente para seleccionar esa conversación."</string>
 </resources>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index cb2c039..e043d1a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> uut sõnumit"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Hääletu"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arhiveerimise ja kustutamise toimingud"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Kuva ainult arhiveerimine"</item>
+    <item msgid="5737880287951287278">"Kuva ainult kustutamine"</item>
+    <item msgid="4279948809971752573">"Kuva arhiveerimine ja kustutamine"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Kuva ainult arhiveerimine"</item>
+    <item msgid="8350973578419775975">"Kuva ainult kustutamine"</item>
+    <item msgid="2967059853409454648">"Kuva arhiveerimine ja kustutamine"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arhiveerimise ja kustutamise toimingud"</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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Arhiveerimine pühkides"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Kustutamine pühkides"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Ava navigeerimissahtel"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Sule navigeerimissahtel"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Vestluse valimiseks puudutage saatja kujutist."</string>
 </resources>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index c3b7833..837c7dd 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> پیام جدید"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"بیصدا"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"عملکردهای بایگانی و حذف"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"فقط نمایش بایگانی"</item>
+    <item msgid="5737880287951287278">"فقط نمایش حذف"</item>
+    <item msgid="4279948809971752573">"نمایش بایگانی و حذف"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"فقط نمایش بایگانی"</item>
+    <item msgid="8350973578419775975">"فقط نمایش حذف"</item>
+    <item msgid="2967059853409454648">"نمایش بایگانی و حذف"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"عملکردهای بایگانی و حذف"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"پاسخ به همه"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"به‌ عنوان پیش‌فرض برای پاسخ‌ پیام استفاده شود"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"کشیدن انگشت روی صفحه برای بایگانی کردن"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"برای حذف با انگشت روی صفحه بکشید"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"باز کردن کشوی پیمایش"</string>
     <string name="drawer_close" msgid="2764774620737876943">"بستن کشوی پیمایش"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"برای انتخاب این مکالمه، تصویر یک فرستنده را لمس کنید."</string>
 </resources>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4224e06..5ae5d34 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> uutta viestiä"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Äänetön"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arkistointi- ja poistotoiminnot"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Näytä vain arkistointi"</item>
+    <item msgid="5737880287951287278">"Näytä vain poisto"</item>
+    <item msgid="4279948809971752573">"Näytä arkistointi ja poisto"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Näytä vain arkistointi"</item>
+    <item msgid="8350973578419775975">"Näytä vain poisto"</item>
+    <item msgid="2967059853409454648">"Näytä arkistointi ja poisto"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arkistointi- ja poistotoiminnot"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Vastaa kaikille"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Käytä oletuksena vastauksissa"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Arkistoi liu\'uttamalla"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Poista liu\'uttamalla"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Keskusteluluettelossa"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Lähettäjän kuva"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Näytä nimen vieressä keskusteluluettelossa"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Avaa navigointipalkki"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Sulje navigointipalkki"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Valitse keskustelu koskettamalla lähettäjän kuvaa."</string>
 </resources>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e788904..d560e9f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nouveaux messages"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g> : <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Mode silencieux"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Actions d\'archivage et de suppression"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"N\'afficher que le bouton \"Archiver\""</item>
+    <item msgid="5737880287951287278">"N\'afficher que le bouton \"Supprimer\""</item>
+    <item msgid="4279948809971752573">"Afficher les boutons \"Archiver\" et \"Supprimer\""</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"N\'afficher que le bouton \"Archiver\""</item>
+    <item msgid="8350973578419775975">"N\'afficher que le bouton \"Supprimer\""</item>
+    <item msgid="2967059853409454648">"Afficher les boutons \"Archiver\" et \"Supprimer\""</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Actions d\'archivage et de suppression"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Répondre à tous"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utiliser ce paramètre par défaut pour les réponses"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Faire glisser les éléments pour les archiver"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Faire glisser les éléments pour les supprimer"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dans la liste des conversations"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Image de l\'expéditeur"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Afficher à côté du nom dans la liste des conversations"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Appuyez sur l\'image d\'un expéditeur pour sélectionner cette conversation."</string>
 </resources>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 40e3678..86bd761 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> नए संदेश"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"मौन"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"संगृहीत करें और हटाएं कार्यवाही"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"केवल संगृहीत करें दिखाएं"</item>
+    <item msgid="5737880287951287278">"केवल हटाएं दिखाएं"</item>
+    <item msgid="4279948809971752573">"संगृहीत करें और हटाएं दिखाएं"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"केवल संगृहीत करें दिखाएं"</item>
+    <item msgid="8350973578419775975">"केवल हटाएं दिखाएं"</item>
+    <item msgid="2967059853409454648">"संगृहीत करें और हटाएं दिखाएं"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"संगृहीत करें और हटाएं कार्यवाही"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"सभी को जवाब दें"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"संदेश के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"संगृहीत करने के लिए स्वाइप करें"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"हटाने के लिए स्वाइप करें"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"नेविगेशन ड्रॉवर खोलें"</string>
     <string name="drawer_close" msgid="2764774620737876943">"नेविगेशन ड्रॉवर बंद करें"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"उस बातचीत को चुनने के लिए प्रेषक के चित्र को स्पर्श करें."</string>
 </resources>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 275e311..fcd53d8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Novih poruka: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Bešumno"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Radnje arhiviranja i brisanja"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Prikaži samo arhiviranje"</item>
+    <item msgid="5737880287951287278">"Prikaži samo brisanje"</item>
+    <item msgid="4279948809971752573">"Prikaži arhiviranje i brisanje"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Prikaži samo arhiviranje"</item>
+    <item msgid="8350973578419775975">"Prikaži samo brisanje"</item>
+    <item msgid="2967059853409454648">"Prikaži arhiviranje i brisanje"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Radnje arhiviranja i brisanja"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Odgovori svima"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Upotrijebi kao zadano za odgovore na poruke"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Prijeđite prstom da biste arhivirali"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Prijeđite prstom da biste izbrisali"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na popisu razgovora"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Slika pošiljatelja"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Prikaži pored imena na popisu razgovora"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Otvaranje pretinca za navigaciju"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zatvaranje pretinca za navigaciju"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Dodirnite sliku pošiljatelja da biste odabrali taj razgovor."</string>
 </resources>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8c3fd16..024ffba 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> új üzenet"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Néma"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Műveletek archiválás és törlése"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Csak az archiválás megjelenítése"</item>
+    <item msgid="5737880287951287278">"Csak a törlés megjelenítése"</item>
+    <item msgid="4279948809971752573">"Archiválás és törlés megjelenítése"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Csak az archiválás megjelenítése"</item>
+    <item msgid="8350973578419775975">"Csak a törlés megjelenítése"</item>
+    <item msgid="2967059853409454648">"Archiválás és törlés megjelenítése"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Műveletek archiválás és törlése"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Válasz mindenkinek"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Használat alapértelmezettként válaszüzenetekhez"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Csúsztassa ujját az archiváláshoz"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Törléshez csúsztassa az ujját"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Beszélgetéslistában"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Küldő képe"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Megjelenítés a név mellett a beszélgetések listájában"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"A beszélgetés kiválasztásához érintse meg a küldő képét."</string>
 </resources>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index f78a4b5..49d0552 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> pesan baru"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tidak Berbunyi"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Tindakan mengarsipkan dan &amp; menghapus"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Hanya tampilkan yang diarsipkan"</item>
+    <item msgid="5737880287951287278">"Hanya tampilkan yang dihapus"</item>
+    <item msgid="4279948809971752573">"Tampilkan yang diarsipkan &amp; dihapus"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Hanya tampilkan yang diarsipkan"</item>
+    <item msgid="8350973578419775975">"Hanya tampilkan yang dihapus"</item>
+    <item msgid="2967059853409454648">"Tampilkan yang diarsipkan &amp; dihapus"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Tindakan mengarsipkan dan &amp; menghapus"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Balas ke semua"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gunakan sebagai default untuk balasan pesan"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Gesek untuk mengarsipkan"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Gesek untuk menghapus"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam daftar percakapan"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Gambar pengirim"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Tampilkan di samping nama dalam daftar percakapan"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Sentuh gambar pengirim untuk memilih percakapan tersebut."</string>
 </resources>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5ef61d9..005113c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nuovi messaggi"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silenzioso"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Azioni Archivia ed Elimina"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Mostra solo Archivia"</item>
+    <item msgid="5737880287951287278">"Mostra solo Elimina"</item>
+    <item msgid="4279948809971752573">"Mostra Archivia ed Elimina"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Mostra solo Archivia"</item>
+    <item msgid="8350973578419775975">"Mostra solo Elimina"</item>
+    <item msgid="2967059853409454648">"Mostra Archivia ed Elimina"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Azioni Archivia ed Elimina"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Rispondi a tutti"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usa come predefinito per le risposte ai messaggi"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Fai scorrere il dito per archiviare"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Fai scorrere il dito per eliminare"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Apri riquadro di navigazione"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Chiudi riquadro di navigazione"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Tocca l\'immagine di un mittente per selezionare tale conversazione."</string>
 </resources>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c458cfa..da58935 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> הודעות חדשות"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>‏: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"שקט"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"פעולות העברה לארכיון ומחיקה"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"הצג רק ארכיון"</item>
+    <item msgid="5737880287951287278">"הצג רק הודעות שנמחקו"</item>
+    <item msgid="4279948809971752573">"הצג ארכיון והודעות שנמחקו"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"הצג רק ארכיון"</item>
+    <item msgid="8350973578419775975">"הצג רק הודעות שנמחקו"</item>
+    <item msgid="2967059853409454648">"הצג ארכיון והודעות שנמחקו"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"פעולות העברה לארכיון ומחיקה"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"השב לכולם"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"השתמש כברירת מחדל עבור תשובה להודעות"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"החלק כדי להעביר לארכיון"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"החלק כדי למחוק"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"פתח את חלונית הניווט"</string>
     <string name="drawer_close" msgid="2764774620737876943">"סגור את חלונית הניווט"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"גע בתמונת שולח כדי לבחור בשיחה."</string>
 </resources>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index f59e3e4..5c84ed5 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>件の新着メッセージ"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"マナーモード"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"アーカイブ/削除操作"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"アーカイブのみを表示"</item>
+    <item msgid="5737880287951287278">"削除のみを表示"</item>
+    <item msgid="4279948809971752573">"アーカイブと削除を表示"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"アーカイブのみを表示"</item>
+    <item msgid="8350973578419775975">"削除のみを表示"</item>
+    <item msgid="2967059853409454648">"アーカイブと削除を表示"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"アーカイブ/削除操作"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"全員に返信"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"返信時のデフォルトとして使用する"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"スワイプしてアーカイブ"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"スワイプして削除"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"ナビゲーションドロワーを開く"</string>
     <string name="drawer_close" msgid="2764774620737876943">"ナビゲーションドロワーを閉じる"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"スレッドを選択するには送信者画像をタップしてください。"</string>
 </resources>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e139eda..14b861f 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"새 메시지 <xliff:g id="COUNT">%1$d</xliff:g>개"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"무음"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"보관처리 및 삭제 작업"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"보관처리된 메일만 표시"</item>
+    <item msgid="5737880287951287278">"삭제된 메일만 표시"</item>
+    <item msgid="4279948809971752573">"보관처리 및 삭제된 메일 표시"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"보관처리된 메일만 표시"</item>
+    <item msgid="8350973578419775975">"삭제된 메일만 표시"</item>
+    <item msgid="2967059853409454648">"보관처리 및 삭제된 메일 표시"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"보관처리 및 삭제 작업"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"전체답장"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"메일 답장 시 기본값으로 사용"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"스와이프하여 보관처리"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"스와이프하여 삭제"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"내비게이션 폴더 열기"</string>
     <string name="drawer_close" msgid="2764774620737876943">"내비게이션 폴더 닫기"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"대화를 선택하려면 발신자 이미지를 터치합니다."</string>
 </resources>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 2343124..d603425 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Naujų pranešimų: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tylus"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Archyvavimo ir ištrynimo veiksmai"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Rodyti tik archyvą"</item>
+    <item msgid="5737880287951287278">"Rodyti tik ištrintus"</item>
+    <item msgid="4279948809971752573">"Rodyti archyvą ir ištrintus"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Rodyti tik archyvą"</item>
+    <item msgid="8350973578419775975">"Rodyti tik ištrintus"</item>
+    <item msgid="2967059853409454648">"Rodyti archyvą ir ištrintus"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Archyvavimo ir ištrynimo veiksmai"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Atsakyti visiems"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Naudoti kaip numatytąjį atsakant į pranešimus"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Perbraukite, kad archyvuotumėte"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Perbraukite, kad ištrintumėte"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Pokalbių sąraše"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Siuntėjo vaizdas"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Rodyti šalia vardo pokalbių sąraše"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Atidaryti naršymo juostą"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Uždaryti naršymo juostą"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Palieskite siuntėjo vaizdą, kad pasirinktumėte tą pokalbį."</string>
 </resources>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 5bfa1c4..670882e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> jauni ziņojumi"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Klusums"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arhivēšanas un dzēšanas darbības"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Rādīt tikai arhivēšanas darbību"</item>
+    <item msgid="5737880287951287278">"Rādīt tikai dzēšanas darbību"</item>
+    <item msgid="4279948809971752573">"Rādīt arhivēšanas un dzēšanas darbību"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Rādīt tikai arhivēšanas darbību"</item>
+    <item msgid="8350973578419775975">"Rādīt tikai dzēšanas darbību"</item>
+    <item msgid="2967059853409454648">"Rādīt arhivēšanas un dzēšanas darbību"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arhivēšanas un dzēšanas darbības"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Atbildēt visiem"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Izmantot kā noklusējumu, atbildot uz ziņojumiem"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Vilkt, lai arhivētu"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Vilkt, lai dzēstu"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sarunu sarakstā"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Sūtītāja attēls"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Rādīt blakus vārdam sarunu sarakstā"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Pieskarieties sūtītāja attēlam, lai atlasītu šo sarunu."</string>
 </resources>

diff --git a/res/values-ms-sw600dp/strings.xml b/res/values-ms-sw600dp/strings.xml
index 1be957b..2dd3224 100644
--- a/res/values-ms-sw600dp/strings.xml
+++ b/res/values-ms-sw600dp/strings.xml

@@ -21,6 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Sk/Skt"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Skt"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Urus folder"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Gunakan secara lalai untuk balasan kepada pemberitahuan mesej"</string>
 </resources>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 61510fb..67d3c4e 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -378,24 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mesej baharu"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Senyap"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arkib &amp; padam tindakan"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Tunjukkan arkib sahaja"</item>
+    <item msgid="5737880287951287278">"Tunjukkan padam sahaja"</item>
+    <item msgid="4279948809971752573">"Tunjukkan arkib &amp; padam"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Tunjukkan arkib sahaja"</item>
+    <item msgid="8350973578419775975">"Tunjukkan padam sahaja"</item>
+    <item msgid="2967059853409454648">"Tunjukkan arkib &amp; padam"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arkib &amp; padam tindakan"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Balas kepada semua"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gunakan secara lalai untuk balasan mesej"</string>
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Leret untuk mengarkib"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Leret untuk memadam"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam senarai perbualan"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imej penghantar"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Tunjukkan di sebelah nama dalam senarai perbualan"</string>
@@ -411,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Buka laci navigasi"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Tutup laci navigasi"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Sentuh imej penghantar untuk memilih perbualan itu."</string>
 </resources>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index ce5f54c..724d90e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nye e-poster"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Stille"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Handlinger for arkivering og sletting"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Vis bare «arkivér»"</item>
+    <item msgid="5737880287951287278">"Vis bare «slett»"</item>
+    <item msgid="4279948809971752573">"Vis «arkivér» og «slett»"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Vis bare «arkivér»"</item>
+    <item msgid="8350973578419775975">"Vis bare «slett»"</item>
+    <item msgid="2967059853409454648">"Vis «arkivér» og «slett»"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Handlinger for arkivering og sletting"</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-postvarsler"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Sveip for å arkivere"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Sveip for å slette"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Åpne navigasjonsskuffen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Lukk navigasjonsskuffen"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Trykk på et avsenderbilde for å velge den samtalen."</string>
 </resources>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 707bd39..9858302 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nieuwe berichten"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Stil"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Acties voor archiveren of verwijderen"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Alleen archief weergeven"</item>
+    <item msgid="5737880287951287278">"Alleen verwijderen weergeven"</item>
+    <item msgid="4279948809971752573">"Archief en verwijderen weergeven"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Alleen archief weergeven"</item>
+    <item msgid="8350973578419775975">"Alleen verwijderen weergeven"</item>
+    <item msgid="2967059853409454648">"Archief en verwijderen weergeven"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Acties voor archiveren of verwijderen"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Allen beantwoorden"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gebruiken als standaard voor beantwoorden"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Vegen om te archiveren"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Vegen om te verwijderen"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"In conversatielijst"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Afbeelding van afzender"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Weergeven naast naam in gesprekslijst"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Navigatielade openen"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Navigatielade sluiten"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Raak de afbeelding van een afzender aan om dat gesprek te selecteren."</string>
 </resources>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 656a137..31f0472 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -376,22 +376,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Nowe wiadomości: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Cichy"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Czynności archiwizuj i usuń"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Pokaż tylko archiwizuj"</item>
+    <item msgid="5737880287951287278">"Pokaż tylko usuń"</item>
+    <item msgid="4279948809971752573">"Pokaż archiwizuj i usuń"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Pokaż tylko archiwizuj"</item>
+    <item msgid="8350973578419775975">"Pokaż tylko usuń"</item>
+    <item msgid="2967059853409454648">"Pokaż archiwizuj i usuń"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Czynności archiwizuj i usuń"</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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Po przesunięciu palcem archiwizuj"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Po przesunięciu palcem usuwaj"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na liście wątków"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Zdjęcie nadawcy"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Pokaż obok imienia i nazwiska na liście wątków"</string>
@@ -407,6 +407,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Otwórz szufladę nawigacji"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zamknij szufladę nawigacji"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Kliknij zdjęcie nadawcy, by wybrać tę rozmowę."</string>
 </resources>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 5610a95..c728023 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> mensagens novas"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arquivar e eliminar ações"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Mostrar apenas arquivar"</item>
+    <item msgid="5737880287951287278">"Mostrar apenas eliminar"</item>
+    <item msgid="4279948809971752573">"Mostrar arquivar e eliminar"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Mostrar apenas arquivar"</item>
+    <item msgid="8350973578419775975">"Mostrar apenas eliminar"</item>
+    <item msgid="2967059853409454648">"Mostrar arquivar e eliminar"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arquivar e eliminar ações"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilizar como predefinição para respostas a mensagens"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Deslize rapidamente para arquivar"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Deslize rapidamente para eliminar"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imagem do remetente"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostrar junto ao nome na lista de conversas"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Toque numa imagem de remetente para selecionar essa conversa."</string>
 </resources>

diff --git a/res/values-pt-sw600dp/strings.xml b/res/values-pt-sw600dp/strings.xml
index a54fe13..e85899d 100644
--- a/res/values-pt-sw600dp/strings.xml
+++ b/res/values-pt-sw600dp/strings.xml

@@ -21,6 +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">"Gerenciar pastas"</string>
-    <!-- no translation found for preferences_default_reply_all_summary (5318418012992612729) -->
-    <skip />
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Usar como padrão para notificações de mensagens"</string>
 </resources>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 749bffa..d829658 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -378,24 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> novas mensagens"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silencioso"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_title (7088691949152598569) -->
-    <skip />
-    <!-- no translation found for preferences_default_reply_all_summary (7389395579918128940) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Ações de arquivar e excluir"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Mostrar somente arquivar"</item>
+    <item msgid="5737880287951287278">"Mostrar somente excluir"</item>
+    <item msgid="4279948809971752573">"Mostrar arquivar e excluir"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Mostrar somente arquivar"</item>
+    <item msgid="8350973578419775975">"Mostrar somente excluir"</item>
+    <item msgid="2967059853409454648">"Mostrar arquivar e excluir"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Ações de arquivar e excluir"</string>
+    <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
+    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como padrão para respostas de mensagens"</string>
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Deslizar para arquivar"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Deslizar para excluir"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imagem do remetente"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Mostrar caixa de seleção ao lado do nome na lista de conversas"</string>
@@ -411,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Toque na imagem do remetente para selecionar a conversa."</string>
 </resources>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3258efc..4255516 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> (de) mesaje noi"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Silențios"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arhivați și Ștergeți"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Afișați numai opțiunea Arhivați"</item>
+    <item msgid="5737880287951287278">"Afișați numai opțiunea Ștergeți"</item>
+    <item msgid="4279948809971752573">"Afișați opțiunile Arhivați și Ștergeți"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Afișați numai opțiunea Arhivați"</item>
+    <item msgid="8350973578419775975">"Afișați numai opțiunea Ștergeți"</item>
+    <item msgid="2967059853409454648">"Afișați opțiunile Arhivați și Ștergeți"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arhivați și Ștergeți"</string>
     <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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Glisați pentru a arhiva"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Glisați pentru a șterge"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"În lista de conversații"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Imaginea expeditorului"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Afișați lângă nume în lista de conversații"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Atingeți imaginea unui expeditor pentru a selecta respectiva conversație."</string>
 </resources>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 165af6c..3cb17b3 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Новых сообщений: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Без звука"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Что делать, если выбрано удаление"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Только архивировать"</item>
+    <item msgid="5737880287951287278">"Только удалять"</item>
+    <item msgid="4279948809971752573">"Архивировать или удалять"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Только архивировать"</item>
+    <item msgid="8350973578419775975">"Только удалять"</item>
+    <item msgid="2967059853409454648">"Архивировать или удалять"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Архивация и удаление"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Отвечать всем"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Использовать по умолчанию для всех ответов"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Архивировать смахиванием"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Удалять смахиванием"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Открыть панель навигации"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Закрыть панель навигации"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Чтобы открыть цепочку писем, нажмите на фото отправителя."</string>
 </resources>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 95297bc..fdad960 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Počet nových správ: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tichý režim"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Akcie archivácie a odstránenia"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Zobraziť iba archiváciu"</item>
+    <item msgid="5737880287951287278">"Zobraziť iba odstránenie"</item>
+    <item msgid="4279948809971752573">"Zobraziť archiváciu aj odstránenie"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Zobraziť iba archiváciu"</item>
+    <item msgid="8350973578419775975">"Zobraziť iba odstránenie"</item>
+    <item msgid="2967059853409454648">"Zobraziť archiváciu aj odstránenie"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Akcie archivácie a 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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Archivácia posunutím prstom"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Odstrániť po posunutí prstom"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"V zozname konverzácií"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Obrázok odosielateľa"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Zobraziť vedľa mena v zozname konverzácií"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Dotknutím sa obrázka odosielateľa vyberiete danú konverzáciu."</string>
 </resources>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index c8b0ea5..5658bec 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Št. novih sporočil: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tiho"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Dejanji arhiviranja in brisanja"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Pokaži samo arhiviranje"</item>
+    <item msgid="5737880287951287278">"Pokaži samo brisanje"</item>
+    <item msgid="4279948809971752573">"Pokaži arhiviranje in brisanje"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Pokaži samo arhiviranje"</item>
+    <item msgid="8350973578419775975">"Pokaži samo brisanje"</item>
+    <item msgid="2967059853409454648">"Pokaži arhiviranje in brisanje"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Dejanji arhiviranja in brisanja"</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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Povlecite za arhiviranje"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Povlecite za brisanje"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Na seznamu pogovorov"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Slika pošiljatelja"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Prikaz zraven imena na seznamu pogovorov"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Odpri predal za navigacijo"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Zapri predal za navigacijo"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Če želite izbrati ta pogovor, se dotaknite slike pošiljatelja."</string>
 </resources>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fa72cf6..d1b9208 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Нових порука: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Нечујно"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Радње архивирања и брисања"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Прикажи само архивирање"</item>
+    <item msgid="5737880287951287278">"Прикажи само брисање"</item>
+    <item msgid="4279948809971752573">"Прикажи архивирање и брисање"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Приказује се само архивирање"</item>
+    <item msgid="8350973578419775975">"Приказује се само брисање"</item>
+    <item msgid="2967059853409454648">"Приказују се архивирање и брисање"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Радње архивирања и брисања"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Одговори свима"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Коришћење ове опције као подразумеване за одговоре на поруке"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Архивирање листањем"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Брисање листањем"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Отвори фиоку за навигацију"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Затвори фиоку за навигацију"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Додирните слику пошиљаоца да бисте изабрали ту преписку."</string>
 </resources>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8d98c3c..05e7560 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> nya meddelanden"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Tyst"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Åtgärderna arkivera och ta bort"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Visa endast arkivera"</item>
+    <item msgid="5737880287951287278">"Visa endast ta bort"</item>
+    <item msgid="4279948809971752573">"Visa arkivera och ta bort"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Visa endast arkivera"</item>
+    <item msgid="8350973578419775975">"Visa endast ta bort"</item>
+    <item msgid="2967059853409454648">"Visa arkivera och ta bort"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Åtgärderna arkivera och ta bort"</string>
     <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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Dra om du vill ta bort"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Dra om du vill radera"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"I konversationslista"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Bild på avsändare"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Visa bredvid namnet i konversationslistan"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Öppna navigeringsmenyn"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Stäng navigeringsmenyn"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Tryck på avsändarens bild om du vill välja den konversationen."</string>
 </resources>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index faf3b73..20718af 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -141,7 +141,7 @@
     <string name="contextmenu_copylink" msgid="3580131515400610839">"Nakili URL ya kiungo"</string>
     <string name="contextmenu_dial_dot" msgid="9104426720103729453">"Piga simu…"</string>
     <string name="contextmenu_sms_dot" msgid="6481040539501081547">"Ujumbe mfupi..."</string>
-    <string name="contextmenu_add_contact" msgid="8395100913366045250">"Ongeza mwasiliani"</string>
+    <string name="contextmenu_add_contact" msgid="8395100913366045250">"Ongeza mtu"</string>
     <string name="contextmenu_send_mail" msgid="8301941130009797208">"Tuma barua pepe"</string>
     <string name="contextmenu_map" msgid="7721544518698532954">"Ramani"</string>
     <string name="contextmenu_sharelink" msgid="6213520416250245200">"Shiriki kiungo"</string>
@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> mpya"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Kimya"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Vitendo vya kuweka kwenye kumbukumbu na kufuta"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Onyesha kumbukumbu pekee"</item>
+    <item msgid="5737880287951287278">"Onyesha futa pekee"</item>
+    <item msgid="4279948809971752573">"Onyesha kumbukumbu na futa"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Onyesha kumbukumbu pekee"</item>
+    <item msgid="8350973578419775975">"Onyesha futa pekee"</item>
+    <item msgid="2967059853409454648">"Onyesha kumbukumbu na futa"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Vitendo vya kuweka kwenye kumbukumbu na kufuta"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Jibu wote"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Tumia kama chaguo-msingi la majibu ya ujumbe"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Papasa hadi kwenye kumbukumbu"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Papasa ili kufuta"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Picha ya mtumaji"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Onyesha kando ya jina katika orodha ya mazungumzo"</string>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Fungua menyu"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Funga menyu"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Gusa picha ya mtumaji ili uchague mazungumzo hayo."</string>
 </resources>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 4d118b9..bb3a981 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> ข้อความใหม่"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"เงียบ"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"การดำเนินการ \"เก็บ\" และ \"ลบ\""</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"แสดงเฉพาะ \"เก็บ\""</item>
+    <item msgid="5737880287951287278">"แสดงเฉพาะ \"ลบ\""</item>
+    <item msgid="4279948809971752573">"แสดง \"เก็บ\" และ \"ลบ\""</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"แสดงเฉพาะ \"เก็บ\""</item>
+    <item msgid="8350973578419775975">"แสดงเฉพาะ \"ลบ\""</item>
+    <item msgid="2967059853409454648">"แสดง \"เก็บ\" และ \"ลบ\""</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"การดำเนินการ \"เก็บ\" และ \"ลบ\""</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"ตอบทั้งหมด"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ใช้เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"กวาดนิ้วเพื่อเก็บถาวร"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"กวาดนิ้วเพื่อลบ"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"เปิดช่องการนำทาง"</string>
     <string name="drawer_close" msgid="2764774620737876943">"ปิดช่องการนำทาง"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"แตะภาพผู้ส่งเพื่อเลือกการสนทนานั้น"</string>
 </resources>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 0c6875f..6fd8fcc 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> (na) bagong mensahe"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Naka-silent"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Mga pagkilos na i-archive at tanggalin"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"I-archive lang ang ipakita"</item>
+    <item msgid="5737880287951287278">"Tanggalin lang ang ipakita"</item>
+    <item msgid="4279948809971752573">"Ipakita ang i-archive at tanggalin"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Archive lang ang ipakita"</item>
+    <item msgid="8350973578419775975">"Tanggalin lang ang ipakita"</item>
+    <item msgid="2967059853409454648">"Ipakita ang i-archive at tanggalin"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Mga pagkilos na i-archive at tanggalin"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Tumugon sa lahat"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Gamitin bilang default para sa mga tugon sa mensahe"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Mag-swipe upang i-archive"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"I-swipe upang tanggalin"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Sa listahan ng pag-uusap"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Larawan ng nagpadala"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Ipakita sa tabi ng pangalan sa listahan ng pag-uusap"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Pumidot ng larawan ng nagpadala upang piliin ang pag-uusap na iyon."</string>
 </resources>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3aaa362..f9a5cb8 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> yeni ileti"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Sessiz"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Arşivleme ve silme işlemleri"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Yalnızca arşivlemeyi göster"</item>
+    <item msgid="5737880287951287278">"Yalnızca silmeyi göster"</item>
+    <item msgid="4279948809971752573">"Arşivlemeyi ve silmeyi göster"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Yalnızca arşivlemeyi göster"</item>
+    <item msgid="8350973578419775975">"Yalnızca silmeyi göster"</item>
+    <item msgid="2967059853409454648">"Arşivlemeyi ve silmeyi göster"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Arşivleme ve silme işlemleri"</string>
     <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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Arşivlemek için hızlıca kaydırın"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Silmek için hızlıca kaydırın"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"İleti dizisi listesinde"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Gönderen resmi"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"İleti dizisi listesinde adın yanında göster"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"İlgili ileti dizisini seçmek için gönderenin resmine dokunun."</string>
 </resources>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 5b9ffa3..1e24260 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"Нових повідомлень: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Без звуку"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Архівування та видалення"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Показувати лише архівування"</item>
+    <item msgid="5737880287951287278">"Показувати лише видалення"</item>
+    <item msgid="4279948809971752573">"Показувати архівування та видалення"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Показувати лише архівування"</item>
+    <item msgid="8350973578419775975">"Показувати лише видалення"</item>
+    <item msgid="2967059853409454648">"Показувати архівування та видалення"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Архівування та видалення"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Відповісти всім"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Використовувати за умовчанням для відповідей на повідомлення"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Провести пальцем, щоб архівувати"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Провести пальцем, щоб видалити"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Висунути навігаційну панель"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Сховати навігаційну панель"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Торкніться зображення відправника, щоб вибрати бесіду."</string>
 </resources>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 3a97497..7349c2a 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> tin nhắn mới"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Im lặng"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Tác vụ lưu trữ và xóa"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Chỉ hiển thị tác vụ lưu trữ"</item>
+    <item msgid="5737880287951287278">"Chỉ hiển thị tác vụ xóa"</item>
+    <item msgid="4279948809971752573">"Hiển thị tác vụ lưu trữ và xóa"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Chỉ hiển thị tác vụ lưu trữ"</item>
+    <item msgid="8350973578419775975">"Chỉ hiển thị tác vụ xóa"</item>
+    <item msgid="2967059853409454648">"Hiển thị tác vụ lưu trữ và xóa"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Tác vụ lưu trữ và xóa"</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>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Vuốt để lưu trữ"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"Vuốt để xóa"</string>
     <string name="preference_swipe_description" msgid="5132683510510041028">"Trong danh sách cuộc hội thoại"</string>
     <string name="preference_sender_image_title" msgid="2441320893522058724">"Ảnh người gửi"</string>
     <string name="preference_sender_image_description" msgid="7126493917536558232">"Hiển thị bên cạnh tên trong danh sách cuộc hội thoại"</string>
@@ -409,6 +409,5 @@
   </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>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Chạm vào hình ảnh của người gửi để chọn cuộc hội thoại đó."</string>
 </resources>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 88124b7..6028e56 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g>封新邮件"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"静音"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"归档和删除操作"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"仅显示归档的邮件"</item>
+    <item msgid="5737880287951287278">"仅显示删除的邮件"</item>
+    <item msgid="4279948809971752573">"显示归档和删除的邮件"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"仅显示归档的邮件"</item>
+    <item msgid="8350973578419775975">"仅显示删除的邮件"</item>
+    <item msgid="2967059853409454648">"显示归档和删除的邮件"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"归档和删除操作"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"全部回复"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"用作默认的邮件回复方式"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"滑动即可归档"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"滑动即可删除"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航栏"</string>
     <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航栏"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"触摸发件人头像即可选择该会话。"</string>
 </resources>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b15e417..fd0b864 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> 封新郵件"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>：<xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"靜音"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"封存及刪除動作"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"僅顯示封存的郵件"</item>
+    <item msgid="5737880287951287278">"僅顯示刪除的郵件"</item>
+    <item msgid="4279948809971752573">"顯示封存和刪除的郵件"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"僅顯示封存的郵件"</item>
+    <item msgid="8350973578419775975">"僅顯示刪除的郵件"</item>
+    <item msgid="2967059853409454648">"顯示封存和刪除的郵件"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"封存及刪除動作"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"回覆所有人"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"設為預設回信方式"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"滑動即可封存"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"滑動即可刪除"</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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"開啟導覽匣"</string>
     <string name="drawer_close" msgid="2764774620737876943">"關閉導覽匣"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"輕觸寄件者圖片即可選取該會話群組。"</string>
 </resources>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 2ce345b..c169fa9 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -378,22 +378,22 @@
     <string name="new_messages" msgid="4419173946074516420">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo emisha"</string>
     <string name="single_new_message_notification_title" msgid="4138237430881084155">"<xliff:g id="SENDER">%1$s</xliff:g>: <xliff:g id="SUBJECT">%2$s</xliff:g>"</string>
     <string name="silent_ringtone" msgid="5856834572357761687">"Thulile"</string>
-    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
-    <skip />
-    <!-- no translation found for prefEntries_removal_action:0 (1938422987822134657) -->
-    <!-- no translation found for prefEntries_removal_action:1 (5737880287951287278) -->
-    <!-- no translation found for prefEntries_removal_action:2 (4279948809971752573) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:0 (492039800376391677) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:1 (8350973578419775975) -->
-    <!-- no translation found for prefSummaries_removal_action_summary:2 (2967059853409454648) -->
-    <!-- no translation found for prefDialogTitle_removal_action (6225642737241938453) -->
-    <skip />
+    <string name="preference_removal_action_title" msgid="6585232628422090835">"Izenzo zokufaka kungobo yomlando nokususa"</string>
+  <string-array name="prefEntries_removal_action">
+    <item msgid="1938422987822134657">"Bonisa ingobo yomlando kuphela"</item>
+    <item msgid="5737880287951287278">"Bonisa ukususa kuphela"</item>
+    <item msgid="4279948809971752573">"Bonisa ingobo yomlando nokususa"</item>
+  </string-array>
+  <string-array name="prefSummaries_removal_action_summary">
+    <item msgid="492039800376391677">"Bonisa ingobo yomlando kuphela"</item>
+    <item msgid="8350973578419775975">"Bonisa ukususa kuphela"</item>
+    <item msgid="2967059853409454648">"Bonisa ingobo yomlando nokususa"</item>
+  </string-array>
+    <string name="prefDialogTitle_removal_action" msgid="6225642737241938453">"Izenzo zokufaka kungobo yomlando nokususa"</string>
     <string name="preferences_default_reply_all_title" msgid="7088691949152598569">"Phendula konke"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Sebenzisa njengokuzenzakalelayo kuzimpendulo zomlayezo"</string>
-    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
-    <skip />
-    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
-    <skip />
+    <string name="preference_swipe_title_archive" msgid="1178014339238995814">"Swayipha ukuze ufake kungobo yomlando"</string>
+    <string name="preference_swipe_title_delete" msgid="8611320022727435597">"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>
@@ -409,6 +409,5 @@
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Vula ukuzulazula kwekhabethe"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Vala ukuzulazula kwekhabethe"</string>
-    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
-    <skip />
+    <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Thinta isithombe somthumeli ukuze ukhethe ingxoxo."</string>
 </resources>

diff --git a/src/com/android/mail/ContactInfo.java b/src/com/android/mail/ContactInfo.java
index 8bf446f..b7cecb8 100644
--- a/src/com/android/mail/ContactInfo.java
+++ b/src/com/android/mail/ContactInfo.java

@@ -23,11 +23,25 @@
 public class ContactInfo {
     public final Uri contactUri;
     public final Integer status;
+    public final byte[] photoBytes;
     public final Bitmap photo;
 
+    public ContactInfo(Uri contactUri, Integer status) {
+        this(contactUri, status, null, null);
+    }
+
+    public ContactInfo(Uri contactUri, Integer status, byte[] photoBytes) {
+        this(contactUri, status, photoBytes, null);
+    }
+
     public ContactInfo(Uri contactUri, Integer status, Bitmap photo) {
+        this(contactUri, status, null, photo);
+    }
+
+    private ContactInfo(Uri contactUri, Integer status, byte[] photoBytes, Bitmap photo) {
         this.contactUri = contactUri;
         this.status = status;
+        this.photoBytes = photoBytes;
         this.photo = photo;
     }
 

diff --git a/src/com/android/mail/SenderInfoLoader.java b/src/com/android/mail/SenderInfoLoader.java
index c9ada75..5d01ad4 100644
--- a/src/com/android/mail/SenderInfoLoader.java
+++ b/src/com/android/mail/SenderInfoLoader.java

@@ -21,6 +21,7 @@
 import com.google.common.collect.Maps;
 
 import android.content.AsyncTaskLoader;
+import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.Loader;
@@ -90,6 +91,24 @@
         if (mSenders == null || mSenders.isEmpty()) {
             return null;
         }
+
+        return loadContactPhotos(
+                getContext().getContentResolver(), mSenders, true /* decodeBitmaps */);
+    }
+
+    /**
+     * Loads contact photos from the ContentProvider.
+     * @param resolver {@link ContentResolver} to use in queries to the ContentProvider.
+     * @param senderSet The email addresses of the sender images to return.
+     * @param decodeBitmaps If {@code true}, decode the bitmaps and put them into
+     *                      {@link ContactInfo}. Otherwise, just put the raw bytes of the photo
+     *                      into the {@link ContactInfo}.
+     * @return A mapping of email addresses to {@link ContactInfo}s. The {@link ContactInfo} will
+     * contain either a byte array or an actual decoded bitmap for the sender image.
+     */
+    public static ImmutableMap<String, ContactInfo> loadContactPhotos(
+            final ContentResolver resolver, final Set<String> senderSet,
+            final boolean decodeBitmaps) {
         Cursor cursor = null;
 
         Map<String, ContactInfo> results = Maps.newHashMap();
@@ -97,7 +116,7 @@
         // temporary structures
         Map<Long, Pair<String, ContactInfo>> photoIdMap = Maps.newHashMap();
         ArrayList<String> photoIdsAsStrings = new ArrayList<String>();
-        ArrayList<String> senders = getTruncatedQueryParams(mSenders);
+        ArrayList<String> senders = getTruncatedQueryParams(senderSet);
 
         // Build first query
         StringBuilder query = new StringBuilder()
@@ -107,7 +126,7 @@
         query.append(')');
 
         try {
-            cursor = getContext().getContentResolver().query(Data.CONTENT_URI, DATA_COLS,
+            cursor = resolver.query(Data.CONTENT_URI, DATA_COLS,
                     query.toString(), toStringArray(senders), null /* sortOrder */);
 
             if (cursor == null) {
@@ -125,7 +144,7 @@
                     status = cursor.getInt(DATA_STATUS_COLUMN);
                 }
 
-                ContactInfo result = new ContactInfo(contactUri, status, null);
+                ContactInfo result = new ContactInfo(contactUri, status);
 
                 if (!cursor.isNull(DATA_PHOTO_ID_COLUMN)) {
                     long photoId = cursor.getLong(DATA_PHOTO_ID_COLUMN);
@@ -148,7 +167,7 @@
             appendQuestionMarks(query, photoIdsAsStrings);
             query.append(')');
 
-            cursor = getContext().getContentResolver().query(Data.CONTENT_URI, PHOTO_COLS,
+            cursor = resolver.query(Data.CONTENT_URI, PHOTO_COLS,
                     query.toString(), toStringArray(photoIdsAsStrings), null /* sortOrder */);
 
             if (cursor == null) {
@@ -167,10 +186,16 @@
                 String email = prev.first;
                 ContactInfo prevResult = prev.second;
 
-                Bitmap photo = BitmapFactory.decodeByteArray(photoBytes, 0, photoBytes.length);
-                // overwrite existing photo-less result
-                results.put(email,
-                        new ContactInfo(prevResult.contactUri, prevResult.status, photo));
+                if (decodeBitmaps) {
+                    Bitmap photo = BitmapFactory.decodeByteArray(photoBytes, 0, photoBytes.length);
+                    // overwrite existing photo-less result
+                    results.put(email,
+                            new ContactInfo(prevResult.contactUri, prevResult.status, photo));
+                } else {
+                    // overwrite existing photoBytes-less result
+                    results.put(email, new ContactInfo(
+                            prevResult.contactUri, prevResult.status, photoBytes));
+                }
             }
         } finally {
             if (cursor != null) {

diff --git a/src/com/android/mail/photomanager/ContactPhotoManager.java b/src/com/android/mail/photomanager/ContactPhotoManager.java
index 03a5aae..2cf23bb 100644
--- a/src/com/android/mail/photomanager/ContactPhotoManager.java
+++ b/src/com/android/mail/photomanager/ContactPhotoManager.java

@@ -27,9 +27,12 @@
 import android.text.TextUtils;
 import android.util.LruCache;
 
+import com.android.mail.ContactInfo;
+import com.android.mail.SenderInfoLoader;
 import com.android.mail.ui.ImageCanvas;
 import com.android.mail.utils.LogUtils;
 import com.google.common.base.Objects;
+import com.google.common.collect.ImmutableMap;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -134,7 +137,7 @@
         }
 
         @Override
-        public Object getKey() {
+        public String getKey() {
             return emailAddress;
         }
 
@@ -197,81 +200,17 @@
         }
 
         @Override
-        protected Map<Object, byte[]> queryForPhotos(Set<Object> photoIds) {
-            Map<Object, byte[]> photos = new HashMap<Object, byte[]>(photoIds.size());
-
-            if (photoIds == null || photoIds.isEmpty()) {
-                return photos;
-            }
-
-            String[] photoIdArgs = new String[photoIds.size()];
-            int i = 0;
-            for (Object id : photoIds) {
-                photoIdArgs[i++] = String.valueOf(id);
-            }
-
-            // first try getting photos from Contacts
-            Cursor contactCursor = null;
-            try {
-                contactCursor = getResolver().query(Data.CONTENT_URI, COLUMNS,
-                        createInQuery(Photo._ID, photoIdArgs.length),
-                        photoIdArgs, null);
-                while (contactCursor.moveToNext()) {
-                    Long id = contactCursor.getLong(0);
-                    byte[] bytes = contactCursor.getBlob(1);
-                    photoIds.remove(id);
-                    photos.put(id, bytes);
-                }
-            } finally {
-                if (contactCursor != null) {
-                    contactCursor.close();
-                }
-            }
-
-            Iterator<Object> iterator = photoIds.iterator();
-            // then try to get the rest from Profiles
-            // FIXME: try to do this in a single query, if possible
-            while (iterator.hasNext()) {
-                Long id = (Long) iterator.next();
-                if (ContactsContract.isProfileId(id)) {
-                    Cursor profileCursor = null;
-                    try {
-                        profileCursor = getResolver().query(
-                                ContentUris.withAppendedId(Data.CONTENT_URI, id),
-                                COLUMNS, null, null, null);
-                        if (profileCursor != null && profileCursor.moveToFirst()) {
-                            photos.put(profileCursor.getLong(0), profileCursor.getBlob(1));
-                        } else {
-                            // Couldn't load a photo this way either.
-                            photos.put(id, null);
-                        }
-                    } finally {
-                        if (profileCursor != null) {
-                            profileCursor.close();
-                        }
-                    }
-                } else {
-                    // Not a profile photo and not found - mark the cache accordingly
-                    photos.put(id, null);
-                }
-                iterator.remove();
-            }
-
-            return photos;
-        }
-
-        @Override
-        protected Map<Object, byte[]> loadPhotos(Collection<Request> requests) {
-            Map<Object, byte[]> photos = new HashMap<Object, byte[]>(requests.size());
+        protected Map<String, byte[]> loadPhotos(Collection<Request> requests) {
+            Map<String, byte[]> photos = new HashMap<String, byte[]>(requests.size());
 
             Set<String> addresses = new HashSet<String>();
-            Set<Object> photoIds = new HashSet<Object>();
+            Set<Long> photoIds = new HashSet<Long>();
             HashMap<Long, String> photoIdMap = new HashMap<Long, String>();
 
             Long match;
             String emailAddress;
             for (Request request : requests) {
-                emailAddress = (String) request.getKey();
+                emailAddress = request.getKey();
                 match = mPhotoIdCache.get(emailAddress);
                 if (match != null) {
                     photoIds.add(match);
@@ -281,58 +220,14 @@
                 }
             }
 
-            if (addresses.size() > 0) {
-                String[] selectionArgs = new String[addresses.size()];
-                addresses.toArray(selectionArgs);
-                Cursor photoIdsCursor = null;
-                try {
-                    StringBuilder query = new StringBuilder().append(Data.MIMETYPE).append("='")
-                            .append(Email.CONTENT_ITEM_TYPE).append("' AND ").append(Email.DATA)
-                            .append(" IN (");
-                    appendQuestionMarks(query, addresses.size());
-                    query.append(')');
-                    photoIdsCursor = getResolver().query(Data.CONTENT_URI, DATA_COLS,
-                            query.toString(), selectionArgs, null /* sortOrder */);
-                    Long id;
-                    String contactAddress;
-                    if (photoIdsCursor != null) {
-                        while (photoIdsCursor.moveToNext()) {
-                            id = photoIdsCursor.getLong(DATA_PHOTO_ID_COLUMN);
-                            // In case there are multiple contacts for this
-                            // contact, try to always pick the one that actually
-                            // has a photo.
-                            if (!photoIdsCursor.isNull(DATA_PHOTO_ID_COLUMN)) {
-                                contactAddress = photoIdsCursor.getString(DATA_EMAIL_COLUMN);
-                                photoIds.add(id);
-                                photoIdMap.put(id, contactAddress);
-                                cachePhotoId(id, contactAddress);
-                            }
-                        }
-                    }
-                } finally {
-                    if (photoIdsCursor != null) {
-                        photoIdsCursor.close();
-                    }
-                }
-            }
-            if (photoIds != null && photoIds.size() > 0) {
-                Map<Object, byte[]> photosFromIds = queryForPhotos(photoIds);
+            // get the Map of email addresses to ContactInfo
+            ImmutableMap<String, ContactInfo> emailAddressToContactInfoMap =
+                    SenderInfoLoader.loadContactPhotos(
+                    getResolver(), addresses, false /* decodeBitmaps */);
 
-                for (Object id : photosFromIds.keySet()) {
-                    byte[] bytes = photosFromIds.get(id);
-                    photos.put(photoIdMap.get(id), bytes);
-                }
-            }
-
-            // TODO(mindyp): this optimization assumes that contact photos don't
-            // change/ update that often, and if you didn't have a matching id
-            // for a contact before, you probably won't be getting it any time soon.
-            for (String a : addresses) {
-                if (!photoIdMap.containsValue(a)) {
-                    // We couldn't find a matching photo id at all, so just
-                    // cache this as needing a default image.
-                    photos.put(a, null);
-                }
+            // put all entries into photos map: mapping of email addresses to photoBytes
+            for(Map.Entry<String, ContactInfo> entry : emailAddressToContactInfoMap.entrySet()) {
+                photos.put(entry.getKey(), entry.getValue().photoBytes);
             }
 
             return photos;

diff --git a/src/com/android/mail/photomanager/PhotoManager.java b/src/com/android/mail/photomanager/PhotoManager.java
index f1d7467..1c3a69c 100644
--- a/src/com/android/mail/photomanager/PhotoManager.java
+++ b/src/com/android/mail/photomanager/PhotoManager.java

@@ -502,7 +502,7 @@
          * bitmap. Instead, the default image provider will be used.
          */
         public boolean isValid();
-        public Object getKey();
+        public String getKey();
     }
 
     /**
@@ -511,16 +511,10 @@
     protected abstract class PhotoLoaderThread extends HandlerThread implements Callback {
 
         /**
-         * Do a query on one or more ContentProviders and return the resulting
-         * photos. Remove from photoIds the processed ids.
-         */
-        protected abstract Map<Object, byte[]> queryForPhotos(Set<Object> photoIds);
-
-        /**
          * Return photos mapped from {@link Request#getKey()} to the photo for
          * that request.
          */
-        protected abstract Map<Object, byte[]> loadPhotos(Collection<Request> requests);
+        protected abstract Map<String, byte[]> loadPhotos(Collection<Request> requests);
 
         private static final int MESSAGE_LOAD_PHOTOS = 0;
 
@@ -587,12 +581,12 @@
                     }
                 }
             }
-            final Map<Object, byte[]> photosMap = loadPhotos(loadRequests);
+            final Map<String, byte[]> photosMap = loadPhotos(loadRequests);
             if (DEBUG) LogUtils.d(TAG,
                     "worker thread completed read request batch. inputN=%s outputN=%s",
                     loadRequests.size(),
                     photosMap.size());
-            for (Object key : photosMap.keySet()) {
+            for (String key : photosMap.keySet()) {
                 if (DEBUG) LogUtils.d(TAG,
                         "worker thread completed read request key=%s byteCount=%s thread=%s",
                         key,
@@ -606,7 +600,7 @@
                     continue;
                 }
 
-                final Object key = r.getKey();
+                final String key = r.getKey();
                 final BitmapHolder holder = sBitmapHolderCache.get(key);
                 if (holder == null || holder.bytes == null || !holder.fresh) {
                     continue;
@@ -724,7 +718,7 @@
             mView = view;
             viewGeneration = view.getGeneration();
 
-            final Object key = getKey();
+            final String key = getKey();
             // TODO: consider having the client pass in the desired width/height, which would be
             // faster and more direct.
             mView.getDesiredDimensions(key, sWorkDims);
@@ -781,12 +775,12 @@
             return sb.toString();
         }
 
-        public Object getKey() {
+        public String getKey() {
             return mPhotoIdentifier.getKey();
         }
 
         public void applyDefaultImage() {
-            final Object key = getKey();
+            final String key = getKey();
             if (mView.getGeneration() != viewGeneration) {
                 // This can legitimately happen when an ImageCanvas is reused and re-purposed to
                 // house a new set of images (e.g. by ListView recycling).

diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index b4bff71..d9c2887 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java

@@ -657,7 +657,6 @@
                 ((FolderItemView) view).overrideUnreadCount(
                         mCurrentFolderForUnreadCheck.unreadCount);
             }
-            LogUtils.d(LOG_TAG, "FLF.getView(%d) returns view of item %s", position, item);
             return view;
         }
 

diff --git a/src/com/android/mail/utils/NotificationUtils.java b/src/com/android/mail/utils/NotificationUtils.java
index f0eff62..ea799dd 100644
--- a/src/com/android/mail/utils/NotificationUtils.java
+++ b/src/com/android/mail/utils/NotificationUtils.java

@@ -106,7 +106,7 @@
      * Clears all notifications in response to the user tapping "Clear" in the status bar.
      */
     public static void clearAllNotfications(Context context) {
-        LogUtils.v(LOG_TAG, "Clearing all notifications.");
+        LogUtils.v(LOG_TAG, "NotificationUtils: Clearing all notifications.");
         final NotificationMap notificationMap = getNotificationMap(context);
         notificationMap.clear();
         notificationMap.saveNotificationMap(context);
@@ -433,7 +433,7 @@
         notificationMap.saveNotificationMap(context);
 
         if (LogUtils.isLoggable(LOG_TAG, LogUtils.VERBOSE)) {
-            LogUtils.v(LOG_TAG, "New email: %s mapSize: %d getAttention: %b",
+            LogUtils.v(LOG_TAG, "NotificationUtils: New email: %s mapSize: %d getAttention: %b",
                     createNotificationString(notificationMap), notificationMap.size(),
                     getAttention);
         }
@@ -456,8 +456,8 @@
 
         final NotificationMap notificationMap = getNotificationMap(context);
         if (LogUtils.isLoggable(LOG_TAG, LogUtils.VERBOSE)) {
-            LogUtils.v(LOG_TAG, "Validating Notification: %s mapSize: %d folder: %s "
-                    + "getAttention: %b", createNotificationString(notificationMap),
+            LogUtils.v(LOG_TAG, "NotificationUtils: Validating Notification: %s mapSize: %d "
+                    + "folder: %s getAttention: %b", createNotificationString(notificationMap),
                     notificationMap.size(), folder.name, getAttention);
         }
         // The number of unread messages for this account and label.
@@ -484,8 +484,8 @@
             // Make sure the unseen count matches the number of items in the cursor.  But, we don't
             // want to overwrite a 0 unseen count that was specified in the intent
             if (unseenCount != 0 && unseenCount != cursorUnseenCount) {
-                LogUtils.d(LOG_TAG,
-                        "Unseen count doesn't match cursor count.  unseen: %d cursor count: %d",
+                LogUtils.d(LOG_TAG, "NotificationUtils: "
+                        + "Unseen count doesn't match cursor count.  unseen: %d cursor count: %d",
                         unseenCount, cursorUnseenCount);
                 unseenCount = cursorUnseenCount;
             }
@@ -576,7 +576,8 @@
                     }
 
                     if (notificationIntent == null) {
-                        LogUtils.e(LOG_TAG, "Null intent when building notification");
+                        LogUtils.e(LOG_TAG, "NotificationUtils: "
+                                + "Null intent when building notification");
                         return;
                     }
 
@@ -599,7 +600,7 @@
                 notification.setOnlyAlertOnce(true);
             }
 
-            LogUtils.d(LOG_TAG, "Account: %s vibrate: %s", account.name,
+            LogUtils.d(LOG_TAG, "NotificationUtils: Account: %s vibrate: %s", account.name,
                     Boolean.toString(folderPreferences.isNotificationVibrateEnabled()));
 
             int defaults = 0;
@@ -618,7 +619,8 @@
 
                     notification.setSound(TextUtils.isEmpty(ringtoneUri) ? null
                             : Uri.parse(ringtoneUri));
-                    LogUtils.d(LOG_TAG, "New email in %s vibrateWhen: %s, playing notification: %s",
+                    LogUtils.d(LOG_TAG, "NotificationUtils: "
+                            + "New email in %s vibrateWhen: %s, playing notification: %s",
                             account.name, vibrate, ringtoneUri);
                 }
             }
@@ -648,8 +650,8 @@
     private static Intent createViewConversationIntent(final Context context, final Account account,
             final Folder folder, final Cursor cursor) {
         if (folder == null || account == null) {
-            LogUtils.e(LOG_TAG, "Null account or folder.  account: %s folder: %s",
-                    account, folder);
+            LogUtils.e(LOG_TAG, "NotificationUtils#createViewConversationIntent(): "
+                    + "Null account or folder.  account: %s folder: %s", account, folder);
             return null;
         }
 
@@ -703,7 +705,7 @@
             final Folder folder, final long when) {
         final Resources res = context.getResources();
 
-        LogUtils.w(LOG_TAG, "Showing notification with unreadCount of %d and "
+        LogUtils.w(LOG_TAG, "NotificationUtils: Showing notification with unreadCount of %d and "
                 + "unseenCount of %d", unreadCount, unseenCount);
 
         String notificationTicker = null;
@@ -788,7 +790,7 @@
                                         sendersLength, notificationAccount);
                             } else {
                                 if (from == null) {
-                                    LogUtils.e(LOG_TAG, "null from string in " +
+                                    LogUtils.e(LOG_TAG, "NotificationUtils: null from string in " +
                                             "configureLatestEventInfoFromConversation");
                                     from = "";
                                 }
@@ -904,7 +906,7 @@
                         bigText.bigText(getSingleMessageBigText(context,
                                 conversation.subject, message));
                     } else {
-                        LogUtils.e(LOG_TAG, "Failed to load message");
+                        LogUtils.e(LOG_TAG, "NotificationUtils: Failed to load message");
                         message = null;
                     }
 
@@ -997,7 +999,7 @@
         SpannableString prevSender = null;
         for (SpannableString sender : styledSenders) {
             if (sender == null) {
-                LogUtils.e(LOG_TAG, "null sender while iterating over styledSenders");
+                LogUtils.e(LOG_TAG, "NotificationUtils: null sender iterating over styledSenders");
                 continue;
             }
             CharacterStyle[] spans = sender.getSpans(0, sender.length(), CharacterStyle.class);
@@ -1497,7 +1499,8 @@
      * Clears the notifications for the specified account/folder/conversation.
      */
     public static void clearFolderNotification(Context context, Account account, Folder folder) {
-        LogUtils.v(LOG_TAG, "Clearing all notifications for %s/%s", account.name, folder.name);
+        LogUtils.v(LOG_TAG, "NotificationUtils: Clearing all notifications for %s/%s", account.name,
+                folder.name);
         final NotificationMap notificationMap = getNotificationMap(context);
         final NotificationKey key = new NotificationKey(account, folder);
         notificationMap.remove(key);
@@ -1673,7 +1676,7 @@
 
         @Override
         public String toString() {
-            return account.toString() + " " + folder.name;
+            return account.name + " " + folder.name;
         }
 
         @Override
commit	a9430830dcc0e3edcc99298b5c6d25dcc0eda784	[log] [tgz]
author	Vikram Aggarwal <viki@google.com>	Thu May 09 20:24:57 2013 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu May 09 20:24:58 2013 +0000
tree	3c1b88670dc9d3dd6dfebb2153793d434c32ea6f
parent	e8a7c4c94cc2e391c6d2b5ade74ca842bc6b3a84 [diff]
parent	5b62a95abaefd7cc1d58b71a90edc6e5f26691ec [diff]