diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml
index d710ff6ec6c..6acaa278b88 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-co/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">Lista di i conti</string>
     <string name="navigation_drawer_dropdown_unified_account_title">Contu di cuncolta</string>
     <string name="navigation_drawer_dropdown_action_add_account">Aghjunghje un contu</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Sincrunizà u contu</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml
index ffb266d1479..9dc0efdb1bd 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-cs/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">Seznam účtů</string>
     <string name="navigation_drawer_dropdown_unified_account_title">Jednotný účet</string>
     <string name="navigation_drawer_dropdown_action_add_account">Přidat účet</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Synchronizovat účet</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml
index a0976779b0b..1a3d1caeece 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-cy/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_action_hide_accounts">Cuddio cyfrifon</string>
     <string name="navigation_drawer_dropdown_folder_item_badge_count_greater_than_99">99+</string>
     <string name="navigation_drawer_dropdown_folder_item_badge_count_greater_than_1_000">1k+</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Cydweddu cyfrif</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml
index a27b8c9e7c4..10beca69b39 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-fa/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">لیست حساب</string>
     <string name="navigation_drawer_dropdown_unified_account_title">حساب یکپارچه</string>
     <string name="navigation_drawer_dropdown_action_add_account">افزودن حساب</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">همگام سازی حساب</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml
index 70c60a7276c..1a6130ddb7a 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-fr/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">Liste des comptes</string>
     <string name="navigation_drawer_dropdown_unified_account_title">Compte unifié</string>
     <string name="navigation_drawer_dropdown_action_add_account">Ajouter un compte</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Synchroniser le compte</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml
index 12fda5b340b..13a2da440c1 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-is/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">Aðgangalisti</string>
     <string name="navigation_drawer_dropdown_unified_account_title">Sameinaður aðgangur</string>
     <string name="navigation_drawer_dropdown_action_add_account">Bæta við aðgangi</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Samstilla aðgang</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml
index 64d6c398236..ab4a42df447 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-nn/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">Kontoliste</string>
     <string name="navigation_drawer_dropdown_unified_account_title">Samla konto</string>
     <string name="navigation_drawer_dropdown_action_add_account">Legg til konto</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Synkroniser konto</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml
index 2b2627a4a5d..9e4ecebb77a 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-sl/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">Seznam računov</string>
     <string name="navigation_drawer_dropdown_unified_account_title">Enoten račun</string>
     <string name="navigation_drawer_dropdown_action_add_account">Dodaj račun</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Uskladi račun</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml
index 7a65d09f4a6..b1babb27d1b 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-sv/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">Kontolista</string>
     <string name="navigation_drawer_dropdown_unified_account_title">Enhetligt konto</string>
     <string name="navigation_drawer_dropdown_action_add_account">Lägg till konto</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">Synkronisera konto</string>
 </resources>
diff --git a/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml b/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml
index 221af607cf9..5018533208a 100644
--- a/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml
+++ b/feature/navigation/drawer/dropdown/src/main/res/values-zh-rCN/strings.xml
@@ -11,4 +11,5 @@
     <string name="navigation_drawer_dropdown_avount_view_selection_title">账号列表</string>
     <string name="navigation_drawer_dropdown_action_add_account">添加账号</string>
     <string name="navigation_drawer_dropdown_unified_account_title">统一账号</string>
+    <string name="navigation_drawer_dropdown_action_sync_account">同步账号</string>
 </resources>
diff --git a/feature/onboarding/welcome/src/main/res/values-zh-rTW/strings.xml b/feature/onboarding/welcome/src/main/res/values-zh-rTW/strings.xml
index 5b753707e9d..a106d5c2444 100644
--- a/feature/onboarding/welcome/src/main/res/values-zh-rTW/strings.xml
+++ b/feature/onboarding/welcome/src/main/res/values-zh-rTW/strings.xml
@@ -2,6 +2,6 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="onboarding_welcome_start_button">開始</string>
     <string name="onboarding_welcome_import_button">匯入設定</string>
-    <string name="onboarding_welcome_developed_by">由 MZLA Technologies 的專業團隊與全球志願者社群共同開發，屬於 Mozilla 家族。</string>
-    <string name="onboarding_welcome_text">一款開源、注重隱私且無廣告的 Android 電子郵件應用程式。</string>
+    <string name="onboarding_welcome_developed_by">由 MZLA Technologies 的專業團隊與全球志工社群共同開發，屬於 Mozilla 家族。</string>
+    <string name="onboarding_welcome_text">一款開放原始碼、注重隱私且無廣告的 Android 電子郵件應用程式。</string>
 </resources>
diff --git a/feature/settings/import/src/main/res/values-zh-rTW/strings.xml b/feature/settings/import/src/main/res/values-zh-rTW/strings.xml
index ffc78cad234..fb9a5e5f041 100644
--- a/feature/settings/import/src/main/res/values-zh-rTW/strings.xml
+++ b/feature/settings/import/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="settings_import_title">匯入設定</string>
-    <string name="settings_import_pick_document_button">選擇檔案</string>
+    <string name="settings_import_pick_document_button">選取檔案</string>
     <string name="settings_import_button">匯入</string>
     <string name="settings_import_success_generic">設定匯入成功</string>
     <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
@@ -40,4 +40,4 @@
     <string name="settings_import_pick_app_dialog_title">從應用程式匯入</string>
     <string name="settings_import_scan_qr_code_button">掃描 QR Code</string>
     <string name="settings_import_app_version_not_supported">應用程式不支援。</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/feature/widget/message-list-glance/src/main/res/values-bg/strings.xml b/feature/widget/message-list-glance/src/main/res/values-bg/strings.xml
index 55344e51920..58ce15aead2 100644
--- a/feature/widget/message-list-glance/src/main/res/values-bg/strings.xml
+++ b/feature/widget/message-list-glance/src/main/res/values-bg/strings.xml
@@ -1,3 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
\ No newline at end of file
+    <string name="message_list_glance_widget_compose_action">Създаване</string>
+    <string name="message_list_glance_widget_inbox_title">Обединени</string>
+    <string name="message_list_glance_widget_label">Списък съобщения</string>
+</resources>
diff --git a/legacy/ui/legacy/src/main/res/values-br/strings.xml b/legacy/ui/legacy/src/main/res/values-br/strings.xml
index 1ae4e40bff0..920804f927e 100644
--- a/legacy/ui/legacy/src/main/res/values-br/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-br/strings.xml
@@ -923,4 +923,9 @@ Gallout a rit mirout ar gemennadenn-mañ hag implij anezhi evel un enrolladenn e
     <string name="swipe_action_change_swipe_gestures">Kemmañ\nRisklañ jestroù</string>
     <string name="archiving_not_available_for_this_account">N\'eo ket hegez an diellaouiñ evit ar c\'hont-mañ.</string>
     <string name="message_view_menu_action_export_eml">Ezporzhiañ e stumm EML</string>
+    <string name="print_message_action">Moullañ</string>
+    <string name="set_format_html_action">Ober gant ar pajennaozañ orin</string>
+    <string name="set_format_html_condensed_action">Diskwel ar pajennaozañ</string>
+    <string name="set_format_plain_action">Diskwel ar postel hep pajennaozañ</string>
+    <string name="set_format_plain_condensed_action">Diskwel hep pajennaozañ</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-cs/strings.xml b/legacy/ui/legacy/src/main/res/values-cs/strings.xml
index 609863fb700..854d0070a98 100644
--- a/legacy/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-cs/strings.xml
@@ -942,4 +942,5 @@ Tuto zprávu si můžete ponechat a použít jí jako zálohu svého tajného kl
     <string name="global_settings_messageview_body_content_type_text_plain">Pouze text (text/plain)</string>
     <string name="global_settings_messageview_body_content_type_title">Typ obsahu těla</string>
     <string name="debug_feature_flags">LADĚNÍ: Příznaky funkcí</string>
