diff --git a/.locale-state.metadata b/.locale-state.metadata
index a68cf8194..06322c824 100644
--- a/.locale-state.metadata
+++ b/.locale-state.metadata
@@ -1,4 +1,4 @@
 {
   "project": "android-core",
-  "locale": "e8f148ec7e497394ce46af7e7f69b4665ea1fa74"
+  "locale": "18eb3927bfb4261605dcfeac0f41cf7655a55ae6"
 }
\ No newline at end of file
diff --git a/account-manager/presentation/src/main/res/values-it/strings.xml b/account-manager/presentation/src/main/res/values-it/strings.xml
index 1a68ca64d..c34bc5aa8 100644
--- a/account-manager/presentation/src/main/res/values-it/strings.xml
+++ b/account-manager/presentation/src/main/res/values-it/strings.xml
@@ -17,7 +17,7 @@
   ~ along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="account_switcher_section_switch_to">Passa a</string>
+  <string name="account_switcher_section_switch_to">Account connessi</string>
   <string name="account_switcher_action_add_account">Aggiungi un account</string>
   <string name="account_switcher_action_sign_in">Accedi</string>
   <string name="account_switcher_action_sign_out">Disconnetti</string>
diff --git a/account-recovery/presentation/src/main/res/values-fa/strings.xml b/account-recovery/presentation/src/main/res/values-fa/strings.xml
index 67c044478..fd58e03bf 100644
--- a/account-recovery/presentation/src/main/res/values-fa/strings.xml
+++ b/account-recovery/presentation/src/main/res/values-fa/strings.xml
@@ -18,28 +18,28 @@
   -->
 <resources>
   <!-- Grace period - info -->
-  <string name="account_recovery_grace_period_info_title">درخواست بازنشانی رمزعبور ثبت شد</string>
+  <string name="account_recovery_grace_period_info_title">درخواست بازنشانی گذرواژه ثبت شد</string>
   <plurals name="account_recovery_grace_period_info_subtitle">
-    <item quantity="one">A password reset was requested for <b>%1$s</b>. You can change your password in %2$d hour.\n\nIf you didn’t make this request, cancel it now.</item>
-    <item quantity="other">A password reset was requested for <b>%1$s</b>. You can change your password in %2$d hours.\n\nIf you didn’t make this request, cancel it now.</item>
+    <item quantity="one">یک بازنشانی گذرواژه برای <b>%1$s</b> درخواست شده. شما می توانید تا %2$d ساعت گذرواژه خود را تغییر دهید.\n\n اگر شما این درخواست را ثبت نکرده اید، اکنون این عملیات را لغو کنید.</item>
+    <item quantity="other">یک بازنشانی رمزعبور برای <b>%1$s</b> درخواست شده. شما می توانید تا %2$d ساعت رمزعبور خود را تغییر دهید.\n\n اگر شما این درخواست را ثبت نکرده اید، اکنون این عملیات را لغو کنید.</item>
   </plurals>
   <!-- Grace period - cancellation form -->
-  <string name="account_recovery_cancel_title">بازنشانی رمزعبور لغو شود؟</string>
-  <string name="account_recovery_cancel_subtitle">جهت لغو، رمز عبور خود را وارد کنید.</string>
+  <string name="account_recovery_cancel_title">بازنشانی گذرواژه لغو شود؟</string>
+  <string name="account_recovery_cancel_subtitle">جهت لغو، گذرواژه خود را وارد کنید.</string>
   <string name="account_recovery_cancel_password_label">گذرواژه کنونی</string>
-  <string name="account_recovery_cancel_password_placeholder">رمزعبور</string>
-  <string name="account_recovery_cancel_now">لغو بازنشانی رمزعبور</string>
+  <string name="account_recovery_cancel_password_placeholder">گذرواژه</string>
+  <string name="account_recovery_cancel_now">لغو بازنشانی گذرواژه</string>
   <string name="account_recovery_cancel_back">بازگشت</string>
   <!-- Account recovery cancelled -->
-  <string name="account_recovery_cancelled_title">بازنشانی رمز عبور لغو شد</string>
-  <string name="account_recovery_cancelled_subtitle">اگر شما درخواست تغییر رمزعبور ثبت نکرده اید، ممکن است حساب شما در خطر باشد!\n\n
-با تغییر رمزعبور خود حساب خود را ایمن کنید.</string>
+  <string name="account_recovery_cancelled_title">بازنشانی گذرواژه لغو شد</string>
+  <string name="account_recovery_cancelled_subtitle">اگر شما درخواست تغییر گذرواژه را ثبت نکرده اید، ممکن است حساب شما در خطر باشد!\n\n
+با تغییر گذرواژه خود حساب خود را ایمن کنید.</string>
   <!-- Password change period -->
-  <string name="account_recovery_password_started_title">بازنشانی رمزعبور دردسترس است.</string>
-  <string name="account_recovery_password_started_subtitle">جهت بازنشانی رمزعبور، به مرورگر دستگاهی که این درخواست را درآن ثبت کردید برگردید.\n\n شما باید تا قبل از %s این کار را انجام دهید. \n\nاگر شما درخواست بازنشانی رمزعبور ثبت نکرده اید، همین الان آن را لغو کنید.</string>
+  <string name="account_recovery_password_started_title">بازنشانی گذرواژه دردسترس است.</string>
+  <string name="account_recovery_password_started_subtitle">جهت بازنشانی گذرواژه، به مرورگر دستگاهی که این درخواست را درآن ثبت کردید برگردید.\n\n شما باید تا قبل از %s این کار را انجام دهید. \n\nاگر شما درخواست بازنشانی گذرواژه ثبت نکرده اید، همین الان آن را لغو کنید.</string>
   <!-- Recovery window ended -->
-  <string name="account_recovery_window_ended_title">بازنشانی رمزعبور منقضی شده است.</string>
-  <string name="account_recovery_window_ended_subtitle">شما در %s دیگر میتوانید درخواست جدیدی برای بازنشانی رمزعبور خود ثبت کنید.</string>
+  <string name="account_recovery_window_ended_title">بازنشانی گذرواژه منقضی شده است.</string>
+  <string name="account_recovery_window_ended_subtitle">شما باید درخواست جدیدی برای بازنشانی گذرواژه %s ثبت کنید.</string>
   <!-- Other -->
   <string name="account_recovery_cancel">لغو درخواست</string>
   <string name="account_recovery_dismiss">متوجه شدم</string>
diff --git a/account-recovery/presentation/src/main/res/values-it/strings.xml b/account-recovery/presentation/src/main/res/values-it/strings.xml
index d37c6d880..8c3949353 100644
--- a/account-recovery/presentation/src/main/res/values-it/strings.xml
+++ b/account-recovery/presentation/src/main/res/values-it/strings.xml
@@ -25,7 +25,7 @@
   </plurals>
   <!-- Grace period - cancellation form -->
   <string name="account_recovery_cancel_title">Annullare la reimpostazione della password?</string>
-  <string name="account_recovery_cancel_subtitle">Inserisci la tua password per annullare.</string>
+  <string name="account_recovery_cancel_subtitle">Inserisci la password per annullare.</string>
   <string name="account_recovery_cancel_password_label">Password attuale</string>
   <string name="account_recovery_cancel_password_placeholder">Password</string>
   <string name="account_recovery_cancel_now">Annulla la reimpostazione della password</string>
diff --git a/auth/presentation/src/main/res/values-b+es+419/strings.xml b/auth/presentation/src/main/res/values-b+es+419/strings.xml
index 9c6efe250..fc2069fde 100644
--- a/auth/presentation/src/main/res/values-b+es+419/strings.xml
+++ b/auth/presentation/src/main/res/values-b+es+419/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Nombre de usuario o correo</string>
   <string name="auth_account_details">Ingrese los datos de su cuenta de Proton.</string>
   <string name="auth_sign_in">Iniciar sesión</string>
+  <string name="auth_sign_out">Cerrar sesión</string>
   <string name="auth_sign_in_action">Iniciar sesión</string>
   <string name="auth_sign_in_sso">Iniciar sesión en su organización</string>
   <string name="auth_sign_in_with_password">Iniciar sesión con su contraseña</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Navegue de forma privada, acceda a contenido bloqueado y disfrute de la libertad digital.</string>
   <string name="auth_credentialless_guest_button">Continuar como invitado</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Al usar esta aplicación acepta nuestros <annotation link="terms">Términos y Condiciones</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Haga el cambio hacia la privacidad.</string>
+  <string name="auth_credentialless_settings_subtitle">Obtenga un gestor de contraseñas, correo y calendario cifrado y 1 GB de almacenamiento en la nube gratis con una cuenta de Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-be/strings.xml b/auth/presentation/src/main/res/values-be/strings.xml
index 98696e6f2..e1635781d 100644
--- a/auth/presentation/src/main/res/values-be/strings.xml
+++ b/auth/presentation/src/main/res/values-be/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Імя карыстальніка або адрас электроннай пошты</string>
   <string name="auth_account_details">Увядзіце звесткі ўліковага запісу Proton.</string>
   <string name="auth_sign_in">Увайсці</string>
+  <string name="auth_sign_out">Выхад</string>
   <string name="auth_sign_in_action">Увайсці</string>
   <string name="auth_sign_in_sso">Увайсці ў сваю арганізацыю</string>
   <string name="auth_sign_in_with_password">Увайсці з паролем</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Прыватны прагляд, доступ да заблакіраванага змесціва і задавальненне ад лічбавай свабоды.</string>
   <string name="auth_credentialless_guest_button">Працягнуць як госць</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Выкарыстоўваючы гэту праграму вы прымаеце нашы <annotation link="terms">Умовы выкарыстання</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Зрабіце крок да прыватнасці.</string>
+  <string name="auth_credentialless_settings_subtitle">Бясплатна атрымайце менеджар пароляў, зашыфраваную пошту, каляндар і 1 ГБ прасторы ў воблачным сховішчы з уліковым запісам Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-ca/strings.xml b/auth/presentation/src/main/res/values-ca/strings.xml
index 512abb67a..d0c77e5a4 100644
--- a/auth/presentation/src/main/res/values-ca/strings.xml
+++ b/auth/presentation/src/main/res/values-ca/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Nom d\'usuari o correu electrònic</string>
   <string name="auth_account_details">Introduïu la informació del vostre compte de Proton.</string>
   <string name="auth_sign_in">Inicia la sessió</string>
+  <string name="auth_sign_out">Tanca la sessió</string>
   <string name="auth_sign_in_action">Inicia la sessió</string>
   <string name="auth_sign_in_sso">Inicieu la sessió a la vostra organització</string>
   <string name="auth_sign_in_with_password">Incicieu la sessió amb una contrasenya</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Navegui en privat, accedeixi a continguts bloquejats i gaudeixi de la llibertat digital.</string>
   <string name="auth_credentialless_guest_button">Continueu com a convidat</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">En utilitzar aquesta aplicació, vostè accepta els nostres <annotation link="terms">Termes i condicions</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-cs/strings.xml b/auth/presentation/src/main/res/values-cs/strings.xml
index a8193a820..9b6229ebc 100644
--- a/auth/presentation/src/main/res/values-cs/strings.xml
+++ b/auth/presentation/src/main/res/values-cs/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Uživatelské jméno nebo e-mail</string>
   <string name="auth_account_details">Zadejte údaje Vašeho účtu Proton.</string>
   <string name="auth_sign_in">Přihlásit se</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Přihlásit se</string>
   <string name="auth_sign_in_sso">Přihlaste se ke své organizaci</string>
   <string name="auth_sign_in_with_password">Přihlásit se pomocí hesla</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Procházejte soukromě, přistupujte k blokovanému obsahu a užívejte si digitální svobody.</string>
   <string name="auth_credentialless_guest_button">Pokračovat jako host</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Používáním této aplikace souhlasíte s našimi <annotation link="terms">smluvními podmínkami užívání</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-da/strings.xml b/auth/presentation/src/main/res/values-da/strings.xml
index 0ea19f307..2f1aceb09 100644
--- a/auth/presentation/src/main/res/values-da/strings.xml
+++ b/auth/presentation/src/main/res/values-da/strings.xml
@@ -19,7 +19,7 @@
 <resources>
   <string name="welcome_title">Beskyt dit privatliv med Proton</string>
   <string name="welcome_subtitle">Kryptering holder dine data private. Dine data tilhører kun dig.</string>
