diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index fa0c62d2cf..aaa50dbf37 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2668,20 +2668,20 @@
   <string name="conversation_callable_secure__menu_video">مكالمة Signal بالفيديو</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">معلومات</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">معلومات</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">نسخ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">نسخ</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">حذف</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">حذف</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">إعادة التوجيه</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">إعادة التوجيه</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">إعادة الإرسال</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">إعادة الإرسال</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">الرَّدّ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">الرَّدّ</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">اختيار متعدد</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">اختيار متعدد</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 7fba642907..cc991cdbb0 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -2326,20 +2326,20 @@
   <string name="conversation_callable_secure__menu_video">Signal görüntülü zəngi</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Məlumat</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Məlumat</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopyala</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopyala</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Sil</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Sil</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Yönləndir</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Yönləndir</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Mesajı yenidən göndər</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Mesajı yenidən göndər</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Cavabla</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Cavabla</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Çoxlu seçim</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Çoxlu seçim</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d seçildi</item>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 543ab364b0..d731957054 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -2174,20 +2174,20 @@
   <string name="conversation_callable_secure__menu_video">Видео разговор чрез Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Информация</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Информация</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Копирай</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Копирай</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Изтрий</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Изтрий</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Препращане</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Препращане</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Повторно изпращане</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Повторно изпращане</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Отговори</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Отговори</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Изберете няколко</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Изберете няколко</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 383dc80d74..1a35a835ed 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -2302,20 +2302,20 @@
   <string name="conversation_callable_secure__menu_video">Signal ভিডিও কল</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">তথ্য</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">তথ্য</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">কপি করুন</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">কপি করুন</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">মুছুন</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">মুছুন</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ফরওয়ার্ড</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ফরওয়ার্ড</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">বার্তা পুনরায় পাঠান</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">বার্তা পুনরায় পাঠান</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">প্রত্যুত্তর</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">প্রত্যুত্তর</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">একাধিক নির্বাচন করুন</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">একাধিক নির্বাচন করুন</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index a42954c5a4..07e4a9a27b 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -2413,20 +2413,20 @@
   <string name="conversation_callable_secure__menu_video">Signal videopoziv</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informacije</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informacije</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopiraj</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopiraj</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Izbriši</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Izbriši</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Proslijedi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Proslijedi</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Ponovo pošalji poruku</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Ponovo pošalji poruku</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Odgovori</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Odgovori</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Označi nekoliko</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Označi nekoliko</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d označeno</item>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index f1a612dee2..4d90575027 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -2320,20 +2320,20 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <string name="conversation_callable_secure__menu_video">Trucada de vídeo del Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informació</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informació</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copia</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copia</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Suprimits</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Suprimits</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Reenvia</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Reenvia</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Torna a enviar el missatge</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Torna a enviar el missatge</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Respon</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Respon</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Selecció múltiple</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Selecció múltiple</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d de seleccionat</item>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6ddb2ec377..e93aa7dd0c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2499,20 +2499,20 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <string name="conversation_callable_secure__menu_video">Signal video hovor</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopírovat</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopírovat</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Smazat</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Smazat</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Přeposlat</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Přeposlat</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Znovu poslat zprávu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Znovu poslat zprávu</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Odpověď</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Odpověď</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Vícenásobný výběr</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Vícenásobný výběr</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d vybrána</item>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 4782844fed..1e8092b1f1 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -2502,20 +2502,20 @@ Send neges heb ei ddiogelu?</string>
   <string name="conversation_callable_secure__menu_video">Galwad fideo Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Gwyb</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Gwyb</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copïo</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copïo</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Dileu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Dileu</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Ymlaen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Ymlaen</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Ailanfon y neges</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Ailanfon y neges</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Ymateb</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Ymateb</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Dewis nifer</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Dewis nifer</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d wedi\'i d/ddewis</item>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index c68ef86af5..33c3234b5e 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -2325,20 +2325,20 @@ nummer (%s) er ugyldigt</string>
   <string name="conversation_callable_secure__menu_video">Signal-videoopkald</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Information</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Information</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopiér</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopiér</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Slet</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Slet</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Videresend</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Videresend</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Send beskeden igen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Send beskeden igen</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Besvar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Besvar</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Vælg flere</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Vælg flere</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d valgt</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6993963154..c0fa9f7bea 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2315,20 +2315,20 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="conversation_callable_secure__menu_video">Signal-Videoanruf</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopieren</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopieren</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Löschen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Löschen</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Weiter­leiten</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Weiter­leiten</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Nachricht erneut senden</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Nachricht erneut senden</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Antworten</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Antworten</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Mehrere auswählen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Mehrere auswählen</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d ausgewählt</item>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6cad6c95cf..27741be8b5 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2321,20 +2321,20 @@
   <string name="conversation_callable_secure__menu_video">Βιντεοκλήση Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Πληροφορίες</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Πληροφορίες</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Αντιγραφή</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Αντιγραφή</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Διαγραφή</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Διαγραφή</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Προώθηση</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Προώθηση</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Αποστολή ξανά</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Αποστολή ξανά</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Απάντηση</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Απάντηση</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Επιλογή πολλαπλών</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Επιλογή πολλαπλών</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d επιλεγμένο</item>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 9c88a11303..8746c326f5 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -2326,20 +2326,20 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
   <string name="conversation_callable_secure__menu_video">Signal-vidalvoko</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informo</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informo</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopii</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopii</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Forigi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Forigi</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Plusendi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Plusendi</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Resendi mesaĝon</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Resendi mesaĝon</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Respondi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Respondi</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Elekti plurajn</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Elekti plurajn</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d elektita</item>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 144611a46f..f7360224eb 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2326,20 +2326,20 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
   <string name="conversation_callable_secure__menu_video">Videollamada de Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Detalles</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Detalles</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copiar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copiar</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Eliminar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Eliminar</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Reenviar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Reenviar</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Reenviar mensaje</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Reenviar mensaje</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Responder</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Responder</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Selección múltiple</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Selección múltiple</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d seleccionado</item>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 23260a9cfd..be840e41d2 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -2245,20 +2245,20 @@
   <string name="conversation_callable_secure__menu_video">Signali videokõne</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Teave</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Teave</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopeeri</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopeeri</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Kustuta</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Kustuta</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Edasta</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Edasta</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Saada sõnum uuesti</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Saada sõnum uuesti</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Vasta</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Vasta</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Vali mitu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Vali mitu</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d valitud</item>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 7c43ba28ba..a9202a2dac 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -2034,14 +2034,14 @@ Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
   <string name="conversation_callable_secure__menu_call">Signal deia</string>
   <string name="conversation_callable_secure__menu_video">Signal bideodeia</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Mezuaren detaileak</string>