+    <string name="print_message_action">Tisk</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-cy/strings.xml b/legacy/ui/legacy/src/main/res/values-cy/strings.xml
index 092897df171..173c1e83b56 100644
--- a/legacy/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-cy/strings.xml
@@ -308,8 +308,8 @@
     <string name="account_settings_ignore_chat_messages_summary">Peidio â dangos hysbysiadau am negeseuon sy\'n perthyn i sgwrs e-bost</string>
     <string name="account_settings_mark_message_as_read_on_view_label">Marcio fel wedi ei darllen wrth ei hagor</string>
     <string name="account_settings_mark_message_as_read_on_view_summary">Marcio neges fel ei bod wedi ei darllen wrth ei hagor i\'w darllen</string>
-    <string name="account_settings_mark_message_as_read_on_delete_label">Nodi wedi\'i darllen wrth dileu</string>
-    <string name="account_settings_mark_message_as_read_on_delete_summary">Nodi neges wedi\'i darllen pan gaiff ei dileu</string>
+    <string name="account_settings_mark_message_as_read_on_delete_label">Nodi wedi\'i darllen ar ôl ei dileu</string>
+    <string name="account_settings_mark_message_as_read_on_delete_summary">Nodi neges wedi\'i darllen wrth ei dileu</string>
     <string name="account_settings_notification_channels_label">Categorïau hysbysiadau</string>
     <string name="account_settings_open_notification_settings_messages_summary">Ffurfweddu hysbysiadau ar gyfer negeseuon newydd</string>
     <string name="account_settings_open_notification_settings_miscellaneous_summary">Ffurfweddu hysbysiadau statws a gwallau</string>
@@ -395,7 +395,7 @@
     <string name="account_settings_name_label">Eich enw</string>
     <string name="notifications_title">Hysbysiadau</string>
     <string name="account_settings_vibration">Crynu</string>
-    <string name="account_settings_vibrate_enable">Crynu</string>
+    <string name="account_settings_vibrate_enable">Dirgrynu</string>
     <string name="account_settings_vibrate_pattern_label">Patrwm crynu</string>
     <string name="account_settings_vibrate_pattern_default">Rhagosodedig</string>
     <string name="account_settings_vibrate_pattern_1">Patrwm 1</string>
@@ -431,7 +431,7 @@
     <string name="manage_identities_edit_action">Golygu</string>
     <string name="manage_identities_move_up_action">Symud i fyny</string>
     <string name="manage_identities_move_down_action">Symud i lawr</string>
-    <string name="manage_identities_move_top_action">Symud i\'r brig / gwneud yn rhagosodedig</string>
+    <string name="manage_identities_move_top_action">Symud i\'r brig / gwneud y rhagosodedig</string>
     <string name="manage_identities_remove_action">Tynnu</string>
     <string name="edit_identity_description_label">Disgrifiad hunaniaeth</string>
     <string name="edit_identity_description_hint">(Dewisol)</string>
@@ -439,7 +439,7 @@
     <string name="edit_identity_name_hint">(Dewisol)</string>
     <string name="edit_identity_email_label">Cyfeiriad e-bost</string>
     <string name="edit_identity_email_hint">(Angenrheidiol)</string>
-    <string name="edit_identity_reply_to_label">Cyfeiriad Ateb-i</string>
+    <string name="edit_identity_reply_to_label">Cyfeiriad Ateb Iddo</string>
     <string name="edit_identity_reply_to_hint">(Dewisol)</string>
     <string name="edit_identity_signature_label">Llofnod</string>
     <string name="edit_identity_signature_hint">(Dewisol)</string>
@@ -460,8 +460,8 @@
     <string name="sort_flagged_last">Negeseuon heb sêr yn gyntaf</string>
     <string name="sort_unread_first">Negeseuon heb eu darllen yn gyntaf</string>
     <string name="sort_unread_last">Negeseuon wedi eu darllen yn gyntaf</string>
-    <string name="sort_attach_first">Negeseuon gydag atodiadau yn gyntaf</string>
-    <string name="sort_unattached_first">Negeseuon heb atodiadau yn gyntaf</string>
+    <string name="sort_attach_first">Negeseuon gydag atodiadau\'n gyntaf</string>
+    <string name="sort_unattached_first">Negeseuon heb atodiadau\'n gyntaf</string>
     <string name="sort_by">Trefnu yn ôl…</string>
     <string name="sort_by_date">Dyddiad</string>
     <string name="sort_by_arrival">Derbyn</string>
@@ -473,7 +473,7 @@
     <string name="account_delete_dlg_title">Tynnu Cyfrif</string>
     <string name="folder_list_filter_hint">Enw ffolder yn cynnwys</string>
     <string name="account_settings_signature__location_label">Lleoliad llofnod</string>
-    <string name="account_settings_signature__location_before_quoted_text">Cyn neges wedi ei dyfynnu</string>
+    <string name="account_settings_signature__location_before_quoted_text">O flaen neges wedi ei dyfynnu</string>
     <string name="account_settings_signature__location_after_quoted_text">Ar ôl neges wedi ei dyfynnu</string>
     <string name="setting_theme_global">Defnyddio thema\'r ap</string>
     <string name="setting_theme_dark">Tywyll</string>
@@ -493,13 +493,13 @@
     <string name="settings_compose_theme_label">Thema creu negeseuon</string>
     <string name="settings_language_label">Iaith</string>
     <string name="preference_search_no_results">Heb ganfod gosodiadau</string>
-    <string name="settings_message_theme_selection_label">Un thema negeseuon</string>
-    <string name="settings_message_theme_selection_summary_off">Dewis y thema dangos neges tra\'n edrych ar y neges</string>
-    <string name="settings_message_theme_selection_summary_on">Defnyddio\'r un thema i edrych ar negeseuon</string>
+    <string name="settings_message_theme_selection_label">Thema negeseuon sefydlog</string>
+    <string name="settings_message_theme_selection_summary_off">Dewis y thema gweld neges tra\'n edrych ar y neges</string>
+    <string name="settings_message_theme_selection_summary_on">Defnyddio\'r thema sefydlog i edrych ar negeseuon</string>
     <string name="setting_language_system">Rhagosodiad y system</string>
     <string name="background_ops_label">Cydweddu yn y cefndir</string>
     <string name="background_ops_never">Byth</string>
-    <string name="background_ops_always">O hyd</string>
+    <string name="background_ops_always">Bob tro</string>
     <string name="background_ops_auto_sync_only">Pan mae \'Awto-cydweddu\' wedi ei ddewis</string>
     <string name="batch_select_all">Dewis y cyfan</string>
     <string name="account_setup_push_limit_label">Nifer mwyaf o ffolderi i\'w gwirio wrth wthio</string>
@@ -557,12 +557,12 @@
     <string name="dialog_confirm_delete_title">Cadarnhau dileu</string>
     <string name="dialog_confirm_delete_message">Ydych chi eisiau dileu\'r neges hon?</string>
     <plurals name="dialog_confirm_delete_messages">
