diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 0be477b0b3..3640d874de 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2678,23 +2678,11 @@
   <string name="conversation_context__menu_forward_message">إعادة التوجيه</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">إعادة الإرسال</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">الرَدّ على الرسالة</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">اختيار متعدد</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="zero"></item>
-    <item quantity="one"></item>
-    <item quantity="two"></item>
-    <item quantity="few"></item>
-    <item quantity="many"></item>
-    <item quantity="other">تم تحديد %d</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">حفظ</string>
+  <string name="conversation_context_image__save_attachment">حفظ المرفق</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">الرسائل المُختفية</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 123700f61e..d0da0f7778 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -2332,22 +2332,14 @@
   <!--Button to delete a message-->
   <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əndirmə</string>
+  <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Mesajı cavabla</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Çoxlu seçim</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d seçildi</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Saxla</string>
+  <string name="conversation_context_image__save_attachment">Qoşmanı yaddaşda saxla</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Yox olan mesajlar</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 696af898e2..d8f151a7f2 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -2150,15 +2150,11 @@
   <string name="conversation_context__menu_forward_message">Препращане</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">Повторно изпращане</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Отговор на съобщение</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">Запази</string>
+  <string name="conversation_context_image__save_attachment">Запази прикачения файл</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Изчезващи съобщения</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index c3ffce13c5..88d8df6ce8 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -2312,19 +2312,11 @@
   <string name="conversation_context__menu_forward_message">ফরওয়ার্ড</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">বার্তা পুনরায় পাঠান</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">বার্তার জবাব দিন</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">একাধিক নির্বাচন করুন</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d নির্বাচিত</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">সংরক্ষণ করুন</string>
+  <string name="conversation_context_image__save_attachment">সংযুক্তি সংরক্ষন করুন</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">অদৃশ্য বার্তা</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index fe1cbe4be6..9cf5fa96dd 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -2413,6 +2413,7 @@
   <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>
   <!--Button to copy a message\'s text to the clipboard-->
   <string name="conversation_context__menu_copy_text">Kopiraj</string>
   <!--Button to delete a message-->
@@ -2421,20 +2422,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Odgovori na poruku</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Označi nekoliko</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="other">%d odabrano</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Pohrani</string>
+  <string name="conversation_context_image__save_attachment">Pohrani prilog</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Nestajuće poruke</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 6a58f48086..e670c2630f 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -789,7 +789,7 @@
   <!--InviteActivity-->
   <string name="InviteActivity_share">Comparteix</string>
   <string name="InviteActivity_share_with_contacts">Comparteix amb els contactes</string>
-  <string name="InviteActivity_share_via">Comparteix via…</string>
+  <string name="InviteActivity_share_via">Comparteix mitjançant…</string>
   <string name="InviteActivity_cancel">Cancel·la</string>
   <string name="InviteActivity_sending">S\'envia…</string>
   <string name="InviteActivity_invitations_sent">Invitacions enviades!</string>
@@ -1267,18 +1267,18 @@
     <item quantity="one">%1$s, %2$s i %3$d més rebran una notificació</item>
     <item quantity="other">%1$s, %2$s i %3$d més rebran una notificació</item>
   </plurals>
-  <string name="WebRtcCallView__ringing_s">S\'està trucant a %1$s</string>
-  <string name="WebRtcCallView__ringing_s_and_s">S\'està trucant a %1$s i %2$s</string>
+  <string name="WebRtcCallView__ringing_s">Es truca a %1$s</string>
+  <string name="WebRtcCallView__ringing_s_and_s">Es truca a %1$s i %2$s</string>
   <plurals name="WebRtcCallView__ringing_s_s_and_d_others">
-    <item quantity="one">S\'està trucant a %1$s, %2$s i %3$d més</item>
-    <item quantity="other">S\'està trucant a %1$s, %2$s i %3$d més</item>
+    <item quantity="one">Es truca a %1$s, %2$s i %3$d més</item>
+    <item quantity="other">Es truca a %1$s, %2$s i %3$d més</item>
   </plurals>
   <string name="WebRtcCallView__s_is_calling_you">%1$s us està trucant</string>
-  <string name="WebRtcCallView__s_is_calling_you_and_s">%1$sus està trucat a vós i a %2$s</string>
-  <string name="WebRtcCallView__s_is_calling_you_s_and_s">%1$s us està trucant a vòs, %2$s i %3$s</string>
+  <string name="WebRtcCallView__s_is_calling_you_and_s">%1$sus truca a vós i a %2$s</string>
+  <string name="WebRtcCallView__s_is_calling_you_s_and_s">%1$s us truca a vós, %2$s i %3$s</string>
   <plurals name="WebRtcCallView__s_is_calling_you_s_s_and_d_others">
-    <item quantity="one">%1$s us està trucant a vós, a %2$s, a %3$s i a %4$d més</item>
-    <item quantity="other">%1$s us està trucant a vós, a %2$s, a %3$s i a %4$d més</item>
+    <item quantity="one">%1$s us truca a vós, a %2$s, a %3$s i a %4$d més</item>
+    <item quantity="other">%1$s us truca a vós, a %2$s, a %3$s i a %4$d més</item>
   </plurals>
   <string name="WebRtcCallView__no_one_else_is_here">Aquí no hi ha ningú més.</string>
   <string name="WebRtcCallView__s_is_in_this_call">%1$s és en aquesta trucada.</string>
@@ -1771,7 +1771,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <!--device_link_fragment-->
   <string name="device_link_fragment__link_device">Enllaça un dispositiu</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_linked">No hi ha cap dispositiu enllaçat</string>
+  <string name="device_list_fragment__no_devices_linked">No hi ha cap dispositiu enllaçat.</string>
   <string name="device_list_fragment__link_new_device">Enllaça un dispositiu nou</string>
   <!--expiration-->
   <string name="expiration_off">Inactiu</string>
@@ -1818,7 +1818,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <!--giphy_activity-->
   <string name="giphy_activity_toolbar__search_gifs">Cerca de GIF</string>
   <!--giphy_fragment-->
-  <string name="giphy_fragment__nothing_found">No s\'ha trobat res</string>
+  <string name="giphy_fragment__nothing_found">No s\'ha trobat res.</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Voleu importar els missatges de text existents a la base de dades encriptada del Signal?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">La base de dades predeterminada del sistema no es modificarà ni  s\'alterarà de cap manera.</string>
@@ -2329,19 +2329,11 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Respon el missatge</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Selecció múltiple</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d de seleccionats</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Desats</string>
+  <string name="conversation_context_image__save_attachment">Desa l\'adjunt</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Missatges efímers</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0de142e332..da51c431e3 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2508,21 +2508,11 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Odpovědět na zprávu</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Vícenásobný výběr</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="many"></item>
-    <item quantity="other">%d vybráno</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Uložit</string>
+  <string name="conversation_context_image__save_attachment">Uložit přílohu</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Mizející zprávy</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 335ec8e57f..2d545a8931 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -2511,21 +2511,11 @@ Send neges heb ei ddiogelu?</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Ateb neges</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Dewis nifer</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="two"></item>
-    <item quantity="many"></item>
-    <item quantity="other">%d wedi\'u dewis</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Cadw</string>
+  <string name="conversation_context_image__save_attachment">Cadw atodiad</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Negeseuon byrhoedlog</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 9e0d6cb2af..6823f56c7d 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -2334,19 +2334,11 @@ nummer (%s) er ugyldigt</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Svar på besked</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Vælg flere</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d valgte</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Gem</string>
+  <string name="conversation_context_image__save_attachment">Gem vedhæftet fil</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Forsvindende beskeder</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7af532898e..305943dce0 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2324,19 +2324,11 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="conversation_context__menu_forward_message">Weiterleiten</string>
   <!--Button to retry sending a message-->
   <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>
-  <!--conversation_context_reaction-->
-  <!--Button to select a message and enter selection mode-->
+  <string name="conversation_context__menu_reply_to_message">Auf Nachricht antworten</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Mehrere auswählen</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d ausgewählt</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Speichern</string>
+  <string name="conversation_context_image__save_attachment">Anhang speichern</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Verschwindende Nachrichten</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index d0e3963560..37c82d2eef 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2323,19 +2323,11 @@
   <string name="conversation_context__menu_forward_message">Προώθηση</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">Αποστολή ξανά</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Απάντηση στο μήνυμα</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Επιλογή πολλαπλών</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d επιλεγμένα</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Αποθήκευση</string>
