diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml
index 5790e402b..859af53c9 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -91,6 +91,7 @@ Hlášení o chyb, úpravy pro nové funkce a dotazy zadávejte prostřednictví
   <string name="forward_as_attachment_action">Přeposlat jako přílohu</string>
   <string name="edit_as_new_message_action">Upravit jako novou zprávu</string>
   <string name="move_action">Přesunout</string>
+  <string name="move_to_drafts_action">Přesunout do konceptů</string>
   <string name="single_message_options_action">Odeslat…</string>
   <string name="refile_action">Přesměrovat…</string>
   <string name="done_action">Hotovo</string>
diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml
index de8c26159..24a534f7c 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -90,6 +90,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="spam_action">Spam</string>
   <string name="forward_action">Videresend</string>
   <string name="forward_as_attachment_action">Videresend som vedhæftet fil</string>
+  <string name="edit_as_new_message_action">Rediger som ny besked besked</string>
   <string name="move_action">Flyt</string>
   <string name="single_message_options_action">Send…</string>
   <string name="refile_action">Genarkivering…</string>
@@ -104,9 +105,9 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="compose_action">Skriv</string>
   <string name="search_action">Søg</string>
   <string name="search_results">Søgeresultater</string>
-  <string name="preferences_action">Opsætning</string>
+  <string name="preferences_action">Indstillinger</string>
   <string name="folders_action">Håndtere mapper</string>
-  <string name="account_settings_action">Konto opsætning</string>
+  <string name="account_settings_action">Kontoindstillinger</string>
   <string name="remove_account_action">Slet konto</string>
   <string name="mark_as_read_action">Marker som læst</string>
   <string name="send_alternate_action">Del</string>
@@ -130,7 +131,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="empty_trash_action">Tøm papirkurv</string>
   <string name="expunge_action">Ryd helt</string>
   <string name="about_action">Om</string>
-  <string name="prefs_title">Opsætning</string>
+  <string name="prefs_title">Indstillinger</string>
   <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
   <string name="general_no_subject">(Intet emne)</string>
   <string name="general_no_sender">Ingen afsender</string>
@@ -158,7 +159,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="notification_action_archive_all">Arkivér alle</string>
   <string name="notification_action_spam">Spam</string>
   <string name="notification_certificate_error_title">Certifikat fejl for <xliff:g id="account">%s</xliff:g></string>
-  <string name="notification_certificate_error_text">Kontrollere server opsætning</string>
+  <string name="notification_certificate_error_text">Kontroller dine serverindstillinger</string>
   <string name="notification_authentication_error_title">Godkendelse mislykkedes</string>
   <string name="notification_authentication_error_text">Godkendelse mislykkedes for <xliff:g id="account">%s</xliff:g>. Opdater dine serverindstillinger.</string>
   <string name="notification_bg_sync_ticker">Synkroniserer mail: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
@@ -202,6 +203,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="message_compose_show_quoted_text_action">Medtage citeret besked</string>
   <string name="message_compose_description_delete_quoted_text">Fjerne citeret tekst</string>
   <string name="message_compose_description_edit_quoted_text">Redigere citeret tekst</string>
+  <string name="remove_attachment_action">Fjern vedhæftning</string>
   <string name="message_view_from_format">Fra: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
   <string name="message_to_label">Til:</string>
   <string name="message_view_cc_label">Cc:</string>
@@ -296,7 +298,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="account_setup_auth_type_insecure_password">Kodeord; sendt usikret</string>
   <string name="account_setup_auth_type_encrypted_password">Krypteret kodeord</string>
   <string name="account_setup_auth_type_tls_client_certificate">Klient certifikat</string>
-  <string name="account_setup_incoming_title">Indgående server opsætning</string>
+  <string name="account_setup_incoming_title">Indgående serverindstillinger</string>
   <string name="account_setup_incoming_username_label">Brugernavn</string>
   <string name="account_setup_incoming_password_label">Password</string>
   <string name="account_setup_incoming_client_certificate_label">Klient certifikat</string>
@@ -339,7 +341,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="account_setup_incoming_webdav_auth_path_hint">Frivilligt</string>
   <string name="account_setup_incoming_webdav_mailbox_path_label">Sti til mailboks (alias)</string>
   <string name="account_setup_incoming_webdav_mailbox_path_hint">Frivilligt</string>
-  <string name="account_setup_outgoing_title">Udgående server opsætning</string>
+  <string name="account_setup_outgoing_title">Udgående serverindstillinger</string>
   <string name="account_setup_outgoing_smtp_server_label">SMTP server</string>
   <string name="account_setup_outgoing_port_label">Port</string>
   <string name="account_setup_outgoing_security_label">Sikkerhedstype</string>
@@ -418,6 +420,8 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="account_settings_notification_opens_unread_summary">Søger efter ulæste meddelelser når besked åbnes</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marker som læst ved åbning</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marker som læst når meddelses åbnes for læsning</string>
+  <string name="account_settings_mark_message_as_read_on_delete_label">Marker som læst ved sletning</string>
+  <string name="account_settings_mark_message_as_read_on_delete_summary">Marker en besked som læst når den bliver slettet</string>
   <string name="account_settings_notification_open_system_notifications_label">Påmindelse opsætning</string>
   <string name="account_settings_notification_open_system_notifications_summary">Åbne system påmindelse opsætning</string>
   <string name="account_settings_show_pictures_label">Vis altid billeder</string>
@@ -618,6 +622,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="setting_theme_global">Benyt app-tema</string>
   <string name="setting_theme_dark">Mørk</string>
   <string name="setting_theme_light">Lys</string>
+  <string name="setting_theme_follow_system">Brug systemstandard</string>
   <string name="display_preferences">Visning</string>
   <string name="global_preferences">Globalt</string>
   <string name="debug_preferences">Fejlsøgning</string>
@@ -631,6 +636,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="settings_message_theme_label">Meddelelsesvisnings-tema</string>
   <string name="settings_compose_theme_label">Editor-tema</string>
   <string name="settings_language_label">Sprog</string>