-        <item quantity="zero">Wyt ti wir eisiau dileu\'r neges hon?</item>
-        <item quantity="one">Wyt ti wir eisiau dileu\'r neges hon?</item>
-        <item quantity="two">Wyt ti wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
-        <item quantity="few">Wyt ti wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
-        <item quantity="many">Wyt ti wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
-        <item quantity="other">Wyt ti wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
+        <item quantity="zero">Ydych chi wir eisiau dileu\'r negeseuon hyn?</item>
+        <item quantity="one">Ydych chi wir eisiau dileu\'r neges hon?</item>
+        <item quantity="two">Ydych chi wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
+        <item quantity="few">Ydych chi wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
+        <item quantity="many">Ydych chi wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
+        <item quantity="other">Ydych chi wir eisiau dileu <xliff:g id="message_count">%1$d</xliff:g> neges?</item>
     </plurals>
     <string name="dialog_confirm_delete_confirm_button">Ydw</string>
     <string name="dialog_confirm_delete_cancel_button">Na</string>
@@ -574,12 +574,12 @@
     <string name="dialog_confirm_mark_all_as_read_cancel_button">Na</string>
     <string name="dialog_confirm_spam_title">Cadarnhau symud i\'r ffolder sbam</string>
     <plurals name="dialog_confirm_spam_message">
-        <item quantity="zero">Wyt ti wir eisiau symud y neges hon i\'r ffolder sbam?</item>
-        <item quantity="one">Wyt ti wir eisiau symud y neges hon i\'r ffolder sbam?</item>
-        <item quantity="two">Wyt ti wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
-        <item quantity="few">Wyt ti wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
-        <item quantity="many">Wyt ti wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
-        <item quantity="other">Wyt ti wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
+        <item quantity="zero">Ydych chi wir eisiau symud y negeseuon hyn i\'r ffolder sbam?</item>
+        <item quantity="one">Ydych chi wir eisiau symud y neges hon i\'r ffolder sbam?</item>
+        <item quantity="two">Ydych chi wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
+        <item quantity="few">Ydych chi wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
+        <item quantity="many">Ydych chi wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
+        <item quantity="other">Ydych chi wir eisiau symud <xliff:g id="message_count">%1$d</xliff:g> neges i\'r ffolder sbam?</item>
     </plurals>
     <string name="dialog_confirm_spam_confirm_button">Ydw</string>
     <string name="dialog_confirm_spam_cancel_button">Na</string>
@@ -624,7 +624,7 @@
     <string name="account_settings_remote_search_num_label">Terfyn chwilio gweinydd</string>
     <string name="remote_search_sending_query">Yn anfon ymholiad at y gweinydd</string>
     <plurals name="remote_search_downloading">
-        <item quantity="zero">Yn nôl %d canlyniad</item>
+        <item quantity="zero">Yn nôl %d canlyniadau</item>
         <item quantity="one">Yn nôl %d canlyniad</item>
         <item quantity="two">Yn nôl %d ganlyniad</item>
         <item quantity="few">Yn nôl %d ganlyniad</item>
@@ -632,7 +632,7 @@
         <item quantity="other">Yn nôl %d canlyniad</item>
     </plurals>
     <plurals name="remote_search_downloading_limited">
-        <item quantity="zero">Yn nôl %1$d o %2$d canlyniad</item>
+        <item quantity="zero">Yn nôl %1$d o %2$d canlyniadau</item>
         <item quantity="one">Yn nôl %1$d o %2$d canlyniad</item>
         <item quantity="two">Yn nôl %1$d o %2$d ganlyniad</item>
         <item quantity="few">Yn nôl %1$d o %2$d ganlyniad</item>
@@ -653,22 +653,22 @@
     <string name="global_settings_splitview_mode_label">Hollti\'r sgrin</string>
     <string name="global_settings_splitview_always">Bob tro</string>
     <string name="global_settings_splitview_never">Byth</string>
-    <string name="global_settings_splitview_when_in_landscape">Pan mae\'r sgrin ar ei ochr, mewn modd tirwedd</string>
+    <string name="global_settings_splitview_when_in_landscape">Pan mewn modd Tirwedd</string>
     <string name="message_view_empty">Dewiswch neges ar y chwith</string>
     <string name="global_settings_show_contact_picture_label">Dangos lluniau cysylltiadau</string>
     <string name="global_settings_show_contact_picture_summary">Dangos lluniau cysylltiadau yn y rhestr negeseuon</string>
-    <string name="mark_all_as_read">Nodi\'r cwbl fel wedi eu darllen</string>
-    <string name="global_settings_colorize_missing_contact_pictures_label">Dangos lliwiau cysylltiadau</string>
-    <string name="global_settings_colorize_missing_contact_pictures_summary">Defnyddio lliwiau ar gyfer cysylltiadau heb luniau</string>
-    <string name="global_settings_messageview_visible_refile_actions_title">Botymau neges i\'w dangos</string>
-    <string name="global_settings_messageview_visible_refile_actions_summary">Dewis pa opsiynau i\'w dangos wrth edrych ar neges</string>
+    <string name="mark_all_as_read">Marcio\'r cyfan fel wedi\'u darllen</string>
+    <string name="global_settings_colorize_missing_contact_pictures_label">Lliwio lluniau cysylltiadau</string>
+    <string name="global_settings_colorize_missing_contact_pictures_summary">Lliwio cysylltiadau heb luniau</string>
+    <string name="global_settings_messageview_visible_refile_actions_title">Gweithredoedd neges amlwg</string>
+    <string name="global_settings_messageview_visible_refile_actions_summary">Dewis gweithredoedd wedi\'u dewis yn y ddewislen golwg neges</string>
     <string name="loading_attachment">Yn llwytho\'r atodiad…</string>
     <string name="fetching_attachment_dialog_title_send">Yn anfon neges</string>
     <string name="fetching_attachment_dialog_title_save">Yn cadw\'r drafft</string>
     <string name="fetching_attachment_dialog_message">Yn nôl yr atodiad…</string>
     <!--Note: This references message_view_download_remainder-->
     <string name="preview_encrypted">*Wedi amgryptio*</string>
-    <string name="add_from_contacts">Ychwanegu o Gysylltiadau</string>
+    <string name="add_from_contacts">Ychwanegu o\'r Cysylltiadau</string>
     <string name="recipient_cc">Cc</string>
     <string name="recipient_bcc">Bcc</string>
     <string name="recipient_to">At</string>
@@ -681,20 +681,20 @@
     <string name="address_type_other">Arall</string>
     <string name="address_type_mobile">Symudol</string>
     <string name="compose_error_no_draft_folder">Does dim ffolder Drafftiau wedi ei ffurfweddu ar gyfer y cyfrif hwn!</string>
-    <string name="compose_error_no_key_configured">Does dim allwedd wedi ei ffurfweddu ar gyfer y cyfrif hwn! Gwiria dy osodiadau.</string>
-    <string name="error_crypto_provider_incompatible">Mae\'r darparwr crypto yn defnyddio fersiwn anghydnaws. Gwiriwch y gosodiadau!</string>
-    <string name="error_crypto_provider_connect">Methwyd cysylltu â darparwr crypto. Gwiriwch eich gosodiadau neu glicio\'r eicon crypto i gynnig eto!</string>
+    <string name="compose_error_no_key_configured">Does dim allwedd wedi ei ffurfweddu ar gyfer y cyfrif hwn! Gwiriwch eich gosodiadau.</string>
+    <string name="error_crypto_provider_incompatible">Mae\'r darparwr crypto yn defnyddio fersiwn anghydnaws. Gwiriwch eich gosodiadau!</string>
+    <string name="error_crypto_provider_connect">Methwyd cysylltu â darparwr crypto, gwiriwch eich gosodiadau neu glicio\'r eicon crypto i gynnig eto!</string>
     <string name="error_crypto_provider_ui_required">Methwyd dechrau\'r amgryptiad pen-i-ben, gwiriwch eich gosodiadau</string>