-  <string name="welcome_subtitle_mail">Krypteret e-mail, der holder dine samtaler private. Din indbakke er helt din egen.</string>
+  <string name="welcome_subtitle_mail">Krypteret e-mail, der holder dine samtaler private. Din indbakke tilhører kun dig.</string>
   <string name="welcome_subtitle_mail_alt">Privatliv. Sikkerhed. Bekvemmelighed. Krypteret e-mail, der giver dig fuld kontrol over dine personlige data.</string>
   <string name="welcome_subtitle_drive">Bekvemmeligheden ved lagring i skyen og sikkerheden ved krypteringsteknologi. Endelig en lagringsløsning i skyen, du kan stole på.</string>
   <string name="welcome_subtitle_drive_alt">Den sikreste måde at opbevare dine filer på. Upload, synkroniser og del dine filer med den stærkeste kryptering, der findes.</string>
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Brugernavn eller e-mail</string>
   <string name="auth_account_details">Indtast oplysninger om din Proton-konto.</string>
   <string name="auth_sign_in">Log ind</string>
+  <string name="auth_sign_out">Log ud</string>
   <string name="auth_sign_in_action">Log ind</string>
   <string name="auth_sign_in_sso">Log ind med din organisation</string>
   <string name="auth_sign_in_with_password">Log ind med en adgangskode</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Browse privat, få adgang til blokeret indhold, og nyd digital frihed.</string>
   <string name="auth_credentialless_guest_button">Forsæt som gæst</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Ved brug af denne applikation accepterer du vores <annotation link="terms">Vilkår og betingelser</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Flyt til privatlivets fred.</string>
+  <string name="auth_credentialless_settings_subtitle">Få en adgangskode administrator, krypteret Mail, Kalender og 1 GB skylager gratis med en Proton-konto.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-de/strings.xml b/auth/presentation/src/main/res/values-de/strings.xml
index abbb395e7..7f59223ad 100644
--- a/auth/presentation/src/main/res/values-de/strings.xml
+++ b/auth/presentation/src/main/res/values-de/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Benutzername oder E‐Mail‐Adresse</string>
   <string name="auth_account_details">Gib deine Proton-Kontodaten ein.</string>
   <string name="auth_sign_in">Anmelden</string>
+  <string name="auth_sign_out">Abmelden</string>
   <string name="auth_sign_in_action">Anmelden</string>
   <string name="auth_sign_in_sso">Bei deiner Organisation anmelden</string>
   <string name="auth_sign_in_with_password">Mit Passwort anmelden</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Surfe privat, greife auf gesperrte Inhalte zu und genieße digitale Freiheit.</string>
   <string name="auth_credentialless_guest_button">Als Gast fortfahren</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Durch das Verwenden dieser App akzeptierst du unsere <annotation link="terms">Nutzungsbedingungen</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Mit einem Proton-Konto erhältst du einen Passwortmanager, verschlüsselte E-Mails und Kalender sowie 1 GB Cloud-Speicher kostenlos.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-el/strings.xml b/auth/presentation/src/main/res/values-el/strings.xml
index 2e322c424..bdcbf7892 100644
--- a/auth/presentation/src/main/res/values-el/strings.xml
+++ b/auth/presentation/src/main/res/values-el/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Όνομα χρήστη ή email</string>
   <string name="auth_account_details">Εισαγάγετε τα στοιχεία του λογαριασμού σας Proton.</string>
   <string name="auth_sign_in">Είσοδος</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Είσοδος</string>
   <string name="auth_sign_in_sso">Συνδεθήτε στον οργανισμό σας</string>
   <string name="auth_sign_in_with_password">Σύνδεση με κωδικό</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Περιηγηθείτε ιδιωτικά, αποκτήστε πρόσβαση σε αποκλεισμένο περιεχόμενο και απολαύστε ψηφιακή ελευθερία.</string>
   <string name="auth_credentialless_guest_button">Συνέχιση ως επισκέπτης</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Χρησιμοποιώντας αυτήν την εφαρμογή αποδέχεστε τους <annotation link="terms">Όρους και Προϋποθέσεις</annotation> μας.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-es-rES/strings.xml b/auth/presentation/src/main/res/values-es-rES/strings.xml
index 368927fd3..0520d1770 100644
--- a/auth/presentation/src/main/res/values-es-rES/strings.xml
+++ b/auth/presentation/src/main/res/values-es-rES/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Nombre de usuario o correo electrónico</string>
   <string name="auth_account_details">Introduce los datos de tu cuenta de Proton.</string>
   <string name="auth_sign_in">Iniciar sesión</string>
+  <string name="auth_sign_out">Cerrar sesión</string>
   <string name="auth_sign_in_action">Iniciar sesión</string>
   <string name="auth_sign_in_sso">Iniciar sesión en tu organización</string>
   <string name="auth_sign_in_with_password">Iniciar sesión con contraseña</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Navega de forma privada, accede a contenido bloqueado y disfruta de libertad digital.</string>
   <string name="auth_credentialless_guest_button">Continuar como invitado</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Al utilizar esta aplicación, aceptas nuestros <annotation link="terms"> términos y condiciones</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Haz el cambio hacia la privacidad.</string>
+  <string name="auth_credentialless_settings_subtitle">Obtén un gestor de contraseñas, correo y calendario cifrado y 1 GB de almacenamiento en la nube gratis con una cuenta de Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-es-rMX/strings.xml b/auth/presentation/src/main/res/values-es-rMX/strings.xml
index 9c6efe250..fc2069fde 100644
--- a/auth/presentation/src/main/res/values-es-rMX/strings.xml
+++ b/auth/presentation/src/main/res/values-es-rMX/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Nombre de usuario o correo</string>
   <string name="auth_account_details">Ingrese los datos de su cuenta de Proton.</string>
   <string name="auth_sign_in">Iniciar sesión</string>
+  <string name="auth_sign_out">Cerrar sesión</string>
   <string name="auth_sign_in_action">Iniciar sesión</string>
   <string name="auth_sign_in_sso">Iniciar sesión en su organización</string>
   <string name="auth_sign_in_with_password">Iniciar sesión con su contraseña</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Navegue de forma privada, acceda a contenido bloqueado y disfrute de la libertad digital.</string>
   <string name="auth_credentialless_guest_button">Continuar como invitado</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Al usar esta aplicación acepta nuestros <annotation link="terms">Términos y Condiciones</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Haga el cambio hacia la privacidad.</string>
+  <string name="auth_credentialless_settings_subtitle">Obtenga un gestor de contraseñas, correo y calendario cifrado y 1 GB de almacenamiento en la nube gratis con una cuenta de Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-fa/strings.xml b/auth/presentation/src/main/res/values-fa/strings.xml
index dd493468c..2b4dcf1e2 100644
--- a/auth/presentation/src/main/res/values-fa/strings.xml
+++ b/auth/presentation/src/main/res/values-fa/strings.xml
@@ -20,33 +20,34 @@
   <string name="welcome_title">با Proton از حریم خصوصی خود حفاظت کنید</string>
   <string name="welcome_subtitle">رمزگذاری داده‌های شما را خصوصی نگاه می‌دارد. داده‌های شما حقیقتاً متعلق به شما هستند.</string>
   <string name="welcome_subtitle_mail">ایمیل رمزگذاری شده که گفتگوهای شما را خصوصی نگه می‌دارد. صندوق دریافت شما حقیقتاً متعلق به شماست.</string>
-  <string name="welcome_subtitle_mail_alt">حریم شخصی. امنیت. آسودگی. ایمیل رمزگذاری شده ای که به شما کنترل کامل داده‌‌های شخصیتان را میدهد.</string>
-  <string name="welcome_subtitle_drive">آسودگی فضای ذخیره‌ سازی ابری و امنیت تکنولوژی رمزگذاری. سرانجام راه حلی برای یک فضای ذخیره سازی ابری که میتوانید به آن اعتماد کنید.</string>
+  <string name="welcome_subtitle_mail_alt">حریم شخصی. امنیت. آسودگی. ایمیل رمزگذاری شده ای که به شما کنترل کامل داده‌‌های شخصیتان را می دهد.</string>
+  <string name="welcome_subtitle_drive">آسودگی فضای ذخیره‌ سازی ابری و امنیت تکنولوژی رمزگذاری. سرانجام راه حلی برای یک فضای ذخیره‌سازی ابری که میتوانید به آن اعتماد کنید.</string>
   <string name="welcome_subtitle_drive_alt">ایمن ترین راه برای ذخیره کردن فایل های شما. بارگذاری کنید، همگام‌سازی کنید و به اشتراک بگذارید با قدرتمندترین روش رمزگذاری موجود.</string>
-  <string name="welcome_subtitle_calendar">تقویم رمزگذاری شده ای که رویدادهای زندگی شما رو محرمانه، ایمن، و محفوظ نگه میدارد.</string>
-  <string name="welcome_subtitle_calendar_alt">تقویم سرتاسر رمزگذاری شده ما به شما کمک میکند که منظم باشید، در مسیر بمانید، و کنترل در دستتان باشد.</string>
-  <string name="welcome_subtitle_vpn">VPN پرسرعت سوئیسی که بوسیله رمزگذاری ارتباط اینترنت شما از حریم خصوصیتان محافظت میکند.</string>
-  <string name="welcome_subtitle_vpn_alt">VPN پر سرعت سوئیسی که از حریم خصوصی شما محافظت میکند. حداکثر امنیت، ۱۶۰۰+ سرور، و بدون محدودیت.</string>
-  <string name="welcome_subtitle_pass">تمامی رمزهای عبور شما، به طور ایمن و در یک مکان، توسط معتبرترین نام در حفظ حریم خصوصی محافظت می شود.</string>
-  <string name="welcome_subtitle_pass_alt">تمامی رمزهای عبور شما، به طور ایمن و در یک مکان، توسط معتبرترین نام در حفظ حریم خصوصی محافظت می شود.</string>
+  <string name="welcome_subtitle_calendar">تقویم رمزگذاری شده ای که رویدادهای زندگی شما رو محرمانه، ایمن، و محفوظ نگه می دارد.</string>
+  <string name="welcome_subtitle_calendar_alt">تقویم سرتاسر رمزگذاری شده ما به شما کمک می کند که منظم باشید، در مسیر بمانید، و کنترل در دستتان باشد.</string>
+  <string name="welcome_subtitle_vpn">VPN پرسرعت سوئیسی که بوسیله رمزگذاری ارتباط اینترنت شما از حریم خصوصیتان محافظت می کند.</string>
+  <string name="welcome_subtitle_vpn_alt">VPN پر سرعت سوئیسی که از حریم خصوصی شما محافظت می کند. حداکثر امنیت، ۱۶۰۰+ سرور، و بدون محدودیت.</string>
+  <string name="welcome_subtitle_pass">تمامی گذرواژه های شما، به طور ایمن و در یک مکان، توسط معتبرترین نام در حفظ حریم خصوصی محافظت می شود.</string>
+  <string name="welcome_subtitle_pass_alt">تمامی گذرواژه های شما، به طور ایمن و در یک مکان، توسط معتبرترین نام در حفظ حریم خصوصی محافظت می شود.</string>
   <string name="welcome_privacy_by_default">حریم شخصی به صورت پیشفرص</string>
   <string name="auth_password_label">گذرواژه</string>
   <string name="auth_password_help">گذرواژه باید حداقل ۸ نویسه داشته باشد</string>
   <string name="auth_current_login_password">گذرواژه کنونی</string>
   <string name="auth_enter_six_digit_code">کد 6 رقمی را وارد نمایید</string>
   <string name="auth_second_factor_code">کد دو مرحله‌ای</string>
-  <string name="auth_email">پست الکترونیکی</string>
+  <string name="auth_email">ایمیل</string>
   <string name="auth_email_username">نام کاربری یا ایمیل</string>
   <string name="auth_account_details">اطلاعات حساب پروتون خود را وارد کنید.</string>
   <string name="auth_sign_in">ورود</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">ورود</string>
   <string name="auth_sign_in_sso">به سازمان خود وارد شوید</string>
-  <string name="auth_sign_in_with_password">ورود با رمزعبور</string>
+  <string name="auth_sign_in_with_password">ورود با گذرواژه</string>
   <string name="auth_continue_to_proton_vpn">برای ادامه به Proton VPN</string>
   <string name="auth_sign_in_with_sso">ورود با احراز هویت یکپارچه</string>
   <string name="auth_help_label">راهنما</string>
   <string name="auth_login_assistive_text">لطفا ایمیل Proton یا نام کاربری خود را وارد کنید.</string>