-  <string name="conversation_context__menu_copy_text">Testua kopiatu</string>
-  <string name="conversation_context__menu_delete_message">Mezua ezabatu</string>
-  <string name="conversation_context__menu_forward_message">Birbidali mezua</string>
-  <string name="conversation_context__menu_resend_message">Berriro bidali mezua</string>
-  <string name="conversation_context__menu_reply_to_message">Erantzun mezuari</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Mezuaren detaileak</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Testua kopiatu</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Mezua ezabatu</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Birbidali mezua</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Berriro bidali mezua</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Erantzun mezuari</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">Hautapen anitza</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Hautapen anitza</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Eraskina gorde</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 403090a082..baf8b6c9a3 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -2324,20 +2324,20 @@
   <string name="conversation_callable_secure__menu_video">تماس تصویری سیگنال</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">اطلاعات</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">اطلاعات</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">کپی</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">کپی</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">حذف</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">حذف</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">بازارسال</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">بازارسال</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">ارسال مجدد پیام</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">ارسال مجدد پیام</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">پاسخ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">پاسخ</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">انتخاب چندگانه</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">انتخاب چندگانه</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d انتخاب شد</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index be571cbc70..e9cb5f4581 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2320,20 +2320,20 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <string name="conversation_callable_secure__menu_video">Signal-videopuhelu</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Tietoja</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Tietoja</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopioi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopioi</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Poista</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Poista</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Välittäminen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Välittäminen</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Lähetä viesti uudelleen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Lähetä viesti uudelleen</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Vastaa</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Vastaa</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Valitse useita</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Valitse useita</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d valittu</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 0ff761031f..2ec4d6dc15 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2317,20 +2317,20 @@
   <string name="conversation_callable_secure__menu_video">Appel vidéo Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Renseignements</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Renseignements</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copier</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copier</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Supprimer</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Supprimer</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Transférer</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Transférer</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Renvoyer le message</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Renvoyer le message</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Répondre</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Répondre</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Sélection multiple</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Sélection multiple</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d sélectionné</item>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index c9ca93cfea..ce20fe59d2 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -1010,12 +1010,12 @@ a shonrú</string>
   <!--conversation_callable_secure-->
   <string name="conversation_callable_secure__menu_call">Glao Signal</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Sonraí na teachtaireachta</string>
-  <string name="conversation_context__menu_copy_text">Macasamhlaigh an téacs</string>
-  <string name="conversation_context__menu_delete_message">Scrios an teachtaireacht</string>
-  <string name="conversation_context__menu_forward_message">Cuir an teachtaireacht ar aghaidh</string>
-  <string name="conversation_context__menu_resend_message">Athsheol an teachtaireacht</string>
-  <string name="conversation_context__menu_reply_to_message">Freagair an teachtaireacht</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Sonraí na teachtaireachta</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Macasamhlaigh an téacs</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Scrios an teachtaireacht</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Cuir an teachtaireacht ar aghaidh</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Athsheol an teachtaireacht</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Freagair an teachtaireacht</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Cuir an ceangaltán i dtaisce</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 6e365ea164..836609702e 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -2077,20 +2077,20 @@
   <string name="conversation_callable_secure__menu_video">Videochamada Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Información</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Información</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copiar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copiar</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Eliminar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Eliminar</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Reenviar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Reenviar</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Reenviar mensaxe</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Reenviar mensaxe</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Responder</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Responder</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Selección múltiple</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Selección múltiple</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index 37c921e0ba..5778018e5f 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -2195,18 +2195,18 @@
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">કૉપિ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">કૉપિ</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">કાઢી નાખો </string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">કાઢી નાખો </string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ફોરવર્ડ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ફોરવર્ડ</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">મેસેજ ફરીથી મોકલો</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">મેસેજ ફરીથી મોકલો</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">જવાબ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">જવાબ</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">વધારે પસંદ કરો</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">વધારે પસંદ કરો</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-ha/strings.xml b/app/src/main/res/values-ha/strings.xml
index f27db81ccc..dcbdcf4c52 100644
--- a/app/src/main/res/values-ha/strings.xml
+++ b/app/src/main/res/values-ha/strings.xml
@@ -1369,14 +1369,14 @@
   <string name="conversation_callable_secure__menu_call">Kiran Signal</string>
   <string name="conversation_callable_secure__menu_video">Kiran bidiyon Signal</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Karin bayanin sako</string>
