Import translations. DO NOT MERGE

Change-Id: Idacd354d13b0bac59fee0ea9654abe01663bcc1d
Auto-generated-cl: translation import

51 files changed, 837 insertions, 667 deletions

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 115ad8ec8..51f2e9320 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwyder handeling"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Argiveer gesprekke"</item>
-    <item msgid="1894624633891654411">"Vee gesprekke uit"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Argiveer gesprekke eerder as om uit te vee"</item>
-    <item msgid="6515786566522105643">"Vee gesprekke uit eerder as om te argiveer"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Verwyder handeling"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Sleep om te verwyder"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"In gespreklys"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Trek af om te verfris"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kyk tans vir pos"</string>
     <string name="empty_trash" msgid="652435297593538512">"Maak asblik leeg"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d6fe6d440..7b6215e31 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"እርምጃ አስወግድ"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"ውይይቶችን በማህደር ያስቀምጡ"</item>
-    <item msgid="1894624633891654411">"ውይይቶችን ይሰርዙ"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"ውይይቶች ከመሰረዝ ይልቅ በማህደር አስቀመጥ"</item>
-    <item msgid="6515786566522105643">"ውይይቶች በማህደር ከማስቀመጥ ይልቅ ሰርዝ"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"እርምጃ አስወግድ"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"ለሁሉም ምላሽ ይስጡ"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ለመልዕክት ምላሾች እንደ ነባሪ ይጠቀሙ"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"ለማስወገድ ያንሸራትቱ"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"በውይይት ዝርዝር ውስጥ"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"በውይይት ዝርዝር ውስጥ"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"የላኪ ምስል"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"በውይይት ዝርዝር ውስጥ ከስም ጎን አሳይ"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"ለማደስ ወደ ታች ያንሸራትቱ"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"መልዕክት በማየት ላይ"</string>
     <string name="empty_trash" msgid="652435297593538512">"መጣያውን አጽዳ"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c6d07d68f..c450d5592 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -378,32 +378,37 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"إجراء الإزالة"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"وضع المحادثات في الأرشيف"</item>
-    <item msgid="1894624633891654411">"حذف المحادثات"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"وضع المحادثات في الأرشيف بدلاً من حذفها"</item>
-    <item msgid="6515786566522105643">"حذف المحادثات بدلاً من وضعها في الأرشيف"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"إجراء الإزالة"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"الرد على الكل"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"الاستخدام كافتراضي مع ردود الرسائل"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"تمرير سريع للإزالة"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"في قائمة المحادثات"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"في قائمة المحادثات"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"صورة المرسل"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"عرض بجوار الاسم في قائمة الدردشات"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"التمرير لأسفل للتحديث"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"التحقق من وجود بريد"</string>
     <string name="empty_trash" msgid="652435297593538512">"إفراغ المهملات"</string>
     <string name="empty_spam" msgid="6064497180615519589">"إفراغ مجلد الرسائل غير المرغوب فيها"</string>
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"هل تريد إفراغ المهملات؟"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"هل تريد إفراغ مجلد الرسائل غير المرغوب فيها؟"</string>
-    <!-- no translation found for empty_folder_dialog_message:one (7530191630810420066) -->
-    <!-- no translation found for empty_folder_dialog_message:other (2182899395748020953) -->
+  <plurals name="empty_folder_dialog_message">
+    <item quantity="one" msgid="7530191630810420066">"سيتم حذف <xliff:g id="COUNT">%1$d</xliff:g> رسالة نهائيًا."</item>
+    <item quantity="other" msgid="2182899395748020953">"سيتم حذف هذه الرسائل البالغ عددها <xliff:g id="COUNT">%1$d</xliff:g> نهائيًا."</item>
+  </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"فتح ساحب التنقل"</string>
     <string name="drawer_close" msgid="2764774620737876943">"إغلاق ساحب التنقل"</string>
+    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
+    <skip />
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index e67bd4a54..3eafb2921 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Выдаліць ​​дзеянне"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Размовы ў архiве"</item>
-    <item msgid="1894624633891654411">"Выдаліць размовы"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Архiваваць, а не выдаляць размовы"</item>
-    <item msgid="6515786566522105643">"Выдаляць, а не архіваваць размовы"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Выдаліць ​​дзеянне"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Адказаць усім"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Выкарыстоўваць у якасці адказу на паведамленні па змаўчанні"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Правядзіце, каб выдалiць"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"У спісе гутарак"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Правядзіце ўніз, каб абнавіць"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Праверка пошты"</string>
     <string name="empty_trash" msgid="652435297593538512">"Ачысціць кошык"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5d6fc47d9..a0cee42af 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действие при премахване"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Архивиране на кореспонденции"</item>
-    <item msgid="1894624633891654411">"Изтриване на кореспонденции"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Архивиране вместо изтриване на кореспонденциите"</item>
-    <item msgid="6515786566522105643">"Изтриване вместо архивиране на кореспонденциите"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Действие при премахване"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Отговор до всички"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Използване като стандартна опция при отговор на съобщения"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Прекарайте пръст, за да премахнете"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"В списък с кореспонденции"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"В списък с кореспонденции"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Изображение на подателя"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Показване до името в списъка с кореспонденции"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Прекарайте пръст надолу, за да опресните"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверява се за поща"</string>
     <string name="empty_trash" msgid="652435297593538512">"Изчистване на кошчето"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 1dec827d0..fdf3c1490 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Suprimeix l\'acció"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arxiva les converses"</item>