-    <string name="error_crypto_inline_attach">Dyw\'r modd PGP/INLINE ddim yn caniatáu atodiadau!</string>
+    <string name="error_crypto_inline_attach">Dyw\'r modd PGP/INLINE ddim yn cynnal atodiadau!</string>
     <string name="enable_inline_pgp">Galluogi PGP/INLINE</string>
     <string name="disable_inline_pgp">Analluogi PGP/INLINE</string>
     <string name="enable_sign_only">Galluogi PGP Llofnodi-yn-Unig</string>
     <string name="disable_sign_only">Analluogi PGP Llofnodi-yn-Unig</string>
     <string name="openpgp_inline_title">Modd PGP/INLINE</string>
-    <string name="openpgp_inline_text">Anfonwyd y neges hon mewn fformat PGP/INLINE.\nDylid ond ei ddefnyddio ar gyfer cydweddiad:</string>
+    <string name="openpgp_inline_text">Anfonwyd y neges hon mewn fformat PGP/INLINE.\nI\'w ddefnyddio dim ond ar gyfer cydweddiad:</string>
     <string name="openpgp_inline_plus_compat">Dyw rhai cleientiaid ond yn caniatáu’r fformat hwn</string>
     <string name="openpgp_inline_minus_transit">Gall allweddi torri yn ystod y daith</string>
-    <string name="openpgp_inline_minus_attach">Dyw atodiadau ddim yn bosib</string>
+    <string name="openpgp_inline_minus_attach">Dyw atodiadau ddim yn cael eu cynnal</string>
     <string name="openpgp_inline_ok">Iawn!</string>
     <string name="openpgp_inline_disable">Analluogi</string>
     <string name="openpgp_inline_keep_enabled">Cadw wedi\'i Alluogi</string>
@@ -702,7 +702,7 @@
     <string name="openpgp_sign_only_disable">Analluogi</string>
     <string name="openpgp_sign_only_keep_enabled">Cadw wedi\'i Analluogi</string>
     <string name="openpgp_dialog_sign_only_title">Modd PGP Llofnodi-yn-Unig</string>
-    <string name="openpgp_dialog_sign_only_text">Yn y modd hwn, caiff eich allwedd PGP ei ddefnyddio i greu llofnod cryptograffeg o neges e-bost heb ei amgryptio.</string>
+    <string name="openpgp_dialog_sign_only_text">Yn y modd hwn, bydd eich allwedd PGP yn cael ei ddefnyddio i greu llofnod cryptograffeg o neges e-bost heb ei amgryptio.</string>
     <string name="openpgp_dialog_sign_only_plus_verified">Dyw hyn ddim yn amgryptio\'r neges, ond mae\'n dilysu ei fod wedi ei anfon o\'ch allwedd di.</string>
     <string name="openpgp_dialog_sign_only_minus_break">Gall llofnodion torri wrth eu hanfon at restrau e-bost.</string>
     <string name="openpgp_dialog_sign_only_minus_attach">Gall llofnodion ymddangos fel atodiad \'signature.asc\' mewn rhai rhaglenni.</string>
@@ -710,32 +710,32 @@
     <string name="crypto_msg_title_plaintext">Testun plaen</string>
     <string name="crypto_msg_unencrypted_sign_error">roedd gwall mewn llofnod pen-i-ben</string>
     <string name="crypto_msg_incomplete_signed">rhaid llwytho\'r neges i lawr yn gyfan er mwyn prosesu\'r llofnod</string>
-    <string name="crypto_msg_unsupported_signed">mae\'n cynnwys llofnod diwedd-i-ddiwedd anghydnaws</string>
+    <string name="crypto_msg_unsupported_signed">mae\'n cynnwys llofnod pen-i-ben anghydnaws</string>
     <string name="crypto_msg_unsupported_encrypted">Mae\'r neges wedi ei hamgryptio, ond mewn fformat dieithr.</string>
     <string name="crypto_msg_cancelled">Mae\'r neges wedi ei hamgryptio, ond diddymwyd yr amgryptio.</string>
-    <string name="crypto_msg_title_unencrypted_signed_e2e">Llofnod testun plaen Diwedd-i-Ddiwedd</string>
+    <string name="crypto_msg_title_unencrypted_signed_e2e">Llofnod testun plaen pen i ben</string>
     <string name="crypto_msg_unencrypted_sign_verified">oddi wrth lofnodwr wedi\'i wirio</string>
     <string name="crypto_msg_title_unencrypted_signed">Llofnodwyd testun plaen</string>
-    <string name="crypto_msg_unencrypted_sign_mismatch">ond nid oedd yr allwedd diwedd-i-ddiwedd yn cyd-fynd â\'r anfonwr</string>
-    <string name="crypto_msg_unencrypted_sign_expired">ond mae\'r allwedd diwedd-i-ddiwedd yn hen</string>
-    <string name="crypto_msg_unencrypted_sign_revoked">ond mae\'r allwedd diwedd-i-ddiwedd wedi ei diddymu</string>
-    <string name="crypto_msg_unencrypted_sign_insecure">ond dyw\'r allwedd diwedd-i-ddiwedd ddim yn ymddangos yn ddiogel</string>
-    <string name="crypto_msg_unencrypted_sign_unknown">oddi wrth allwedd diwedd-i-ddiwedd anhysbys</string>
+    <string name="crypto_msg_unencrypted_sign_mismatch">ond nid oedd yr allwedd pen i ben yn cyd-fynd â\'r anfonwr</string>
+    <string name="crypto_msg_unencrypted_sign_expired">ond mae\'r allwedd pen i ben yn hen</string>
+    <string name="crypto_msg_unencrypted_sign_revoked">ond mae\'r allwedd pen i ben wedi ei diddymu</string>
+    <string name="crypto_msg_unencrypted_sign_insecure">ond dyw\'r allwedd pen i ben ddim yn ymddangos yn ddiogel</string>
+    <string name="crypto_msg_unencrypted_sign_unknown">oddi wrth allwedd pen i ben anhysbys</string>
     <string name="crypto_msg_title_encrypted_unknown">Amgryptiwyd</string>
     <string name="crypto_msg_encrypted_error">ond roedd gwall dadgryptio</string>
     <string name="crypto_msg_encrypted_incomplete">rhaid llwytho\'r neges i lawr yn gyfan er mwyn dadgryptio</string>
     <string name="crypto_msg_encrypted_no_provider">ond does dim ap crypto wedi ei ffurfweddu</string>
     <string name="crypto_msg_title_encrypted_unsigned">Amgryptiwyd</string>
-    <string name="crypto_msg_encrypted_unsigned">ond nid diwedd-i-ddiwedd</string>
-    <string name="crypto_msg_title_encrypted_signed_e2e">Amgrpytiad diwedd-i-ddiwedd</string>
+    <string name="crypto_msg_encrypted_unsigned">ond nid pen i ben</string>
+    <string name="crypto_msg_title_encrypted_signed_e2e">Amgrpytiad pen i ben</string>
     <string name="crypto_msg_encrypted_sign_verified">oddi wrth anfonwr wedi\'i wirio</string>
     <string name="crypto_msg_title_encrypted_signed">Amgryptiwyd</string>