+  <string name="conversation_context_image__save_attachment">Αποθήκευση συνημμένου</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Μηνύματα που εξαφανίζονται</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index d333996037..9ee339bb64 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -2326,6 +2326,7 @@ 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>
   <!--Button to copy a message\'s text to the clipboard-->
   <string name="conversation_context__menu_copy_text">Kopii</string>
   <!--Button to delete a message-->
@@ -2334,19 +2335,11 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Respondi mesaĝon</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Elekti plurajn</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d elektitaj</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Konservi</string>
+  <string name="conversation_context_image__save_attachment">Konservi kunsendaĵon</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Memviŝontaj mesaĝoj</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index d05904ddc8..b3f5c48ce3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2335,19 +2335,11 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Responder al mensaje</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Selección múltiple</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d seleccionados</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Guardar</string>
+  <string name="conversation_context_image__save_attachment">Guardar archivo adjunto</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Desaparición de mensajes</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index c3141dfd7f..535a08a740 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -2215,19 +2215,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Vasta sõnumile</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Vali mitu</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d valitud</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Salvesta</string>
+  <string name="conversation_context_image__save_attachment">Salvesta manus</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Kaduvad sõnumid</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index bdf0d3cc8c..bcd92e6c33 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -412,6 +412,7 @@
   <string name="BackupsPreferenceFragment__in_progress">در حال پیشرفت…</string>
   <string name="BackupsPreferenceFragment__d_so_far">%1$d تا بحال…</string>
   <!--Show percentage of completion of backup-->
+  <string name="BackupsPreferenceFragment__s_so_far">%1$s%% تا کنون…</string>
   <string name="BackupsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">سیگنال برای پشتیبان‌گیری نیاز به مجوز حافظه دارد، اما اجازه آن داده نشده است. لطفاً به تنظیمات برنامه رفته، «مجوزها» را انتخاب کنید و «ذخیره‌سازی» را فعال کنید.</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">استفاده از سفارشی: %s</string>
@@ -1621,6 +1622,7 @@
   <string name="UnauthorizedReminder_device_no_longer_registered">این دستگاه دیگر ثبت‌نام شده نیست</string>
   <string name="UnauthorizedReminder_this_is_likely_because_you_registered_your_phone_number_with_Signal_on_a_different_device">این احتمالاً به این خاطر است که شما ثبت‌نام شماره‌تلفن خود را با دستگاهی دیگر در سیگنال انجام داده‌اید. برای ثبت‌نام دوباره ضربه بزنید.</string>
   <!--WebRtcCallActivity-->
+  <string name="WebRtcCallActivity_to_answer_the_call_give_signal_access_to_your_microphone">برای پاسخ به تماس، به سیگنال دسترسی به میکروفون خود را بدهید.</string>
   <string name="WebRtcCallActivity_to_answer_the_call_from_s_give_signal_access_to_your_microphone">برای پاسخ به تماس %s، به سیگنال اجازهٔ دسترسی به میکروفون خود را بدهید.</string>
   <string name="WebRtcCallActivity_signal_requires_microphone_and_camera_permissions_in_order_to_make_or_receive_calls">سیگنال برای برقراری و دریافت تماس نیاز مجوزها‌ی میکروفون و دوربین دارد، اما دسترسی به آن‌ها به طور دائم رد شده است. لطفاً به تنظیمات برنامه رفته، در قسمت «مجوزها»، «میکروفون» و «دوربین» را فعال کنید.</string>
   <string name="WebRtcCallActivity__answered_on_a_linked_device">برروی دستگاه پیوند داده شده پاسخ داده شد.</string>
@@ -2331,19 +2333,11 @@
   <string name="conversation_context__menu_forward_message">بازارسال</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">ارسال مجدد پیام</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">پاسخ به پیام</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">انتخاب چندگانه</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d انتخاب شد</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">ذخیره</string>
+  <string name="conversation_context_image__save_attachment">ذخیره‌سازی پیوست</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">پیام‌های ناپدید شونده</string>
   <!--conversation_expiring_on-->
@@ -2578,6 +2572,7 @@
   <string name="BackupDialog_verify">وارسی</string>
   <string name="BackupDialog_you_successfully_entered_your_backup_passphrase">گذرواژهٔ پشتیبان با موفقیت وارد شد</string>
   <string name="BackupDialog_passphrase_was_not_correct">گذرواژه نادرست بود</string>
+  <string name="LocalBackupJob_creating_signal_backup">در حال ایجاد پشتیبان سیگنال…</string>
   <string name="LocalBackupJobApi29_backup_failed">پشتیبان‌گیری ناموفق بود</string>
   <string name="LocalBackupJobApi29_your_backup_directory_has_been_deleted_or_moved">آدرس ذخیره‌سازی پشتیبان شما حذف شده یا به جای دیگری انتقال یافته است.</string>
   <string name="LocalBackupJobApi29_your_backup_file_is_too_large">حجم فایل پشتیبان شما برای نگهداری در این محل زیاد است.</string>
@@ -2700,6 +2695,7 @@
   <string name="DeviceTransfer__keep_both_devices_near_each_other">هر دو دستگاه را نزدیک به یکدیگر نگه دارید. دستگاه‌ها را خاموش نکنید و سیگنال را باز نگه دارید. انتقال‌ها سرتاسر رمزگذاری شده هستند.</string>
   <string name="DeviceTransfer__d_messages_so_far">%1$d پیام تا کنون…</string>
   <!--Filled in with total percentage of messages transferred-->
+  <string name="DeviceTransfer__s_of_messages_so_far">%1$s%% از پیام‌ها تا کنون…</string>
   <string name="DeviceTransfer__cancel">لغو</string>
   <string name="DeviceTransfer__try_again">دوباره امتحان کنید</string>
   <string name="DeviceTransfer__stop_transfer_question">توقف انتقال؟</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1d45e038a4..5b0cfa1c11 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2327,19 +2327,11 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Vastaa viestiin</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Valitse useita</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d valittu</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Tallenna</string>
+  <string name="conversation_context_image__save_attachment">Tallenna liite</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Katoavat viestit</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f21b718267..69e376222b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -450,7 +450,7 @@
   <string name="DocumentView_unnamed_file">Fichier sans nom</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Optimiser pour palier l’absence des Services Play</string>
-  <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Cet appareil ne prend pas les Services Google Play en charge. Touchez pour désactiver les optimisations système de la batterie qui empêchent à Signal de récupérer les messages lors d’inactivité.</string>
+  <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Cet appareil ne prend pas les Services Google Play en charge. Touchez pour désactiver les optimisations système de la batterie/pile qui empêchent à Signal de récupérer les messages lors d’inactivité.</string>
   <!--ExpiredBuildReminder-->
   <string name="ExpiredBuildReminder_this_version_of_signal_has_expired">Votre version de Signal est expirée. Mettez-la à jour maintenant afin d’échanger des messages.</string>
   <string name="ExpiredBuildReminder_update_now">Mettre Signal à jour maintenant</string>
@@ -1754,11 +1754,11 @@
   <string name="EnableCallNotificationSettingsDialog__everything_looks_good_now">Tout semble en ordre maintenant !</string>
   <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_show_notifications">Pour recevoir les notifications d’appel, touchez ici et activez l’option « Afficher les notifications ».</string>
   <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_turn_on_notifications">Pour recevoir les notifications d\'appel, touchez ici, activez les notifications et assurez-vous que le son et les fenêtres surgissantes sont activées.</string>
-  <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_enable_background_activity_in_battery_settings">Pour recevoir les notifications d’appel, touchez ici et activez l’activité d’arrière-plan dans la section « Batterie » des paramètres.</string>
+  <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_here_and_enable_background_activity_in_battery_settings">Pour recevoir les notifications d’appel, touchez ici et activez l’activité d’arrière-plan dans la section « Batterie/Pile » des paramètres.</string>
   <string name="EnableCallNotificationSettingsDialog__settings">Paramètres</string>
   <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_show_notifications">Pour recevoir les notifications d’appel, touchez Réglages et activez l’option « Afficher les notifications ».</string>
   <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_turn_on_notifications">Pour recevoir les notifications d\'appel, touchez Paramètres, activez les notifications et assurez-vous que le son et les fenêtres surgissantes sont activées.</string>