-    <item msgid="1894624633891654411">"Suprimeix les converses"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arxiva les converses en comptes de suprimir-les"</item>
-    <item msgid="6515786566522105643">"Suprimeix les converses en comptes d\'arxivar-les"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Suprimeix l\'acció"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Fes lliscar el dit per suprimir"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"A la llista de converses"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Fes lliscar el dit cap avall per actualitzar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"S\'està comprovant si hi ha correu."</string>
     <string name="empty_trash" msgid="652435297593538512">"Buida la paperera"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4c5471abe..0fa7bcad3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akce odstranění"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archivovat konverzace"</item>
-    <item msgid="1894624633891654411">"Smazat konverzace"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Konverzace nemazat, pouze je archivovat"</item>
-    <item msgid="6515786566522105643">"Konverzace mazat, a nikoliv archivovat"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Odebrat akci"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Odpovědět všem"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Použít jako výchozí pro odpovědi na zprávy"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Přejetím prstem odstranit"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"V seznamu konverzací"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Seznam aktualizujete posunutím dolů."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vysypat koš"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index bfff844a8..1a21cd49e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Fjern handling"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arkivér samtaler"</item>
-    <item msgid="1894624633891654411">"Slet samtaler"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arkivér i stedet for at slette samtaler"</item>
-    <item msgid="6515786566522105643">"Slet i stedet for at arkivere samtaler"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Fjern handling"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Svar alle"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Brug som standardsvar på meddelelser"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Stryg med fingeren for at fjerne"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"På samtaleliste"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Stryg ned for at opdatere"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tjekker for e-mails"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tøm papirkurv"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 4f212e5ad..1a910015c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Aktion entfernen"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Konversationen archivieren"</item>
-    <item msgid="1894624633891654411">"Konversationen löschen"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Konversationen archivieren statt löschen"</item>
-    <item msgid="6515786566522105643">"Konversationen löschen statt archivieren"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Entfernungsaktion"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Zum Entfernen wischen"</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_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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d65fcb374..a113cf97f 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Κατάργηση ενέργειας"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Αρχειοθέτηση συνομιλιών"</item>
-    <item msgid="1894624633891654411">"Διαγραφή συνομιλιών"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Αρχειοθέτηση αντί για διαγραφή συνομιλιών"</item>
-    <item msgid="6515786566522105643">"Διαγραφή αντί για αρχειοθέτηση συνομιλιών"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Κατάργηση ενέργειας"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Απάντηση σε όλους"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Χρήση ως προεπιλογή για απαντήσεις μηνυμάτων"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Σύρετε για να καταργήσετε"</string>
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
+    <skip />
     <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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 131c70589..240c3b840 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remove action"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archive conversations"</item>
-    <item msgid="1894624633891654411">"Delete conversations"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Archive rather than delete conversations"</item>
-    <item msgid="6515786566522105643">"Delete rather than archive conversations"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Remove action"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Swipe to remove"</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_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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-es-rUS-sw600dp/strings.xml b/res/values-es-rUS-sw600dp/strings.xml
index 70e5214d6..9c8b1bfd5 100644
--- a/res/values-es-rUS-sw600dp/strings.xml
+++ b/res/values-es-rUS-sw600dp/strings.xml
@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ CC/CCO"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ CCO"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Administrar carpetas"</string>
-    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Usar como opción predeterminada para responder notif. de mensajes"</string>
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Usar como opción predeterminada para responder mensajes"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 6b4e63726..f1733f796 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Acción de eliminar"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archivar conversaciones"</item>
-    <item msgid="1894624633891654411">"Eliminar conversaciones"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Archivar en lugar de eliminar conversaciones"</item>
-    <item msgid="6515786566522105643">"Eliminar en lugar de archivar conversaciones"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Acción de eliminar"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"En lista de conversaciones"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Desliza el dedo hacia abajo para actualizar."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Comprobando si hay correo electrónico…"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vaciar papelera"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ec4e82101..6c9cbb877 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminar acción"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archivar conversaciones"</item>
-    <item msgid="1894624633891654411">"Eliminar conversaciones"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Archivar las conversaciones en lugar de eliminarlas"</item>
-    <item msgid="6515786566522105643">"Eliminar las conversaciones en lugar de archivarlas"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eliminar acció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="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Usar como opción predeterminada para responder mensajes"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar para eliminar"</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_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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 2c0b040bd..cb2c03950 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eemalda toiming"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arhiveeri vestlused"</item>
-    <item msgid="1894624633891654411">"Kustuta vestlused"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Kustutamise asemel arhiivite meilivestlused"</item>
-    <item msgid="6515786566522105643">"Arhiivimise asemel kustutate meilivestlused"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eemalda toiming"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Vasta kõigile"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Kasuta vaikeseadena sõnumitele vastamisel"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Pühkige eemaldamiseks"</string>
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
+    <skip />
     <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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cd2526908..c3b783393 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"عملکرد حذف"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"بایگانی کردن مکالمات"</item>
