diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 75a845e170..69f24ac463 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1666,7 +1666,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Dodajte prilog</string>
   <string name="conversation__menu_edit_group">Uredi grupu</string>
-  <string name="conversation__menu_manage_group">Uredi grupu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Uredi grupu</string> -->
   <string name="conversation__menu_leave_group">Napusti grupu</string>
   <string name="conversation__menu_view_all_media">Svi prilozi</string>
   <string name="conversation__menu_conversation_settings">Podešavanja</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 4104762fab..be1f1322d9 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -1618,7 +1618,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Afegeix un adjunt</string>
   <string name="conversation__menu_edit_group">Edita el grup</string>
-  <string name="conversation__menu_manage_group">Gestioneu el grup</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Gestioneu el grup</string> -->
   <string name="conversation__menu_leave_group">Abandona el grup</string>
   <string name="conversation__menu_view_all_media">Tot el contingut</string>
   <string name="conversation__menu_conversation_settings">Configuració de la conversa</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 3bc5d0c657..9b3277c0c9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -1707,7 +1707,7 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Přidat přílohu</string>
   <string name="conversation__menu_edit_group">Editovat skupinu</string>
-  <string name="conversation__menu_manage_group">Spravovat skupinu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Spravovat skupinu</string> -->
   <string name="conversation__menu_leave_group">Opustit skupinu</string>
   <string name="conversation__menu_view_all_media">Všechna média</string>
   <string name="conversation__menu_conversation_settings">Nastavení konverzace</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index d138dcb983..8435849f1d 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -1710,7 +1710,7 @@ Send neges heb ei ddiogelu?</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Ychwanegu atodiad</string>
   <string name="conversation__menu_edit_group">Golygu grŵp</string>
-  <string name="conversation__menu_manage_group">Rheoli grŵp</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Rheoli grŵp</string> -->
   <string name="conversation__menu_leave_group">Gadael y grŵp</string>
   <string name="conversation__menu_view_all_media">Pob cyfrwng</string>
   <string name="conversation__menu_conversation_settings">Gosodiadau sgwrsio</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 17993cf6d6..b22e6b6a3a 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -1624,7 +1624,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Vedhæft fil</string>
   <string name="conversation__menu_edit_group">Redigér gruppe</string>
-  <string name="conversation__menu_manage_group">Håndtering af gruppe</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Håndtering af gruppe</string> -->
   <string name="conversation__menu_leave_group">Forlad gruppe</string>
   <string name="conversation__menu_view_all_media">Alle mediefiler</string>
   <string name="conversation__menu_conversation_settings">Samtale indstillinger</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4ff8e268a4..1cac64b2ff 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1613,7 +1613,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Anhang hinzufügen</string>
   <string name="conversation__menu_edit_group">Gruppe bearbeiten</string>
-  <string name="conversation__menu_manage_group">Gruppe verwalten</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Gruppe verwalten</string> -->
   <string name="conversation__menu_leave_group">Gruppe verlassen</string>
   <string name="conversation__menu_view_all_media">Alle Medieninhalte</string>
   <string name="conversation__menu_conversation_settings">Unterhaltungseinstellungen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index e735e7def8..b870e95748 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -1616,7 +1616,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Προσθήκη συνημμένου</string>
   <string name="conversation__menu_edit_group">Επεξεργασία ομάδας</string>
-  <string name="conversation__menu_manage_group">Διαχείριση ομάδας</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Διαχείριση ομάδας</string> -->
   <string name="conversation__menu_leave_group">Αποχώρηση απ\' την ομάδα</string>
   <string name="conversation__menu_view_all_media">Όλα τα πολυμέσα</string>
   <string name="conversation__menu_conversation_settings">Επιλογές συνομιλίας</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 976544b123..dba9e511e4 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -1623,7 +1623,7 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Aldoni kunsendaĵon</string>
   <string name="conversation__menu_edit_group">Modifi grupon</string>
