diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index cc6dbc0b8a..bdbbed8b19 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -850,7 +850,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">أدخل عبارة سرية جديدة!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ربط هذا الجهاز؟</string>
-  <string name="DeviceProvisioningActivity_cancel">إلغاء</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">إلغاء</string> -->
   <string name="DeviceProvisioningActivity_continue">استمر</string>
   <string name="DeviceProvisioningActivity_content_intro">سوف يتمكن من </string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1062,7 +1062,7 @@
   <string name="SubmitDebugLogActivity_success">تمّ بنجاح!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">انسخـ/ـي هذا الرابط وأضفـ(ـيـ)ـه إلى بلاغك أو إلى بريد الدعم:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">تمّ النسخ إلى الحافظة</string>
-  <string name="SubmitDebugLogActivity_ok">موافق</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">موافق</string> -->
   <string name="SubmitDebugLogActivity_share">شارك</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">الموضوع:</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 25a4d13a41..7af031a519 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -447,7 +447,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Yeni şifrə ifadəni daxil et!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Bu cihazla bağlantı qurulsun?</string>
-  <string name="DeviceProvisioningActivity_cancel">LƏĞV ET</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">LƏĞV ET</string> -->
   <string name="DeviceProvisioningActivity_continue">DAVAM ET</string>
   <string name="DeviceProvisioningActivity_content_intro">Onun icazəsi olacaq ki,</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index d4b5d41862..758fecaaf5 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -474,7 +474,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Въведете нова парола!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Свържи това устройство?</string>
-  <string name="DeviceProvisioningActivity_cancel">ОТКАЗ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ОТКАЗ</string> -->
   <string name="DeviceProvisioningActivity_continue">ПРОДЪЛЖИ</string>
   <string name="DeviceProvisioningActivity_content_intro">Ще може да</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 23b75cff7f..ee5e0d6467 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -715,7 +715,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">নতুন পাসফ্রেজ লিখুন!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">এই ডিভাইস যুক্ত করবেন?</string>
-  <string name="DeviceProvisioningActivity_cancel">বাতিল করুন</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">বাতিল করুন</string> -->
   <string name="DeviceProvisioningActivity_continue">সামনে আগান</string>
   <string name="DeviceProvisioningActivity_content_intro">এটা সক্ষম হবে</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -920,7 +920,7 @@
   <string name="SubmitDebugLogActivity_success">সফল!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">এই ইউআরএল টি কপি করুন এবং এটি আপনার সমস্যা প্রতিবেদন বা সাপোর্ট ইমে‌ইলে যোগ করুন:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">ক্লিপবোর্ডে অনুলিপি করা হয়েছে</string>
-  <string name="SubmitDebugLogActivity_ok">ঠিক আছে</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">ঠিক আছে</string> -->
   <string name="SubmitDebugLogActivity_share">শেয়ার করুন</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">বিষয়ঃ</string>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 045d89f38a..6103aa2a50 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -771,7 +771,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Unesite novu lozinku!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Uvezati ovaj uređaj?</string>
-  <string name="DeviceProvisioningActivity_cancel">OTKAŽI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">OTKAŽI</string> -->
   <string name="DeviceProvisioningActivity_continue">NASTAVI</string>
   <string name="DeviceProvisioningActivity_content_intro">Moći će da</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -991,7 +991,7 @@
   <string name="SubmitDebugLogActivity_success">Uspješno završeno!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopirajte ovu adresu i priložite je uz svoj izvještaj o problemu ili email za podršku:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopirano u međuspremnik</string>
-  <string name="SubmitDebugLogActivity_ok">Uredu</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Uredu</string> -->
   <string name="SubmitDebugLogActivity_share">Dijeli</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Tema:</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 93a699bd3d..6d0c240826 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Escriviu la contrasenya nova.</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Voleu enllaçar aquest dispositiu?</string>
-  <string name="DeviceProvisioningActivity_cancel">CANCEL·LA</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">CANCEL·LA</string> -->
   <string name="DeviceProvisioningActivity_continue">CONTINUA</string>
   <string name="DeviceProvisioningActivity_content_intro">Podrà</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -948,7 +948,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
   <string name="SubmitDebugLogActivity_success">Acabat!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copieu aquest URL i afegiu-lo a l\'informe d\'error o al correu electrònic de suport:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Copiat al porta-retalls</string>
-  <string name="SubmitDebugLogActivity_ok">D\'acord</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">D\'acord</string> -->
   <string name="SubmitDebugLogActivity_share">Comparteix</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Assumpte:</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b665905c72..5125d5fd9c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -806,7 +806,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Zadejte nové heslo!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Propojit toto zařízení?</string>
-  <string name="DeviceProvisioningActivity_cancel">ZRUŠIT</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ZRUŠIT</string> -->
   <string name="DeviceProvisioningActivity_continue">POKRAČOVAT</string>
   <string name="DeviceProvisioningActivity_content_intro">Bude moci</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1027,7 +1027,7 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
   <string name="SubmitDebugLogActivity_success">Úspěšně dokončeno!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Zkopírujte tento URL a přidejte jej do chybového hlášení nebo e-mailu podpoře:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Zkopírováno do schránky</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Sdílet</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Předmět:</string>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index a6cd82f631..292e2f6a47 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -808,7 +808,7 @@ Send neges heb ei ddiogelu?</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Rhoi\'r cyfrinymadrodd newydd!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Cysylltu\'r ddyfais hon?</string>
-  <string name="DeviceProvisioningActivity_cancel">DIDDYMU</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">DIDDYMU</string> -->
   <string name="DeviceProvisioningActivity_continue">PARHAU</string>
   <string name="DeviceProvisioningActivity_content_intro">Bydd yn gallu</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1030,7 +1030,7 @@ Send neges heb ei ddiogelu?</string>
   <string name="SubmitDebugLogActivity_success">Llwyddiant!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copïwch yr URL hwn a\'i ychwanegu at eich adroddiad neu e-bost cymorth:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Wedi\'i gopïo i\'r clipfwrdd</string>
-  <string name="SubmitDebugLogActivity_ok">Iawn</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Iawn</string> -->
   <string name="SubmitDebugLogActivity_share">Rhannu</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Pwnc:</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index aea28e26bb..6461be45e6 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -38,7 +38,7 @@
   <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Tap for at gøre Signal til din standard SMS app</string>
   <string name="ApplicationPreferencesActivity_on">aktivér</string>
   <string name="ApplicationPreferencesActivity_On">Aktivér</string>
-  <string name="ApplicationPreferencesActivity_off">deaktiver</string>
+  <string name="ApplicationPreferencesActivity_off">déaktiver</string>
   <string name="ApplicationPreferencesActivity_Off">Déaktiver</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <string name="ApplicationPreferencesActivity_privacy_summary">Skærmlås %1$s, Registreringslås %2$s</string>
@@ -279,7 +279,7 @@
   <string name="ConversationFragment_you_can_swipe_to_the_left_reply">Du kan swipe til venstre på enhver besked, for at svare hurtigt</string>
   <string name="ConversationFragment_outgoing_view_once_media_files_are_automatically_removed">Udgående mediebeskeder der kun vises én gang, bliver automatisk fjernet efter de er sendt</string>
   <string name="ConversationFragment_you_already_viewed_this_message">Beskeden er allerede læst</string>
-  <string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">Du kan tilføje egne notater i samtalen.\nHvis din konto har forbundne enheder, vil notaterne blive synkroniseret.</string>
+  <string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">Du kan tilføje egne notater i samtalen.\nHvis din konto har forbundne enheder, vil notaterne blive synkroniseret</string>
   <!--ConversationListActivity-->
   <string name="ConversationListActivity_there_is_no_browser_installed_on_your_device">Ingen browser installeret på enheden</string>
   <!--ConversationListFragment-->
@@ -737,7 +737,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Indtast nyt kodeord!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Tilføj denne enhed?</string>
-  <string name="DeviceProvisioningActivity_cancel">AFBRYD</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">AFBRYD</string> -->
   <string name="DeviceProvisioningActivity_continue">FORTSÆT</string>
   <string name="DeviceProvisioningActivity_content_intro">Den vil være i stand til at</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -857,7 +857,7 @@ nummer (%s) er ugyldigt</string>
   <string name="RegistrationActivity_more_information">Mere information</string>
   <string name="RegistrationActivity_less_information">Mindre information</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal kræver tilladelse til at tilgå dine kontakter og medieindhold, for at oprette forbindelser til venner, udveksle beskeder og foretage sikre opkald</string>