-    <string name="crypto_msg_encrypted_sign_unknown">oddi wrth allwedd diwedd-i-ddiwedd anhysbys</string>
-    <string name="crypto_msg_encrypted_sign_mismatch">ond nid oedd yr allwedd diwedd-i-ddiwedd yn cyd-fynd â\'r anfonwr</string>
-    <string name="crypto_msg_encrypted_sign_expired">ond mae\'r allwedd diwedd-i-ddiwedd yn hen</string>
-    <string name="crypto_msg_encrypted_sign_revoked">ond mae\'r allwedd diwedd-i-ddiwedd wedi ei diddymu</string>
-    <string name="crypto_msg_encrypted_sign_insecure">ond dyw\'r allwedd diwedd-i-ddiwedd ddim yn ymddangos yn ddiogel</string>
-    <string name="crypto_msg_encrypted_sign_error">ond mae gwallau yn y data diwedd-i-ddiwedd</string>
+    <string name="crypto_msg_encrypted_sign_unknown">oddi wrth allwedd pen i ben anhysbys</string>
+    <string name="crypto_msg_encrypted_sign_mismatch">ond nid oedd yr allwedd pen i benpen i ben yn cyd-fynd â\'r anfonwr</string>
+    <string name="crypto_msg_encrypted_sign_expired">ond mae\'r allwedd pen i ben yn hen</string>
+    <string name="crypto_msg_encrypted_sign_revoked">ond mae\'r allwedd pen i ben wedi\'i diddymu</string>
+    <string name="crypto_msg_encrypted_sign_insecure">ond dyw\'r allwedd pen i ben ddim yn ymddangos yn ddiogel</string>
+    <string name="crypto_msg_encrypted_sign_error">ond mae gwallau yn y data pen i ben</string>
     <string name="crypto_msg_encrypted_insecure">ond dyw\'r amgryptiad ddim yn ymddangos yn ddiogel</string>
     <string name="locked_attach_unlock">Datgloi</string>
     <string name="locked_attach_unencrypted">Chafodd y rhan hwn ddim ei amgryptio a gall fod yn anniogel.</string>
diff --git a/legacy/ui/legacy/src/main/res/values-de/strings.xml b/legacy/ui/legacy/src/main/res/values-de/strings.xml
index d4e6c664978..69d6c2e7f0b 100644
--- a/legacy/ui/legacy/src/main/res/values-de/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-de/strings.xml
@@ -925,4 +925,5 @@ Du kannst diese Nachricht aufheben und sie als Backup für deinen geheimen Schl
     <string name="global_settings_messageview_body_content_type_text_plain">Nur Text (Text/Klartext)</string>
     <string name="account_setup_auto_select_folder">Ordner automatisch auswählen</string>
     <string name="global_settings_messageview_body_content_type_title">Inhaltstyp des Textes</string>
+    <string name="print_message_action">Drucken</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-es/strings.xml b/legacy/ui/legacy/src/main/res/values-es/strings.xml
index c18bc0989b6..311413c46bf 100644
--- a/legacy/ui/legacy/src/main/res/values-es/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-es/strings.xml
@@ -928,4 +928,5 @@
     <string name="global_settings_messageview_body_content_type_title">Tipo de contenido del cuerpo del mensaje</string>
     <string name="global_settings_messageview_body_content_type_text_html">HTML (text/html)</string>
     <string name="debug_feature_flags">DEPURACIÓN: Indicadores de características</string>
+    <string name="print_message_action">Imprimir</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-et/strings.xml b/legacy/ui/legacy/src/main/res/values-et/strings.xml
index 1a58be6a99f..f5f3119c5b8 100644
--- a/legacy/ui/legacy/src/main/res/values-et/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-et/strings.xml
@@ -928,4 +928,5 @@ Palun jäta see kiri alles ning kasuta seda muu hulgas oma krüptovõtme varunda
     <string name="global_settings_messageview_body_content_type_text_html">HTML (text/html)</string>
     <string name="global_settings_messageview_body_content_type_text_plain">Vormindamata tekst (text/plain)</string>
     <string name="debug_feature_flags">VEAOTSING: funktsionaalsuste võtmed</string>
+    <string name="print_message_action">Prindi</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-fr/strings.xml b/legacy/ui/legacy/src/main/res/values-fr/strings.xml
index ee796c2b4bc..620efc80f4b 100644
--- a/legacy/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-fr/strings.xml
@@ -928,4 +928,5 @@
     <string name="navigation_drawer_preferences">Menu latéral</string>
     <string name="expand_folders">Développer les dossiers</string>
     <string name="debug_feature_flags">DÉBOGAGE : Drapeaux de fonction</string>
+    <string name="print_message_action">Imprimer</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-fy/strings.xml b/legacy/ui/legacy/src/main/res/values-fy/strings.xml
index 7a3aa20e42c..0e03c9ee5d6 100644
--- a/legacy/ui/legacy/src/main/res/values-fy/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-fy/strings.xml
@@ -922,4 +922,5 @@
     <string name="global_settings_messageview_body_content_type_text_html">HTML (text/html)</string>
     <string name="global_settings_messageview_body_content_type_text_plain">Platte tekst (text/plain)</string>
     <string name="debug_feature_flags">DEBUGGE: Funksjelabels</string>
+    <string name="print_message_action">Ofdrukke</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-ga/strings.xml b/legacy/ui/legacy/src/main/res/values-ga/strings.xml
index 784d6faaf62..252aa8350c4 100644
--- a/legacy/ui/legacy/src/main/res/values-ga/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-ga/strings.xml
@@ -878,4 +878,5 @@
     <string name="global_settings_messageview_body_content_type_text_html">HTML (téacs/html)</string>
     <string name="global_settings_messageview_body_content_type_text_plain">Téacs simplí (téacs/simplí)</string>
     <string name="debug_feature_flags">Dífhabhtú: Bratacha Gnéithe</string>
+    <string name="print_message_action">Priontáil</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-it/strings.xml b/legacy/ui/legacy/src/main/res/values-it/strings.xml
index c9cef3552d4..6c3c02e186e 100644
--- a/legacy/ui/legacy/src/main/res/values-it/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-it/strings.xml
@@ -928,4 +928,5 @@
     <string name="message_view_menu_action_export_eml">Esporta come EML</string>
     <string name="global_settings_messageview_body_content_type_title">Corpo del messaggio come</string>
     <string name="debug_feature_flags">DEBUG: Flag Caratteristiche</string>
+    <string name="print_message_action">Stampa</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-nl/strings.xml b/legacy/ui/legacy/src/main/res/values-nl/strings.xml
index 22a0a520c67..ba66df034b9 100644
--- a/legacy/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-nl/strings.xml
@@ -922,4 +922,5 @@
     <string name="global_settings_messageview_body_content_type_text_html">HTML (text/html)</string>
     <string name="global_settings_messageview_body_content_type_text_plain">Platte tekst (text/plain)</string>
     <string name="debug_feature_flags">DEBUGGEN: Functielabels</string>
+    <string name="print_message_action">Afdrukken</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-nn/strings.xml b/legacy/ui/legacy/src/main/res/values-nn/strings.xml
index 225eb456881..69a8a63e60f 100644
--- a/legacy/ui/legacy/src/main/res/values-nn/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-nn/strings.xml
@@ -924,4 +924,7 @@
     <string name="account_setup_auto_select_folder">Autoselekter mappe</string>
     <string name="navigation_drawer_preferences">Sidemeny</string>
     <string name="expand_folders">Utvid mapper</string>