-  <string name="conversation__menu_manage_group">Administri grupon</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Administri grupon</string> -->
   <string name="conversation__menu_leave_group">Forlasi la grupon</string>
   <string name="conversation__menu_view_all_media">Ĉiuj aŭvidaĵoj</string>
   <string name="conversation__menu_conversation_settings">Agordoj pri interparolo</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7fbcafb236..40227f1b91 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1625,7 +1625,7 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Añadir archivo adjunto</string>
   <string name="conversation__menu_edit_group">Editar grupo</string>
-  <string name="conversation__menu_manage_group">Administrar grupo</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Administrar grupo</string> -->
   <string name="conversation__menu_leave_group">Abandonar grupo</string>
   <string name="conversation__menu_view_all_media">Todos los archivos multimedia</string>
   <string name="conversation__menu_conversation_settings">Ajustes de chat</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index b4503e6703..b6d0f0cb21 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -1624,7 +1624,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Lisa manus</string>
   <string name="conversation__menu_edit_group">Muuda gruppi</string>
-  <string name="conversation__menu_manage_group">Halda gruppi</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Halda gruppi</string> -->
   <string name="conversation__menu_leave_group">Lahku grupist</string>
   <string name="conversation__menu_view_all_media">Kogu meedia</string>
   <string name="conversation__menu_conversation_settings">Vestluse seaded</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index a19902cfeb..c3a5a58768 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -1573,7 +1573,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">افزودن پیوست</string>
   <string name="conversation__menu_edit_group">ویرایش گروه</string>
-  <string name="conversation__menu_manage_group">مدیریت گروه</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">مدیریت گروه</string> -->
   <string name="conversation__menu_leave_group">ترک گروه</string>
   <string name="conversation__menu_view_all_media">تمام رسانه‌ها</string>
   <string name="conversation__menu_conversation_settings">تنظیمات مکالمه</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index e3bc9c0e1a..d7b149e526 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -1618,7 +1618,7 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Lisää liite</string>
   <string name="conversation__menu_edit_group">Muokkaa ryhmää</string>
-  <string name="conversation__menu_manage_group">Hallinnoi ryhmää</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Hallinnoi ryhmää</string> -->
   <string name="conversation__menu_leave_group">Poistu ryhmästä</string>
   <string name="conversation__menu_view_all_media">Kaikki media</string>
   <string name="conversation__menu_conversation_settings">Keskustelun asetukset</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a24e0476a2..51710995fc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1615,7 +1615,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Ajouter un fichier joint</string>
   <string name="conversation__menu_edit_group">Modifier le groupe</string>
-  <string name="conversation__menu_manage_group">Gérer le groupe</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Gérer le groupe</string> -->
   <string name="conversation__menu_leave_group">Quitter le groupe</string>
   <string name="conversation__menu_view_all_media">Tous les médias</string>
   <string name="conversation__menu_conversation_settings">Paramètres de la conversation</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index ac112dd5c1..d6da655aaa 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1627,7 +1627,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Melléklet hozzáadása</string>
   <string name="conversation__menu_edit_group">Csoport szerkesztése</string>
-  <string name="conversation__menu_manage_group">Csoport kezelése</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Csoport kezelése</string> -->
   <string name="conversation__menu_leave_group">Kilépés a csoportból</string>
   <string name="conversation__menu_view_all_media">Összes médiafájl</string>
   <string name="conversation__menu_conversation_settings">Beszélgetés beállításai</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index ad568aca28..c50434d80a 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1559,7 +1559,7 @@ Menerima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Tambahkan lampiran</string>
   <string name="conversation__menu_edit_group">Ubah grup</string>
-  <string name="conversation__menu_manage_group">Pengaturan grup</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Pengaturan grup</string> -->
   <string name="conversation__menu_leave_group">Keluar grup</string>
   <string name="conversation__menu_view_all_media">Semua media</string>
   <string name="conversation__menu_conversation_settings">Pengaturan percakapan</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ddcf1ed92b..636adde0b9 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1624,7 +1624,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Aggiungi allegato</string>
   <string name="conversation__menu_edit_group">Modifica il gruppo</string>