-  <string name="RegistrationActivity_rate_limited_to_service">Du har foretaget for mange forsøg på at registrere dette nummer. Prøv igen senere.</string>
+  <string name="RegistrationActivity_rate_limited_to_service">Du har foretaget for mange forsøg på at registrere dette nummer. Prøv igen senere</string>
   <string name="RegistrationActivity_unable_to_connect_to_service">Ikke muligt at få forbindelse til service. Tjek venligst din netværksforbindelse og prøv igen</string>
   <string name="RegistrationActivity_to_easily_verify_your_phone_number_signal_can_automatically_detect_your_verification_code">For nemt at godkende dit mobilnummer, kan Signal automatisk registrere din verifikationskode, hvis du tillader Signal adgang til at læse SMS beskeder</string>
   <plurals name="RegistrationActivity_debug_log_hint">
@@ -954,7 +954,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
   <string name="SubmitDebugLogActivity_success">Fuldført!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopier denne URL og tilføj den til din fejlrapport, eller til support email:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopieret til udklipsholder</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Del</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Emne:</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2478868486..be033713d4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Bitte neue Passphrase eingeben!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Dieses Gerät koppeln?</string>
-  <string name="DeviceProvisioningActivity_cancel">ABBRECHEN</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ABBRECHEN</string> -->
   <string name="DeviceProvisioningActivity_continue">WEITER</string>
   <string name="DeviceProvisioningActivity_content_intro">Folgende Rechte werden vergeben:</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -943,7 +943,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="SubmitDebugLogActivity_success">Erfolgreich!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Bitte kopiere diese Internetadresse und füge sie deinem Fehlerbericht oder deiner E-Mail an den Support hinzu:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">In Zwischenablage kopiert</string>
-  <string name="SubmitDebugLogActivity_ok">O. K.</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">O. K.</string> -->
   <string name="SubmitDebugLogActivity_share">Teilen</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Betreff:</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 216480ac5a..f8a2e5d751 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Εισαγωγή νέου συνθηματικού! </string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Σύνδεση αυτής της συσκευής;</string>
-  <string name="DeviceProvisioningActivity_cancel">ΑΚΥΡΩΣΗ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ΑΚΥΡΩΣΗ</string> -->
   <string name="DeviceProvisioningActivity_continue">ΣΥΝΕΧΕΙΑ</string>
   <string name="DeviceProvisioningActivity_content_intro">Θα μπορεί πλέον να</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -949,7 +949,7 @@
   <string name="SubmitDebugLogActivity_success">Επιτυχία!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Αντέγραψε αυτό το URL και προσθεσέ το στην αναφορά σφάλματος ή στο email υποστήριξης:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Αντιγράφηκε στο πρόχειρο</string>
-  <string name="SubmitDebugLogActivity_ok">Εντάξει</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Εντάξει</string> -->
   <string name="SubmitDebugLogActivity_share">Διαμοιρασμός</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Θέμα:</string>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index a3fa66e033..495aa467b1 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Entajpu novan pasfrazon!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Ĉu ligi ĉi tiun aparaton?</string>
-  <string name="DeviceProvisioningActivity_cancel">NULIGI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">NULIGI</string> -->
   <string name="DeviceProvisioningActivity_continue">DAŬRIGI</string>
   <string name="DeviceProvisioningActivity_content_intro">Ĝi povos</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -953,7 +953,7 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
   <string name="SubmitDebugLogActivity_success">Sukceso!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopiu tiun ĉi retadreson kaj aldonu ĝin al via problemraporto aŭ subtena retpoŝtmesaĝo:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopiita al tondujo</string>
-  <string name="SubmitDebugLogActivity_ok">Bone</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Bone</string> -->
   <string name="SubmitDebugLogActivity_share">Kunhavigi</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Pri:</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 226a178d0e..15aad2e2e5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">¡Introduce una nueva clave de acceso!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">¿Enlazar este dispositivo?</string>
-  <string name="DeviceProvisioningActivity_cancel">CANCELAR</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">CANCELAR</string> -->
   <string name="DeviceProvisioningActivity_continue">CONTINUAR</string>
   <string name="DeviceProvisioningActivity_content_intro">Podrá</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -954,7 +954,7 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
   <string name="SubmitDebugLogActivity_success">¡Completado!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copia esta URL y añádela a tu correo para el soporte o informe de incidencia:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Copiado al portapapeles</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Compartir</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Asunto:</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index bae65f8021..7fbc8cab2c 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -731,7 +731,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Sisesta uus salasõna!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Lingid selle seadme?</string>
-  <string name="DeviceProvisioningActivity_cancel">TÜHISTA</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">TÜHISTA</string> -->
   <string name="DeviceProvisioningActivity_continue">JÄTKA</string>
   <string name="DeviceProvisioningActivity_content_intro">See saab</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -948,7 +948,7 @@
   <string name="SubmitDebugLogActivity_success">Õnnestus!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopeeri see aadress ja lisa oma probleemiteatesse või toe e-kirja:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Lõikelauale kopeeritud</string>
-  <string name="SubmitDebugLogActivity_ok">OK</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">OK</string> -->
   <string name="SubmitDebugLogActivity_share">Jaga</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Teema:</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 6f60a86c36..82ff3e6483 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Sartu pasahitz berria!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Lotu gailu hau?</string>
-  <string name="DeviceProvisioningActivity_cancel">UTZI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">UTZI</string> -->
   <string name="DeviceProvisioningActivity_continue">JARRAITU</string>
   <string name="DeviceProvisioningActivity_content_intro">Hori egiteko gai izango da</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -954,7 +954,7 @@ Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
   <string name="SubmitDebugLogActivity_success">Arrakasta!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">URL hau kopiatu eta erantsi zure arazoaren txostenari edo laguntza eskatzeko emailari: \n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Arbelera kopiatuta</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Elkarbanatu</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Gaia:</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 0941e8d943..cb80bb9f45 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">گذرواژهٔ جدید را وارد کنید!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">پیوند دادن این دستگاه؟</string>
-  <string name="DeviceProvisioningActivity_cancel">لغو</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">لغو</string> -->
   <string name="DeviceProvisioningActivity_continue">ادامه</string>
   <string name="DeviceProvisioningActivity_content_intro">قادر خواهد بود تا</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -951,7 +951,7 @@
   <string name="SubmitDebugLogActivity_success">موفقیت!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">این ‌‌URL را کپی کرده و آن را به گزارش اشکال یا ایمیل پشتیبانی اضافه کنید:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">روی کلیپ بورد کپی شد</string>
-  <string name="SubmitDebugLogActivity_ok">قبول</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">قبول</string> -->
   <string name="SubmitDebugLogActivity_share">اشتراک‌گذاری</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">موضوع:</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 3f432edb45..5442bcb6cf 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Syötä uusi salalause!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Yhdistetäänkö tämä laite?</string>
-  <string name="DeviceProvisioningActivity_cancel">PERUUTA</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">PERUUTA</string> -->
   <string name="DeviceProvisioningActivity_continue">JATKA</string>
   <string name="DeviceProvisioningActivity_content_intro">Se saa luvan</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -948,7 +948,7 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <string name="SubmitDebugLogActivity_success">Onnistui!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopioi tämä URL ja lisää se ongelmaraporttiin tai tukisähköpostiisi:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopioitu leikepöydälle</string>
-  <string name="SubmitDebugLogActivity_ok">Selvä</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Selvä</string> -->
   <string name="SubmitDebugLogActivity_share">Jaa</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Aihe:</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index ae799d2078..55423df5b3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -82,7 +82,7 @@
   <string name="BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates">Vous ne recevrez plus ni message ni mise à jour de ce groupe et les membres ne pourront plus vous rajouter à ce groupe.</string>
   <string name="BlockUnblockDialog_group_members_wont_be_able_to_add_you">Les membres du groupe ne pourront plus vous rajouter à ce groupe.</string>
   <string name="BlockUnblockDialog_group_members_will_be_able_to_add_you">Les membres du groupe pourront vous rajouter à ce groupe.</string>
