diff --git a/.locale-state.metadata b/.locale-state.metadata
index fa6d65164d..d6b8f7bced 100644
--- a/.locale-state.metadata
+++ b/.locale-state.metadata
@@ -1,4 +1,4 @@
 {
   "project": "android-mail-new",
-  "locale": "83c60b95a8d5d5642f7009a4da6c964b49e2ecd7"
+  "locale": "72c66f66b77578a9c307033760b6e2501d4b565a"
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index b88e91e4e3..4b5837539d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -34,7 +34,7 @@
   <string name="mailbox_message_sending_offline">Sem ligação, a mensagem está na lista para ser enviada</string>
   <string name="mailbox_message_sending_success">Mensagem enviada</string>
   <string name="mailbox_message_sending_error">Erro no envio da mensagem</string>
-  <string name="mailbox_message_sending_error_address_disabled">Este endereço está desativado. Erro no envio .</string>
+  <string name="mailbox_message_sending_error_address_disabled">Este endereço está desativado. Erro no envio.</string>
   <string name="mailbox_message_sending_error_action">Ir para Rascunhos</string>
   <string name="mailbox_attachment_uploading_error">Erro a enviar o anexo</string>
   <string name="notification_switched_account">Mudou para a conta %s</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e609939661..3148d46ea1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -34,7 +34,7 @@
   <string name="mailbox_message_sending_offline">未連線，郵件佇列等候傳送</string>
   <string name="mailbox_message_sending_success">郵件已傳送</string>
   <string name="mailbox_message_sending_error">傳送郵件時發生錯誤</string>
-  <string name="mailbox_message_sending_error_address_disabled">This address is disabled, sending failed</string>
+  <string name="mailbox_message_sending_error_address_disabled">此位址已停用，傳送失敗</string>
   <string name="mailbox_message_sending_error_action">前往草稿資料夾</string>
   <string name="mailbox_attachment_uploading_error">上載附件出現錯誤</string>
   <string name="notification_switched_account">已切換至帳號 %s</string>
diff --git a/mail-common/presentation/src/main/res/values-cs/strings.xml b/mail-common/presentation/src/main/res/values-cs/strings.xml
index 6bec05f054..56e9ac61d5 100644
--- a/mail-common/presentation/src/main/res/values-cs/strings.xml
+++ b/mail-common/presentation/src/main/res/values-cs/strings.xml
@@ -57,7 +57,7 @@
   <string name="action_label_content_description">Označit jako…</string>
   <string name="action_move_content_description">Přesunout do…</string>
   <string name="action_trash_content_description">Koš</string>
-  <string name="action_delete_content_description">Odstranit</string>
+  <string name="action_delete_content_description">Smazat</string>
   <string name="action_archive_content_description">Archivovat</string>
   <string name="action_spam_content_description">Spam</string>
   <string name="action_view_in_light_mode_content_description">Zobrazit zprávu ve světlém režimu</string>
diff --git a/mail-common/presentation/src/main/res/values-hr/strings.xml b/mail-common/presentation/src/main/res/values-hr/strings.xml
index 87a94be065..54ec962c2e 100644
--- a/mail-common/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-common/presentation/src/main/res/values-hr/strings.xml
@@ -84,26 +84,26 @@
   <string name="auto_delete_banner_action_upgrade_learn_more">Saznajte više</string>
   <!-- message expiration -->
   <string name="expiration_expired">Isteklo</string>
-  <string name="expiration_days_arg">%dd</string>
-  <string name="expiration_hours_arg">%dh</string>
-  <string name="expiration_minutes_arg">%dm</string>
+  <string name="expiration_days_arg">%d d</string>
+  <string name="expiration_hours_arg">%d s</string>
+  <string name="expiration_minutes_arg">%d m</string>
   <string name="expiration_auto_delete_hour">This message will be automatically deleted in less than an hour</string>
   <string name="expiration_auto_delete_day">This message will be automatically deleted in less than a day</string>
   <string name="expiration_auto_delete_days" description="example: This message will be automatically deleted in 5 days">This message will be automatically deleted in %s</string>
   <plurals name="expiration_minutes_full_word">
-    <item quantity="one">%d minute</item>
-    <item quantity="few">%d minutes</item>
-    <item quantity="other">%d minutes</item>
+    <item quantity="one">%d minuta</item>
+    <item quantity="few">%d minute</item>
+    <item quantity="other">%d minuta</item>
   </plurals>
   <plurals name="expiration_hours_full_word">
-    <item quantity="one">%d hour</item>
-    <item quantity="few">%d hours</item>
-    <item quantity="other">%d hours</item>
+    <item quantity="one">%d sat</item>
+    <item quantity="few">%d sata</item>
+    <item quantity="other">%d sati</item>
   </plurals>
   <plurals name="expiration_days_full_word">
-    <item quantity="one">%d day</item>
-    <item quantity="few">%d days</item>
-    <item quantity="other">%d days</item>
+    <item quantity="one">%d dan</item>
+    <item quantity="few">%d dana</item>
+    <item quantity="other">%d dana</item>
   </plurals>
   <!-- notification channels -->
   <string name="attachment_download_notification_channel_name">Privitci</string>
diff --git a/mail-composer/presentation/src/main/res/values-cs/strings.xml b/mail-composer/presentation/src/main/res/values-cs/strings.xml
index 31e64b3b6e..4cbe466165 100644
--- a/mail-composer/presentation/src/main/res/values-cs/strings.xml
+++ b/mail-composer/presentation/src/main/res/values-cs/strings.xml
@@ -97,7 +97,7 @@
   <string name="set_message_password_button_hide">Skrýt heslo</string>
   <string name="set_message_password_button_apply">Použít heslo</string>
   <string name="set_message_password_button_save_changes">Uložit změny</string>
-  <string name="set_message_password_button_remove_password">Odstranit heslo</string>
+  <string name="set_message_password_button_remove_password">Odebrat heslo</string>
   <string name="respondInline">Odpovědět v řádku</string>
   <plurals name="composer_recipient_suggestion_contacts">
     <item quantity="one">%d člen</item>
diff --git a/mail-composer/presentation/src/main/res/values-hr/strings.xml b/mail-composer/presentation/src/main/res/values-hr/strings.xml
index dc2b634063..cd287ac374 100644
--- a/mail-composer/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-composer/presentation/src/main/res/values-hr/strings.xml
@@ -50,7 +50,7 @@
   <string name="composer_attachment_error_draft_loading">Unable to load the original draft message.</string>
   <string name="composer_attachment_error_saving_attachment">Unable to store the attachment. Please try again.</string>
   <string name="composer_warning_local_data_shown">The latest version of this draft failed to load. Any change will override its content.</string>
-  <string name="composer_button_add_password">Add password</string>
+  <string name="composer_button_add_password">Dodaj lozinku</string>
   <string name="composer_button_set_expiration">Postavi datum isteka</string>
   <string name="composer_expiration_time_bottom_sheet_title">Istek poruke</string>
   <string name="composer_expiration_time_bottom_sheet_done">Postavi</string>
@@ -82,7 +82,7 @@
   <string name="message_sending_error_dialog_button_dismiss">Zatvori</string>
   <string name="message_sending_error_dialog_text_error">Your email cannot be sent to the address entered due to the following reason:</string>
   <string name="message_sending_error_dialog_text_reason_no_trusted_keys">There are no Trusted Keys: %s</string>
-  <string name="message_sending_error_dialog_text_reason_address_disabled">Address does not exist: %s</string>
+  <string name="message_sending_error_dialog_text_reason_address_disabled">Adresa ne postoji: %s</string>
   <string name="set_message_password_title">Encrypt message</string>
   <string name="set_message_password_info_message">Postavite lozinku za šifriranje ove poruke za one koji nisu korisnici ProtonMaila.</string>
   <string name="set_message_password_info_link"><a href="https://proton.me/support/password-protected-emails">Learn more</a></string>
@@ -100,8 +100,8 @@
   <string name="set_message_password_button_remove_password">Ukloni lozinku</string>
   <string name="respondInline">Odgovori u ravnini s ostalim tekstom</string>
   <plurals name="composer_recipient_suggestion_contacts">
-    <item quantity="one">%d member</item>
-    <item quantity="few">%d members</item>
-    <item quantity="other">%d members</item>
+    <item quantity="one">%d član</item>
+    <item quantity="few">%d člana</item>
+    <item quantity="other">%d članova</item>
   </plurals>
 </resources>
diff --git a/mail-composer/presentation/src/main/res/values-pt-rPT/strings.xml b/mail-composer/presentation/src/main/res/values-pt-rPT/strings.xml
index e0fc6c5e2d..ccdca045a4 100644
--- a/mail-composer/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/mail-composer/presentation/src/main/res/values-pt-rPT/strings.xml
@@ -31,7 +31,7 @@
   <string name="change_sender_button_content_description">Alterar o remetente</string>
   <string name="composer_change_sender_paid_feature">É necessária uma subscrição paga do Proton Mail para alterar o endereço do remetente.</string>
   <string name="composer_error_change_sender_failed_getting_subscription">Não é possível alterar o remetente porque a subscrição do utilizador não pôde ser obtida. Tente novamente.</string>
-  <string name="composer_error_store_draft_sender_address">Erro ao guardar o endereço do remetente</string>
+  <string name="composer_error_store_draft_sender_address">O endereço do remetente não foi guardado</string>
   <string name="composer_error_store_draft_body">O corpo do rascunho do e-mail não foi guardado.</string>
   <string name="composer_error_duplicate_recipient">Um ou mais destinatários duplicados foram removidos.</string>
   <string name="composer_error_store_draft_subject">Erro ao guardar a linha de assunto</string>
@@ -41,15 +41,15 @@
   <string name="composer_add_attachments_bottom_sheet_import_from">Importar de…</string>
   <string name="composer_error_loading_parent_message">Não foi possível carregar as informações da mensagem.</string>
   <string name="composer_original_message_quote">Mensagem original</string>
-  <string name="composer_sender_quote">Em %s, %s &lt; %s&gt; escreveu:</string>
+  <string name="composer_sender_quote">A %s, %s &lt; %s&gt; escreveu:</string>
   <string name="composer_attachment_size_exceeded_dialog_confirm_button">OK</string>
   <string name="composer_attachment_size_exceeded_dialog_title">O limite de anexos foi atingido.</string>
   <string name="composer_attachment_size_exceeded_dialog_message">O limite de tamanho para anexos é de %1$s.</string>
-  <string name="composer_attachment_reencryption_failed_message">Erro na reencriptação do anexo. Por questões de segurança, todos os anexos foram removidos.</string>
+  <string name="composer_attachment_reencryption_failed_message">A reencriptação do anexo falhou. Por motivos de segurança, todos os anexos foram removidos.</string>
   <string name="composer_attachment_not_found">O anexo não foi encontrado.</string>
   <string name="composer_attachment_error_draft_loading">Não foi possível carregar a mensagem original do rascunho.</string>
   <string name="composer_attachment_error_saving_attachment">Não foi possível armazenar o anexo. Tente novamente.</string>
-  <string name="composer_warning_local_data_shown">A versão mais recente deste rascunho não conseguiu carregar. Qualquer alteração substituirá o seu conteúdo.</string>
+  <string name="composer_warning_local_data_shown">A versão mais recente deste rascunho falhou ao carregar. Qualquer alteração irá substituir o seu conteúdo.</string>
   <string name="composer_button_add_password">Adicionar uma palavra-passe</string>
   <string name="composer_button_set_expiration">Definir tempo de expiração</string>
   <string name="composer_expiration_time_bottom_sheet_title">Expiração da mensagem</string>
diff --git a/mail-contact/presentation/src/main/res/values-hr/strings.xml b/mail-contact/presentation/src/main/res/values-hr/strings.xml
index 8f78aa6f74..1e424ec407 100644
--- a/mail-contact/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-contact/presentation/src/main/res/values-hr/strings.xml
@@ -24,7 +24,7 @@
   <string name="no_contacts_description">Improve your email experience by creating a new contact or importing existing ones.</string>
   <string name="no_contact_groups_description">Improve your email experience by creating a new contact group.</string>
   <string name="add_contact">Dodaj kontakt</string>
-  <string name="add_contact_group">Add contact group</string>
+  <string name="add_contact_group">Dodaj grupu kontakta</string>
   <string name="add_contact_content_description">Dodaj kontakt</string>
   <string name="all_title">Sve</string>
   <string name="groups_title">Grupe</string>
@@ -71,7 +71,7 @@
   <string name="contact_form_update_success">Contact updated</string>
   <string name="save_contact_content_description">Spremi kontakt</string>
   <string name="contact_form_save">Spremi</string>
-  <string name="add_new">Add new</string>
+  <string name="add_new">Dodaj novo</string>
   <string name="email_section">E-pošta</string>
   <string name="phone_section">Broj telefona</string>
   <string name="address_section">Adresa</string>
@@ -101,9 +101,9 @@
   <string name="all_contacts_tab">Kontakti</string>
   <string name="contact_groups_tab">Grupe</string>
   <plurals name="contact_group_details_member_count">
-    <item quantity="one">%1$d member</item>
-    <item quantity="few">%1$d members</item>
-    <item quantity="other">%1$d members</item>
+    <item quantity="one">%1$d član</item>
+    <item quantity="few">%1$d člana</item>
+    <item quantity="other">%1$d članova</item>
   </plurals>
   <plurals name="contact_group_form_member_count">
     <item quantity="one">Member (%1$d)</item>
@@ -115,7 +115,7 @@
   <string name="contact_group_details_deletion_success">Kontaktna grupa je izbrisana</string>
   <string name="contact_group_details_deletion_error">Error deleting contact group</string>
   <string name="contact_group_delete_dialog_title">Remove %s group from Contacts?</string>
-  <string name="contact_group_delete_dialog_message">The group will be disbanded, but the assigned contacts will remain unaffected.</string>
+  <string name="contact_group_delete_dialog_message">Grupa će biti raspuštena, ali dodijeljeni kontakti ostat će nepromijenjeni.</string>
   <string name="contact_group_delete_dialog_confirm">Ukloni</string>
   <string name="contact_group_delete_dialog_dismiss">Keep it</string>
   <string name="contact_group_delete_button_text">Izbriši grupu</string>
@@ -136,15 +136,15 @@
   <string name="members_loading_error">Error loading members, please try again later</string>
   <string name="members_done">Gotovo</string>
   <string name="add_members_error">Error adding members, please try again later</string>
-  <string name="manage_members_title">Manage members</string>
+  <string name="manage_members_title">Upravljanje članovima</string>
   <string name="search_contact">Search for contact</string>
   <string name="search_contacts_description">Pretraži kontakte</string>
   <string name="member_update_error">Error updating member, please try again later</string>
   <string name="contact_group_color">Contact group color</string>
   <plurals name="contact_search_contact_group_counter">
-    <item quantity="one">%d member</item>
-    <item quantity="few">%d members</item>
-    <item quantity="other">%d members</item>
+    <item quantity="one">%d član</item>
+    <item quantity="few">%d člana</item>
+    <item quantity="other">%d članova</item>
   </plurals>
   <string name="contact_search_placeholder">Search for contact or group</string>
   <string name="contact_search_content_description">Search for contact or group</string>
diff --git a/mail-contact/presentation/src/main/res/values-pt-rPT/strings.xml b/mail-contact/presentation/src/main/res/values-pt-rPT/strings.xml
index 7d203e981a..6dd1274852 100644
--- a/mail-contact/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/mail-contact/presentation/src/main/res/values-pt-rPT/strings.xml
@@ -21,10 +21,10 @@
   <string name="contact_list_loading_error">Erro ao carregar os contactos. Tente outra vez mais tarde.</string>
   <string name="no_contacts">Não foram encontrados contactos.</string>
   <string name="no_contact_groups">Nenhum grupo de contactos foi encontrado.</string>
-  <string name="no_contacts_description">Melhore a sua experiência de email criando um novo contacto ou importando os existentes.</string>
+  <string name="no_contacts_description">Melhore a sua experiência de email criando um contacto ou importando os existentes.</string>
   <string name="no_contact_groups_description">Melhore a sua experiência de email criando um grupo de contactos.</string>
   <string name="add_contact">Adicionar contacto</string>
-  <string name="add_contact_group">Adicionar un grupo de contactos</string>
+  <string name="add_contact_group">Adicionar grupo de contactos</string>
   <string name="add_contact_content_description">Adicionar contacto</string>
   <string name="all_title">Todos</string>
   <string name="groups_title">Grupos</string>
diff --git a/mail-detail/presentation/src/main/res/values-hr/strings.xml b/mail-detail/presentation/src/main/res/values-hr/strings.xml
index 7ab04f689a..0f5d159a76 100644
--- a/mail-detail/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-detail/presentation/src/main/res/values-hr/strings.xml
@@ -22,9 +22,9 @@
   <string name="detail_error_loading_messages">Neuspješno učitavanje poruka</string>
   <string name="error_mark_unread_failed">Mark unread failed. Please try again.</string>
   <plurals name="message_count_label_text">
-    <item quantity="one">%d message</item>
-    <item quantity="few">%d messages</item>
-    <item quantity="other">%d messages</item>
+    <item quantity="one">%d poruka</item>
+    <item quantity="few">%d poruke</item>
+    <item quantity="other">%d poruka</item>
   </plurals>
   <string name="quick_reply_button_content_description">Odgovori</string>
   <string name="quick_reply_all_button_content_description">Odgovori svima</string>
@@ -36,9 +36,9 @@
   <string name="bcc">Skrivena kopija:</string>
   <string name="date">Datum:</string>
   <plurals name="attachment">
-    <item quantity="one">%d Attachment</item>
-    <item quantity="few">%d Attachments</item>
-    <item quantity="other">%d Attachments</item>
+    <item quantity="one">%d privitak</item>
+    <item quantity="few">%d privitka</item>
+    <item quantity="other">%d privitaka</item>
   </plurals>
   <string name="hide_details">Sakrij detalje</string>
   <string name="undisclosed_recipients">Nedefinirani primatelji</string>
@@ -60,7 +60,7 @@
   <string name="error_move_conversation_failed">Moving conversation failed. Please retry.</string>
   <string name="error_loading_message">Nešto je pošlo po zlu. Pokušajte ponovno.</string>
   <string name="error_offline_loading_message">You are offline. An internet connection is required to display the content of this message.</string>
-  <string name="error_get_attachment_failed">Failed to get attachment.</string>
+  <string name="error_get_attachment_failed">Dohvaćanje privitka nije uspjelo.</string>
   <string name="error_attachment_download_in_progress">Current download must complete before starting a new one.</string>
   <string name="error_get_attachment_not_enough_memory">Failed to get attachment due to insufficient memory</string>
   <string name="reload">Ponovno učitaj</string>
@@ -116,7 +116,7 @@
   <string name="non_trashed_messages_banner">Ovaj razgovor sadrži poruke koje nisu u otpadu.</string>
   <string name="show">Prikaži</string>
   <string name="hide">Sakrij</string>
-  <string name="tooltip_customize_toolbar_title">Customize toolbar</string>
+  <string name="tooltip_customize_toolbar_title">Prilagodi alatnu traku</string>
   <string name="tooltip_customize_toolbar_message">You can now choose and rearrange the actions in this toolbar.</string>
   <string name="tooltip_customize_toolbar_cta">Prilagodi</string>
 </resources>
diff --git a/mail-label/presentation/src/main/res/values-ca/strings.xml b/mail-label/presentation/src/main/res/values-ca/strings.xml
index fbbb4a2074..f3ab1cdcbc 100644
--- a/mail-label/presentation/src/main/res/values-ca/strings.xml
+++ b/mail-label/presentation/src/main/res/values-ca/strings.xml
@@ -28,7 +28,7 @@
   <string name="label_title_all_mail">Tot el correu</string>
   <string name="label_title_all_drafts">Tots els esborranys</string>
   <string name="label_title_all_sent">Tots els enviats</string>
-  <string name="label_title_all_scheduled">Tot el que s\'ha programat</string>
+  <string name="label_title_all_scheduled">Totes les planificacions</string>
   <string name="label_title_snoozed">Ajornat</string>
   <string name="label_title_folders">Carpetes</string>
   <string name="label_title_parent_folder">Carpeta principal</string>
diff --git a/mail-label/presentation/src/main/res/values-hr/strings.xml b/mail-label/presentation/src/main/res/values-hr/strings.xml
index 8d0a0f4356..d8858d8e41 100644
--- a/mail-label/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-label/presentation/src/main/res/values-hr/strings.xml
@@ -26,7 +26,7 @@
   <string name="label_title_trash">Otpad</string>
   <string name="label_title_outbox">Odlazni spremnik</string>
   <string name="label_title_all_mail">Sva pošta</string>
-  <string name="label_title_all_drafts">All drafts</string>
+  <string name="label_title_all_drafts">Sve skice</string>
   <string name="label_title_all_sent">Sve poslane poruke</string>
   <string name="label_title_all_scheduled">All scheduled</string>
   <string name="label_title_snoozed">Snoozed</string>
@@ -38,7 +38,7 @@
   <string name="label_title_label_list">Popis oznaka</string>
   <string name="label_title_folder_list">Popis mapa</string>
   <string name="label_list_no_labels_found">No labels found.</string>
-  <string name="label_list_create_label_placeholder_description">Create a label to enhance your email experience.</string>
+  <string name="label_list_create_label_placeholder_description">Stvorite oznaku kako biste poboljšali svoje iskustvo s e-poštom.</string>
   <string name="create_label_content_description">Stvori oznaku</string>
   <string name="label_form_create_label">Stvori oznaku</string>
   <string name="folder_form_create_folder">Stvori mapu</string>
@@ -66,7 +66,7 @@
   <string name="label_list_item_content_description">Label list item</string>
   <string name="folder_list_item_content_description">Folder list item</string>
   <string name="folder_list_no_folders_found">No folders found.</string>
-  <string name="folder_list_create_folder_placeholder_description">Create a folder to enhance your email experience.</string>
+  <string name="folder_list_create_folder_placeholder_description">Stvorite mapu kako biste poboljšali svoje iskustvo s e-poštom.</string>
   <string name="create_folder_content_description">Dodaj mapu</string>
   <string name="folder_settings_content_description">Folder settings</string>
   <string name="folder_settings_title">Postavke</string>
diff --git a/mail-label/presentation/src/main/res/values-tr/strings.xml b/mail-label/presentation/src/main/res/values-tr/strings.xml
index 7ebbe826cb..188a08a2ac 100644
--- a/mail-label/presentation/src/main/res/values-tr/strings.xml
+++ b/mail-label/presentation/src/main/res/values-tr/strings.xml
@@ -28,7 +28,7 @@
   <string name="label_title_all_mail">Tüm e-postalar</string>
   <string name="label_title_all_drafts">Tüm taslaklar</string>
   <string name="label_title_all_sent">Tüm gönderilmişler</string>
-  <string name="label_title_all_scheduled">All scheduled</string>
+  <string name="label_title_all_scheduled">Tüm zamanlanmışlar</string>
   <string name="label_title_snoozed">Ertelenmişler</string>
   <string name="label_title_folders">Klasörler</string>
   <string name="label_title_parent_folder">Üst klasör</string>
@@ -51,8 +51,8 @@
   <string name="add_a_label_name_hint">Etiket adını yazın</string>
   <string name="add_a_folder_name_hint">Bir klasör adı yazın</string>
   <plurals name="input_field_max_characters_count">
-    <item quantity="one">%1d / %2d character</item>
-    <item quantity="other">%1d / %2d characters</item>
+    <item quantity="one">%1d / %2d karakter</item>
+    <item quantity="other">%1d / %2d karakter</item>
   </plurals>
   <string name="color_picker_title">Renk</string>
   <string name="save_label_error">Etiket kaydedilirken sorun çıktı. Lütfen bir süre sonra yeniden deneyin</string>
diff --git a/mail-label/presentation/src/main/res/values-zh-rTW/strings.xml b/mail-label/presentation/src/main/res/values-zh-rTW/strings.xml
index 19e1c3b167..46dfc83c5b 100644
--- a/mail-label/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/mail-label/presentation/src/main/res/values-zh-rTW/strings.xml
@@ -28,7 +28,7 @@
   <string name="label_title_all_mail">所有郵件</string>
   <string name="label_title_all_drafts">所有草稿</string>
   <string name="label_title_all_sent">全部寄件備份</string>
-  <string name="label_title_all_scheduled">All scheduled</string>
+  <string name="label_title_all_scheduled">全部排程</string>
   <string name="label_title_snoozed">已延後</string>
   <string name="label_title_folders">資料夾</string>
   <string name="label_title_parent_folder">上層資料夾</string>
@@ -51,7 +51,7 @@
   <string name="add_a_label_name_hint">新增標籤名稱</string>
   <string name="add_a_folder_name_hint">新增一個資料夾名稱</string>
   <plurals name="input_field_max_characters_count">
-    <item quantity="other">%1d / %2d characters</item>
+    <item quantity="other">%1d/%2d 個字元</item>
   </plurals>
   <string name="color_picker_title">顏色</string>
   <string name="save_label_error">儲存存標籤時發生錯誤，請稍後再試。</string>
diff --git a/mail-mailbox/presentation/src/main/res/values-cs/strings.xml b/mail-mailbox/presentation/src/main/res/values-cs/strings.xml
index f57e422440..afa8a7ec3e 100644
--- a/mail-mailbox/presentation/src/main/res/values-cs/strings.xml
+++ b/mail-mailbox/presentation/src/main/res/values-cs/strings.xml
@@ -22,7 +22,7 @@
   <string name="mailbox_toolbar_menu_button_content_description">Nabídka</string>
   <string name="mailbox_toolbar_search_button_content_description">Vyhledat</string>
   <string name="mailbox_toolbar_exit_search_mode_content_description">Ukončit režim vyhledávání</string>
-  <string name="mailbox_toolbar_searchview_clear_search_query_content_description">Vymazat vyhledávací dotaz</string>
+  <string name="mailbox_toolbar_searchview_clear_search_query_content_description">Vyčistit vyhledávací dotaz</string>
   <string name="mailbox_toolbar_searchview_query_text_field_content_description">Zadejte vyhledávací dotaz</string>
   <plurals name="mailbox_toolbar_selected_count">
     <item quantity="one">Vybráno: %d</item>
diff --git a/mail-mailbox/presentation/src/main/res/values-hr/strings.xml b/mail-mailbox/presentation/src/main/res/values-hr/strings.xml
index ca549b6b58..1d361912c7 100644
--- a/mail-mailbox/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-mailbox/presentation/src/main/res/values-hr/strings.xml
@@ -30,9 +30,9 @@
     <item quantity="other">%d Selected</item>
   </plurals>
   <plurals name="filter_unread_button_text">
-    <item quantity="one">%s unread</item>
-    <item quantity="few">%s unread</item>
-    <item quantity="other">%s unread</item>
+    <item quantity="one">%s nepročitana</item>
+    <item quantity="few">%s nepročitane</item>
+    <item quantity="other">%s nepročitanih</item>
   </plurals>
   <string name="mailbox_default_recipient">(Nema primatelja)</string>
   <string name="mailbox_default_sender">(Nema pošiljatelja)</string>
@@ -47,29 +47,29 @@
   <string name="mailbox_is_empty_spam_description">Vaša mapa neželjene pošte je prazna</string>
   <string name="mailbox_is_empty_trash_description">Otpad je prazan.</string>
   <plurals name="mailbox_action_trash_conversation">
-    <item quantity="one">Conversation moved to Trash</item>
-    <item quantity="few">%d conversations moved to Trash</item>
-    <item quantity="other">%d conversations moved to Trash</item>
+    <item quantity="one">Razgovor premješten u otpad</item>
+    <item quantity="few">%d razgovora premještena u otpad</item>
+    <item quantity="other">%d razgovora premještena u otpad</item>
   </plurals>
   <plurals name="mailbox_action_trash_message">
-    <item quantity="one">Message moved to Trash</item>
-    <item quantity="few">%d messages moved to Trash</item>
-    <item quantity="other">%d messages moved to Trash</item>
+    <item quantity="one">Poruka premještena u otpad</item>
+    <item quantity="few">%d poruke premještene u otpad</item>
+    <item quantity="other">%d poruka premješteno u otpad</item>
   </plurals>
   <plurals name="mailbox_action_delete_conversation_dialog_title">
-    <item quantity="one">Delete conversation</item>
-    <item quantity="few">Delete %d conversations</item>
-    <item quantity="other">Delete %d conversations</item>
+    <item quantity="one">Izbriši razgovor</item>
+    <item quantity="few">Izbriši %d razgovora</item>
+    <item quantity="other">Izbriši %d razgovora</item>
   </plurals>
   <plurals name="mailbox_action_delete_message_dialog_title">
-    <item quantity="one">Delete message</item>
-    <item quantity="few">Delete %d messages</item>
-    <item quantity="other">Delete %d messages</item>
+    <item quantity="one">Izbriši poruku</item>
+    <item quantity="few">Izbriši %d poruke</item>
+    <item quantity="other">Izbriši %d poruka</item>
   </plurals>
   <plurals name="mailbox_action_delete_conversation_dialog_message">
-    <item quantity="one">Are you sure you want to permanently delete this conversation?</item>
-    <item quantity="few">Are you sure you want to permanently delete these conversations?</item>
-    <item quantity="other">Are you sure you want to permanently delete these conversations?</item>
+    <item quantity="one">Jeste li sigurni da želite trajno izbrisati ovaj razgovor?</item>
+    <item quantity="few">Jeste li sigurni da želite trajno izbrisati ove razgovore?</item>
+    <item quantity="other">Jeste li sigurni da želite trajno izbrisati ove razgovore?</item>
   </plurals>
   <plurals name="mailbox_action_delete_message_dialog_message">
     <item quantity="one">Are you sure you want to permanently delete this message?</item>
@@ -77,14 +77,14 @@
     <item quantity="other">Are you sure you want to permanently delete these messages?</item>
   </plurals>
   <plurals name="mailbox_action_delete_message">
-    <item quantity="one">Message permanently deleted</item>
-    <item quantity="few">%d messages permanently deleted</item>
-    <item quantity="other">%d messages permanently deleted</item>
+    <item quantity="one">Poruka je trajno izbrisana</item>
+    <item quantity="few">%d poruke trajno su izbrisane</item>
+    <item quantity="other">%d poruka trajno je izbrisano</item>
   </plurals>
   <plurals name="mailbox_action_delete_conversation">
-    <item quantity="one">Conversation permanently deleted</item>
-    <item quantity="few">%d conversations permanently deleted</item>
-    <item quantity="other">%d conversations permanently deleted</item>
+    <item quantity="one">Razgovor je trajno izbrisan</item>
+    <item quantity="few">%d razgovora trajno su izbrisana</item>
+    <item quantity="other">%d razgovora trajno je izbrisano</item>
   </plurals>
   <string name="mailbox_include_all_desc">Can\'t find what you\'re looking for?</string>
   <string name="mailbox_include_all_button">Include Spam/Trash</string>
diff --git a/mail-mailbox/presentation/src/main/res/values-tr/strings.xml b/mail-mailbox/presentation/src/main/res/values-tr/strings.xml
index 0364923fa0..d9f0923395 100644
--- a/mail-mailbox/presentation/src/main/res/values-tr/strings.xml
+++ b/mail-mailbox/presentation/src/main/res/values-tr/strings.xml
@@ -76,8 +76,8 @@
     <item quantity="one">Yazışma kalıcı olarak silindi</item>
     <item quantity="other">%d yazışma kalıcı olarak silindi</item>
   </plurals>
-  <string name="mailbox_include_all_desc">Can\'t find what you\'re looking for?</string>
-  <string name="mailbox_include_all_button">Include Spam/Trash</string>
+  <string name="mailbox_include_all_desc">Aradığınızı bulamadınız mı?</string>
+  <string name="mailbox_include_all_button">İstenmeyen/Çöp katılsın</string>
   <string name="mailbox_action_label_messages_failed">Etiket işlemi yapılamadı</string>
   <string name="mailbox_action_label_messages_failed_retrieving_labels">Etiketler alınamadı</string>
   <string name="mailbox_action_failed_retrieving_colors">Renk ayarları alınamadı</string>
diff --git a/mail-mailbox/presentation/src/main/res/values-zh-rTW/strings.xml b/mail-mailbox/presentation/src/main/res/values-zh-rTW/strings.xml
index 9c545cdce0..f3eedc0e87 100644
--- a/mail-mailbox/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/mail-mailbox/presentation/src/main/res/values-zh-rTW/strings.xml
@@ -66,8 +66,8 @@
   <plurals name="mailbox_action_delete_conversation">
     <item quantity="other">%d 則往來對話永久刪除</item>
   </plurals>
-  <string name="mailbox_include_all_desc">Can\'t find what you\'re looking for?</string>
-  <string name="mailbox_include_all_button">Include Spam/Trash</string>
+  <string name="mailbox_include_all_desc">找不到您要找的內容嗎？</string>
+  <string name="mailbox_include_all_button">包含垃圾郵件/垃圾桶</string>
   <string name="mailbox_action_label_messages_failed">無法進行標籤操作</string>
   <string name="mailbox_action_label_messages_failed_retrieving_labels">無法取得標籤</string>
   <string name="mailbox_action_failed_retrieving_colors">無法取得顏色設定值</string>
diff --git a/mail-message/presentation/src/main/res/values-hr/strings.xml b/mail-message/presentation/src/main/res/values-hr/strings.xml
index 04ef6af9dc..feb5aa2e30 100644
--- a/mail-message/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-message/presentation/src/main/res/values-hr/strings.xml
@@ -18,13 +18,13 @@
   -->
 <resources>
   <plurals name="attachment_count_label">
-    <item quantity="one">%d file</item>
-    <item quantity="few">%d files</item>
-    <item quantity="other">%d files</item>
+    <item quantity="one">%d datoteka</item>
+    <item quantity="few">%d datoteke</item>
+    <item quantity="other">%d datoteka</item>
   </plurals>
   <string name="attachment_show_more_label">+%1$d više</string>
   <string name="attachment_permission_dialog_title">Permission required</string>
-  <string name="attachment_permission_dialog_message">Proton Mail needs permission to access your storage to download the attachment.</string>
+  <string name="attachment_permission_dialog_message">Proton Mail treba dopuštenje za pristup vašoj pohrani za učitavanje privitka.</string>
   <string name="attachment_permission_dialog_dismiss_button">U redu</string>
   <string name="attachment_permission_dialog_action_button">Postavke</string>
   <string name="attachment_type_description">%1$s datoteka</string>
@@ -65,7 +65,7 @@
   <string name="contact_actions_view_contact_details_description">View details of the contact</string>
   <!-- Device Contacts permission dialog -->
   <string name="device_contacts_permission_dialog_title">Permission required</string>
-  <string name="device_contacts_permission_dialog_message">Proton Mail needs permission to read your contacts to suggest recipients.</string>
+  <string name="device_contacts_permission_dialog_message">Proton Mail treba dopuštenje za čitanje vaših kontakata za predlaganje primatelja.</string>
   <string name="device_contacts_permission_dialog_dismiss_button">OK</string>
   <string name="device_contacts_permission_dialog_action_button">Request permission</string>
   <string name="device_contacts_permission_dialog_action_button_deny">Odbij</string>
diff --git a/mail-notifications/src/main/res/values-ja/strings.xml b/mail-notifications/src/main/res/values-ja/strings.xml
index a35b5f8551..4a8742a081 100644
--- a/mail-notifications/src/main/res/values-ja/strings.xml
+++ b/mail-notifications/src/main/res/values-ja/strings.xml
@@ -29,5 +29,5 @@
   <string name="notification_permission_dialog_post_send_title">更新を続けますか？</string>
   <string name="notification_permission_dialog_post_send_message">通知をオンにして、メールにいつ返信がきたかを確認します。</string>
   <string name="notification_permission_dialog_button_enable">プッシュ通知を有効にする</string>
-  <string name="notification_permission_dialog_button_dismiss">中止</string>
+  <string name="notification_permission_dialog_button_dismiss">却下</string>
 </resources>
diff --git a/mail-onboarding/presentation/src/main/res/values-hr/strings.xml b/mail-onboarding/presentation/src/main/res/values-hr/strings.xml
index e26b4d34d8..4091b09cad 100644
--- a/mail-onboarding/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-onboarding/presentation/src/main/res/values-hr/strings.xml
@@ -19,7 +19,7 @@
 <resources>
   <!--  Onboarding 1  -->
   <string name="onboarding_privacy_for_all_headline">Privatnost za sve</string>
-  <string name="onboarding_privacy_for_all_description">Invite others to Proton Mail so you can all benefit from end-to-end encryption.</string>
+  <string name="onboarding_privacy_for_all_description">Pozovite druge u Proton Mail kako biste svi imali koristi od end-to-end šifriranja.</string>
   <!--  Onboarding 2  -->
   <string name="onboarding_easily_up_to_date_headline">Lako ažurirano</string>
   <string name="onboarding_easily_up_to_date_description">Breeze through threaded messages in conversation mode.</string>
diff --git a/mail-upselling/presentation/src/main/res/values-ca/strings.xml b/mail-upselling/presentation/src/main/res/values-ca/strings.xml
index 8dc1ba8582..618fe88c1c 100644
--- a/mail-upselling/presentation/src/main/res/values-ca/strings.xml
+++ b/mail-upselling/presentation/src/main/res/values-ca/strings.xml
@@ -107,7 +107,7 @@
   <string name="upselling_auto_renew_text_promo_short">Oferta de benvinguda. Es renova automàticament a %s %s%s.</string>
   <string name="upselling_auto_renew_text_standard">Es renova automàticament per %s%s%s tret que es cancel·li.</string>
   <string name="upselling_social_proof_reviews">MÉS DE 3.500 RESENYES</string>
-  <string name="upselling_description_social_proof">Estimats per més de <b>1 milió d\'abonats de pagament</b>.</string>
+  <string name="upselling_description_social_proof">Adorat per més de <b>1 milió de subscriptors de pagament</b>.</string>
   <string name="upselling_description_social_proof_second">Milloreu la productivitat avui.</string>
   <string name="upselling_discount_tag">ESTALVIEU EL %s%%</string>
   <string name="upselling_month">/mes</string>
diff --git a/mail-upselling/presentation/src/main/res/values-cs/strings.xml b/mail-upselling/presentation/src/main/res/values-cs/strings.xml
index 148c100002..4a2c3688c8 100644
--- a/mail-upselling/presentation/src/main/res/values-cs/strings.xml
+++ b/mail-upselling/presentation/src/main/res/values-cs/strings.xml
@@ -123,7 +123,7 @@
   <!-- Errors -->
   <string name="upselling_unable_retrieve_options">Nepodařilo se načíst možnosti navýšení.</string>
   <string name="upselling_snackbar_error_no_user_id">Došlo k chybě.</string>
-  <string name="upselling_snackbar_error_no_subscriptions">Nepodařilo se načíst předplatné.</string>
+  <string name="upselling_snackbar_error_no_subscriptions">Nepodařilo se stáhnout předplatné.</string>
   <!-- Snackbar texts -->
   <string name="upselling_snackbar_upgrade_in_progress">Probíhá navýšení předplatného…</string>
   <string name="upselling_snackbar_upgrade_error_generic">Při navýšení vašeho předplatného došlo k chybě.</string>
diff --git a/mail-upselling/presentation/src/main/res/values-hr/strings.xml b/mail-upselling/presentation/src/main/res/values-hr/strings.xml
index f98af2ff96..0f42135e47 100644
--- a/mail-upselling/presentation/src/main/res/values-hr/strings.xml
+++ b/mail-upselling/presentation/src/main/res/values-hr/strings.xml
@@ -82,12 +82,12 @@
   <string name="upselling_onboarding_unlimited_feature_drive">Encrypted cloud storage for photos and documents</string>
   <string name="upselling_onboarding_unlimited_feature_sentinel">Advanced account protection</string>
   <!-- NPS feedback-->
-  <string name="nps_feedback_title">Feedback</string>
+  <string name="nps_feedback_title">Povratne informacije</string>
   <string name="nps_feedback_headline">How likely are you to recommend Proton Mail to a friend or colleague?</string>
   <string name="nps_cta">Share anonymously</string>
   <string name="nps_label_left">0 is very unlikely</string>
   <string name="nps_label_right">10 is very likely</string>
-  <string name="nps_optional">Optional</string>
+  <string name="nps_optional">Neobavezno</string>
   <string name="nps_why_description">Please let us know why you gave that rating</string>
   <string name="nps_success">Thanks for your feedback! It helps us make Proton Mail even better ❤️</string>
   <!-- Comparison Table -->
@@ -115,22 +115,22 @@
   <string name="upselling_get_button">Nabavite %s</string>
   <string name="upselling_get_button_promotional">Get 1 month for %s %s</string>
   <plurals name="upselling_month">
-    <item quantity="one">%d month</item>
-    <item quantity="few">%d months</item>
-    <item quantity="other">%d months</item>
+    <item quantity="one">%d mjesec</item>
+    <item quantity="few">%d mjeseca</item>
+    <item quantity="other">%d mjeseci</item>
   </plurals>
   <!-- Errors -->
   <string name="upselling_unable_retrieve_options">Unable to retrieve upgrade options.</string>
   <string name="upselling_snackbar_error_no_user_id">Došlo je do pogreške.</string>
-  <string name="upselling_snackbar_error_no_subscriptions">Unable to fetch subscriptions.</string>
+  <string name="upselling_snackbar_error_no_subscriptions">Nije moguće dohvatiti pretplate.</string>
   <!-- Snackbar texts -->
   <string name="upselling_snackbar_upgrade_in_progress">Subscription upgrade in progress…</string>
-  <string name="upselling_snackbar_upgrade_error_generic">An error occurred while upgrading your subscription.</string>
-  <string name="upselling_snackbar_upgrade_error_recoverable">An error occurred. Please try again.</string>
+  <string name="upselling_snackbar_upgrade_error_generic">Došlo je do pogreške prilikom nadogradnje vaše pretplate.</string>
+  <string name="upselling_snackbar_upgrade_error_recoverable">Dogodila se greška. Pokušajte ponovno.</string>
   <!-- Upselling: Onboarding -->
   <string name="upselling_onboarding_title">Choose a plan</string>
   <string name="upselling_onboarding_switcher_monthly">Mjesečno</string>
-  <string name="upselling_onboarding_switcher_annual">Annual</string>
+  <string name="upselling_onboarding_switcher_annual">Godišnje</string>
   <string name="upselling_onboarding_best_value">Best value</string>
   <string name="upselling_onboarding_month">/mjesec</string>
   <string name="upselling_onboarding_year">/godina</string>
@@ -165,6 +165,6 @@
   <string name="post_subscription_proton_vpn_message">The best VPN for speed and security.</string>
   <string name="post_subscription_proton_pass">Proton Pass</string>
   <string name="post_subscription_proton_pass_message">Secure password storage and easy sign-in to your accounts.</string>
-  <string name="post_subscription_button_installed">Installed</string>
-  <string name="post_subscription_button_get_the_app">Get the app</string>
+  <string name="post_subscription_button_installed">Instalirano</string>
+  <string name="post_subscription_button_get_the_app">Preuzmite aplikaciju</string>
 </resources>
diff --git a/mail-upselling/presentation/src/main/res/values-ja/strings.xml b/mail-upselling/presentation/src/main/res/values-ja/strings.xml
index 4a49eb1b1d..ce0b9b7c88 100644
--- a/mail-upselling/presentation/src/main/res/values-ja/strings.xml
+++ b/mail-upselling/presentation/src/main/res/values-ja/strings.xml
@@ -93,7 +93,7 @@
   <!-- Comparison Table -->
   <string name="upselling_comparison_table_storage">容量</string>
   <string name="upselling_comparison_table_email_addresses">メールアドレス</string>
-  <string name="upselling_comparison_table_custom_email_domain">独自メールドメイン</string>
+  <string name="upselling_comparison_table_custom_email_domain">カスタムメールドメイン</string>
   <string name="upselling_comparison_table_desktop_app">デスクトップアプリへアクセス</string>
   <string name="upselling_comparison_table_unlimited_folders_labels">無制限のフォルダとラベル</string>
   <string name="upselling_comparison_table_priority_support">優先的なカスタマーサポート</string>
diff --git a/mail-upselling/presentation/src/main/res/values-pt-rPT/strings.xml b/mail-upselling/presentation/src/main/res/values-pt-rPT/strings.xml
index def0983941..6487956ca7 100644
--- a/mail-upselling/presentation/src/main/res/values-pt-rPT/strings.xml
+++ b/mail-upselling/presentation/src/main/res/values-pt-rPT/strings.xml
@@ -21,10 +21,10 @@
   <string name="upselling_button_item_content_description">Botão Atualizar</string>
   <string name="upselling_close_button_content_description">Botão fechar</string>
   <!-- Upselling: Mailbox -->
-  <string name="upselling_mailbox_plus_description_override">Para desbloquear mais funcionalidades de armazenamento e premium</string>
+  <string name="upselling_mailbox_plus_description_override">Para desbloquear mais armazenamento e funcionalidades premium</string>
   <string name="upselling_mailbox_plus_title">Atualize para Mail Plus</string>
   <!-- Upselling: Mailbox Promo -->
-  <string name="upselling_mailbox_plus_promo_description_override">Oferta por tempo limitado. Cancele quando quiser.</string>
+  <string name="upselling_mailbox_plus_promo_description_override">Oferta por tempo limitado. Cancele a qualquer momento.</string>
   <string name="upselling_mailbox_plus_promo_title">Experimente o Mail Plus por %s</string>
   <!-- Upselling: Contact Groups -->
   <string name="upselling_contact_groups_plus_description_override">Envie e-mails facilmente para um grupo e beneficie de outras funcionalidades premium com Mail Plus.</string>
@@ -134,8 +134,8 @@
   <string name="upselling_onboarding_month">/mês</string>
   <string name="upselling_onboarding_year">/ano</string>
   <plurals name="upselling_onboarding_more_features">
-    <item quantity="one">%d mais funcionalidade</item>
-    <item quantity="other">%d mais funcionalidades</item>
+    <item quantity="one">mais %d funcionalidade</item>
+    <item quantity="other">mais %d funcionalidades</item>
   </plurals>
   <string name="upselling_onboarding_get_plan">Obter %s</string>
   <string name="upselling_onboarding_continue_with_proton_free">Continuar com Proton Free</string>
@@ -145,7 +145,7 @@
   <string name="post_subscription_continue_button">Continuar</string>
   <string name="post_subscription_got_it_button">Entendido</string>
   <string name="post_subscription_welcome_page_title">Boas-vindas ao Mail Plus</string>
-  <string name="post_subscription_welcome_page_message">Obrigado por nos apoiar na manutenção da segurança e privacidade da internet para todos.</string>
+  <string name="post_subscription_welcome_page_message">Obrigado por nos ajudar a manter a Internet segura e privada para todos.</string>
   <string name="post_subscription_welcome_page_unlocked">Desbloqueou</string>
   <string name="post_subscription_plus_feature_storage">15 GB de armazenamento</string>
   <string name="post_subscription_plus_feature_email_addresses">10 endereços de e-mail extra</string>
@@ -156,7 +156,7 @@
   <string name="post_subscription_plus_feature_customer_support">Apoio ao cliente prioritário</string>
   <string name="post_subscription_discover_apps_page_title">Descubra todas as aplicações</string>
   <string name="post_subscription_proton_calendar">Proton Calendar</string>
-  <string name="post_subscription_proton_calendar_message">Desbloqueou a partilha de calendários e até 8 vezes mais calendários.</string>
+  <string name="post_subscription_proton_calendar_message">Desbloqueou a partilha de calendários e até 8x mais calendários.</string>
   <string name="post_subscription_proton_drive">Proton Drive</string>
   <string name="post_subscription_proton_drive_message">A sua nova subscrição aumentou o seu armazenamento para 15 GB.</string>
   <string name="post_subscription_proton_vpn">Proton VPN</string>
diff --git a/mail-upselling/presentation/src/main/res/values-tr/strings.xml b/mail-upselling/presentation/src/main/res/values-tr/strings.xml
index ae959f773e..ce74c9065b 100644
--- a/mail-upselling/presentation/src/main/res/values-tr/strings.xml
+++ b/mail-upselling/presentation/src/main/res/values-tr/strings.xml
@@ -82,14 +82,14 @@
   <string name="upselling_onboarding_unlimited_feature_drive">Fotoğraf ve belgeler için şifrelenmiş bulut depolama alanı</string>
   <string name="upselling_onboarding_unlimited_feature_sentinel">Gelişmiş hesap koruması</string>
   <!-- NPS feedback-->
-  <string name="nps_feedback_title">Feedback</string>
-  <string name="nps_feedback_headline">How likely are you to recommend Proton Mail to a friend or colleague?</string>
-  <string name="nps_cta">Share anonymously</string>
-  <string name="nps_label_left">0 is very unlikely</string>
-  <string name="nps_label_right">10 is very likely</string>
-  <string name="nps_optional">Optional</string>
-  <string name="nps_why_description">Please let us know why you gave that rating</string>
-  <string name="nps_success">Thanks for your feedback! It helps us make Proton Mail even better ❤️</string>
+  <string name="nps_feedback_title">Geri bildirim</string>
+  <string name="nps_feedback_headline">Proton Mail hizmetini bir arkadaşınıza veya meslektaşınıza önerme olasılığınız nedir?</string>
+  <string name="nps_cta">Anonim olarak paylaş</string>
+  <string name="nps_label_left">0 hiç önermem</string>
+  <string name="nps_label_right">10 çok öneririm</string>
+  <string name="nps_optional">İsteğe bağlı</string>
+  <string name="nps_why_description">Lütfen neden bu puanı verdiğinizi bize anlatın</string>
+  <string name="nps_success">Geri bildiriminiz için teşekkürler! Proton Mail hizmetini daha da iyi yapmamıza yardımcı oluyor ❤️</string>
   <!-- Comparison Table -->
   <string name="upselling_comparison_table_storage">Depolama alanı</string>
   <string name="upselling_comparison_table_email_addresses">E-posta adresleri</string>
diff --git a/mail-upselling/presentation/src/main/res/values-zh-rTW/strings.xml b/mail-upselling/presentation/src/main/res/values-zh-rTW/strings.xml
index 5dfc295054..87f3b070ac 100644
--- a/mail-upselling/presentation/src/main/res/values-zh-rTW/strings.xml
+++ b/mail-upselling/presentation/src/main/res/values-zh-rTW/strings.xml
@@ -42,17 +42,17 @@
   <string name="upselling_auto_delete_plus_description_override">使用 Mail Plus，享受更整潔的信箱，並從其他進階功能中獲益。</string>
   <string name="upselling_auto_delete_plus_title">清除舊垃圾桶與垃圾郵件</string>
   <!-- Drive Spotlight-->
-  <string name="drive_spotlight_title">New! Albums in Proton</string>
-  <string name="drive_spotlight_description">Organize photos in albums and securely share them with friends and family. Included free with your plan.</string>
-  <string name="drive_spotlight_description_with_gb">Organize photos in albums and securely share them with friends and family. You still have %d GB of secure cloud storage available.</string>
-  <string name="drive_spotlight_cta">Open Albums in Proton Drive</string>
+  <string name="drive_spotlight_title">新功能！Proton 中的相簿</string>
+  <string name="drive_spotlight_description">將照片整理到相簿中，並安全地與親友共享。您的方案隨附免費。</string>
+  <string name="drive_spotlight_description_with_gb">將照片整理到相簿中，並安全地與親友共享。您仍有 %d GB 的安全雲端儲存空間可供使用。</string>
+  <string name="drive_spotlight_cta">開啟 Proton Drive 中的相簿</string>
   <!-- Mail Plus -->
   <string name="upselling_plus_feature_storage">15 GB 儲存空間</string>
-  <string name="upselling_plus_feature_storage_plus_mails">15 GB storage, 10 email addresses</string>
+  <string name="upselling_plus_feature_storage_plus_mails">15 GB 儲存空間，10 個電郵位址</string>
   <string name="upselling_plus_feature_email_addresses">10 個電子信箱</string>
   <string name="upselling_plus_feature_custom_domain">支援自訂電子郵件網域</string>
   <string name="upselling_plus_feature_desktop_app">新的 Proton Mail 桌面應用程式</string>
-  <string name="upselling_plus_feature_calendar">Premium calendar features</string>
+  <string name="upselling_plus_feature_calendar">頂級質子版行事曆功能</string>
   <string name="upselling_plus_feature_folders_labels">資料夾、標籤與篩選器無上限</string>
   <string name="upselling_plus_feature_plus_7_features">與 7 項進階功能</string>
   <!-- Unlimited -->
@@ -82,14 +82,14 @@
   <string name="upselling_onboarding_unlimited_feature_drive">加密雲端儲存給予照片和文件</string>
   <string name="upselling_onboarding_unlimited_feature_sentinel">進階的帳號保護</string>
   <!-- NPS feedback-->
-  <string name="nps_feedback_title">Feedback</string>
-  <string name="nps_feedback_headline">How likely are you to recommend Proton Mail to a friend or colleague?</string>
-  <string name="nps_cta">Share anonymously</string>
-  <string name="nps_label_left">0 is very unlikely</string>
-  <string name="nps_label_right">10 is very likely</string>
-  <string name="nps_optional">Optional</string>
-  <string name="nps_why_description">Please let us know why you gave that rating</string>
-  <string name="nps_success">Thanks for your feedback! It helps us make Proton Mail even better ❤️</string>
+  <string name="nps_feedback_title">意見反饋</string>
+  <string name="nps_feedback_headline">您有多大可能向朋友或同事推薦 Proton Mail？</string>
+  <string name="nps_cta">匿名共享</string>
+  <string name="nps_label_left">0 代表非常不可能</string>
+  <string name="nps_label_right">10 非常有可能</string>
+  <string name="nps_optional">自由列席</string>
+  <string name="nps_why_description">請告訴我們您給出此評分的原因</string>
+  <string name="nps_success">感謝您的意見反饋！這有助於我們讓 Proton Mail 更臻完善 ❤️</string>
   <!-- Comparison Table -->
   <string name="upselling_comparison_table_storage">儲存空間</string>
   <string name="upselling_comparison_table_email_addresses">電郵位址</string>