-    <item msgid="1894624633891654411">"حذف مکالمات"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"مکالمات به جای حذف شدن بایگانی شوند"</item>
-    <item msgid="6515786566522105643">"مکالمات به جای بایگانی شدن حذف شوند"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"عملکرد حذف"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"پاسخ به همه"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"به‌ عنوان پیش‌فرض برای پاسخ‌ پیام استفاده شود"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"برای حذف انگشت خود را روی صفحه بکشید"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"در لیست مکالمه"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"در لیست مکالمه"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"تصویر فرستنده"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"نمایش در کنار نام در فهرست مکالمه"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"برای بازخوانی، صفحه را با انگشت به سمت پایین بکشید"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"در حال بررسی برای ایمیل"</string>
     <string name="empty_trash" msgid="652435297593538512">"خالی کردن پوشه حذف‌ شده‌ها"</string>
@@ -404,8 +405,10 @@
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"خالی کردن پوشه هرزنامه؟"</string>
   <plurals name="empty_folder_dialog_message">
     <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> پیام به طور دائم حذف خواهد شد."</item>
-    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> پیام به طور دائم حذف خواهند شد."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> پیام به طور دائم حذف خواهد شد."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"باز کردن کشوی پیمایش"</string>
     <string name="drawer_close" msgid="2764774620737876943">"بستن کشوی پیمایش"</string>
+    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 5d79e586c..4224e0622 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Poista toiminto"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arkistoi keskusteluja"</item>
-    <item msgid="1894624633891654411">"Poista keskusteluja"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arkistoi keskustelut poistamisen sijaan"</item>
-    <item msgid="6515786566522105643">"Poista keskustelut arkistoinnin sijaan"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Poistotoiminto"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Vastaa kaikille"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Käytä oletuksena vastauksissa"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Poista liu\'uttamalla sormea"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Keskusteluluettelossa"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Päivitä liu\'uttamalla alas"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tarkistetaan sähköposteja"</string>
     <string name="empty_trash" msgid="652435297593538512">"Tyhjennä roskakori"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9b5c88662..e7889045c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Supprimer"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archiver les conversations"</item>
-    <item msgid="1894624633891654411">"Supprimer les conversations"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Archiver les conversations au lieu de les supprimer"</item>
-    <item msgid="6515786566522105643">"Supprimer les conversations au lieu de les archiver"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Action de suppression"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Répondre à tous"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utiliser ce paramètre par défaut pour les réponses"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Faire glisser l\'élément pour le supprimer"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Dans la liste des conversations"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Faire glisser le doigt vers le bas pour actualiser"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Vérification des e-mails en cours…"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vider la corbeille"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b79acf451..40e36782e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"निकालने की कार्यवाही"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"बातचीत संगृहीत करें"</item>
-    <item msgid="1894624633891654411">"बातचीत हटाएं"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"बातचीतों को हटाने के बजाय संगृहीत करें"</item>
-    <item msgid="6515786566522105643">"बातचीतों को संगृहीत करने के बजाए हटाएं"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"निकालने की कार्यवाही"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"सभी को जवाब दें"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"संदेश के जवाबों के लिए डिफ़ॉल्ट के रूप में उपयोग करें"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"निकालने के लिए स्वाइप करें"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"बातचीत की सूची में"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"बातचीत की सूची में"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"प्रेषक का चित्र"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"बातचीत सूची में नाम के पास दिखाएं"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"रीफ्रेश करने के लिए नीचे स्वाइप करें"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"मेल के लिए जांच की जा रही है"</string>
     <string name="empty_trash" msgid="652435297593538512">"ट्रैश रिक्त करें"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 1c8b60ebb..275e311e7 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Uklanjanje radnje"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arhiviranje razgovora"</item>
-    <item msgid="1894624633891654411">"Brisanje razgovora"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Umjesto brisanja razgovori se arhiviraju"</item>
-    <item msgid="6515786566522105643">"Umjesto arhiviranja razgovori se brišu"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Uklanjanje radnje"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Prijeđite prstom da biste uklonili"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Na popisu razgovora"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Prijeđite prstom prema dolje za osvježivanje"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Provjeravanje pošte"</string>
     <string name="empty_trash" msgid="652435297593538512">"Pražnjenje otpada"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1344261f8..8c3fd168c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eltávolítási művelet"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Beszélgetések archiválása"</item>
-    <item msgid="1894624633891654411">"Beszélgetések törlése"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"A beszélgetések archiválása törlés helyett"</item>
-    <item msgid="6515786566522105643">"A beszélgetések törlése archiválás helyett"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eltávolítási művelet"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Csúsztassa gyorsan az ujját az eltávolításhoz"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Beszélgetéslistában"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Frissítéshez húzza le"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"E-mail ellenőrzése"</string>
     <string name="empty_trash" msgid="652435297593538512">"Kuka ürítése"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 99be6a102..f78a4b5cb 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -76,7 +76,7 @@
     <string name="menu_change_folders" msgid="1542713666608888717">"Ganti folder"</string>
     <string name="menu_move_to" msgid="9138296669516358542">"Pindahkan ke"</string>
     <string name="menu_manage_folders" msgid="6755623004628177492">"Setelan folder"</string>
