diff --git a/app/static-ips.properties b/app/static-ips.properties
index 3b130260fa..c8eff34536 100644
--- a/app/static-ips.properties
+++ b/app/static-ips.properties
@@ -1,9 +1,9 @@
 service_ips=new String[]{"13.248.212.111","76.223.92.165"}
-storage_ips=new String[]{"142.251.211.179"}
-cdn_ips=new String[]{"18.161.21.122","18.161.21.4","18.161.21.66","18.161.21.70"}
+storage_ips=new String[]{"142.250.139.121"}
+cdn_ips=new String[]{"18.160.18.106","18.160.18.114","18.160.18.42","18.160.18.45"}
 cdn2_ips=new String[]{"104.18.10.47","104.18.11.47"}
 cdn3_ips=new String[]{"104.18.10.47","104.18.11.47"}
 sfu_ips=new String[]{"34.117.136.13"}
 content_proxy_ips=new String[]{"107.178.250.75"}
-svr2_ips=new String[]{"20.119.62.85"}
+svr2_ips=new String[]{"20.104.52.125"}
 cdsi_ips=new String[]{"40.122.45.194"}
diff --git a/feature/app-settings/src/main/res/values-af/strings.xml b/feature/app-settings/src/main/res/values-af/strings.xml
index ff03788cc0..e35e5b06a3 100644
--- a/feature/app-settings/src/main/res/values-af/strings.xml
+++ b/feature/app-settings/src/main/res/values-af/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Voer die 6-syfer-kode vanaf jou bevestigingstoepassing in.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Volgende</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Verkeerde kode. Sleutel nou die kode in wat in jou bevestigingstoepassing gewys word.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ar/strings.xml b/feature/app-settings/src/main/res/values-ar/strings.xml
index a591698a87..a11397be71 100644
--- a/feature/app-settings/src/main/res/values-ar/strings.xml
+++ b/feature/app-settings/src/main/res/values-ar/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">أدخِل الكود المُكوَّن من 6 أرقام من تطبيق المصادقة لديك.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">التالي</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">كود غير صحيح. أدخِل الكود الذي يظهر في تطبيق المصادقة الآن.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-az/strings.xml b/feature/app-settings/src/main/res/values-az/strings.xml
index 3ee9e26cc0..d0a1530035 100644
--- a/feature/app-settings/src/main/res/values-az/strings.xml
+++ b/feature/app-settings/src/main/res/values-az/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Autentifikasiya tətbiqində yaradılmış 6 rəqəmli kodu daxil edin.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Növbəti</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Səhv kod. Hazırda autentifikasiya tətbiqində göstərilən kodu daxil edin.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-be/strings.xml b/feature/app-settings/src/main/res/values-be/strings.xml
index e82e444274..66853f2e39 100644
--- a/feature/app-settings/src/main/res/values-be/strings.xml
+++ b/feature/app-settings/src/main/res/values-be/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Увядзіце 6-значны код з праграмы аўтэнтыфікацыі.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Далей</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Няправільны код. Увядзіце код, што зараз паказаны ў праграме аўтэнтыфікацы.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-bg/strings.xml b/feature/app-settings/src/main/res/values-bg/strings.xml
index 2f6fde6444..d78845a58c 100644
--- a/feature/app-settings/src/main/res/values-bg/strings.xml
+++ b/feature/app-settings/src/main/res/values-bg/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Въведете 6-цифрения код от вашето приложение за автентикация.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Напред</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Неправилен код. Въведете кода, показан във вашето приложение за автентикация в момента.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-bn/strings.xml b/feature/app-settings/src/main/res/values-bn/strings.xml
index b0bd4a8b6c..141364de67 100644
--- a/feature/app-settings/src/main/res/values-bn/strings.xml
+++ b/feature/app-settings/src/main/res/values-bn/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">আপনার অথেন্টিকেটর অ্যাপ থেকে ৬-সংখ্যার কোডটি লিখুন।</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">পরবর্তী</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">ভুল কোড। এখন আপনার অথেনটিকেটর অ্যাপে দেখানো কোডটি লিখুন।</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-bs/strings.xml b/feature/app-settings/src/main/res/values-bs/strings.xml
index 7c59f1c1ba..9028944ae7 100644
--- a/feature/app-settings/src/main/res/values-bs/strings.xml
+++ b/feature/app-settings/src/main/res/values-bs/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Unesite šestocifreni kôd iz aplikacije za autentifikaciju.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Dalje</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Pogrešan kôd. Unesite kôd koji se sada prikazuje u vašoj aplikaciji za autentifikaciju.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ca/strings.xml b/feature/app-settings/src/main/res/values-ca/strings.xml
index f9d3d40894..dbe917e68c 100644
--- a/feature/app-settings/src/main/res/values-ca/strings.xml
+++ b/feature/app-settings/src/main/res/values-ca/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Introdueix la clau de 6 dígits de la teva app d\'autenticació.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Següent</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Clau incorrecta. Introdueix ara la clau de la teva app d\'autenticació.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-cs/strings.xml b/feature/app-settings/src/main/res/values-cs/strings.xml
index 1f71482be8..d216b41d90 100644
--- a/feature/app-settings/src/main/res/values-cs/strings.xml
+++ b/feature/app-settings/src/main/res/values-cs/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Zadejte 6číselný kód ze své ověřovací aplikace.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Další</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Nesprávný kód. Zadejte kód, který se právě zobrazuje ve vaší ověřovací aplikaci.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-da/strings.xml b/feature/app-settings/src/main/res/values-da/strings.xml
index f335734fd2..74dd06e853 100644
--- a/feature/app-settings/src/main/res/values-da/strings.xml
+++ b/feature/app-settings/src/main/res/values-da/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Angiv den sekscifrede kode fra din godkendelsesapp.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Næste</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Forkert kode. Angiv den kode, der vises i din godkendelsesapp.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-de/strings.xml b/feature/app-settings/src/main/res/values-de/strings.xml
index 770ac48b3e..15f540fc36 100644
--- a/feature/app-settings/src/main/res/values-de/strings.xml
+++ b/feature/app-settings/src/main/res/values-de/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Gib den 6-stelligen Code aus deiner Authentifizierungs-App ein.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Weiter</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Falscher Code. Gib jetzt den Code ein, der in deiner Authentifizierungs-App angezeigt wird.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-el/strings.xml b/feature/app-settings/src/main/res/values-el/strings.xml
index e732cecb56..4465608aaf 100644
--- a/feature/app-settings/src/main/res/values-el/strings.xml
+++ b/feature/app-settings/src/main/res/values-el/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Γράψε τον 6-ψηφιο κωδικό από την εφαρμογή επαλήθευσης.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Επόμενο</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Λάθος κωδικός. Γράψε τον κωδικό από την εφαρμογή επαλήθευσης τώρα.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-es/strings.xml b/feature/app-settings/src/main/res/values-es/strings.xml
index ced599ad71..fa57cb90ee 100644
--- a/feature/app-settings/src/main/res/values-es/strings.xml
+++ b/feature/app-settings/src/main/res/values-es/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Introduce la clave de 6 dígitos de tu aplicación de autenticación.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Siguiente</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Clave incorrecta. Introduce ahora la clave de tu aplicación de autenticación.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-et/strings.xml b/feature/app-settings/src/main/res/values-et/strings.xml
index 9a420df540..62b5d41770 100644
--- a/feature/app-settings/src/main/res/values-et/strings.xml
+++ b/feature/app-settings/src/main/res/values-et/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Sisesta oma autentimise äpist 6-kohaline kood.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Edasi</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Vale kood. Sisesta praegu autentimisäpis kuvatav kood.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-eu/strings.xml b/feature/app-settings/src/main/res/values-eu/strings.xml
index 4dbb331ab7..722fe64081 100644
--- a/feature/app-settings/src/main/res/values-eu/strings.xml
+++ b/feature/app-settings/src/main/res/values-eu/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Idatzi 6 digituko kodea autentifikatzeko aplikaziotik.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Hurrengoa</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Kode okerra. Idatzi une honetan autentifikazio-aplikazioan ikusgai dagoen kodea.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-fa/strings.xml b/feature/app-settings/src/main/res/values-fa/strings.xml
index 3ae8c39e87..4ceb307c55 100644
--- a/feature/app-settings/src/main/res/values-fa/strings.xml
+++ b/feature/app-settings/src/main/res/values-fa/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">کد ۶ رقمی را از برنامه احراز هویت خود وارد کنید.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">بعدی</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">کد نادرست است. اکنون کد نمایش‌داده‌شده در برنامه احراز هویت خود را وارد کنید.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-fi/strings.xml b/feature/app-settings/src/main/res/values-fi/strings.xml
index 0f337d40c3..310a3e44ac 100644
--- a/feature/app-settings/src/main/res/values-fi/strings.xml
+++ b/feature/app-settings/src/main/res/values-fi/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Anna autentikointisovelluksen antama kuusinumeroinen koodi.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Seuraava</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Väärä koodi. Anna autentikointisovelluksen antama koodi.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-fr/strings.xml b/feature/app-settings/src/main/res/values-fr/strings.xml
index 8ba9bd16ea..55811973f8 100644
--- a/feature/app-settings/src/main/res/values-fr/strings.xml
+++ b/feature/app-settings/src/main/res/values-fr/strings.xml
@@ -141,9 +141,9 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Saisissez le code à 6 chiffres généré par votre appli d\'authentification.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Suivant</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
-    <string name="TotpCodeEntryScreen__incorrect_code">Code incorrect. Saisissez le code qui s\'affiche actuellement sur votre appli d\'authentification.</string>
+    <string name="TotpCodeEntryScreen__incorrect_code">Code incorrect. Saisissez le code actuellement affiché sur votre appli d\'authentification.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
     <string name="TotpCodeEntryScreen__couldnt_reach_signal">Impossible d\'accéder à Signal. Veuillez vérifier votre connexion et réessayer.</string>
 
@@ -152,11 +152,11 @@
 
     <!-- TotpNameEntryScreen -->
     <!-- Title of the screen where the user names an authenticator app -->