-  <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_enable_background_activity_in_battery_settings">Pour recevoir les notifications d’appel, touchez Paramètres et activez l’activité d’arrière-plan dans la section « Batterie » des paramètres.</string>
+  <string name="EnableCallNotificationSettingsDialog__to_receive_call_notifications_tap_settings_and_enable_background_activity_in_battery_settings">Pour recevoir les notifications d’appel, touchez Paramètres et activez l’activité d’arrière-plan dans la section « Batterie/Pile » des paramètres.</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Chargement des pays…</string>
   <string name="country_selection_fragment__search">Chercher</string>
@@ -2317,7 +2317,7 @@
   <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">Infos</string>
+  <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>
   <!--Button to delete a message-->
@@ -2326,19 +2326,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Répondre au message</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Sélection multiple</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d sélectionnées</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Enregistrer</string>
+  <string name="conversation_context_image__save_attachment">Enregistrer le fichier joint</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Messages éphémères</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 2d6cdd9c84..701aded8e1 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -2086,15 +2086,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Responder a mensaxe</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">Gardar</string>
+  <string name="conversation_context_image__save_attachment">Gardar anexo</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Desaparición das mensaxes</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index dde66b666e..43640c75cb 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -2202,15 +2202,11 @@
   <string name="conversation_context__menu_forward_message">ફોરવર્ડ</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">મેસેજ ફરીથી મોકલો</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">મેસેજ નો જવાબ આપો</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">સેવ કરો</string>
+  <string name="conversation_context_image__save_attachment">જોડાણ સેવ કરો</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">અદૃશ્ય થઈ રહેલા મેસેજ</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index f84ecb0a6f..41c9a00242 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -2321,19 +2321,11 @@ href=\"https://signal.org/redirect/safety-numbers\">ज़्यादा जा
   <string name="conversation_context__menu_forward_message">आगे भेजें</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">मेसेज दोबारा भेजें</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">मेसेज का जवाब</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">कई का चयन करें</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d चुना हुआ</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">सेव करें</string>
+  <string name="conversation_context_image__save_attachment">अटैचमेंट सेव करे</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">मेसेज जो गायब हो जाते हैं</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index bbce8617bf..2a4b2681f2 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -2283,15 +2283,11 @@ broj telefona</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Odgovori na poruku</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">Spremi</string>
+  <string name="conversation_context_image__save_attachment">Spremi privitak</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Poruke koje nestaju</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1948f30f7a..27675e367d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -390,7 +390,7 @@
   <string name="ChooseBackupFragment__restore_your_messages_and_media">Állítsd vissza elmentett üzeneteid és médiafájljaid egy helyi biztonsági mentésből. Ha most nem állítod vissza, később már nem lesz rá lehetőség.</string>
   <string name="ChooseBackupFragment__icon_content_description">\"Visszaállítás biztonsági mentésből\" ikonja</string>
   <string name="ChooseBackupFragment__choose_backup">Válassz biztonsági mentést!</string>
-  <string name="ChooseBackupFragment__learn_more">További információ</string>
+  <string name="ChooseBackupFragment__learn_more">Tudj meg többet!</string>
   <string name="ChooseBackupFragment__no_file_browser_available">Nincs elérhető fájlkezelő</string>
   <!--RestoreBackupFragment-->
   <string name="RestoreBackupFragment__restore_complete">Visszaállítás kész</string>
@@ -408,7 +408,7 @@
   <string name="BackupsPreferenceFragment__turn_on">Bekapcsolás</string>
   <string name="BackupsPreferenceFragment__turn_off">Kikapcsolás</string>
   <string name="BackupsPreferenceFragment__to_restore_a_backup">Egy biztonsági mentés visszaállításához először is telepítsd a Signalt! Nyisd meg az alkalmazást, koppints a \"Biztonsági mentés visszaállítása\" feliratra, majd keresd ki a biztonsági mentést tartalmazó fájlt! %1$s</string>
-  <string name="BackupsPreferenceFragment__learn_more">További információ</string>
+  <string name="BackupsPreferenceFragment__learn_more">Tudj meg többet!</string>
   <string name="BackupsPreferenceFragment__in_progress">Folyamatban…</string>
   <string name="BackupsPreferenceFragment__d_so_far">%1$d eddig…</string>
   <!--Show percentage of completion of backup-->
@@ -802,7 +802,7 @@
   <string name="InviteActivity_lets_switch_to_signal">Váltsunk Signalra: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Úgy néz ki, hogy egy alkalmazásod sincs a megosztás kezeléséhez.</string>
   <!--LearnMoreTextView-->
-  <string name="LearnMoreTextView_learn_more">További információ</string>
+  <string name="LearnMoreTextView_learn_more">Tudj meg többet!</string>
   <string name="SpanUtil__read_more">További információk</string>
   <!--LongMessageActivity-->
   <string name="LongMessageActivity_unable_to_find_message">Az üzenet nem található</string>
@@ -1714,7 +1714,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <string name="conversation_item_received__contact_photo_description">Kontakt fotó</string>
   <!--ConversationUpdateItem-->
   <string name="ConversationUpdateItem_loading">Betöltés</string>
-  <string name="ConversationUpdateItem_learn_more">További információ</string>
+  <string name="ConversationUpdateItem_learn_more">Tudj meg többet!</string>
   <string name="ConversationUpdateItem_join_call">Belépés a hívásba</string>
   <string name="ConversationUpdateItem_return_to_call">Vissza a híváshoz</string>
   <string name="ConversationUpdateItem_call_is_full">A hívás betelt</string>
@@ -1890,7 +1890,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Adj meg egy nevet vagy telefonszámot</small></string>
   <!--verify_display_fragment-->
-  <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Ha szeretnéd ellenőrizni a titkosítás sértetlenségét %s nevű partnereddel, hasonlítsd össze a fenti számot az ő készülékén megjelenő számmal. Alternatív megoldásként beszkennelheted a kódot telefonja kijelzőjéről <a href="https://signal.org/redirect/safety-numbers">További információ</a>]]></string>
+  <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Ha szeretnéd ellenőrizni a titkosítás sértetlenségét %s nevű partnereddel, hasonlítsd össze a fenti számot az ő készülékén megjelenő számmal. Alternatív megoldásként beszkennelheted a kódot telefonja kijelzőjéről <a href="https://signal.org/redirect/safety-numbers">Tudj meg többet!</a>]]></string>
   <string name="verify_display_fragment__tap_to_scan">Koppints a szkenneléshez</string>
   <string name="verify_display_fragment__successful_match">Sikeres egyezés</string>
   <string name="verify_display_fragment__failed_to_verify_safety_number">Biztonsági azonosító ellenőrzése sikertelen</string>
@@ -2162,7 +2162,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <string name="preferences_communication__sealed_sender_display_indicators_description">Jelenítsen meg egy státuszikont a rejtett feladóval kézbesített üzenetek \"Üzenet részletei\" menüpontjában.</string>
   <string name="preferences_communication__sealed_sender_allow_from_anyone">Engedélyezés mindenkitől</string>
   <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Rejtett feladóval érkező üzenetek engedélyezése olyan nem-kontaktoktól és személyektől is, akikkel nem osztottad meg a profilodat.</string>
-  <string name="preferences_communication__sealed_sender_learn_more">További információ</string>
+  <string name="preferences_communication__sealed_sender_learn_more">Tudj meg többet!</string>
   <string name="preferences_setup_a_username">Felhasználónév beállítása</string>
   <string name="preferences_proxy">Proxy</string>
   <string name="preferences_use_proxy">Proxy használata</string>
@@ -2336,19 +2336,11 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Válasz az üzenetre</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Több kiválasztása</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d kiválasztva</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Mentés</string>
+  <string name="conversation_context_image__save_attachment">Melléklet mentése</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Eltűnő üzenetek</string>
   <!--conversation_expiring_on-->
@@ -2477,7 +2469,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <!--KbsSplashFragment-->
   <string name="KbsSplashFragment__introducing_pins">A PIN kódok bemutatása</string>
   <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">A PIN-nek köszönhetően a Signal által tárolt információk titkosítva lesznek, így csak te férhetsz hozzájuk. Újratelepítés esetén profilod, beállításaid és kontaktjaid visszaállításra kerülnek. Az alkalmazás megnyitásához nincs szükség a PIN kódra.</string>
-  <string name="KbsSplashFragment__learn_more">Tudj meg többet</string>
+  <string name="KbsSplashFragment__learn_more">Tudj meg többet!</string>
   <string name="KbsSplashFragment__registration_lock_equals_pin">Regisztrációs kód = PIN</string>
   <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">A regisztrációs zárat mostantól PIN kódnak hívják, és többet tud. Frissítsd most!</string>
   <string name="KbsSplashFragment__update_pin">PIN kód frissítése</string>