-    <string name="menu_show_original" msgid="4227060689700765828">"Balikkan pengubahan ukuran otomatis"</string>
+    <string name="menu_show_original" msgid="4227060689700765828">"Balikkan ubah ukuran otomatis"</string>
     <string name="message_modified" msgid="2564340197585393687">"(Pesan ini telah diubah dari versi aslinya untuk menyesuaikan dengan layar.)"</string>
     <string name="folder_list_title" msgid="4276644062440415214">"Folder"</string>
     <string name="folder_list_more" msgid="537172187223133825">"Lainnya"</string>
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Tindakan penghapusan"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Mengarsipkan percakapan"</item>
-    <item msgid="1894624633891654411">"Hapus percakapan"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arsipkan, bukan hapus percakapan"</item>
-    <item msgid="6515786566522105643">"Hapus, bukan arsipkan percakapan"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Tindakan penghapusan"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Gesek untuk menghapus"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam daftar percakapan"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Gesek ke bawah untuk menyegarkan"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Memeriksa email"</string>
     <string name="empty_trash" msgid="652435297593538512">"Kosongkan Sampah"</string>
@@ -403,9 +404,11 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Kosongkan Sampah?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Kosongkan Spam?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> pesan akan dihapus selamanya."</item>
-    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> pesan akan dihapus selamanya."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> pesan akan dihapus secara permanen."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> pesan akan dihapus secara permanen."</item>
   </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 />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 97c0382cd..5ef61d95e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Azione rimozione"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archivia conversazioni"</item>
-    <item msgid="1894624633891654411">"Elimina conversazioni"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Archivia anziché eliminare le conversazioni"</item>
-    <item msgid="6515786566522105643">"Elimina anziché archiviare le conversazioni"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Azione rimozione"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Fai scorrere per rimuovere"</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_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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 427c306d9..c458cfa31 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"פעולת הסרה"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"העבר שיחות לארכיון"</item>
-    <item msgid="1894624633891654411">"מחק שיחות"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"העבר הודעות לארכיון במקום למחוק אותן"</item>
-    <item msgid="6515786566522105643">"מחק הודעות במקום להעביר אותן לארכיון"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"פעולת הסרה"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"השב לכולם"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"השתמש כברירת מחדל עבור תשובה להודעות"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"החלק כדי להסיר"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"ברשימת השיחות"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"ברשימת השיחות"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"תמונת השולח"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"הצג לצד השם ברשימת השיחות"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"החלק מטה לביצוע רענון"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"בודק אם יש דואר"</string>
     <string name="empty_trash" msgid="652435297593538512">"רוקן את האשפה"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 29c768b45..f59e3e440 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"削除操作"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"スレッドをアーカイブする"</item>
-    <item msgid="1894624633891654411">"スレッドを削除する"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"スレッドを削除せずにアーカイブする"</item>
-    <item msgid="6515786566522105643">"スレッドをアーカイブせずに削除する"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"削除操作"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"全員に返信"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"返信時のデフォルトとして使用する"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"スワイプして削除"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"スレッドリスト内"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"スレッドリスト内"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"送信者の画像"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"スレッドリストの名前の横に表示します"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下にスワイプして更新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"メールを確認しています"</string>
     <string name="empty_trash" msgid="652435297593538512">"ゴミ箱を空にする"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 92bc1859a..e139eda83 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"삭제 작업"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"대화 보관처리"</item>
-    <item msgid="1894624633891654411">"대화 삭제"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"대화를 삭제하지 않고 보관처리"</item>
-    <item msgid="6515786566522105643">"대화를 보관처리하지 않고 삭제"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"작업 삭제"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"전체답장"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"메일 답장 시 기본값으로 사용"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"스와이프하여 삭제"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"대화 목록"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"대화 목록"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"발신자 이미지"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"대화 목록에서 이름 옆에 표시"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"아래로 스와이프하여 새로고침"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"메일 확인 중"</string>
     <string name="empty_trash" msgid="652435297593538512">"휴지통 비우기"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f63e6269e..2343124ff 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Pašalinti veiksmą"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archyvuoti pokalbius"</item>
-    <item msgid="1894624633891654411">"Ištrinti pokalbius"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Pokalbius archyvuoti, o ne ištrinti"</item>
-    <item msgid="6515786566522105643">"Pokalbius ištrinti, o ne archyvuoti"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Pašalinti veiksmą"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Jei norite pašalinti, perbraukite"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Pokalbių sąraše"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Perbraukite žemyn, kad atnaujintumėte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Ieškoma laiškų"</string>
     <string name="empty_trash" msgid="652435297593538512">"Išvalyti šiukšliadėžę"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 72d279fe6..5bfa1c479 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Noņemšanas darbība"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arhivēt sarunas"</item>