-  <string name="conversation_context__menu_copy_text">Kwafa rubutu</string>
-  <string name="conversation_context__menu_delete_message">Goge sako</string>
-  <string name="conversation_context__menu_forward_message">Ingiza sako</string>
-  <string name="conversation_context__menu_resend_message">Sake tura sako</string>
-  <string name="conversation_context__menu_reply_to_message">Amsa sako</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Karin bayanin sako</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kwafa rubutu</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Goge sako</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Ingiza sako</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Sake tura sako</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Amsa sako</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">Zaba da yawa</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Zaba da yawa</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Ajiye kari</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 58292193ac..0811002436 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -2311,20 +2311,20 @@ href=\"https://signal.org/redirect/safety-numbers\">ज़्यादा जा
   <string name="conversation_callable_secure__menu_video">Signal वीडियो कॉल</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">जानकारी</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">जानकारी</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">कॉपी</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">कॉपी</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">डिलीट करें</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">डिलीट करें</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">आगे भेजें</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">आगे भेजें</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">मेसेज दोबारा भेजें</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">मेसेज दोबारा भेजें</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">उत्तर</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">उत्तर</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">कई का चयन करें</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">कई का चयन करें</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index f85a6189eb..d86384735f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -2274,20 +2274,20 @@ broj telefona</string>
   <string name="conversation_callable_secure__menu_video">Signal video poziv</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Detalji</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Detalji</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopiraj</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopiraj</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Izbriši</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Izbriši</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Proslijedi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Proslijedi</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Ponovno pošalji poruku</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Ponovno pošalji poruku</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Odgovori</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Odgovori</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Odaberi više</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Odaberi više</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index fd4c6171a8..e460b0a442 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -2327,20 +2327,20 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <string name="conversation_callable_secure__menu_video">Signal videóhívás</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Részletek</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Részletek</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Másolás</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Másolás</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Törlés</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Törlés</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Továbbítás</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Továbbítás</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Üzenet újraküldése</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Üzenet újraküldése</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Válasz</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Válasz</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Több kiválasztása</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Több kiválasztása</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d kiválasztva</item>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 8f5a240a68..c93f2e8e22 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -2239,20 +2239,20 @@ Menerima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <string name="conversation_callable_secure__menu_video">Panggilan video Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Salin</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Salin</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Hapus</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Hapus</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Teruskan</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Teruskan</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Kirim ulang pesan</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Kirim ulang pesan</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Balas</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Balas</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Pilih beberapa</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Pilih beberapa</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="other">%d dipilih</item>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index ef006117d6..004c7f07d4 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -2325,20 +2325,20 @@
   <string name="conversation_callable_secure__menu_video">Signal-myndsímtal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Upplýsingar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Upplýsingar</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Afrita</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Afrita</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Eyða</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Eyða</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Áfram</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Áfram</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Endursenda skilaboð</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Endursenda skilaboð</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Svara</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Svara</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Velja mörg</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Velja mörg</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d valin</item>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b2cd5db342..7fa2f31405 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2326,20 +2326,20 @@
   <string name="conversation_callable_secure__menu_video">Videochiamata Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informazioni</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informazioni</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copia</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copia</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Elimina</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Elimina</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Inoltra</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Inoltra</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Rinvia il messaggio</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Rinvia il messaggio</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Rispondi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Rispondi</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Selezione multipla</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Selezione multipla</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d selezionato</item>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index cee811d234..1c74dbbdba 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -2500,20 +2500,20 @@
   <string name="conversation_callable_secure__menu_video">שיחת וידאו של Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">מידע</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">מידע</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">העתק</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">העתק</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">מחק</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">מחק</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">העבר הלאה</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">העבר הלאה</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">שלח מחדש הודעה</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">שלח מחדש הודעה</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">השב</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">השב</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">בחר רבים</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">בחר רבים</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d נבחר</item>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 942abfa9eb..8f161043e1 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2229,20 +2229,20 @@
   <string name="conversation_callable_secure__menu_video">Signalビデオ通話</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">詳細</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">詳細</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">コピー</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">コピー</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">削除</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">削除</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">転送</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">転送</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">メッセージの再送信</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">メッセージの再送信</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">返信</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">返信</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">複数を選択</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">複数を選択</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="other">%d件選択済み</item>
diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml
index cc45a0f006..6c81399e49 100644
--- a/app/src/main/res/values-jv/strings.xml
+++ b/app/src/main/res/values-jv/strings.xml
@@ -1356,14 +1356,14 @@
   <string name="conversation_callable_secure__menu_call">Telepon Signal</string>
   <string name="conversation_callable_secure__menu_video">Telepon video Signal</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Rincian pesen</string>
-  <string name="conversation_context__menu_copy_text">Salin teks</string>
-  <string name="conversation_context__menu_delete_message">Brusak pesen</string>
-  <string name="conversation_context__menu_forward_message">Terusaken pesen</string>
-  <string name="conversation_context__menu_resend_message">Kirimaken pesen malih</string>
-  <string name="conversation_context__menu_reply_to_message">Wangsuli pesen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Rincian pesen</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Salin teks</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Brusak pesen</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Terusaken pesen</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Kirimaken pesen malih</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Wangsuli pesen</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">Pileh ingkang kathah</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Pileh ingkang kathah</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Simpen lampiran</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 94ea773dcc..366eb6125b 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -2088,14 +2088,14 @@ i d-tefkiḍ (%s) ur yeɣti ara.</string>
   <string name="conversation_callable_secure__menu_call">Asiwel Signal</string>
   <string name="conversation_callable_secure__menu_video">Asiwel Signal s tvidyut</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Talqayt n yizen</string>
-  <string name="conversation_context__menu_copy_text">Nɣel aḍris</string>
-  <string name="conversation_context__menu_delete_message">Kkes izen</string>
-  <string name="conversation_context__menu_forward_message">Ḍfer izen</string>
-  <string name="conversation_context__menu_resend_message">Azn izen i tikelt nniḍen</string>
-  <string name="conversation_context__menu_reply_to_message">Err i yizen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Talqayt n yizen</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Nɣel aḍris</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Kkes izen</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Ḍfer izen</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Azn izen i tikelt nniḍen</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Err i yizen</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">Fren aṭas</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Fren aṭas</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Sekles taceqquft yaddan</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index f24720d1b3..f9473f6c9a 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -1700,14 +1700,14 @@
   <string name="conversation_callable_secure__menu_call">ការហៅចេញSignal</string>
   <string name="conversation_callable_secure__menu_video">ការហៅ Signal ជាវីដេអូ</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">សារលម្អិត</string>