@@ -2495,7 +2487,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <string name="AccountLockedFragment__account_locked">Fiók zárolva</string>
   <string name="AccountLockedFragment__your_account_has_been_locked_to_protect_your_privacy">Biztonságod és személyes adataid védelme érdekében fiókodat zároltuk. %1$d nap inaktivitást követően újraregisztrálhatod ezt a telefonszámot a PIN kód használata nélkül. Az összes adat törlésre kerül.</string>
   <string name="AccountLockedFragment__next">Tovább</string>
-  <string name="AccountLockedFragment__learn_more">Tudj meg többet</string>
+  <string name="AccountLockedFragment__learn_more">Tudj meg többet!</string>
   <!--KbsLockFragment-->
   <string name="RegistrationLockFragment__enter_your_pin">Add meg PIN kódodat</string>
   <string name="RegistrationLockFragment__enter_the_pin_you_created">Gépeld be a fiókodhoz létrehozott PIN kódodat. Ez nem azonos az SMS-ben regisztrációkor kapott ellenőrző kóddal.</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 8667fc077f..2122425032 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -2246,18 +2246,11 @@ Menerima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Balas pesan</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Pilih beberapa</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">%d dipilih</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Simpan</string>
+  <string name="conversation_context_image__save_attachment">Simpan lampiran</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Penghilangan pesan</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index e0becd7c0d..47edfb0d2f 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -2334,19 +2334,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Svara skilaboðum</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Velja mörg</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d valin</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Vista</string>
+  <string name="conversation_context_image__save_attachment">Vista viðhengi</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Sjálfeyðandi skilaboð</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9129e7e4d2..066f695c8e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2335,19 +2335,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Rispondi al messaggio</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Selezione multipla</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d selezionate</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Salva</string>
+  <string name="conversation_context_image__save_attachment">Salva allegato</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Messaggi a scomparsa</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index f1c5eb0488..6dba522d71 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -2509,21 +2509,11 @@
   <string name="conversation_context__menu_forward_message">העבר הלאה</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">שלח מחדש הודעה</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">השב אל הודעה</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">בחר רבים</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="two"></item>
-    <item quantity="many"></item>
-    <item quantity="other">%d נבחרו</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">שמור</string>
+  <string name="conversation_context_image__save_attachment">שמור צרופה</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">הודעות נעלמות</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4dcfa4a3c2..989d136905 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2233,23 +2233,16 @@
   <!--Button to copy a message\'s text to the clipboard-->
   <string name="conversation_context__menu_copy_text">コピー</string>
   <!--Button to delete a message-->
-  <string name="conversation_context__menu_delete_message">削除する</string>
+  <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>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">メッセージの再送信</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">メッセージに返信</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">複数を選択</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">%d件選択済み</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">保存</string>
+  <string name="conversation_context_image__save_attachment">添付ファイルを保存</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">消えるメッセージ</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index 24a85b784a..b06ef06274 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -2207,15 +2207,11 @@
   <string name="conversation_context__menu_forward_message">ಫಾರ್ವರ್ಡ್</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">ಸಂದೇಶ ಪುನಃ ಕಳುಹಿಸಿ</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">ಸಂದೇಶಕ್ಕೆ ಉತ್ತರಿಸಿ</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">ಉಳಿಸಿ</string>
+  <string name="conversation_context_image__save_attachment">ಲಗತ್ತು ಉಳಿಸು</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">ಕಣ್ಮರೆಯಾಗುವ ಸಂದೇಶಗಳು</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 91aeb93185..b053bfe461 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2183,18 +2183,11 @@
   <string name="conversation_context__menu_forward_message">전달</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">메시지 다시 보내기</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">메시지 답장</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">여러 개 선택</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">%d개 선택됨</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">저장</string>
+  <string name="conversation_context_image__save_attachment">첨부 파일 저장</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">사라지는 메시지</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index f53e4398c5..43b01e9a5b 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -2509,21 +2509,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Atsakyti į žinutę</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Pasirinkti kelis</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="many"></item>
-    <item quantity="other">Pažymėta: %d</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Įrašyti</string>
+  <string name="conversation_context_image__save_attachment">Įrašyti priedą</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Išnykstančios žinutės</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index bacdd0a592..a3a5bd904f 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -2280,15 +2280,11 @@ Saņemts nederīgas protokola versijas atslēgas apmaiņas ziņojums.
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Atbildēt uz ziņu</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Atzīmējiet vairākus</string>
-  <!--Heading which shows how many messages are currently selected-->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Saglabāt</string>
+  <string name="conversation_context_image__save_attachment">Saglabāt pielikumu</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Gaistošās ziņas</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index d6666ef1eb..436d35ab18 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -184,7 +184,7 @@
   <string name="ConversationItem_this_message_was_deleted">Оваа порака беше избришана.</string>
   <string name="ConversationItem_you_deleted_this_message">Ја избришавте оваа порака.</string>
   <!--ConversationActivity-->
-  <string name="ConversationActivity_add_attachment">Прикачи датотека</string>
+  <string name="ConversationActivity_add_attachment">Додај прилог</string>
   <string name="ConversationActivity_select_contact_info">Изберете информации за контакт</string>
   <string name="ConversationActivity_compose_message">Напишете порака</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Извинете, се појави грешка при прикачување на датотеката.</string>
@@ -202,7 +202,7 @@
   <string name="ConversationActivity_lets_switch_to_signal">Ајде да се префрлиме на Signal %1$s</string>
   <string name="ConversationActivity_specify_recipient">Ве молиме изберете контакт</string>
   <string name="ConversationActivity_unblock">Одблокирај</string>
-  <string name="ConversationActivity_attachment_exceeds_size_limits">Прилогот ги надминува границите на големината за видот на пораката што ја испраќате.</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Прилогот ги надминува ограничувањата на големината за видот на пораката што ја испраќате.</string>
   <string name="ConversationActivity_unable_to_record_audio">Не може да се снима аудио!</string>
   <string name="ConversationActivity_you_cant_send_messages_to_this_group">Не можете да испраќате пораки на оваа група бидејќи не сте повеќе член.</string>
   <string name="ConversationActivity_only_s_can_send_messages">Само %1$s може да испраќа пораки.</string>
@@ -264,8 +264,8 @@
   </plurals>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Не може да се запишува на складот!</string>
   <plurals name="ConversationFragment_saving_n_attachments">
-    <item quantity="one">Зачувувам додаток</item>
-    <item quantity="other">Зачувувам %1$d додатоци</item>
+    <item quantity="one">Зачувувам прилог</item>
+    <item quantity="other">Зачувувам %1$d прилози</item>
   </plurals>
   <plurals name="ConversationFragment_saving_n_attachments_to_sd_card">
     <item quantity="one">Зачувувам прилог во складот…</item>
@@ -342,7 +342,7 @@
     <item quantity="one">Вклучи известувања</item>
     <item quantity="other">Вклучи известувања</item>
   </plurals>
-  <string name="ConversationListFragment_select">Одбери</string>
+  <string name="ConversationListFragment_select">Избери</string>
   <plurals name="ConversationListFragment_archive_plural">
     <item quantity="one">Архивирај</item>
     <item quantity="other">Архивирај</item>
@@ -357,7 +357,7 @@
   </plurals>
   <string name="ConversationListFragment_select_all">Избери сѐ</string>
   <plurals name="ConversationListFragment_s_selected">
-    <item quantity="one">%d избран</item>
+    <item quantity="one">%d избрана</item>
     <item quantity="other">%d избрани</item>
   </plurals>
   <!--Show in conversation list overflow menu to open selection bottom sheet-->
@@ -462,7 +462,7 @@
   <string name="PendingGroupJoinRequestsReminder_view">Преглед</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Сподели со</string>
-  <string name="ShareActivity_multiple_attachments_are_only_supported">Повеќе прилози се поддржани само за слики и видеа</string>
+  <string name="ShareActivity_multiple_attachments_are_only_supported">Повеќекратни прилози се поддржани само за слики и видеа</string>
   <string name="ShareActivity_you_do_not_have_permission_to_send_to_this_group">Немате дозвола да испраќате на оваа група</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Перманетна неуспешна комуникација со Signal</string>
