diff --git a/app/ui/legacy/src/main/res/values-az/strings.xml b/app/ui/legacy/src/main/res/values-az/strings.xml
index a3aa9bd46..1e4965ec4 100644
--- a/app/ui/legacy/src/main/res/values-az/strings.xml
+++ b/app/ui/legacy/src/main/res/values-az/strings.xml
@@ -130,9 +130,10 @@
     <!--For unread messages the first line of a message list item is modified by this to improve the experience for people with screen readers.-->
     <string name="message_view_theme_action_light">İşıqlı fona keçin</string>
     <string name="default_signature">--
-\nK-9 Mail ilə Android cihazımdan göndərilib. Qısa qeydə görə üzrlü sayın.</string>
+\nK-9 Mail ilə Android cihazımdan göndərilib. Yığcamlığa görə üzrlü sayın.</string>
     <string name="changelog_snackbar_button_text">Baxın</string>
     <string name="prefs_title">Tənzimləmələr</string>
     <string name="message_view_theme_action_dark">Qaranlıq fona keç</string>
     <string name="about_action">Haqqında</string>
-</resources>
+    <string name="account_delete_dlg_instructions_fmt">\"<xliff:g id="account"> %s</xliff:g> \" hesabı K-9 Mail-dən silinəcək.</string>
+</resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml
index d08acb5d7..21d075bfa 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -348,7 +348,7 @@
     <string name="account_settings_show_pictures_never">Niemals</string>
     <string name="account_settings_show_pictures_only_from_contacts">Nur von Kontakten</string>
     <string name="account_settings_show_pictures_always">Von jedem</string>
-    <string name="account_settings_composition">E-Mail-Versand</string>
+    <string name="account_settings_composition">E-Mails versenden</string>
     <string name="account_settings_default_quoted_text_shown_label">Nachricht beim Antworten zitieren</string>
     <string name="account_settings_default_quoted_text_shown_summary">Ursprüngliche Nachricht als Zitat in die Antwort einfügen.</string>
     <string name="account_settings_reply_after_quote_label">Antwort nach Zitat</string>
@@ -974,4 +974,4 @@ Du kannst diese Nachricht aufheben und sie als Backup für deinen geheimen Schl
     <string name="general_settings_post_mark_as_unread_action_stay">Bei der aktuellen Nachricht bleiben</string>
     <string name="general_settings_post_mark_as_unread_action_title">Nachdem eine Nachricht als ungelesen markiert wurde</string>
     <string name="general_settings_post_mark_as_unread_action_return_to_list">Zurück zur Nachrichtenliste</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml
index fd2ca36f1..384fdac21 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -617,8 +617,8 @@
     <string name="dialog_confirm_mark_all_as_read_cancel_button">Non</string>
     <string name="dialog_confirm_spam_title">Confirmar antes de mover á carpeta spam</string>
     <plurals name="dialog_confirm_spam_message">
-        <item quantity="one">Queres mover esta mensaxe á carpeta spam?</item>
-        <item quantity="other">Queres mover esta mensaxe á carpeta spam?</item>
+        <item quantity="one">Realmente queres mover esta mensaxe ao cartafol de spam?</item>
+        <item quantity="other">Realmente queres mover as mensaxes <xliff:g id="message_count">%1$d</xliff:g> ao cartafol de spam?</item>
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Si</string>
     <string name="dialog_confirm_spam_cancel_button">Non</string>
@@ -911,4 +911,69 @@ Podes conservar esta mensaxe e usala como copia de seguridade da túa chave secr
     <!--A user visible label for the name and email address copied to the clipboard-->
     <!--Might be displayed in a notification when deleting an account (in the background)-->
     <!--For unread messages the first line of a message list item is modified by this to improve the experience for people with screen readers.-->
+<string name="new_messages_title">Novas mensaxes</string>
+    <string name="unsubscribe_action">Cancelar a subscrición</string>
+    <string name="message_view_me_text">eu</string>
+    <string name="message_view_show_remote_images_action">Mostra imaxes remotas</string>
+    <string name="general_settings_contact_name_color_label">Cor do nome do contacto</string>
+    <string name="general_settings_post_remove_action_title">Despois de eliminar ou mover unha mensaxe</string>
+    <string name="general_settings_post_remove_action_return_to_list">Volver á lista de mensaxes</string>
+    <string name="general_settings_post_remove_action_show_previous_message">Mostrar a mensaxe anterior</string>
+    <string name="general_settings_post_remove_action_show_next_message">Mostra a seguinte mensaxe</string>
+    <string name="general_settings_post_mark_as_unread_action_stay">Manterse na mensaxe actual</string>
+    <string name="general_settings_post_mark_as_unread_action_return_to_list">Volver á lista de mensaxes</string>
+    <string name="general_settings_swipe_actions_title">Accións de pasar o dedo</string>
+    <string name="general_settings_right_swipe_title">Pase o dedo cara á dereita</string>
+    <string name="general_settings_left_swipe_title">Pase o dedo cara á esquerda</string>
+    <string name="general_settings_swipe_action_toggle_star">Engadir/eliminar estrela</string>
+    <string name="general_settings_message_list_density_title">densidade</string>
+    <string name="general_settings_ui_density_compact">Compacto</string>
+    <string name="account_settings_vibrate_pattern_5">Patrón 5</string>
+    <string name="account_settings_notification_light_disabled">Desactivado</string>
+    <string name="account_settings_notification_light_default_color">Cor predeterminada do sistema</string>
+    <string name="account_settings_notification_light_white">Branco</string>
+    <string name="account_settings_notification_light_blue">Azul</string>
+    <string name="account_settings_notification_light_yellow">Amarelo</string>
+    <string name="message_list_error_folder_not_found">Non se atopou o cartafol</string>
+    <string name="message_details_toolbar_title">Detalles da mensaxe</string>
+    <string name="message_details_loading_error">Produciuse un erro ao cargar os detalles da mensaxe.</string>
+    <string name="action_add_to_contacts">Engadir aos contactos</string>
+    <string name="action_compose_message_to">Redactar un correo dirixido a</string>
+    <string name="action_copy_email_address">Copiar enderezo de correo electrónico</string>
+    <string name="volume_navigation_title">Navegación coa tecla de volume na vista de mensaxes</string>
+    <string name="general_settings_show_compose_button_title">Mostrar o botón flotante de redacción</string>
+    <string name="message_list_error_title">Erro</string>
+    <string name="account_settings_vibrate_pattern_2">Patrón 2</string>
+    <string name="account_settings_notification_light_label">Luz de notificación</string>
+    <string name="account_settings_vibrate_summary_disabled">Desactivado</string>
+    <string name="account_settings_notification_light_cyan">Cian</string>
+    <string name="account_settings_notification_light_magenta">Magenta</string>
+    <string name="account_settings_vibrate_pattern_label">Patrón de vibración</string>
+    <string name="account_settings_vibrate_pattern_1">Patrón 1</string>
+    <string name="account_settings_vibrate_pattern_3">Patrón 3</string>
+    <string name="account_settings_vibrate_pattern_4">Patrón 4</string>
+    <string name="action_copy_name_and_email_address">Copia o nome e o enderezo de correo electrónico</string>
+    <string name="background_work_notification_remove_account">Eliminando conta…</string>
+    <string name="notification_notify_error_title">Erro de notificación</string>
+    <string name="get_help_title">Obter axuda</string>
+    <string name="changelog_snackbar_button_text">Vista</string>
+    <string name="message_view_recipients_format">aos <xliff:g id="destinatarios">%s</xliff:g></string>
+    <string name="message_view_additional_recipient_prefix">+</string>
+    <string name="general_settings_swipe_action_toggle_read">Marcar como lido/non lido</string>
+    <string name="account_settings_notification_light_red">Vermello</string>
+    <string name="account_settings_notification_light_green">Verde</string>
+    <string name="general_settings_swipe_action_toggle_selection">Alternar selección</string>
+    <string name="general_settings_ui_density_relaxed">Relaxado</string>
+    <string name="account_settings_vibration">Vibración</string>
+    <string name="font_size_message_view_recipients">Destinatarios</string>
+    <string name="swipe_action_mark_as_read">Marcar como leído</string>
+    <string name="clipboard_label_name_and_email_address">Nome e enderezo de correo electrónico</string>
+    <string name="user_manual_title">Manual de usuario</string>
+    <string name="notification_notify_error_text">Produciuse un erro ao tentar crear unha notificación do sistema para unha mensaxe nova. O motivo é probablemente un son de notificación que falta.
+\n
+\nToca para abrir a configuración de notificacións.</string>
+    <string name="message_details_missing_date">Falta a cabeceira \"Data\".</string>
+    <string name="general_settings_post_mark_as_unread_action_title">Despois de marcar unha mensaxe como non lida</string>
+    <string name="swipe_action_move">Mover…</string>
+    <string name="message_list_content_description_unread_prefix">sen ler, %s</string>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml
index 01c47179a..9186d462c 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -33,7 +33,7 @@
     <!--General strings that include the app name-->
     <string name="account_delete_dlg_instructions_fmt">アカウント \"<xliff:g id="account">%s</xliff:g>\" は K-9 Mail から削除されます。</string>
     <!--=== General strings ==================================================================-->
-    <string name="authors">作者</string>
+    <string name="authors">開発者</string>
     <string name="about_title">K-9 Mail について</string>
     <string name="accounts_title">アカウント</string>
     <string name="advanced">拡張</string>
@@ -968,4 +968,4 @@
     <string name="general_settings_post_mark_as_unread_action_stay">現在のメッセージに留まる</string>
     <string name="general_settings_post_mark_as_unread_action_title">メッセージを既読にした後</string>
     <string name="general_settings_post_mark_as_unread_action_return_to_list">メッセージ一覧に戻る</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-ka/strings.xml b/app/ui/legacy/src/main/res/values-ka/strings.xml
index 94f5625b0..8a473f57f 100644
--- a/app/ui/legacy/src/main/res/values-ka/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ka/strings.xml
@@ -42,9 +42,9 @@
     <string name="edit_as_new_message_action">რედაქტირება როგორც ახალი მესიჯი</string>
     <string name="move_action">გადატანა</string>
     <string name="move_to_drafts_action">გადატანა მონახაზებში</string>
-    <string name="refile_action">საკეცის ცვლილება</string>
+    <string name="refile_action">საქაღალდის შეცვლა…</string>
     <string name="done_action">შესრულდა</string>
-    <string name="discard_action">გაუქმება</string>
+    <string name="discard_action">მოცილება</string>
     <string name="save_draft_action">შენახვა მონახაზად</string>
     <string name="check_mail_action">ფოსტის შემოწმება</string>
     <string name="send_messages_action">მესიჯების გაგზავნა</string>
@@ -90,8 +90,8 @@
     <string name="size_format_kilobytes">%.1f ᲙᲑ</string>
     <string name="size_format_bytes">%d Ბ</string>
     <plurals name="notification_new_messages_title">
-        <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> ახალი მესიჯი</item>
-        <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> ახალი მესიჯი </item>
+        <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> ახალი შეტყობინება</item>
+        <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> ახალი შეტყობინება</item>
     </plurals>
     <string name="notification_action_reply">პასუხი</string>
     <string name="notification_action_mark_as_read">მონიშვნა წაკითხულად</string>