-  <string name="conversation__menu_manage_group">Gestisci gruppo</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Gestisci gruppo</string> -->
   <string name="conversation__menu_leave_group">Abbandona il gruppo</string>
   <string name="conversation__menu_view_all_media">Tutti i file multimediali</string>
   <string name="conversation__menu_conversation_settings">Impostazioni conversazione</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index d76a243b62..80f07309bc 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -1708,7 +1708,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">הוסף צרופה</string>
   <string name="conversation__menu_edit_group">ערוך קבוצה</string>
-  <string name="conversation__menu_manage_group">נהל קבוצה</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">נהל קבוצה</string> -->
   <string name="conversation__menu_leave_group">עזוב קבוצה</string>
   <string name="conversation__menu_view_all_media">כל המדיה</string>
   <string name="conversation__menu_conversation_settings">הגדרות שיחה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e3295c9f37..174da3d0e6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1562,7 +1562,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">添付ファイルを追加</string>
   <string name="conversation__menu_edit_group">グループを編集</string>
-  <string name="conversation__menu_manage_group">グループの管理</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">グループの管理</string> -->
   <string name="conversation__menu_leave_group">グループを抜ける</string>
   <string name="conversation__menu_view_all_media">すべてのメディア</string>
   <string name="conversation__menu_conversation_settings">会話設定</string>
@@ -1824,6 +1824,7 @@
   <string name="RegistrationActivity_incorrect_registration_lock_pin">登録ロック PIN が違います</string>
   <string name="RegistrationActivity_too_many_attempts">試行数が多すぎます</string>
   <string name="RegistrationActivity_you_have_made_too_many_incorrect_registration_lock_pin_attempts_please_try_again_in_a_day">登録ロック PIN の無効な試行回数が多すぎます。1 日経ってからもう一度お試しください。</string>
+  <string name="RegistrationActivity_you_have_made_too_many_attempts_please_try_again_later">試行回数が多すぎます。再度お試しください。</string>
   <string name="RegistrationActivity_error_connecting_to_service">サービスへの接続中にエラーが発生しました</string>
   <string name="RegistrationActivity_oh_no">おっと！</string>
   <string name="RegistrationActivity_registration_of_this_phone_number_will_be_possible_without_your_registration_lock_pin_after_seven_days_have_passed">登録ロック PIN 無しでこの電話番号を登録するには、最後に Signal を使用した日から 7日間待つ必要があります。登録可能になるまであと %d 日です。</string>
diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml
index 2041e133f3..6bbeb2ab2e 100644
--- a/app/src/main/res/values-jv/strings.xml
+++ b/app/src/main/res/values-jv/strings.xml
@@ -1579,6 +1579,7 @@
   <string name="preferences_app_protection__change_your_pin">Gantos PIN</string>
   <string name="preferences_app_protection__pins_keep_information_stored_with_signal_encrypted">PIN njagi supados informasi disimpen kangge enkripsi Signal, dados sampeyan mawon ingkang saged ngakses. Profil, panatanan, lan kontak bakal dipulihaken kala sampeyan masangaken Signal malih.</string>
   <string name="preferences_app_protection__confirm_pin">Konfirmasi PIN</string>
+  <string name="preferences_app_protection__confirm_your_signal_pin">Konfirmasiaken PIN Signal sampeyan</string>
   <string name="preferences_app_protection__incorrect_pin_try_again">PIN klintu. Cobi malih.</string>
   <string name="AppProtectionPreferenceFragment_none">Mboten enten</string>
   <string name="registration_activity__the_registration_lock_pin_is_not_the_same_as_the_sms_verification_code_you_just_received_please_enter_the_pin_you_previously_configured_in_the_application">PIN Kunci Pendaftaran mboten sami kaliyan kode verifikasi SMS ingkang nembe sampeyan tampi. Lebetaken PIN ingkang sampeyan tetapaken ing aplikasi saderengipun.</string>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index 3ffbda4391..6fdd532711 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -1404,7 +1404,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">ភ្ជាប់ឯកសារបន្ថែម</string>
   <string name="conversation__menu_edit_group">កែប្រែក្រុម</string>