-  <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Vous pourrez échanger des messages et des appels et votre nom et photo seront partagés avec eux.</string>
+  <string name="BlockUnblockDialog_you_will_be_able_to_call_and_message_each_other">Vous pourrez échanger des messages et des appels, et vos nom et photo seront partagés avec eux.</string>
   <string name="BlockUnblockDialog_blocked_people_wont_be_able_to_call_you_or_send_you_messages">Les personnes bloquées ne pourront ni vous appeler ni vous envoyer de messages.</string>
   <string name="BlockUnblockDialog_unblock_s">Débloquer %1$s ?</string>
   <string name="BlockUnblockDialog_unblock">Débloquer</string>
@@ -468,6 +468,10 @@
   <string name="ManageRecipientActivity_view_all_groups">Voir tous les groupes</string>
   <string name="ManageRecipientActivity_see_all">Tout voir</string>
   <string name="ManageRecipientActivity_no_groups_in_common">Pas de groupes en commun</string>
+  <plurals name="ManageRecipientActivity_d_groups_in_common">
+    <item quantity="one">groupe %d en commun</item>
+    <item quantity="other">%dgroupes en commun</item>
+  </plurals>
   <string name="ManageRecipientActivity_edit_name_and_picture">Modifier le nom et l’image</string>
   <string name="ManageRecipientActivity_message_description">Message</string>
   <string name="ManageRecipientActivity_voice_call_description">Appel vocal</string>
@@ -705,6 +709,9 @@
   <string name="MessageRequestBottomView_delete">Supprimer</string>
   <string name="MessageRequestBottomView_block">Bloquer</string>
   <string name="MessageRequestBottomView_unblock">Débloquer</string>
+  <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_they_wont_know_youve_seen_their_messages_until_you_accept">Autoriser %1$s à vous envoyer des messages et partager votre nom et votre photo avec ce contact  ? Ce contact ne saura pas que vous avez vu ses messages tant que vous n’aurez pas accepté.</string>
+  <string name="MessageRequestBottomView_do_you_want_to_let_s_message_you_wont_receive_any_messages_until_you_unblock_them">Autoriser %1$s à vous envoyer des messages et partager votre nom et votre photo avec ce contact  ? Vous ne recevrez aucun message tant que vous ne l’aurez pas débloqué.</string>
+  <string name="MessageRequestBottomView_do_you_want_to_join_this_group_they_wont_know_youve_seen_their_messages_until_you_accept">Rejoindre ce groupe et partager votre nom et votre photo avec ses membres  ? Ils ne sauront pas que vous avez vu leurs messages tant que vous n’aurez pas accepté.</string>
   <string name="MessageRequestBottomView_you_were_invited_to_join_the_group_s">Vous avez été invité à vous joindre au groupe%1$s. Souhaitez-vous permettre aux membres de ce groupe de vous envoyer des messages ?</string>
   <string name="MessageRequestBottomView_unblock_this_group_and_share_your_name_and_photo_with_its_members">Débloquer ce groupe et partager votre nom et votre photo avec ses membres ? Vous ne recevrez aucun message tant que vous ne l’aurez pas débloqué.</string>
   <string name="MessageRequestProfileView_member_of_one_group">Membre de %1$s</string>
@@ -728,7 +735,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Saisissez la nouvelle phrase de passe.</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Relier cet appareil ?</string>
-  <string name="DeviceProvisioningActivity_cancel">ANNULER</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ANNULER</string> -->
   <string name="DeviceProvisioningActivity_continue">POURSUIVRE</string>
   <string name="DeviceProvisioningActivity_content_intro">Il pourra</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -843,6 +850,7 @@
   <string name="RegistrationActivity_more_information">Plus de précisions</string>
   <string name="RegistrationActivity_less_information">Moins de précisions</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal a besoin d’accéder à vos contacts et médias afin de se connecter avec vos amis, échanger des messages et effectuer des appels sécurisés</string>
+  <string name="RegistrationActivity_rate_limited_to_service">Vous avez effectué trop de tentatives pour enregistrer ce numéro. Veuillez réessayer plus tard.</string>
   <string name="RegistrationActivity_unable_to_connect_to_service">Impossible de se connecter au service. Veuillez vérifier la connexion réseau et ressayer.</string>
   <string name="RegistrationActivity_to_easily_verify_your_phone_number_signal_can_automatically_detect_your_verification_code">Pour confirmer facilement votre numéro de téléphone, Signal peut automatiquement détecter votre code de confirmation si vous autorisez Signal à lire les textos.</string>
   <plurals name="RegistrationActivity_debug_log_hint">
@@ -936,7 +944,7 @@
   <string name="SubmitDebugLogActivity_success">C’est réussi !</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copiez cette URL et ajoutez-la à votre relevé d’erreur ou à votre courriel de demande d’assistance :\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">A été copié dans le presse-papiers</string>
-  <string name="SubmitDebugLogActivity_ok">Valider</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Valider</string> -->
   <string name="SubmitDebugLogActivity_share">Partager</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Objet :</string>
@@ -1198,6 +1206,10 @@
   <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal a besoin d’accéder à vos contacts afin de les afficher.</string>
   <string name="contact_selection_list_fragment__show_contacts">Afficher les contacts</string>
   <!--contact_selection_list_item-->
+  <plurals name="contact_selection_list_item__number_of_members">
+    <item quantity="one">%1$d membre</item>
+    <item quantity="other">%1$d membres</item>
+  </plurals>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Message Signal</string>
   <string name="conversation_activity__type_message_sms_insecure">Texto non sécurisé</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index 1db5d56ba5..cf0436aff8 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -416,7 +416,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Cuir isteach nath faire nua!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Nasc an gléas?</string>
-  <string name="DeviceProvisioningActivity_cancel">CEALAIGH</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">CEALAIGH</string> -->
   <string name="DeviceProvisioningActivity_continue">LEAN AR AGHAIDH</string>
   <string name="DeviceProvisioningActivity_content_intro">Beidh sé in ann</string>
   <string name="DeviceProvisioningActivity_content_bullets">Léigh do theachtaireachtaí ar fad\n\nSeol teachtaireachtaí le do ainm</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index d53b0ab82a..43d898c2e9 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -579,7 +579,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Inserir nova frase de acceso!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Vincular este dispositivo?</string>
-  <string name="DeviceProvisioningActivity_cancel">CANCELAR</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">CANCELAR</string> -->
   <string name="DeviceProvisioningActivity_continue">CONTINUAR</string>
   <string name="DeviceProvisioningActivity_content_intro">Poderá</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index 06f3607f96..4003359f33 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -565,7 +565,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">નવો પાસફ્રેઝ દાખલ કરો!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">આ ઉપકરણને લિંક કરીએ?</string>
-  <string name="DeviceProvisioningActivity_cancel">રદ કરો</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">રદ કરો</string> -->
   <string name="DeviceProvisioningActivity_continue">ચાલુ રાખો</string>
   <string name="DeviceProvisioningActivity_content_intro">તે સમર્થ હશે</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-ha/strings.xml b/app/src/main/res/values-ha/strings.xml
index 1a15a332b7..9f49a10826 100644
--- a/app/src/main/res/values-ha/strings.xml
+++ b/app/src/main/res/values-ha/strings.xml
@@ -565,7 +565,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Shigar da sabon kalaman sirri!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Hade wannan na\'urar</string>
-  <string name="DeviceProvisioningActivity_cancel">Katse</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">Katse</string> -->
   <string name="DeviceProvisioningActivity_continue">Cigaba</string>
   <string name="DeviceProvisioningActivity_content_intro">Zai iya</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 487388aaac..33380bd681 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -567,7 +567,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">नया पासफ्रेज दर्ज करें</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">इस डिवाइस को लिंक करें?</string>
-  <string name="DeviceProvisioningActivity_cancel">रद्द करो </string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">रद्द करो </string> -->
   <string name="DeviceProvisioningActivity_continue">आगे </string>
   <string name="DeviceProvisioningActivity_content_intro">यह करने में सक्षम हो जाएगा</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 18feab53b2..ccc23e7cd8 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -636,7 +636,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Unesite novu lozinku!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Poveži ovaj uređaj?</string>