+  <string name="preference_search_no_results">Ingen indstillinger fundet</string>
   <string name="settings_message_theme_selection_label">Fixed meddelelses-tema</string>
   <string name="settings_message_theme_selection_summary_off">Benyt meddelelsesvisnings-tema når meddelelser læses</string>
   <string name="settings_message_theme_selection_summary_on">Benyt et fixed meddelelsesvisnings-tema</string>
@@ -654,6 +660,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="volume_navigation_title">Volume-knap navigation</string>
   <string name="volume_navigation_message">Mail-visning</string>
   <string name="volume_navigation_list">Diverse listevisninger</string>
+  <string name="hide_special_accounts_title">Skjul Fælles indbakke</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier"> - Ulæste</string>
   <string name="search_all_messages_title">Alle mails</string>
@@ -709,6 +716,7 @@ Rapporter venligst fejl, forslag til nye funktioner eller stil spørgsmål på:
   <string name="confirm_discard_draft_message_title">Annuller meddelelse?</string>
   <string name="confirm_discard_draft_message">Er du sikker på at du ønsker at annullere denne meddelelse?</string>
   <string name="select_text_now">Vælg tekst som skal kopieres.</string>
+  <string name="dialog_confirm_clear_local_folder_title">Ryd lokale beskeder</string>
   <string name="dialog_confirm_delete_title">Bekræft sletning</string>
   <string name="dialog_confirm_delete_message">Ønsker du at slette denne mail?</string>
   <plurals name="dialog_confirm_delete_messages">
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 3f258a7b5..52597948a 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -93,6 +93,7 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
   <string name="forward_as_attachment_action">Als Anhang weiterleiten</string>
   <string name="edit_as_new_message_action">Editiere als neue Meldung</string>
   <string name="move_action">Verschieben</string>
+  <string name="move_to_drafts_action">Zu Entwürfen verschieben</string>
   <string name="single_message_options_action">Senden…</string>
   <string name="refile_action">Umsortieren…</string>
   <string name="done_action">Fertig</string>
diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml
index 670b35bfd..9c398c3a2 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -91,6 +91,7 @@ Bonvolu raporti erarojn, kontribui novajn eblojn kaj peti pri novaj funkcioj per
   <string name="forward_as_attachment_action">Plusendi kiel kunsendaĵon</string>
   <string name="edit_as_new_message_action">Redakti kiel novan mesaĝon</string>
   <string name="move_action">Movi</string>
+  <string name="move_to_drafts_action">Movi al malnetujo</string>
   <string name="single_message_options_action">Sendi…</string>
   <string name="refile_action">Agoj…</string>
   <string name="done_action">Farita</string>
diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml
index eb4d6edf4..41099785d 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -22,7 +22,7 @@
   <!--=== General strings ==================================================================-->
   <string name="authors">Autorid</string>
   <string name="app_revision">Parandusteave</string>
-  <string name="read_messages_label">Loe meilisõnumeid</string>
+  <string name="read_messages_label">Loe e-kirju</string>
   <string name="read_messages_desc">Lubab sellel rakendusel lugeda sinu e-kirju.</string>
   <string name="delete_messages_label">Kustuta e-kirjad</string>
   <string name="delete_messages_desc">Lubab sellel rakendusel kustutada sinu e-kirju.</string>
@@ -47,7 +47,7 @@
   <string name="next_action">Järgmine</string>
   <string name="previous_action">Eelmine</string>
   <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
-  <string name="okay_action">OK</string>
+  <string name="okay_action">Ok</string>
   <string name="cancel_action">Tühista</string>
   <string name="send_action">Saada</string>
   <string name="send_again_action">Saada uuesti</string>
@@ -61,6 +61,7 @@
   <string name="spam_action">Rämpspost</string>
   <string name="forward_action">Saada edasi</string>
   <string name="forward_as_attachment_action">Saada edasi manusena</string>
+  <string name="edit_as_new_message_action">Ava uue e-kirjana</string>
   <string name="move_action">Teisalda</string>
   <string name="single_message_options_action">Saada…</string>
   <string name="refile_action">Paiguta ümber…</string>
@@ -95,8 +96,8 @@
   <string name="message_view_theme_action_light">Lülitu heledale teemale</string>
   <string name="mark_as_unread_action">Märgi mitteloetuks</string>
   <string name="read_receipt">Lugemise kinnitus</string>
-  <string name="read_receipt_enabled">Taotleb lugemise kinnitust</string>
-  <string name="read_receipt_disabled">Ei taotle lugemise kinnitust</string>
+  <string name="read_receipt_enabled">Taotletakse lugemise kinnitust</string>
+  <string name="read_receipt_disabled">Ei taotleta lugemise kinnitust</string>
   <string name="add_attachment_action">Lisa manus</string>
   <string name="empty_trash_action">Tühjenda prügikast</string>
   <string name="expunge_action">Pühi ära</string>
@@ -108,11 +109,15 @@
   <string name="status_loading_more">Laadib kirju\u2026</string>
   <string name="status_network_error">Ühenduse viga</string>
   <string name="status_invalid_id_error">Kirja ei leita</string>
-  <string name="status_loading_error">Sõnumi laadimise viga</string>
-  <string name="load_more_messages_fmt">Laadi üles
+  <string name="status_loading_error">Kirja laadimise viga</string>
+  <string name="load_more_messages_fmt">Laadi alla
     <xliff:g id="messages_to_load">%d</xliff:g> rohkem</string>
+  <string name="size_format_gigabytes">%.1f GB</string>
+  <string name="size_format_megabytes">%.1f MB</string>
+  <string name="size_format_kilobytes">%.1f kB</string>
+  <string name="size_format_bytes">%d B</string>
   <string name="account_size_changed">Konto\"<xliff:g id="account">%s</xliff:g>\" kahanenud <xliff:g id="oldSize">%s</xliff:g> <xliff:g id="newSize">%s</xliff:g></string>
-  <string name="compacting_account">Tihendab kontot \"<xliff:g id="account">%s</xliff:g>\"</string>
+  <string name="compacting_account">Tihendatakse kontot \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Uus e-kiri</string>
   <plurals name="notification_new_messages_title">
     <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> uus kiri</item>