-  <string name="conversation__menu_manage_group">គ្រប់គ្រងក្រុម</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">គ្រប់គ្រងក្រុម</string> -->
   <string name="conversation__menu_leave_group">ចាកចេញពីក្រុម</string>
   <string name="conversation__menu_view_all_media">ព័ត៌មានទាំងអស់</string>
   <string name="conversation__menu_conversation_settings">កំណត់ការសន្ទនា</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 4593b083cc..f5892e72c5 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -1617,7 +1617,7 @@ Saņemts nederīgas protokola versijas atslēgas apmaiņas ziņojums.
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Pievienot pielikumu</string>
   <string name="conversation__menu_edit_group">Rediģēt grupu</string>
-  <string name="conversation__menu_manage_group">Pārvaldīt grupu</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Pārvaldīt grupu</string> -->
   <string name="conversation__menu_leave_group">Pamest grupu</string>
   <string name="conversation__menu_view_all_media">Visi multimediji</string>
   <string name="conversation__menu_conversation_settings">Sarunas iestatījumi</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index cfb6db1fd7..755dfb82cb 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -1553,7 +1553,7 @@ Signal zal nu toestemming vragen om je contactenlijst te lezen, om na te gaan wi
   <string name="preferences_storage__review_storage">Alle bestanden bekijken</string>
   <string name="preferences_advanced__use_system_emoji">Gebruik systeem-emoji</string>
   <string name="preferences_advanced__disable_signal_built_in_emoji_support">Schakel de ingebouwde emoji-ondersteuning van Signal uit</string>
-  <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Om te voorkomen dat je gesprekspartner je IP-adres kan achterhalen worden oproepen met niet-contactpersonen altijd omgeleid via de Signal-server. Door deze optie in te schakelen wordt dat ook gedaan voor contacten wie wel in je contactenlijst staan. Dit leidt echter tot een verminderde geluids- en videokwaliteit.</string>
+  <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Om te voorkomen dat je gesprekspartner je IP-adres kan achterhalen worden Signal-oproepen met niet-contactpersonen altijd omgeleid via de Signal-server. Door deze optie in te schakelen wordt dat ook gedaan voor Signal-oproepen met contacten wie wel in je contactenlijst staan. Dit leidt echter tot een verminderde geluids- en videokwaliteit.</string>
   <string name="preferences_advanced__always_relay_calls">Alle oproepen omleiden</string>
   <string name="preferences_app_protection__app_access">Toegang tot app</string>
   <string name="preferences_app_protection__communication">Communicatie</string>
@@ -1628,7 +1628,7 @@ Signal zal nu toestemming vragen om je contactenlijst te lezen, om na te gaan wi
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Bijlage toevoegen</string>
   <string name="conversation__menu_edit_group">Groep aanpassen</string>
-  <string name="conversation__menu_manage_group">Groep beheren</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Groep beheren</string> -->
   <string name="conversation__menu_leave_group">Groep verlaten</string>
   <string name="conversation__menu_view_all_media">Alle media</string>
   <string name="conversation__menu_conversation_settings">Gespreksinstellingen</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 1dcd796c90..cfebbb015d 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -1626,7 +1626,7 @@ Du er à jour!</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Legg til vedlegg</string>
   <string name="conversation__menu_edit_group">Rediger gruppa</string>
-  <string name="conversation__menu_manage_group">Handter gruppe</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Handter gruppe</string> -->
   <string name="conversation__menu_leave_group">Forlat gruppe</string>
   <string name="conversation__menu_view_all_media">All media</string>
   <string name="conversation__menu_conversation_settings">Samtaleinnstillingar</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 6575039455..145112fd1b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1700,7 +1700,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Dodaj załącznik</string>
   <string name="conversation__menu_edit_group">Edytuj grupę</string>
-  <string name="conversation__menu_manage_group">Zarządzaj grupą</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Zarządzaj grupą</string> -->
   <string name="conversation__menu_leave_group">Opuść grupę</string>
   <string name="conversation__menu_view_all_media">Wszystkie multimedia</string>
   <string name="conversation__menu_conversation_settings">Ustawienia konwersacji</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 285f639b79..159557e35f 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1620,7 +1620,7 @@ Mensagem de troca de chaves inválida para esta versão do protocolo.
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Adicionar anexo</string>
   <string name="conversation__menu_edit_group">Editar o grupo</string>