@@ -271,7 +271,7 @@
     <string name="account_settings_crypto_key">გამჭოლი შიფრაციის გასაღების გამართვა</string>
     <string name="account_settings_crypto_summary_off">OpenPGP აპი არ გამართულა</string>
     <string name="account_settings_crypto_summary_on">დაკავშირებულია: %s</string>
-    <string name="account_settings_crypto_summary_config">კონფიგურაცია...</string>
+    <string name="account_settings_crypto_summary_config">მორგება…</string>
     <string name="account_settings_crypto_encrypt_all_drafts">ყველა მონახაზის დაშიფრულად შენახვა</string>
     <string name="account_settings_crypto_encrypt_all_drafts_on">ყველა მონახაზი შენახული იქნება დაშიფრულად</string>
     <string name="account_settings_crypto_encrypt_all_drafts_off">მონახაზების დაშიფვრა მხოლოდ თუ შიფრაცია ჩართულია</string>
@@ -500,7 +500,7 @@
     <string name="crypto_info_view_sender">გამგზავნის ჩვენება</string>
     <string name="crypto_info_view_security_warning">დეტალები</string>
     <string name="locked_attach_unlock">გახსნა</string>
-    <string name="message_progress_text">ლოდინი...</string>
+    <string name="message_progress_text">ჩატვირთვა…</string>
     <string name="messageview_decrypt_retry">გამეორება</string>
     <string name="messageview_decrypt_incomplete">დაშიფრული წერილი უნდა ჩამოიტვირთოს გასაშიფრად.</string>
     <string name="messageview_crypto_error_title">შეცდომა წერილის დეშიფრაციისას</string>
@@ -510,9 +510,9 @@
     <string name="crypto_no_provider_button">პარამეტრებში შესვლა</string>
     <string name="mail_list_widget_text">K-9 მესიჯების ნუსხა</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">ლოდინი...</string>
+    <string name="message_list_widget_initializing">ჩატვირთვა…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">ლოდინი...</string>
+    <string name="message_list_widget_list_item_loading">ჩატვირთვა…</string>
     <string name="openpgp_enabled_error_title">შიფრაცია შეუძლებელია</string>
     <string name="enable_encryption">შიფრაციის ჩართვა</string>
     <string name="disable_encryption">შიფრაციის გამორთვა</string>
@@ -583,4 +583,4 @@
     <!--For unread messages the first line of a message list item is modified by this to improve the experience for people with screen readers.-->
     <string name="user_manual_title">ინსტრუქცია</string>
     <string name="about_website_title">ვებსაიტი</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml
index 32abf88ff..9f4e77ac7 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -10,7 +10,7 @@
     <string name="app_authors">K-9 šunų vedžiotojai</string>
     <string name="source_code">Šaltinio kodas</string>
     <string name="app_license">Apache licencija, versija 2.0</string>
-    <string name="about_project_title">Atviro kodo projektas</string>
+    <string name="about_project_title">Atvirojo kodo projektas</string>
     <string name="about_website_title">Svetainė</string>
     <string name="user_manual_title">Naudotojo vadovas</string>
     <string name="get_help_title">Gauti pagalbos</string>
@@ -964,4 +964,30 @@ Norėdami nustatyti automatinį šifravimą naujajame prietaise, vadovaukitės i
     <string name="clipboard_label_name_and_email_address">Vardas ir el. pašto adresas</string>
     <!--Might be displayed in a notification when deleting an account (in the background)-->
     <!--For unread messages the first line of a message list item is modified by this to improve the experience for people with screen readers.-->
-</resources>
+<string name="message_details_loading_error">Bandant įkelti laiško savybes, įvyko klaida.</string>
+    <string name="general_settings_post_remove_action_return_to_list">Grįžti į laiškų sąrašą</string>
+    <string name="general_settings_post_remove_action_show_previous_message">Rodyti ankstesnį laišką</string>
+    <string name="general_settings_ui_density_relaxed">Mažesnis</string>
+    <string name="general_settings_show_compose_button_title">Rodyti slankų rašymo mygtuką</string>
+    <string name="notification_notify_error_text">Bandant sukurti sistemos pranešimą apie naują laišką, įvyko klaida. Tikėtina priežastis – trūkstamas pranešimo garsas.
+\n
+\nBakstelėkite pranešimų nustatymams atverti.</string>
+    <string name="general_settings_post_remove_action_show_next_message">Rodyti kitą laišką</string>
+    <string name="general_settings_post_remove_action_title">Pašalinus ar perkėlus laišką</string>
+    <string name="general_settings_right_swipe_title">Braukimas dešinėn</string>
+    <string name="general_settings_left_swipe_title">Braukimas kairėn</string>
+    <string name="general_settings_swipe_actions_title">Braukimo veiksmai</string>
+    <string name="general_settings_ui_density_compact">Didesnis</string>
+    <string name="general_settings_message_list_density_title">Tankis</string>
+    <string name="message_details_missing_date">Trūksta „Date“ antraštės</string>
+    <string name="general_settings_post_mark_as_unread_action_title">Pažymėjus laišką kaip neskaitytą</string>
+    <string name="general_settings_post_mark_as_unread_action_stay">Likti šiame laiške</string>
+    <string name="general_settings_swipe_action_toggle_selection">Pasirinkti / panaikinti pasirinkimą</string>
+    <string name="general_settings_swipe_action_toggle_read">Pažymėti kaip skaitytą / neskaitytą</string>
+    <string name="general_settings_post_mark_as_unread_action_return_to_list">Grįžti į laiškų sąrašą</string>
+    <string name="volume_navigation_title">Judėjimas laiškų sąrašu garso mygtukais</string>
+    <string name="action_compose_message_to">Rašyti laišką</string>
+    <string name="background_work_notification_remove_account">Šalinama paskyra…</string>
+    <string name="message_list_content_description_unread_prefix">neskaityti, %s</string>
+    <string name="changelog_snackbar_button_text">Rodyti</string>
+</resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml
index 89c8db71f..1f9c5f5aa 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -349,7 +349,7 @@
     <string name="account_settings_notification_channels_label">Kategorie powiadomień</string>
     <string name="account_settings_open_notification_settings_messages_summary">Konfiguruj powiadomienia dla nowych wiadomości</string>
     <string name="account_settings_open_notification_settings_miscellaneous_summary">Konfiguruj powiadomienia o błędach i stanie</string>
-    <string name="account_settings_show_pictures_label">Zawsze pokazuj obrazki</string>
+    <string name="account_settings_show_pictures_label">Zawsze pokazuj obrazy</string>
     <string name="account_settings_show_pictures_never">Nie</string>
     <string name="account_settings_show_pictures_only_from_contacts">Od kontaktów</string>
     <string name="account_settings_show_pictures_always">Od każdego</string>
@@ -361,8 +361,8 @@
     <string name="account_settings_strip_signature_label">Wycinaj podpis z tekstu</string>
     <string name="account_settings_strip_signature_summary">Gdy odpowiadasz na wiadomość, cytowany tekst nie bedzie zawierał podpisu</string>
     <string name="account_settings_message_format_label">Format wiadomości</string>
-    <string name="account_settings_message_format_text">Zwykły tekst (bez obrazków i formatowania)</string>
-    <string name="account_settings_message_format_html">HTML (z obrazkami i formatowaniem)</string>
+    <string name="account_settings_message_format_text">Zwykły tekst (bez obrazów i formatowania)</string>
+    <string name="account_settings_message_format_html">HTML (z obrazami i formatowaniem)</string>
     <string name="account_settings_message_format_auto">Automatycznie</string>
     <string name="account_settings_always_show_cc_bcc_label">Zawsze wyświetlaj DW/UDW</string>
     <string name="account_settings_message_read_receipt_label">Potwierdzenie przeczytania</string>
@@ -987,4 +987,4 @@ Tą wiadomość można zachować i użyć w formie kopii zapasowej twojego klucz
     <string name="general_settings_post_mark_as_unread_action_stay">Pozostań przy bieżącej wiadomości</string>
     <string name="general_settings_post_mark_as_unread_action_title">Po oznaczeniu wiadomości jako nieprzeczytanej</string>
     <string name="general_settings_post_mark_as_unread_action_return_to_list">Wróć do listy wiadomości</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index e4a42a712..258707f56 100644
--- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -3,7 +3,7 @@
     <!--=== App-specific strings =============================================================-->
     <!--This should make it easier for forks to change the branding-->
     <!--Used in AndroidManifest.xml-->
-    <string name="app_name">K-9 Mail</string>
+    <string name="app_name">K-9 邮件</string>
     <string name="shortcuts_title">K-9 账户</string>
     <string name="unread_widget_label">K-9 未读</string>
     <!--Used in the about dialog-->
diff --git a/core/ui/compose/designsystem/src/main/res/values-lt/strings.xml b/core/ui/compose/designsystem/src/main/res/values-lt/strings.xml
index a6b3daec9..f6f27cb57 100644
--- a/core/ui/compose/designsystem/src/main/res/values-lt/strings.xml
+++ b/core/ui/compose/designsystem/src/main/res/values-lt/strings.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="designsystem_atom_password_textfield_hide_password">Nerodyti slaptažodžio</string>
+    <string name="designsystem_atom_password_textfield_show_password">Rodyti slaptažodį</string>
+    <string name="designsystem_molecule_email_address_input_label">El. pašto adresas</string>
+    <string name="designsystem_molecule_password_input_label">Slaptažodis</string>
+    <string name="designsystem_molecule_error_view_button_retry">Kartoti bandymą</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/common/src/main/res/values-eu/strings.xml b/feature/account/common/src/main/res/values-eu/strings.xml
index 74e271767..5a3044276 100644
--- a/feature/account/common/src/main/res/values-eu/strings.xml
+++ b/feature/account/common/src/main/res/values-eu/strings.xml
@@ -3,4 +3,6 @@
     <string name="account_common_button_next">Hurrengoa</string>
     <string name="account_common_button_back">Aurrekoa</string>
     <string name="account_common_title">K-9 Mail</string>
+    <string name="account_common_error_server_message">Zerbitzariak mezu hau itzuli du:
+\n%s</string>
 </resources>
\ No newline at end of file
diff --git a/feature/account/common/src/main/res/values-fa/strings.xml b/feature/account/common/src/main/res/values-fa/strings.xml
index e832b6d6d..b333b63b0 100644
--- a/feature/account/common/src/main/res/values-fa/strings.xml
+++ b/feature/account/common/src/main/res/values-fa/strings.xml
@@ -3,4 +3,6 @@
     <string name="account_common_button_next">بعدی</string>
     <string name="account_common_button_back">بازگشت</string>
     <string name="account_common_title">کلاینت رایانامه K9</string>
+    <string name="account_common_error_server_message">کارساز، پیام زیر را برگردانده است:
+\n%s</string>
 </resources>