@@ -645,7 +645,7 @@
     <item quantity="other">Оваа група не може да биде создадена бидејќи %1$d членови користат стара верзија на Signal. Можете да ги отстраните пред да ја создадете групата.</item>
   </plurals>
   <!--ManageGroupActivity-->
-  <string name="ManageGroupActivity_member_requests_and_invites">Барања од членови &amp; покани</string>
+  <string name="ManageGroupActivity_member_requests_and_invites">Барања од членови и покани</string>
   <string name="ManageGroupActivity_add_members">Додај членови</string>
   <string name="ManageGroupActivity_edit_group_info">Уреди информации за група</string>
   <string name="ManageGroupActivity_who_can_add_new_members">Кој може да додава нови членови?</string>
@@ -828,7 +828,7 @@
   </plurals>
   <string name="MediaOverviewActivity_Media_delete_progress_title">Бришење</string>
   <string name="MediaOverviewActivity_Media_delete_progress_message">Бришење на пораките… </string>
-  <string name="MediaOverviewActivity_Select_all">Избери се</string>
+  <string name="MediaOverviewActivity_Select_all">Избери сѐ</string>
   <string name="MediaOverviewActivity_collecting_attachments">Собирам прилози…</string>
   <string name="MediaOverviewActivity_Sort_by">Сортирај по</string>
   <string name="MediaOverviewActivity_Newest">Најново</string>
@@ -1187,7 +1187,7 @@
   <string name="PinRestoreEntryFragment_need_help">Потребна Ви е помош?</string>
   <string name="PinRestoreEntryFragment_your_pin_is_a_d_digit_code">Вашиот PIN е%1$d+ цифрен код содаден така што може да биде нумерички или алфанумерички.\n\nАко не можете да го запомните Вашиот PIN, можете да создадете нов. Можете да ја регистрирате и користите Вашата сметка, но ќе ги изгубите некои од зачуваните поставувања како што се Вашите информации за профилот.</string>
   <string name="PinRestoreEntryFragment_if_you_cant_remember_your_pin">Ако не можете да го запомните Вашиот PIN, можете да создадете нов. Можете да се регистрирате и да ја користите Вашата сметка но ќе ги изгубите некои од зачуваните поставувања како Вашите информации за профилот.</string>
-  <string name="PinRestoreEntryFragment_create_new_pin">Создадете Нов PIN</string>
+  <string name="PinRestoreEntryFragment_create_new_pin">Создадете нов PIN</string>
   <string name="PinRestoreEntryFragment_contact_support">Контакт за поддршка</string>
   <string name="PinRestoreEntryFragment_cancel">Откажи</string>
   <string name="PinRestoreEntryFragment_skip">Прескокни</string>
@@ -1306,7 +1306,7 @@
   <string name="CallParticipantView__s_is_blocked">%1$s е блокиран/а.</string>
   <string name="CallParticipantView__more_info">Повеќе информации</string>
   <string name="CallParticipantView__you_wont_receive_their_audio_or_video">Нема да добивате аудио и видео и тие нема да го добиваат Вашето аудио и видео.</string>
-  <string name="CallParticipantView__cant_receive_audio_video_from_s">Не добивам аудио &amp; видео од %1$s</string>
+  <string name="CallParticipantView__cant_receive_audio_video_from_s">Не добивам аудио и видео од %1$s</string>
   <string name="CallParticipantView__cant_receive_audio_and_video_from_s">Не можам да добијам аудио и видео од %1$s</string>
   <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">Ова може да се случи бидејќи тие го немаат проверено Вашиот сигурносен број по промената, има некаков проблем со нивниот уред или пак Ве имаат блокирано.</string>
   <!--CallToastPopupWindow-->
@@ -1338,7 +1338,7 @@
   <string name="RegistrationActivity_i_understand">Разбирам</string>
   <string name="RegistrationActivity_play_services_error">Грешка со Play Services</string>
   <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services се ажурира или моментално е недостапна. Ве молиме обидетете се повторно.</string>
-  <string name="RegistrationActivity_terms_and_privacy">Услови &amp; Политика на приватност</string>
+  <string name="RegistrationActivity_terms_and_privacy">Услови и Политика на приватност</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal има потреба од дозвола до контакти и склад за да Ви помогне да се поврзете со пријателите и да испраќате пораки. Вашите контакти се качуваат преку приватното откривање на контакти во Signal, ова значи дека се шифрирани од крај до крај и никогаш не се видливи за Signal услугата.</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal има потреба од дозвола до контакти за да Ви помогне да се поврзете со пријателите. Вашите контакти се качуваат преку приватното откривање на контакти во Signal, ова значи дека се шифрирани од крај до крај и никогаш не се видливи за Signal услугата.</string>
   <string name="RegistrationActivity_rate_limited_to_service">Направивте премногу обиди за регистрација на овој број. Ве молиме обидете се повторно подоцна.</string>
@@ -1688,10 +1688,10 @@
   <string name="conversation_activity__send">Испрати</string>
   <string name="conversation_activity__compose_description">Пишување порака</string>
   <string name="conversation_activity__emoji_toggle_description">Вклучи/исклучи emoji тастатура</string>
-  <string name="conversation_activity__attachment_thumbnail">Слика на додатокот</string>
-  <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Вклучи/исклучи фиока за брзи прилози за камера</string>
+  <string name="conversation_activity__attachment_thumbnail">Сликичка на прилогот</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_camera_description">Вклучи/исклучи фиока за прилози за брза камера</string>
   <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Сними и испрати аудио прилог</string>
-  <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Заклучи снимка од аудио прилог</string>
+  <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Заклучи снимање на аудио прилог</string>
   <string name="conversation_activity__enable_signal_for_sms">Вклучи Signal за SMS</string>
   <string name="conversation_activity__message_could_not_be_sent">Пораката не може да биде испратена. Проверете ја Вашата интернет конекција и обидете се повторно.</string>
   <!--conversation_input_panel-->
@@ -1954,12 +1954,12 @@
     <item>Повратни информации</item>
     <item>Друго</item>
     <item>Плаќања (MobileCoin)</item>
-    <item>Поддржувачи &amp; Signal Boost</item>
+    <item>Поддржувачи и Signal поттик</item>
   </string-array>
   <!--ReactWithAnyEmojiBottomSheetDialogFragment-->
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__this_message">Оваа порака</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__recently_used">Скорешни</string>
-  <string name="ReactWithAnyEmojiBottomSheetDialogFragment__smileys_and_people">Смајлија &amp; луѓе</string>
+  <string name="ReactWithAnyEmojiBottomSheetDialogFragment__smileys_and_people">Смајлија и луѓе</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__nature">Природа</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__food">Храна</string>
   <string name="ReactWithAnyEmojiBottomSheetDialogFragment__activities">Активности</string>
@@ -2331,19 +2331,11 @@
   <string name="conversation_context__menu_forward_message">Препрати</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">Препрати порака</string>
-  <!--Button to reply to a message-->
   <string name="conversation_context__menu_reply_to_message">Одговори</string>
-  <!--conversation_context_reaction-->
-  <!--Button to select a message and enter selection mode-->
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Изберете повеќе</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one">%d избрана</item>
-    <item quantity="other">%d избрани</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Зачувај</string>
+  <string name="conversation_context_image__save_attachment">Зачувај прилог</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Пораки што исчезнуваат</string>
   <!--conversation_expiring_on-->
@@ -2353,8 +2345,8 @@
   <string name="conversation_list_batch__menu_delete_selected">Избриши избрани</string>
   <string name="conversation_list_batch__menu_pin_selected">Закачи избрани</string>
   <string name="conversation_list_batch__menu_unpin_selected">Откачи избрани</string>
-  <string name="conversation_list_batch__menu_select_all">Избери се</string>
-  <string name="conversation_list_batch_archive__menu_archive_selected">Архивирај го одбраното</string>
+  <string name="conversation_list_batch__menu_select_all">Избери сѐ</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Архивирај избрани</string>
   <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Деархивирај избрани</string>
   <string name="conversation_list_batch__menu_mark_as_read">Обележи ги како прочитани</string>
   <string name="conversation_list_batch__menu_mark_as_unread">Обележи како непрочитани</string>
@@ -2880,7 +2872,7 @@
   <string name="MultiShareDialogs__failed_to_send_to_some_users">Не успеав да испратам на некои корисници</string>
   <string name="MultiShareDialogs__you_can_only_share_with_up_to">Можете да споделите со најмногу %1$d разговори</string>
   <!--ShareInterstitialActivity-->