-  <string name="auth_login_sso_assistive_text">لطفا آدرس email خود را وارد کنید.</string>
+  <string name="auth_login_sso_assistive_text">لطفا ایمیل خود را وارد کنید.</string>
   <string name="auth_help_title">چه طور می‌توانیم کمک کنیم؟</string>
   <string name="auth_help_option_forgot_username">فراموشی نام کاربری</string>
   <string name="auth_help_option_forgot_password">فراموشی گذرواژه</string>
@@ -73,7 +74,7 @@
   <string name="auth_login_empty_credentials">اعتبارنامه‌ها‌ نباید خالی باشند.</string>
   <string name="auth_mailbox_empty_credentials">اعتبارنامه‌ها‌ نباید خالی باشند.</string>
   <string name="auth_create_address_title">آدرس Proton نیاز است</string>
-  <string name="auth_create_address_subtitle">You need a Proton email address to use Proton Mail and Proton Calendar. You’ll still be able to use %1$s to sign in, and to recover your account.</string>
+  <string name="auth_create_address_subtitle">برای استفاده از Proton Mail و Proton Calendar شما به یک آدرس ایمیل Proton نیاز دارید. شما همچنان می توانید از %1$s برای ورود، و بازیابی حساب کاربری خود استفاده کنید.</string>
   <string name="auth_username">نام کاربری</string>
   <string name="auth_username_next_action">ادامه</string>
   <string name="auth_create_address_result_title">%s در دسترس است</string>
@@ -81,10 +82,10 @@
   <string name="auth_create_address_result_subtitle">شما از این آدرس برای ورود به حساب کاربری خود در تمامی سرویس های Proton استفاده خواهید کرد.</string>
   <string name="auth_create_address_result_recovery_title">آدرس ایمیل بازیابی شما این است:</string>
   <string name="auth_create_address_create">ایجاد آدرس</string>
-  <string name="auth_create_address_creating">در حال ایجاد نشانی</string>
-  <string name="auth_create_address_terms">با کلیک روی ایجاد آدرس، بدین منظور است که شما با شرایط و ضوابط Proton <a href="https://proton.me/legal/terms"> موافقت میکنید.</a>.</string>
+  <string name="auth_create_address_creating">در حال ایجاد آدرس</string>
+  <string name="auth_create_address_terms">با کلیک روی ایجاد آدرس، بدین منظور است که شما با <a href="https://proton.me/legal/terms">قوانین و ضوابط</a> Proton موافقت می کنید.</string>
   <string name="auth_create_address_error_credentials">اعتبارنامه‌ها‌ نباید خالی باشند.</string>
-  <string name="auth_create_address_error_no_available_domain">دامنه در دسترس نیست.</string>
+  <string name="auth_create_address_error_no_available_domain">دامنه ای در دسترس نیست.</string>
   <string name="auth_create_address_error_private_key">ساخت کلید خصوصی موفقیت آمیز نبود.</string>
   <string name="auth_create_address_error_signed_key_list">تولید لیست کلید ناموفق بود.</string>
   <string name="auth_create_address_error_setusername">قرار دادن نام کاربری ناموفق بود.</string>
@@ -94,7 +95,7 @@
   <string name="auth_mailbox_login_error_invalid_passphrase">عبارت عبور نامعتبر.</string>
   <string name="auth_password_chooser_title">گذرواژه خود را تغییر دهید</string>
   <string name="auth_password_chooser_description">برای استفاده از برنامه Proton به عنوان عضوی از یک سازمان، شما اول باید گذرواژه خود را از طریق ورود به Proton از طریق یک مرورگر تغییر دهید.</string>
-  <string name="auth_password_chooser_change">تغییر رمز عبور</string>
+  <string name="auth_password_chooser_change">تغییر گذرواژه</string>
   <string name="auth_user_check_one_free_error">فقط یک حساب کاربری رایگان Proton مجاز است.</string>
   <string name="auth_user_check_delinquent_error">حساب کاربری شما به دلیل صورت‌حساب معوقه در حالت انتظار است.</string>
   <string name="auth_user_check_delinquent_action">پرداخت صورت‌حساب</string>
@@ -106,7 +107,7 @@
   <!-- signup related strings -->
   <string name="auth_signup_create_account">حساب Proton خود را ایجاد کنید</string>
   <string name="auth_signup_current_email">در عوض از ایمیل فعلی خود استفاده کنید</string>
-  <string name="auth_signup_external_footnote">با یک نشانی Proton، میتوانیپ از تمامی سرویس های Proton استفاده کنید</string>
+  <string name="auth_signup_external_footnote">با یک آدرس Proton، میتوانید از تمامی سرویس های Proton استفاده کنید</string>
   <string name="auth_signup_internal_footnote">شما برای استفاده از Proton Mail و Proton Calendar به یک نشانی Proton نیاز دارید</string>
   <string name="auth_signup_create_secure_proton_address">دریافت یک آدرس ایمیل رمزگذاری شده جدید</string>
   <string name="auth_signup_username">نام کاربری</string>
@@ -126,7 +127,7 @@
   <string name="auth_signup_terms_conditions">شرایط و ضوابط</string>
   <string name="auth_signup_terms_conditions_full" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">با کلیک روی بعدی، شما با شرایط و ضوابط Proton <annotation link="terms"> موافقت میکنید.</annotation>.</string>
   <string name="auth_signup_skip_recovery_title">رد شدن از تعیین روش بازیابی؟</string>
-  <string name="auth_signup_skip_recovery_description">یک روش بازیابی به شما کمک میکند که در صورت فراموشی رمز عبور یا عدم امکان ورود به حساب کاربری، به حساب کاربری خود دسترسی پیدا کنید.</string>
+  <string name="auth_signup_skip_recovery_description">یک روش بازیابی به شما کمک می کند که در صورت فراموشی گذرواژه یا عدم امکان ورود به حساب کاربری، به حساب کاربری خود دسترسی پیدا کنید.</string>
   <string name="auth_signup_skip_recovery">رد شدن</string>
   <string name="auth_signup_set_recovery">تعیین روش بازیابی</string>
   <string name="auth_signup_no_connectivity">اتصال برای نمایش شرایط و ضوابط برقرار نیست.</string>
@@ -135,12 +136,12 @@
   <string name="auth_signup_validation_password_length">گذرواژه باید حداقل ۸ نویسه داشته باشد.</string>
   <string name="auth_signup_validation_password">گذرواژه نباید خالی باشد.</string>
   <string name="auth_signup_your_account_is_being_setup">در حال ایجاد حساب کاربری شما…</string>
-  <string name="auth_signup_please_wait">معمولا بیشتر از یک دقیقه طول نمیکشد.</string>
+  <string name="auth_signup_please_wait">معمولا بیشتر از یک دقیقه طول نمی کشد.</string>
   <string name="auth_signup_replacement_code">کد را دریافت نکردید؟</string>
   <string name="auth_signup_verify">تایید</string>
   <string name="auth_signup_verification_code">کد تایید</string>
   <string name="auth_signup_enter_code_subtitle">کد تاییدی که به %s ارسال شد را وارد نمایید:</string>
-  <string name="auth_signup_error_human_verification_failed">تشخیص انسان موفقیت آمیز نبود.</string>
+  <string name="auth_signup_error_human_verification_failed">تشخیص انسان بودن موفقیت آمیز نبود.</string>
   <string name="auth_signup_congratulations_subtitle">حساب کاربری Proton شما با موفقیت ساخته شد.\n از دنیای حریم خصوصی لذت ببرید.</string>
   <string name="auth_signup_congratulations">تبریک!</string>
   <string name="auth_signup_start_using_proton">شروع به استفاده از Proton کنید</string>
@@ -148,11 +149,13 @@
   <string name="auth_signup_start_using_mail">شروع به استفاده از Proton Mail کنید</string>
   <string name="auth_signup_start_using_drive">شروع به استفاده از Proton Drive کنید</string>
   <string name="auth_signup_start_using_vpn">شروع به استفاده از Proton VPN کنید</string>
-  <string name="auth_signup_start_using_pass">استفاده از Proton Pass را شروع کنید</string>
+  <string name="auth_signup_start_using_pass">شروع به استفاده از Proton Pass کنید</string>
   <string name="auth_signup_error_validation_recovery_destination">مقصد بازیابی نامعتبر است.</string>
-  <string name="auth_credentialless_vpn_no_logs">Certified no-logs VPN</string>
+  <string name="auth_credentialless_vpn_no_logs">VPN بدون گزارش گیری</string>
   <string name="auth_credentialless_vpn_title">به Proton VPN خوش آمدید</string>
-  <string name="auth_credentialless_vpn_subtitle">Browse privately, access blocked content, and enjoy digital freedom.</string>
-  <string name="auth_credentialless_guest_button">Continue as guest</string>
-  <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_vpn_subtitle">به صورت خصوصی وبگردی کنید، به محتوای مسدود شده دسترسی پیدا کنید، و از آزادی دیجیتال لذت ببرید.</string>
+  <string name="auth_credentialless_guest_button">ادامه به عنوان مهمان</string>
+  <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">با استفاده از این برنامه شما با <annotation link="terms">شرایط و ضوابط</annotation> ما موافقت می کنید.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-fr/strings.xml b/auth/presentation/src/main/res/values-fr/strings.xml
index 8f190c055..6ad267613 100644
--- a/auth/presentation/src/main/res/values-fr/strings.xml
+++ b/auth/presentation/src/main/res/values-fr/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Nom d\'utilisateur ou adresse email</string>
   <string name="auth_account_details">Saisissez les informations de votre compte Proton.</string>
   <string name="auth_sign_in">Se connecter</string>
+  <string name="auth_sign_out">Se déconnecter</string>
   <string name="auth_sign_in_action">Se connecter</string>
   <string name="auth_sign_in_sso">Connectez-vous à votre organisation</string>
   <string name="auth_sign_in_with_password">Connectez-vous avec un mot de passe</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Naviguez en toute confidentialité, accédez aux contenus bloqués et profitez de la liberté numérique.</string>
   <string name="auth_credentialless_guest_button">Continuer en tant qu\'invité</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">En utilisant cette application, vous acceptez nos <annotation link="terms">conditions générales</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Faites le pas vers le respect de la vie privée.</string>
+  <string name="auth_credentialless_settings_subtitle">Obtenez un gestionnaire de mots de passe, une boîte mail et un calendrier chiffrés, ainsi que 1 Go de stockage cloud gratuitement avec un compte Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-hr/strings.xml b/auth/presentation/src/main/res/values-hr/strings.xml
index 3ffc30fca..a6a55e054 100644
--- a/auth/presentation/src/main/res/values-hr/strings.xml
+++ b/auth/presentation/src/main/res/values-hr/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Korisničko ime ili adresa e-pošte</string>
   <string name="auth_account_details">Unesite detalje vašeg Proton računa</string>
   <string name="auth_sign_in">Prijavite se</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Prijavite se</string>
   <string name="auth_sign_in_sso">Prijavite se u vašu organizaciju</string>
   <string name="auth_sign_in_with_password">Prijavite se s lozinkom.</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Browse privately, access blocked content, and enjoy digital freedom.</string>
   <string name="auth_credentialless_guest_button">Continue as guest</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-hu/strings.xml b/auth/presentation/src/main/res/values-hu/strings.xml
index 4964875ad..47bbc14e3 100644
--- a/auth/presentation/src/main/res/values-hu/strings.xml
+++ b/auth/presentation/src/main/res/values-hu/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Felhasználónév vagy e-mail cím</string>
   <string name="auth_account_details">Írja be a Proton fiókja adatait.</string>
   <string name="auth_sign_in">Bejelentkezés</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Bejelentkezés</string>
   <string name="auth_sign_in_sso">Jelentkezzen be a szervezetébe</string>
   <string name="auth_sign_in_with_password">Bejelentkezés jelszóval</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Browse privately, access blocked content, and enjoy digital freedom.</string>
   <string name="auth_credentialless_guest_button">Continue as guest</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-in/strings.xml b/auth/presentation/src/main/res/values-in/strings.xml
index 6a5771b16..b06b5c81d 100644
--- a/auth/presentation/src/main/res/values-in/strings.xml
+++ b/auth/presentation/src/main/res/values-in/strings.xml
@@ -37,8 +37,9 @@
   <string name="auth_second_factor_code">Kode Dua Faktor</string>
   <string name="auth_email">Surel</string>
   <string name="auth_email_username">Nama pengguna atau surel</string>