\ No newline at end of file
diff --git a/feature/account/common/src/main/res/values-iw/strings.xml b/feature/account/common/src/main/res/values-iw/strings.xml
index a6b3daec9..c043f9b80 100644
--- a/feature/account/common/src/main/res/values-iw/strings.xml
+++ b/feature/account/common/src/main/res/values-iw/strings.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="account_common_error_server_message">השרת החזיר את השגיאה הבאה:
+\n%s</string>
+    <string name="account_common_title">דוא\"ל K-9</string>
+    <string name="account_common_button_next">הבא</string>
+    <string name="account_common_button_back">אחורה</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/common/src/main/res/values-lt/strings.xml b/feature/account/common/src/main/res/values-lt/strings.xml
index a6b3daec9..fb8911d09 100644
--- a/feature/account/common/src/main/res/values-lt/strings.xml
+++ b/feature/account/common/src/main/res/values-lt/strings.xml
@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="account_common_error_server_message">Serverio grąžintas pranešimas:
+\n%s</string>
+    <string name="account_common_title">K-9 paštas</string>
+    <string name="account_common_button_next">Toliau</string>
+    <string name="account_common_button_back">Atgal</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/common/src/main/res/values-pt-rBR/strings.xml b/feature/account/common/src/main/res/values-pt-rBR/strings.xml
index 848fd0446..3ea5ae6c3 100644
--- a/feature/account/common/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/account/common/src/main/res/values-pt-rBR/strings.xml
@@ -3,5 +3,6 @@
     <string name="account_common_button_next">Próximo</string>
     <string name="account_common_button_back">Voltar</string>
     <string name="account_common_title">K-9 Mail</string>
-    <string name="account_common_error_server_message">O servidor retornou a seguinte mensagem:</string>
+    <string name="account_common_error_server_message">O servidor retornou a seguinte mensagem:
+\n%s</string>
 </resources>
\ No newline at end of file
diff --git a/feature/account/oauth/src/main/res/values-lt/strings.xml b/feature/account/oauth/src/main/res/values-lt/strings.xml
index a6b3daec9..c7f7e705b 100644
--- a/feature/account/oauth/src/main/res/values-lt/strings.xml
+++ b/feature/account/oauth/src/main/res/values-lt/strings.xml
@@ -1,2 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="account_oauth_sign_in_description">Kad prisijungtumėte, jus nukreipsime pas jūsų el. pašto paslaugos teikėją. Šiai programai turėsite suteikti prieigą prie savo el. pašto paskyros.</string>
+    <string name="account_oauth_sign_in_button">Prisijungti</string>
+    <string name="account_oauth_sign_in_with_google_button">Prisijungti per „Google“</string>
+    <string name="account_oauth_loading_message">Prisijungti naudojant „OAuth“</string>
+    <string name="account_oauth_loading_error">Prisijungti naudojant „OAuth“ nepavyko</string>
+    <string name="account_oauth_error_canceled">Tapatybės patvirtinimas nutrauktas</string>
+    <string name="account_oauth_error_failed">Tapatybės patikrinimas nepavyko dėl klaidos: <xliff:g id="error">%s</xliff:g></string>
+    <string name="account_oauth_error_not_supported">„OAuth 2.0“ šiuo metu su šiuo tiekėju nepalaikoma.</string>
+    <string name="account_oauth_error_browser_not_available">Programai nepavyko aptikti naršyklės, kurią galėtų panaudoti prieigai prie jūsų paskyros gauti.</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/certificate/src/main/res/values-eu/strings.xml b/feature/account/server/certificate/src/main/res/values-eu/strings.xml
index a6b3daec9..2a09852cc 100644
--- a/feature/account/server/certificate/src/main/res/values-eu/strings.xml
+++ b/feature/account/server/certificate/src/main/res/values-eu/strings.xml
@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="account_server_certificate_warning_title">Abisua</string>
+    <string name="account_server_certificate_unknown_error_subtitle">Ziurtagiriaren errorea</string>
+    <string name="account_server_certificate_unknown_error_description_format">Aplikazioak balizko segurtasun-mehatxu bat detektatu du eta ez du <xliff:g id="serverName">%s</xliff:g>-ra konektatzen jarraitu.
+\nJarraitzen baduzu, erasotzaileak zure pasahitza edo mezu elektronikoak bezalako informazioa lapurtzen saia litezke.</string>
+    <string name="account_server_certificate_button_back">Atzera itzuli (gomendatua)</string>
+    <string name="account_server_certificate_button_advanced">Aurreratua</string>
+    <string name="account_server_certificate_button_continue">Arriskua onartu eta jarraitu</string>
+    <string name="account_server_certificate_section_title">Zerbitzariaren ziurtagiria</string>
+    <string name="account_server_certificate_subject_alternative_names">Subjektuaren ordezko izenak</string>
+    <string name="account_server_certificate_not_valid_before">Data hau baino lehen ez du balio</string>
+    <string name="account_server_certificate_not_valid_after">Data honen ondoren ez du balio</string>
+    <string name="account_server_certificate_subject">Subjektua</string>
+    <string name="account_server_certificate_issuer">Jaulkitzailea</string>
+    <string name="account_server_certificate_fingerprints_section">Hatz-markak</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/certificate/src/main/res/values-fa/strings.xml b/feature/account/server/certificate/src/main/res/values-fa/strings.xml
index a6b3daec9..773963041 100644
--- a/feature/account/server/certificate/src/main/res/values-fa/strings.xml
+++ b/feature/account/server/certificate/src/main/res/values-fa/strings.xml
@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="account_server_certificate_button_back">بازگشت (توصیه می‌شود)</string>
+    <string name="account_server_certificate_button_advanced">پیشرفته</string>
+    <string name="account_server_certificate_button_continue">پذیرفتن ریسک و ادامه دادن</string>
+    <string name="account_server_certificate_not_valid_before">معتبر نیست تا قبل از</string>
+    <string name="account_server_certificate_not_valid_after">معتبر نیست تا بعد از</string>
+    <string name="account_server_certificate_subject">موضوع</string>
+    <string name="account_server_certificate_issuer">ایجاد کننده</string>
+    <string name="account_server_certificate_fingerprints_section">اثرانگشت‌ها</string>
+    <string name="account_server_certificate_warning_title">اخطار</string>
+    <string name="account_server_certificate_unknown_error_subtitle">خطای گواهی</string>
+    <string name="account_server_certificate_unknown_error_description_format">یک مسئله امنیتی شناسایی شد و به <xliff:g id="serverName">%s</xliff:g> متصل نشد.
+\nدر صورت تمایل به ادامه، ریسک سرقت اطلاعات شما مانند رمز عبور و ایمیل‌ها وجود دارد.</string>
+    <string name="account_server_certificate_section_title">گواهی کارساز</string>
+    <string name="account_server_certificate_subject_alternative_names">نام‌های حایگزین موضوع</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/certificate/src/main/res/values-lt/strings.xml b/feature/account/server/certificate/src/main/res/values-lt/strings.xml
index a6b3daec9..8bfec8312 100644
--- a/feature/account/server/certificate/src/main/res/values-lt/strings.xml
+++ b/feature/account/server/certificate/src/main/res/values-lt/strings.xml
@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="account_server_certificate_unknown_error_description_format">Programa aptiko galima saugos grėsmę, todėl nutraukė bandymą jungtis prie <xliff:g id="serverName">%s</xliff:g>.
+\nJei tęsite, piktavaliai gali kėsintis pavogti jūsų duomenis, pavyzdžiui slaptažodį ar el. laiškus.</string>
+    <string name="account_server_certificate_warning_title">Įspėjimas</string>
+    <string name="account_server_certificate_unknown_error_subtitle">Liudijimo klaida</string>
+    <string name="account_server_certificate_button_advanced">Išsamiau</string>
+    <string name="account_server_certificate_button_back">Grįžti (rekomenduotina)</string>
+    <string name="account_server_certificate_button_continue">Priimti riziką ir tęsti</string>
+    <string name="account_server_certificate_section_title">Serverio liudijimas</string>
+    <string name="account_server_certificate_subject_alternative_names">Subjekto alternatyvieji vardai</string>
+    <string name="account_server_certificate_not_valid_before">Negalioja iki</string>
+    <string name="account_server_certificate_not_valid_after">Negalioja po</string>
+    <string name="account_server_certificate_subject">Subjektas</string>
+    <string name="account_server_certificate_issuer">Išdavėjas</string>
+    <string name="account_server_certificate_fingerprints_section">Kontroliniai kodai</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/certificate/src/main/res/values-pt-rBR/strings.xml b/feature/account/server/certificate/src/main/res/values-pt-rBR/strings.xml
index a6b3daec9..0f5611228 100644
--- a/feature/account/server/certificate/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/account/server/certificate/src/main/res/values-pt-rBR/strings.xml
@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="account_server_certificate_warning_title">Aviso</string>
+    <string name="account_server_certificate_unknown_error_subtitle">Erro de certificado</string>
+    <string name="account_server_certificate_unknown_error_description_format">O aplicativo detectou um possível risco de segurança e não conectou-se ao <xliff:g id="serverName">%s</xliff:g>.
+\nSe você continuar, agressores podem tentar interceptar informações como sua senha ou emails.</string>
+    <string name="account_server_certificate_button_back">Voltar (recomendado)</string>
+    <string name="account_server_certificate_button_advanced">Avançado</string>
+    <string name="account_server_certificate_button_continue">Aceitar risco e continuar</string>
+    <string name="account_server_certificate_section_title">Certificado do servidor</string>
+    <string name="account_server_certificate_subject_alternative_names">Subject alternative names (nomes alternativos)</string>
+    <string name="account_server_certificate_not_valid_before">Inválido antes de</string>
+    <string name="account_server_certificate_not_valid_after">Inválido após</string>
+    <string name="account_server_certificate_subject">Sujeito</string>
+    <string name="account_server_certificate_issuer">Emissor</string>
+    <string name="account_server_certificate_fingerprints_section">Impressão digital</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/certificate/src/main/res/values-sq/strings.xml b/feature/account/server/certificate/src/main/res/values-sq/strings.xml
index a6b3daec9..b710eb441 100644
--- a/feature/account/server/certificate/src/main/res/values-sq/strings.xml
+++ b/feature/account/server/certificate/src/main/res/values-sq/strings.xml
@@ -1,2 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="account_server_certificate_unknown_error_description_format">Aplikacioni pikasi një kërcënim potencial sigurie dhe s’vazhdoi të lidhet me <xliff:g id="serverName">%s</xliff:g>.
+\nNëse vazhdoni, agresorë mund të përpiqen të vjedhin informacione, bie fjala, fjalëkalim, ose email-e.</string>
+    <string name="account_server_certificate_issuer">Lëshues</string>
+    <string name="account_server_certificate_fingerprints_section">Shenja gishtash</string>
+    <string name="account_server_certificate_warning_title">Kujdes</string>
+    <string name="account_server_certificate_unknown_error_subtitle">Gabim dëshmie</string>
+    <string name="account_server_certificate_button_back">Shkon mbrapsht (e rekomanduar)</string>
+    <string name="account_server_certificate_button_advanced">Të mëtejshme</string>
+    <string name="account_server_certificate_button_continue">Pranojeni rrezikun dhe vazhdoni</string>
+    <string name="account_server_certificate_section_title">Dëshmi shërbyesi</string>
+    <string name="account_server_certificate_subject_alternative_names">Emra alternativë të subjektit</string>
+    <string name="account_server_certificate_not_valid_before">Jo e vlefshme para</string>
+    <string name="account_server_certificate_not_valid_after">Jo e vlefshme pas</string>
+    <string name="account_server_certificate_subject">Subjekt</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/settings/src/main/res/values-lt/strings.xml b/feature/account/server/settings/src/main/res/values-lt/strings.xml
index a6b3daec9..fa0215f19 100644
--- a/feature/account/server/settings/src/main/res/values-lt/strings.xml
+++ b/feature/account/server/settings/src/main/res/values-lt/strings.xml
@@ -1,2 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="account_server_settings_validation_error_password_required">Slaptažodį nurodyti būtina.</string>
+    <string name="account_server_settings_password_authentication_subtitle">Atrakinkite slaptažodžiui pamatyti</string>
+    <string name="account_server_settings_protocol_type_label">Protokolas</string>
+    <string name="account_server_settings_connection_security_start_tls">StartTLS</string>
+    <string name="account_server_settings_connection_security_ssl">SSL/TLS</string>
+    <string name="account_server_settings_incoming_imap_prefix_label">IMAP kelio prefiksas</string>
+    <string name="account_server_settings_validation_error_server_invalid_ip_or_hostname">Neleistinas IP adresas ar serverio vardas</string>
+    <string name="account_server_settings_validation_error_port_invalid">Prievadas neleistinas (leistinos reikšmės – 1–65535).</string>
+    <string name="account_server_settings_validation_error_username_required">Naudotojo vardą nurodyti būtina.</string>
+    <string name="account_server_settings_password_authentication_title">Patvirtinkite savo tapatybę</string>
+    <string name="account_server_settings_password_authentication_screen_lock_required">Kad čia matytumėte slaptažodį, šiame įrenginyje įgalinkite ekrano užraktą.</string>
+    <string name="account_server_settings_validation_error_imap_prefix_blank">IMAP prefiksas negali būti tuščias.</string>
+    <string name="account_server_settings_server_label">Serveris</string>
+    <string name="account_server_settings_security_label">Šifravimas</string>
+    <string name="account_server_settings_port_label">Prievadas</string>
+    <string name="account_server_settings_authentication_label">Tapatumo nustatymas</string>
+    <string name="account_server_settings_username_label">Naudotojo vardas</string>
+    <string name="account_server_settings_connection_security_none">Jokio</string>
+    <string name="account_server_settings_authentication_none">Jokio</string>
+    <string name="account_server_settings_authentication_password_cleartext">Paprastas slaptažodis</string>
+    <string name="account_server_settings_authentication_password_encrypted">Šifruotas slaptažodis</string>
+    <string name="account_server_settings_authentication_client_certificate">Kliento liudijimas</string>
+    <string name="account_server_settings_authentication_client_oauth">OAuth 2.0</string>
+    <string name="account_server_settings_client_certificate_none_selected">Jokio</string>
+    <string name="account_server_settings_client_certificate_label">Kliento liudijimas</string>
+    <string name="account_server_settings_incoming_top_bar_title">Gaunamų laiškų serverio parametrai</string>
+    <string name="account_server_settings_incoming_imap_namespace_label">Automatiškai aptikti IMAP vardų erdvę</string>
+    <string name="account_server_settings_incoming_imap_compression_label">Naudoti glaudinimą</string>
+    <string name="account_server_settings_incoming_imap_send_client_id_label">Siųsti kliento ID</string>
+    <string name="account_server_settings_outgoing_top_bar_title">Siunčiamų laiškų serverio parametrai</string>
+    <string name="account_server_settings_validation_error_server_required">Serverio vardą nurodyti būtina.</string>
+    <string name="account_server_settings_validation_error_port_required">Prievadą nurodyti būtina.</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/settings/src/main/res/values-pt-rBR/strings.xml b/feature/account/server/settings/src/main/res/values-pt-rBR/strings.xml
index 12f662409..3c8774b16 100644
--- a/feature/account/server/settings/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/account/server/settings/src/main/res/values-pt-rBR/strings.xml
@@ -3,7 +3,7 @@
     <string name="account_server_settings_validation_error_server_required">Nome do servidor é obrigatório.</string>
     <string name="account_server_settings_validation_error_username_required">Nome de usuário é obrigatório.</string>
     <string name="account_server_settings_outgoing_top_bar_title">Configuração do servidor de saída</string>