+    <string name="debug_feature_flags">DEBUG: Funksjonsflagg</string>
+    <string name="global_settings_messageview_body_content_type_text_plain">Rein tekst (text/plain)</string>
+    <string name="global_settings_messageview_body_content_type_title">Innhaldstype for brødtekst</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-pl/strings.xml b/legacy/ui/legacy/src/main/res/values-pl/strings.xml
index 9cca67fcd05..514a7d1ac9e 100644
--- a/legacy/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-pl/strings.xml
@@ -933,4 +933,5 @@
     <string name="global_settings_messageview_body_content_type_text_html">HTML (tekst/HTML)</string>
     <string name="global_settings_messageview_body_content_type_text_plain">Zwykły tekst (tekst/zwykły)</string>
     <string name="debug_feature_flags">DEBUGOWANIE: flagi funkcji</string>
+    <string name="print_message_action">Drukuj</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-sl/strings.xml b/legacy/ui/legacy/src/main/res/values-sl/strings.xml
index 0dad580bd26..337ed9f6f8e 100644
--- a/legacy/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-sl/strings.xml
@@ -928,4 +928,12 @@ Sporočilo lahko shranite in ga uporabite kot varno kopijo šifrirnega ključa.
     <string name="debug_invalidate_access_token_cannot_modify">Shranjenega žeton za dostop ni bilo mogoče spremeniti. Poizkusite s krajevno razveljavitvijo.</string>
     <string name="debug_invalidate_access_token_already_modified">Shranjen žeton za dostop je bil že spremenjen.</string>
     <string name="message_view_menu_action_export_eml">Izvozi kot EML</string>
+    <string name="set_format_html_action">Uporabi izvirno obliko</string>
+    <string name="set_format_html_condensed_action">Prikaži oblikovano</string>
+    <string name="set_format_plain_action">Prikaži neoblikovano sporočilo</string>
+    <string name="set_format_plain_condensed_action">Prikaži neoblikovano</string>
+    <string name="global_settings_messageview_body_content_type_text_html">HTML (text/html)</string>
+    <string name="global_settings_messageview_body_content_type_text_plain">Golo besedilo (text/plain)</string>
+    <string name="navigation_drawer_preferences">Stranski meni</string>
+    <string name="expand_folders">Razširi mape</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-sq/strings.xml b/legacy/ui/legacy/src/main/res/values-sq/strings.xml
index 8d53b28f907..36917f4bc7e 100644
--- a/legacy/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-sq/strings.xml
@@ -921,4 +921,5 @@
     <string name="navigation_drawer_preferences">Menu Anësore</string>
     <string name="expand_folders">Zgjeroji Dosjet</string>
     <string name="global_settings_messageview_body_content_type_title">Lloj Lënde Mesazhi</string>
+    <string name="print_message_action">Shtypni</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index fd7949984c2..92c1383aabf 100644
--- a/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -916,4 +916,5 @@
     <string name="global_settings_messageview_body_content_type_text_html">HTML (text/html)</string>
     <string name="global_settings_messageview_body_content_type_text_plain">纯文本（text/plain）</string>
     <string name="debug_feature_flags">调试：功能标识</string>
+    <string name="print_message_action">打印</string>
 </resources>
diff --git a/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml
index 72190455be6..eb94bdac774 100644
--- a/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml
+++ b/legacy/ui/legacy/src/main/res/values-zh-rTW/strings.xml
@@ -16,7 +16,7 @@
     <string name="changelog_title">變更記錄</string>
     <string name="changelog_loading_error">無法載入變更記錄。</string>
     <string name="changelog_version_title">第%s版</string>
-    <string name="changelog_recent_changes_title">最新消息</string>
+    <string name="changelog_recent_changes_title">最新變化</string>
     <string name="changelog_show_recent_changes">顯示應用程式更新後的最新變更</string>
     <!--Displayed in a "snack bar" at the bottom of the screen when the app was updated.-->
     <string name="changelog_snackbar_text">了解此版本的新增功能</string>
@@ -37,7 +37,7 @@
     <string name="choose_folder_copy_title">複製至…</string>
     <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> 已選擇</string>
     <string name="send_action">寄送</string>
-    <string name="empty_subject">主題空白，再次點擊以繼續寄送</string>
+    <string name="empty_subject">主旨空白，再次按一下以繼續寄送</string>
     <string name="reply_action">回覆</string>
     <string name="reply_all_action">全部回覆</string>
     <string name="delete_action">刪除</string>
@@ -67,16 +67,16 @@
     <string name="remove_account_action">刪除帳號</string>
     <string name="mark_as_read_action">標記為已讀</string>
     <string name="send_alternate_action">分享</string>
-    <string name="send_alternate_chooser_title">選擇寄件人</string>
+    <string name="send_alternate_chooser_title">選擇寄件者</string>
     <string name="flag_action">加上星號</string>
     <string name="unflag_action">移除星號</string>
     <string name="copy_action">複製</string>
     <string name="unsubscribe_action">取消訂閱</string>
     <string name="show_headers_action">顯示標頭</string>
     <plurals name="copy_address_to_clipboard">
-        <item quantity="other">位址已複製到剪貼簿</item>
+        <item quantity="other">地址已複製至剪貼簿</item>
     </plurals>
-    <string name="copy_subject_to_clipboard">主題文字已複製到剪貼簿</string>
+    <string name="copy_subject_to_clipboard">主旨文字已複製至剪貼簿</string>
     <string name="message_view_theme_action_dark">切換為暗色主題</string>
     <string name="message_view_theme_action_light">切換為亮色主題</string>
     <string name="mark_as_unread_action">標記為未讀</string>
@@ -89,19 +89,19 @@
     <string name="about_action">關於</string>
     <string name="prefs_title">設定</string>
     <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
-    <string name="general_no_subject">（無主題）</string>
-    <string name="general_no_sender">無寄件人</string>
-    <string name="status_loading_more">正在載入郵件…</string>
-    <string name="status_network_error">網路連接錯誤</string>
-    <string name="status_invalid_id_error">沒有找到郵件</string>
-    <string name="status_loading_error">郵件載入錯誤</string>
-    <string name="load_more_messages_fmt">再載入 <xliff:g id="messages_to_load">%d</xliff:g> 封郵件</string>
-    <string name="size_format_gigabytes">%.1fGB</string>
-    <string name="size_format_megabytes">%.1fMB</string>
-    <string name="size_format_kilobytes">%.1fkB</string>
-    <string name="size_format_bytes">%dB</string>
+    <string name="general_no_subject">（無主旨）</string>
+    <string name="general_no_sender">無寄件者</string>
+    <string name="status_loading_more">正在載入訊息…</string>
+    <string name="status_network_error">網路連線錯誤</string>
+    <string name="status_invalid_id_error">找不到訊息</string>
+    <string name="status_loading_error">訊息載入錯誤</string>
+    <string name="load_more_messages_fmt">再載入 <xliff:g id="messages_to_load">%d</xliff:g> 則訊息</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>
     <plurals name="notification_new_messages_title">
-        <item quantity="other"><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_additional_messages">+ 來自<xliff:g id="account">%2$s</xliff:g>已超過<xliff:g id="additional_messages">%1$d</xliff:g>則訊息</string>
     <string name="notification_action_reply">回覆</string>
@@ -112,10 +112,10 @@
     <string name="notification_action_archive">封存</string>
     <string name="notification_action_archive_all">全部封存</string>
     <string name="notification_action_spam">垃圾郵件</string>