-  <string name="conversation__menu_manage_group">Administrar grupo</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Administrar grupo</string> -->
   <string name="conversation__menu_leave_group">Abandonar grupo</string>
   <string name="conversation__menu_view_all_media">Toda a multimédia</string>
   <string name="conversation__menu_conversation_settings">Definições de conversa</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index e476825a4b..7956d78a44 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -1663,7 +1663,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Adăugați atașament</string>
   <string name="conversation__menu_edit_group">Editează grupul</string>
-  <string name="conversation__menu_manage_group">Administrați grupul</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Administrați grupul</string> -->
   <string name="conversation__menu_leave_group">Părăseşte grupul</string>
   <string name="conversation__menu_view_all_media">Toate fișierele media</string>
   <string name="conversation__menu_conversation_settings">Setări conversaţie</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3de431c11b..a73b9e19ba 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1701,7 +1701,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Добавить вложение</string>
   <string name="conversation__menu_edit_group">Редактировать группу</string>
-  <string name="conversation__menu_manage_group">Управлять группой</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Управлять группой</string> -->
   <string name="conversation__menu_leave_group">Покинуть группу</string>
   <string name="conversation__menu_view_all_media">Все медиа-файлы</string>
   <string name="conversation__menu_conversation_settings">Настройки разговора</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 3d1f62a604..164c9d7d93 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1699,7 +1699,7 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Dodaj priponko</string>
   <string name="conversation__menu_edit_group">Uredi skupino</string>
-  <string name="conversation__menu_manage_group">Uredi skupino</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Uredi skupino</string> -->
   <string name="conversation__menu_leave_group">Zapusti skupino</string>
   <string name="conversation__menu_view_all_media">Vsa multimedijska sporočila</string>
   <string name="conversation__menu_conversation_settings">Nastavitve pogovora</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index a6d8159f54..4d1557fa51 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1620,7 +1620,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Shto bashkëngjitje</string>
   <string name="conversation__menu_edit_group">Përpunoni grup</string>
-  <string name="conversation__menu_manage_group">Administroni grupin</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Administroni grupin</string> -->
   <string name="conversation__menu_leave_group">Braktise grupin</string>
   <string name="conversation__menu_view_all_media">Krejt mediat</string>
   <string name="conversation__menu_conversation_settings">Rregullime bisedash</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 73a636b8f2..961cbd4987 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -1618,7 +1618,7 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Lägg till bilaga</string>
   <string name="conversation__menu_edit_group">Ändra grupp</string>
-  <string name="conversation__menu_manage_group">Hantera grupp</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Hantera grupp</string> -->
   <string name="conversation__menu_leave_group">Lämna grupp</string>
   <string name="conversation__menu_view_all_media">Alla media</string>
   <string name="conversation__menu_conversation_settings">Konversationsinställningar</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 7164c641af..8da6862e45 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1610,7 +1610,7 @@ Geçersiz protokol sürümünde anahtar değişim iletisi alındı.</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Eklenti ekle</string>
   <string name="conversation__menu_edit_group">Grubu düzenle</string>
-  <string name="conversation__menu_manage_group">Grubu yönet</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">Grubu yönet</string> -->
   <string name="conversation__menu_leave_group">Gruptan ayrıl</string>
   <string name="conversation__menu_view_all_media">Tüm içerik</string>
   <string name="conversation__menu_conversation_settings">Sohbet ayarları</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 21cf88e10a..bfc34f82bc 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1579,7 +1579,7 @@
   <!--conversation-->
   <string name="conversation__menu_add_attachment">新增附件檔案</string>
   <string name="conversation__menu_edit_group">編輯群組</string>
-  <string name="conversation__menu_manage_group">管理群組</string>
+  <!-- Removed by excludeNonTranslatables <string name="conversation__menu_manage_group">管理群組</string> -->
   <string name="conversation__menu_leave_group">離開對話群組</string>
   <string name="conversation__menu_view_all_media">所有的媒體</string>
   <string name="conversation__menu_conversation_settings">對話設定</string>