-  <string name="DeviceProvisioningActivity_cancel">ODUSTANI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ODUSTANI</string> -->
   <string name="DeviceProvisioningActivity_continue">NASTAVI</string>
   <string name="DeviceProvisioningActivity_content_intro">Moći će</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0cfbe2481c..c670d23cb5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -737,7 +737,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Add meg az új jelmondatot!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Társítod ezt a készüléket?</string>
-  <string name="DeviceProvisioningActivity_cancel">MÉGSE</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">MÉGSE</string> -->
   <string name="DeviceProvisioningActivity_continue">FOLYTATÁS</string>
   <string name="DeviceProvisioningActivity_content_intro">Képes lesz</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -956,7 +956,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <string name="SubmitDebugLogActivity_success">Sikerült!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Másold ki ezt a URL-t és illeszd be a hibajegybe vagy a támogatásnak küldött e-mailbe:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Vágólapra másolva</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Megosztás</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Tárgy:</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 428cbd7a2b..5e2849e1d9 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -653,7 +653,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Masukkan frasa sandi baru!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Hubungkan perangkat ini?</string>
-  <string name="DeviceProvisioningActivity_cancel">BATAL</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">BATAL</string> -->
   <string name="DeviceProvisioningActivity_continue">LANJUTKAN</string>
   <string name="DeviceProvisioningActivity_content_intro">Perangkat yang telah terhubung akan dapat</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -860,7 +860,7 @@ Menerima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <string name="SubmitDebugLogActivity_success">Sukses!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Salin URL ini dan kirimkan ke email support <b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Disalin ke papan klip</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Bagikan</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Judul</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 79ec793c7a..6ba63f1e9d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Inserisci una nuova password!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Collegare questo dispositivo?</string>
-  <string name="DeviceProvisioningActivity_cancel">ANNULLA</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ANNULLA</string> -->
   <string name="DeviceProvisioningActivity_continue">CONTINUA</string>
   <string name="DeviceProvisioningActivity_content_intro">Sarà in grado di</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -954,7 +954,7 @@
   <string name="SubmitDebugLogActivity_success">Completato!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copia questo URL e aggiungilo alla tua segnalazione o all\'email di supporto:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Aggiunto agli appunti</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Condividi</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Oggetto:</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 0b6676bea1..9b5c9e8f67 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -806,7 +806,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">הכנס משפט־סיסמה חדש!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">לקשר מכשיר זה?</string>
-  <string name="DeviceProvisioningActivity_cancel">בטל</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">בטל</string> -->
   <string name="DeviceProvisioningActivity_continue">המשך</string>
   <string name="DeviceProvisioningActivity_content_intro">הוא יוכל</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1028,7 +1028,7 @@
   <string name="SubmitDebugLogActivity_success">הצלחה!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">העתק כתובת זו והוסף אותה אל דוח הסוגיות שלך או דוא״ל התמיכה שלך:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">הועתק ללוח</string>
-  <string name="SubmitDebugLogActivity_ok">בסדר</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">בסדר</string> -->
   <string name="SubmitDebugLogActivity_share">שתף</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">נושא:</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 331a7916c8..56fc529d4b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -701,7 +701,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">新しいパスフレーズを入力してください！</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">このデバイスをリンクしますか？</string>
-  <string name="DeviceProvisioningActivity_cancel">キャンセル</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">キャンセル</string> -->
   <string name="DeviceProvisioningActivity_continue">続行</string>
   <string name="DeviceProvisioningActivity_content_intro">以下が可能になります:</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -906,7 +906,7 @@
   <string name="SubmitDebugLogActivity_success">成功しました!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">このURLをコピーしてバグレポートやサポートメールに貼り付けてください:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">クリップボードにコピーしました</string>
-  <string name="SubmitDebugLogActivity_ok">OK</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">OK</string> -->
   <string name="SubmitDebugLogActivity_share">共有</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Subject:</string>
diff --git a/app/src/main/res/values-jv/strings.xml b/app/src/main/res/values-jv/strings.xml
index c9762d3e8d..174ab45c81 100644
--- a/app/src/main/res/values-jv/strings.xml
+++ b/app/src/main/res/values-jv/strings.xml
@@ -546,7 +546,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Lebetaken tembung sandi ingkang enggal!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Tautaken pirantos niki?</string>
-  <string name="DeviceProvisioningActivity_cancel">BATALAKEN</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">BATALAKEN</string> -->
   <string name="DeviceProvisioningActivity_continue">LAJENGAKEN</string>
   <string name="DeviceProvisioningActivity_content_intro">Tumindak niki bakal saged</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index 8d3d333379..8ad1aaabf9 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -701,7 +701,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">បញ្ចូលឃ្លាសម្ងាត់ថ្មី!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ភ្ជាប់ឧបករណ៍នេះឬទេ?</string>
-  <string name="DeviceProvisioningActivity_cancel">បោះបង់</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">បោះបង់</string> -->
   <string name="DeviceProvisioningActivity_continue">បន្ត</string>
   <string name="DeviceProvisioningActivity_content_intro">វានឹងអាច</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -911,7 +911,7 @@
   <string name="SubmitDebugLogActivity_success">ជោគជ័យ!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">ចម្លងអាសយដ្ឋាន URL នេះ និងបន្ថែមវាទៅរបាយការណ៍បញ្ហា ឬអ៊ីម៉ែលគាំទ្រ:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">បានចម្លងទៅ clipboard</string>
-  <string name="SubmitDebugLogActivity_ok">យល់ព្រម</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">យល់ព្រម</string> -->
   <string name="SubmitDebugLogActivity_share">ចែករំលែក</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">ចំណងជើង៖</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index cdf25886d1..b1746b31e0 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -586,7 +586,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">ಹೊಸ ಪಾಸ್‌ಫ್ರೇಸ್‌ ನಮೂದಿಸಿ!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ಈ ಸಾಧನವನ್ನು ಲಿಂಕ್ ಮಾಡುವುದೇ?</string>
-  <string name="DeviceProvisioningActivity_cancel">ರದ್ದುಗೊಳಿಸಿ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ರದ್ದುಗೊಳಿಸಿ</string> -->
   <string name="DeviceProvisioningActivity_continue">ಮುಂದುವರಿಸು</string>
   <string name="DeviceProvisioningActivity_content_intro">ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -778,7 +778,7 @@
   <string name="SubmitDebugLogActivity_success">ಯಶಸ್ವಿಯಾಗಿದೆ!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">ಈ URL ಅನ್ನು ನಕಲಿಸಿ ಮತ್ತು ಇದನ್ನು ನಿಮ್ಮ ವಿಷಯ ವರದಿಗೆ ಸೇರಿಸಿ ಅಥವಾ ಇಮೇಲ್ ಬೆಂಬಲಿಸಿ :\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲು ಮಾಡಲಾಗಿದೆ</string>
-  <string name="SubmitDebugLogActivity_ok">ಓಕೆ</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">ಓಕೆ</string> -->
   <string name="SubmitDebugLogActivity_share">ಹಂಚಿಕೊಳ್ಳಿ </string>
   <!--SupportEmailUtil-->
   <!--ThreadRecord-->
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b6065972e7..5dad5af69f 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -574,7 +574,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">새 암호를 입력하세요!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">기기를 연결하시겠습니까?</string>
-  <string name="DeviceProvisioningActivity_cancel">취소</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">취소</string> -->
   <string name="DeviceProvisioningActivity_continue">계속</string>
   <string name="DeviceProvisioningActivity_content_intro">다음 수행 가능:</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -769,7 +769,7 @@
   <string name="SubmitDebugLogActivity_failed_to_submit_logs">로그를 제출하는데 실패했습니다.</string>
   <string name="SubmitDebugLogActivity_success">성공!</string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">클립보드로 복사됨</string>