-    <string name="notification_certificate_error_public">證書錯誤</string>
-    <string name="notification_certificate_error_title"><xliff:g id="account">%s</xliff:g>驗證錯誤</string>
+    <string name="notification_certificate_error_public">憑證錯誤</string>
+    <string name="notification_certificate_error_title"><xliff:g id="account">%s</xliff:g> 的憑證錯誤</string>
     <string name="notification_certificate_error_text">檢查你的伺服器設定</string>
-    <string name="notification_authentication_error_title">身份驗證失敗</string>
+    <string name="notification_authentication_error_title">身分驗證失敗</string>
     <string name="notification_authentication_error_text"><xliff:g id="account">%s</xliff:g> 登入失敗。請更新你的伺服器設定。</string>
     <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
     <string name="notification_notify_error_title">通知錯誤</string>
@@ -126,36 +126,36 @@
     <string name="notification_bg_send_ticker">正在寄送郵件：<xliff:g id="account">%s</xliff:g></string>
     <string name="notification_bg_send_title">正在寄送郵件</string>
     <string name="notification_bg_title_separator">：</string>
-    <string name="notification_channel_push_title">同步（推送）</string>
-    <string name="notification_channel_push_description">等待新郵件時顯示</string>
-    <string name="notification_channel_messages_title">郵件</string>
-    <string name="notification_channel_messages_description">與郵件相關的通知</string>
+    <string name="notification_channel_push_title">同步處理（推播）</string>
+    <string name="notification_channel_push_description">等待新訊息時顯示</string>
+    <string name="notification_channel_messages_title">訊息</string>
+    <string name="notification_channel_messages_description">與訊息相關的通知</string>
     <string name="notification_channel_miscellaneous_title">雜項設定</string>
     <string name="notification_channel_miscellaneous_description">其他通知，如錯誤通知等。</string>
-    <string name="send_failure_subject">有些郵件沒有成功寄送</string>
+    <string name="send_failure_subject">部分訊息沒有成功寄送</string>
     <string name="version">版本</string>
-    <string name="debug_enable_debug_logging_title">啟用除錯日誌</string>
-    <string name="debug_enable_debug_logging_summary">記錄額外的除錯訊息</string>
-    <string name="debug_enable_sensitive_logging_title">記錄敏感訊息</string>
-    <string name="debug_enable_sensitive_logging_summary">允許在日誌中顯示密碼。</string>
-    <string name="debug_export_logs_title">匯出日誌</string>
-    <string name="debug_export_logs_success">匯出成功。日誌可能包含敏感訊息。請小心選擇您要傳送的人。</string>
+    <string name="debug_enable_debug_logging_title">啟用除錯記錄</string>
+    <string name="debug_enable_debug_logging_summary">記錄額外的診斷資訊</string>
+    <string name="debug_enable_sensitive_logging_title">記錄機密資訊</string>
+    <string name="debug_enable_sensitive_logging_summary">可能在記錄中顯示密碼。</string>
+    <string name="debug_export_logs_title">匯出記錄</string>
+    <string name="debug_export_logs_success">匯出成功。記錄可能包含機密資訊。請小心選擇您要傳送的人。</string>
     <string name="debug_export_logs_failure">匯出失敗。</string>
-    <string name="message_list_load_more_messages_action">載入更多郵件</string>
-    <string name="message_to_fmt">收件人：<xliff:g id="counterParty">%s</xliff:g></string>
-    <string name="message_compose_subject_hint">主題</string>
-    <string name="message_compose_content_hint">郵件內容</string>
+    <string name="message_list_load_more_messages_action">載入更多訊息</string>
+    <string name="message_to_fmt">收件者：<xliff:g id="counterParty">%s</xliff:g></string>
+    <string name="message_compose_subject_hint">主旨</string>
+    <string name="message_compose_content_hint">訊息文字</string>
     <string name="message_compose_signature_hint">簽名</string>
     <string name="message_compose_quote_header_separator">--------原始郵件--------</string>
-    <string name="message_compose_quote_header_subject">主題：</string>
-    <string name="message_compose_quote_header_send_date">送件日期:</string>
-    <string name="message_compose_quote_header_from">寄件人：</string>
-    <string name="message_compose_quote_header_to">收件人：</string>
+    <string name="message_compose_quote_header_subject">主旨：</string>
+    <string name="message_compose_quote_header_send_date">寄送日期:</string>
+    <string name="message_compose_quote_header_from">寄件者：</string>
+    <string name="message_compose_quote_header_to">收件者：</string>
     <string name="message_compose_quote_header_cc">副本：</string>
     <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g>寫到:</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> 寫到：</string>
-    <string name="message_compose_error_no_recipients">至少必須加入一位收件人。</string>
-    <string name="compose_error_incomplete_recipient">收件人欄位包含不完整的輸入！</string>
+    <string name="message_compose_error_no_recipients">至少必須加入一位收件者。</string>
+    <string name="compose_error_incomplete_recipient">收件者欄位包含不完整的輸入！</string>
     <string name="error_contact_address_not_found">找不到此聯絡人的電子郵件地址。</string>
     <string name="message_compose_attachments_skipped_toast">由於一些附件還沒有被下載，因此無法轉寄這些附件。</string>
     <string name="message_compose_attachments_forward_toast">因為有些附件尚未下載，所以無法轉寄郵件。</string>
@@ -163,7 +163,7 @@
     <string name="message_compose_description_delete_quoted_text">清除引用文字內容</string>
     <string name="message_compose_description_edit_quoted_text">編輯引用文字內容</string>
     <string name="remove_attachment_action">移除附件</string>
-    <string name="message_to_label">收件人：</string>
+    <string name="message_to_label">收件者：</string>
     <string name="message_view_cc_label">副本：</string>
     <string name="message_view_bcc_label">密件副本：</string>
     <string name="message_view_status_attachment_not_saved">無法存檔附件。</string>
@@ -178,20 +178,20 @@
     <string name="message_view_no_viewer">無法開啟<xliff:g id="mimetype">%s</xliff:g>。找不到可以開啟該附件的程式。</string>
     <string name="message_view_download_remainder">下載完整郵件</string>
     <string name="message_view_sender_label">透過 %1$s</string>
-    <string name="from_same_sender">來自這個寄件人的更多郵件</string>
-    <string name="message_discarded_toast">郵件已捨棄</string>
-    <string name="message_saved_toast">郵件已儲存為草稿</string>
+    <string name="from_same_sender">來自此寄件者的更多郵件</string>
+    <string name="message_discarded_toast">已捨棄訊息</string>
+    <string name="message_saved_toast">訊息已儲存為草稿</string>
     <string name="global_settings_flag_label">顯示星號</string>
     <string name="global_settings_flag_summary">顯示標記過星號的郵件</string>
     <string name="global_settings_preview_lines_label">預覽行數</string>
-    <string name="global_settings_show_correspondent_names_label">顯示收件人姓名</string>
-    <string name="global_settings_show_correspondent_names_summary">用收件人姓名取代顯示電子郵件地址</string>
-    <string name="global_settings_sender_above_subject_label">在主題上顯示寄件人姓名</string>
-    <string name="global_settings_sender_above_subject_summary">在信件匣主題上方顯示寄件人姓名，取代原先的主題下方顯示</string>
+    <string name="global_settings_show_correspondent_names_label">顯示通信者名稱</string>
+    <string name="global_settings_show_correspondent_names_summary">用通信者名稱取代顯示電子郵件地址</string>
+    <string name="global_settings_sender_above_subject_label">上方主旨的通信者</string>
+    <string name="global_settings_sender_above_subject_summary">在信件匣主旨上方顯示通信者名稱，取代原先的主旨下方顯示</string>
     <string name="global_settings_show_contact_name_label">顯示聯絡人姓名</string>
     <string name="global_settings_show_contact_name_summary">用聯絡人姓名取代顯示電子郵件地址</string>
     <string name="global_settings_registered_name_color_label">使用顏色標示特定聯絡人</string>