-  <string name="conversation_context__menu_copy_text">ថតចម្លងអក្សរ</string>
-  <string name="conversation_context__menu_delete_message">លុបសារ</string>
-  <string name="conversation_context__menu_forward_message">បញ្ជូនសារបន្ត</string>
-  <string name="conversation_context__menu_resend_message">ផ្ញើសារឡើងវិញ</string>
-  <string name="conversation_context__menu_reply_to_message">ឆ្លើយតបសារ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">សារលម្អិត</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">ថតចម្លងអក្សរ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">លុបសារ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">បញ្ជូនសារបន្ត</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">ផ្ញើសារឡើងវិញ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">ឆ្លើយតបសារ</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">ជ្រើសរើសច្រើន</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">ជ្រើសរើសច្រើន</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">រក្សាឯកសារភ្ជាប់</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index d153b967ac..49cb31accb 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -2200,18 +2200,18 @@
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">ನಕಲಿಸು</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">ನಕಲಿಸು</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">ಅಳಿಸು</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">ಅಳಿಸು</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ಫಾರ್ವರ್ಡ್</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ಫಾರ್ವರ್ಡ್</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">ಸಂದೇಶ ಪುನಃ ಕಳುಹಿಸಿ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">ಸಂದೇಶ ಪುನಃ ಕಳುಹಿಸಿ</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">ಉತ್ತರಿಸಿ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">ಉತ್ತರಿಸಿ</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">ಬಹು ಆಯ್ಕೆ ಮಾಡಿ </string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">ಬಹು ಆಯ್ಕೆ ಮಾಡಿ </string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 4049795b67..dc57eedce8 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2176,18 +2176,18 @@
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">복사</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">복사</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">삭제</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">삭제</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">전달</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">전달</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">메시지 다시 보내기</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">메시지 다시 보내기</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">답장</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">답장</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">여러 개 선택</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">여러 개 선택</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 9f5834ada2..e0cf67708f 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -1934,14 +1934,14 @@
   <string name="conversation_callable_secure__menu_call">Gerîna Signalê</string>
   <string name="conversation_callable_secure__menu_video">Gerîna vîdoyî ya Signalê</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Hûrgiliyên peyamê</string>
-  <string name="conversation_context__menu_copy_text">Nivîsê kopî bike</string>
-  <string name="conversation_context__menu_delete_message">Peyamê jê bibe</string>
-  <string name="conversation_context__menu_forward_message">Peyamê berhêl bike</string>
-  <string name="conversation_context__menu_resend_message">Peyamê dîsa bişîne</string>
-  <string name="conversation_context__menu_reply_to_message">Peyamê bibersivîne</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Hûrgiliyên peyamê</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Nivîsê kopî bike</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Peyamê jê bibe</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Peyamê berhêl bike</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Peyamê dîsa bişîne</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Peyamê bibersivîne</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">Bijartina pirjimarî</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Bijartina pirjimarî</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Pêvekê tomar bike</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-lg/strings.xml b/app/src/main/res/values-lg/strings.xml
index 35ab310e9f..06b107f726 100644
--- a/app/src/main/res/values-lg/strings.xml
+++ b/app/src/main/res/values-lg/strings.xml
@@ -669,11 +669,11 @@ gy\'olonze (%s) sintuufu.</string>
   <!--conversation_callable_secure-->
   <string name="conversation_callable_secure__menu_call">Essimu ya Signal</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Obulambulukufu bw\'obubaka</string>