-  <string name="SubmitDebugLogActivity_ok">확인</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">확인</string> -->
   <string name="SubmitDebugLogActivity_share">공유</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_signal_version">Signal 버전:</string>
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 3c290449c1..3a73f51ac5 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -418,7 +418,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Borînbiwêjek nû têkeve!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Vê amûrê girê bide?</string>
-  <string name="DeviceProvisioningActivity_cancel">BETAL</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">BETAL</string> -->
   <string name="DeviceProvisioningActivity_continue">BIDOMÎNE</string>
   <string name="DeviceProvisioningActivity_content_intro">Ew ê bikaribe</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-lg/strings.xml b/app/src/main/res/values-lg/strings.xml
index 049da19289..7944ef6224 100644
--- a/app/src/main/res/values-lg/strings.xml
+++ b/app/src/main/res/values-lg/strings.xml
@@ -259,7 +259,7 @@ a</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Yingizamu passiwaddi empya nga yabigaambo ne namba</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Yungako divayisi?</string>
-  <string name="DeviceProvisioningActivity_cancel">Sazaamu</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">Sazaamu</string> -->
   <string name="DeviceProvisioningActivity_continue">Weyongere maaso</string>
   <string name="DeviceProvisioningActivity_content_intro">Kijjakusoboseza </string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index daf96a5750..794882ae7d 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -298,6 +298,7 @@
   <string name="ConversationFragment_you_can_swipe_to_the_left_reply">Norėdami greitai atsakyti į žinutę, galite perbraukti ją į kairę</string>
   <string name="ConversationFragment_outgoing_view_once_media_files_are_automatically_removed">Išsiunčiami vienkartinės peržiūros medijos failai, juos išsiuntus, yra automatiškai pašalinami</string>
   <string name="ConversationFragment_you_already_viewed_this_message">Jūs jau žiūrėjote šią žinutę</string>
+  <string name="ConversationFragment__you_can_add_notes_for_yourself_in_this_conversation">Šiame pokalbyje galite rašyti sau pastabas.\nJeigu yra su paskyra susietų įrenginių, naujos pastabos bus sinchronizuotos.</string>
   <!--ConversationListActivity-->
   <string name="ConversationListActivity_there_is_no_browser_installed_on_your_device">Jūsų įrenginyje nėra įdiegtos naršyklės.</string>
   <!--ConversationListFragment-->
@@ -493,6 +494,7 @@
   <string name="GroupManagement_choose_who_can_change_the_group_name_and_photo">Pasirinkite, kas gali keisti grupės pavadinimą ir nuotrauką</string>
   <!--ManageRecipientActivity-->
   <string name="ManageRecipientActivity_disappearing_messages">Išnykstančios žinutės</string>
+  <string name="ManageRecipientActivity_chat_color">Pokalbio spalva</string>
   <string name="ManageRecipientActivity_block">Užblokuoti</string>
   <string name="ManageRecipientActivity_unblock">Atblokuoti</string>
   <string name="ManageRecipientActivity_view_safety_number">Rodyti saugumo numerį</string>
@@ -502,9 +504,20 @@
   <string name="ManageRecipientActivity_off">Išjungta</string>
   <string name="ManageRecipientActivity_on">Įjungta</string>
   <string name="ManageRecipientActivity_add_to_a_group">Pridėti į grupę</string>
+  <string name="ManageRecipientActivity_view_all_groups">Rodyti visas grupes</string>
   <string name="ManageRecipientActivity_see_all">Rodyti visus</string>
+  <string name="ManageRecipientActivity_no_groups_in_common">Nėra bendrų grupių</string>
+  <plurals name="ManageRecipientActivity_d_groups_in_common">
+    <item quantity="one">%d bendra grupė</item>
+    <item quantity="few">%d bendros grupės</item>
+    <item quantity="many">%d bendrų grupių</item>
+    <item quantity="other">%d bendra grupė</item>
+  </plurals>
   <string name="ManageRecipientActivity_edit_name_and_picture">Taisyti pavadinimą ir paveikslą</string>
   <string name="ManageRecipientActivity_message_description">Žinutė</string>
+  <string name="ManageRecipientActivity_voice_call_description">Balso skambutis</string>
+  <string name="ManageRecipientActivity_insecure_voice_call_description">Nesaugus balso skambutis</string>
+  <string name="ManageRecipientActivity_video_call_description">Vaizdo skambutis</string>
   <plurals name="GroupMemberList_invited">
     <item quantity="one">%1$s pakvietė 1 žmogų</item>
     <item quantity="few">%1$s pakvietė %2$d žmones</item>
@@ -793,7 +806,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Įveskite naują slaptafrazę!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Susieti šį įrenginį?</string>
-  <string name="DeviceProvisioningActivity_cancel">ATSISAKYTI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ATSISAKYTI</string> -->
   <string name="DeviceProvisioningActivity_continue">TĘSTI</string>
   <string name="DeviceProvisioningActivity_content_intro">Jis galės</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -916,6 +929,7 @@
   <string name="RegistrationActivity_more_information">Daugiau informacijos</string>
   <string name="RegistrationActivity_less_information">Mažiau informacijos</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Norinti susisiekti su draugais, keistis žinutėmis ir saugiai skambinti, Signal reikia prieigos prie jūsų adresatų ir medijos</string>
+  <string name="RegistrationActivity_rate_limited_to_service">Atlikote per daug bandymų užregistruoti šį numerį. Vėliau bandykite dar kartą.</string>
   <string name="RegistrationActivity_unable_to_connect_to_service">Nepavyksta prisijungti prie paslaugos. Patikrinkite tinklo ryšį ir bandykite dar kartą.</string>
   <string name="RegistrationActivity_to_easily_verify_your_phone_number_signal_can_automatically_detect_your_verification_code">Norint lengvai patvirtinti jūsų telefono numerį, Signal gali automatiškai aptikti patvirtinimo kodą, jei leisite programai Signal peržiūrėti SMS žinutes.</string>
   <plurals name="RegistrationActivity_debug_log_hint">
@@ -1014,7 +1028,7 @@
   <string name="SubmitDebugLogActivity_success">Įvykdyta!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Nukopijuokite šį URL ir pridėkite jį į savo pranešimą apie klaidą ar palaikymo el. laišką:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Nukopijuota į iškarpinę</string>
-  <string name="SubmitDebugLogActivity_ok">Gerai</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Gerai</string> -->
   <string name="SubmitDebugLogActivity_share">Bendrinti</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Tema:</string>
@@ -1491,6 +1505,8 @@
   <string name="message_details_header__disappears">Išnyksta</string>
   <string name="message_details_header__via">Per</string>
   <!--message_details_recipient_header-->
+  <string name="message_details_recipient_header__pending_send">Laukiama</string>
+  <string name="message_details_recipient_header__not_sent">Neišsiųsta</string>
   <!--message_Details_recipient-->
   <string name="message_details_recipient__failed_to_send">Nepavyko išsiųsti</string>
   <string name="message_details_recipient__new_safety_number">Naujas saugumo numeris</string>
@@ -2075,6 +2091,9 @@
   <string name="RecipientBottomSheet_remove_as_admin">Pašalinti iš administratorių</string>
   <string name="RecipientBottomSheet_remove_from_group">Šalinti iš grupės</string>
   <string name="RecipientBottomSheet_message_description">Žinutė</string>
+  <string name="RecipientBottomSheet_voice_call_description">Balso skambutis</string>
+  <string name="RecipientBottomSheet_insecure_voice_call_description">Nesaugus balso skambutis</string>
+  <string name="RecipientBottomSheet_video_call_description">Vaizdo skambutis</string>
   <string name="RecipientBottomSheet_remove_s_as_group_admin">Pašalinti %1$s iš grupės administratorių?</string>
   <string name="RecipientBottomSheet_s_will_be_able_to_edit_group">%1$s galės taisyti šią grupę ir jos narių sąrašą</string>
   <string name="RecipientBottomSheet_remove_s_from_s">Šalinti %1$s iš \"%2$s\"?</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 043537306a..0645833ff9 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -687,7 +687,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Ievadiet jaunu paroli!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Vai piesaistīt šo ierīci?</string>