-  <string name="auth_account_details">Masukkan detail Akun Proton Anda.</string>
+  <string name="auth_account_details">Masukkan rincian Akun Proton Anda.</string>
   <string name="auth_sign_in">Masuk</string>
+  <string name="auth_sign_out">Keluar</string>
   <string name="auth_sign_in_action">Masuk</string>
   <string name="auth_sign_in_sso">Masuk ke organisasi Anda</string>
   <string name="auth_sign_in_with_password">Masuk dengan kata sandi</string>
@@ -61,7 +62,7 @@
   <string name="auth_2fa_action">Autentikasi</string>
   <string name="auth_2fa_use_recovery_code">Gunakan kode pemulihan</string>
   <string name="auth_2fa_use_2fa_code">Gunakan kode dua faktor</string>
-  <string name="auth_2fa_error_empty_code">Masukkan kode 6 digit.</string>
+  <string name="auth_2fa_error_empty_code">Masukkan kode 6 digit yang Anda miliki.</string>
   <string name="auth_mailbox_title">Buka kunci kotak surat Anda</string>
   <string name="auth_mailbox_password_label">Kata sandi kotak surat</string>
   <string name="auth_mailbox_unlock_action">Membuka kunci</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Jelajahi internet secara privat, akses konten yang diblokir, dan nikmati kebebasan digital.</string>
   <string name="auth_credentialless_guest_button">Lanjut sebagai tamu</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Dengan menggunakan aplikasi ini, Anda menyatakan diri setuju terhadap <annotation link="terms">Syarat dan Ketentuan</annotation> yang berlaku.</string>
+  <string name="auth_credentialless_settings_title">Berpindahlah ke privasi.</string>
+  <string name="auth_credentialless_settings_subtitle">Dapatkan pengelola kata sandi, Mail dan Calendar yang terenkripsi, serta penyimpanan cloud sebesar 1 GB secara cuma-cuma dengan Akun Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-is/strings.xml b/auth/presentation/src/main/res/values-is/strings.xml
index 5dfa0d211..39417334e 100644
--- a/auth/presentation/src/main/res/values-is/strings.xml
+++ b/auth/presentation/src/main/res/values-is/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Notandanafn eða tölvupóstfang</string>
   <string name="auth_account_details">Sláðu inn þínum Proton reikningsupplýsingum.</string>
   <string name="auth_sign_in">Skrá inn</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Skrá inn</string>
   <string name="auth_sign_in_sso">Sign in to your organization</string>
   <string name="auth_sign_in_with_password">Sign in with a password</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Browse privately, access blocked content, and enjoy digital freedom.</string>
   <string name="auth_credentialless_guest_button">Continue as guest</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-it/strings.xml b/auth/presentation/src/main/res/values-it/strings.xml
index 634a202c2..1b6906ec8 100644
--- a/auth/presentation/src/main/res/values-it/strings.xml
+++ b/auth/presentation/src/main/res/values-it/strings.xml
@@ -31,14 +31,15 @@
   <string name="welcome_subtitle_pass_alt">Tutte le tue password. Al sicuro in un unico posto e protette dal nome più attendibile nella privacy.</string>
   <string name="welcome_privacy_by_default">Privacy by default</string>
   <string name="auth_password_label">Password</string>
-  <string name="auth_password_help">La password deve contenere almeno 8 caratteri</string>
+  <string name="auth_password_help">Inserisci una password lunga almeno 8 caratteri</string>
   <string name="auth_current_login_password">Password di accesso attuale</string>
   <string name="auth_enter_six_digit_code">Inserisci il codice a 6 cifre</string>
   <string name="auth_second_factor_code">Codice del secondo fattore</string>
   <string name="auth_email">Email</string>
   <string name="auth_email_username">Nome utente o email</string>
-  <string name="auth_account_details">Inserisci i dettagli del tuo account Proton.</string>
+  <string name="auth_account_details">Inserisci le credenziali del tuo account Proton.</string>
   <string name="auth_sign_in">Accedi</string>
+  <string name="auth_sign_out">Disconnetti</string>
   <string name="auth_sign_in_action">Accedi</string>
   <string name="auth_sign_in_sso">Accedi alla tua organizzazione</string>
   <string name="auth_sign_in_with_password">Accedi con una password</string>
@@ -130,10 +131,10 @@
   <string name="auth_signup_skip_recovery">Ignora</string>
   <string name="auth_signup_set_recovery">Imposta un metodo di recupero</string>
   <string name="auth_signup_no_connectivity">Nessuna connessione per visualizzare Termini e condizioni.</string>
-  <string name="auth_signup_error_username_blank">Il nome utente non può essere vuoto.</string>
-  <string name="auth_signup_error_passwords_do_not_match">Le password non corrispondono.</string>
-  <string name="auth_signup_validation_password_length">La password deve essere lunga almeno 8 caratteri.</string>
-  <string name="auth_signup_validation_password">La password non può essere vuota.</string>
+  <string name="auth_signup_error_username_blank">Nome utente necessario</string>
+  <string name="auth_signup_error_passwords_do_not_match">Password non corrispondente</string>
+  <string name="auth_signup_validation_password_length">Inserisci una password lunga almeno 8 caratteri</string>
+  <string name="auth_signup_validation_password">Inserisci la password di accesso attuale</string>
   <string name="auth_signup_your_account_is_being_setup">Creazione dell\'account in corso</string>
   <string name="auth_signup_please_wait">Di solito non ci vuole più di un minuto.</string>
   <string name="auth_signup_replacement_code">Non hai ricevuto il codice?</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Naviga privatamente, accedi ai contenuti bloccati e approfitta della libertà digitale.</string>
   <string name="auth_credentialless_guest_button">Continua come ospite</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Utilizzando questa app accetti i nostri <annotation link="terms">Termini e condizioni</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Passa al mondo della privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Ottieni gratuitamente un gestore di password, email, calendari e 1 GB di spazio di archiviazione cloud crittografato con un account Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-ja/strings.xml b/auth/presentation/src/main/res/values-ja/strings.xml
index ac92ecba7..b6fb69a2a 100644
--- a/auth/presentation/src/main/res/values-ja/strings.xml
+++ b/auth/presentation/src/main/res/values-ja/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">ユーザー名またはメールアドレス</string>
   <string name="auth_account_details">Proton アカウントの詳細を入力してください。</string>
   <string name="auth_sign_in">サインイン</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">サインイン</string>
   <string name="auth_sign_in_sso">組織にサインインする</string>
   <string name="auth_sign_in_with_password">パスワードを使ってサインインする</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">プライベートなブラウジング、ブロックされたコンテンツへのアクセス、デジタルの自由を楽しんでください。</string>
   <string name="auth_credentialless_guest_button">ゲストとして続ける</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">このアプリを使用することで私達の<annotation link="terms">利用規約</annotation>に同意したことになります。</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-ka/strings.xml b/auth/presentation/src/main/res/values-ka/strings.xml
index 54618853a..6f8a6738d 100644
--- a/auth/presentation/src/main/res/values-ka/strings.xml
+++ b/auth/presentation/src/main/res/values-ka/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">მომხმარებლის სახელი ან ელფოსტა</string>
   <string name="auth_account_details">შეიყვანეთ თქვენი Proton-ის ანგარიშის დეტალები.</string>
   <string name="auth_sign_in">შესვლა</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">შესვლა</string>
   <string name="auth_sign_in_sso">შედით თქვენს ორგანიზაციაში</string>
   <string name="auth_sign_in_with_password">პაროლით შესვლა</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">იმუშავეთ ინტერნეტში ინკოგნიტოდ, იქონიეთ წვდომა დაბლოკილ შემცველობასთან და ისიამოვნეთ ციფრული თავისუფლებით.</string>
   <string name="auth_credentialless_guest_button">გაგრძელება სტუმრის სახელით</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">ამ აპის გამოყენებით თქვენ ეთანხმებით ჩვენს <annotation link="terms">წესებს და პირობებს</annotation></string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-kab/strings.xml b/auth/presentation/src/main/res/values-kab/strings.xml
index 1b89993db..5237c565d 100644
--- a/auth/presentation/src/main/res/values-kab/strings.xml
+++ b/auth/presentation/src/main/res/values-kab/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Isem n useqdac neɣ imayl</string>
   <string name="auth_account_details">Sekcem umlan n umiḍan-ik Proton.</string>
   <string name="auth_sign_in">Qqen</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Qqen</string>
   <string name="auth_sign_in_sso">Kcem ɣer tkebbanit-ik</string>
   <string name="auth_sign_in_with_password">Qqen s wawal uffir</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Browse privately, access blocked content, and enjoy digital freedom.</string>
   <string name="auth_credentialless_guest_button">Continue as guest</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-ko/strings.xml b/auth/presentation/src/main/res/values-ko/strings.xml
index a28738bfd..f7cb1c1ed 100644
--- a/auth/presentation/src/main/res/values-ko/strings.xml
+++ b/auth/presentation/src/main/res/values-ko/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">사용자 이름 또는 비밀번호</string>
   <string name="auth_account_details">Proton 계정 상세 정보를 입력하세요.</string>
   <string name="auth_sign_in">로그인</string>
+  <string name="auth_sign_out">로그아웃</string>
   <string name="auth_sign_in_action">로그인</string>
   <string name="auth_sign_in_sso">조직에 로그인</string>
   <string name="auth_sign_in_with_password">비밀번호로 로그인</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">브라우징은 은밀하게, 막힌 컨텐츠는 열리게, 디지털 자유를 그렇게 누리십시오.</string>
   <string name="auth_credentialless_guest_button">게스트로 계속하기</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">앱 사용시 <annotation link="terms">이용 약관</annotation>에 동의하는 것으로 간주됩니다.</string>
+  <string name="auth_credentialless_settings_title">프라이버시를 향한 첫 걸음.</string>
+  <string name="auth_credentialless_settings_subtitle">Proton 계정으로 비밀번호 관리자, 암호화된 메일 및 캘린더, 1 GB 클라우드 스토리지를 무료로 사용할 수 있습니다.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-nb-rNO/strings.xml b/auth/presentation/src/main/res/values-nb-rNO/strings.xml
index 0d55db941..67a5b7d6b 100644
--- a/auth/presentation/src/main/res/values-nb-rNO/strings.xml
+++ b/auth/presentation/src/main/res/values-nb-rNO/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Brukernavn eller e-post</string>
   <string name="auth_account_details">Skriv inn Proton-kontoopplysningene dine.</string>
   <string name="auth_sign_in">Logg på</string>
+  <string name="auth_sign_out">Logg av</string>
   <string name="auth_sign_in_action">Logg på</string>
   <string name="auth_sign_in_sso">Logg på din organisasjon</string>
   <string name="auth_sign_in_with_password">Logg på med et passord</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Surf privat, få tilgang til blokkert innhold og nyt digital frihet.</string>
   <string name="auth_credentialless_guest_button">Fortsett som gjest</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Ved å bruke denne appen godtar du våre <annotation link="terms">vilkår og betingelser</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Gjør overgangen til personvern.</string>
+  <string name="auth_credentialless_settings_subtitle">Få en passordbehandler, kryptert e-post og kalender og 1 GB skylagring gratis med en Proton-konto.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-nl/strings.xml b/auth/presentation/src/main/res/values-nl/strings.xml
index 39baddb6a..5d445f98e 100644
--- a/auth/presentation/src/main/res/values-nl/strings.xml
+++ b/auth/presentation/src/main/res/values-nl/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Gebruikersnaam of e-mailadres</string>
   <string name="auth_account_details">Vul uw Proton Account gegevens in.</string>
   <string name="auth_sign_in">Inloggen</string>
+  <string name="auth_sign_out">Uitloggen</string>
   <string name="auth_sign_in_action">Inloggen</string>
   <string name="auth_sign_in_sso">Aanmelden bij uw organisatie</string>
   <string name="auth_sign_in_with_password">Aanmelden met wachtwoord</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Surf privé, bekijk geblokkeerde content en geniet van digitale vrijheid.</string>
   <string name="auth_credentialless_guest_button">Ga verder als gast</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Door dit programma te gebruiken accepteert u onze <annotation link="terms">Voorwaarden</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-pl/strings.xml b/auth/presentation/src/main/res/values-pl/strings.xml
index 0706ad45e..ee27068e2 100644
--- a/auth/presentation/src/main/res/values-pl/strings.xml
+++ b/auth/presentation/src/main/res/values-pl/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Nazwa użytkownika lub adres e-mail</string>
   <string name="auth_account_details">Wpisz szczegóły konta Proton.</string>
   <string name="auth_sign_in">Zaloguj się</string>