-  <string name="conversation_context__menu_copy_text">yozaamu obubaka.</string>
-  <string name="conversation_context__menu_delete_message">Siimula obubaka</string>
-  <string name="conversation_context__menu_forward_message">Sindikirako kumulala obubaka.</string>
-  <string name="conversation_context__menu_resend_message">Ddamu osindike obubaka.</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Obulambulukufu bw\'obubaka</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">yozaamu obubaka.</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Siimula obubaka</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Sindikirako kumulala obubaka.</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Ddamu osindike obubaka.</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Tereka ekigattiddwako.</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f593fb99a2..a2eb278a1d 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -2500,20 +2500,20 @@
   <string name="conversation_callable_secure__menu_video">Signal vaizdo skambutis</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informacija</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informacija</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopijuoti</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopijuoti</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Ištrinti</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Ištrinti</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Persiųsti</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Persiųsti</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Iš naujo siųsti žinutę</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Iš naujo siųsti žinutę</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Atsakyti</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Atsakyti</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Pasirinkti kelis</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Pasirinkti kelis</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">Pažymėta %d</item>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index a0895e5255..964e524a7c 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -2411,20 +2411,20 @@ Saņemts nederīgas protokola versijas atslēgas apmaiņas ziņojums.
   <string name="conversation_callable_secure__menu_video">Signal videozvans</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informācija</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informācija</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopēt</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopēt</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Dzēst</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Dzēst</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Uz priekšu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Uz priekšu</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Atkārtoti sūtīt ziņu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Atkārtoti sūtīt ziņu</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Atbildēt</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Atbildēt</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Atzīmējiet vairākus</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Atzīmējiet vairākus</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="zero">%d atlasītas</item>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index c37908b896..76a509bcc6 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -2322,20 +2322,20 @@
   <string name="conversation_callable_secure__menu_video">Signal видео повик</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Информации</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Информации</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Копирај</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Копирај</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Избриши</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Избриши</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Препрати</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Препрати</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Препрати порака</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Препрати порака</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Одговори</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Одговори</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Изберете повеќе</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Изберете повеќе</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d избрана</item>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index fad282cbdf..f927124ac9 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -2318,20 +2318,20 @@
   <string name="conversation_callable_secure__menu_video">Signal വീഡിയോ കോൾ</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">വിവരം</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">വിവരം</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">പകർത്തുക</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">പകർത്തുക</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">ഇല്ലാതാക്കൂ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">ഇല്ലാതാക്കൂ</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ഫോർവേഡ് ചെയ്യുക</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ഫോർവേഡ് ചെയ്യുക</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">സന്ദേശം വീണ്ടും അയയ്‌ക്കുക</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">സന്ദേശം വീണ്ടും അയയ്‌ക്കുക</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">മറുപടി</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">മറുപടി</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">ഒന്നിലധികം തിരഞ്ഞെടുക്കുക</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">ഒന്നിലധികം തിരഞ്ഞെടുക്കുക</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d തിരഞ്ഞെടുത്തു</item>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 15c66c581a..c085c28725 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -2322,20 +2322,20 @@
   <string name="conversation_callable_secure__menu_video">Signal व्हिडिओ कॉल</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">माहिती</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">माहिती</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">कॉपी करा</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">कॉपी करा</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">हटवा</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">हटवा</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">फॉर्वर्ड करा</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">फॉर्वर्ड करा</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">संदेश पुन्हा पाठवा</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">संदेश पुन्हा पाठवा</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">प्रत्युत्तर द्या</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">प्रत्युत्तर द्या</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">अनेक निवडा</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">अनेक निवडा</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d निवडला</item>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index d1281d4a53..1d0368eff0 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -2222,20 +2222,20 @@ Menerima mesej pertukaran kunci untuk versi protokol yang tidak sah.</string>
   <string name="conversation_callable_secure__menu_video">Panggilan video Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Maklumat</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Maklumat</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Salin</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Salin</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Padam</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Padam</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Hantar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Hantar</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Hantar semula mesej</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Hantar semula mesej</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Balas</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Balas</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Pilih berbilang</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Pilih berbilang</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 9b8b03ceef..f6a4aa0a5f 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -2075,20 +2075,20 @@
   <string name="conversation_callable_secure__menu_video">Signal ဗီဒီယိုခေါ်ဆိုမှု</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">အချက်အလက် </string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">အချက်အလက် </string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">ကူးမည်</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">ကူးမည်</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">ဖျက်မယ်</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">ဖျက်မယ်</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ထပ်ဆင့် ပေးပို့မယ်</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ထပ်ဆင့် ပေးပို့မယ်</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">မက်ဆေ့ချ် ပြန်ပို့မယ်</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">မက်ဆေ့ချ် ပြန်ပို့မယ်</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">စာပြန်မည်</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">စာပြန်မည်</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">မျိုးစုံရွေးချယ်မယ်</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">မျိုးစုံရွေးချယ်မယ်</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 1cb54f8720..4f1719f328 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -2154,18 +2154,18 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversion.</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopier</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopier</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Slett</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Slett</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Videresend</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Videresend</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Send melding på nytt</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Send melding på nytt</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Svar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Svar</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Velg flere</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Velg flere</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 7f9acb4df4..72d0ff1752 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2329,20 +2329,20 @@
   <string name="conversation_callable_secure__menu_video">Signal-video-oproep</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Bericht­details</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Bericht­details</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Tekst kopiëren</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Tekst kopiëren</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Wissen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Wissen</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Doorsturen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Doorsturen</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Bericht opnieuw verzenden</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Bericht opnieuw verzenden</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Reageren</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Reageren</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Meerdere selecteren</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Meerdere selecteren</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d geselecteerd</item>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index cd705667bc..328e9cec89 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -2332,20 +2332,20 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <string name="conversation_callable_secure__menu_video">Signal-videosamtale</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopier</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopier</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Slett</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Slett</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Vidaresend</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Vidaresend</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Send melding på nytt</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Send melding på nytt</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Svar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Svar</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Vel fleire</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Vel fleire</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d vald</item>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index 8a74e90264..477583fa08 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -2069,14 +2069,14 @@
   <string name="conversation_callable_secure__menu_call">Signal କଲ୍</string>
   <string name="conversation_callable_secure__menu_video">Signal ଭିଡିଓ କଲ୍…</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">ବାର୍ତ୍ତା ବିବରଣୀ</string>
-  <string name="conversation_context__menu_copy_text">ପାଠ୍ୟର ନକଲ ବନାନ୍ତୁ</string>
-  <string name="conversation_context__menu_delete_message">ବାର୍ତ୍ତା ବିଲୋପ କରନ୍ତୁ</string>
-  <string name="conversation_context__menu_forward_message">ବାର୍ତ୍ତା ଅଗ୍ରଗାମୀ କରନ୍ତୁ</string>
-  <string name="conversation_context__menu_resend_message">ବାର୍ତ୍ତା ପୁଣି ପଠାନ୍ତୁ</string>
-  <string name="conversation_context__menu_reply_to_message">ବାର୍ତ୍ତାର ଉତ୍ତର ଦିଅ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">ବାର୍ତ୍ତା ବିବରଣୀ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">ପାଠ୍ୟର ନକଲ ବନାନ୍ତୁ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">ବାର୍ତ୍ତା ବିଲୋପ କରନ୍ତୁ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ବାର୍ତ୍ତା ଅଗ୍ରଗାମୀ କରନ୍ତୁ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">ବାର୍ତ୍ତା ପୁଣି ପଠାନ୍ତୁ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">ବାର୍ତ୍ତାର ଉତ୍ତର ଦିଅ</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">ଏକାଧିକ ଚୟନ କରନ୍ତୁ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">ଏକାଧିକ ଚୟନ କରନ୍ତୁ</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">ସଲଗ୍ନକ ସଞ୍ଚୟ କରନ୍ତୁ</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index ec799d2f36..35aff6008a 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -1376,14 +1376,14 @@
   <string name="conversation_callable_secure__menu_call">Signal کال</string>
   <string name="conversation_callable_secure__menu_video">Signal ویڈیو کال</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">سنیہے دیاں تفصیلاں</string>