-    <item msgid="1894624633891654411">"Dzēst sarunas"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arhivēt, nevis dzēst sarunas"</item>
-    <item msgid="6515786566522105643">"Dzēst, nevis arhivēt sarunas"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Noņemšanas darbība"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Vilkt, lai noņemtu"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Sarunu sarakstā"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Lai atsvaidzinātu, velciet uz leju."</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Notiek e-pasta pārbaude"</string>
     <string name="empty_trash" msgid="652435297593538512">"Iztukšot atkritni"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2c21dc44e..61510fb7a 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -378,26 +378,27 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alih keluar tindakan"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arkibkan perbualan"</item>
-    <item msgid="1894624633891654411">"Padam perbualan"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arkibkan bukannya padam perbualan"</item>
-    <item msgid="6515786566522105643">"Padam bukannya arkibkan perbualan"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Alih keluar tindakan"</string>
+    <!-- no translation found for 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 />
-    <string name="preference_swipe_title" msgid="807579971507624260">"Leret untuk mengalih keluar"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Dalam senarai perbualan"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Leret ke bawah untuk memuat semula"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Menyemak mel"</string>
     <string name="empty_trash" msgid="652435297593538512">"Kosongkan Sampah"</string>
@@ -410,4 +411,6 @@
   </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 />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 04a3de896..ce5f54c7f 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Handling for fjerning"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arkivér samtaler"</item>
-    <item msgid="1894624633891654411">"Slett samtaler"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arkivér samtaler i stedet for å slette dem"</item>
-    <item msgid="6515786566522105643">"Slett samtaler i stedet for å arkivere dem"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Handling for fjerning"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Sveip for å fjerne"</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_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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index dc0adff92..707bd3905 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Verwijderen"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Conversaties archiveren"</item>
-    <item msgid="1894624633891654411">"Conversaties verwijderen"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Conversaties archiveren in plaats van deze te verwijderen"</item>
-    <item msgid="6515786566522105643">"Conversaties verwijderen in plaats van deze te archiveren"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Actie voor verwijderen"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Vegen om te verwijderen"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"In conversatielijst"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Veeg omlaag om te vernieuwen"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Controleren op e-mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Prullenbak leegmaken"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 263a905e1..656a137bf 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -376,24 +376,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Usuń czynność"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archiwizowanie wątków"</item>
-    <item msgid="1894624633891654411">"Usuń wątki"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Archiwizuj wątki zamiast je usuwać"</item>
-    <item msgid="6515786566522105643">"Usuwaj wątki zamiast je archiwizować"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Usuń czynność"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Odpowiedz wszystkim"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Używaj domyślnie podczas odpowiadania na wiadomości"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Przesuń palcem, by usunąć"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Na liście wątków"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Przesuń w dół, by odświeżyć"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Sprawdzam pocztę"</string>
     <string name="empty_trash" msgid="652435297593538512">"Opróżnij kosz"</string>
@@ -406,4 +407,6 @@
   </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 />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0747fe13b..5610a9525 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Remover ação"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arquivar conversas"</item>
-    <item msgid="1894624633891654411">"Eliminar conversas"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arquivar conversas em vez de as eliminar"</item>
-    <item msgid="6515786566522105643">"Eliminar conversas em vez de as arquivar"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Remover ação"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Responder a todos"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilizar como predefinição para respostas a mensagens"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Deslizar rapidamente para remover"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize rapidamente para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"A verificar a existência de correio"</string>
     <string name="empty_trash" msgid="652435297593538512">"Esvaziar Lixo"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 046e0cf2a..749bffad0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -378,26 +378,27 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ação de remoção"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arquivar conversas"</item>
-    <item msgid="1894624633891654411">"Excluir conversas"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arquivar conversas em vez de excluí-las"</item>
-    <item msgid="6515786566522105643">"Excluir conversas em vez de arquivá-las"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Ação de remoção"</string>
+    <!-- no translation found for 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 />
-    <string name="preference_swipe_title" msgid="807579971507624260">"Deslize para remover"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Na lista de conversas"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Deslize para baixo para atualizar"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Verificando e-mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Esvaziar lixeira"</string>
@@ -410,4 +411,6 @@
   </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 />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 36d592c1c..638225073 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -590,19 +590,23 @@
     <skip />
     <!-- no translation found for silent_ringtone (5856834572357761687) -->
     <skip />
-    <!-- no translation found for preference_archive_vs_delete_title (6469574019069966937) -->
+    <!-- no translation found for preference_removal_action_title (6585232628422090835) -->
     <skip />
-    <!-- no translation found for prefEntries_archive_vs_delete:0 (7861611617238166527) -->
-    <!-- no translation found for prefEntries_archive_vs_delete:1 (1894624633891654411) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:0 (6388312490146989386) -->
-    <!-- no translation found for prefSummaries_archive_vs_delete_summary:1 (6515786566522105643) -->
-    <!-- no translation found for prefDialogTitle_archive_vs_delete (8526388308897297454) -->
+    <!-- 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 (807579971507624260) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
     <!-- no translation found for preference_swipe_description (5132683510510041028) -->
     <skip />
@@ -628,4 +632,6 @@
     <skip />
     <!-- no translation found for drawer_close (2764774620737876943) -->
     <skip />