+  <string name="auth_sign_out">Wyloguj</string>
   <string name="auth_sign_in_action">Zaloguj się</string>
   <string name="auth_sign_in_sso">Zaloguj się do organizacji</string>
   <string name="auth_sign_in_with_password">Zaloguj się za pomocą hasła</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Przeglądaj prywatnie Internet, uzyskaj dostęp do zablokowanych treści i ciesz się cyfrową wolnością.</string>
   <string name="auth_credentialless_guest_button">Kontynuuj jako gość</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Korzystając z aplikacji, akceptujesz <annotation link="terms">Regulamin</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Przejdź do prywatności.</string>
+  <string name="auth_credentialless_settings_subtitle">Konto Proton zapewnia darmowy menadżer haseł, szyfrowaną pocztę, kalendarz oraz 1 GB przestrzeni dyskowej w chmurze.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-pt-rBR/strings.xml b/auth/presentation/src/main/res/values-pt-rBR/strings.xml
index 97004761e..f045896ff 100644
--- a/auth/presentation/src/main/res/values-pt-rBR/strings.xml
+++ b/auth/presentation/src/main/res/values-pt-rBR/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Nome de usuário ou e-mail</string>
   <string name="auth_account_details">Insira os detalhes de sua conta Proton.</string>
   <string name="auth_sign_in">Iniciar sessão</string>
+  <string name="auth_sign_out">Encerrar sessão</string>
   <string name="auth_sign_in_action">Iniciar sessão</string>
   <string name="auth_sign_in_sso">Iniciar sessão na sua organização</string>
   <string name="auth_sign_in_with_password">Iniciar sessão com senha</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Navegue com privacidade, acesse conteúdo bloqueado e desfrute da liberdade digital.</string>
   <string name="auth_credentialless_guest_button">Continuar como convidado</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Ao usar este aplicativo você aceita nossos <annotation link="terms">Termos e Condições</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Mude-se para a privacidade.</string>
+  <string name="auth_credentialless_settings_subtitle">Obtenha um gerenciador de senhas, Mail e Calendar criptografados e 1 GB de armazenamento em nuvem gratuitos com uma conta Proton.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-pt-rPT/strings.xml b/auth/presentation/src/main/res/values-pt-rPT/strings.xml
index ff9e9e636..4eb5fbbd4 100644
--- a/auth/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/auth/presentation/src/main/res/values-pt-rPT/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Utilizador ou e-mail </string>
   <string name="auth_account_details">Introduza os detalhes da sua conta Proton.</string>
   <string name="auth_sign_in">Iniciar sessão</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Iniciar sessão</string>
   <string name="auth_sign_in_sso">Faça o login na sua organização</string>
   <string name="auth_sign_in_with_password">Faça o login com a palavra-passe</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Browse privately, access blocked content, and enjoy digital freedom.</string>
   <string name="auth_credentialless_guest_button">Continue as guest</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-ro/strings.xml b/auth/presentation/src/main/res/values-ro/strings.xml
index 95aaab1e1..8b2b790c6 100644
--- a/auth/presentation/src/main/res/values-ro/strings.xml
+++ b/auth/presentation/src/main/res/values-ro/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Utilizator sau e-mail</string>
   <string name="auth_account_details">Introduceți detaliile contului Proton.</string>
   <string name="auth_sign_in">Autentificare</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Autentificare</string>
   <string name="auth_sign_in_sso">Autentificare la organizație</string>
   <string name="auth_sign_in_with_password">Autentificare cu e-mail și parolă</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Navigați în privat, accesați conținutul blocat și bucurați-vă de libertatea digitală.</string>
   <string name="auth_credentialless_guest_button">Continuare ca vizitator</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Folosind această aplicație sunteți de acord cu <annotation link="terms">Termenii și condițiile</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-ru/strings.xml b/auth/presentation/src/main/res/values-ru/strings.xml
index 48404d1fb..889e0ebae 100644
--- a/auth/presentation/src/main/res/values-ru/strings.xml
+++ b/auth/presentation/src/main/res/values-ru/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Имя пользователя или эл. почта</string>
   <string name="auth_account_details">Введите данные вашего аккаунта Proton.</string>
   <string name="auth_sign_in">Войти</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Войти</string>
   <string name="auth_sign_in_sso">Войдите в вашу организацию</string>
   <string name="auth_sign_in_with_password">Войти с паролем</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Просматривайте сайты в приватно, получайте доступ к заблокированному содержимому и пользуйтесь цифровой свободой.</string>
   <string name="auth_credentialless_guest_button">Продолжить без регистрации</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Используя это приложение, вы принимаете наши <annotation link="terms">Условия использования</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-sk/strings.xml b/auth/presentation/src/main/res/values-sk/strings.xml
index 62e750f3c..8994d741d 100644
--- a/auth/presentation/src/main/res/values-sk/strings.xml
+++ b/auth/presentation/src/main/res/values-sk/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Používateľské meno alebo email</string>
   <string name="auth_account_details">Zadajte podrobnosti o svojom účte Proton.</string>
   <string name="auth_sign_in">Prihlásiť sa</string>
+  <string name="auth_sign_out">Odhlásiť sa</string>
   <string name="auth_sign_in_action">Prihlásiť sa</string>
   <string name="auth_sign_in_sso">Prihláste sa do svojej organizácie</string>
   <string name="auth_sign_in_with_password">Prihláste sa pomocou hesla</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Surfujte v súkromí, získajte prístup k blokovanému obsahu a užívajte si digitálnu slobodu.</string>
   <string name="auth_credentialless_guest_button">Pokračovať ako hosť</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-sv-rSE/strings.xml b/auth/presentation/src/main/res/values-sv-rSE/strings.xml
index be65aedc2..f4d33382a 100644
--- a/auth/presentation/src/main/res/values-sv-rSE/strings.xml
+++ b/auth/presentation/src/main/res/values-sv-rSE/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Användarnamn eller e-post</string>
   <string name="auth_account_details">Ange dina kontodetaljer för Proton.</string>
   <string name="auth_sign_in">Logga in</string>
+  <string name="auth_sign_out">Logga ut</string>
   <string name="auth_sign_in_action">Logga in</string>
   <string name="auth_sign_in_sso">Logga in på din organisation</string>
   <string name="auth_sign_in_with_password">Logga in med ett lösenord</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Surfa privat, åtkomst till blockerat innehåll och njut av digital frihet.</string>
   <string name="auth_credentialless_guest_button">Fortsätt som gäst</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Genom att använda denna app accepterar du våra <annotation link="terms">användarvillkor</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Ta steget till integritet.</string>
+  <string name="auth_credentialless_settings_subtitle">Skaffa en lösenordshanterare, krypterad e-post och kalender och 1 GB molnlagring gratis med ett Proton-konto.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-tr/strings.xml b/auth/presentation/src/main/res/values-tr/strings.xml
index b4dcf5e80..0b18b7354 100644
--- a/auth/presentation/src/main/res/values-tr/strings.xml
+++ b/auth/presentation/src/main/res/values-tr/strings.xml
@@ -24,7 +24,7 @@
   <string name="welcome_subtitle_drive">Bulut depolamanın rahatlığı ve şifreleme teknolojisinin güvenliği. Sonunda güvenebileceğiniz bir bulut depolama çözümü var.</string>
   <string name="welcome_subtitle_drive_alt">Dosyalarınızı saklamanın en güvenli yolu. Güncel en güçlü şifreleme ile dosyalarınızı yükleyin, eşitleyin ve paylaşın.</string>
   <string name="welcome_subtitle_calendar">Hayatınızdaki etkinlikleri gizli, emniyetli ve güvenli tutan şifrelenmiş takvim.</string>
-  <string name="welcome_subtitle_calendar_alt">Uçtan uca şifrelenmiş takvimimiz, kontrolü size bırakarak planlarınızı uygulamanıza yardımcı olur.</string>
+  <string name="welcome_subtitle_calendar_alt">Uçtan uca şifrelenmiş takvimimiz, kontrolü size vererek planlarınızı uygulamanıza yardımcı olur.</string>
   <string name="welcome_subtitle_vpn">İnternet bağlantınızı şifreleyerek gizliliğinizi koruyan yüksek hızlı İsviçre\'li VPN.</string>
   <string name="welcome_subtitle_vpn_alt">Gizliliğinizi koruyan yüksek hızlı İsviçre\'li VPN. En yüksek güvenlik, 1.600 üzerinde sunucu ve sınırlamasız.</string>
   <string name="welcome_subtitle_pass">Tüm parolalarınız. Tek bir yerde güvenli bir şekilde ve gizliliğin en güvenilir adı tarafından korunuyor.</string>
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Kullanıcı adı ya da e-posta</string>
   <string name="auth_account_details">Proton hesabınızın bilgilerini yazın.</string>
   <string name="auth_sign_in">Oturum aç</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Oturum aç</string>
   <string name="auth_sign_in_sso">Kuruluşunuzda oturum açın</string>
   <string name="auth_sign_in_with_password">Parola ile oturum açın</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">Gizliliğinizi koruyarak gezinin, engellenen içeriğe erişin ve dijital özgürlüğün tadını çıkarın.</string>
   <string name="auth_credentialless_guest_button">Konuk olarak ilerle</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Bu uygulamayı kullanarak <annotation link="terms">Hüküm ve Koşullarımızı</annotation> kabul etmiş olursunuz.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-uk/strings.xml b/auth/presentation/src/main/res/values-uk/strings.xml
index bfac0cfe8..2b75cf2e2 100644
--- a/auth/presentation/src/main/res/values-uk/strings.xml
+++ b/auth/presentation/src/main/res/values-uk/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">Ім\'я користувача або е-пошта</string>
   <string name="auth_account_details">Введіть дані свого облікового запису Proton.</string>
   <string name="auth_sign_in">Увійти</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">Увійти</string>
   <string name="auth_sign_in_sso">Увійдіть до своєї організації</string>
   <string name="auth_sign_in_with_password">Увійти за допомогою пароля</string>
@@ -153,6 +154,8 @@
   <string name="auth_credentialless_vpn_no_logs">Сертифікована VPN без журналювання</string>
   <string name="auth_credentialless_vpn_title">Ласкаво просимо до Proton VPN</string>
   <string name="auth_credentialless_vpn_subtitle">Приватний перегляд, доступ до заблокованого вмісту і задоволення від цифрової свободи.</string>
-  <string name="auth_credentialless_guest_button">Continue as guest</string>
-  <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">By using this app you accept our <annotation link="terms">Terms and Conditions</annotation>.</string>
+  <string name="auth_credentialless_guest_button">Продовжити як гість</string>
+  <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">Використовуючи цю програму, ви приймаєте наші <annotation link="terms">Умови та Положення</annotation>.</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-zh-rCN/strings.xml b/auth/presentation/src/main/res/values-zh-rCN/strings.xml
index f3f887bef..94c0cd10c 100644
--- a/auth/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/auth/presentation/src/main/res/values-zh-rCN/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">用户名或电子邮箱</string>
   <string name="auth_account_details">请输入您的 Proton 账户信息。</string>
   <string name="auth_sign_in">登录</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">登录</string>
   <string name="auth_sign_in_sso">登录到您的组织</string>
   <string name="auth_sign_in_with_password">使用密码登录</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">私密浏览，访问被屏蔽的内容，享受数字自由。</string>
   <string name="auth_credentialless_guest_button">以宾客身份继续</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">使用本应用程序即表示您接受我们的<annotation link="terms">服务条款</annotation>。</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/auth/presentation/src/main/res/values-zh-rTW/strings.xml b/auth/presentation/src/main/res/values-zh-rTW/strings.xml
index 076476c47..deee2372c 100644
--- a/auth/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/auth/presentation/src/main/res/values-zh-rTW/strings.xml
@@ -39,6 +39,7 @@
   <string name="auth_email_username">使用者名稱或電子信箱</string>
   <string name="auth_account_details">輸入您的 Proton 帳號詳細資料。</string>
   <string name="auth_sign_in">登入</string>
+  <string name="auth_sign_out">Sign out</string>
   <string name="auth_sign_in_action">登入</string>
   <string name="auth_sign_in_sso">登入您的組織</string>
   <string name="auth_sign_in_with_password">使用密碼登入</string>