-    <string name="account_server_settings_validation_error_password_required">Senha é obrigatório.</string>
+    <string name="account_server_settings_validation_error_password_required">Senha é obrigatória.</string>
     <string name="account_server_settings_incoming_imap_send_client_id_label">Enviar identidade de cliente</string>
     <string name="account_server_settings_authentication_client_oauth">OAuth 2.0</string>
     <string name="account_server_settings_authentication_none">Nenhum</string>
diff --git a/feature/account/server/validation/src/main/res/values-cs/strings.xml b/feature/account/server/validation/src/main/res/values-cs/strings.xml
index c320c4ced..aec9871ed 100644
--- a/feature/account/server/validation/src/main/res/values-cs/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-cs/strings.xml
@@ -4,11 +4,11 @@
     <string name="account_server_validation_error_authentication">Chyba autentizace</string>
     <string name="account_server_validation_outgoing_loading_message">Kontrola nastavení serveru odchozí pošty…</string>
     <string name="account_server_validation_error_network">Chyba sítě</string>
-    <string name="account_server_validation_outgoing_success">Nastavení serveru odchozí pošty je platné</string>
+    <string name="account_server_validation_outgoing_success">Nastavení serveru odchozí pošty je ověřené</string>
     <string name="account_server_validation_error_unknown">Neznámá chyba</string>
     <string name="account_server_validation_sign_in">Přihlaste se</string>
     <string name="account_server_validation_outgoing_loading_error">Kontrola nastavení serveru odchozí pošty se nezdařila</string>
-    <string name="account_server_validation_incoming_success">Nastavení serveru příchozí pošty je platné</string>
+    <string name="account_server_validation_incoming_success">Nastavení serveru příchozí pošty je ověřené</string>
     <string name="account_server_validation_incoming_loading_error">Kontrola nastavení serveru příchozí pošty se nezdařila</string>
     <string name="account_server_validation_error_server">Chyba serveru</string>
     <string name="account_server_validation_error_client_certificate_expired">Klientský certifikát je již neplatný</string>
diff --git a/feature/account/server/validation/src/main/res/values-de/strings.xml b/feature/account/server/validation/src/main/res/values-de/strings.xml
index 703d834e8..08724b487 100644
--- a/feature/account/server/validation/src/main/res/values-de/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-de/strings.xml
@@ -4,11 +4,11 @@
     <string name="account_server_validation_error_authentication">Authentifizierungsfehler</string>
     <string name="account_server_validation_outgoing_loading_message">Einstellungen des Postausgangsservers werden überprüft…</string>
     <string name="account_server_validation_error_network">Netzwerkfehler</string>
-    <string name="account_server_validation_outgoing_success">Einstellungen des Postausgangsservers sind gültig</string>
+    <string name="account_server_validation_outgoing_success">Einstellungen des Postausgangsservers sind verifiziert</string>
     <string name="account_server_validation_error_unknown">Unbekannter Fehler</string>
     <string name="account_server_validation_sign_in">Bitte anmelden</string>
     <string name="account_server_validation_outgoing_loading_error">Prüfung der Einstellungen des Postausgangsservers fehlgeschlagen</string>
-    <string name="account_server_validation_incoming_success">Einstellungen des Posteingangsservers sind gültig</string>
+    <string name="account_server_validation_incoming_success">Einstellungen des Posteingangsservers sind verifiziert</string>
     <string name="account_server_validation_incoming_loading_error">Prüfung der Einstellungen des Posteingangservers fehlgeschlagen</string>
     <string name="account_server_validation_error_server">Serverfehler</string>
     <string name="account_server_validation_error_missing_server_capability">Fehlende Serverfähigkeit</string>
diff --git a/feature/account/server/validation/src/main/res/values-eu/strings.xml b/feature/account/server/validation/src/main/res/values-eu/strings.xml
index 065ddbbe7..638f50a4c 100644
--- a/feature/account/server/validation/src/main/res/values-eu/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-eu/strings.xml
@@ -11,4 +11,11 @@
     <string name="account_server_validation_incoming_success">Sarrerako zerbitzariaren ezarpenak zuzenak dira</string>
     <string name="account_server_validation_incoming_loading_error">Akatsa sarrerako zerbitzariaren ezarpenak egiaztatzean</string>
     <string name="account_server_validation_error_server">Zerbitzariaren errorea</string>
+    <string name="account_server_validation_error_missing_server_capability_details">Zerbitzariari gaitasun hau falta zaio:
+\n%s</string>
+    <string name="account_server_validation_error_client_certificate_expired">Bezeroaren ziurtagiriak dagoeneko ez du balio</string>
+    <string name="account_server_validation_error_client_certificate_retrieval_failure">Ezin izan da bezeroaren ziurtagiria atzitu</string>
+    <string name="account_server_validation_error_missing_server_capability">Zerbitzariaren gaitasuna falta da</string>
+    <string name="account_server_validation_error_details">Xehetasunak:
+\n%s</string>
 </resources>
\ No newline at end of file
diff --git a/feature/account/server/validation/src/main/res/values-fa/strings.xml b/feature/account/server/validation/src/main/res/values-fa/strings.xml
index 624380f7e..ad82d5359 100644
--- a/feature/account/server/validation/src/main/res/values-fa/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-fa/strings.xml
@@ -5,11 +5,11 @@
     <string name="account_server_validation_error_authentication">خطای احراز هویت</string>
     <string name="account_server_validation_outgoing_loading_message">بررسی تنظیمات سرور خروجی …</string>
     <string name="account_server_validation_error_network">خطای شبکه</string>
-    <string name="account_server_validation_outgoing_success">تنظیمات سرور خروجی معتبر است</string>
+    <string name="account_server_validation_outgoing_success">تنظیمات سرور خروجی اعتبارسنجی شد</string>
     <string name="account_server_validation_error_unknown">خطای ناشناخته</string>
     <string name="account_server_validation_sign_in">لطفا وارد شوید</string>
     <string name="account_server_validation_outgoing_loading_error">بررسی تنظیمات سرور خروجی با خطا مواجه شد</string>
-    <string name="account_server_validation_incoming_success">تنظیمات سرور ورودی معتبر است</string>
+    <string name="account_server_validation_incoming_success">تنظیمات سرور ورودی اعتبارسنجی شد</string>
     <string name="account_server_validation_error_client_certificate_retrieval_failure">گواهینامه کلاینت در دسترس نیست</string>
     <string name="account_server_validation_error_missing_server_capability_details">سرور این قابلیت را ندارد:
 \n%s</string>
diff --git a/feature/account/server/validation/src/main/res/values-is/strings.xml b/feature/account/server/validation/src/main/res/values-is/strings.xml
index 32eac8486..bdfed683b 100644
--- a/feature/account/server/validation/src/main/res/values-is/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-is/strings.xml
@@ -4,11 +4,11 @@
     <string name="account_server_validation_error_authentication">Auðkenningarvilla</string>
     <string name="account_server_validation_outgoing_loading_message">Athuga stillingar sendinga-póstþjónsins…</string>
     <string name="account_server_validation_error_network">Villa í netkerfi</string>
-    <string name="account_server_validation_outgoing_success">Stillingar sendinga-póstþjóns eru gildar</string>
+    <string name="account_server_validation_outgoing_success">Stillingar sendinga-póstþjóns sannreyndar</string>
     <string name="account_server_validation_error_unknown">Óþekkt villa</string>
     <string name="account_server_validation_sign_in">Skráðu þig inn</string>
     <string name="account_server_validation_outgoing_loading_error">Athugun á stillingum sendinga-póstþjónsins mistókst</string>