-  <string name="ShareInterstitialActivity__forward_message">Проследи порака</string>
+  <string name="ShareInterstitialActivity__forward_message">Препрати порака</string>
   <!--ChatWallpaperActivity-->
   <string name="ChatWallpaperActivity__chat_wallpaper">Позадина за разговорот</string>
   <!--ChatWallpaperFragment-->
@@ -3119,7 +3111,7 @@
   <string name="HelpSettingsFragment__contact_us">Контактирајте нѐ</string>
   <string name="HelpSettingsFragment__version">Верзија</string>
   <string name="HelpSettingsFragment__debug_log">Запис за дебагирање</string>
-  <string name="HelpSettingsFragment__terms_amp_privacy_policy">Услови &amp; Политика на приватност</string>
+  <string name="HelpSettingsFragment__terms_amp_privacy_policy">Услови и Политика на приватност</string>
   <string name="HelpFragment__copyright_signal_messenger">Авторски права Signal Messenger</string>
   <string name="HelpFragment__licenced_under_the_gplv3">Лиценцирано под GPLv3</string>
   <!--DataAndStorageSettingsFragment-->
@@ -3331,7 +3323,7 @@
   <string name="ImageEditorHud__toggle_between_text_styles">Промена на стилот на текст</string>
   <string name="MediaCountIndicatorButton__send">Испрати</string>
   <string name="MediaReviewSelectedItem__tap_to_remove">Допрете за да отстраните</string>
-  <string name="MediaReviewSelectedItem__tap_to_select">Допри за да одбереш</string>
+  <string name="MediaReviewSelectedItem__tap_to_select">Допри за да избереш</string>
   <string name="MediaReviewImagePageFragment__discard">Откажи</string>
   <string name="MediaReviewImagePageFragment__discard_changes">Да ги откажам промените?</string>
   <string name="MediaReviewImagePageFragment__youll_lose_any_changes">Ќе ги изгубите сите промени направени на оваа фотографија.</string>
@@ -3372,8 +3364,8 @@
   <string name="SubscribeLearnMoreBottomSheetDialogFragment__your_contribution">Вашите придонеси ја подгреваат каузата и плаќаат за развојот и операциите околу апликацијата која што се користи од милиони за приватна комуникација. Без реклами. Без тракери. Сериозно.</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_your_support">Ви благодариме за Вашата поддршка!</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__thanks_for_the_boost">Благодариме за поттикот!</string>
-  <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_help_signal">Заработивте %s беџ! Помогнете му на Signal да изгради свест преку прикажување на овој беџ на Вашиот профил.</string>
-  <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_help_signal">Заработивте беџ за поттик! Помогнете му на Signal да изгради свест преку прикажување на овој беџ на Вашиот профил.</string>
+  <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_s_badge_help_signal">Добивте %s беџ! Помогнете му на Signal да изгради свест преку прикажување на овој беџ на Вашиот профил.</string>
+  <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__youve_earned_a_boost_badge_help_signal">Добивте беџ за поттик! Помогнете му на Signal да изгради свест преку прикажување на овој беџ на Вашиот профил.</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__you_can_also">Можете исто така да</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__become_a_montly_sustainer">Станете месечен поддржувач</string>
   <string name="SubscribeThanksForYourSupportBottomSheetDialogFragment__display_on_profile">Прикажи на профил</string>
@@ -3401,8 +3393,8 @@
   <string name="ExpiredBadgeBottomSheetDialogFragment__your_badge_has_expired">Вашиот беџ е истечен</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__badge_expired">Беџот е истечен</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__subscription_cancelled">Претплатата е откажана</string>
-  <string name="ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired">Вашиот беџ за поттик истече и повеќе не е видлив на други на Вашиот профил.</string>
-  <string name="ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate">Можете да го реактивирате Вашиот беџ за поттик за уште 30 дена со еднократен надомест.</string>
+  <string name="ExpiredBadgeBottomSheetDialogFragment__your_boost_badge_has_expired">Вашиот беџ за поттик истече и повеќе не е видлив за другите на Вашиот профил.</string>
+  <string name="ExpiredBadgeBottomSheetDialogFragment__you_can_reactivate">Можете повторно да го активирате Вашиот беџ за поттик за уште 30 дена со еднократен надомест.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__to_continue_supporting_technology">За да продолжите да ја поддржувате технологијата што е создадена за Вас, размислете да станете месечен поддржувач.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__become_a_sustainer">Станете поддржувач</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__add_a_boost">Додај поттик</string>
@@ -3412,7 +3404,7 @@
   <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">Обнови претплата</string>
   <string name="Subscription__please_contact_support_for_more_information">Ве молиме контактирајте со тимот за поддршка за повеќе информации.</string>
   <string name="Subscription__contact_support">Контакт за поддршка</string>
-  <string name="Subscription__earn_a_s_badge">Заработете %1$s беџ</string>
+  <string name="Subscription__earn_a_s_badge">Добијте %1$s беџ</string>
   <string name="SubscribeFragment__processing_payment">Плаќањето се обработува…</string>
   <!--Displayed in notification when user payment fails to process on Stripe-->
   <string name="DonationsErrors__error_processing_payment">Грешка при обработка на плаќањето</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 5ebb03cbe8..e1f3c95340 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -2209,15 +2209,11 @@
   <string name="conversation_context__menu_forward_message">ഫോർവേഡ് ചെയ്യുക</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">സന്ദേശം വീണ്ടും അയയ്‌ക്കുക</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">സന്ദേശത്തിന് മറുപടി നൽകുക</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">സംരക്ഷിക്കൂ</string>
+  <string name="conversation_context_image__save_attachment">അറ്റാച്ചുമെന്റ് സംരക്ഷിക്കൂ</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">അപ്രത്യക്ഷമാകുന്ന സന്ദേശങ്ങൾ</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 1b58fe60d1..ac94f6dec6 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -2330,19 +2330,11 @@
   <string name="conversation_context__menu_forward_message">फॉर्वर्ड करा</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">संदेश पुन्हा पाठवा</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">संदेशाला प्रत्युत्तर द्या</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">अनेक निवडा</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d निवडले</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">जतन करा</string>
+  <string name="conversation_context_image__save_attachment">संलग्न जतन करा</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">हरवणारे संदेश</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index d8bfbefb83..ac33f85172 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -2232,18 +2232,11 @@ Menerima mesej pertukaran kunci untuk versi protokol yang tidak sah.</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Balas mesej</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Pilih berbilang</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">%d dipilih</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Simpan</string>
+  <string name="conversation_context_image__save_attachment">Simpan lampiran</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Mesej hilang</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 28b850683b..147ca04cc8 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -2084,15 +2084,11 @@
   <string name="conversation_context__menu_forward_message">ထပ်ဆင့် ပေးပို့မယ်</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">မက်ဆေ့ချ် ပြန်ပို့မယ်</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">မက်ဆေ့ချ်ကို ပြန်ကြားမယ်</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">သိမ်းမယ်</string>
+  <string name="conversation_context_image__save_attachment">ပူးတွဲဖိုင်ကို သိမ်းမယ်</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">ပျောက်ကွယ်မည့် မက်ဆေ့ချ်များ</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 4499a8bb0a..99fef2e8cb 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -2161,15 +2161,11 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversion.</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Svar på melding</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">Lagre</string>
+  <string name="conversation_context_image__save_attachment">Lagre vedlegg</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Tidsavgrensede meldinger</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 5a9e0d5349..0c2982e0e7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -253,10 +253,10 @@
     <item quantity="one">Geselecteerd bericht wissen?</item>
     <item quantity="other">Geselecteerde berichten wissen?</item>
   </plurals>
-  <string name="ConversationFragment_save_to_sd_card">Opslaan naar telefoonopslag?</string>
+  <string name="ConversationFragment_save_to_sd_card">Onversleuteld opslaan?</string>
   <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