-  <string name="DeviceProvisioningActivity_cancel">ATCELT</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ATCELT</string> -->
   <string name="DeviceProvisioningActivity_continue">TURPINĀT</string>
   <string name="DeviceProvisioningActivity_content_intro">Tā varēs</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -899,7 +899,7 @@ Saņemts nederīgas protokola versijas atslēgas apmaiņas ziņojums.
   <string name="SubmitDebugLogActivity_success">Izdevās!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Nokopējiet šo URL un pievienojiet to problēmas ziņojumam vai atbalsta e-pastam:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Iekopēts starpenē</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Dalīties</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Temats</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index f427e300f0..74a75230a5 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -191,7 +191,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Внесете нова лозинка!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Поврзете го овај уред?</string>
-  <string name="DeviceProvisioningActivity_cancel">ОТКАЖИ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ОТКАЖИ</string> -->
   <string name="DeviceProvisioningActivity_continue">ПРОДОЛЖИ</string>
   <string name="DeviceProvisioningActivity_content_intro">Ќе може</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index ed74a4c04e..314a904b02 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -467,6 +467,11 @@
   <string name="ManageRecipientActivity_add_to_a_group">ഒരു ഗ്രൂപ്പിലേക്ക് ചേർക്കുക</string>
   <string name="ManageRecipientActivity_view_all_groups">എല്ലാ ഗ്രൂപ്പുകളും കാണുക</string>
   <string name="ManageRecipientActivity_see_all">എല്ലാം കാണുക</string>
+  <string name="ManageRecipientActivity_no_groups_in_common">പൊതുവായി ഗ്രൂപ്പുകളൊന്നുമില്ല</string>
+  <plurals name="ManageRecipientActivity_d_groups_in_common">
+    <item quantity="one">പൊതുവായുള്ള %d ഗ്രൂപ്പ്</item>
+    <item quantity="other">പൊതുവായി %d ഗ്രൂപ്പുകൾ</item>
+  </plurals>
   <string name="ManageRecipientActivity_edit_name_and_picture">പേരും ചിത്രവും എഡിറ്റുചെയ്യുക</string>
   <string name="ManageRecipientActivity_message_description">സന്ദേശം</string>
   <string name="ManageRecipientActivity_voice_call_description">വോയ്സ് കോൾ</string>
@@ -730,7 +735,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">പുതിയ പാസ്‌ഫ്രെയ്‌സ് നൽകുക!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ഈ ഉപകരണം ലിങ്കുചെയ്യണോ?</string>
-  <string name="DeviceProvisioningActivity_cancel">റദ്ദാക്കുക</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">റദ്ദാക്കുക</string> -->
   <string name="DeviceProvisioningActivity_continue">തുടരുക</string>
   <string name="DeviceProvisioningActivity_content_intro">അതിന് കഴിയും</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -940,7 +945,7 @@
   <string name="SubmitDebugLogActivity_success">വിജയം!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">ഈ URL പകർത്തി നിങ്ങളുടെ പ്രശ്ന റിപ്പോർട്ടിലേക്കോ പിന്തുണാ ഇമെയിലിലേക്കോ ചേർക്കുക:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി</string>
-  <string name="SubmitDebugLogActivity_ok">ശരി</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">ശരി</string> -->
   <string name="SubmitDebugLogActivity_share">പങ്കിടുക</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">വിഷയം:</string>
@@ -1400,6 +1405,7 @@ grūpp ap‌ḍē</string>
   <string name="message_details_header__disappears">അപ്രത്യക്ഷമാകുന്നു</string>
   <string name="message_details_header__via">വഴി</string>
   <!--message_details_recipient_header-->
+  <string name="message_details_recipient_header__pending_send">ശേഷിക്കുന്നു</string>
   <string name="message_details_recipient_header__sent_from">അയച്ചത്</string>
   <string name="message_details_recipient_header__read_by">വായിച്ചത്</string>
   <string name="message_details_recipient_header__not_sent">അയച്ചില്ല</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 018837adef..57a609020b 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -617,7 +617,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">नवीन पासफ्रेझ प्रविष्ट करा!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">हा डिव्हाईस लिंक करायचा?</string>
-  <string name="DeviceProvisioningActivity_cancel">रद्द करा</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">रद्द करा</string> -->
   <string name="DeviceProvisioningActivity_continue">सुरू ठेवा</string>
   <string name="DeviceProvisioningActivity_content_intro">ते करण्यास सक्षम असेल</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index b1f58a6e37..9dceb4ed82 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -484,7 +484,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Masukkan frasa laluan baru!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Pautkan peranti ini?</string>
-  <string name="DeviceProvisioningActivity_cancel">BATALKAN</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">BATALKAN</string> -->
   <string name="DeviceProvisioningActivity_continue">TERUSKAN</string>
   <string name="DeviceProvisioningActivity_content_intro">ia akan dapat</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index f42f4e6735..4b8bfba3fd 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -402,7 +402,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">စသားဝှက်အသစ်ထည့်ပါ</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ဒီစက်ကိုချိတ်ပါ</string>
-  <string name="DeviceProvisioningActivity_cancel">ပယ်ဖျက်မည်</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ပယ်ဖျက်မည်</string> -->
   <string name="DeviceProvisioningActivity_continue">ဆက်လုပ်မည်</string>
   <string name="DeviceProvisioningActivity_content_intro">ဖြစ်နိုင်သည်</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index edf9925f17..b84d1d28d4 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -599,7 +599,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Skriv inn ny passord!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Vil du koble denne enheten til tjenesten?</string>
-  <string name="DeviceProvisioningActivity_cancel">AVBRYT</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">AVBRYT</string> -->
   <string name="DeviceProvisioningActivity_continue">FORTSETT</string>
   <string name="DeviceProvisioningActivity_content_intro">Den kan i så fall</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -793,7 +793,7 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversion.</string>
   <string name="SubmitDebugLogActivity_success">Fullført!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopier denne URL-en og legg den til i din feilrapport eller support-e-postadressen:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopiert til utklippstavle</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Del</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Emne:</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b5d1f15827..3ad33c2f56 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Voer nieuw wachtwoord in!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Dit apparaat koppelen?</string>
-  <string name="DeviceProvisioningActivity_cancel">ANNULEREN</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ANNULEREN</string> -->
   <string name="DeviceProvisioningActivity_continue">DOORGAAN</string>
   <string name="DeviceProvisioningActivity_content_intro">Het kan dan</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -956,7 +956,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
   <string name="SubmitDebugLogActivity_success">Succesvol geüpload!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopieer deze URL en voeg die toe aan je foutrapport op GitHub of aan een e-mail aan onze ondersteuning:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Gekopieerd naar klembord</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Doorsturen via andere app</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Onderwerp:</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 2bf2ec1c30..9f9ea3597b 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -737,7 +737,7 @@ Viss kontoen din har lenka einingar, så vil nye notat bli synkroniserte.</strin
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Skriv inn ny passordfrase.</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Vil du kopla denne eininga til tenesta?</string>
-  <string name="DeviceProvisioningActivity_cancel">AVBRYT</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">AVBRYT</string> -->
   <string name="DeviceProvisioningActivity_continue">HALD FRAM</string>
   <string name="DeviceProvisioningActivity_content_intro">Kan i så fall</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -954,7 +954,7 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <string name="SubmitDebugLogActivity_success">Fullført!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopier denne URL-en og legg han til feilrapporten eller e-posten til support:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopiert til utklippstavla</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Del</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Emne:</string>
diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml
index 983f0d791c..8a08d755f0 100644
--- a/app/src/main/res/values-pa-rPK/strings.xml
+++ b/app/src/main/res/values-pa-rPK/strings.xml
@@ -569,7 +569,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">نواں پاس فریز درج کرو!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ایس الے نوں توں منسلک کر دئی اے؟</string>
-  <string name="DeviceProvisioningActivity_cancel">منسوخ کرو</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">منسوخ کرو</string> -->
   <string name="DeviceProvisioningActivity_continue">جاری رکھو</string>
   <string name="DeviceProvisioningActivity_content_intro">اے ایہدے قابل ہووے گا کہ</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 4d140f7ba7..2055703710 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -560,7 +560,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">ਨਵਾਂ ਪਾਸਫਰੇਜ ਦਰਜ ਕਰੋ!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ਇਸ ਡਿਵਾਈਸ ਨੂੰ ਲਿੰਕ ਕਰੋ?</string>