-    <string name="account_server_validation_incoming_success">Stillingar inn-póstþjóns eru gildar</string>
+    <string name="account_server_validation_incoming_success">Stillingar inn-póstþjóns sannreyndar</string>
     <string name="account_server_validation_incoming_loading_error">Athugun á stillingum inn-póstþjónsins mistókst</string>
     <string name="account_server_validation_error_server">Villa á þjóni</string>
     <string name="account_server_validation_error_missing_server_capability">Vantar upplýsingar um getu póstþjóns</string>
diff --git a/feature/account/server/validation/src/main/res/values-iw/strings.xml b/feature/account/server/validation/src/main/res/values-iw/strings.xml
index a6b3daec9..a3114f8cb 100644
--- a/feature/account/server/validation/src/main/res/values-iw/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-iw/strings.xml
@@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="account_server_validation_error_client_certificate_expired">תעודת הלקוח אינה בתוקף עוד</string>
+    <string name="account_server_validation_error_client_certificate_retrieval_failure">לא ניתן לגשת לתעודת הלקוח</string>
+    <string name="account_server_validation_error_missing_server_capability">יכולת שרת חסרה</string>
+    <string name="account_server_validation_error_details">פרטים:
+\n%s</string>
+    <string name="account_server_validation_incoming_success">הגדרות שרת נכנסות אומתו</string>
+    <string name="account_server_validation_outgoing_loading_error">בדיקת הגדרות שרת יוצאות נכשלה</string>
+    <string name="account_server_validation_incoming_loading_error">בדיקת הגדרות שרת נכנסות נכשלה</string>
+    <string name="account_server_validation_outgoing_loading_message">הגדרות שרת יוצאות בבדיקה…</string>
+    <string name="account_server_validation_incoming_loading_message">הגדרות שרת נכנסות בבדיקה…</string>
+    <string name="account_server_validation_outgoing_success">הגדרות שרת יוצאות אומתו</string>
+    <string name="account_server_validation_sign_in">אנא התחבר</string>
+    <string name="account_server_validation_error_authentication">שגיאת אימות</string>
+    <string name="account_server_validation_error_network">שגיאת רשת</string>
+    <string name="account_server_validation_error_server">שגיאת שרת</string>
+    <string name="account_server_validation_error_unknown">שגיאה לא ידועה</string>
+    <string name="account_server_validation_error_missing_server_capability_details">היכולת הבא חסרה לשרת:
+\n%s</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/validation/src/main/res/values-lt/strings.xml b/feature/account/server/validation/src/main/res/values-lt/strings.xml
index a6b3daec9..774a0f23e 100644
--- a/feature/account/server/validation/src/main/res/values-lt/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-lt/strings.xml
@@ -1,2 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="account_server_validation_error_client_certificate_expired">Kliento liudijimas nebegalioja</string>
+    <string name="account_server_validation_error_missing_server_capability">Serveryje trūksta galimybės</string>
+    <string name="account_server_validation_error_client_certificate_retrieval_failure">Kliento liudijimo nepavykto pasiekti</string>
+    <string name="account_server_validation_error_details">Išsamiau:
+\n%s</string>
+    <string name="account_server_validation_incoming_loading_message">Tikrinami gaunamų laiškų serverio parametrai…</string>
+    <string name="account_server_validation_sign_in">Prisijunkite</string>
+    <string name="account_server_validation_outgoing_success">Siunčiamų laiškų serverio parametrai patvirtinti</string>
+    <string name="account_server_validation_error_missing_server_capability_details">Serveryje trūksta šios galimybės:
+\n%s</string>
+    <string name="account_server_validation_incoming_loading_error">Nepavyko patikrinti gaunamų laiškų serverio parametrų</string>
+    <string name="account_server_validation_incoming_success">Gaunamų laiškų serverio parametrai patvirtinti</string>
+    <string name="account_server_validation_outgoing_loading_message">Tikrinami siunčiamų laiškų serverio parametrai…</string>
+    <string name="account_server_validation_outgoing_loading_error">Nepavyko patikrinti siunčiamų laiškų serverio parametrų</string>
+    <string name="account_server_validation_error_authentication">Klaida nustatant tapatybę</string>
+    <string name="account_server_validation_error_network">Tinklo klaida</string>
+    <string name="account_server_validation_error_server">Serverio klaida</string>
+    <string name="account_server_validation_error_unknown">Nežinoma klaida</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/server/validation/src/main/res/values-pt-rBR/strings.xml b/feature/account/server/validation/src/main/res/values-pt-rBR/strings.xml
index cc34b9a15..1486c2bdf 100644
--- a/feature/account/server/validation/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-pt-rBR/strings.xml
@@ -4,15 +4,18 @@
     <string name="account_server_validation_error_authentication">Erro de autenticação</string>
     <string name="account_server_validation_outgoing_loading_message">Checando configurações do servidor de saída…</string>
     <string name="account_server_validation_error_network">Erro de rede</string>
-    <string name="account_server_validation_outgoing_success">Configurações do servidor de saída são válidas</string>
+    <string name="account_server_validation_outgoing_success">Configurações do servidor de saída verificadas</string>
     <string name="account_server_validation_error_unknown">Erro desconhecido</string>
     <string name="account_server_validation_sign_in">Por favor, entre</string>
     <string name="account_server_validation_outgoing_loading_error">Erro ao checar configurações do servidor de saída</string>
-    <string name="account_server_validation_incoming_success">Configurações do servidor de entrada são válidas</string>
+    <string name="account_server_validation_incoming_success">Configurações do servidor de entrada verificadas</string>
     <string name="account_server_validation_incoming_loading_error">Erro ao checar configurações do servidor de entrada</string>
     <string name="account_server_validation_error_server">Erro do servidor</string>
     <string name="account_server_validation_error_client_certificate_expired">O certificado do cliente não está mais válido</string>
     <string name="account_server_validation_error_client_certificate_retrieval_failure">O certificado do cliente não pode ser acessado</string>
-    <string name="account_server_validation_error_missing_server_capability">Falta de capacidade no servidor</string>
-    <string name="account_server_validation_error_details">Detalhes</string>
+    <string name="account_server_validation_error_missing_server_capability">Falha de suporte no servidor</string>
+    <string name="account_server_validation_error_details">Detalhes:
+\n%s</string>
+    <string name="account_server_validation_error_missing_server_capability_details">O servidor não tem suporte para isso:
+\n%s</string>
 </resources>
\ No newline at end of file
diff --git a/feature/account/server/validation/src/main/res/values-ro/strings.xml b/feature/account/server/validation/src/main/res/values-ro/strings.xml
index e971092fa..e08b99c05 100644
--- a/feature/account/server/validation/src/main/res/values-ro/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-ro/strings.xml
@@ -4,11 +4,11 @@
     <string name="account_server_validation_error_authentication">Eroare de autentificare</string>
     <string name="account_server_validation_outgoing_loading_message">Verificarea setărilor serverului de expediere…</string>
     <string name="account_server_validation_error_network">Eroare de rețea</string>
-    <string name="account_server_validation_outgoing_success">Setările serverului de ieșire sunt valide</string>
+    <string name="account_server_validation_outgoing_success">Setările serverului de ieșire sunt verificate</string>
     <string name="account_server_validation_error_unknown">Eroare necunoscută</string>
     <string name="account_server_validation_sign_in">Conectează-te</string>
     <string name="account_server_validation_outgoing_loading_error">Verificarea setărilor serverului de ieșire a eșuat</string>
-    <string name="account_server_validation_incoming_success">Setările serverului de intrare sunt valide</string>
+    <string name="account_server_validation_incoming_success">Setările serverului de intrare sunt verificate</string>
     <string name="account_server_validation_incoming_loading_error">Verificarea setărilor serverului de intrare a eșuat</string>
     <string name="account_server_validation_error_server">Eroare de server</string>
     <string name="account_server_validation_error_missing_server_capability">Lipsește capacitatea serverului</string>
diff --git a/feature/account/server/validation/src/main/res/values-sq/strings.xml b/feature/account/server/validation/src/main/res/values-sq/strings.xml
index aca4a4848..0e39d8930 100644
--- a/feature/account/server/validation/src/main/res/values-sq/strings.xml
+++ b/feature/account/server/validation/src/main/res/values-sq/strings.xml
@@ -4,11 +4,11 @@
     <string name="account_server_validation_error_authentication">Gabim mirëfilltësimi</string>
     <string name="account_server_validation_outgoing_loading_message">Po kontrollohen rregullime shërbyesi dërgimi mesazhesh…</string>
     <string name="account_server_validation_error_network">Gabim rrjeti</string>
-    <string name="account_server_validation_outgoing_success">Rregullimet për shërbyes dërgimi mesazhesh janë të vlefshme</string>
+    <string name="account_server_validation_outgoing_success">Rregullimet për shërbyes dërgimi mesazhesh janë verifikuar</string>
     <string name="account_server_validation_error_unknown">Gabim i panjohur</string>
     <string name="account_server_validation_sign_in">Ju lutemi, bëni hyrjen</string>
     <string name="account_server_validation_outgoing_loading_error">Kontrolli i rregullimeve të shërbyesit të dërgimit të mesazheve dështoi</string>
-    <string name="account_server_validation_incoming_success">Rregullimet për shërbyes marrjeje mesazhesh janë të vlefshme</string>
+    <string name="account_server_validation_incoming_success">Rregullimet për shërbyes marrjeje mesazhesh janë verifikuar</string>
     <string name="account_server_validation_incoming_loading_error">Kontrolli i rregullimeve të shërbyesit të marrjes së mesazheve dështoi</string>
     <string name="account_server_validation_error_server">Gabim shërbyesi</string>
     <string name="account_server_validation_error_client_certificate_retrieval_failure">S’u përdor dot dëshmia e klientit</string>
diff --git a/feature/account/setup/src/main/res/values-cs/strings.xml b/feature/account/setup/src/main/res/values-cs/strings.xml
index 0fc1d0229..6ef92d4b0 100644
--- a/feature/account/setup/src/main/res/values-cs/strings.xml
+++ b/feature/account/setup/src/main/res/values-cs/strings.xml
@@ -27,7 +27,7 @@
     <string name="account_setup_error_network">Síť</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Toto není rozeznáno jako platná e-mailová adresa.</string>
     <string name="account_setup_options_email_check_frequency_never">Nikdy</string>
-    <string name="account_setup_auto_discovery_loading_message">Zjišťování podrobností o e-mailu</string>
+    <string name="account_setup_auto_discovery_loading_message">Zjišťování konfigurace…</string>
     <string name="account_setup_options_section_sync_options">Nastavení synchronizace</string>
     <string name="account_setup_options_show_notifications_label">Zobrazovat oznámení</string>
     <string name="account_setup_options_section_display_options">Nastavení zobrazení</string>
@@ -50,4 +50,20 @@
     <string name="account_setup_special_folders_trash_folder_label">Koš</string>
     <string name="account_setup_special_folders_folder_none">Žádný</string>
     <string name="account_setup_special_folders_folder_automatic">Automaticky (%s)</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Heslo je vyžadováno.</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">Každou minutu</item>