-    <string name="TotpNameEntryScreen__choose_a_name">Choisissez un nom</string>
+    <string name="TotpNameEntryScreen__choose_a_name">Nommer l\'application</string>
     <!-- Instructions shown above the name field when renaming an authenticator app -->
     <string name="TotpNameEntryScreen__choose_a_unique_name">Donnez un nom à cette appli d\'authentification.</string>
     <!-- Instructions shown above the name field when naming a newly configured authenticator app -->
-    <string name="TotpNameEntryScreen__choose_a_unique_name_to_help_you_identify_it">Donnez un nom à cette appli d\'authentification pour pouvoir l\'identifier facilement.</string>
+    <string name="TotpNameEntryScreen__choose_a_unique_name_to_help_you_identify_it">Nommez cette appli d\'authentification afin de l\'identifier facilement.</string>
     <!-- Label of the name field -->
     <string name="TotpNameEntryScreen__name">Nom</string>
     <!-- Button that submits the entered name -->
diff --git a/feature/app-settings/src/main/res/values-ga/strings.xml b/feature/app-settings/src/main/res/values-ga/strings.xml
index dd8cb6eb9b..eeaccf0d6f 100644
--- a/feature/app-settings/src/main/res/values-ga/strings.xml
+++ b/feature/app-settings/src/main/res/values-ga/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Cuir isteach an cód 6 dhigit ó d\'aip fíordheimhnitheora.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Ar aghaidh</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Cód mícheart. Cuir isteach an cód a thaispeántar i d\'aip fíordheimhnitheora anois.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-gl/strings.xml b/feature/app-settings/src/main/res/values-gl/strings.xml
index 47a865d89f..2014ee9c25 100644
--- a/feature/app-settings/src/main/res/values-gl/strings.xml
+++ b/feature/app-settings/src/main/res/values-gl/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Introduce o código de 6 díxitos da aplicación de autenticación.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Seguinte</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Código incorrecto. Escribe o código que aparece agora mesmo na túa aplicación de autenticación.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-gu/strings.xml b/feature/app-settings/src/main/res/values-gu/strings.xml
index 3cc1da2581..9c95fcadc0 100644
--- a/feature/app-settings/src/main/res/values-gu/strings.xml
+++ b/feature/app-settings/src/main/res/values-gu/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">તમારી પ્રમાણીકરણ ઍપમાંથી 6-અંકનો કોડ દાખલ કરો.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">આગળ</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">ખોટો કોડ. તમારી પ્રમાણીકરણ ઍપમાં બતાવતા હોય તે કોડ દાખલ કરો.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-hi/strings.xml b/feature/app-settings/src/main/res/values-hi/strings.xml
index b342f2dcce..7c27c3b0fd 100644
--- a/feature/app-settings/src/main/res/values-hi/strings.xml
+++ b/feature/app-settings/src/main/res/values-hi/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">अपने ऑथेंटिकेटर ऐप में दिख रहा 6-अंकों वाला कोड डालें।</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">अगला</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">कोड गलत है। अपने ऑथेंटिकेटर ऐप में अभी दिखाई दे रहा कोड डालें।</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-hr/strings.xml b/feature/app-settings/src/main/res/values-hr/strings.xml
index 7d1a03cad6..0e9ff67335 100644
--- a/feature/app-settings/src/main/res/values-hr/strings.xml
+++ b/feature/app-settings/src/main/res/values-hr/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Unesite šesteroznamenkasti kôd iz aplikacije za provjeru autentičnosti.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Sljedeće</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Pogrešan kôd. Unesite kôd koji se sada prikazuje u aplikaciji za provjeru autentičnosti.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-hu/strings.xml b/feature/app-settings/src/main/res/values-hu/strings.xml
index 4aa166b2d0..b79df13b77 100644
--- a/feature/app-settings/src/main/res/values-hu/strings.xml
+++ b/feature/app-settings/src/main/res/values-hu/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Add meg a 6 jegyű kódot a hitelesítő alkalmazásból.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Tovább</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Helytelen kód! Add meg most a hitelesítő alkalmazásodban megjelenő kódot.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-in/strings.xml b/feature/app-settings/src/main/res/values-in/strings.xml
index fa3e259425..4caa6d101e 100644
--- a/feature/app-settings/src/main/res/values-in/strings.xml
+++ b/feature/app-settings/src/main/res/values-in/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Masukkan kode 6 digit dari aplikasi autentikator Anda.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Berikutnya</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Kode salah. Masukkan kode yang ditampilkan di aplikasi autentikator Anda sekarang.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-it/strings.xml b/feature/app-settings/src/main/res/values-it/strings.xml
index b40366428b..a84f70d21c 100644
--- a/feature/app-settings/src/main/res/values-it/strings.xml
+++ b/feature/app-settings/src/main/res/values-it/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Inserisci il codice a 6 cifre dalla tua app di autenticazione.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Avanti</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Codice errato. Inserisci il codice mostrato ora nella tua app di autenticazione.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-iw/strings.xml b/feature/app-settings/src/main/res/values-iw/strings.xml
index b931110705..2c03247d0d 100644
--- a/feature/app-settings/src/main/res/values-iw/strings.xml
+++ b/feature/app-settings/src/main/res/values-iw/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">יש להזין קוד בן 6 ספרות מאפליקציית האימות שלך.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">הבא</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">קוד שגוי. יש להזין את הקוד שמופיע באפליקציית האימות שלך כעת.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ja/strings.xml b/feature/app-settings/src/main/res/values-ja/strings.xml
index c0812730c2..eb1a64b5f5 100644
--- a/feature/app-settings/src/main/res/values-ja/strings.xml
+++ b/feature/app-settings/src/main/res/values-ja/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">認証アプリに表示された6桁のコードを入力してください。</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">次へ</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">コードが違います。認証アプリに表示されたコードを入力してください。</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ka/strings.xml b/feature/app-settings/src/main/res/values-ka/strings.xml
index 60a92a3dc6..87824d18d1 100644
--- a/feature/app-settings/src/main/res/values-ka/strings.xml
+++ b/feature/app-settings/src/main/res/values-ka/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">შეიყვანე 6-ციფრიანი კოდი შენი ავტორიზაციის აპიდან.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">შემდეგი</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">არასწორი კოდი. შეიყვანე კოდი შენი ავტორიზაციის აპიდან ახლა.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-kk/strings.xml b/feature/app-settings/src/main/res/values-kk/strings.xml
index c4bdef7d12..0ee30f42e0 100644
--- a/feature/app-settings/src/main/res/values-kk/strings.xml
+++ b/feature/app-settings/src/main/res/values-kk/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Аутентификатор қолданбасындағы 6 цифрлық кодты енгізіңіз.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Келесі</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Код дұрыс емес. Дәл қазір аутентификатор қолданбаңызда көрсетіліп тұрған кодты енгізіңіз.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-km/strings.xml b/feature/app-settings/src/main/res/values-km/strings.xml
index 2a073a181b..b6bccdd955 100644
--- a/feature/app-settings/src/main/res/values-km/strings.xml
+++ b/feature/app-settings/src/main/res/values-km/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">សូមបញ្ចូលលេខកូដ 6 ខ្ទង់ពីកម្មវិធីផ្ទៀងផ្ទាត់របស់អ្នក។</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">បន្ទាប់</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">លេខកូដមិនត្រឹមត្រូវ។ សូមបញ្ចូលលេខកូដដែលបង្ហាញនៅក្នុងកម្មវិធីផ្ទៀងផ្ទាត់របស់អ្នកឥឡូវនេះ។</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-kn/strings.xml b/feature/app-settings/src/main/res/values-kn/strings.xml
index 5362cb3b93..a1e60e9202 100644
--- a/feature/app-settings/src/main/res/values-kn/strings.xml
+++ b/feature/app-settings/src/main/res/values-kn/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">ನಿಮ್ಮ ಅಥೆಂಟಿಕೇಟರ್ ಆ್ಯಪ್‌ನಿಂದ 6-ಅಂಕಿಯ ಕೋಡ್ ಅನ್ನು ನಮೂದಿಸಿ.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">ಮುಂದೆ</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">ತಪ್ಪಾದ ಕೋಡ್. ನಿಮ್ಮ ಅಥೆಂಟಿಕೇಟರ್ ಆ್ಯಪ್‌ನಲ್ಲಿ ಈಗ ತೋರಿಸಿರುವ ಕೋಡ್ ಅನ್ನು ನಮೂದಿಸಿ.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ko/strings.xml b/feature/app-settings/src/main/res/values-ko/strings.xml
index f0878bd605..8298ffae25 100644
--- a/feature/app-settings/src/main/res/values-ko/strings.xml
+++ b/feature/app-settings/src/main/res/values-ko/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">인증 앱에 표시된 6자리 코드를 입력하세요.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">다음</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">올바르지 않은 코드입니다. 지금 인증 앱에 표시된 코드를 입력하세요.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ky/strings.xml b/feature/app-settings/src/main/res/values-ky/strings.xml
index 778c2abf2b..bbdfc938b7 100644
--- a/feature/app-settings/src/main/res/values-ky/strings.xml
+++ b/feature/app-settings/src/main/res/values-ky/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Авторизация колдонмоңуздагы 6 орундуу кодду киргизиңиз.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Кийинки</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Код туура эмес. Аутентификация колдонмоңуздагы кодду киргизиңиз.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-lt/strings.xml b/feature/app-settings/src/main/res/values-lt/strings.xml
index f398117ce7..1ed7f181d2 100644
--- a/feature/app-settings/src/main/res/values-lt/strings.xml
+++ b/feature/app-settings/src/main/res/values-lt/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Įveskite 6 skaitmenų kodą iš autentifikavimo programėlės.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Kitas</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Neteisingas kodas. Įveskite kodą, šiuo metu rodomą jūsų autentifikavimo programėlėje.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-lv/strings.xml b/feature/app-settings/src/main/res/values-lv/strings.xml
index 95d950b599..6cd52f29ce 100644
--- a/feature/app-settings/src/main/res/values-lv/strings.xml
+++ b/feature/app-settings/src/main/res/values-lv/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Ievadiet autentifikācijas lietotnē redzamo sešciparu kodu.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Tālāk</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Nepareizs kods. Ievadiet autentifikācijas lietotnē redzamo kodu.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-mk/strings.xml b/feature/app-settings/src/main/res/values-mk/strings.xml
index 1a0d0f7fd4..5feb60dae5 100644
--- a/feature/app-settings/src/main/res/values-mk/strings.xml
+++ b/feature/app-settings/src/main/res/values-mk/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Внесете го кодот од 6 цифри од вашата апликација за автентикација.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Следно</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Погрешен код. Внесете го кодот кој се прикажува во вашата апликација за автентикација сега.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ml/strings.xml b/feature/app-settings/src/main/res/values-ml/strings.xml
index 1454d1c772..7736a055d1 100644
--- a/feature/app-settings/src/main/res/values-ml/strings.xml
+++ b/feature/app-settings/src/main/res/values-ml/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">നിങ്ങളുടെ ഓതന്റിക്കേറ്റർ ആപ്പിൽ നിന്നുള്ള 6 അക്ക കോഡ് നൽകുക.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">അടുത്തത്</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">കോഡ് തെറ്റാണ്. നിങ്ങളുടെ ഓതൻ്റിക്കേറ്റർ ആപ്പിൽ ഇപ്പോൾ കാണിക്കുന്ന കോഡ് നൽകുക.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-mr/strings.xml b/feature/app-settings/src/main/res/values-mr/strings.xml
index 17a7c8ac02..b4f0b350d8 100644
--- a/feature/app-settings/src/main/res/values-mr/strings.xml
+++ b/feature/app-settings/src/main/res/values-mr/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">तुमच्या ऑथेंटिकेटर ॲपमधील 6-अंकी कोड प्रविष्ट करा.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">पुढे</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">चुकीचा कोड. तुमच्या ऑथेंटिकेटर ॲपमध्ये दिसणारा कोड आत्ता प्रविष्ट करा.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ms/strings.xml b/feature/app-settings/src/main/res/values-ms/strings.xml
index 1cce3e09d5..e25078bf31 100644
--- a/feature/app-settings/src/main/res/values-ms/strings.xml
+++ b/feature/app-settings/src/main/res/values-ms/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Masukkan kod 6 digit daripada aplikasi pengesah anda.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Seterusnya</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Kod salah. Masukkan kod yang dipaparkan dalam aplikasi pengesah anda sekarang.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-my/strings.xml b/feature/app-settings/src/main/res/values-my/strings.xml
index d152753131..1c1440667b 100644
--- a/feature/app-settings/src/main/res/values-my/strings.xml
+++ b/feature/app-settings/src/main/res/values-my/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">သင့် အတည်ပြုကုဒ်ထုတ်ပေးသည့် အက်ပ်မှ ရရှိသော ဂဏန်း 6 လုံးပါ ကုဒ်ကို ထည့်ပါ။</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">ဆက်သွားမည်</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">ကုဒ် မှားနေပါသည်။ ယခု သင့်အတည်ပြုကုဒ်ထုတ်ပေးသည့် အက်ပ်မှာ ပြသနေသော ကုဒ်ကို ထည့်ပါ။</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-nb/strings.xml b/feature/app-settings/src/main/res/values-nb/strings.xml
index 3ea25c7ea4..8e2b819eb5 100644
--- a/feature/app-settings/src/main/res/values-nb/strings.xml
+++ b/feature/app-settings/src/main/res/values-nb/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Skriv inn den sekssifrede koden fra autentiseringsappen din.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Neste</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Feil kode. Skriv inn koden fra autentiseringsappen din.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-nl/strings.xml b/feature/app-settings/src/main/res/values-nl/strings.xml
index 981e277985..9c840291ab 100644
--- a/feature/app-settings/src/main/res/values-nl/strings.xml
+++ b/feature/app-settings/src/main/res/values-nl/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Voer de 6-cijferige code uit je authenticatie-app in.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Volgende</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Onjuiste code. Voer de code in die nu in je authenticatie-app wordt weergegeven.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-pa/strings.xml b/feature/app-settings/src/main/res/values-pa/strings.xml
index 5240678ccd..af1c806943 100644
--- a/feature/app-settings/src/main/res/values-pa/strings.xml
+++ b/feature/app-settings/src/main/res/values-pa/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">ਆਪਣੀ ਪ੍ਰਮਾਣੀਕਰਨ ਐਪ ਤੋਂ 6 ਅੰਕਾਂ ਵਾਲਾ ਕੋਡ ਦਰਜ ਕਰੋ।</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">ਅੱਗੇ</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">ਕੋਡ ਗਲਤ ਹੈ। ਤੁਹਾਡੀ ਪ੍ਰਮਾਣੀਕਰਨ ਐਪ ਵਿੱਚ ਇਸ ਵੇਲੇ ਦਿਖ ਰਿਹਾ ਕੋਡ ਦਰਜ ਕਰੋ।</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-pl/strings.xml b/feature/app-settings/src/main/res/values-pl/strings.xml
index 32052871cc..e05d6e7168 100644
--- a/feature/app-settings/src/main/res/values-pl/strings.xml
+++ b/feature/app-settings/src/main/res/values-pl/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Podaj 6-cyfrowy kod z aplikacji uwierzytelniającej.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Dalej</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Niepoprawny kod. Wpisz kod wyświetlany w aplikacji uwierzytelniającej.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-pt-rBR/strings.xml b/feature/app-settings/src/main/res/values-pt-rBR/strings.xml
index 4bb666dfbe..ebecdead33 100644
--- a/feature/app-settings/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/app-settings/src/main/res/values-pt-rBR/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Insira o código de 6 dígitos do seu app de autenticação.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Próximo</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Código incorreto. Insira o código que está aparecendo no seu app de autenticação agora.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-pt/strings.xml b/feature/app-settings/src/main/res/values-pt/strings.xml
index 6fa9f5a24e..0554f0ab45 100644
--- a/feature/app-settings/src/main/res/values-pt/strings.xml
+++ b/feature/app-settings/src/main/res/values-pt/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Introduza o código de 6 dígitos da sua app autenticadora.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Seguinte</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Código incorreto. Introduza o código mostrado agora na sua app autenticadora.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ro/strings.xml b/feature/app-settings/src/main/res/values-ro/strings.xml
index 2150864ec3..8efdc4712e 100644
--- a/feature/app-settings/src/main/res/values-ro/strings.xml
+++ b/feature/app-settings/src/main/res/values-ro/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Introdu un cod de 6 cifre din aplicația de autentificare.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Următorul</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Cod incorect. Introdu codul care apare în aplicația ta de autentificare acum.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ru/strings.xml b/feature/app-settings/src/main/res/values-ru/strings.xml
index 0407ba9629..c718d3e9d9 100644
--- a/feature/app-settings/src/main/res/values-ru/strings.xml
+++ b/feature/app-settings/src/main/res/values-ru/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Введите 6-значный код из приложения для аутентификации.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Далее</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Неверный код. Введите код, отображаемый в вашем приложении для аутентификации.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-sk/strings.xml b/feature/app-settings/src/main/res/values-sk/strings.xml
index 69e4411d41..cdfd3ee8d2 100644
--- a/feature/app-settings/src/main/res/values-sk/strings.xml
+++ b/feature/app-settings/src/main/res/values-sk/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Zadajte 6-miestny kód z vašej aplikácie na autentifikáciu.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Ďalej</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Nesprávny kód. Zadajte kód zobrazený vo vašej aplikácii na autentifikáciu.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-sl/strings.xml b/feature/app-settings/src/main/res/values-sl/strings.xml
index 05df0ab43f..468447ad95 100644
--- a/feature/app-settings/src/main/res/values-sl/strings.xml
+++ b/feature/app-settings/src/main/res/values-sl/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Vnesite 6-mestno kodo iz svoje aplikacije za preverjanje pristnosti.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Naprej</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Napačna koda. Vnesite kodo, prikazano v vaši aplikaciji za preverjanje pristnosti.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-sq/strings.xml b/feature/app-settings/src/main/res/values-sq/strings.xml
index 67d92205c1..a5f4b83dc3 100644
--- a/feature/app-settings/src/main/res/values-sq/strings.xml
+++ b/feature/app-settings/src/main/res/values-sq/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Vendos kodin 6-shifror nga aplikacioni i autentifikimit.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Tjetër</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Kod i gabuar. Vendos kodin që shfaqet tani në aplikacionin e autentifikimit.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-sr/strings.xml b/feature/app-settings/src/main/res/values-sr/strings.xml
index ff4bf0fe8b..33259f27b6 100644
--- a/feature/app-settings/src/main/res/values-sr/strings.xml
+++ b/feature/app-settings/src/main/res/values-sr/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Унесите 6-цифрени кôд са апликације за аутентификацију.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Следеће</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Нетачан код. Унесите код приказан у апликацији за аутентификацију.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-sv/strings.xml b/feature/app-settings/src/main/res/values-sv/strings.xml
index 64a73fe98e..bc0d9caca5 100644
--- a/feature/app-settings/src/main/res/values-sv/strings.xml
+++ b/feature/app-settings/src/main/res/values-sv/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Ange den 6-siffriga koden från din autentiseringsapp.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Nästa</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Felaktig kod. Ange koden som visas i din autentiseringsapp just nu.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-sw/strings.xml b/feature/app-settings/src/main/res/values-sw/strings.xml
index 1546cef0f8..08046ff7f5 100644
--- a/feature/app-settings/src/main/res/values-sw/strings.xml
+++ b/feature/app-settings/src/main/res/values-sw/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Weka code ya tarakimu 6 kutoka kwenye programu yako ya kithibitishaji.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Ifuatayo</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Code si sahihi. Weka code inayoonekana kwenye programu yako ya uthibitishaji sasa.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ta/strings.xml b/feature/app-settings/src/main/res/values-ta/strings.xml
index 952dc6f276..98b14f34ee 100644
--- a/feature/app-settings/src/main/res/values-ta/strings.xml
+++ b/feature/app-settings/src/main/res/values-ta/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">உங்கள் அங்கீகரிப்புச் செயலியில் உள்ள 6 இலக்கக் குறியீட்டை உள்ளிடவும்.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">அடுத்தது</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">தவறான குறியீடு. உங்கள் அங்கீகரிப்புச் செயலியில் இப்போது காட்டப்படும் குறியீட்டை உள்ளிடவும்.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-te/strings.xml b/feature/app-settings/src/main/res/values-te/strings.xml
index 680bd55104..d6ade1013a 100644
--- a/feature/app-settings/src/main/res/values-te/strings.xml
+++ b/feature/app-settings/src/main/res/values-te/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">మీ అథెంటికేటర్ యాప్ నుండి 6-అంకెల కోడ్‌ను ఎంటర్ చేయండి.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">తరువాత</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">తప్పు కోడ్. ఇప్పుడు మీ ఆథెంటికేటర్ యాప్‌లో ప్రస్తుతం కనిపిస్తున్న కోడ్‌ను నమోదు చేయండి.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-th/strings.xml b/feature/app-settings/src/main/res/values-th/strings.xml
index e49fdf01b3..af0eb69eb9 100644
--- a/feature/app-settings/src/main/res/values-th/strings.xml
+++ b/feature/app-settings/src/main/res/values-th/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">ใส่รหัส 6 หลักจากแอปยืนยันตัวตนของคุณ</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">ดำเนินการต่อ</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">รหัสไม่ถูกต้อง โปรดใส่รหัสที่แอปยืนยันตัวตนของคุณแสดงอยู่ขณะนี้</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-tl/strings.xml b/feature/app-settings/src/main/res/values-tl/strings.xml
index 4952be96d0..da5138db00 100644
--- a/feature/app-settings/src/main/res/values-tl/strings.xml
+++ b/feature/app-settings/src/main/res/values-tl/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Ilagay ang 6-digit code mula sa authenticator app mo.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Susunod</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Maling code. Ilagay ang code na nakikita mo sa authenticator app ngayon.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-tr/strings.xml b/feature/app-settings/src/main/res/values-tr/strings.xml
index 5ca77e64b0..b5d2957052 100644
--- a/feature/app-settings/src/main/res/values-tr/strings.xml
+++ b/feature/app-settings/src/main/res/values-tr/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Kimlik doğrulama uygulamandaki 6 haneli kodu gir.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">İleri</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Hatalı kod. Şu anda kimlik doğrulama uygulamanda gösterilen kodu gir.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ug/strings.xml b/feature/app-settings/src/main/res/values-ug/strings.xml
index 99a520adb4..02aa06764b 100644
--- a/feature/app-settings/src/main/res/values-ug/strings.xml
+++ b/feature/app-settings/src/main/res/values-ug/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">دەلىللىگۈچى ئەپتىكى 6 خانىلىق كودنى كىرگۈزۈڭ.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">كېيىنكى</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">خاتا كود. دەلىللىگۈچى ئەپىڭىزدە ھازىر كۆرسىتىلگەن كودنى كىرگۈزۈڭ.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-uk/strings.xml b/feature/app-settings/src/main/res/values-uk/strings.xml
index 2c1943f055..6380599305 100644
--- a/feature/app-settings/src/main/res/values-uk/strings.xml
+++ b/feature/app-settings/src/main/res/values-uk/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Введіть 6-значний код з автентифікатора.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Далі</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Неправильний код. Введіть код, який зараз показано у вашому автентифікаторі.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-ur/strings.xml b/feature/app-settings/src/main/res/values-ur/strings.xml
index 37d4d52208..82fdc62427 100644
--- a/feature/app-settings/src/main/res/values-ur/strings.xml
+++ b/feature/app-settings/src/main/res/values-ur/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">اپنی توثیق کار ایپ سے 6 ہندسوں کا کوڈ درج کریں۔</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">اگلا</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">غلط کوڈ۔ اب اپنی توثیق کار ایپ میں دکھایا جانے والا کوڈ درج کریں۔</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-vi/strings.xml b/feature/app-settings/src/main/res/values-vi/strings.xml
index b3c581f258..978636a96b 100644
--- a/feature/app-settings/src/main/res/values-vi/strings.xml
+++ b/feature/app-settings/src/main/res/values-vi/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">Nhập mã gồm 6 chữ số từ ứng dụng xác thực của bạn.</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">Tiếp</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">Mã không đúng. Nhập mã hiện đang hiển thị trong ứng dụng xác thực của bạn.</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-yue/strings.xml b/feature/app-settings/src/main/res/values-yue/strings.xml
index c1877255d2..89250d2761 100644
--- a/feature/app-settings/src/main/res/values-yue/strings.xml
+++ b/feature/app-settings/src/main/res/values-yue/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">輸入驗證 APP 入面嘅 6 位數驗證碼。</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">下一步</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">個驗證碼唔啱。輸入而家驗證 APP 入面嘅驗證碼。</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-zh-rCN/strings.xml b/feature/app-settings/src/main/res/values-zh-rCN/strings.xml
index 509d97bc24..db467a8e46 100644
--- a/feature/app-settings/src/main/res/values-zh-rCN/strings.xml
+++ b/feature/app-settings/src/main/res/values-zh-rCN/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">请输入您的身份验证器应用生成的 6 位数验证码。</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">下一步</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">验证码不正确。请输入您的身份验证器应用当前显示的验证码。</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-zh-rHK/strings.xml b/feature/app-settings/src/main/res/values-zh-rHK/strings.xml
index b921eb4292..1ba90ee9aa 100644
--- a/feature/app-settings/src/main/res/values-zh-rHK/strings.xml
+++ b/feature/app-settings/src/main/res/values-zh-rHK/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">請輸入驗證應用程式中的 6 位數驗證碼。</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">下一步</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">驗證碼錯誤。請輸入現在驗證應用程式中的驗證碼。</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/app-settings/src/main/res/values-zh-rTW/strings.xml b/feature/app-settings/src/main/res/values-zh-rTW/strings.xml
index ad21bdbaa3..30616f652b 100644
--- a/feature/app-settings/src/main/res/values-zh-rTW/strings.xml
+++ b/feature/app-settings/src/main/res/values-zh-rTW/strings.xml
@@ -141,7 +141,7 @@
     <!-- Instructions shown above the code entry field -->
     <string name="TotpCodeEntryScreen__enter_the_6_digit_code">請輸入驗證應用程式中的 6 位數驗證碼。</string>
     <!-- Button that submits the entered code -->