@@ -129,20 +134,20 @@
   <string name="notification_action_archive_all">Arhiveeri kõik</string>
   <string name="notification_action_spam">Rämps</string>
   <string name="notification_certificate_error_title">Sertifikaadi viga kontol <xliff:g id="account">%s</xliff:g></string>
-  <string name="notification_certificate_error_text">Kontrolli oma serveri sätteid</string>
+  <string name="notification_certificate_error_text">Kontrolli serveri sätteid</string>
   <string name="notification_authentication_error_title">Autentimine ebaõnnestus</string>
-  <string name="notification_authentication_error_text">Autentimine ebaõnnestus konto <xliff:g id="account">%s</xliff:g> jaoks. Uuenda oma serveri seadeid.</string>
-  <string name="notification_bg_sync_ticker">Kontrollib emaili: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
-  <string name="notification_bg_sync_title">Kontrollib meili</string>
-  <string name="notification_bg_send_ticker">Saadab meili: <xliff:g id="account">%s</xliff:g></string>
-  <string name="notification_bg_send_title">Saadab meilisõnumit</string>
+  <string name="notification_authentication_error_text">Autentimine ebaõnnestus konto <xliff:g id="account">%s</xliff:g> puhul. Uuenda serveri seadeid.</string>
+  <string name="notification_bg_sync_ticker">Kontrollib e-kirju: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
+  <string name="notification_bg_sync_title">Kontrollib e-kirju</string>
+  <string name="notification_bg_send_ticker">Saadab e-kirja: <xliff:g id="account">%s</xliff:g></string>
+  <string name="notification_bg_send_title">Saadab e-kirja</string>
   <string name="notification_bg_title_separator">:</string>
-  <string name="notification_channel_messages_title">Sõnumid</string>
-  <string name="notification_channel_messages_description">Sõnumitega seotud teated</string>
+  <string name="notification_channel_messages_title">E-kirjad</string>
+  <string name="notification_channel_messages_description">E-kirjadega seotud teated</string>
   <string name="notification_channel_miscellaneous_title">Muu</string>
   <string name="notification_channel_miscellaneous_description">Mitmesugused teated nagu vead jms</string>
-  <string name="special_mailbox_name_inbox">Sisse</string>
-  <string name="special_mailbox_name_outbox">Välja</string>
+  <string name="special_mailbox_name_inbox">Sisendkast</string>
+  <string name="special_mailbox_name_outbox">Väljundkast</string>
   <string name="special_mailbox_name_drafts">Mustandid</string>
   <string name="special_mailbox_name_trash">Prügikast</string>
   <string name="special_mailbox_name_sent">Saadetud</string>
@@ -165,14 +170,15 @@
   <string name="message_compose_quote_header_cc">Koopia:</string>
   <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> kirjutas:</string>
   <string name="message_compose_reply_header_fmt_with_date"><xliff:g id="sent_date">%1$s</xliff:g>, <xliff:g id="sender">%2$s</xliff:g>  kirjutas:</string>
-  <string name="message_compose_error_no_recipients">Pead lisama vähemalt ühe adressaadi.</string>
+  <string name="message_compose_error_no_recipients">Pead lisama vähemalt ühe vastuvõtja.</string>
   <string name="compose_error_incomplete_recipient">Vastuvõtja väli on puudulikult täidetud!</string>
   <string name="error_contact_address_not_found">Selle kontakti e-posti aadressi ei leita</string>
   <string name="message_compose_attachments_skipped_toast">Mõnda manust ei saa edasi saata, kuna seda pole alla laaditud</string>
   <string name="message_compose_attachments_forward_toast">Sõnumit ei saa edastada kuna mõnda manust pole alla laaditud.</string>
-  <string name="message_compose_show_quoted_text_action">Kaasa osundatud sõnum</string>
+  <string name="message_compose_show_quoted_text_action">Kaasa osundatud kiri</string>
   <string name="message_compose_description_delete_quoted_text">Eemalda osundatud tekst</string>
   <string name="message_compose_description_edit_quoted_text">Muuda osundatud teksti</string>
+  <string name="remove_attachment_action">Eemalda manus</string>
   <string name="message_view_from_format">Kellelt: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
   <string name="message_to_label">Kellele:</string>
   <string name="message_view_cc_label">Koopia:</string>
@@ -181,9 +187,9 @@
   <string name="message_view_attachment_download_action">Salvesta</string>
   <string name="message_view_status_attachment_not_saved">Manuse salvestamine ebaõnnestus</string>
   <string name="message_view_show_pictures_action">Näita pilte</string>
-  <string name="message_view_no_viewer">Ei leia <xliff:g id="mimetype">%s</xliff:g> käivitamiseks programmi.</string>
+  <string name="message_view_no_viewer">Ei leia <xliff:g id="mimetype">%s</xliff:g> kuvamiseks programmi.</string>
   <string name="message_view_download_remainder">Laadi kogu kiri alla</string>
-  <string name="message_view_toast_unable_to_display_message">Ei saa kuvada sõnumit</string>
+  <string name="message_view_toast_unable_to_display_message">Kirja kuvamine ebaõnnestus</string>
   <string name="message_view_sender_label">%1$s kaudu</string>
   <!--NOTE: The following message refers to strings with id account_setup_incoming_save_all_headers_label and account_setup_incoming_title-->
   <string name="message_no_additional_headers_available">Kõik pealkirjad on alla laaditud, kuid näitamiseks pole ühtegi täiendavat pealkirja.</string>
@@ -213,11 +219,11 @@
   <string name="global_settings_messageview_show_next_label">Peale kustutamist näita järgmist kirja</string>
   <string name="global_settings_messageview_show_next_summary">Peale mõne kirja kustutamist näita järgmist kirja</string>
   <string name="global_settings_confirm_actions_title">Kinnita toiming</string>
-  <string name="global_settings_confirm_actions_summary">Näita alati dialoogiakent kui teed valitud toimingut</string>
+  <string name="global_settings_confirm_actions_summary">Näita alati dialoogiakent kui teed valitud toiminguid</string>
   <string name="global_settings_confirm_action_delete">Kustuta</string>
   <string name="global_settings_confirm_action_delete_starred">Kustuta tärniga tähistatud (kirjade vaates)</string>
   <string name="global_settings_confirm_action_spam">Rämpspost</string>