-  <string name="DeviceProvisioningActivity_cancel">ਰੱਦ ਕਰੋ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ਰੱਦ ਕਰੋ</string> -->
   <string name="DeviceProvisioningActivity_continue">ਜਾਰੀ ਰੱਖੋ</string>
   <string name="DeviceProvisioningActivity_content_intro">ਇਹ ਕਰਨ ਦੇ ਯੋਗ ਹੋ ਜਾਵੇਗਾ</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -747,7 +747,7 @@
   <string name="SubmitDebugLogActivity_submit">ਜਮ੍ਹਾਂ ਕਰੋ</string>
   <string name="SubmitDebugLogActivity_success">ਸਫਲਤਾ!</string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">ਕਲਿਪਬੋਰਡ ਤੇ ਕਾਪੀ ਕੀਤਾ ਗਿਆ</string>
-  <string name="SubmitDebugLogActivity_ok">ਠੀਕ ਹੈ</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">ਠੀਕ ਹੈ</string> -->
   <string name="SubmitDebugLogActivity_share">ਸਾਂਝਾ ਕਰੋ</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_device_info">ਡਿਵਾਈਸ ਜਾਣਕਾਰੀ:</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1958098c98..2b302ba43f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -806,7 +806,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Wpisz nowe hasło!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Połączyć z tym urządzeniem?</string>
-  <string name="DeviceProvisioningActivity_cancel">ANULUJ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ANULUJ</string> -->
   <string name="DeviceProvisioningActivity_continue">KONTYNUUJ</string>
   <string name="DeviceProvisioningActivity_content_intro">Będzie w stanie:</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1020,7 +1020,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="SubmitDebugLogActivity_success">Sukces!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Skopiuj ten URL i dodaj go do Twojego raportu o błędzie lub wiadomości e-mail:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Skopiowano do schowka</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Udostępnij</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Temat:</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8813dc7245..fa8f7c9562 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -587,7 +587,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Insira uma nova frase-chave!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Vincular este dispositivo?</string>
-  <string name="DeviceProvisioningActivity_cancel">CANCELAR</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">CANCELAR</string> -->
   <string name="DeviceProvisioningActivity_continue">CONTINUAR</string>
   <string name="DeviceProvisioningActivity_content_intro">Ele será capaz de</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -784,7 +784,7 @@
   <string name="SubmitDebugLogActivity_success">Sucesso!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copie essa URL e adicione seu relatório de problemas ou envie para o email: \n\n &lt;b&gt;%1$s</string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Copiado para a área de transferência</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Compartilhar</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Assunto:</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e0d41f5dd3..f78b8f75c6 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Introduza uma nova frase-passe</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Associar este dispositivo?</string>
-  <string name="DeviceProvisioningActivity_cancel">CANCELAR</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">CANCELAR</string> -->
   <string name="DeviceProvisioningActivity_continue">CONTINUAR</string>
   <string name="DeviceProvisioningActivity_content_intro">Será capaz de</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -950,7 +950,7 @@ Mensagem de troca de chaves inválida para esta versão do protocolo.
   <string name="SubmitDebugLogActivity_success">Efetuado com sucesso!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copie este URL e adicione-o ao seu relatório de problema ou e-mail de pedido de apoio:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Copiado para a área de transferência</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Partilhar</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Assunto:</string>
diff --git a/app/src/main/res/values-qu-rEC/strings.xml b/app/src/main/res/values-qu-rEC/strings.xml
index 5995a60410..44509ff2c3 100644
--- a/app/src/main/res/values-qu-rEC/strings.xml
+++ b/app/src/main/res/values-qu-rEC/strings.xml
@@ -399,7 +399,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">¡Mushuk paskachik-shimita churapay!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Kay antahillayta kimichinkapak munankichu</string>
-  <string name="DeviceProvisioningActivity_cancel">SHAYACHINA</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">SHAYACHINA</string> -->
   <string name="DeviceProvisioningActivity_continue">KATIPAY</string>
   <string name="DeviceProvisioningActivity_content_intro">Ushankimi</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 54f85b6733..9fc0fa0a73 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -771,7 +771,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Introduceți parola nouă!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Asociez acest dispozitiv?</string>
-  <string name="DeviceProvisioningActivity_cancel">ANULAȚI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ANULAȚI</string> -->
   <string name="DeviceProvisioningActivity_continue">CONTINUAȚI</string>
   <string name="DeviceProvisioningActivity_content_intro">Va putea</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -987,7 +987,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="SubmitDebugLogActivity_success">Succes!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copiați acest URL și adăugați-l la raportul de probleme sau la mail-ul de suport:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">S-a copiat în clipboard</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Partajați</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Subiect:</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index f6a9b8b13b..7e45908cee 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -806,7 +806,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Введите новую парольную фразу!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Привязать это устройство?</string>
-  <string name="DeviceProvisioningActivity_cancel">ОТМЕНА</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ОТМЕНА</string> -->
   <string name="DeviceProvisioningActivity_continue">ПРОДОЛЖИТЬ</string>
   <string name="DeviceProvisioningActivity_content_intro">Оно сможет</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1021,7 +1021,7 @@
   <string name="SubmitDebugLogActivity_success">Успех!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Скопируйте этот URL-адрес и добавьте его в отчет о проблеме или в письмо в службу поддержки:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Скопировано в буфер обмена</string>
-  <string name="SubmitDebugLogActivity_ok">Ок</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ок</string> -->
   <string name="SubmitDebugLogActivity_share">Поделиться</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Тема:</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8483cc5a32..c273299696 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -734,7 +734,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Zadajte nové heslo!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Pridať toto zariadenie?</string>
-  <string name="DeviceProvisioningActivity_cancel">ZRUŠIŤ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ZRUŠIŤ</string> -->
   <string name="DeviceProvisioningActivity_continue">POKRAČOVAŤ</string>
   <string name="DeviceProvisioningActivity_content_intro">Bude môcť </string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -948,7 +948,7 @@ Bola prijatá správa výmeny kľúčov s neplatnou verziou protokolu.
   <string name="SubmitDebugLogActivity_success">Operácia úspešne dokončená!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Skopírujte túto URL adresu a pridajte ju k hláseniu o chybe alebo e-mailu určenému tímu podpory:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Skopírované do schránky</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Zdieľať</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Predmet:</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index cf0bac414e..d9eedea15e 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -806,7 +806,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Vnesite novo geslo!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Povežem napravo?</string>
-  <string name="DeviceProvisioningActivity_cancel">PREKINI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">PREKINI</string> -->
   <string name="DeviceProvisioningActivity_continue">NADALJUJ</string>
   <string name="DeviceProvisioningActivity_content_intro">Lahko bo:</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -1019,7 +1019,7 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
   <string name="SubmitDebugLogActivity_success">Uspešno opravljeno!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Prekopirajte naslov URL in ga dodajte k prijavi napake ali v elektronsko sporočilo za tehnično podporo:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopirano v odložišče</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Deli</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Predmet:</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 66e38456f1..7b1be667d5 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Jepni frazëkalim të ri!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Të lidhet kjo pajisje?</string>
-  <string name="DeviceProvisioningActivity_cancel">ANULOJE</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ANULOJE</string> -->
   <string name="DeviceProvisioningActivity_continue">VAZHDO</string>
   <string name="DeviceProvisioningActivity_content_intro">Do të jetë në gjendje të</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -950,7 +950,7 @@
   <string name="SubmitDebugLogActivity_success">Sukses!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopjojeni këtë URL dhe shtojeni te njoftimi i problemit tuaj ose email-i për asistencën:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">U kopjua në të papastër!</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Ndajeni Me të Tjerë</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Subjekt:</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index cd9ba171d8..2277b50228 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -531,7 +531,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Унесите нову лозинку!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Да повежем овај уређај?</string>
-  <string name="DeviceProvisioningActivity_cancel">ОДУСТАНИ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ОДУСТАНИ</string> -->
   <string name="DeviceProvisioningActivity_continue">НАСТАВИ</string>
   <string name="DeviceProvisioningActivity_content_intro">Моћи ће да</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 0874f71366..b430f1935e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -736,7 +736,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Ange nytt lösenord!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Länka den här enheten?</string>