-    <item quantity="one">Als je dit bestand opslaat op de telefoonopslag wordt het niet versleuteld opgeslagen en hebben alle andere apps op je apparaat toegang tot dit bestand.\n\nDoorgaan?</item>
-    <item quantity="other">Als je deze %1$d bestanden opslaat op de telefoonopslag worden ze niet versleuteld en hebben alle andere apps op je apparaat ook toegang tot deze bestanden.\n\nDoorgaan?</item>
+    <item quantity="one">Als je dit bestand opslaat op de telefoonopslag wordt het onversleuteld opgeslagen waardoor alle apps op je apparaat toegang krijgen tot dit bestand.\n\nToch doorgaan?</item>
+    <item quantity="other">Als je deze %1$d bestanden opslaat op de telefoonopslag worden ze onversleuteld opgeslagen waardoor alle apps op je apparaat toegang krijgen tot deze bestanden.\n\nToch doorgaan?</item>
   </plurals>
   <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
     <item quantity="one">Fout tijdens het opslaan van de bijlage op de telefoonopslag!</item>
@@ -2329,28 +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">Info</string>
+  <string name="conversation_context__menu_message_details">Berichtdetails</string>
   <!--Button to copy a message\'s text to the clipboard-->
-  <string name="conversation_context__menu_copy_text">Kopiëren</string>
+  <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>
   <!--Button to forward a message to another person or group chat-->
   <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>
-  <!--Button to reply to a message-->
   <string name="conversation_context__menu_reply_to_message">Reageren</string>
-  <!--conversation_context_reaction-->
-  <!--Button to select a message and enter selection mode-->
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Meerdere selecteren</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d geselecteerd</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Onversleuteld opslaan</string>
+  <string name="conversation_context_image__save_attachment">Bijlage opslaan</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Verlopende berichten</string>
   <!--conversation_expiring_on-->
@@ -3358,7 +3350,7 @@
   <string name="SubscribeFragment__support_technology_that_is_built_for_you">Ondersteun technologie die is gemaakt voor jou—niet voor het verzamelen van je gegevens—door mee te doen met de gemeenschap die het mogelijk maakt.</string>
   <string name="SubscribeFragment__support_technology_that_is_built_for_you_not">Ondersteun technologie die is gemaakt voor jou, niet voor het verzamelen van je gegevens, door één van de donateurs te worden die Signal mogelijk maken.</string>
   <string name="SubscribeFragment__currency">Valuta</string>
-  <string name="SubscribeFragment__more_payment_options">Meer overschrijvingsopties</string>
+  <string name="SubscribeFragment__more_payment_options">Meer overschrijvingsopties (Let op: je kunt de badge alleen krijgen als je via Google Pay doneert)</string>
   <string name="SubscribeFragment__cancel_subscription">Maandelijkse donatie annuleren</string>
   <string name="SubscribeFragment__confirm_cancellation">Maandelijkse donatie annuleren?</string>
   <string name="SubscribeFragment__you_wont_be_charged_again">Er zal niet opnieuw geld worden afgeschreven. Je badge zal worden verwijderd van je profiel wanneer je laatste betalingsperiode is afgelopen.</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 2bb80829a9..9b980e820e 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -2341,19 +2341,11 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Svar på meldinga</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Vel fleire</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d valde</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Lagra</string>
+  <string name="conversation_context_image__save_attachment">Lagra vedlegg</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Forsvinnande meldingar</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index c64ce346c8..26130339a7 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -2294,19 +2294,11 @@
   <string name="conversation_context__menu_forward_message">ਅੱਗੇ ਭੇਜੋ </string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">ਸੁਨੇਹਾ ਦੁਬਾਰਾ ਭੇਜੋ</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">ਸੁਨੇਹੇ ਨੂੰ ਜਵਾਬ ਦਿਓ</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">ਕਈ ਚੁਣੋ</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%dਚੁਣੇ</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">ਸੰਭਾਲੋ</string>
+  <string name="conversation_context_image__save_attachment">ਅਟੈਚਮੈਂਟਸ ਦਰਜ ਕਰੋ</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">ਅਲੋਪ ਹੋਣ ਵਾਲੇ ਸੁਨੇਹੇ</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d0c61c7225..797cd8bbda 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2498,24 +2498,14 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--Button to delete a message-->
   <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ż dalej</string>
+  <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Odpowiedz na wiadomość</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Wybierz wiele</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="many"></item>
-    <item quantity="other">%d wybrane</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Zapisz</string>
+  <string name="conversation_context_image__save_attachment">Zapisz załącznik</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Znikające wiadomości</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 73e1bd3fa2..463db01eb8 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -2258,15 +2258,11 @@
   <string name="conversation_context__menu_forward_message">فاروارډ</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">د پیغام بیالیږل</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">پیغام ته ځواب ورکول</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">ثبت</string>
+  <string name="conversation_context_image__save_attachment">د ضمیمې ثبت</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">ورک کېدونکې پیغامونه</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3e5a30b183..40fca5cb73 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -2335,19 +2335,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Responder à mensagem</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Selecionar várias</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d selecionadas</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Salvar</string>
+  <string name="conversation_context_image__save_attachment">Salvar anexo</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Mensagens efêmeras</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index a97a02d6e3..f9b4d01ee9 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -2334,19 +2334,11 @@
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Responder à mensagem</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Selecionar vários(as)</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one">%d selecionada</item>
-    <item quantity="other">%d selecionadas</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Guardar</string>
+  <string name="conversation_context_image__save_attachment">Guardar anexo</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Destruição de mensagens</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index ca73f76424..a68178a6ef 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1207,7 +1207,7 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Parola veche este incorectă!</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Introdu parola nouă!</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">Asociez acest dispozitiv?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Asociezi acest dispozitiv?</string>
   <string name="DeviceProvisioningActivity_continue">CONTINUĂ</string>
   <string name="DeviceProvisioningActivity_content_intro">Va putea</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1413,7 +1413,7 @@ furnizat (%s) este invalid.</string>
   <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Serviciile Google Play se actualizează sau sunt temporar indisponibile. Te rugăm încearcă din nou.</string>
   <string name="RegistrationActivity_terms_and_privacy">Termeni &amp; Politica de confidențialitate</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal are nevoie de permisiunea pentru contacte și media să te ajute să iei legătura cu prietenii și să trimiți mesaje. Contactele tale sunt încărcate utilizând descoperirea privată a contactelor de la Signal, ceea ce înseamnă că sunt criptate integral și nu sunt niciodată vizibile pentru serviciul Signal.</string>
-  <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal are nevoie de permisiunea pentru contacte să te ajute să iei legătura cu prietenii.  Contactele tale sunt încărcate utilizând descoperirea privată a contactelor de la Signal, ceea ce înseamnă că sunt criptate integral și nu sunt niciodată vizibile pentru serviciul Signal.</string>
+  <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal are nevoie de permisiunea pentru contacte să te ajute să iei legătura cu prietenii. Contactele tale sunt încărcate utilizând descoperirea privată a contactelor de la Signal, ceea ce înseamnă că sunt criptate integral și nu sunt niciodată vizibile pentru serviciul Signal.</string>
   <string name="RegistrationActivity_rate_limited_to_service">Ai făcut prea multe încercări de înregistrare a acestui număr. Te rugăm să încerci din nou mai târziu.</string>
   <string name="RegistrationActivity_unable_to_connect_to_service">Nu s-a putut realiza conexiunea la serviciu. Te rugăm verifică conexiunea la rețea și încearcă din nou.</string>
   <string name="RegistrationActivity_non_standard_number_format">Număr cu format non-standard</string>
@@ -2418,20 +2418,11 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Răspunde la mesaj</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Selectează mai multe</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="other">%d selectate</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Salvează</string>
+  <string name="conversation_context_image__save_attachment">Salvează atașamentul</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Dispariție mesaje</string>
   <!--conversation_expiring_on-->
@@ -3512,7 +3503,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="ExpiredBadgeBottomSheetDialogFragment__add_a_boost">Adaugă un Boost</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__not_now">Nu acum</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__your_sustainer">Abonamentul tău de Susținător a fost anulat automat deoarece ai fost inactiv pentru o perioadă prea lungă de timp. Insigna ta %1$s nu mai este vizibilă pe profilul tău.</string>
-  <string name="ExpiredBadgeBottomSheetDialogFragment__you_can">Poți folosi în continuare Signal dar pentru a sprijini aplicația și pentru ați reactiva insigna, reînnoiește acum.</string>
+  <string name="ExpiredBadgeBottomSheetDialogFragment__you_can">Poți folosi în continuare Signal dar pentru a sprijini aplicația și pentru a-ți reactiva insigna, reînnoiește acum.</string>
   <string name="ExpiredBadgeBottomSheetDialogFragment__renew_subscription">Reînnoiește abonamentul</string>
   <string name="Subscription__please_contact_support_for_more_information">Te rugăm să contactezi suportul pentru mai multe informații.</string>
   <string name="Subscription__contact_support">Contactează suportul</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 09aa39bc4c..c2fb9a7734 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2502,21 +2502,11 @@
   <string name="conversation_context__menu_forward_message">Переслать</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">Отправить заново</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Ответить на сообщение</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Выбрать несколько</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="many"></item>