-  <string name="conversation_context__menu_copy_text">متن کاپی کرو</string>
-  <string name="conversation_context__menu_delete_message"> سنیہا مٹا دیو</string>
-  <string name="conversation_context__menu_forward_message"> سنیہا اگے گھلو</string>
-  <string name="conversation_context__menu_resend_message"> سنیہا فیر گھلو</string>
-  <string name="conversation_context__menu_reply_to_message"> سنیہے دا جواب دیو</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">سنیہے دیاں تفصیلاں</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">متن کاپی کرو</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message"> سنیہا مٹا دیو</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message"> سنیہا اگے گھلو</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message"> سنیہا فیر گھلو</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message"> سنیہے دا جواب دیو</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select"> اک توں ودھ چنو</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select"> اک توں ودھ چنو</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment"> اٹیچمنٹ محفوظ کرو</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index ac84c063f0..277c2db142 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -2294,20 +2294,20 @@
   <string name="conversation_callable_secure__menu_video">Signal ਵੀਡੀਓ ਕਾਲ</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">ਜਾਣਕਾਰੀ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">ਜਾਣਕਾਰੀ</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">ਕਾਪੀ ਕਰੋ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">ਕਾਪੀ ਕਰੋ</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">ਹਟਾਓ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">ਹਟਾਓ</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ਅੱਗੇ ਭੇਜੋ </string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ਅੱਗੇ ਭੇਜੋ </string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">ਸੁਨੇਹਾ ਦੁਬਾਰਾ ਭੇਜੋ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">ਸੁਨੇਹਾ ਦੁਬਾਰਾ ਭੇਜੋ</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">ਜਵਾਬ ਦਿਓ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">ਜਵਾਬ ਦਿਓ</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">ਕਈ ਚੁਣੋ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">ਕਈ ਚੁਣੋ</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d ਚੁਣਿਆ</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 18fe705525..bc7cdbf6b4 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2492,20 +2492,20 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="conversation_callable_secure__menu_video">Połączenie wideo Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informacje</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informacje</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopiuj</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopiuj</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Usuń</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Usuń</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Przekaż</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Przekaż</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Wyślij ponownie wiadomość</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Wyślij ponownie wiadomość</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Odpowiedz</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Odpowiedz</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Wybierz wiele</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Wybierz wiele</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d wybrana</item>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 6972179c5f..e6cb909e95 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -2248,20 +2248,20 @@
   <string name="conversation_callable_secure__menu_video">د Signal ویډیويي اړیکه</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">معلومات</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">معلومات</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">کاپي کول</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">کاپي کول</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">پاکول</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">پاکول</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">فاروارډ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">فاروارډ</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">د پیغام بیالیږل</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">د پیغام بیالیږل</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">بیا پلي کول</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">بیا پلي کول</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">د ګڼ شمېر مواردو ټاکل</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">د ګڼ شمېر مواردو ټاکل</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a5e0dc5867..762fa1b63c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -2326,20 +2326,20 @@
   <string name="conversation_callable_secure__menu_video">Vídeo chamada do Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copiar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copiar</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Excluir</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Excluir</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Encaminhar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Encaminhar</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Reenviar mensagem</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Reenviar mensagem</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Responder</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Responder</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Selecionar várias</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Selecionar várias</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d selecionada</item>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 8f15eae27d..8fc7af3338 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -2325,20 +2325,20 @@
   <string name="conversation_callable_secure__menu_video">Videochamada do Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copiar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copiar</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Eliminar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Eliminar</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Reencaminhar</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Reencaminhar</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Reenviar mensagem</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Reenviar mensagem</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Responder</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Responder</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Selecionar vários(as)</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Selecionar vários(as)</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d selecionada</item>
diff --git a/app/src/main/res/values-qu-rEC/strings.xml b/app/src/main/res/values-qu-rEC/strings.xml
index 779869f711..3c13c31ee3 100644
--- a/app/src/main/res/values-qu-rEC/strings.xml
+++ b/app/src/main/res/values-qu-rEC/strings.xml
@@ -1058,12 +1058,12 @@ Shuk ranti pakallayupay chaski chayamurka, shuk ñawpa mana alli protocolo kashk
   <!--conversation_callable_secure-->
   <string name="conversation_callable_secure__menu_call">Signalwan kayachipay</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Chaskipa kilkashkakuna</string>