+        <item quantity="few">Každé %d minuty</item>
+        <item quantity="other">Každých %d minut</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">Každou hodinu</item>
+        <item quantity="few">Každé %d hodiny</item>
+        <item quantity="other">Každých %d hodin</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">1 zpráva</item>
+        <item quantity="few">%d zprávy</item>
+        <item quantity="other">%d zpráv</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-de/strings.xml b/feature/account/setup/src/main/res/values-de/strings.xml
index 47a6bdff0..29fef30ec 100644
--- a/feature/account/setup/src/main/res/values-de/strings.xml
+++ b/feature/account/setup/src/main/res/values-de/strings.xml
@@ -21,13 +21,13 @@
     <string name="account_setup_auto_discovery_status_header_title_configuration_found">Konfiguration gefunden</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_required">E-Mail-Adresse ist erforderlich.</string>
     <string name="account_setup_options_display_name_label">Dein Name</string>
-    <string name="account_setup_auto_discovery_loading_error">Die E-Mail-Konfiguration konnte nicht geladen werden</string>
+    <string name="account_setup_auto_discovery_loading_error">E-Mail-Konfiguration konnte nicht geladen werden</string>
     <string name="account_setup_auto_discovery_result_approval_checkbox_label">Ich vertraue dieser Konfiguration</string>
     <string name="account_setup_options_display_name_error_required">Dein Name ist erforderlich.</string>
     <string name="account_setup_error_network">Netzwerk</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Diese Adresse wird nicht als gültige E-Mail-Adresse erkannt.</string>
     <string name="account_setup_options_email_check_frequency_never">Niemals</string>
-    <string name="account_setup_auto_discovery_loading_message">E-Mail-Details finden</string>
+    <string name="account_setup_auto_discovery_loading_message">E-Mail-Konfiguration suchen…</string>
     <string name="account_setup_options_section_sync_options">Synchronisierungsoptionen</string>
     <string name="account_setup_options_show_notifications_label">Benachrichtigungen anzeigen</string>
     <string name="account_setup_options_section_display_options">Anzeigeoptionen</string>
@@ -50,4 +50,17 @@
     <string name="account_setup_special_folders_trash_folder_label">Papierkorb</string>
     <string name="account_setup_special_folders_folder_none">Keine</string>
     <string name="account_setup_special_folders_spam_folder_label">Spam</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Passwort ist erforderlich.</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">Jede Minute</item>
+        <item quantity="other">Alle %d Minuten</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">Jede Stunde</item>
+        <item quantity="other">Alle %d Stunden</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">1 Nachricht</item>
+        <item quantity="other">%d Nachrichten</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-eu/strings.xml b/feature/account/setup/src/main/res/values-eu/strings.xml
index 07bf43357..74647fa40 100644
--- a/feature/account/setup/src/main/res/values-eu/strings.xml
+++ b/feature/account/setup/src/main/res/values-eu/strings.xml
@@ -37,4 +37,30 @@
     <string name="account_setup_auto_discovery_validation_error_email_address_not_supported">Helbide elektroniko hau ez da bateragarria.</string>
     <string name="account_setup_create_account_creating">Kontua sortzen…</string>
     <string name="account_setup_create_account_error">Errore bat gertatu da kontua sortzerakoan</string>
+    <string name="account_setup_special_folders_top_bar_title">Karpeta bereziak</string>
+    <string name="account_setup_special_folders_form_description">Zehaztu zure kontuko karpeta bereziak.</string>
+    <string name="account_setup_special_folders_loading_message">Karpeten zerrenda lortzen…</string>
+    <string name="account_setup_special_folders_error_message">Ezin izan da zerbitzaritik karpeten zerrenda eskuratu</string>
+    <string name="account_setup_special_folders_form_description_automatic">\"Automatiko\" sarrerak zerbitzariak egindako aldaketei jarraituko die automatikoki. Uneko zerbitzariaren balioa parentesi artean bistaratzen da.</string>
+    <string name="account_setup_special_folders_success_message">Zerbitzariak karpeta berezi guztiak automatikoki konfiguratu ditu.</string>
+    <string name="account_setup_special_folders_archive_folder_label">Artxiboen karpeta</string>
+    <string name="account_setup_special_folders_drafts_folder_label">Zirriborroen karpeta</string>
+    <string name="account_setup_special_folders_sent_folder_label">Bidalitakoen karpeta</string>
+    <string name="account_setup_special_folders_spam_folder_label">Spam karpeta</string>
+    <string name="account_setup_special_folders_trash_folder_label">Zaborrontziaren karpeta</string>
+    <string name="account_setup_special_folders_folder_none">Bat ere ez</string>
+    <string name="account_setup_special_folders_folder_automatic">Automatikoa (%s)</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Pasahitza beharrezkoa da.</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">Minuturo</item>
+        <item quantity="other">%d minuturo</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">Orduro</item>
+        <item quantity="other">%d orduro</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">Mezu bat</item>
+        <item quantity="other">%d mezu</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-fa/strings.xml b/feature/account/setup/src/main/res/values-fa/strings.xml
index 8cc63c350..015b823ad 100644
--- a/feature/account/setup/src/main/res/values-fa/strings.xml
+++ b/feature/account/setup/src/main/res/values-fa/strings.xml
@@ -35,19 +35,32 @@
     <string name="account_setup_auto_discovery_status_header_title_configuration_found">پیکربندی پیدا شد</string>
     <string name="account_setup_special_folders_archive_folder_label">پوشه بایگانی</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_required">نشانی رایانامه اجباری است.</string>
-    <string name="account_setup_options_display_name_label">نام نمایشی</string>
+    <string name="account_setup_options_display_name_label">نام شما</string>
     <string name="account_setup_auto_discovery_loading_error">خطا در بارگیری پیکربندی ایمیل</string>
     <string name="account_setup_auto_discovery_result_approval_checkbox_label">من به این پیکربندی اعتماد دارم</string>
-    <string name="account_setup_options_display_name_error_required">نام نمایشی اجباری است.</string>
+    <string name="account_setup_options_display_name_error_required">نام نمایشی شما اجباری است.</string>
     <string name="account_setup_create_account_error">در هنگام تلاش برای ایجاد حساب خطا رخ داده است</string>
     <string name="account_setup_error_network">شبکه</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">این یک آدرس ایمیل معتبر نیست.</string>
     <string name="account_setup_special_folders_spam_folder_label">پوشه هرزنامه</string>
     <string name="account_setup_options_email_check_frequency_never">هرگز</string>
-    <string name="account_setup_auto_discovery_loading_message">پیدا کردن جزییات رایانامه</string>
+    <string name="account_setup_auto_discovery_loading_message">پیدا کردن پیکربندی</string>
     <string name="account_setup_options_section_sync_options">گزینه‌های همگام‌سازی</string>
     <string name="account_setup_options_show_notifications_label">نمایش اعلان‌ها</string>
     <string name="account_setup_options_section_display_options">گزینه‌های نمایش</string>
     <string name="account_setup_special_folders_form_description_automatic">تنظیم \"خودکار\" تغییراتی که توسط سرور به طور خودکار انجام می شود را اعمال می‌کند. مقدار فعلی در داخل پرانتز نمایش داده می‌شود.</string>
     <string name="account_setup_title">کلاینت رایانامه K9</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">رمز عبور مورد نیاز است</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">هر %d دقیقه</item>
+        <item quantity="other">هر %d دقیقه</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">هر ساعت</item>
+        <item quantity="other">هر %d ساعت</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">۱ پیام</item>
+        <item quantity="other">%d پیام</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-is/strings.xml b/feature/account/setup/src/main/res/values-is/strings.xml
index 38080dd4e..e164ecd0d 100644
--- a/feature/account/setup/src/main/res/values-is/strings.xml
+++ b/feature/account/setup/src/main/res/values-is/strings.xml
@@ -27,7 +27,7 @@
     <string name="account_setup_options_display_name_error_required">Nafnið þitt er nauðsynlegt.</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Þetta telst ekki vera gilt tölvupóstfang.</string>
     <string name="account_setup_options_email_check_frequency_never">Aldrei</string>
-    <string name="account_setup_auto_discovery_loading_message">Finna nánar um tölvupóst</string>
+    <string name="account_setup_auto_discovery_loading_message">Skoða grunnstillingar…</string>
     <string name="account_setup_options_section_sync_options">Valkostir samstillinga</string>
     <string name="account_setup_options_show_notifications_label">Birta tilkynningar</string>
     <string name="account_setup_options_section_display_options">Valkostir birtingar</string>
@@ -48,4 +48,19 @@
     <string name="account_setup_special_folders_trash_folder_label">Rusl-mappa</string>
     <string name="account_setup_special_folders_archive_folder_label">Safnmappa</string>
     <string name="account_setup_special_folders_spam_folder_label">Ruslpóstmappa</string>
+    <string name="account_setup_special_folders_form_description_automatic">\"Sjálfvirkt\" færslan mun fylgja sjálfkrafa þeim breytingum sem póstþjónninn gerir. Fyrirliggjandi gildi þjónsins eru birt innan sviga.</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Lykilorð er nauðsynlegt.</string>
+    <string name="account_setup_special_folders_success_message">Allar sérmöppur hafa verið stilltar sjálfkrafa af póstþjóninum.</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">Á mínútu fresti</item>
+        <item quantity="other">Á %d mínútna fresti</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">Á klukkustundar fresti</item>
+        <item quantity="other">Á %d klukkustunda fresti</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">1 skilaboð</item>
+        <item quantity="other">%d skilaboð</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-it/strings.xml b/feature/account/setup/src/main/res/values-it/strings.xml
index d83c709cb..a860d0d75 100644
--- a/feature/account/setup/src/main/res/values-it/strings.xml
+++ b/feature/account/setup/src/main/res/values-it/strings.xml
@@ -27,7 +27,7 @@
     <string name="account_setup_error_network">Rete</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Non è riconosciuto come indirizzo email valido</string>
     <string name="account_setup_options_email_check_frequency_never">Mai</string>
-    <string name="account_setup_auto_discovery_loading_message">Ricerca configurazione email</string>
+    <string name="account_setup_auto_discovery_loading_message">Ricerca della configurazione…</string>
     <string name="account_setup_options_section_sync_options">Opzioni di sincronizzazione</string>
     <string name="account_setup_options_show_notifications_label">Mostra notifiche</string>
     <string name="account_setup_options_section_display_options">Opzioni di visualizzazione</string>
@@ -53,17 +53,17 @@
     <plurals name="account_setup_options_email_display_count_messages">
         <item quantity="one">1 messaggio</item>
         <item quantity="many">%d messaggi</item>
-        <item quantity="other"></item>
+        <item quantity="other">%d messaggi</item>
     </plurals>
     <plurals name="account_setup_options_email_check_frequency_hours">
         <item quantity="one">Ogni ora</item>
         <item quantity="many">Ogni %d ore</item>
-        <item quantity="other"></item>
+        <item quantity="other">Ogni %d ore</item>
     </plurals>
     <string name="account_setup_auto_discovery_validation_error_password_required">La password è richiesta.</string>
     <plurals name="account_setup_options_email_check_frequency_minutes">
         <item quantity="one">Ogni minuto</item>
         <item quantity="many">Ogni %d minuti</item>
-        <item quantity="other"></item>
+        <item quantity="other">Ogni %d minuti</item>
     </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-lt/strings.xml b/feature/account/setup/src/main/res/values-lt/strings.xml