-    <item quantity="other">%d выбрано</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Сохранить</string>
+  <string name="conversation_context_image__save_attachment">Сохранить вложение</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Исчезающие сообщения</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 03bf5b06fa..a0731a4cb0 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2508,21 +2508,11 @@ Bola prijatá správa výmeny kľúčov s neplatnou verziou protokolu.
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Odpovedať na správu</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Vyberte viaceré</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="many"></item>
-    <item quantity="other">%d vybraných</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Uložiť</string>
+  <string name="conversation_context_image__save_attachment">Uložiť prílohu </string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Miznúce správy</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index f4e3579568..45c937a1c4 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -2500,21 +2500,11 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Odgovori na sporočilo</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Izberi več</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="two"></item>
-    <item quantity="few"></item>
-    <item quantity="other">%d izbranih</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Shrani</string>
+  <string name="conversation_context_image__save_attachment">Shrani priponko</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Izginjajoča sporočila</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 73ce121a0c..1b004d1ab0 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -2341,19 +2341,11 @@ aktivizoni Kyçje Regjistrimi, teksa PIN-i është i çaktivizuar.</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Përgjigjuni mesazhin</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Përzgjidhni disa</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d të përzgjedhur</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Ruaji</string>
+  <string name="conversation_context_image__save_attachment">Ruaje bashkëngjitjen</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Tretje mesazhesh</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 3b5dda6ea7..f2aa384d91 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -2421,20 +2421,11 @@
   <string name="conversation_context__menu_forward_message">Проследи</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">Понови слање</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Одговори на поруку</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Изабери више</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="other">Изабрано: %d</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Сачувај</string>
+  <string name="conversation_context_image__save_attachment">Сачувај прилог</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Нестајуће поруке</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index af23f498fe..981a2db2db 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -2328,19 +2328,11 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Svara på meddelande</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Välj flera</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d valda</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Spara</string>
+  <string name="conversation_context_image__save_attachment">Spara bilaga</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Försvinnande meddelanden</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 88ed86dfb5..f91baf5daa 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -2205,15 +2205,11 @@ nambari yako ya simu</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Jibu ujumbe</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">Hifadhi</string>
+  <string name="conversation_context_image__save_attachment">Hifadhi ambatisho</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Jumbe zinazotoweka</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index b1b572add7..eb9e0c5719 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -2237,15 +2237,11 @@
   <string name="conversation_context__menu_forward_message">முன்னனுப்புக</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">செய்தியை மீண்டும் அனுப்பு</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">செய்திக்கு பதில்</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">சேமி</string>
+  <string name="conversation_context_image__save_attachment">இணைப்பைச் சேமி</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">காணாமல் போகும் செய்திகள்</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 58efec823b..1a9ec36f74 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -2139,15 +2139,11 @@
   <string name="conversation_context__menu_forward_message">ส่งต่อ</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">ส่งข้อความอีกครั้ง</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">ตอบกลับข้อความ</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">บันทึก</string>
+  <string name="conversation_context_image__save_attachment">บันทึกแฟ้มแนบ</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">ข้อความที่ลบตัวเอง</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 8b13d8c151..da15356763 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2330,19 +2330,11 @@ Geçersiz protokol sürümünde anahtar değişim iletisi alındı.</string>
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">İletiyi yanıtla</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Çoklu seçim</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="other">%d seçili</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Kaydet</string>
+  <string name="conversation_context_image__save_attachment">Eklentiyi kaydet</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Kaybolan iletiler</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 061f1775e5..de5764748a 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -2255,15 +2255,11 @@
   <string name="conversation_context__menu_forward_message">ئۇلاپ يوللا</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">ئۇچۇرنى قايتا يوللا</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">ئۇچۇرغا جاۋاب</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">ساقلا</string>
+  <string name="conversation_context_image__save_attachment">قوشۇمچە ساقلا</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">غايىب ئۇچۇرلار</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b58243511a..632643e626 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2509,21 +2509,11 @@
   <string name="conversation_context__menu_forward_message">Переслати</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">Переслати повідомлення</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Відповісти на повідомлення</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Вибрати декілька</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="one"></item>
-    <item quantity="few"></item>
-    <item quantity="many"></item>
-    <item quantity="other">%d обрано</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Зберегти</string>
+  <string name="conversation_context_image__save_attachment">Зберегти вкладення</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Зникнення повідомлень</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index a212214aeb..b5f66d9af4 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -2205,15 +2205,11 @@
   <string name="conversation_context__menu_forward_message">آگے</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">پیغام دوبارہ بھیجیں</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">پیغام کا جواب دیں</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">محفوظ کریں</string>
+  <string name="conversation_context_image__save_attachment">منسلک چیزیں محفوظ کریں</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">پیغامات غائب ہو رہے ہیں</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index f693af36b4..1a124f9c19 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -2242,18 +2242,11 @@ Nhận thông tin trao đổi mã khóa về phiên bản giao thức không h
   <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>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">Trả lời tin nhắn</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">Chọn nhiều</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">%d đã chọn</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">Lưu</string>
+  <string name="conversation_context_image__save_attachment">Lưu tệp đính kèm</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">Tin nhắn tự hủy</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index 1a5dcae1ec..66aebec497 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -2248,18 +2248,11 @@
   <string name="conversation_context__menu_forward_message">轉寄</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">重新傳送訊息</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">回覆訊息</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">揀選多個</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">揀選咗 %d 個</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">儲存</string>
+  <string name="conversation_context_image__save_attachment">儲存附件</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">過眼雲煙訊息</string>
   <!--conversation_expiring_on-->
@@ -3400,7 +3393,7 @@
   <!--Profile exception to allow all calls through the profile restrictions-->
   <string name="NotificationProfileDetails__allow_all_calls">批准所有通話入閘</string>
   <!--Profile exception to allow all @mentions through the profile restrictions-->
-  <string name="NotificationProfileDetails__notify_for_all_mentions">點名講嘅時候一律都要通知</string>
+  <string name="NotificationProfileDetails__notify_for_all_mentions">點名講嘅時候點都要通知</string>
   <!--Section header for showing schedule information-->
   <string name="NotificationProfileDetails__schedule">時間表</string>
   <!--If member list is long, will truncate the list and show an option to then see all when tapped-->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6f31ef23ba..d6d1fb4f61 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2130,15 +2130,11 @@
   <string name="conversation_context__menu_forward_message">转发</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">重新发送信息</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">回复消息</string>
+  <!--conversation_context_reacction-->
   <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.)-->
-  <string name="conversation_context_image__save_attachment">保存</string>
+  <string name="conversation_context_image__save_attachment">保存附件</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">阅后即焚</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 0dd8f12913..cfd718cf96 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -2247,18 +2247,11 @@
   <string name="conversation_context__menu_forward_message">轉發</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">重新傳送訊息</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">回覆訊息</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">選取多個項目</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">%d 個已選取</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">儲存</string>
+  <string name="conversation_context_image__save_attachment">儲存附件</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">限時訊息</string>
   <!--conversation_expiring_on-->
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e686cf35c6..d1c7b83f4c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2244,18 +2244,11 @@
   <string name="conversation_context__menu_forward_message">轉寄</string>
   <!--Button to retry sending a message-->
   <string name="conversation_context__menu_resend_message">重送訊息</string>
-  <!--Button to reply to a message-->
-  <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__menu_reply_to_message">回覆訊息</string>
+  <!--conversation_context_reacction-->
   <string name="conversation_context__reaction_multi_select">選擇多個</string>
-  <!--Heading which shows how many messages are currently selected-->
-  <!-- Removed by excludeNonTranslatables <plurals name="conversation_context__s_selected">
-    <item quantity="other">%d 已選擇</item>
-  </plurals> -->
   <!--conversation_context_image-->
-  <!--Button to save a message attachment (image, file etc.)-->
-  <string name="conversation_context_image__save_attachment">儲存</string>
+  <string name="conversation_context_image__save_attachment">儲存附檔</string>
   <!--conversation_expiring_off-->
   <string name="conversation_expiring_off__disappearing_messages">自動銷毀訊息</string>
   <!--conversation_expiring_on-->