-  <string name="DeviceProvisioningActivity_cancel">AVBRYT</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">AVBRYT</string> -->
   <string name="DeviceProvisioningActivity_continue">FORTSÄTT</string>
   <string name="DeviceProvisioningActivity_content_intro">Den kommer att kunna</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -948,7 +948,7 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="SubmitDebugLogActivity_success">Klart!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopiera webbadressen och lägg till den i din problemrapport eller support-e-post:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Kopierade till urklipp</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Dela</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Ämne:</string>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 1ca58972f3..b2072f80ec 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -570,7 +570,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Ingiza Nenosiri mpya!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Unganisha kifaa hiki?</string>
-  <string name="DeviceProvisioningActivity_cancel">GHAIRI</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">GHAIRI</string> -->
   <string name="DeviceProvisioningActivity_continue">ENDELEA</string>
   <string name="DeviceProvisioningActivity_content_intro">Itaweza ku</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index c5510fbc96..bd39d528cb 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -579,7 +579,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">புது கடவுச்சொல்லை உள்ளிடவும்.</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">இந்த சாதனத்தை இணைக்களாமா? </string>
-  <string name="DeviceProvisioningActivity_cancel">ரத்து</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ரத்து</string> -->
   <string name="DeviceProvisioningActivity_continue">தொடர்</string>
   <string name="DeviceProvisioningActivity_content_intro">இதனால் முடியும் </string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 10d5030ed9..bd93da6dcb 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -672,7 +672,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">కొత్త సంకేతపదం వ్రాయండి!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ఈ పరికరం బంధము చేయాలా?</string>
-  <string name="DeviceProvisioningActivity_cancel">రద్దు</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">రద్దు</string> -->
   <string name="DeviceProvisioningActivity_continue">కొనసాగించు</string>
   <string name="DeviceProvisioningActivity_content_intro">ఇది చెయ్యగలరు</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 0e6a4c63f0..67fcb82f29 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -662,7 +662,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">ป้อนวลีรหัสผ่านใหม่!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">เชื่อมโยงกับอุปกรณ์นี้หรือไม่?</string>
-  <string name="DeviceProvisioningActivity_cancel">ยกเลิก</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">ยกเลิก</string> -->
   <string name="DeviceProvisioningActivity_continue">ดำเนินการต่อ</string>
   <string name="DeviceProvisioningActivity_content_intro">มันจะสามารถ</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -868,7 +868,7 @@
   <string name="SubmitDebugLogActivity_success">สำเร็จ!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">คัดลอก URL และเพิ่มมันในรายงานปัญหาหรืออีเมลปรึกษาปัญหา:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">คัดลอกไปคลิปบอร์ดแล้ว</string>
-  <string name="SubmitDebugLogActivity_ok">ตกลง</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">ตกลง</string> -->
   <string name="SubmitDebugLogActivity_share">แบ่งปัน</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">หัวข้อ:</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 1e3a0c7e1c..6d83c588b3 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -592,7 +592,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Ilagay ang bagong passphrase!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">I-link ang device na ito?</string>
-  <string name="DeviceProvisioningActivity_cancel">KANSELAHIN</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">KANSELAHIN</string> -->
   <string name="DeviceProvisioningActivity_continue">IPAGPATULOY</string>
   <string name="DeviceProvisioningActivity_content_intro">Magagawa nitong</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -788,7 +788,7 @@
   <string name="SubmitDebugLogActivity_success">Tagumpay!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Kopyahin ang URL at idagdag ito sa iyong ulat na isyu o support email:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Nakopya na sa clipboard</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Ibahagi</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Paksa:</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 905af08e10..b18982ddb6 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -731,7 +731,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Yeni parola girin!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Bu cihazı bağla?</string>
-  <string name="DeviceProvisioningActivity_cancel">VAZGEÇ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">VAZGEÇ</string> -->
   <string name="DeviceProvisioningActivity_continue">DEVAM ET</string>
   <string name="DeviceProvisioningActivity_content_intro">Aşağıdaki eylemleri gerçekleştirebilecek</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -938,7 +938,7 @@ Geçersiz protokol sürümünde anahtar değişim iletisi alındı.</string>
   <string name="SubmitDebugLogActivity_success">Başarılı!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Bu adresi kopyalayın ve sorun bildirinize veya destek epostasına ekleyin:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Panoya kopyalandı</string>
-  <string name="SubmitDebugLogActivity_ok">Tamam</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Tamam</string> -->
   <string name="SubmitDebugLogActivity_share">Paylaş</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Konu:</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index cc3d639551..f18dd359b6 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -462,7 +462,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Введіть нову фразу-пароль!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">З\'язати цей пристрій?</string>
-  <string name="DeviceProvisioningActivity_cancel">СКАСУВАТИ</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">СКАСУВАТИ</string> -->
   <string name="DeviceProvisioningActivity_continue">ПРОДОВЖИТИ</string>
   <string name="DeviceProvisioningActivity_content_intro">Він зможе</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 3664047fdb..6129d2c8a5 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -567,7 +567,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">نیا پاسفریز داخل کریں!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">ڈیوائس منسلک کریں؟</string>
-  <string name="DeviceProvisioningActivity_cancel">منسوخ کریں</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">منسوخ کریں</string> -->
   <string name="DeviceProvisioningActivity_continue">جاری رکھیں</string>
   <string name="DeviceProvisioningActivity_content_intro">قابل ہو جائے گا</string>
   <string name="DeviceProvisioningActivity_content_bullets">
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ed410a05c5..ca5284461b 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -693,7 +693,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Điền mật khẩu mới!</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">Liên kết thiết bị này?</string>
-  <string name="DeviceProvisioningActivity_cancel">HỦY</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">HỦY</string> -->
   <string name="DeviceProvisioningActivity_continue">TIẾP TỤC</string>
   <string name="DeviceProvisioningActivity_content_intro">Nó sẽ có thể </string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -896,7 +896,7 @@ Nhận thông tin trao đổi mã khóa về phiên bản giao thức không h
   <string name="SubmitDebugLogActivity_success">Thành công!</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Sao chép URL này và thêm nó vào báo cáo lỗi hoặc email hỗ trợ:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">Đã sao chép vào clipboard</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">Chia sẻ</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">Chủ đề:</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index b06bd4b245..e327bceaff 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -569,7 +569,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">输入新的密码！</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">关联该设备？</string>
-  <string name="DeviceProvisioningActivity_cancel">取消</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">取消</string> -->
   <string name="DeviceProvisioningActivity_continue">继续</string>
   <string name="DeviceProvisioningActivity_content_intro">这将可以：</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -766,7 +766,7 @@
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">复制此 URL 并将其添加到问题报告或支持电子邮件:\n\n<b>%1$s</b>
 </string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">已复制到剪切板</string>
-  <string name="SubmitDebugLogActivity_ok">好</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">好</string> -->
   <string name="SubmitDebugLogActivity_share">分享</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">主题 :</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 739485c1fa..e931d280b0 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -701,7 +701,7 @@
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">輸入新的自訂密碼</string>
   <!--DeviceProvisioningActivity-->
   <string name="DeviceProvisioningActivity_link_this_device">連結此裝置？</string>
-  <string name="DeviceProvisioningActivity_cancel">取消</string>
+  <!-- Removed by excludeNonTranslatables <string name="DeviceProvisioningActivity_cancel">取消</string> -->
   <string name="DeviceProvisioningActivity_continue">繼續</string>
   <string name="DeviceProvisioningActivity_content_intro">它將能夠</string>
   <string name="DeviceProvisioningActivity_content_bullets">
@@ -913,7 +913,7 @@
   <string name="SubmitDebugLogActivity_success">成功！</string>
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">複製網址及將之加入你的錯誤報告或支援email:\n\n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_copied_to_clipboard">已複製到剪貼簿</string>
-  <string name="SubmitDebugLogActivity_ok">Ok</string>
+  <!-- Removed by excludeNonTranslatables <string name="SubmitDebugLogActivity_ok">Ok</string> -->
   <string name="SubmitDebugLogActivity_share">分享</string>
   <!--SupportEmailUtil-->
   <string name="SupportEmailUtil_subject">標題:</string>