index a6b3daec9..52488f47b 100644
--- a/feature/account/setup/src/main/res/values-lt/strings.xml
+++ b/feature/account/setup/src/main/res/values-lt/strings.xml
@@ -1,2 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="account_setup_special_folders_top_bar_title">Specialieji aplankai</string>
+    <string name="account_setup_special_folders_loading_message">Gaunamas aplankų sąrašas…</string>
+    <string name="account_setup_special_folders_error_message">Nepavyko gauti aplankų sąrašo iš serverio</string>
+    <string name="account_setup_special_folders_success_message">Visi specialieji aplankai automatiškai sukonfigūruoti remiantis serverio parametrais.</string>
+    <string name="account_setup_special_folders_archive_folder_label">Archyvo aplankas</string>
+    <string name="account_setup_special_folders_drafts_folder_label">Juodraščių aplankas</string>
+    <string name="account_setup_special_folders_spam_folder_label">Brukalo aplankas</string>
+    <string name="account_setup_special_folders_trash_folder_label">Šiukšlinės aplankas</string>
+    <string name="account_setup_special_folders_folder_none">Jokio</string>
+    <string name="account_setup_special_folders_folder_automatic">Automatinis (%s)</string>
+    <string name="account_setup_options_top_bar_title">Paskyros nustatymai</string>
+    <string name="account_setup_options_account_name_error_blank">Paskyros pavadinimas negali būti tuščias.</string>
+    <string name="account_setup_options_display_name_label">Jūsų vardas</string>
+    <string name="account_setup_options_display_name_error_required">Jūsų vardas būtinas.</string>
+    <string name="account_setup_options_email_signature_error_blank">Laiškų parašo pavadinimas negali būti tuščias.</string>
+    <string name="account_setup_options_email_signature_label">Laiškų parašas</string>
+    <string name="account_setup_options_account_check_frequency_label">Tikrinimo dažnis</string>
+    <string name="account_setup_options_email_check_frequency_never">Niekada</string>
+    <string name="account_setup_options_email_display_count_label">Rodomų laiškų kiekis</string>
+    <string name="account_setup_special_folders_sent_folder_label">Išsiųstųjų aplankas</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">Kas %d minutę</item>
+        <item quantity="few">Kas %d minutes</item>
+        <item quantity="other">Kas %d minučių</item>
+    </plurals>
+    <string name="account_setup_options_show_notifications_label">Rodyti pranešimus</string>
+    <string name="account_setup_auto_discovery_result_disclaimer_untrusted_configuration">Jūsų el. pašto serverių konfigūraciją gavome ne tokiu saugiu ryšiu, kokiu norėtume. Tai reiškia, jog yra nedidelė galimybė, kad ji buvo pakeista. Prašom patikrinti, jog žemiau nurodyta konfigūracija yra teisinga.</string>
+    <string name="account_setup_special_folders_form_description">Prašom nurodyti šios paskyros specialiuosius aplankus.</string>
+    <string name="account_setup_special_folders_form_description_automatic">Pasirinkus „Automatinis“, bus automatiškai sekami serveryje atlikti pakeitimai. Esamoji reikšmė nurodyta skliaustuose.</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Slaptažodį įvesti privaloma.</string>
+    <string name="account_setup_auto_discovery_loading_message">Ieškoma konfigūracijos…</string>
+    <string name="account_setup_auto_discovery_loading_error">Nepavyko įkelti el. pašto konfigūracijos</string>
+    <string name="account_setup_auto_discovery_status_header_title_configuration_found">Konfigūracija aptikta</string>
+    <string name="account_setup_auto_discovery_result_header_title_configuration_not_found">Konfigūracija neaptikta</string>
+    <string name="account_setup_auto_discovery_result_header_subtitle_configuration_trusted">Konfigūruoti automatiškai</string>
+    <string name="account_setup_auto_discovery_result_header_subtitle_configuration_untrusted">Šia konfigūracija nepasitikima</string>
+    <string name="account_setup_auto_discovery_result_header_subtitle_configuration_not_found">Konfigūruoti rankiniu būdu</string>
+    <string name="account_setup_auto_discovery_result_edit_configuration_button_label">Taisyti konfigūraciją</string>
+    <string name="account_setup_auto_discovery_result_approval_checkbox_label">Pasitikiu šia konfigūracija</string>
+    <string name="account_setup_auto_discovery_result_approval_error_approval_required">Tai būtina konfigūracijai patvirtinti.</string>
+    <string name="account_setup_options_section_sync_options">Sinchronizavimo nustatymai</string>
+    <string name="account_setup_create_account_creating">Kuriama paskyra…</string>
+    <string name="account_setup_create_account_created">Paskyra sėkmingai sukurta</string>
+    <string name="account_setup_title">K-9 paštas</string>
+    <string name="account_setup_button_finish">Užbaigti</string>
+    <string name="account_setup_error_network">Tinklas</string>
+    <string name="account_setup_error_unknown">Nenumatyta klaida</string>
+    <string name="account_setup_auto_discovery_validation_error_email_address_required">El. pašto adresą įvesti būtina.</string>
+    <string name="account_setup_auto_discovery_validation_error_email_address_not_allowed">Šis el. pašto adresas neleidžiamas.</string>
+    <string name="account_setup_auto_discovery_validation_error_email_address_not_supported">Šis el. pašto adresas nepalaikomas.</string>
+    <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Įvestas tekstas nepanašus į el. pašto adresą.</string>
+    <string name="account_setup_auto_discovery_connection_security_start_tls">StartTLS</string>
+    <string name="account_setup_auto_discovery_connection_security_ssl">SSL/TLS</string>
+    <string name="account_setup_options_section_display_options">Rodymo nustatymai</string>
+    <string name="account_setup_options_account_name_label">Paskyros pavadinimas</string>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">Kas %d valandą</item>
+        <item quantity="few">Kas %d valandas</item>
+        <item quantity="other">Kas %d valandų</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">%d laiškas</item>
+        <item quantity="few">%d laiškai</item>
+        <item quantity="other">%d laiškų</item>
+    </plurals>
+    <string name="account_setup_create_account_error">Kuriant paskyrą, įvyko klaida</string>
+</resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-pt-rBR/strings.xml b/feature/account/setup/src/main/res/values-pt-rBR/strings.xml
index b3ebee23e..5c96fe9d8 100644
--- a/feature/account/setup/src/main/res/values-pt-rBR/strings.xml
+++ b/feature/account/setup/src/main/res/values-pt-rBR/strings.xml
@@ -20,14 +20,14 @@
     <string name="account_setup_options_account_name_label">Nome da conta</string>
     <string name="account_setup_auto_discovery_status_header_title_configuration_found">Configuração encontrada</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_required">Endereço de email é obrigatório.</string>
-    <string name="account_setup_options_display_name_label">Nome de exibição</string>
+    <string name="account_setup_options_display_name_label">Seu nome</string>
     <string name="account_setup_auto_discovery_loading_error">Falha ao carregar configuração do email</string>
     <string name="account_setup_auto_discovery_result_approval_checkbox_label">Eu confio nessa configuração</string>
-    <string name="account_setup_options_display_name_error_required">Nome de exibição é obrigatório.</string>
+    <string name="account_setup_options_display_name_error_required">Seu nome é obrigatório.</string>
     <string name="account_setup_error_network">Rede</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Este endereço eletrônico é inválido.</string>
     <string name="account_setup_options_email_check_frequency_never">Nunca</string>
-    <string name="account_setup_auto_discovery_loading_message">Encontrando configuração do email</string>
+    <string name="account_setup_auto_discovery_loading_message">Encontrando configuração do email…</string>
     <string name="account_setup_options_section_sync_options">Opções de sincronização</string>
     <string name="account_setup_options_show_notifications_label">Mostrar notificações</string>
     <string name="account_setup_options_section_display_options">Opções de visualização</string>
@@ -37,4 +37,33 @@
     <string name="account_setup_auto_discovery_validation_error_email_address_not_supported">Este endereço eletrônico não é suportado.</string>
     <string name="account_setup_create_account_creating">Criando a conta…</string>
     <string name="account_setup_create_account_error">Um erro ocorreu ao tentar criar a conta</string>
+    <string name="account_setup_special_folders_form_description_automatic">A opção \"Automático\" irá seguir mudanças do servidor automaticamente. O valor atual do servidor é mostrado entre parênteses.</string>
+    <string name="account_setup_special_folders_folder_automatic">Automático (%s)</string>
+    <string name="account_setup_special_folders_loading_message">Obtendo lista de pastas…</string>
+    <string name="account_setup_special_folders_success_message">Todas as pastas especiais foram configuradas automaticamente pelo servidor.</string>
+    <string name="account_setup_special_folders_spam_folder_label">Pasta de spam</string>
+    <string name="account_setup_special_folders_trash_folder_label">Pasta da lixeira</string>
+    <string name="account_setup_special_folders_folder_none">Nenhum</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Senha é obrigatória.</string>
+    <string name="account_setup_special_folders_top_bar_title">Pastas especiais</string>
+    <string name="account_setup_special_folders_form_description">Por favor, especifique as pastas especiais para sua conta.</string>
+    <string name="account_setup_special_folders_error_message">Falha em obter lista de pastas do servidor</string>
+    <string name="account_setup_special_folders_archive_folder_label">Pasta de arquivo</string>
+    <string name="account_setup_special_folders_drafts_folder_label">Pasta de rascunhos</string>
+    <string name="account_setup_special_folders_sent_folder_label">Pasta de enviados</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">A cada %d minuto</item>
+        <item quantity="many">A cada %d minutos</item>
+        <item quantity="other">A cada %d minutos</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">A cada %d hora</item>
+        <item quantity="many">A cada %d horas</item>
+        <item quantity="other">A cada %d horas</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">%d mensagem</item>
+        <item quantity="many">%d mensagens</item>
+        <item quantity="other">%d mensagens</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-ro/strings.xml b/feature/account/setup/src/main/res/values-ro/strings.xml
index b8f842e0b..13601832f 100644
--- a/feature/account/setup/src/main/res/values-ro/strings.xml
+++ b/feature/account/setup/src/main/res/values-ro/strings.xml
@@ -27,7 +27,7 @@
     <string name="account_setup_error_network">Rețea</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Aceasta nu este recunoscută ca o adresă de e-mail validă.</string>
     <string name="account_setup_options_email_check_frequency_never">Niciodată</string>
-    <string name="account_setup_auto_discovery_loading_message">Găsirea detaliilor de e-mail</string>
+    <string name="account_setup_auto_discovery_loading_message">Se caută configurația…</string>
     <string name="account_setup_options_section_sync_options">Opțiuni de sincronizare</string>
     <string name="account_setup_options_show_notifications_label">Afișare notificări</string>
     <string name="account_setup_options_section_display_options">Opțiuni de afișare</string>
@@ -50,4 +50,20 @@
     <string name="account_setup_special_folders_archive_folder_label">Dosarul de arhivare</string>
     <string name="account_setup_special_folders_spam_folder_label">Dosarul spam</string>
     <string name="account_setup_special_folders_form_description_automatic">Intrarea „Automat” va urma automat modificările făcute de server. Valoarea curentă a serverului este afișată în paranteze.</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Parola este necesară.</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">Fiecare %d minut</item>