-  <string name="conversation_context__menu_copy_text">Shinashina kilkashkata yallichina</string>
-  <string name="conversation_context__menu_delete_message">Chaskita pichana</string>
-  <string name="conversation_context__menu_forward_message">Chaskita kutin kachana</string>
-  <string name="conversation_context__menu_resend_message">Chaskita kutin kachana</string>
-  <string name="conversation_context__menu_reply_to_message">Chaskita kutichina</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Chaskipa kilkashkakuna</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Shinashina kilkashkata yallichina</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Chaskita pichana</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Chaskita kutin kachana</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Chaskita kutin kachana</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Chaskita kutichina</string> -->
   <!--conversation_context_reacction-->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">Allichina kimichishkata</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ee55786145..c9ae7ae778 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -2409,20 +2409,20 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="conversation_callable_secure__menu_video">Apel video Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Informații</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Informații</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Copiere</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Copiere</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Șterge</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Șterge</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Redirecționează</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Redirecționează</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Retrimite mesajul</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Retrimite mesajul</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Răspunde</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Răspunde</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Selectează mai multe</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Selectează mai multe</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d selectat</item>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 7a16e92103..e622083bb3 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2493,20 +2493,20 @@
   <string name="conversation_callable_secure__menu_video">Видеозвонок Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Информация</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Информация</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Копировать</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Копировать</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Удалить</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Удалить</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Переслать</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Переслать</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Отправить заново</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Отправить заново</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Ответить</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Ответить</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Выбрать несколько</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Выбрать несколько</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">Выбрано: %d</item>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index d5a9d5e654..ca03042bf2 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2499,20 +2499,20 @@ Bola prijatá správa výmeny kľúčov s neplatnou verziou protokolu.
   <string name="conversation_callable_secure__menu_video">Videohovor Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopírovať</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopírovať</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Odstrániť</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Odstrániť</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Preposlať</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Preposlať</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Odoslať správu znovu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Odoslať správu znovu</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Odpovedať</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Odpovedať</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Vyberte viaceré</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Vyberte viaceré</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d vybraný</item>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 60ac083f67..d75f63275b 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -2491,20 +2491,20 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
   <string name="conversation_callable_secure__menu_video">Video klic Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopiraj</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopiraj</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Izbriši</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Izbriši</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Posreduj</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Posreduj</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Ponovno pošlji sporočilo</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Ponovno pošlji sporočilo</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Odgovori</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Odgovori</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Izberi več</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Izberi več</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d izbran</item>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index c6b1a17e09..04da3ab211 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -2332,20 +2332,20 @@ aktivizoni Kyçje Regjistrimi, teksa PIN-i është i çaktivizuar.</string>
   <string name="conversation_callable_secure__menu_video">Thirrje video Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopjoje</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopjoje</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Fshiji</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Fshiji</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Përcjellje</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Përcjellje</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Ridërgoje mesazhin</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Ridërgoje mesazhin</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Përgjigju</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Përgjigju</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Përzgjidhni disa</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Përzgjidhni disa</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d i përsgjedhur</item>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index a21c41f579..8a95347adc 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -2412,20 +2412,20 @@
   <string name="conversation_callable_secure__menu_video">Signal видео позив</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Инфо</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Инфо</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Копирај</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Копирај</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Избриши</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Избриши</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Проследи</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Проследи</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Понови слање</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Понови слање</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Одговори</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Одговори</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Изабери више</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Изабери више</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">Одабрано %d </item>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 5f8a810256..ddc8053fba 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -2319,20 +2319,20 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="conversation_callable_secure__menu_video">Signal-videosamtal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Info</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Info</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopiera</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopiera</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Ta bort</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Ta bort</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Vidarebefordra</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Vidarebefordra</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Skicka meddelande igen</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Skicka meddelande igen</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Svara</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Svara</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Välj flera</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Välj flera</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d vald</item>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index f6e08de51a..8252a84f91 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -2196,20 +2196,20 @@ nambari yako ya simu</string>
   <string name="conversation_callable_secure__menu_video">Simu ya video ya Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Maelezo</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Maelezo</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Nakili</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Nakili</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Futa</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Futa</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Mbele</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Mbele</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Tuma tena ujumbe</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Tuma tena ujumbe</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Jibu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Jibu</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Chagua anuai</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Chagua anuai</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 2bf485de09..ee09fec6d3 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -2227,20 +2227,20 @@
   <string name="conversation_callable_secure__menu_video">Signal காணொளி அழைப்பு</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">தகவல்</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">தகவல்</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">நகல்</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">நகல்</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">நீக்கு</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">நீக்கு</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">முன்னனுப்புக</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">முன்னனுப்புக</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">செய்தியை மீண்டும் அனுப்பு</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">செய்தியை மீண்டும் அனுப்பு</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">பதில்</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">பதில்</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">பலவற்றை தேர்வு செய்க</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">பலவற்றை தேர்வு செய்க</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index dd494f79cb..0e0fd37236 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -2080,14 +2080,14 @@
   <string name="conversation_callable_secure__menu_call">Signal కాల్</string>
   <string name="conversation_callable_secure__menu_video">Signal వీడియో కాల్</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">సందేశం వివరాలు</string>
-  <string name="conversation_context__menu_copy_text">మూల గ్రంథము అనుకరణ</string>
-  <string name="conversation_context__menu_delete_message">సందేశాన్ని తొలగించు</string>
-  <string name="conversation_context__menu_forward_message">సందేశాన్ని బదలాయించు</string>
-  <string name="conversation_context__menu_resend_message">సందేశాన్ని తిరిగి పంపు</string>
-  <string name="conversation_context__menu_reply_to_message">సందేశానికి ప్రత్యుత్తరం ఇవ్వండి</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">సందేశం వివరాలు</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">మూల గ్రంథము అనుకరణ</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">సందేశాన్ని తొలగించు</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">సందేశాన్ని బదలాయించు</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">సందేశాన్ని తిరిగి పంపు</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">సందేశానికి ప్రత్యుత్తరం ఇవ్వండి</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">బహుళ ఎంచుకోండి</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">బహుళ ఎంచుకోండి</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">జత పరిచినది దాచి పెట్టు </string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 0c0bb8b884..d9c9263cd0 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -2130,20 +2130,20 @@
   <string name="conversation_callable_secure__menu_video">โทรวิดีโอ Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">ข้อมูล</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">ข้อมูล</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">คัดลอก</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">คัดลอก</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">ลบ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">ลบ</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ส่งต่อ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ส่งต่อ</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">ส่งข้อความอีกครั้ง</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">ส่งข้อความอีกครั้ง</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">ตอบกลับ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">ตอบกลับ</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">เลือกหลายข้อความ</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">เลือกหลายข้อความ</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 439a4d239b..3a27eeedc0 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -1450,14 +1450,14 @@
   <string name="conversation_callable_secure__menu_call">Tawag sa Signal</string>
   <string name="conversation_callable_secure__menu_video">Video call sa Signal</string>
   <!--conversation_context-->