-    <string name="TotpCodeEntryScreen__next">Next</string>
+    <string name="TotpCodeEntryScreen__next">下一步</string>
     <!-- Error shown under the code field when the code the user entered was rejected -->
     <string name="TotpCodeEntryScreen__incorrect_code">驗證碼錯誤。請輸入現在驗證應用程式中的驗證碼。</string>
     <!-- Error shown under the code field when we couldn\'t reach the service to check the code -->
diff --git a/feature/media-send/src/main/res/values-fr/strings.xml b/feature/media-send/src/main/res/values-fr/strings.xml
index 9071c8f9a3..4cf5c15ede 100644
--- a/feature/media-send/src/main/res/values-fr/strings.xml
+++ b/feature/media-send/src/main/res/values-fr/strings.xml
@@ -168,7 +168,7 @@
   <!-- Error message shown when we try to take a photo, but fail when trying to process it (convert it into something the user can see). -->
   <string name="CameraXFragment_photo_processing_failed">Impossible de traiter la photo. Veuillez réessayer.</string>
   <!-- Label shown below the elapsed time while a video recording is paused -->
-  <string name="CameraXFragment_paused">Mis en pause</string>
+  <string name="CameraXFragment_paused">En pause</string>
   <!-- Displayed in a permissions dialog when the user has denied access to hardware for image and video capture. -->
   <string name="CameraXFragment_signal_needs_the_recording_permissions_to_capture_video">Pour enregistrer des vidéos, Signal doit accéder à l\'application Microphone, mais vous lui en avez interdit l\'accès. Dans les paramètres Android, touchez Applications &gt; Signal &gt; Autorisations, puis activez \"Microphone\" et \"Appareil photo\".</string>
 