@@ -155,4 +156,6 @@
   <string name="auth_credentialless_vpn_subtitle">私密瀏覽、存取被封鎖的內容並享受數位自由。</string>
   <string name="auth_credentialless_guest_button">以訪客身份繼續</string>
   <string name="auth_credentialless_terms" comment="Please do not modify the &lt;annotation link=&quot;terms&quot;&gt; tag, only its contents.">使用此應用程式即表示您接受我們的<annotation link="terms">條款與條件</annotation>。</string>
+  <string name="auth_credentialless_settings_title">Make the move to privacy.</string>
+  <string name="auth_credentialless_settings_subtitle">Get a password manager, encrypted Mail and Calendar, and 1 GB of cloud storage for free with a Proton Account.</string>
 </resources>
diff --git a/country/presentation/src/main/res/values-zh-rCN/strings.xml b/country/presentation/src/main/res/values-zh-rCN/strings.xml
index 282d123a6..8fd2ddd8d 100644
--- a/country/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/country/presentation/src/main/res/values-zh-rCN/strings.xml
@@ -17,5 +17,5 @@
   ~ along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="countries_search">搜索国家</string>
+  <string name="countries_search">搜索国家/地区</string>
 </resources>
diff --git a/crypto-validator/presentation/src/main/res/values-fa/strings.xml b/crypto-validator/presentation/src/main/res/values-fa/strings.xml
index 8d11e63cf..7552693b5 100644
--- a/crypto-validator/presentation/src/main/res/values-fa/strings.xml
+++ b/crypto-validator/presentation/src/main/res/values-fa/strings.xml
@@ -18,7 +18,7 @@
   -->
 <resources>
   <string name="crypto_keystore_error_title">خطای رمزگذاری</string>
-  <string name="crypto_keystore_error_message">این دستگاه از یک روش پیاده سازی معیوب برای مخزن کلید Android استفاده میکند، که ما از آن برای ایمن نگه داشتن داده شما استفاده میکنیم. این به آن معناست که داده شما میتواند به خطر بیافتد اگر یک مهاجم به دستگاه شما دسترسی فیزیکی پیدا کند. دوست دارید چه کار کنید؟</string>
+  <string name="crypto_keystore_error_message">این دستگاه از یک روش پیاده سازی معیوب برای مخزن کلید Android استفاده می کند، که ما از آن برای ایمن نگه داشتن داده های شما استفاده می کنیم. این به آن معناست که داده های شما اگر یک مهاجم به دستگاه شما دسترسی فیزیکی پیدا کند می تواند به خطر بیافتد. دوست دارید چه کار کنید؟</string>
   <string name="crypto_keystore_error_continue_action">ادامه</string>
   <string name="crypto_keystore_error_more_info_action">دریافت اطلاعات بیشتر</string>
   <string name="crypto_keystore_error_logout_action">خروج از حساب</string>
diff --git a/crypto-validator/presentation/src/main/res/values-zh-rCN/strings.xml b/crypto-validator/presentation/src/main/res/values-zh-rCN/strings.xml
index ee77c7a5e..41a5515e5 100644
--- a/crypto-validator/presentation/src/main/res/values-zh-rCN/strings.xml
+++ b/crypto-validator/presentation/src/main/res/values-zh-rCN/strings.xml
@@ -17,7 +17,7 @@
   ~ along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="crypto_keystore_error_title">加密程序错误</string>
+  <string name="crypto_keystore_error_title">加密失败</string>
   <string name="crypto_keystore_error_message">此设备使用了存在缺陷的 Android 密钥库，而我们需要利用该组件保障您的数据安全。这意味着如果攻击者能够以物理手段得到此设备，您的数据就有可能被窃取。您要如何操作？</string>
   <string name="crypto_keystore_error_continue_action">继续</string>
   <string name="crypto_keystore_error_more_info_action">了解详细信息</string>
diff --git a/human-verification/presentation/src/main/res/values-ca/strings.xml b/human-verification/presentation/src/main/res/values-ca/strings.xml
index 196468667..5caee1907 100644
--- a/human-verification/presentation/src/main/res/values-ca/strings.xml
+++ b/human-verification/presentation/src/main/res/values-ca/strings.xml
@@ -25,7 +25,7 @@
   <string name="sms_hint">XX XXX XX XX</string>
   <!-- TODO: update correct strings below -->
   <string name="human_verification_help_manual_title">Demanar una invitació</string>
-  <string name="human_verification_help_manual">Si teniu problemes per crear el vostre compte, sol·liciteu una cita i us respondrem en 1 dia laborable.</string>
-  <string name="human_verification_help_website_title">Visiteu el nostre centre d\'ajuda</string>
+  <string name="human_verification_help_manual">Si teniu problemes per crear el vostre compte, si us plau, sol·liciteu una cita i us respondrem en 1 dia laborable.</string>
+  <string name="human_verification_help_website_title">Visiti el nostre Centre d\'ajuda</string>
   <string name="human_verification_help_website">Més informació sobre la verificació humana i per què la demanem.</string>
 </resources>
diff --git a/human-verification/presentation/src/main/res/values-fa/strings.xml b/human-verification/presentation/src/main/res/values-fa/strings.xml
index f27d91da1..28116a57f 100644
--- a/human-verification/presentation/src/main/res/values-fa/strings.xml
+++ b/human-verification/presentation/src/main/res/values-fa/strings.xml
@@ -19,7 +19,7 @@
 <resources>
   <!-- base common strings -->
   <string name="human_verification_help">راهنما</string>
-  <string name="human_verification_title">اعتبارسنجی</string>
+  <string name="human_verification_title">تأیید انسان بودن</string>
   <!-- To verify the entered code - action -->
   <string name="human_verification_help_title">برای اعتبارسنجی به کمک نیاز دارید؟</string>
   <string name="sms_hint">XX XXX XX XX</string>
@@ -27,5 +27,5 @@
   <string name="human_verification_help_manual_title">درخواست دعوتنامه</string>
   <string name="human_verification_help_manual">اگر در ایجاد حساب کاربری خود مشکلی دارید، لطفا یک دعوت‌ نامه درخواست کنید و ما ظرف یک روز کاری پاسخ خواهیم داد.</string>
   <string name="human_verification_help_website_title">از مرکز راهنمایی ما دیدن کنید</string>
-  <string name="human_verification_help_website">در مورد اعتبارسنجی و این که چرا ما آن را درخواست میکنیم بیشتر یاد بگیرید.</string>
+  <string name="human_verification_help_website">در مورد اعتبارسنجی و این که چرا ما آن را درخواست می کنیم بیشتر یاد بگیرید.</string>
 </resources>
diff --git a/payment-iap/presentation/src/main/res/values-fa/strings.xml b/payment-iap/presentation/src/main/res/values-fa/strings.xml
index 0a43bd1f9..aaaa9bb06 100644
--- a/payment-iap/presentation/src/main/res/values-fa/strings.xml
+++ b/payment-iap/presentation/src/main/res/values-fa/strings.xml
@@ -17,8 +17,8 @@
   ~ along with ProtonCore.  If not, see <https://www.gnu.org/licenses/>.
   -->
 <resources>
-  <string name="payments_iap_surcharge_info">*شامل اضافه بها برای ارائه دهنده کارمزد و مالیات اضافی میشود.</string>
-  <string name="payments_iap_terms_conditions">با زدن روی \"خرید از طریق Google Play\" شما شرایط و ضوابط Google Play را قبول میکنید و برپا کردن پرداخت مکرر با Google را تایید میکنید.</string>
+  <string name="payments_iap_surcharge_info">*شامل اضافه بها برای ارائه دهنده کارمزد و مالیات اضافی می شود.</string>
+  <string name="payments_iap_terms_conditions">با زدن روی \"خرید از طریق Google Play\" شما شرایط و ضوابط Google Play را قبول می کنید و برپا کردن پرداخت مکرر با Google را تایید می کنید.</string>
   <string name="payments_iap_invalid_google_plan">نوع طرح سرویس انتخاب شده معتبر نیست. لطفا مراحل را از ابتدا انجام دهید.</string>
   <string name="payments_iap_error_google_plan_price">Problem with Google product price. Please restart the process.</string>
   <string name="payments_iap_error_fetching_google_plan">Problem fetching Google product. Please restart the process.</string>
diff --git a/payment/presentation/src/main/res/values-fa/strings.xml b/payment/presentation/src/main/res/values-fa/strings.xml
index de6e56f43..746e2c05c 100644
--- a/payment/presentation/src/main/res/values-fa/strings.xml
+++ b/payment/presentation/src/main/res/values-fa/strings.xml
@@ -24,11 +24,11 @@
   <string name="payments_error_card_name">نام روی کارت الزامی است.</string>
   <string name="payments_error_card_number">شماره کارت نامعتبر.</string>
   <string name="payments_error_cvc">لطفا کد امنیتی معتبر وارد کنید.</string>
-  <string name="payments_error_session">Valid session ID is needed when subscribing a signed-in user.</string>
+  <string name="payments_error_session">هنگام تهیه اشتراک برای یک کاربر وارد شده، شناسه نشست معتبر ضروری است.</string>
   <string name="payments_error_signup_paymentmethod">با روش پرداخت فعلی نمی توان ثبت‌نام کرد.</string>
   <string name="payments_error_invalid_session">نشست نامعتبر.</string>
   <string name="payments_no_payment_provider">هیچ ارائه دهنده سیستم پرداخت فعالی یافت نشد.</string>
-  <string name="payments_error_google_prices">Problem retrieving Google Play Store prices at the moment.</string>
+  <string name="payments_error_google_prices">مشکل در دریافت قیمت های Google Play Store</string>
   <!-- endregion -->
   <!-- region payment options -->
   <string name="payments_choose_payment_method">روش پرداخت خود را انتخاب کنید</string>
@@ -36,8 +36,8 @@
   <string name="payments_pay" comment="Example: Pay 5EUR">پرداخت %s</string>
   <string name="payments_pay_with" comment="Example: Pay with debit card">پرداخت با</string>
   <string name="payments_method_icon">آیکون روش پرداخت.</string>
-  <string name="payments_method_surcharge">*خرید از طریق این روش پرداخت منجر به اضافه بها میشود.</string>
-  <string name="payments_method_terms_conditions">خرید از طریق Google Play به این معناست که شما شرایط و ضوابط Google Play را قبول میکنید و پرداخت مکرر با Google را تایید میکنید.</string>
+  <string name="payments_method_surcharge">*خرید از طریق این روش پرداخت منجر به اضافه بها می شود.</string>
+  <string name="payments_method_terms_conditions">خرید از طریق Google Play به این معناست که شما شرایط و ضوابط Google Play را قبول می کنید و پرداخت مکرر با Google را تایید می کنید.</string>
   <string name="payments_method_google">Google</string>
   <string name="payments_method_continue">ادامه</string>
   <!-- endregion -->
@@ -52,12 +52,12 @@
   <string name="payments_expiration_date_hint">ماه/سال</string>
   <string name="payments_security_code_hint">123</string>
   <string name="payments_country">کشور</string>
-  <string name="payments_get_plan">Get %s</string>
+  <string name="payments_get_plan">دریافت %s</string>
   <string name="payments_paying_in_process">در حال پرداخت</string>
   <string name="payments_choose_country">انتخاب کشور</string>
-  <string name="payment_cc_list_item">%1$s - %2$s (مثال %3$s/%4$s)</string>
+  <string name="payment_cc_list_item">%1$s - %2$s (تاریخ انقضاء %3$s/%4$s)</string>
   <string name="payment_paypal_list_item">PayPal</string>
-  <string name="payments_info_not_available">در دسترس/ نیست</string>
+  <string name="payments_info_not_available">در دسترس نیست</string>
   <string name="payments_billing_monthly">برای ۱ ماه</string>
   <string name="payments_billing_yearly">برای ۱ سال</string>
   <string name="payments_billing_two_years">برای ۲ سال</string>
@@ -66,7 +66,7 @@
   <!-- endregion -->
   <!-- region GIAP -->
   <string name="payments_giap_unredeemed_title">تایید ارتقا حساب کاربری</string>
-  <string name="payments_giap_unredeemed_description">پرداخت از طریق Google Play با موفقیت انجام شد، اما پروسه ارتقا حساب کاربری مختل شد. پرداخت خود را برای ارتقا حساب کاربری خود همین حالا اعمال میکنید؟</string>
+  <string name="payments_giap_unredeemed_description">پرداخت از طریق Google Play با موفقیت انجام شد، اما پروسه ارتقا حساب کاربری مختل شد. پرداخت خود را برای ارتقا حساب کاربری خود همین حالا اعمال می کنید؟</string>
   <string name="payments_giap_unredeemed_confirm">تأیید ارتقا</string>
   <string name="payments_giap_redeem_success">حساب کاربری شما با موفقیت ارتقا یافت</string>
   <string name="payments_giap_redeem_error">ارتقا حساب کاربری کامل نشد. لطفا بعدا دوباره امتحان کنید.</string>