-  <string name="conversation_context__menu_message_details">Mga detalye ng mensahe</string>
-  <string name="conversation_context__menu_copy_text">Kopyahin ang text</string>
-  <string name="conversation_context__menu_delete_message">Burahin ang mensahe</string>
-  <string name="conversation_context__menu_forward_message">Ipasa ang mensahe</string>
-  <string name="conversation_context__menu_resend_message">Muling ipadala ang mensahe</string>
-  <string name="conversation_context__menu_reply_to_message">Tugon sa mensahe</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Mga detalye ng mensahe</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopyahin ang text</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Burahin ang mensahe</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Ipasa ang mensahe</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Muling ipadala ang mensahe</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Tugon sa mensahe</string> -->
   <!--conversation_context_reacction-->
-  <string name="conversation_context__reaction_multi_select">Pumili ng marami</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Pumili ng marami</string> -->
   <!--conversation_context_image-->
   <string name="conversation_context_image__save_attachment">I-save ang kalakip</string>
   <!--conversation_expiring_off-->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6877802eaf..ca5d3c5f8d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2323,20 +2323,20 @@ Geçersiz protokol sürümünde anahtar değişim iletisi alındı.</string>
   <string name="conversation_callable_secure__menu_video">Görüntülü Signal araması</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Bilgi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Bilgi</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopyala</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Kopyala</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Sil</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Sil</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Yönlendir</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Yönlendir</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">İletiyi tekrar gönder</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">İletiyi tekrar gönder</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Cevapla</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Cevapla</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Çoklu seçim</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Çoklu seçim</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d seçili</item>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 0630f62691..ad8db6d7b0 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -2245,20 +2245,20 @@
   <string name="conversation_callable_secure__menu_video">Signal سىنلىق چاقىرىق</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">ئۇچۇر</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">ئۇچۇر</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">كۆچۈر</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">كۆچۈر</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">ئۆچۈر</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">ئۆچۈر</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">ئۇلاپ يوللا</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">ئۇلاپ يوللا</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">ئۇچۇرنى قايتا يوللا</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">ئۇچۇرنى قايتا يوللا</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">جاۋاب</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">جاۋاب</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">كۆپ تاللا</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">كۆپ تاللا</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 162e0ae550..62f0c47692 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2500,20 +2500,20 @@
   <string name="conversation_callable_secure__menu_video">Відеодзвінок Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Інформація</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Інформація</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Копіювати</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Копіювати</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Видалити</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Видалити</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Переслати</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Переслати</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Переслати повідомлення</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Переслати повідомлення</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Відповісти</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Відповісти</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Вибрати декілька</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Вибрати декілька</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="one">%d обрано</item>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 400e1275f9..94f4feaee5 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -2198,18 +2198,18 @@
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">کاپی کریں</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">کاپی کریں</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">حذف کریں</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">حذف کریں</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">آگے</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">آگے</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">پیغام دوبارہ بھیجیں</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">پیغام دوبارہ بھیجیں</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">جواب دیں</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">جواب دیں</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">متعدد منتخب کریں</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">متعدد منتخب کریں</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ed6591ed23..bdbd578a70 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -2232,20 +2232,20 @@ Nhận thông tin trao đổi mã khóa về phiên bản giao thức không h
   <string name="conversation_callable_secure__menu_video">Cuộc gọi video Signal</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">Thông tin</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">Thông tin</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Sao chép</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">Sao chép</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">Xóa</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">Xóa</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">Chuyển tiếp</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">Chuyển tiếp</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">Gửi lại tin nhắn</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">Gửi lại tin nhắn</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">Trả lời</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">Trả lời</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">Chọn nhiều</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">Chọn nhiều</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index ec4c220ab6..3e8f99839d 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -2239,20 +2239,20 @@
   <string name="conversation_callable_secure__menu_video">Signal 視像通話</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">資訊</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">資訊</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">複製</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">複製</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">刪除</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">刪除</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">轉寄</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">轉寄</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">重新傳送訊息</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">重新傳送訊息</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">回覆</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">回覆</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">揀選多個</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">揀選多個</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="other">揀選咗 %d 個</item>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index cf56d9b0f8..de202292eb 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2121,20 +2121,20 @@
   <string name="conversation_callable_secure__menu_video">Signal 视频通话</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">信息</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">信息</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">复制</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">复制</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">删除</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">删除</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">转发</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">转发</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">重新发送信息</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">重新发送信息</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">回复</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">回复</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">多选</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">多选</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
   <!--Button to save a message attachment (image, file etc.)-->
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 0808fa6699..ac2ec0d97c 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -2238,20 +2238,20 @@
   <string name="conversation_callable_secure__menu_video">Signal 視像通話</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">資訊</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">資訊</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">複製</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">複製</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">刪除</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">刪除</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">轉發</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">轉發</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">重新傳送訊息</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">重新傳送訊息</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">回覆</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">回覆</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">選取多個項目</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">選取多個項目</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="other">%d 個已選取</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index fe9a11244d..dc5667982c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2235,20 +2235,20 @@
   <string name="conversation_callable_secure__menu_video">Signal 視訊電話</string>
   <!--conversation_context-->
   <!--Button to view detailed information for a message-->
-  <string name="conversation_context__menu_message_details">資訊</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_message_details">資訊</string> -->
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">複製</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_copy_text">複製</string> -->
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">刪除</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_delete_message">刪除</string> -->
   <!--Button to forward a message to another person or group chat-->
-  <string name="conversation_context__menu_forward_message">轉寄</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_forward_message">轉寄</string> -->
   <!--Button to retry sending a message-->
-  <string name="conversation_context__menu_resend_message">重送訊息</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_resend_message">重送訊息</string> -->
   <!--Button to reply to a message-->
-  <string name="conversation_context__menu_reply_to_message">回覆</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__menu_reply_to_message">回覆</string> -->
   <!--conversation_context_reaction-->
   <!--Button to select a message and enter selection mode-->
-  <string name="conversation_context__reaction_multi_select">選擇多個</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation_context__reaction_multi_select">選擇多個</string> -->
   <!--Heading which shows how many messages are currently selected-->
   <plurals name="conversation_context__s_selected">
     <item quantity="other">%d 已選擇</item>