-  <string name="global_settings_confirm_menu_discard">Eira kirja</string>
+  <string name="global_settings_confirm_menu_discard">Loobu kirjast</string>
   <string name="global_settings_confirm_menu_mark_all_read">Märgi kõik sõnumid loetuks</string>
   <string name="global_settings_confirm_action_delete_notif">Kustuta (teadetest)</string>
   <string name="global_settings_privacy_hide_useragent">Peida meiliklient</string>
diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml
index 8deecf346..b8ab36061 100644
--- a/app/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fr/strings.xml
@@ -92,6 +92,7 @@ Rapportez les bogues, recommandez de nouvelles fonctions et posez vos questions
   <string name="forward_as_attachment_action">Transférer en tant que fichier joint</string>
   <string name="edit_as_new_message_action">Éditer en tant que nouveau courriel</string>
   <string name="move_action">Déplacer</string>
+  <string name="move_to_drafts_action">Déplacer vers Brouillons</string>
   <string name="single_message_options_action">Envoyer…</string>
   <string name="refile_action">Reclasser…</string>
   <string name="done_action">Terminé</string>
@@ -894,7 +895,7 @@ jusqu’à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="compose_error_no_draft_folder">Aucun dossier Brouillons n’est configuré pour ce compte !</string>
   <string name="compose_error_no_key_configured">Aucune clé n’est configurée pour ce compte ! Veuillez vérifier vos paramètres.</string>
   <string name="error_crypto_provider_incompatible">Le fournisseur cryptographique utilise une version non compatible. Veuillez vérifier vos paramètres !</string>
-  <string name="error_crypto_provider_connect">Impossible de se connecter au fournisseur cryptographique. Veuillez vérifiez vos paramètres ou touchez l’icône Cryptographie pour ressayer !</string>
+  <string name="error_crypto_provider_connect">Impossible de se connecter au fournisseur cryptographique. Veuillez vérifiez vos paramètres ou touchez l’icône Cryptographie pour réessayer !</string>
   <string name="error_crypto_provider_ui_required">Échec d’initialisation du chiffrement de bout en bout, veuillez vérifier vos paramètres</string>
   <string name="error_crypto_inline_attach">Le mode PGP/INTÉGRÉ ne prend pas en charge les fichiers joints !</string>
   <string name="enable_inline_pgp">Activer PGP/INTÉGRÉ</string>
@@ -958,7 +959,7 @@ jusqu’à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="locked_attach_title">Fichier joint non protégé</string>
   <string name="message_progress_text">Chargement…</string>
   <string name="messageview_decrypt_cancelled">Le déchiffrement a été annulé.</string>
-  <string name="messageview_decrypt_retry">Ressayer</string>
+  <string name="messageview_decrypt_retry">Réessayer</string>
   <string name="messageview_decrypt_incomplete">Le courriel chiffré doit être téléchargé pour être déchiffré.</string>
   <string name="messageview_crypto_error_title">Erreur de déchiffrement du courriel</string>
   <string name="recipient_error_non_ascii">Les caractères spéciaux ne sont actuellement pas pris en charge</string>
diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml
index 9c3586ea0..2cdd08e18 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -90,6 +90,7 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="spam_action">Ruslpóstur</string>
   <string name="forward_action">Framsenda</string>
   <string name="forward_as_attachment_action">Áframsenda sem viðhengi</string>
+  <string name="edit_as_new_message_action">Breyta sem nýjum skilaboðum</string>
   <string name="move_action">Færa</string>
   <string name="single_message_options_action">Senda…</string>
   <string name="refile_action">Endurraða…</string>
@@ -206,6 +207,7 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="message_compose_show_quoted_text_action">Hafa með tilvitnuð skilaboð</string>
   <string name="message_compose_description_delete_quoted_text">Fjarlægja tilvitnun</string>
   <string name="message_compose_description_edit_quoted_text">Breyta tilvitnun</string>
+  <string name="remove_attachment_action">Fjarlægja viðhengi</string>
   <string name="message_view_from_format">Frá: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
   <string name="message_to_label">Til:</string>
   <string name="message_view_cc_label">Afrit:</string>
@@ -732,6 +734,9 @@ Sendu inn villuskýrslur, leggðu fram nýja eiginleika og spurðu spurninga á
   <string name="confirm_discard_draft_message_title">Henda skilaboðum?</string>
   <string name="confirm_discard_draft_message">Ertu viss um að þú viljir henda þessum skilaboðum?</string>
   <string name="select_text_now">Veldu texta til að afrita.</string>
+  <string name="dialog_confirm_clear_local_folder_title">Hreinsa staðvær skilaboð?</string>
+  <string name="dialog_confirm_clear_local_folder_message">Þetta mun fjarlægja öll staðvær skilaboð úr þessari möppu. Engum skilaboðum verður eytt af póstþjóninum.</string>
+  <string name="dialog_confirm_clear_local_folder_action">Hreinsa skilaboð</string>
   <string name="dialog_confirm_delete_title">Staðfesta eyðingu</string>
   <string name="dialog_confirm_delete_message">Viltu eyða þessum skilaboðum?</string>
   <plurals name="dialog_confirm_delete_messages">
diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml
index 751697f9a..c18a649a2 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -93,6 +93,7 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="forward_as_attachment_action">Inoltra come allegato</string>
   <string name="edit_as_new_message_action">Modifica come nuovo messaggio</string>
   <string name="move_action">Sposta</string>
+  <string name="move_to_drafts_action">Sposta in Bozze</string>
   <string name="single_message_options_action">Invio…</string>
   <string name="refile_action">Riarchivia…</string>
   <string name="done_action">Fatto</string>
diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml
index 47e4accb4..9edbe7ed2 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -7,7 +7,12 @@
   <string name="shortcuts_title">K-9 Konti</string>
   <string name="unread_widget_label">K-9 Nelasīts</string>
   <!--Used in the about dialog-->