diff --git a/payment/presentation/src/main/res/values-pt-rPT/strings.xml b/payment/presentation/src/main/res/values-pt-rPT/strings.xml
index d767a1e4a..77e1cac17 100644
--- a/payment/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/payment/presentation/src/main/res/values-pt-rPT/strings.xml
@@ -52,7 +52,7 @@
   <string name="payments_expiration_date_hint">MM/AA</string>
   <string name="payments_security_code_hint">123</string>
   <string name="payments_country">País</string>
-  <string name="payments_get_plan">Get %s</string>
+  <string name="payments_get_plan">Obter %s</string>
   <string name="payments_paying_in_process">Pagamento</string>
   <string name="payments_choose_country">Selecione o país</string>
   <string name="payment_cc_list_item">%1$s - %2$s (exp %3$s/%4$s)</string>
diff --git a/payment/presentation/src/main/res/values-ru/strings.xml b/payment/presentation/src/main/res/values-ru/strings.xml
index 28c634a8c..cc36824b3 100644
--- a/payment/presentation/src/main/res/values-ru/strings.xml
+++ b/payment/presentation/src/main/res/values-ru/strings.xml
@@ -28,7 +28,7 @@
   <string name="payments_error_signup_paymentmethod">Не удалось зарегистрироваться с существующим способом оплаты.</string>
   <string name="payments_error_invalid_session">Недействительный сеанс.</string>
   <string name="payments_no_payment_provider">Активный поставщик платежей не найден.</string>
-  <string name="payments_error_google_prices">В настоящее время возникает проблема с получением данных о ценах из Google Play Store.</string>
+  <string name="payments_error_google_prices">В настоящее время существует проблема с получением цен из Google Play Store.</string>
   <!-- endregion -->
   <!-- region payment options -->
   <string name="payments_choose_payment_method">Выберите способ оплаты</string>
diff --git a/plan/presentation/src/main/res/values-cs/strings.xml b/plan/presentation/src/main/res/values-cs/strings.xml
index 05186794c..fd40e36fe 100644
--- a/plan/presentation/src/main/res/values-cs/strings.xml
+++ b/plan/presentation/src/main/res/values-cs/strings.xml
@@ -61,12 +61,12 @@
   <string name="plans_can_not_upgrade_from_mobile">Není možné navýšit tarif pomocí mobilní aplikace.</string>
   <string name="plans_no_upgrade_available">V současnosti není k dispozici žádné navýšení.</string>
   <string name="plans_limited_offer">Časově omezená nabídka</string>
-  <string name="plans_subscription_base_storage_full_title">Vaše úložiště je plné</string>
-  <string name="plans_subscription_base_storage_nearly_full_title">Vaše Mail úložiště je téměř plné</string>
-  <string name="plans_subscription_drive_storage_full_title">Vaše úložiště je plné</string>
-  <string name="plans_subscription_drive_storage_nearly_full_title">Vaše Mail úložiště je téměř plné</string>
+  <string name="plans_subscription_base_storage_full_title">Vaše úložiště Mail je plné</string>
+  <string name="plans_subscription_base_storage_nearly_full_title">Vaše úložiště Mail je téměř plné</string>
+  <string name="plans_subscription_drive_storage_full_title">Vaše úložiště Drive je plné</string>
+  <string name="plans_subscription_drive_storage_nearly_full_title">Vaše úložiště Drive je téměř plné</string>
   <string name="plans_subscription_storage_get_more">Získat více úložného prostoru</string>
-  <string name="plans_subscription_storage_full_description">Upgradujte svůj tarif a pokračujte v používání účtu bez přerušení.</string>
+  <string name="plans_subscription_storage_full_description">Navyšte svůj tarif abyste mohli pokračovat v používání účtu bez přerušení.</string>
   <!-- region all possible plan item types. this could be updated as per language requirements.-->
   <plurals name="item_storage" comment="please do not modify the text between #">
     <item quantity="one">#proton_storage# úložiště</item>
diff --git a/plan/presentation/src/main/res/values-da/strings.xml b/plan/presentation/src/main/res/values-da/strings.xml
index 66998fc83..6bc62eb50 100644
--- a/plan/presentation/src/main/res/values-da/strings.xml
+++ b/plan/presentation/src/main/res/values-da/strings.xml
@@ -164,9 +164,9 @@
   <string name="ten_hide_my_email_aliases">10 Hide My Email-aliasser</string>
   <!-- endregion -->
   <!-- region Plan entitlement tags -->
-  <string name="upgrade_storage_current_drive_storage">Drive storage: %d%% full</string>
-  <string name="upgrade_storage_current_mail_storage">Mail storage: %d%% full</string>
+  <string name="upgrade_storage_current_drive_storage">Lagerplads %d%% fuld</string>
+  <string name="upgrade_storage_current_mail_storage">Mail lager: %d%% fuld</string>
   <string name="upgrade_storage_subtitle">Få mere lagerplads</string>
-  <string name="upgrade_storage_cta_button">Upgrade</string>
+  <string name="upgrade_storage_cta_button">Opgradering</string>
   <!-- endregion -->
 </resources>
diff --git a/plan/presentation/src/main/res/values-fa/strings.xml b/plan/presentation/src/main/res/values-fa/strings.xml
index 46c4dac15..7f5a3c7e2 100644
--- a/plan/presentation/src/main/res/values-fa/strings.xml
+++ b/plan/presentation/src/main/res/values-fa/strings.xml
@@ -19,10 +19,10 @@
 <resources>
   <string name="plans_select_a_plan">یک طرح انتخاب کنید</string>
   <string name="plans_select_a_plan_subtitle">یک طرح سرویس برای همه سرویس‌های Proton</string>
-  <string name="plans_fetching_general_error">خطای در واکشی طرح سرویس ها رخ داد.</string>
+  <string name="plans_fetching_general_error">خطای در دریافت طرح سرویس ها رخ داد.</string>
   <string name="plans_payment_error">خطایی در پرداخت رخ داد. لطفا بعدا دوباره امتحان کنید یا یک طرح سرویس رایگان ایجاد کنید.</string>
   <string name="plans_free_name">Free</string>
-  <string name="plan_price_monthly">هر ماه</string>
+  <string name="plan_price_monthly">در ماه</string>
   <string name="plan_price_annually">در سال</string>
   <string name="plans_current_plan">طرح کنونی</string>
   <string name="plans_upgrade_plan">طرح خود را ارتقا دهید</string>
@@ -34,7 +34,7 @@
   <string name="plans_pay_biennially">هر 2 سال یک بار پرداخت کنید</string>
   <plurals name="plans_pay_other">
     <item quantity="one">پرداخت برای %d ماه</item>
-    <item quantity="other">Pay for %d months</item>
+    <item quantity="other">پرداخت برای %d ماه</item>
   </plurals>
   <string name="plans_billed_yearly">صورتحساب سالانه به مقدار %s</string>
   <string name="plans_billed_monthly">صورتحساب ماهانه</string>
@@ -50,18 +50,18 @@
   <string name="plans_get_proton">%s را دریافت کنید</string>
   <string name="plans_manage_your_subscription">اشتراک خود را در <a href="https://account.proton.me">account.proton.me</a> مدیریت کنید</string>
   <string name="plans_used_space" comment="1 - used space (e.g. 300MB); 2 - max available space (e.g. 1GB)">%1$s از %2$s</string>
-  <string name="plans_payments_info_not_available">در دسترس/ نیست</string>
-  <string name="plans_manage_your_subscription_google">اشتراک شما توسط Google Play مدیریت میشود.</string>
+  <string name="plans_payments_info_not_available">در دسترس نیست</string>
+  <string name="plans_manage_your_subscription_google">اشتراک شما توسط Google Play مدیریت می شود.</string>
   <string name="plans_manage_your_subscription_other">نمیتوان اشتراک را از داخل برنامه موبایل مدیریت کرد.</string>
   <string name="plans_autorenew_subscriptions">Only auto-renewing annual subscriptions are available via this app.</string>
-  <string name="plans_can_not_upgrade_from_mobile">شما از طریق نرم‌افزار مبایل امکان ارتقا دادن ندارید.</string>
+  <string name="plans_can_not_upgrade_from_mobile">شما از طریق نرم‌افزار موبایل امکان ارتقا دادن را ندارید.</string>
   <string name="plans_no_upgrade_available">There is currently no upgrade available.</string>
   <string name="plans_limited_offer">Limited time offer</string>
-  <string name="plans_subscription_base_storage_full_title">Your Mail storage is full</string>
-  <string name="plans_subscription_base_storage_nearly_full_title">Your Mail storage is almost full</string>
-  <string name="plans_subscription_drive_storage_full_title">Your Drive storage is full</string>
-  <string name="plans_subscription_drive_storage_nearly_full_title">Your Drive storage is almost full</string>
-  <string name="plans_subscription_storage_get_more">Get more storage</string>
+  <string name="plans_subscription_base_storage_full_title">فضای ذخیره سازی ایمیل شما پر شده است</string>
+  <string name="plans_subscription_base_storage_nearly_full_title">فضای ذخیره‌سازی ایمیل شما تقریبا پر شده است</string>
+  <string name="plans_subscription_drive_storage_full_title">فضای ذخیره سازی درایو شما پر شده است</string>
+  <string name="plans_subscription_drive_storage_nearly_full_title">فضای ذخیره‌سازی درایو شما تقریبا پر شده است</string>
+  <string name="plans_subscription_storage_get_more">دریافت حافظه بیشتر</string>
   <string name="plans_subscription_storage_full_description">Upgrade your plan to continue to use your account without interruptions.</string>
   <!-- region all possible plan item types. this could be updated as per language requirements.-->
   <plurals name="item_storage" comment="please do not modify the text between #">
@@ -81,8 +81,8 @@
     <item quantity="other">#proton_addresses# آدرس ایمیل</item>
   </plurals>
   <plurals name="item_address_multiuser" comment="please do not modify the test between #">
-    <item quantity="one">#proton_addresses# address / user</item>
-    <item quantity="other">#proton_addresses# addresses / user</item>
+    <item quantity="one">#proton_addresses# آدرس/کاربر</item>
+    <item quantity="other">#proton_addresses# آدرس/کاربر</item>
   </plurals>
   <plurals name="item_address_current" comment="please do not modify the test between #">
     <item quantity="one">%d از #proton_addresses# آدرس</item>
@@ -124,7 +124,7 @@
   <string name="plan_id_vpnbasic_countries">۶۳ کشور</string>
   <string name="plan_id_vpnbasic_high_speed">سرعت بالا</string>
   <string name="plan_id_vpnplus_adblock">مسدودکننده آگهی (NetShield)</string>
-  <string name="plan_id_vpnplus_streaming">پشتیبانی از سرویس استریم</string>
+  <string name="plan_id_vpnplus_streaming">پشتیبانی از استریم کردن</string>
   <string name="plan_id_vpnplus_header">VPN Plus</string>
   <string name="plan_id_vpnplus_countries">۶۳ کشور</string>
   <string name="plan_id_vpnplus_highest_speed">بالاترین سرعت</string>
@@ -154,19 +154,19 @@
   <string name="p2p_bittorrent" comment="new_plans">P2P/BitTorrent</string>
   <string name="unlimited_logins_and_notes">ورودها و یادداشت‌های نامحدود</string>
   <string name="unlimited_devices">دستگاه های نامحدود</string>
-  <string name="integrated_2fa_authenticator">Integrated 2FA authenticator</string>
-  <string name="multiple_vaults">Multiple vaults</string>
-  <string name="unlimited_email_alias">Unlimited Hide My Email aliases</string>
-  <string name="custom_email_alias_domains">Custom domains for email aliases</string>
+  <string name="integrated_2fa_authenticator">احراز هویت دو عاملی یکپارچه</string>
+  <string name="multiple_vaults">چندین گاوصندوق</string>
+  <string name="unlimited_email_alias">پنهان سازی نامحدود نام مستعار</string>
+  <string name="custom_email_alias_domains">دامنه دلخواه برای نام مستعار ایمیل</string>
   <string name="multiple_forwarding_mailboxes">Multiple forwarding mailboxes</string>
   <string name="priority_support">اولویت پشتیبانی</string>