+    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4123d0de0..3258efcb5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Eliminați"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arhivați conversațiile"</item>
-    <item msgid="1894624633891654411">"Ștergeți conversațiile"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arhivați, nu ștergeți conversațiile"</item>
-    <item msgid="6515786566522105643">"Ștergeți, nu arhivați conversațiile"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Eliminați"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Răspundeți tuturor"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Utilizați ca setare prestabilită pentru răspunsurile la mesaje"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Glisați pentru a elimina"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"În lista de conversații"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Glisați în jos pentru actualizare"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Se verifică e-mailurile"</string>
     <string name="empty_trash" msgid="652435297593538512">"Goliți coșul de gunoi"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 105d42df4..165af6cf9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Действия при удалении"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Архивировать цепочки"</item>
-    <item msgid="1894624633891654411">"Удалять цепочки"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Архивировать, а не удалять цепочки"</item>
-    <item msgid="6515786566522105643">"Удалять, а не архивировать цепочки"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Действия при удалении"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Отвечать всем"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Использовать по умолчанию для всех ответов"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Удаление при смахивании"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"В списке цепочек"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"В списке цепочек"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Фотографии отправителей"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Показывать рядом с именами в списке цепочек"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Пролистните вниз, чтобы обновить"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверка почты…"</string>
     <string name="empty_trash" msgid="652435297593538512">"Очистить корзину"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 03649de98..95297bcf1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Akcia odstránenia"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Archivácia konverzácií"</item>
-    <item msgid="1894624633891654411">"Odstrániť konverzácie"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Konverzácie radšej archivovať, neodstrániť"</item>
-    <item msgid="6515786566522105643">"Konverzácie radšej odstrániť, nearchivovať"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Akcia odstránenia"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Odpovedať všetkým"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Použiť ako predvolenú možnosť pre odpovede na správy"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Odstrániť posunutím"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"V zozname konverzácií"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Potiahnutím nadol obnovte"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Kontrola pošty"</string>
     <string name="empty_trash" msgid="652435297593538512">"Vyprázdniť kôš"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0069c0762..c8b0ea555 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Dejanje odstranitve"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arhiviranje pogovorov"</item>
-    <item msgid="1894624633891654411">"Brisanje pogovorov"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Arhiviranje pogovorov, ne brisanje"</item>
-    <item msgid="6515786566522105643">"Brisanje pogovorov, ne arhiviranje"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Dejanje odstranitve"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Odgovori vsem"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Uporabi kot privzeto za odgovore na sporočila"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Povlecite za odstranitev"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Na seznamu pogovorov"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Za osvežitev povlecite navzdol"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Preverjanje pošte"</string>
     <string name="empty_trash" msgid="652435297593538512">"Izprazni smetnjak"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f4d9570b7..fa72cf609 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Радња уклањања"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Архивирај преписке"</item>
-    <item msgid="1894624633891654411">"Избриши преписке"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Архивирање уместо брисања преписки"</item>
-    <item msgid="6515786566522105643">"Брисање уместо архивирања преписки"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Радња уклањања"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Одговори свима"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Коришћење ове опције као подразумеване за одговоре на поруке"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Превуците да бисте уклонили"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"На листи преписки"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"На листи преписки"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"Слика пошиљаоца"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"Приказивање поред имена на листи преписки"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Листајте надоле да бисте освежили"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Проверавање поште"</string>
     <string name="empty_trash" msgid="652435297593538512">"Пражњење директоријума за отпад"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 095e5bedd..8d98c3c51 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ta bort åtgärd"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Arkivera konversationer"</item>
-    <item msgid="1894624633891654411">"Ta bort konversationer"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Ta bort i stället för att arkivera konversationer"</item>
-    <item msgid="6515786566522105643">"Ta bort i stället för att arkivera konversationer"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Ta bort åtgärd"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Svara alla"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Använd som standard för svar på meddelanden"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Ta bort genom att dra"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"I konversationslista"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Dra nedåt om du vill uppdatera"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Söker efter e-post"</string>
     <string name="empty_trash" msgid="652435297593538512">"Töm papperskorgen"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-sw-sw600dp/strings.xml b/res/values-sw-sw600dp/strings.xml
index c1e39c634..1ea08ab65 100644
--- a/res/values-sw-sw600dp/strings.xml
+++ b/res/values-sw-sw600dp/strings.xml
@@ -21,5 +21,5 @@
     <string name="add_cc_label" msgid="6156834609108442458">"+ Nakala kwa/Nakala fiche kwa"</string>
     <string name="add_bcc_label" msgid="7648769906379235693">"+ Nakala fiche kwa"</string>
     <string name="menu_manage_folders" msgid="7574962882483466700">"Dhibiti folda"</string>