-    <string name="global_settings_registered_name_color_changed">使用顏色標示聯絡人列表</string>
+    <string name="global_settings_registered_name_color_changed">使用顏色標示聯絡人清單</string>
     <string name="general_settings_contact_name_color_label">聯絡人名稱顏色</string>
     <string name="global_settings_messageview_fixedwidth_label">固定寬度字體</string>
     <string name="global_settings_messageview_fixedwidth_summary">顯示純文字訊息時使用等寬字體</string>
@@ -232,7 +232,7 @@
     <string name="general_settings_ui_density_compact">密集</string>
     <string name="general_settings_ui_density_default">預設</string>
     <string name="general_settings_ui_density_relaxed">寬鬆</string>
-    <string name="global_settings_privacy_hide_useragent">隱藏郵件客戶端</string>
+    <string name="global_settings_privacy_hide_useragent">隱藏郵件用戶端</string>
     <string name="global_settings_privacy_hide_useragent_detail">從郵件標頭中移除使用者代理</string>
     <string name="global_settings_privacy_hide_timezone">隱藏時區</string>
     <string name="global_settings_privacy_hide_timezone_detail">在郵件標頭及回覆標頭中使用 UTC 時間而不是本地時間</string>
@@ -262,7 +262,7 @@
     <string name="account_setup_expunge_policy_on_poll">接收郵件時</string>
     <string name="account_setup_expunge_policy_manual">僅手動接收</string>
     <string name="drafts_folder_label">草稿名稱</string>
-    <string name="sent_folder_label">寄件備份名稱</string>
+    <string name="sent_folder_label">寄件資料夾</string>
     <string name="trash_folder_label">垃圾桶名稱</string>
     <string name="archive_folder_label">封存信件匣名稱</string>
     <string name="spam_folder_label">垃圾郵件匣名稱</string>
@@ -790,13 +790,13 @@
     <string name="push_notification_state_listening">正在等待新郵件</string>
     <string name="push_notification_state_wait_background_sync">等待背景同步允許</string>
     <string name="push_notification_state_wait_network">等待網路可用</string>
-    <string name="push_notification_info">點擊以瞭解更多。</string>
+    <string name="push_notification_info">點選以進一步瞭解。</string>
     <string name="push_info_title">推送資訊</string>
     <string name="push_info_configure_notification_text">不過，Android 也允許你隱藏通知。</string>
     <string name="push_info_learn_more_text">了解更多</string>
     <string name="push_info_configure_notification_action">設定通知</string>
     <string name="push_info_disable_push_text">如果你不需要新郵件的即時通知，則應停用推送並使用輪詢。輪詢會定期檢查新郵件，不需要通知權限。</string>
-    <string name="push_info_disable_push_action">停用推送</string>
+    <string name="push_info_disable_push_action">停用推播</string>
     <!--Name of the swipe action to select a message. Try to keep it short.-->
     <string name="swipe_action_select">選擇</string>
     <!--Name of the swipe action to deselect a message. Try to keep it short.-->
@@ -865,11 +865,11 @@
     <string name="general_settings_post_mark_as_unread_action_title">標記郵件為未讀後</string>
     <string name="general_settings_post_mark_as_unread_action_return_to_list">回到郵件清單</string>
     <string name="push_notification_state_alarm_permission_missing">缺少排程鬧鐘的權限</string>
-    <string name="push_notification_grant_alarm_permission">點擊以授予權限。</string>
+    <string name="push_notification_grant_alarm_permission">點選以授予權限。</string>
     <string name="about_app_authors_thunderbird">Thunderbird 行動版團隊</string>
     <string name="push_info_notification_explanation_text">使用推送時，<xliff:g id="app_name">%1$s</xliff:g> 會保持與郵件伺服器的連接。當應用程式在背景中運行時，Android 需要顯示持續通知。<xliff:g id="optional_extended_explanation">%2$s</xliff:g></string>
     <string name="dialog_openkeychain_info_text">需要安裝 OpenKeychain 應用程式以支援端到端加密。</string>
-    <string name="account_delete_dlg_instructions_fmt">帳戶 \"<xliff:g id="account">%1$s</xliff:g>\" 將從 <xliff:g id="app_name">%2$s</xliff:g> 中移除。</string>
+    <string name="account_delete_dlg_instructions_fmt">帳號 \"<xliff:g id="account">%1$s</xliff:g>\" 將從 <xliff:g id="app_name">%2$s</xliff:g> 中移除。</string>
     <string name="about_title">關於 <xliff:g id="app_name">%s</xliff:g></string>
     <string name="settings_ui_data_collection">數據收集</string>
     <string name="folder_settings_notifications_label">通知</string>
@@ -887,14 +887,25 @@
     <string name="dialog_confirm_empty_spam_title">確認清空垃圾郵件</string>
     <string name="dialog_confirm_empty_spam_message">您想清空垃圾郵件資料夾嗎？</string>
     <string name="expand_content_description">展開</string>
-    <string name="open_camera">打開相機</string>
-    <string name="attach_file">添加附件</string>
-    <string name="camera_permission_denied">相機權限已被拒絕！無法拍攝照片</string>
-    <string name="debug_enable_sync_debug_logging_title">啓用同步調試記錄</string>
-    <string name="debug_enable_sync_debug_logging_summary">記錄24小時的同步診斷信息</string>
-    <string name="debug_sync_export_logs_title">導出同步日誌</string>
-    <string name="debug_open_secret_debug_screen">開啓隱藏偵錯畫面</string>
+    <string name="open_camera">開啟相機</string>
+    <string name="attach_file">附件檔案</string>
+    <string name="camera_permission_denied">相機權限已被拒絕！無法拍攝相片</string>
+    <string name="debug_enable_sync_debug_logging_title">啟用同步除錯記錄</string>
+    <string name="debug_enable_sync_debug_logging_summary">記錄 24 小時的同步診斷資訊</string>
+    <string name="debug_sync_export_logs_title">匯出同步記錄</string>
+    <string name="debug_open_secret_debug_screen">開啟秘密除錯畫面</string>
     <string name="swipe_action_archive_folder_not_set">設置歸檔文件夾</string>
     <string name="swipe_action_change_swipe_gestures">更改\n滑動手勢</string>
     <string name="archiving_not_available_for_this_account">該帳號無法使用歸檔功能。</string>
+    <string name="message_view_menu_action_export_eml">匯出為 EML</string>
+    <string name="set_format_html_action">使用原來的格式</string>
+    <string name="set_format_html_condensed_action">顯示格式化的內容</string>
+    <string name="set_format_plain_action">顯示未格式化的訊息</string>
+    <string name="set_format_plain_condensed_action">顯示未格式化的內容</string>
+    <string name="global_settings_messageview_body_content_type_title">本文內容類型</string>
+    <string name="global_settings_messageview_body_content_type_text_html">HTML (text/html)</string>
+    <string name="global_settings_messageview_body_content_type_text_plain">純文字（text/plain）</string>
+    <string name="debug_feature_flags">除錯：功能標幟</string>
+    <string name="account_setup_auto_select_folder">自動選取資料夾</string>
+    <string name="navigation_drawer_preferences">側邊選單</string>
 </resources>