-  <string name="one_vault">1 vault</string>
+  <string name="one_vault">۱ گاوصندوق</string>
   <string name="ten_hide_my_email_aliases">۱۰ پنهان‌سازی نام‌های مستعار ایمیل</string>
   <!-- endregion -->
   <!-- region Plan entitlement tags -->
-  <string name="upgrade_storage_current_drive_storage">Drive storage: %d%% full</string>
-  <string name="upgrade_storage_current_mail_storage">Mail storage: %d%% full</string>
-  <string name="upgrade_storage_subtitle">Get more storage</string>
-  <string name="upgrade_storage_cta_button">Upgrade</string>
+  <string name="upgrade_storage_current_drive_storage">حافظه درایو: %d%% پر</string>
+  <string name="upgrade_storage_current_mail_storage">حافظه ایمیل : %d%% پر</string>
+  <string name="upgrade_storage_subtitle">دریافت حافظه بیشتر</string>
+  <string name="upgrade_storage_cta_button">ارتقا</string>
   <!-- endregion -->
 </resources>
diff --git a/plan/presentation/src/main/res/values-ja/strings.xml b/plan/presentation/src/main/res/values-ja/strings.xml
index fa164f95b..43fa79359 100644
--- a/plan/presentation/src/main/res/values-ja/strings.xml
+++ b/plan/presentation/src/main/res/values-ja/strings.xml
@@ -152,6 +152,6 @@
   <string name="upgrade_storage_current_drive_storage">Drive storage: %d%% full</string>
   <string name="upgrade_storage_current_mail_storage">Mail storage: %d%% full</string>
   <string name="upgrade_storage_subtitle">ストレージを増やす</string>
-  <string name="upgrade_storage_cta_button">Upgrade</string>
+  <string name="upgrade_storage_cta_button">アップグレード</string>
   <!-- endregion -->
 </resources>
diff --git a/plan/presentation/src/main/res/values-ko/strings.xml b/plan/presentation/src/main/res/values-ko/strings.xml
index 5d1459b77..661821ee1 100644
--- a/plan/presentation/src/main/res/values-ko/strings.xml
+++ b/plan/presentation/src/main/res/values-ko/strings.xml
@@ -93,7 +93,7 @@
     <item quantity="other">#proton_vpn#개 기기에서 고속 VPN</item>
   </plurals>
   <plurals name="item_connections_highspeed" comment="please do not modify the test between #">
-    <item quantity="other">#proton_vpn# 빠른 속도의 VPN 연결</item>
+    <item quantity="other"> 빠른 속도의 VPN 연결 #proton_vpn#대</item>
   </plurals>
   <plurals name="item_users" comment="please do not modify the test between #">
     <item quantity="other">#proton_users#명의 사용자</item>
diff --git a/plan/presentation/src/main/res/values-pt-rPT/strings.xml b/plan/presentation/src/main/res/values-pt-rPT/strings.xml
index 1f6cf5c4f..72fe3bbe5 100644
--- a/plan/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/plan/presentation/src/main/res/values-pt-rPT/strings.xml
@@ -167,6 +167,6 @@
   <string name="upgrade_storage_current_drive_storage">Drive storage: %d%% full</string>
   <string name="upgrade_storage_current_mail_storage">Mail storage: %d%% full</string>
   <string name="upgrade_storage_subtitle">Obter mais espaço de armazenamento</string>
-  <string name="upgrade_storage_cta_button">Upgrade</string>
+  <string name="upgrade_storage_cta_button">Alterar a subscrição</string>
   <!-- endregion -->
 </resources>
diff --git a/plan/presentation/src/main/res/values-ru/strings.xml b/plan/presentation/src/main/res/values-ru/strings.xml
index 44a72faaf..13077887e 100644
--- a/plan/presentation/src/main/res/values-ru/strings.xml
+++ b/plan/presentation/src/main/res/values-ru/strings.xml
@@ -194,9 +194,9 @@
   <string name="ten_hide_my_email_aliases">10 псевдонимов Hide My Email</string>
   <!-- endregion -->
   <!-- region Plan entitlement tags -->
-  <string name="upgrade_storage_current_drive_storage">Drive storage: %d%% full</string>
-  <string name="upgrade_storage_current_mail_storage">Mail storage: %d%% full</string>
+  <string name="upgrade_storage_current_drive_storage">Drive хранилище: %d%% заполнено</string>
+  <string name="upgrade_storage_current_mail_storage">Mail хранилище: %d%% заполнено</string>
   <string name="upgrade_storage_subtitle">Получите больше дискового пространства</string>
-  <string name="upgrade_storage_cta_button">Upgrade</string>
+  <string name="upgrade_storage_cta_button">Улучшить</string>
   <!-- endregion -->
 </resources>
diff --git a/plan/presentation/src/main/res/values-uk/strings.xml b/plan/presentation/src/main/res/values-uk/strings.xml
index d26090215..f4d9e9c38 100644
--- a/plan/presentation/src/main/res/values-uk/strings.xml
+++ b/plan/presentation/src/main/res/values-uk/strings.xml
@@ -194,9 +194,9 @@
   <string name="ten_hide_my_email_aliases">10 псевдонімів Hide-my-email</string>
   <!-- endregion -->
   <!-- region Plan entitlement tags -->
-  <string name="upgrade_storage_current_drive_storage">Drive storage: %d%% full</string>
-  <string name="upgrade_storage_current_mail_storage">Mail storage: %d%% full</string>
+  <string name="upgrade_storage_current_drive_storage">Сховище Drive: заповнене на %d%%</string>
+  <string name="upgrade_storage_current_mail_storage">Сховище Mail: заповнене на %d%%</string>
   <string name="upgrade_storage_subtitle">Збільшити сховище</string>
-  <string name="upgrade_storage_cta_button">Upgrade</string>
+  <string name="upgrade_storage_cta_button">Покращити</string>
   <!-- endregion -->
 </resources>
diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml
index 9b5d209c0..31434a5b9 100644
--- a/presentation/src/main/res/values-uk/strings.xml
+++ b/presentation/src/main/res/values-uk/strings.xml
@@ -27,7 +27,7 @@
   <string name="presentation_authenticate">Автентифікація</string>
   <string name="presentation_signin_to_continue">Увійдіть для продовження</string>
   <string name="presentation_alert_title">Попередження</string>
-  <string name="presentation_alert_ok">Гаразд</string>
+  <string name="presentation_alert_ok">OK</string>
   <string name="presentation_alert_enter">Ввести</string>
   <string name="presentation_alert_cancel">Скасувати</string>
   <string name="presentation_alert_continue">Продовжити</string>
diff --git a/user-settings/presentation/src/main/res/values-fa/strings.xml b/user-settings/presentation/src/main/res/values-fa/strings.xml
index a8a9ba207..4adc6372f 100644
--- a/user-settings/presentation/src/main/res/values-fa/strings.xml
+++ b/user-settings/presentation/src/main/res/values-fa/strings.xml
@@ -18,7 +18,7 @@
   -->
 <resources>
   <!-- recovery email settings -->
-  <string name="settings_recovery_email_header">رایانامه بازیابی</string>
+  <string name="settings_recovery_email_header">ایمیل بازیابی</string>
   <string name="settings_recovery_email_current">ایمیل بازیابی فعلی</string>
   <string name="settings_recovery_email_new">ایمیل بازیابی جدید</string>
   <string name="settings_recovery_email_confirm">تایید ایمیل بازیابی</string>
@@ -41,7 +41,7 @@
   <string name="settings_mailbox_password_hint_new">رمز عبور جدید صندوق پستی</string>
   <string name="settings_mailbox_password_hint_new_confirm">تایید گذرواژه جدید صندوق پیام</string>
   <string name="settings_change_password_error">خطایی در تغییر گذرواژه رخ داد.</string>
-  <string name="settings_recovery_email_success">Recovery email address updated</string>
+  <string name="settings_recovery_email_success">ایمیل بازیابی بروزرسانی شد</string>
   <string name="settings_password_management_success">گذرواژه به‌روز شد</string>
   <string name="settings_password_management_login_password_success">گذرواژه ورود بروزرسانی شد</string>
   <string name="settings_password_management_mailbox_password_success">گذرواژهٔ صندوق پیام بروزرسانی شد</string>
diff --git a/user-settings/presentation/src/main/res/values-it/strings.xml b/user-settings/presentation/src/main/res/values-it/strings.xml
index d133f94d5..616c79257 100644
--- a/user-settings/presentation/src/main/res/values-it/strings.xml
+++ b/user-settings/presentation/src/main/res/values-it/strings.xml
@@ -23,23 +23,23 @@
   <string name="settings_recovery_email_new">Nuovo indirizzo email di recupero</string>
   <string name="settings_recovery_email_confirm">Conferma il nuovo indirizzo email di recupero</string>
   <string name="settings_recovery_email_new_hint">Inserisci l\'indirizzo email</string>
-  <string name="settings_recovery_email_confirm_hint">Inserisci di nuovo l\'indirizzo email</string>
+  <string name="settings_recovery_email_confirm_hint">Inserisci nuovamente l\'indirizzo email</string>
   <string name="settings_save">Salva</string>
-  <string name="settings_password_required">Inserisci la tua password di accesso</string>
+  <string name="settings_password_required">Inserisci la password di accesso</string>
   <string name="settings_password_required_ok">OK</string>
   <string name="settings_not_set">Non impostato</string>
   <string name="settings_recovery_email_error_no_match">Le email di recupero non corrispondono</string>
   <string name="settings_validation_email">Indirizzo email non valido.</string>
   <string name="settings_general_error">Si è verificato un errore.</string>
   <!-- login and mailbox password settings -->
-  <string name="settings_password_management_change_login_password">Cambia la password</string>
+  <string name="settings_password_management_change_login_password">Cambia la password di accesso</string>
   <string name="settings_password_management_change_mailbox_password">Cambia la password della casella di posta</string>
   <string name="settings_password_management_header">Gestione delle password</string>
   <string name="settings_login_password_hint_current">Password di accesso attuale</string>
   <string name="settings_login_password_hint_new">Nuova password di accesso</string>
-  <string name="settings_login_password_hint_new_confirm">Conferma la nuova password di accesso</string>
+  <string name="settings_login_password_hint_new_confirm">Conferma la nuova password</string>
   <string name="settings_mailbox_password_hint_new">Nuova password della casella di posta</string>
-  <string name="settings_mailbox_password_hint_new_confirm">Conferma la nuova password della casella di posta</string>
+  <string name="settings_mailbox_password_hint_new_confirm">Conferma la nuova password</string>
   <string name="settings_change_password_error">Si è verificato un errore nel cambio della password.</string>
   <string name="settings_recovery_email_success">Indirizzo email di recupero aggiornato</string>
   <string name="settings_password_management_success">Password aggiornata</string>
@@ -48,6 +48,6 @@
   <!-- device/local settings -->
   <string name="device_settings_telemetry_title">Telemetria anonima</string>
   <string name="device_settings_telemetry_hint">Per migliorare i nostri servizi, a volte raccogliamo dati di utilizzo in forma anonima.</string>
-  <string name="device_settings_crashreport_title">Segnalazioni anonime sugli arresti anomali</string>
+  <string name="device_settings_crashreport_title">Segnalazioni anonime per gli arresti anomali</string>
   <string name="device_settings_crashreport_hint">Se l\'app si arresta in modo anomalo, verrà inviata una segnalazione ai nostri tecnici con i dettagli della causa. Useremo queste solamente al fine di migliorare l\'app.</string>
 </resources>
diff --git a/user-settings/presentation/src/main/res/values-uk/strings.xml b/user-settings/presentation/src/main/res/values-uk/strings.xml
index 2036d8e24..8eb4744f0 100644
--- a/user-settings/presentation/src/main/res/values-uk/strings.xml
+++ b/user-settings/presentation/src/main/res/values-uk/strings.xml
@@ -26,7 +26,7 @@
   <string name="settings_recovery_email_confirm_hint">Повторно введіть адресу е-пошти</string>
   <string name="settings_save">Зберегти</string>
   <string name="settings_password_required">Введіть свій пароль входу</string>
-  <string name="settings_password_required_ok">Гаразд</string>
+  <string name="settings_password_required_ok">OK</string>
   <string name="settings_not_set">Не встановлено</string>
   <string name="settings_recovery_email_error_no_match">Нові адреси е-пошти для відновлення не збігаються</string>
   <string name="settings_validation_email">Недійсна адреса е-пошти.</string>