-    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Tumia kama chaguo-msingi ya majibu ya ujumbe wa arifa"</string>
+    <string name="preferences_default_reply_all_summary" msgid="5318418012992612729">"Tumia kama chaguo-msingi ya majibu kwa arifa za ujumbe"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index e69ba60ac..faf3b7394 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -378,34 +378,37 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Ondoa kitendo"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Mazungumzo yaliyo kwenye kumbukumbu"</item>
-    <item msgid="1894624633891654411">"Futa mazungumzo"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Jalidi badala ya kufuta mazungumzo"</item>
-    <item msgid="6515786566522105643">"Futa badala ya kuweka kwenye kumbukumbu za mazungumzo"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Ondoa kitendo"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Jibu wote"</string>
-    <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Tumia kama chaguo-msingi au majibu ya ujumbe"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Papasa ili uondoe"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Katika orodha ya mazungumzo"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <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_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Papasa kwa kasi kwenda chini ili kuonyesha upya"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Inaangalia barua pepe"</string>
     <string name="empty_trash" msgid="652435297593538512">"Safisha Tupio"</string>
     <string name="empty_spam" msgid="6064497180615519589">"Ondoa Barua taka"</string>
-    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Je, ungependa Kusafisha Tupio?"</string>
-    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Je, ungependa Kuondoa Barua taka"</string>
+    <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Ungependa Kusafisha Tupio?"</string>
+    <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Ungependa Kuondoa Barua taka?"</string>
   <plurals name="empty_folder_dialog_message">
     <item quantity="one" msgid="7530191630810420066">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> utafutwa kabisa."</item>
     <item quantity="other" msgid="2182899395748020953">"Ujumbe <xliff:g id="COUNT">%1$d</xliff:g> utafutwa kabisa."</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"Fungua menyu"</string>
     <string name="drawer_close" msgid="2764774620737876943">"Funga menyu"</string>
+    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a24ebdb54..4d118b9fa 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"ลบการทำงาน"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"เก็บการสนทนา"</item>
-    <item msgid="1894624633891654411">"ลบการสนทนา"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"เก็บถาวรการสนทนาแทนการลบ"</item>
-    <item msgid="6515786566522105643">"ลบการสนทนาแทนการเก็บถาวร"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"ลบการทำงาน"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"ตอบทั้งหมด"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"ใช้เป็นค่าเริ่มต้นสำหรับการตอบกลับข้อความ"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"กวาดนิ้วเพื่อนำออก"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"ในรายการการสนทนา"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"ในรายการการสนทนา"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"ภาพของผู้ส่ง"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"แสดงข้างชื่อในรายการสนทนา"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"กวาดลงเพื่อรีเฟรช"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"กำลังตรวจดูจดหมาย"</string>
     <string name="empty_trash" msgid="652435297593538512">"ลบทุกอย่างในถังขยะ"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 25d8354f1..0c6875f31 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Alisin ang pagkilos"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Mag-archive ng mga pag-uusap"</item>
-    <item msgid="1894624633891654411">"Tanggalin ang mga pag-uusap"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"I-archive sa halip na tanggalin ang mga pag-uusap"</item>
-    <item msgid="6515786566522105643">"Tanggalin sa halip na i-archive ang mga pag-uusap"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Alisin ang pagkilos"</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="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>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Mag-swipe upang alisin"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Sa listahan ng pag-uusap"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Mag-swipe pababa upang mag-refresh"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Tumitingin ng mail"</string>
     <string name="empty_trash" msgid="652435297593538512">"Alisan ng Laman ang Basurahan"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 58bcbd66d..3aaa36241 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Kaldırma işlemi"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"İleti dizilerini arşivle"</item>
-    <item msgid="1894624633891654411">"İleti dizilerini sil"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"İleti dizilerini silmek yerine arşivleyin"</item>
-    <item msgid="6515786566522105643">"İleti dizilerini arşivlemek yerine silin"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Kaldırma işlemi"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Yanıtı tüm alıcılara gönder"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"İleti yanıtlarında varsayılan olarak kullan"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Kaldırmak için hızlıca kaydırın"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"İleti dizisi listesinde"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Yenilemek için aşağı hızlıca kaydırın"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Posta kontrol ediliyor"</string>
     <string name="empty_trash" msgid="652435297593538512">"Çöp Kutusunu Boşalt"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 6fd397e3b..5b9ffa36e 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Вилучити дію"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Архівувати бесіди"</item>
-    <item msgid="1894624633891654411">"Видаляти бесіди"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Архівувати, а не видаляти бесіди"</item>
-    <item msgid="6515786566522105643">"Видаляти, а не архівувати бесіди"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Вилучити дію"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Відповісти всім"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Використовувати за умовчанням для відповідей на повідомлення"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Проведіть пальцем, щоб вилучити"</string>
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
+    <skip />
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
+    <skip />
     <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>
@@ -406,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e4e6b9ee3..3a97497c3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Xóa tác vụ"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Lưu trữ các cuộc trò chuyện"</item>
-    <item msgid="1894624633891654411">"Xóa các cuộc trò chuyện"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Lưu trữ thay vì xóa các cuộc trò chuyện"</item>
-    <item msgid="6515786566522105643">"Xóa thay vì lưu trữ các cuộc trò chuyện"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Xóa tác vụ"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"Trả lời tất cả"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Sử dụng làm mặc định cho trả lời thư"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Vuốt để xóa"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"Trong danh sách cuộc hội thoại"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <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>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"Vuốt xuống để làm mới"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"Đang kiểm tra thư"</string>
     <string name="empty_trash" msgid="652435297593538512">"Xóa sạch thùng rác"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index af592da0e..88124b744 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"删除操作"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"归档会话"</item>