+  <string name="app_authors">K-9 Suņa Staigātāji</string>
   <string name="app_copyright_fmt">Autortiesības 2008-<xliff:g>%s</xliff:g> The K-9 Dog Walkers. Daļējas autortiesības 2006-<xliff:g>%s</xliff:g> Android atvērtā koda projekts.</string>
+  <string name="source_code">Avots</string>
+  <string name="app_license">Apache licence, Versija 2.0</string>
+  <string name="about_libraries">Vārdnīcas</string>
+  <string name="license">Licence</string>
   <!--Welcome message-->
   <string name="welcome_message_title">Laipni lūdzam K-9 Pastā</string>
   <string name="accounts_welcome"><![CDATA[
@@ -44,10 +49,13 @@ Lūdzu, iesniedziet kļūdu ziņojumus, ierosiniet jaunas iespējas un uzdodiet
   <!--General strings that include the app name-->
   <string name="account_delete_dlg_instructions_fmt">Konts \"<xliff:g id="account">%s</xliff:g>\" tiks noņemts no K-9 Pasta.</string>
   <!--=== General strings ==================================================================-->
+  <string name="authors">Autori</string>
+  <string name="app_revision">Informācija par izmaiņām</string>
   <string name="read_messages_label">Izlasīt e-pastus</string>
   <string name="read_messages_desc">Atļauj šai aplikācijai lasīt Jūsu e-pastus</string>
   <string name="delete_messages_label">Izdzēst e-pastus</string>
   <string name="delete_messages_desc">Atļauj šai aplikācijai izdzēst Jūsu e-pastus</string>
+  <string name="about_title">Par K-9 Pastu</string>
   <string name="accounts_title">Konti</string>
   <string name="folders_title">Mapes</string>
   <string name="advanced">Detalizētāk</string>
@@ -82,7 +90,9 @@ Lūdzu, iesniedziet kļūdu ziņojumus, ierosiniet jaunas iespējas un uzdodiet
   <string name="spam_action">Surogātpasts</string>
   <string name="forward_action">Pārsūtīt</string>
   <string name="forward_as_attachment_action">Pārsūtīt kā pielikumu </string>
+  <string name="edit_as_new_message_action">Rediģēt kā jaunu vēstuli</string>
   <string name="move_action">Pārvietot</string>
+  <string name="move_to_drafts_action">Pārvietot uz melnrakstiem</string>
   <string name="single_message_options_action">Sūtīt…</string>
   <string name="refile_action">Atkārtoti iearhivēt…</string>
   <string name="done_action">Gatavs</string>
@@ -97,6 +107,7 @@ Lūdzu, iesniedziet kļūdu ziņojumus, ierosiniet jaunas iespējas un uzdodiet
   <string name="search_action">Meklēt</string>
   <string name="search_results">Meklēšanas rezultāti</string>
   <string name="preferences_action">Iestatījumi</string>
+  <string name="folders_action">Pārvaldīt mapes</string>
   <string name="account_settings_action">Konta iestatījumi</string>
   <string name="remove_account_action">Noņemt kontu</string>
   <string name="mark_as_read_action">Atzīmēt kā izlasītu</string>
@@ -132,6 +143,10 @@ Lūdzu, iesniedziet kļūdu ziņojumus, ierosiniet jaunas iespējas un uzdodiet
   <string name="status_loading_error">Kļūda ielādējot vēstuli</string>
   <string name="load_more_messages_fmt">Ielādēt līdz
 pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
+  <string name="size_format_gigabytes">%.1f GB</string>
+  <string name="size_format_megabytes">%.1f MB</string>
+  <string name="size_format_kilobytes">%.1f kB</string>
+  <string name="size_format_bytes">%d B</string>
   <string name="account_size_changed">Konts \"<xliff:g id="account">%s</xliff:g>\" sarucis no <xliff:g id="oldSize">%s</xliff:g> līdz <xliff:g id="newSize">%s</xliff:g></string>
   <string name="compacting_account">Saspiest kontu \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="notification_new_title">Jauna vēstule</string>
@@ -160,13 +175,16 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="notification_bg_send_title">Sūta pastu</string>
   <string name="notification_bg_title_separator">:</string>
   <string name="notification_channel_messages_title">Vēstules</string>
+  <string name="notification_channel_messages_description">Paziņojumi par vēstulēm</string>
   <string name="notification_channel_miscellaneous_title">Dažādi</string>
+  <string name="notification_channel_miscellaneous_description">Dažādi paziņojumi, piemēram, par kļūdām u.c.</string>
   <string name="special_mailbox_name_inbox">Iesūtne</string>
   <string name="special_mailbox_name_outbox">Izsūtne</string>
   <string name="special_mailbox_name_drafts">Melnraksti</string>
   <string name="special_mailbox_name_trash">Miskaste</string>
   <string name="special_mailbox_name_sent">Nosūtīts</string>
   <string name="send_failure_subject">Neizdevās nosūtīt dažas vēstules</string>
+  <string name="version">Versija</string>
   <string name="debug_enable_debug_logging_title">Iestatīt programmas kļūdu reģistrēšanu</string>
   <string name="debug_enable_debug_logging_summary">Reģistrēt papildus diagnostisko informāciju</string>
   <string name="debug_enable_sensitive_logging_title">Reģistrēt slepeno informāciju</string>
@@ -192,12 +210,14 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="message_compose_show_quoted_text_action">Iekļaut citēto vēstuli</string>
   <string name="message_compose_description_delete_quoted_text">Noņemt citēto tekstu</string>
   <string name="message_compose_description_edit_quoted_text">Redigēt citēto tekstu</string>
+  <string name="remove_attachment_action">Noņemt pielikumu</string>
   <string name="message_view_from_format">No: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
   <string name="message_to_label">Kam:</string>
   <string name="message_view_cc_label">Cc:</string>
   <string name="message_view_bcc_label">Neredzamais:</string>
   <string name="message_view_attachment_view_action">Atvērt</string>
   <string name="message_view_attachment_download_action">Saglabāt</string>
+  <string name="message_view_status_attachment_not_saved">Nevar saglabāt pielikumu.</string>
   <string name="message_view_show_pictures_action">Rādīt bildes</string>
   <string name="message_view_no_viewer">Nevar atrast programmu, lai atvērtu <xliff:g id="mimetype">%s</xliff:g>.</string>
   <string name="message_view_download_remainder">lejupielādēt pilnu vēstuli</string>
@@ -407,6 +427,10 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_settings_notification_opens_unread_summary">Meklēt nelasītās vēstules, kad atvērts paziņojums</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Atzīmēt kā izlasītu, kad vēstule atvērta</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Atzīmēt vēstuli kā izlasītu, kad tā atvērta aplūkošanai</string>
+  <string name="account_settings_mark_message_as_read_on_delete_label">Pēc izdzēšanas atzīmēt kā izlasītu</string>
+  <string name="account_settings_mark_message_as_read_on_delete_summary">Pēc izdzēšanas atzīmēt vestuli kā izlasītu</string>
+  <string name="account_settings_notification_open_system_notifications_label">Paziņojumu iestatījumi</string>
+  <string name="account_settings_notification_open_system_notifications_summary">Atvērt sistēmas paziņojumu iestatījumus</string>
   <string name="account_settings_show_pictures_label">Vienmēr rādīt bildes</string>
   <string name="account_settings_show_pictures_never">Nē</string>
   <string name="account_settings_show_pictures_only_from_contacts">No kontaktiem</string>
@@ -428,6 +452,8 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_settings_quote_style_label">Atbildēt izmantojot pēdiņas</string>
   <string name="account_settings_quote_style_prefix">Prefikss (kā, piemēram, Gmail)</string>
   <string name="account_settings_quote_style_header">Galvene (kā, piemēram, Outlook)</string>
+  <string name="account_settings_upload_sent_messages_label">Augšupielādāt nosūtītās vēstules</string>
+  <string name="account_settings_upload_sent_messages_summary">Pēc nosūtīšanas augšupielādēt vēstules mapē Nosūtīts</string>
   <string name="account_settings_general_title">Vispārīgie iestatījumi</string>
   <string name="account_settings_reading_mail">Lasa pastu</string>
   <string name="account_settings_sync">Saņem pastu</string>
@@ -439,13 +465,32 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_settings_crypto_key">Iestatīt privātās šifrēšanas atslēgu</string>
   <string name="account_settings_crypto_summary_off">OpenPGP lietotne nav iestatīta</string>
   <string name="account_settings_crypto_summary_on">Pievienots pie %s</string>
+  <string name="account_settings_crypto_summary_config">Notiek iestatīšana...</string>
+  <string name="account_settings_crypto_encrypt_all_drafts">Saglabāt visus melrakstus šifrētā veidā</string>
+  <string name="account_settings_crypto_encrypt_all_drafts_on">Visi melnraksti tiks saglabāti šifrētā veidā</string>
+  <string name="account_settings_crypto_encrypt_all_drafts_off">Šifrēt melnrakstus tikai tad, ja ieslēgta šifrēšana</string>
   <string name="account_settings_mail_check_frequency_label">Mapes pārbaudes biežums</string>
   <string name="account_settings_color_label">Konta krāsa</string>
   <string name="account_settings_color_summary">Noteicošā šī konta krāsa mapju un konta sarakstā</string>
+  <string name="account_settings_color_none">Bez krāsas</string>
   <string name="account_settings_led_color_label">Paziņojuma LED krāsa</string>
   <string name="account_settings_led_color_summary">Krāsa, kādā jūsu ierīces LED būtu jāmirgo šim kontam</string>
   <string name="account_settings_mail_display_count_label">Vietējās mapes izmērs</string>
   <string name="account_settings_autodownload_message_size_label">Saņemt vēstules līdz</string>
+  <string name="account_settings_autodownload_message_size_1">1 KiB</string>
+  <string name="account_settings_autodownload_message_size_2">2 KiB</string>
+  <string name="account_settings_autodownload_message_size_4">4 KiB</string>
+  <string name="account_settings_autodownload_message_size_8">8 KiB</string>
+  <string name="account_settings_autodownload_message_size_16">16 KiB</string>
+  <string name="account_settings_autodownload_message_size_32">32 KiB</string>
+  <string name="account_settings_autodownload_message_size_64">64 KiB</string>
+  <string name="account_settings_autodownload_message_size_128">128 KiB</string>
+  <string name="account_settings_autodownload_message_size_256">256 KiB</string>
+  <string name="account_settings_autodownload_message_size_512">512 KiB</string>
+  <string name="account_settings_autodownload_message_size_1024">1 MiB</string>
+  <string name="account_settings_autodownload_message_size_2048">2 MiB</string>
+  <string name="account_settings_autodownload_message_size_5120">5 MiB</string>
+  <string name="account_settings_autodownload_message_size_10240">10 MiB</string>
   <string name="account_settings_autodownload_message_size_any">jebkurā lielumā (neierobežoti)</string>
   <string name="account_settings_message_age_label">Sinhronizēt vēstules no</string>
   <string name="account_settings_message_age_any">jebkura laika (neierobežoti)</string>
@@ -598,6 +643,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="setting_theme_global">Izmantot aplikācijas motīvu</string>
   <string name="setting_theme_dark">Tumšs</string>
   <string name="setting_theme_light">Gaišs</string>
+  <string name="setting_theme_follow_system">Izmantot sistēmas noklusējumu</string>
   <string name="display_preferences">Ekrāns</string>
   <string name="global_preferences">Vispārīgs</string>
   <string name="debug_preferences">Atkļūdošana</string>
@@ -611,6 +657,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="settings_message_theme_label">Vēstules skata motīvs</string>
   <string name="settings_compose_theme_label">Vēstules rakstīšanas motīvs</string>
   <string name="settings_language_label">Valoda</string>
+  <string name="preference_search_no_results">Iestatījumi nav atrasti</string>
   <string name="settings_message_theme_selection_label">Nemainīgs vēstules motīvs</string>
   <string name="settings_message_theme_selection_summary_off">Izvēlieties vēstules skata motīvu, kad aplūkojat vēstuli</string>
   <string name="settings_message_theme_selection_summary_on">Izmantot nemainīgu vēstules skata motīvu</string>
@@ -634,6 +681,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="volume_navigation_title">Skaļuma pogas navigācija</string>
   <string name="volume_navigation_message">Vēstuļu skatā</string>
   <string name="volume_navigation_list">Saraksta skatā</string>
+  <string name="hide_special_accounts_title">Paslēpt apvienoto pastkasti</string>
   <string name="search_title"><xliff:g id="search_name">%s</xliff:g> <xliff:g id="modifier">%s</xliff:g></string>
   <string name="unread_modifier">- nelasīts</string>
   <string name="search_all_messages_title">Visas vēstules</string>
@@ -647,6 +695,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_settings_searchable_displayable">Attēlojamās</string>
   <string name="account_settings_searchable_none">Nevienā</string>
   <string name="account_settings_no_folder_selected">Neviens</string>
+  <string name="account_settings_automatic_special_folder">Automātiski (%s)</string>
   <string name="font_size_settings_title">Šrifta izmērs</string>
   <string name="font_size_settings_description">Iestatīt šrifta izmēru</string>
   <string name="font_size_account_list">Kontu saraksts</string>
@@ -688,6 +737,9 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="confirm_discard_draft_message_title">Izmest vēstuli?</string>
   <string name="confirm_discard_draft_message">Vai tiešām izmest šo vēstuli?</string>
   <string name="select_text_now">Iezīmēt tekstu, lai kopētu.</string>
+  <string name="dialog_confirm_clear_local_folder_title">Izdzēst ierīcē esošās vēstules?</string>
+  <string name="dialog_confirm_clear_local_folder_message">Šādi no mapes tiks izdzēstas visas lejupielādētās vēstules. No servera vēstules netiks izdzēstas.</string>
+  <string name="dialog_confirm_clear_local_folder_action">Izdzēst vēstules</string>
   <string name="dialog_confirm_delete_title">Apstiprināt dzēšanu</string>
   <string name="dialog_confirm_delete_message">Vai gribat izdzēst šo vēstuli?</string>
   <plurals name="dialog_confirm_delete_messages">
@@ -699,6 +751,8 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="dialog_confirm_delete_cancel_button">Nē</string>
   <string name="dialog_confirm_mark_all_as_read_title">Apstiprināt, ka viss atzīmēts kā izlasīts</string>
   <string name="dialog_confirm_mark_all_as_read_message">Vai atzīmēt visas vēstules kā izlasītas?</string>
+  <string name="dialog_confirm_empty_trash_title">Apstiprināt miskastes iztukšošanu</string>
+  <string name="dialog_confirm_empty_trash_message">Vai gribat iztukšot miskastes mapi?</string>
   <string name="dialog_confirm_mark_all_as_read_confirm_button">Jā</string>
   <string name="dialog_confirm_mark_all_as_read_cancel_button">Nē</string>
   <string name="dialog_confirm_spam_title">Apstiprināt pārvietošanu uz surogātpasta mapi</string>
@@ -712,16 +766,38 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="dialog_attachment_progress_title">Lejupielādē pielikumu</string>
   <string name="messagelist_sent_to_me_sigil">»</string>
   <string name="messagelist_sent_cc_me_sigil">›</string>
+  <string name="settings_list_backup_category">Rezerves kopija</string>
   <string name="settings_list_miscellaneous_category">Dažādi</string>
+  <string name="settings_export_title">Eksportēt iestatījumus</string>
   <string name="settings_export_button">Eksportēt</string>
   <string name="settings_export_share_button">Dalīties</string>
   <string name="settings_export_progress_text">Eksportē iestatījumus…</string>
   <string name="settings_export_success_generic">Iestatījumi eksportēti veiksmīgi </string>
   <string name="settings_export_failure">Neizdevās eksportēt iestatījumus</string>
   <string name="settings_import_title">Importēšanas iestatījumi</string>
+  <string name="settings_import_pick_document_button">Izvēlēties datni</string>
   <string name="settings_import_button">Importēt</string>
+  <string name="settings_import_success_generic">Iestatījumi importēti veiksmīgi </string>
+  <string name="settings_import_password_required">Lūdzu, ievadiet paroles</string>
+  <string name="settings_import_failure">Neizdevās importēt iestatījumus</string>
+  <string name="settings_import_read_failure">Neizdevās nolasīt iestatījumu datni</string>
+  <string name="settings_import_partial_failure">Neizdevās importēt dažus iestatījumus</string>
+  <string name="settings_import_status_success">Importēts veiksmīgi</string>
+  <string name="settings_import_status_password_required">Nepieciešama parole</string>
+  <string name="settings_import_status_not_imported">Nav importēts</string>
+  <string name="settings_import_status_error">Imports neizdevās</string>
+  <string name="settings_import_later_button">Vēlāk</string>
   <string name="settings_import">Importēšanas iestatījumi</string>
   <string name="settings_importing">Importē iestatījumus…</string>
+  <plurals name="settings_import_password_prompt">
+    <item quantity="zero">Lai izmantotu kontu \"<xliff:g id="account">%s</xliff:g>\", jāievada servera parole.</item>
+    <item quantity="one">Lai izmantotu kontu \"<xliff:g id="account">%s</xliff:g>\", jāievada servera parole.</item>
+    <item quantity="other">Lai izmantotu kontu \"<xliff:g id="account">%s</xliff:g>\", jāievada servera paroles.</item>
+  </plurals>
+  <string name="settings_import_incoming_server_password_hint">Ienākošā servera parole</string>
+  <string name="settings_import_outgoing_server_password_hint">Izejošā severa parole</string>
+  <string name="settings_import_use_same_password_for_outgoing_server">Izmantot to pašu paroli izejošajam serverim</string>
+  <string name="server_name_format">Servera nosaukums: <xliff:g id="hostname">%s</xliff:g></string>
   <string name="unread_widget_select_account">Parādīt nelasīto vēstuļu skaitu…</string>
   <string name="unread_widget_account_title">Konts</string>
   <string name="unread_widget_account_summary">Konts, kuram jāparāda neizlasītās</string>
@@ -880,6 +956,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="crypto_msg_encrypted_sign_error">taču privātās šifrēšanas datos ir kļūdas</string>
   <string name="crypto_msg_encrypted_insecure">taču privātā šifrēšana nav droša</string>
   <string name="crypto_info_ok">Labi</string>
+  <string name="crypto_info_search_key">Meklēšanas atslēga</string>
   <string name="crypto_info_view_signer">Apskatīties parakstītāju</string>
   <string name="crypto_info_view_sender">Apskatīties sūtītāju</string>
   <string name="crypto_info_view_security_warning">Sīkāka informācija</string>
@@ -924,7 +1001,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="openpgp_enabled_error_back">Atpakaļ</string>
   <string name="openpgp_enabled_error_disable">Izslēgt šifrēšanu</string>
   <string name="openpgp_encryption">OpenPGP šifrēšana</string>
-  <string name="account_settings_crypto_prefer_encrypt">Abpusējs šifrēšanas režīms</string>
+  <string name="account_settings_crypto_prefer_encrypt">Automātisks šifrēšanas režīms</string>
   <string name="dialog_autocrypt_mutual_title">Abpusējs šifrēšanas režīms</string>
   <string name="dialog_autocrypt_mutual_description_1">Vēstuļu šifrēšana darbosies pēc izvēlēs vai atbildot uz iešifrētu vēstuli.</string>
   <string name="dialog_autocrypt_mutual_description_2">Ja gan sūtītājs, gan saņēmējs būs iestatījuši abpusēju šifrēšanas režīmu, šifrēšana notiks automātiski.</string>
@@ -933,7 +1010,34 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="dialog_openkeychain_info_title">OpenPGP lietotne nav instalēta</string>
   <string name="dialog_openkeychain_info_install">Instalēt</string>
   <string name="dialog_openkeychain_info_text">K-9 Pastam nepieciešama OpenKeychain, lai nodrošinātu privāto šifrēšanu.</string>
+  <string name="encrypted_subject">Šifrēta vēstule</string>
+  <string name="account_settings_crypto_encrypt_subject">Šifrēt vēstules tematus</string>
+  <string name="account_settings_crypto_encrypt_subject_subtitle">Daži saņēmēji var to neatpazīt</string>
+  <string name="toast_account_not_found">Iekšējā kļūda: Nederīgs konts!</string>
+  <string name="toast_openpgp_provider_error">Kļūda savienojoties ar %s!</string>
+  <string name="ac_transfer_setting_title">Nosūtīt automātiskas šifrēšanas iestatījumu vēstuli</string>
+  <string name="ac_transfer_setting_summary">Ievērot drošību, daloties pa tiešo ar citām ierīcēm</string>
+  <string name="ac_transfer_title">Automātiskas šifrēšanas iestatījumu vēstule</string>
+  <string name="ac_transfer_intro">Automātisks vēstules šifrēšanas iestatījums ļauj droši dalīties ar citām ierīcēm.</string>
+  <string name="ac_transfer_button_send">Nosūtīt iestatījumu vēstuli</string>
+  <string name="ac_transfer_will_be_sent">Vēstule tiks nosūtīta uz Jūsu adresi:</string>
+  <string name="ac_transfer_generating">Izveido iestatījumu vēstuli...</string>
+  <string name="ac_transfer_sending_to">Sūta vēstuli:</string>
+  <string name="ac_transfer_finish">Lai pabeigtu, vēstule jāatver citā ierīcē un jāievada iestatīšanas kods.</string>
+  <string name="ac_transfer_show_code">Parādīt iestatījumu kodu</string>
+  <string name="ac_transfer_msg_subject">Automātiskas šifrēšanas iestatījumu vēstule</string>
+  <string name="ac_transfer_msg_body">Šī vēstule satur visu nepieciešamo informāciju, lai pārsūtītu Jūsu automātiskās šifrēšanas iestatījumus kopā ar slepeno šifra atslēgu no sākotnējās ierīces.
+
+Lai jaunajā ierīcē iestatītu automātisko šifrēšanu, lūdzu sekojiet norādēm jaunajā ierīcē.
+
+Šo vēstuli var saglabāt un izmantot kā rezerves kopiju šifra atslēgai. Ja vēlaties to darīt, pierakstiet paroli un nolieciet drošā vietā.
+</string>
+  <string name="ac_transfer_error_send">Kļūdas dēl neizdevās nosūtīt vēstuli. Lūdzu, pārbaudiet tīkla savienojumu un izejošā servera iestatījumus!</string>
+  <string name="switch_on">Ieslēgt</string>
+  <string name="switch_off">Izslēgt</string>
   <string name="navigation_drawer_open">Atvērt</string>
   <string name="navigation_drawer_close">Aizvērt</string>
   <!--permissions-->
+  <string name="permission_contacts_rationale_title">Atļaut piekļuvi kontaktiem</string>
+  <string name="permission_contacts_rationale_message">Lai ieteiktu kontaktus un parādītu to vārdus un attēlus, lietotnei nepieciešama atļauja piekļūt Jūsu kontaktiem.</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml
index 5338b45b5..f98b5d861 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -93,6 +93,7 @@ Ju lutemi, parashtrim njoftimesh për të meta, kontribute për veçori të reaj
   <string name="forward_as_attachment_action">Përcille si bashkëngjitje</string>
   <string name="edit_as_new_message_action">Përpunojeni si mesazh të ri</string>
   <string name="move_action">Lëvizeni</string>
+  <string name="move_to_drafts_action">Kaloje te Skicat</string>
   <string name="single_message_options_action">Dërgoni…</string>
   <string name="refile_action">Riskedojeni…</string>
   <string name="done_action">U bë</string>
diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml
index f387b78bd..4d8bf9f5e 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -92,6 +92,7 @@ Skicka gärna in felrapporter, bidra med nya funktioner och ställ frågor på
   <string name="forward_as_attachment_action">Vidarebefordra som bilaga</string>
   <string name="edit_as_new_message_action">Redigera som nytt meddelande</string>
   <string name="move_action">Flytta</string>
+  <string name="move_to_drafts_action">Flytta till utkast</string>
   <string name="single_message_options_action">Skicka…</string>
   <string name="refile_action">Omarkivera…</string>
   <string name="done_action">Klar</string>