+        <item quantity="few">Fiecare %d minute</item>
+        <item quantity="other">Fiecare %d minute</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">Fiecare %d oră</item>
+        <item quantity="few">Fiecare %d ore</item>
+        <item quantity="other">Fiecare %d ore</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">%d mesaj</item>
+        <item quantity="few">%d mesaje</item>
+        <item quantity="other">%d mesaje</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/account/setup/src/main/res/values-sq/strings.xml b/feature/account/setup/src/main/res/values-sq/strings.xml
index 5f15fa391..bf39986fa 100644
--- a/feature/account/setup/src/main/res/values-sq/strings.xml
+++ b/feature/account/setup/src/main/res/values-sq/strings.xml
@@ -21,14 +21,14 @@
     <string name="account_setup_options_account_name_label">Emër llogarie</string>
     <string name="account_setup_auto_discovery_status_header_title_configuration_found">U Gjet formësim</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_required">Lypset adresa email.</string>
-    <string name="account_setup_options_display_name_label">Emër në ekran</string>
+    <string name="account_setup_options_display_name_label">Emri juaj</string>
     <string name="account_setup_auto_discovery_loading_error">S’u arrit të ngarkohej formësimi i email-it</string>
     <string name="account_setup_auto_discovery_result_approval_checkbox_label">E besoj këtë formësim</string>
-    <string name="account_setup_options_display_name_error_required">Emri në ekran është i domosdoshëm.</string>
+    <string name="account_setup_options_display_name_error_required">Emri juaj është i domosdoshëm.</string>
     <string name="account_setup_error_network">Rrjeti</string>
     <string name="account_setup_auto_discovery_validation_error_email_address_invalid">Kjo nuk njihet si adresë email e vlefshme.</string>
     <string name="account_setup_options_email_check_frequency_never">Kurrë</string>
-    <string name="account_setup_auto_discovery_loading_message">Po gjenden hollësi email-i</string>
+    <string name="account_setup_auto_discovery_loading_message">Po shihet për formësim…</string>
     <string name="account_setup_options_section_sync_options">Mundësi njëkohësimi</string>
     <string name="account_setup_options_show_notifications_label">Shfaq njoftime</string>
     <string name="account_setup_options_section_display_options">Mundësi shfaqjeje</string>
@@ -50,4 +50,17 @@
     <string name="account_setup_create_account_error">Ndodhi një gabim teksa provohej të krijohej llogaria</string>
     <string name="account_setup_special_folders_spam_folder_label">Dosje të padëshiruarish</string>
     <string name="account_setup_special_folders_form_description_automatic">Zëri “Automatik” do të pasojë ndryshime të bëra nga shërbyesi automatikisht. Vlera aktuale e shërbyesit shfaqet në kllapa.</string>
+    <string name="account_setup_auto_discovery_validation_error_password_required">Fjalëkalimi është i domosdoshëm.</string>
+    <plurals name="account_setup_options_email_check_frequency_minutes">
+        <item quantity="one">Çdo minutë</item>
+        <item quantity="other">Çdo %d minuta</item>
+    </plurals>
+    <plurals name="account_setup_options_email_check_frequency_hours">
+        <item quantity="one">Çdo orë</item>
+        <item quantity="other">Çdo %d orë</item>
+    </plurals>
+    <plurals name="account_setup_options_email_display_count_messages">
+        <item quantity="one">1 mesazh</item>
+        <item quantity="other">%d mesazhe</item>
+    </plurals>
 </resources>
\ No newline at end of file
diff --git a/feature/onboarding/permissions/src/main/res/values-lt/strings.xml b/feature/onboarding/permissions/src/main/res/values-lt/strings.xml
index a6b3daec9..85683b7f0 100644
--- a/feature/onboarding/permissions/src/main/res/values-lt/strings.xml
+++ b/feature/onboarding/permissions/src/main/res/values-lt/strings.xml
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="onboarding_permissions_screen_title">Pagerinkite patirtį</string>
+    <string name="onboarding_permissions_contacts_title">Kontaktai</string>
+    <string name="onboarding_permissions_contacts_description">Leiskite prieigą, kad programa galėtų siūlyti laiškų adresatus, rodyti jų vardus ir nuotraukas.</string>
+    <string name="onboarding_permissions_notifications_title">Pranešimai</string>
+    <string name="onboarding_permissions_notifications_description">Įjunkite pranešimus, kad gaunami laiškai neliktų nepastebėti.</string>
+    <string name="onboarding_permissions_allow_button">Leisti</string>
+    <string name="onboarding_permissions_skip_button">Praleisti</string>
+</resources>
\ No newline at end of file
diff --git a/feature/onboarding/welcome/src/main/res/values-en-rGB/strings.xml b/feature/onboarding/welcome/src/main/res/values-en-rGB/strings.xml
index e9ddaea46..82f07ba7d 100644
--- a/feature/onboarding/welcome/src/main/res/values-en-rGB/strings.xml
+++ b/feature/onboarding/welcome/src/main/res/values-en-rGB/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="onboarding_welcome_title">K-9 Mail</string>
-    <string name="onboarding_welcome_start_button">Iniziamo</string>
-    <string name="onboarding_welcome_import_button">Importa impostazioni</string>
-    <string name="onboarding_welcome_message">Benvenuto in K-9 Mail, il client di posta elettronica Android progettato per la sicurezza, la personalizzazione e la gestione fluida di tutti i tuoi account di posta elettronica.</string>
+    <string name="onboarding_welcome_start_button">Start</string>
+    <string name="onboarding_welcome_import_button">Import settings</string>
+    <string name="onboarding_welcome_message">Welcome to K-9 Mail, the Android email client designed for enhanced security, easy customisation, and seamless management of all your email accounts.</string>
 </resources>
\ No newline at end of file
diff --git a/feature/onboarding/welcome/src/main/res/values-iw/strings.xml b/feature/onboarding/welcome/src/main/res/values-iw/strings.xml
index a6b3daec9..1ef2a1d53 100644
--- a/feature/onboarding/welcome/src/main/res/values-iw/strings.xml
+++ b/feature/onboarding/welcome/src/main/res/values-iw/strings.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="onboarding_welcome_title">דוא\"ל K-9</string>
+    <string name="onboarding_welcome_message">ברוכים הבאים ל- K-9 דוא\"ל, לקוח הדואר האלקטרוני של אנדרואיד שתוכנן עבור אבטחה משופרת, התאמה אישית קלה וניהול חלק של כל חשבונות הדואר האלקטרוני שלכם.</string>
+    <string name="onboarding_welcome_start_button">התחלה</string>
+    <string name="onboarding_welcome_import_button">ייבוא הגדרות</string>
+</resources>
\ No newline at end of file
diff --git a/feature/onboarding/welcome/src/main/res/values-lt/strings.xml b/feature/onboarding/welcome/src/main/res/values-lt/strings.xml
index a6b3daec9..8532965d6 100644
--- a/feature/onboarding/welcome/src/main/res/values-lt/strings.xml
+++ b/feature/onboarding/welcome/src/main/res/values-lt/strings.xml
@@ -1,2 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="onboarding_welcome_message">Sveiki! Tai – „K-9 paštas“, el. pašto programa „Android“ aplinkai, orientuota į didesnį saugumą, patogų tinkinimą ir paprastą el. pašto paskyrų tvarkymą.</string>
+    <string name="onboarding_welcome_title">K-9 paštas</string>
+    <string name="onboarding_welcome_start_button">Pradėti</string>
+    <string name="onboarding_welcome_import_button">Importuoti nustatymus</string>
+</resources>
\ No newline at end of file
diff --git a/feature/settings/import/src/main/res/values-it/strings.xml b/feature/settings/import/src/main/res/values-it/strings.xml
index 596e286bb..26ba18196 100644
--- a/feature/settings/import/src/main/res/values-it/strings.xml
+++ b/feature/settings/import/src/main/res/values-it/strings.xml
@@ -22,9 +22,9 @@
     <string name="settings_import_later_button">Più tardi</string>
     <string name="settings_importing">Importazione impostazioni…</string>
     <plurals name="settings_import_password_prompt">
-        <item quantity="one">Per poter utilizzare l\'account \"<xliff:g id="account">%s</xliff:g>\" devi fornire la password del server</item>
-        <item quantity="many">Per poter utilizzare l\'account \"<xliff:g id="account">%s</xliff:g>\" devi fornire le password del server</item>
-        <item quantity="other">Per poter utilizzare l\'account \"<xliff:g id="account">%s</xliff:g>\" devi fornire le password del server</item>
+        <item quantity="one">Per poter utilizzare l\'account \"<xliff:g id="account">%s</xliff:g>\" devi fornire la password del server.</item>
+        <item quantity="many">Per poter utilizzare l\'account \"<xliff:g id="account">%s</xliff:g>\" devi fornire le password del server.</item>
+        <item quantity="other">Per poter utilizzare l\'account \"<xliff:g id="account">%s</xliff:g>\" devi fornire le password del server.</item>
     </plurals>
     <string name="settings_import_incoming_server_password_hint">Password server in arrivo</string>
     <string name="settings_import_outgoing_server_password_hint">Password server in uscita</string>
@@ -35,7 +35,7 @@
     <string name="settings_import_oauth_sign_in_with_google">Accedi con Google</string>
     <string name="settings_import_oauth_error_oauth_flow_canceled">Autorizzazione annullata</string>
     <string name="settings_import_oauth_error_oauth_flow_failed">Autorizzazione non riuscita con il seguente errore: <xliff:g id="error">%s</xliff:g></string>
-    <string name="settings_import_oauth_error_oauth_not_supported">OAuth 2.0 non supportato da questo provider di posta</string>
-    <string name="settings_import_oauth_error_browser_not_found">L\' applicazione non trova un browser per richiedere l\'accesso al tuo account</string>
+    <string name="settings_import_oauth_error_oauth_not_supported">OAuth 2.0 non è supportato da questo provider di posta.</string>
+    <string name="settings_import_oauth_error_browser_not_found">L\' applicazione non trova un browser per richiedere l\'accesso al tuo account.</string>
     <string name="settings_import_general_settings_item">Impostazioni generali</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/feature/settings/import/src/main/res/values-lt/strings.xml b/feature/settings/import/src/main/res/values-lt/strings.xml
index a52adc294..fe5e42c6b 100644
--- a/feature/settings/import/src/main/res/values-lt/strings.xml
+++ b/feature/settings/import/src/main/res/values-lt/strings.xml
@@ -9,7 +9,7 @@
     <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
     <string name="settings_import_authorization_required">Prašome prisijungti</string>
     <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
-    <string name="settings_import_authorization_and_password_required">Prašome priisjungti ir įvesti slaptažodžius</string>
+    <string name="settings_import_authorization_and_password_required">Prašome prisijungti ir įvesti slaptažodžius</string>
     <string name="settings_import_failure">Nepavyko importuoti nustatymų</string>
     <string name="settings_import_read_failure">Nepavyko nuskaityti nustatymų failo</string>
     <string name="settings_import_partial_failure">Nepavyko importuoti kai kurių nustatymų</string>
@@ -39,4 +39,4 @@
     <string name="settings_import_oauth_error_oauth_not_supported">Šiuo metu šis teikėjas nepalaiko OAuth 2.0.</string>
     <string name="settings_import_oauth_error_browser_not_found">Programai nepavyko rasti naršyklės, kurią naudoti suteikiant prieigą prie paskyros.</string>
     <string name="settings_import_general_settings_item">Bendri nustatymai</string>
-</resources>
+</resources>
\ No newline at end of file