-    <item msgid="1894624633891654411">"删除会话"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"将会话归档（而不是删除）"</item>
-    <item msgid="6515786566522105643">"删除会话（而不是归档）"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"删除操作"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"全部回复"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"用作默认的邮件回复方式"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"滑动即可删除"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"在会话列表中"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"在会话列表中"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"发件人头像"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"在会话列表中的名称旁显示"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"下拉即可刷新"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在检查邮件"</string>
     <string name="empty_trash" msgid="652435297593538512">"清空已删除邮件"</string>
@@ -403,9 +404,11 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"要清空已删除邮件吗？"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"要清空垃圾邮件吗？"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将遭到永久删除。"</item>
-    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将遭到永久删除。"</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将会永久删除。"</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g>封邮件将会永久删除。"</item>
   </plurals>
     <string name="drawer_open" msgid="6074646853178471940">"打开抽屉式导航栏"</string>
     <string name="drawer_close" msgid="2764774620737876943">"关闭抽屉式导航栏"</string>
+    <!-- no translation found for conversation_photo_welcome_text (4274875219447670662) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 22a5efbc4..b15e41763 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -378,24 +378,25 @@
     <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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"移除動作"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"封存會話群組"</item>
-    <item msgid="1894624633891654411">"刪除會話群組"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"封存會話群組 (不刪除)"</item>
-    <item msgid="6515786566522105643">"刪除會話群組 (不封存)"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"移除動作"</string>
+    <!-- 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="preferences_default_reply_all_title" msgid="7088691949152598569">"回覆所有人"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"設為預設回信方式"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"滑動即可移除"</string>
-    <string name="preference_swipe_description" msgid="5132683510510041028">"在會話群組清單中"</string>
-    <!-- no translation found for preference_sender_image_title (2441320893522058724) -->
+    <!-- no translation found for preference_swipe_title_archive (1178014339238995814) -->
     <skip />
-    <!-- no translation found for preference_sender_image_description (7126493917536558232) -->
+    <!-- no translation found for preference_swipe_title_delete (8611320022727435597) -->
     <skip />
+    <string name="preference_swipe_description" msgid="5132683510510041028">"在會話群組清單中"</string>
+    <string name="preference_sender_image_title" msgid="2441320893522058724">"寄件者圖片"</string>
+    <string name="preference_sender_image_description" msgid="7126493917536558232">"在會話群組清單中的名稱旁邊顯示"</string>
     <string name="swipe_down_to_refresh" msgid="6401908905820786227">"向下滑動即可重新整理"</string>
     <string name="checking_for_mail" msgid="2301797903350897130">"正在檢查郵件"</string>
     <string name="empty_trash" msgid="652435297593538512">"清空垃圾筒"</string>
@@ -408,4 +409,6 @@
   </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 />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index aa93cf139..2ce345b6a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -378,19 +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>
-    <string name="preference_archive_vs_delete_title" msgid="6469574019069966937">"Susa isenzo"</string>
-  <string-array name="prefEntries_archive_vs_delete">
-    <item msgid="7861611617238166527">"Faka kungobo yomlando izingxoxo"</item>
-    <item msgid="1894624633891654411">"Susa izingxoxo"</item>
-  </string-array>
-  <string-array name="prefSummaries_archive_vs_delete_summary">
-    <item msgid="6388312490146989386">"Faka kungobo yomlando kunokuthi ususe izingxoxo"</item>
-    <item msgid="6515786566522105643">"Susa kunokuthi ufake kungobo yomlando izingxoxo"</item>
-  </string-array>
-    <string name="prefDialogTitle_archive_vs_delete" msgid="8526388308897297454">"Susa isenzo"</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="preferences_default_reply_all_title" msgid="7088691949152598569">"Phendula konke"</string>
     <string name="preferences_default_reply_all_summary" msgid="7389395579918128940">"Sebenzisa njengokuzenzakalelayo kuzimpendulo zomlayezo"</string>
-    <string name="preference_swipe_title" msgid="807579971507624260">"Swayipha ukuze ususe"</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_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>
@@ -401,9 +404,11 @@
     <string name="empty_trash_dialog_title" msgid="3248644791068595150">"Sula konke kudoti?"</string>
     <string name="empty_spam_dialog_title" msgid="8091014690336479280">"Sula konke kugaxekile?"</string>
   <plurals name="empty_folder_dialog_message">
-    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> umlayezo ozosuswa ngonaphakade."</item>
-    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo ezosuswa ngonaphakade."</item>
+    <item quantity="one" msgid="7530191630810420066">"<xliff:g id="COUNT">%1$d</xliff:g> umlayezo ozosuswa unaphakade."</item>
+    <item quantity="other" msgid="2182899395748020953">"<xliff:g id="COUNT">%1$d</xliff:g> imilayezo ezosuswa unaphakade."</item>
   </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 />
 </resources>