diff --git a/feature/registration/src/main/res/values-af/strings.xml b/feature/registration/src/main/res/values-af/strings.xml
index 2242a3318e..444b995e20 100644
--- a/feature/registration/src/main/res/values-af/strings.xml
+++ b/feature/registration/src/main/res/values-af/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Geen herwinsleutel nie?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Te lank (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Te lank (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Ongeldige herwinsleutel</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Te lank. %1$d/%2$d karakters.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Te lank. %1$d/%2$d karakters.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Ongeldige rekening-ID</string>
 
diff --git a/feature/registration/src/main/res/values-ar/strings.xml b/feature/registration/src/main/res/values-ar/strings.xml
index ca4c70fa45..d24f55833a 100644
--- a/feature/registration/src/main/res/values-ar/strings.xml
+++ b/feature/registration/src/main/res/values-ar/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">لا حاجة لمفتاح استعادة جديد؟</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">طويل جدًا (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">طويل جدًا (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">مفتاح الاستعادة غير صالح</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -734,7 +734,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">طويل جدًا. %1$d/%2$d رمزًا.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">طويل جدًا. %1$d/%2$d رمزًا.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">مُعرِّف الحساب غير صالح</string>
 
diff --git a/feature/registration/src/main/res/values-az/strings.xml b/feature/registration/src/main/res/values-az/strings.xml
index 04b2173fb2..99602ed4b8 100644
--- a/feature/registration/src/main/res/values-az/strings.xml
+++ b/feature/registration/src/main/res/values-az/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Bərpa şifrəsi yoxdur?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Çox uzundur (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Çox uzundur (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Etibarsız bərpa şifrəsi</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Çox uzundur. %1$d/%2$d simvol.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Çox uzundur. %1$d/%2$d simvol.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Etibarsız hesab ID-si</string>
 
diff --git a/feature/registration/src/main/res/values-be/strings.xml b/feature/registration/src/main/res/values-be/strings.xml
index 2a5f16673a..4840b8cf4f 100644
--- a/feature/registration/src/main/res/values-be/strings.xml
+++ b/feature/registration/src/main/res/values-be/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Няма кода для аднаўлення?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Занадта доўгі (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Занадта доўгі (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Несапраўдны код для аднаўлення</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Занадта доўгі. %1$d/%2$d знакі.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Занадта доўгі. %1$d/%2$d знакі.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Несапраўдны ID уліковага запісу</string>
 
diff --git a/feature/registration/src/main/res/values-bg/strings.xml b/feature/registration/src/main/res/values-bg/strings.xml
index 7cd55ac136..639bed9d35 100644
--- a/feature/registration/src/main/res/values-bg/strings.xml
+++ b/feature/registration/src/main/res/values-bg/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Нямате ключ за възстановяване?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Твърде дълго (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Твърде дълго (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Невалиден ключ за възстановяване</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Твърде дълго. %1$d/%2$d знака.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Твърде дълго. %1$d/%2$d знака.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Невалиден идентификатор на акаунт</string>
 
diff --git a/feature/registration/src/main/res/values-bn/strings.xml b/feature/registration/src/main/res/values-bn/strings.xml
index 8901ea531a..6a1c71f7be 100644
--- a/feature/registration/src/main/res/values-bn/strings.xml
+++ b/feature/registration/src/main/res/values-bn/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">কোনো পুনরুদ্ধার \'কি\' নেই?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">অনেক লম্বা (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">অনেক লম্বা (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">অকার্যকর পুনরুদ্ধার \'কি\'</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">অনেক বড়। %1$d/%2$d অক্ষর।</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">অনেক বড়। %1$d/%2$d অক্ষর।</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">অকার্যকর অ্যাকাউন্ট আইডি</string>
 
diff --git a/feature/registration/src/main/res/values-bs/strings.xml b/feature/registration/src/main/res/values-bs/strings.xml
index 2aa54d4f74..4a7a542414 100644
--- a/feature/registration/src/main/res/values-bs/strings.xml
+++ b/feature/registration/src/main/res/values-bs/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nema ključa za oporavak?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Predugo (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Predugo (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Nevažeći ključ za oporavak</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Predugo. %1$d/%2$d znak/a.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Predugo. %1$d/%2$d znak/a.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Nevažeći ID računa</string>
 
diff --git a/feature/registration/src/main/res/values-ca/strings.xml b/feature/registration/src/main/res/values-ca/strings.xml
index 132eca06e2..9d82b024e2 100644
--- a/feature/registration/src/main/res/values-ca/strings.xml
+++ b/feature/registration/src/main/res/values-ca/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">No tens clau de recuperació?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Massa llarg (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Massa llarg (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Clau de recuperació no vàlida</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Massa llarg. %1$d/%2$d caràcters.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Massa llarg. %1$d/%2$d caràcters.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID del compte no vàlid</string>
 
diff --git a/feature/registration/src/main/res/values-cs/strings.xml b/feature/registration/src/main/res/values-cs/strings.xml
index f707a2ad8d..ec1bb2db52 100644
--- a/feature/registration/src/main/res/values-cs/strings.xml
+++ b/feature/registration/src/main/res/values-cs/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nemáte klíč pro obnovení?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Příliš dlouhé (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Příliš dlouhé (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Neplatný klíč pro obnovení</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Příliš dlouhé. %1$d/%2$d znaků.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Příliš dlouhé. %1$d/%2$d znaků.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Neplatné ID účtu</string>
 
diff --git a/feature/registration/src/main/res/values-da/strings.xml b/feature/registration/src/main/res/values-da/strings.xml
index e6e5111ec0..9bce8ecf90 100644
--- a/feature/registration/src/main/res/values-da/strings.xml
+++ b/feature/registration/src/main/res/values-da/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Har du ingen gendannelsesnøgle?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">For lang (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">For lang (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Ugyldig gendannelsesnøgle</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">For lang. %1$d/%2$d tegn.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">For lang. %1$d/%2$d tegn.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Ugyldigt konto-id</string>
 
diff --git a/feature/registration/src/main/res/values-de/strings.xml b/feature/registration/src/main/res/values-de/strings.xml
index 8e8f946488..8b7aaaab35 100644
--- a/feature/registration/src/main/res/values-de/strings.xml
+++ b/feature/registration/src/main/res/values-de/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Kein Wiederherstellungsschlüssel?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Zu lang (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Zu lang (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Wiederherstellungsschlüssel ungültig</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Zu lang. %1$d/%2$d Zeichen.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Zu lang. %1$d/%2$d Zeichen.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Ungültige Konto-ID</string>
 
diff --git a/feature/registration/src/main/res/values-el/strings.xml b/feature/registration/src/main/res/values-el/strings.xml
index e602d2384f..9310a4c1a3 100644
--- a/feature/registration/src/main/res/values-el/strings.xml
+++ b/feature/registration/src/main/res/values-el/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Δεν υπάρχει κλειδί ανάκτησης;</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Πολύ μακροσκελές (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Πολύ μακροσκελές (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Μη έγκυρο κλειδί ανάκτησης</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Πολύ μακροσκελές. %1$d/%2$d χαρακτήρες.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Πολύ μακροσκελές. %1$d/%2$d χαρακτήρες.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Μη έγκυρο ID λογαριασμού</string>
 
diff --git a/feature/registration/src/main/res/values-es/strings.xml b/feature/registration/src/main/res/values-es/strings.xml
index c3de9bffa4..9d37a5ff4c 100644
--- a/feature/registration/src/main/res/values-es/strings.xml
+++ b/feature/registration/src/main/res/values-es/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">¿No tienes clave de recuperación?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Demasiado larga (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Demasiado larga (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Clave de recuperación no válida</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Demasiado largo. %1$d/%2$d caracteres.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Demasiado largo. %1$d/%2$d caracteres.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID de la cuenta no válida</string>
 
diff --git a/feature/registration/src/main/res/values-et/strings.xml b/feature/registration/src/main/res/values-et/strings.xml
index bba0ff58de..4d70759569 100644
--- a/feature/registration/src/main/res/values-et/strings.xml
+++ b/feature/registration/src/main/res/values-et/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Kas sul ei ole varukoopia võtit?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Liiga pikk (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Liiga pikk (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Kehtetu varukoopia võti</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Liiga pikk. %1$d tähemärki %2$d-st.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Liiga pikk. %1$d tähemärki %2$d-st.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Kehtetu konto ID</string>
 
diff --git a/feature/registration/src/main/res/values-eu/strings.xml b/feature/registration/src/main/res/values-eu/strings.xml
index 649493b0af..e4a558b2ee 100644
--- a/feature/registration/src/main/res/values-eu/strings.xml
+++ b/feature/registration/src/main/res/values-eu/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Ez duzu berreskuratze-gakorik?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Luzeegia (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Luzeegia (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Berreskuratze-gakoak ez du balio</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Luzeegia. %1$d/%2$d karaktere.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Luzeegia. %1$d/%2$d karaktere.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Kontu-identifikatzaile baliogabea</string>
 
diff --git a/feature/registration/src/main/res/values-fa/strings.xml b/feature/registration/src/main/res/values-fa/strings.xml
index d624528826..c62838ff5a 100644
--- a/feature/registration/src/main/res/values-fa/strings.xml
+++ b/feature/registration/src/main/res/values-fa/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">رمز بازیابی ندارید؟</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">بیش‌از حد طولانی (%2$d/%1$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">بیش‌از حد طولانی (%2$d/%1$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">رمز بازیابی نامعتبر</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">بیش‌ازحد طولانی است. ‎%1$d/%2$d‎ نویسه.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">بیش‌ازحد طولانی است. ‎%1$d/%2$d‎ نویسه.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">شناسه حساب نامعتبر است</string>
 
diff --git a/feature/registration/src/main/res/values-fi/strings.xml b/feature/registration/src/main/res/values-fi/strings.xml
index 50b3a1382c..abcfc83c61 100644
--- a/feature/registration/src/main/res/values-fi/strings.xml
+++ b/feature/registration/src/main/res/values-fi/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Eikö sinulla ole palautusavainta?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Liian pitkä (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Liian pitkä (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Kelpaamaton palautusavain</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Liian pitkä koodi. %1$d/%2$d merkkiä.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Liian pitkä koodi. %1$d/%2$d merkkiä.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Virheellinen tilin tunniste</string>
 
diff --git a/feature/registration/src/main/res/values-fr/strings.xml b/feature/registration/src/main/res/values-fr/strings.xml
index 8e584a50ef..3101930c72 100644
--- a/feature/registration/src/main/res/values-fr/strings.xml
+++ b/feature/registration/src/main/res/values-fr/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Pas de clé de récupération ?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Saisie trop longue (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Saisie trop longue (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Clé de récupération non valide</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Saisie trop longue. %1$d/%2$d caractères.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Saisie trop longue. %1$d/%2$d caractères.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Identifiant de compte non valide</string>
 
diff --git a/feature/registration/src/main/res/values-ga/strings.xml b/feature/registration/src/main/res/values-ga/strings.xml
index 6d0872f577..74118cc3f8 100644
--- a/feature/registration/src/main/res/values-ga/strings.xml
+++ b/feature/registration/src/main/res/values-ga/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nach bhfuil eochair athshlánaithe ann?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Rófhada (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Rófhada (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Eochair athshlánaithe neamhbhailí</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -732,7 +732,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Rófhada. Carachtair: %1$d/%2$d.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Rófhada. Carachtair: %1$d/%2$d.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID an chuntais neamhbhailí</string>
 
diff --git a/feature/registration/src/main/res/values-gl/strings.xml b/feature/registration/src/main/res/values-gl/strings.xml
index bd29b53345..1d3c125dc0 100644
--- a/feature/registration/src/main/res/values-gl/strings.xml
+++ b/feature/registration/src/main/res/values-gl/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Non tes unha clave de recuperación?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Demasiado longo (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Demasiado longo (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Clave de recuperación incorrecta</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Demasiado longa. %1$d/%2$d caracteres.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Demasiado longa. %1$d/%2$d caracteres.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID da conta incorrecto</string>
 
diff --git a/feature/registration/src/main/res/values-gu/strings.xml b/feature/registration/src/main/res/values-gu/strings.xml
index 00d038c814..735492485b 100644
--- a/feature/registration/src/main/res/values-gu/strings.xml
+++ b/feature/registration/src/main/res/values-gu/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">નવી રિકવરી કી?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">ખૂબ લાંબી (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">ખૂબ લાંબી (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">અમાન્ય રિકવરી કી</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">બહુ લાંબી છે. %1$d/%2$d અક્ષર.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">બહુ લાંબી છે. %1$d/%2$d અક્ષર.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">અમાન્ય એકાઉન્ટ ID</string>
 
diff --git a/feature/registration/src/main/res/values-hi/strings.xml b/feature/registration/src/main/res/values-hi/strings.xml
index 1571a418b1..d010a85db6 100644
--- a/feature/registration/src/main/res/values-hi/strings.xml
+++ b/feature/registration/src/main/res/values-hi/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">कोई \'रिकवरी की\' नहीं है?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">बहुत लंबा (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">बहुत लंबा (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">\'रिकवरी की\' अमान्य है</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">काफ़ी बड़ी है। %1$d/%2$d कैरेक्टर।</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">काफ़ी बड़ी है। %1$d/%2$d कैरेक्टर।</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">अकाउंट ID गलत है</string>
 
diff --git a/feature/registration/src/main/res/values-hr/strings.xml b/feature/registration/src/main/res/values-hr/strings.xml
index e915608084..6cbc8fd0ac 100644
--- a/feature/registration/src/main/res/values-hr/strings.xml
+++ b/feature/registration/src/main/res/values-hr/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Bez ključa za oporavak?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Predugo (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Predugo (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Nevažeći ključ za oporavak</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Predugo. %1$d/%2$d znakova.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Predugo. %1$d/%2$d znakova.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Nevažeći identifikacijski broj računa</string>
 
diff --git a/feature/registration/src/main/res/values-hu/strings.xml b/feature/registration/src/main/res/values-hu/strings.xml
index 2ab1ac743f..1e2ec2f94c 100644
--- a/feature/registration/src/main/res/values-hu/strings.xml
+++ b/feature/registration/src/main/res/values-hu/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nincs helyreállítási kulcs?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Túl hosszú (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Túl hosszú (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Érvénytelen helyreállítási kulcs</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Túl hosszú. %1$d/%2$d karakter.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Túl hosszú. %1$d/%2$d karakter.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Érvénytelen fiókazonosító</string>
 
diff --git a/feature/registration/src/main/res/values-in/strings.xml b/feature/registration/src/main/res/values-in/strings.xml
index 2ed2dfedf9..055d4c1cb9 100644
--- a/feature/registration/src/main/res/values-in/strings.xml
+++ b/feature/registration/src/main/res/values-in/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Tidak punya kunci pemulihan?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Terlalu panjang (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Terlalu panjang (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Kunci pemulihan tidak valid</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Terlalu panjang. %1$d/%2$d karakter.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Terlalu panjang. %1$d/%2$d karakter.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID akun tidak valid</string>
 
diff --git a/feature/registration/src/main/res/values-it/strings.xml b/feature/registration/src/main/res/values-it/strings.xml
index 9ae88d3c26..6f9d8414ff 100644
--- a/feature/registration/src/main/res/values-it/strings.xml
+++ b/feature/registration/src/main/res/values-it/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nessuna chiave di ripristino?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Troppo lunga (%1$d%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Troppo lunga (%1$d%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Chiave di ripristino non valida</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Troppo lunga. %1$d/%2$d caratteri.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Troppo lunga. %1$d/%2$d caratteri.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID account non valido</string>
 
diff --git a/feature/registration/src/main/res/values-iw/strings.xml b/feature/registration/src/main/res/values-iw/strings.xml
index e3d3b072bd..07df815cca 100644
--- a/feature/registration/src/main/res/values-iw/strings.xml
+++ b/feature/registration/src/main/res/values-iw/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">אין מפתח שחזור?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">ארוך מדי (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">ארוך מדי (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">מפתח שחזור לא תקין</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">ארוך מדי. %2$d/%1$d תווים.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">ארוך מדי. %2$d/%1$d תווים.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">מזהה חשבון לא תקין</string>
 
diff --git a/feature/registration/src/main/res/values-ja/strings.xml b/feature/registration/src/main/res/values-ja/strings.xml
index 6b5c266451..41922a20f7 100644
--- a/feature/registration/src/main/res/values-ja/strings.xml
+++ b/feature/registration/src/main/res/values-ja/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">回復キーをお持ちでない場合</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">長すぎます (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">長すぎます (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">無効な回復キーです</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">長すぎます。%1$d/%2$d 文字。</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">長すぎます。%1$d/%2$d 文字。</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">アカウントIDが無効です</string>
 
diff --git a/feature/registration/src/main/res/values-ka/strings.xml b/feature/registration/src/main/res/values-ka/strings.xml
index 4c8094fcc3..e3e211caa5 100644
--- a/feature/registration/src/main/res/values-ka/strings.xml
+++ b/feature/registration/src/main/res/values-ka/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">არ გაქვს აღდგენის გასაღები?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">ზედმეტად გრძელია (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">ზედმეტად გრძელია (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">აღდგენის გასაღები არასწორია</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">ზედმეტად გრძელია. %1$d/%2$d სიმბოლო.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">ზედმეტად გრძელია. %1$d/%2$d სიმბოლო.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">არასწორი ანგარიშის ID</string>
 
diff --git a/feature/registration/src/main/res/values-kk/strings.xml b/feature/registration/src/main/res/values-kk/strings.xml
index 8369acaae9..e38babbbba 100644
--- a/feature/registration/src/main/res/values-kk/strings.xml
+++ b/feature/registration/src/main/res/values-kk/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Қалпына келтіру кілті жоқ па?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Тым ұзақ (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Тым ұзақ (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Қалпына келтіру кілті жарамсыз</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Өте ұзын. %1$d/%2$d таңба.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Өте ұзын. %1$d/%2$d таңба.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Аккаунт идентификаторы дұрыс емес</string>
 
diff --git a/feature/registration/src/main/res/values-km/strings.xml b/feature/registration/src/main/res/values-km/strings.xml
index d16df94d7d..41367fe2a5 100644
--- a/feature/registration/src/main/res/values-km/strings.xml
+++ b/feature/registration/src/main/res/values-km/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">មិនមានសោស្តារទេ?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">វែងពេក (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">វែងពេក (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">សោស្តារមិនមានសុពលភាព</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">វែងពេក។ %1$d/%2$d តួអក្សរ។</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">វែងពេក។ %1$d/%2$d តួអក្សរ។</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">លេខសម្គាល់គណនីមិនត្រឹមត្រូវ</string>
 
diff --git a/feature/registration/src/main/res/values-kn/strings.xml b/feature/registration/src/main/res/values-kn/strings.xml
index 57b1d15b0c..3cbd72009c 100644
--- a/feature/registration/src/main/res/values-kn/strings.xml
+++ b/feature/registration/src/main/res/values-kn/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">ರಿಕವರಿ ಕೀ ಇಲ್ಲವೇ?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">ತುಂಬಾ ಉದ್ದವಾಗಿದೆ (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">ತುಂಬಾ ಉದ್ದವಾಗಿದೆ (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">ಅಮಾನ್ಯವಾದ ರಿಕವರಿ ಕೀ</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">ತುಂಬಾ ಉದ್ದವಾಗಿದೆ. %1$d/%2$d ಅಕ್ಷರಗಳು.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">ತುಂಬಾ ಉದ್ದವಾಗಿದೆ. %1$d/%2$d ಅಕ್ಷರಗಳು.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ಅಮಾನ್ಯ ಖಾತೆ ID</string>
 
diff --git a/feature/registration/src/main/res/values-ko/strings.xml b/feature/registration/src/main/res/values-ko/strings.xml
index 641eaca6a1..860d138d92 100644
--- a/feature/registration/src/main/res/values-ko/strings.xml
+++ b/feature/registration/src/main/res/values-ko/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">복구 키가 없으신가요?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">너무 깁니다(%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">너무 깁니다(%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">잘못된 복구 키</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">계정 키 자릿수를 초과했습니다. %1$d/%2$d자</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">계정 키 자릿수를 초과했습니다. %1$d/%2$d자</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">잘못된 계정 ID입니다</string>
 
diff --git a/feature/registration/src/main/res/values-ky/strings.xml b/feature/registration/src/main/res/values-ky/strings.xml
index 8cca4fa155..ccda06c902 100644
--- a/feature/registration/src/main/res/values-ky/strings.xml
+++ b/feature/registration/src/main/res/values-ky/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Калыбына келтирүү ачкычы жокпу?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Өтө узун (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Өтө узун (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Калыбына келтирүү ачкычы жарабайт</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Өтө узун. %1$d/%2$d белги.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Өтө узун. %1$d/%2$d белги.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Аккаунттун идентификатору туура эмес</string>
 
diff --git a/feature/registration/src/main/res/values-lt/strings.xml b/feature/registration/src/main/res/values-lt/strings.xml
index 2ef8d5d616..39c70f2fc4 100644
--- a/feature/registration/src/main/res/values-lt/strings.xml
+++ b/feature/registration/src/main/res/values-lt/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Neturite atkūrimo rakto?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Per ilgas (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Per ilgas (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Negaliojantis atkūrimo raktas</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Per ilgas. %1$d/%2$d ženklų.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Per ilgas. %1$d/%2$d ženklų.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Negaliojantis paskyros ID</string>
 
diff --git a/feature/registration/src/main/res/values-lv/strings.xml b/feature/registration/src/main/res/values-lv/strings.xml
index 9c73b37bd8..2379b71e25 100644
--- a/feature/registration/src/main/res/values-lv/strings.xml
+++ b/feature/registration/src/main/res/values-lv/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nav atkopšanas atslēgas?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Par daudz teksta (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Par daudz teksta (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Nederīga atkopšanas atslēga</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -728,7 +728,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Pārāk gara. %1$d/%2$d rakstzīmes.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Pārāk gara. %1$d/%2$d rakstzīmes.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Nederīgs konta ID</string>
 
diff --git a/feature/registration/src/main/res/values-mk/strings.xml b/feature/registration/src/main/res/values-mk/strings.xml
index 5bb119259f..5380259b43 100644
--- a/feature/registration/src/main/res/values-mk/strings.xml
+++ b/feature/registration/src/main/res/values-mk/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Немате клуч за враќање резервни копии?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Предолго (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Предолго (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Неважечки клуч за враќање резервни копии</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Предолго. %1$d/%2$d знаци.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Предолго. %1$d/%2$d знаци.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Невалидна идентификација на корисничка сметка</string>
 
diff --git a/feature/registration/src/main/res/values-ml/strings.xml b/feature/registration/src/main/res/values-ml/strings.xml
index 6acd61b032..670597aa57 100644
--- a/feature/registration/src/main/res/values-ml/strings.xml
+++ b/feature/registration/src/main/res/values-ml/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">വീണ്ടെടുക്കൽ കീ ഇല്ലേ?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">വളരെ നീണ്ടത് (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">വളരെ നീണ്ടത് (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">വീണ്ടെടുക്കൽ കീ അസാധുവാണ്</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">വളരെ നീളമുള്ളതാണ്. %1$d/%2$d ക്യാരക്ടറുകൾ.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">വളരെ നീളമുള്ളതാണ്. %1$d/%2$d ക്യാരക്ടറുകൾ.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">അക്കൗണ്ട് ഐഡി അസാധുവാണ്</string>
 
diff --git a/feature/registration/src/main/res/values-mr/strings.xml b/feature/registration/src/main/res/values-mr/strings.xml
index 2a623b9497..afa6ccdac5 100644
--- a/feature/registration/src/main/res/values-mr/strings.xml
+++ b/feature/registration/src/main/res/values-mr/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">रीकव्हरी की नाही?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">खूप लांब (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">खूप लांब (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">अवैध रीकव्हरी की</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">खूप मोठी. %1$d/%2$d अक्षरे.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">खूप मोठी. %1$d/%2$d अक्षरे.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">अवैध खाते आयडी</string>
 
diff --git a/feature/registration/src/main/res/values-ms/strings.xml b/feature/registration/src/main/res/values-ms/strings.xml
index 5b3e54be9e..d8319543a3 100644
--- a/feature/registration/src/main/res/values-ms/strings.xml
+++ b/feature/registration/src/main/res/values-ms/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Tiada kunci pemulihan?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Terlalu panjang (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Terlalu panjang (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Kunci pemulihan tidak sah</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Terlalu panjang. %1$d/%2$d aksara.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Terlalu panjang. %1$d/%2$d aksara.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID akaun tidak sah</string>
 
diff --git a/feature/registration/src/main/res/values-my/strings.xml b/feature/registration/src/main/res/values-my/strings.xml
index 9bf80c9a0e..a2b7ce5f1c 100644
--- a/feature/registration/src/main/res/values-my/strings.xml
+++ b/feature/registration/src/main/res/values-my/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">ပြန်လည်ရယူရေးကီး မရှိသေးဘူးလား။</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">ရှည်လွန်းသည် (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">ရှည်လွန်းသည် (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">ပြန်လည်ရယူရေးကီး မမှန်ကန်ပါ</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">ရှည်လွန်းပါသည်။ အက္ခရာ %1$d/%2$d လုံး။</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">ရှည်လွန်းပါသည်။ အက္ခရာ %1$d/%2$d လုံး။</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">အကောင့် ID မမှန်ကန်ပါ</string>
 
diff --git a/feature/registration/src/main/res/values-nb/strings.xml b/feature/registration/src/main/res/values-nb/strings.xml
index 87050d664b..1c29170393 100644
--- a/feature/registration/src/main/res/values-nb/strings.xml
+++ b/feature/registration/src/main/res/values-nb/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Ingen sikkerhetskode?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">For lang (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">For lang (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Ugyldig sikkerhetskode</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">For lang. %1$d/%2$d tegn.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">For lang. %1$d/%2$d tegn.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Ugyldig konto-ID</string>
 
diff --git a/feature/registration/src/main/res/values-nl/strings.xml b/feature/registration/src/main/res/values-nl/strings.xml
index d0e858bdde..910525217b 100644
--- a/feature/registration/src/main/res/values-nl/strings.xml
+++ b/feature/registration/src/main/res/values-nl/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Geen herstelsleutel?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Te lang (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Te lang (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Ongeldige herstelsleutel</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Te lang. %1$d/%2$d tekens.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Te lang. %1$d/%2$d tekens.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Ongeldig account-ID</string>
 
diff --git a/feature/registration/src/main/res/values-pa/strings.xml b/feature/registration/src/main/res/values-pa/strings.xml
index cb7ebccad4..b7dea0ecc9 100644
--- a/feature/registration/src/main/res/values-pa/strings.xml
+++ b/feature/registration/src/main/res/values-pa/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਰਿਕਵਰੀ ਕੁੰਜੀ ਨਹੀਂ ਹੈ?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">ਬਹੁਤ ਲੰਮਾ ਹੈ (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">ਬਹੁਤ ਲੰਮਾ ਹੈ (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">ਰਿਕਵਰੀ ਕੁੰਜੀ ਅਵੈਧ ਹੈ</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">ਬਹੁਤ ਲੰਮਾ ਹੈ। %1$d/%2$d ਅੱਖਰ।</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">ਬਹੁਤ ਲੰਮਾ ਹੈ। %1$d/%2$d ਅੱਖਰ।</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ਅਵੈਧ ਖਾਤਾ ID</string>
 
diff --git a/feature/registration/src/main/res/values-pl/strings.xml b/feature/registration/src/main/res/values-pl/strings.xml
index 94c007d405..c1e6e8e5c4 100644
--- a/feature/registration/src/main/res/values-pl/strings.xml
+++ b/feature/registration/src/main/res/values-pl/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nie masz kodu odzyskiwania?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Za długi (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Za długi (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Nieprawidłowy kod odzyskiwania</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Za długi. %1$d/%2$d znaków.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Za długi. %1$d/%2$d znaków.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Nieprawidłowy identyfikator konta</string>
 
diff --git a/feature/registration/src/main/res/values-pt-rBR/strings.xml b/feature/registration/src/main/res/values-pt-rBR/strings.xml
index 1312089cfc..40524b4e40 100644
--- a/feature/registration/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/registration/src/main/res/values-pt-rBR/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Sem chave de recuperação?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Muito longo (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Muito longo (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Chave de recuperação inválida</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Muito longa. %1$d/%2$d caracteres.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Muito longa. %1$d/%2$d caracteres.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID de conta inválido</string>
 
diff --git a/feature/registration/src/main/res/values-pt/strings.xml b/feature/registration/src/main/res/values-pt/strings.xml
index a2ffd11b6b..4f7e006e08 100644
--- a/feature/registration/src/main/res/values-pt/strings.xml
+++ b/feature/registration/src/main/res/values-pt/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Não tem chave de recuperação?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Demasiado longo (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Demasiado longo (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Chave de recuperação inválida</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Demasiado longa. %1$d/%2$d caracteres.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Demasiado longa. %1$d/%2$d caracteres.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID da conta inválido</string>
 
diff --git a/feature/registration/src/main/res/values-ro/strings.xml b/feature/registration/src/main/res/values-ro/strings.xml
index 91f3049295..2e30bba6cf 100644
--- a/feature/registration/src/main/res/values-ro/strings.xml
+++ b/feature/registration/src/main/res/values-ro/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Niciun cod de recuperare?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Prea lung (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Prea lung (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Cod de recuperare nevalid</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -728,7 +728,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Prea lung. %1$d/%2$d caractere.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Prea lung. %1$d/%2$d caractere.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID cont invalid</string>
 
diff --git a/feature/registration/src/main/res/values-ru/strings.xml b/feature/registration/src/main/res/values-ru/strings.xml
index d1f9cf6764..f6173260cf 100644
--- a/feature/registration/src/main/res/values-ru/strings.xml
+++ b/feature/registration/src/main/res/values-ru/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Нет ключа восстановления?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Слишком длинный (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Слишком длинный (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Недействительный ключ восстановления</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Слишком длинный. %1$d/%2$d символов.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Слишком длинный. %1$d/%2$d символов.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Неверный идентификатор учётной записи</string>
 
diff --git a/feature/registration/src/main/res/values-sk/strings.xml b/feature/registration/src/main/res/values-sk/strings.xml
index 2a978363a0..d359d2f2cc 100644
--- a/feature/registration/src/main/res/values-sk/strings.xml
+++ b/feature/registration/src/main/res/values-sk/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nemáte kľúč na obnovenie?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Príliš dlhé (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Príliš dlhé (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Neplatný kľúč na obnovenie</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Príliš dlhý. %1$d/%2$d znakov.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Príliš dlhý. %1$d/%2$d znakov.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Neplatné ID účtu</string>
 
diff --git a/feature/registration/src/main/res/values-sl/strings.xml b/feature/registration/src/main/res/values-sl/strings.xml
index 4e4299b602..bb9bd4f02e 100644
--- a/feature/registration/src/main/res/values-sl/strings.xml
+++ b/feature/registration/src/main/res/values-sl/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Ne želite vpisati obnovitvenega ključa?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Predolgo (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Predolgo (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Neveljaven obnovitveni ključ</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Predolgo. %1$d/%2$d znakov.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Predolgo. %1$d/%2$d znakov.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Neveljavna številka računa</string>
 
diff --git a/feature/registration/src/main/res/values-sq/strings.xml b/feature/registration/src/main/res/values-sq/strings.xml
index 9cc7173c13..d4b8868c9d 100644
--- a/feature/registration/src/main/res/values-sq/strings.xml
+++ b/feature/registration/src/main/res/values-sq/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Nuk ke kod rikthimi?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Shumë e gjatë (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Shumë e gjatë (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Kodi i pavlefshëm rikthimi</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Shumë e gjatë. %1$d/%2$d karaktere.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Shumë e gjatë. %1$d/%2$d karaktere.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID-ja e llogarisë e pavlefshme</string>
 
diff --git a/feature/registration/src/main/res/values-sr/strings.xml b/feature/registration/src/main/res/values-sr/strings.xml
index 1385e606fc..d277256dd6 100644
--- a/feature/registration/src/main/res/values-sr/strings.xml
+++ b/feature/registration/src/main/res/values-sr/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Немате кључ за опоравак?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Предугачко (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Предугачко (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Неважећи кључ за опоравак</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Предугачко. %1$d/%2$d карактера.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Предугачко. %1$d/%2$d карактера.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Неважећи идентификациони кôд налога</string>
 
diff --git a/feature/registration/src/main/res/values-sv/strings.xml b/feature/registration/src/main/res/values-sv/strings.xml
index bd0d1f2969..626e9f26c6 100644
--- a/feature/registration/src/main/res/values-sv/strings.xml
+++ b/feature/registration/src/main/res/values-sv/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Ingen återställningsnyckel?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">För långt (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">För långt (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Ogiltig återställningsnyckel</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">För lång. %1$d/%2$d tecken.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">För lång. %1$d/%2$d tecken.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Ogiltigt konto-ID</string>
 
diff --git a/feature/registration/src/main/res/values-sw/strings.xml b/feature/registration/src/main/res/values-sw/strings.xml
index 69cf980c88..0d80d3ce9e 100644
--- a/feature/registration/src/main/res/values-sw/strings.xml
+++ b/feature/registration/src/main/res/values-sw/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Hakuna ufunguo wa kurejesha akaunti?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Ndefu sana (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Ndefu sana (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Ufunguo wa kurejesha akaunti batili</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Ndefu sana. Herufi %1$d kati ya %2$d.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Ndefu sana. Herufi %1$d kati ya %2$d.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID ya akaunti si sahihi</string>
 
diff --git a/feature/registration/src/main/res/values-ta/strings.xml b/feature/registration/src/main/res/values-ta/strings.xml
index a9317dbcd0..5b8d8dfa32 100644
--- a/feature/registration/src/main/res/values-ta/strings.xml
+++ b/feature/registration/src/main/res/values-ta/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">மீட்புக் குறியீடு இல்லையா?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">மிக நீளமாக உள்ளது (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">மிக நீளமாக உள்ளது (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">தவறான மீட்புக் குறியீடு</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">மிக நீளமாக உள்ளது. %1$d/%2$d எழுத்துக்கள்.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">மிக நீளமாக உள்ளது. %1$d/%2$d எழுத்துக்கள்.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">தவறான கணக்கு ID</string>
 
diff --git a/feature/registration/src/main/res/values-te/strings.xml b/feature/registration/src/main/res/values-te/strings.xml
index 089092afbb..bf2d152142 100644
--- a/feature/registration/src/main/res/values-te/strings.xml
+++ b/feature/registration/src/main/res/values-te/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">రికవరీ కీ లేదా?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">చాలా పొడవుగా ఉంది (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">చాలా పొడవుగా ఉంది (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">చెల్లని రికవరీ కీ</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">చాలా పొపవైనది. %1$d/%2$d అక్షరాలు.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">చాలా పొపవైనది. %1$d/%2$d అక్షరాలు.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">చెల్లని ఖాతా ID</string>
 
diff --git a/feature/registration/src/main/res/values-th/strings.xml b/feature/registration/src/main/res/values-th/strings.xml
index b7e09f43f4..c41778c76d 100644
--- a/feature/registration/src/main/res/values-th/strings.xml
+++ b/feature/registration/src/main/res/values-th/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">แตะที่นี่หากไม่มีกุญแจกู้คืน</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">ยาวเกินกำหนด (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">ยาวเกินกำหนด (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">กุญแจกู้คืนใช้งานไม่ได้</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">ยาวเกินกำหนด %1$d/%2$d ตัว</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">ยาวเกินกำหนด %1$d/%2$d ตัว</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ไอดีบัญชีใช้งานไม่ได้</string>
 
diff --git a/feature/registration/src/main/res/values-tl/strings.xml b/feature/registration/src/main/res/values-tl/strings.xml
index c677c53f71..826b272acc 100644
--- a/feature/registration/src/main/res/values-tl/strings.xml
+++ b/feature/registration/src/main/res/values-tl/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Walang recovery key?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Masyadong mahaba (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Masyadong mahaba (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Invalid ang recovery key</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Masyadong mahaba. %1$d/%2$d characters.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Masyadong mahaba. %1$d/%2$d characters.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Invalid account ID</string>
 
diff --git a/feature/registration/src/main/res/values-tr/strings.xml b/feature/registration/src/main/res/values-tr/strings.xml
index c93e103aff..b9e689cc13 100644
--- a/feature/registration/src/main/res/values-tr/strings.xml
+++ b/feature/registration/src/main/res/values-tr/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Kurtarma anahtarın mı yok?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Çok uzun (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Çok uzun (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Geçersiz kurtarma anahtarı</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Çok uzun. %1$d/%2$d karakter.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Çok uzun. %1$d/%2$d karakter.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Geçersiz hesap kimliği</string>
 
diff --git a/feature/registration/src/main/res/values-ug/strings.xml b/feature/registration/src/main/res/values-ug/strings.xml
index 0b8f650962..3587c8c855 100644
--- a/feature/registration/src/main/res/values-ug/strings.xml
+++ b/feature/registration/src/main/res/values-ug/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">ئەسلىگە كەلتۈرۈش ئاچقۇچى يوقمۇ؟</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">بەك ئۇزۇن (%2$d/%1$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">بەك ئۇزۇن (%2$d/%1$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">ئىناۋەتسىز ئەسلىگە كەلتۈرۈش ئاچقۇچى</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">بەك ئۇزۇن. %2$d/%1$d ھەرپ-بەلگىلەر.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">بەك ئۇزۇن. %2$d/%1$d ھەرپ-بەلگىلەر.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ئىناۋەتسىز ھېسابات كىملىكى</string>
 
diff --git a/feature/registration/src/main/res/values-uk/strings.xml b/feature/registration/src/main/res/values-uk/strings.xml
index e857914fe9..d5bff88f7c 100644
--- a/feature/registration/src/main/res/values-uk/strings.xml
+++ b/feature/registration/src/main/res/values-uk/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Забули ключ відновлення?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Ключ задовгий (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Ключ задовгий (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Недійсний ключ відновлення</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -730,7 +730,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Ключ задовгий. %1$d/%2$d символів.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Ключ задовгий. %1$d/%2$d символів.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">Неправильний ID акаунту</string>
 
diff --git a/feature/registration/src/main/res/values-ur/strings.xml b/feature/registration/src/main/res/values-ur/strings.xml
index c6e0a0e29d..b1eff2b407 100644
--- a/feature/registration/src/main/res/values-ur/strings.xml
+++ b/feature/registration/src/main/res/values-ur/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">کوئی ریکوری کیی نہیں ہے؟</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">بہت طویل ہے (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">بہت طویل ہے (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">غلط ریکوری کیی</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -726,7 +726,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">بہت طویل ہے۔ %1$d/%2$d حروف۔</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">بہت طویل ہے۔ %1$d/%2$d حروف۔</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">اکاؤنٹ ID غلط ہے</string>
 
diff --git a/feature/registration/src/main/res/values-vi/strings.xml b/feature/registration/src/main/res/values-vi/strings.xml
index 7fd701aa91..92b9481a05 100644
--- a/feature/registration/src/main/res/values-vi/strings.xml
+++ b/feature/registration/src/main/res/values-vi/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">Không có mã khôi phục?</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">Quá dài (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">Quá dài (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">Mã khóa khôi phục không hợp lệ</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">Quá dài. %1$d/%2$d ký tự.</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">Quá dài. %1$d/%2$d ký tự.</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">ID tài khoản không đúng</string>
 
diff --git a/feature/registration/src/main/res/values-yue/strings.xml b/feature/registration/src/main/res/values-yue/strings.xml
index b061bf8828..5421e0ed98 100644
--- a/feature/registration/src/main/res/values-yue/strings.xml
+++ b/feature/registration/src/main/res/values-yue/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">冇恢復金鑰？</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">太長 (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">太長 (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">恢復金鑰無效</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">太長。%1$d/%2$d 個字元。</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">太長。%1$d/%2$d 個字元。</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">帳戶 ID 無效</string>
 
diff --git a/feature/registration/src/main/res/values-zh-rCN/strings.xml b/feature/registration/src/main/res/values-zh-rCN/strings.xml
index f00060804f..53b969063d 100644
--- a/feature/registration/src/main/res/values-zh-rCN/strings.xml
+++ b/feature/registration/src/main/res/values-zh-rCN/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">没有恢复密钥？</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">密钥过长（%1$d/%2$d）</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">密钥过长（%1$d/%2$d）</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">恢复密钥无效</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">密钥过长。%1$d/%2$d 个字符。</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">密钥过长。%1$d/%2$d 个字符。</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">账户 ID 无效</string>
 
diff --git a/feature/registration/src/main/res/values-zh-rHK/strings.xml b/feature/registration/src/main/res/values-zh-rHK/strings.xml
index 35c7e5a487..a17ee24701 100644
--- a/feature/registration/src/main/res/values-zh-rHK/strings.xml
+++ b/feature/registration/src/main/res/values-zh-rHK/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">沒有恢復金鑰嗎？</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">太長 (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">太長 (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">無效的恢復金鑰</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">太長。%1$d/%2$d 個字元。</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">太長。%1$d/%2$d 個字元。</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">無效的帳戶 ID</string>
 
diff --git a/feature/registration/src/main/res/values-zh-rTW/strings.xml b/feature/registration/src/main/res/values-zh-rTW/strings.xml
index 727cc136e6..df4b0e9394 100644
--- a/feature/registration/src/main/res/values-zh-rTW/strings.xml
+++ b/feature/registration/src/main/res/values-zh-rTW/strings.xml
@@ -225,7 +225,7 @@
     <!-- Link for users who don\'t have their recovery key -->
     <string name="EnterAepScreen__no_recovery_key">沒有恢復金鑰嗎？</string>
     <!-- Error text when key is too long -->
-    <string name="EnterAepScreen__too_long">太長 (%1$d/%2$d)</string>
+  <!-- Removed by excludeNonTranslatables <string name="EnterAepScreen__too_long">太長 (%1$d/%2$d)</string> -->
     <!-- Error text when key is invalid -->
     <string name="EnterAepScreen__invalid_recovery_key">無效的恢復金鑰</string>
     <!-- Error text when key is correct format but does not match account -->
@@ -724,7 +724,7 @@
 
     <!-- Errors shown beneath an account ID text field, wherever one is offered -->
     <!-- Error shown when too many characters were entered in an account ID field. First placeholder is how many were entered, second is the maximum. -->
-    <string name="AccountIdField__too_long">太長。%1$d/%2$d 個字元。</string>
+  <!-- Removed by excludeNonTranslatables <string name="AccountIdField__too_long">太長。%1$d/%2$d 個字元。</string> -->
     <!-- Error shown when the entered account ID contains characters that can\'t appear in one. -->
     <string name="AccountIdField__invalid_account_id">無效的帳戶 ID</string>