diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index 356bc68730..771def6d35 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -176,6 +176,7 @@
     <string name="title_setup_intro">Postavljanje računa odvija se u samo tri koraka i nakon toga možete slati i primati e-poštu</string>
     <string name="title_setup_simple">Nije potrebno mijenjati druge opcije</string>
     <string name="title_setup_issue">FairEmail je razvijen kako bi zaštitio vašu privatnost i predstavlja djelo u koje je doslovno uloženo na hiljade sati. Ukoliko imate nekih problema, molim da me prvo kontaktirate za podršku, prije nego ostavite lošu recenziju. Rado ću Vam pomoći!</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail ne prikazuje reklame niti prati ili analizira vaše ponašanje.</string>
     <string name="title_setup_quick_accounts">Dodaj ili ukloni račune</string>
     <string name="title_setup_quick_support">Neki provajderi (poslužitelji) otežavaju način za dodavanje računa. Molimo da ne krivite FairEmail zbog toga, nego da zatražite podršku.</string>
     <string name="title_setup_quick_hint">Unesena adresa e-pošte koristi se za slanje upita e-mail serveru i za konfiguracijske informacije s autoconfig.thunderbird.net </string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 15bbf422a9..7de01a04bb 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -190,6 +190,7 @@
     <string name="title_setup_intro">Nastavení účtu jsou jen tři kroky a poté již můžete posílat a přijímat e-maily</string>
     <string name="title_setup_simple">Není třeba měnit žádné další volby</string>
     <string name="title_setup_issue">FairEmail byl vyvinut tak, aby Vám pomohl chránit vaše soukromí a zabral doslova tisíce hodin práce. Pokud máte nějaké problémy, prosím kontaktujte s Vašimi dotazy nejprve mě, než se rozhodnete pro špatné hodnocení. S radostí Vám pomůžu!</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail nezobrazuje reklamy a nesleduje ani neanalyzuje vaše chování.</string>
     <string name="title_setup_quick_accounts">Přidat nebo upravit účty</string>
     <string name="title_setup_quick_support">Někteří poskytovatelé činí přidání účtu zbytečně obtížným. Nekřivděte prosím kvůli tomu FairEmailu, namísto toho požádejte o podporu.</string>
     <string name="title_setup_quick_hint">Zadaná e-mailová adresa se použije k dotazu na e-mailový server a autoconfig.thunderbird.net pro získání konfiguračních informací</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 93c7316d33..9970a2f728 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_intro">Kontoopsætning udgør kun tre trin, hvorefter e-mails kan afsendes og modtages</string>
     <string name="title_setup_simple">Ingen grund til at ændre valgmuligheder</string>
     <string name="title_setup_issue">FairEmail er udviklet for at hjælpe dig med at beskytte din fortrolighed og repræsenterer bogstaveligt talt tusindvis af arbejdstimer. Oplever du problemer, så kontakt mig først mhp. support, inden du giver en dårlig bedømmelse. Jeg vil med glæde hjælpe!</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail viser ikke annoncer og sporer eller analyserer ikke brugerens adfærd.</string>
     <string name="title_setup_quick_accounts">Tilføj eller skift konti</string>
     <string name="title_setup_quick_support">Visse udbydere besværliggør kontotilføjelse. Bebrejd venligst ikke FairEmail for dette, men anmod i stedet om support.</string>
     <string name="title_setup_quick_hint">Den angivne e-mailadresse bruges til indhentning af opsætningsoplysninger fra e-mailserveren og autoconfig.thunderbird.net</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 99fc04d74d..35ebefefb0 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -163,7 +163,7 @@
     <string name="title_setup_intro">Die Einrichtung eines Kontos ist mit nur drei Schritten erledigt und danach können Sie bereits E-Mails senden und empfangen</string>
     <string name="title_setup_simple">Es ist nicht notwendig, andere Optionen zu ändern</string>
     <string name="title_setup_issue">FairEmail wurde entwickelt, um Ihnen zu helfen, Ihre Privatsphäre zu schützen, und erforderte buchstäblich Tausende von Arbeitsstunden. Sollten Sie irgendwelche Probleme haben, wenden Sie sich bitte zuerst an mich, bevor Sie eine schlechte Bewertung abgeben. Ich bin gerne bereit zu helfen!</string>
-    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail zeigt weder Werbung an noch verfolgt oder analysiert es Ihr Verhalten.</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail zeigt keine Werbung und verfolgt oder analysiert auch nicht Ihr Verhalten.</string>
     <string name="title_setup_quick_accounts">Konten hinzufügen oder ändern</string>
     <string name="title_setup_quick_support">Einige Anbieter erschweren das Hinzufügen eines Kontos. Bitte geben Sie nicht FairEmail dafür die Schuld, sondern bitten Sie stattdessen um Unterstützung.</string>
     <string name="title_setup_quick_hint">Die eingegebene E-Mail-Adresse wird verwendet, um den E-Mail-Server und autoconfig.thunderbird.net für Konfigurationsinformationen abzufragen</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index ee34ff8ce0..67ee938955 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -146,6 +146,7 @@
     <string name="title_setup_intro">تنظیم کردن حساب تنها سه مرحله دارد و پس از آن شما می‌توانید ایمیل بفرستید یا دریافت کنید</string>
     <string name="title_setup_simple">نیازی به تغییر هیچ یک از تنظیمات نیست</string>
     <string name="title_setup_issue">FairEmail به منظور حفاظت از حریم شخصی شما توسعه پیدا کرده و حاصل هزاران ساعت کار و تلاش است. در صورت مواجهه با هرگونه مشکلی، لطفا پیش از نوشتن نظرات منفی، با من تماس بگیرید. خوشحال می‌شوم که کمکتان کنم!</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail تبلیغات نشان نمی‌دهد و رفتار شما را رهگیری و بررسی نمی‌کند.</string>
     <string name="title_setup_quick_accounts">افزودن یا تغییر حساب‌ها</string>
     <string name="title_setup_quick_support">برخی از ارائه‌دهندگان ایمیل، افزودن حساب را دشوار می‌کنند. لطفا تقصیر را گردن FairEmail نیاندازید و به جای آن خواستار پشتیبانی شوید.</string>
     <string name="title_setup_quick_hint">آدرس ایمیل وارد شده برای پرس و جوی سرور و autoconfig.thunderbird.net استفاده می‌شود تا اطلاعات پیکربندی شوند</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 1cacd58b91..092524d554 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_intro">Configurare un account richiede solo tre passaggi per poter inviare e ricevere email</string>
     <string name="title_setup_simple">Non serve cambiare altre opzioni</string>
     <string name="title_setup_issue">FairEmail è stata sviluppata per aiutare a proteggere la propria privacy e sono state necessarie letteralmente migliaia di ore di lavoro. Se si riscontrano problemi, contattare lo sviluppatore per supporto prima di lasciare una brutta recensione. Sarà felice di dare una mano!</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail non mostra pubblicità e non traccia né analizza il tuo comportamento.</string>
     <string name="title_setup_quick_accounts">Aggiungere o cambiare gli account</string>
     <string name="title_setup_quick_support">Alcuni provider rendono difficile aggiungere un account. Di questo non è responsabile FairEmail, semmai è necessario chiedere supporto.</string>
     <string name="title_setup_quick_hint">L\'indirizzo email inserito è usato per interrogare il server email e autoconfig.thunderbird.net per le informazioni di configurazione</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 99e6069593..5f97d5c55a 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -148,6 +148,7 @@
     <string name="title_setup_intro">3 ステップのアカウント設定で、すぐにメールを送受信できます</string>
     <string name="title_setup_simple">細かな設定は必要ありません</string>
     <string name="title_setup_issue">FairEmail はあなたのプライバシーを保護するために開発され、文字通り数千時間が費やされています。何か問題があれば、低評価レビューを投稿する前にサポートに連絡してください。喜んでお手伝いします！</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail は広告を表示せず、あなたの行動を追跡したり分析したりしません。</string>
     <string name="title_setup_quick_accounts">アカウントを追加または変更する</string>
     <string name="title_setup_quick_support">一部のプロバイダーはアカウントを追加しにくくしています。FairEmail を非難せずに、サポートを依頼してください。</string>
     <string name="title_setup_quick_hint">入力されたメールアドレスは、設定情報を取得するためのメールサーバーと autoconfig.thunderbird.net への問い合わせに使用されます</string>
@@ -332,6 +333,11 @@
     </string>
     <string name="title_advanced_hint_remark">        設定は、外観や操作などのカテゴリーごとにタブに分類され、さらにセクションに分けられています。検索もできます。
     </string>
+    <string name="title_advanced_hint_options">        あなたにはほとんどのオプションは必要ではなく、いくつかはあまりに特殊すぎると感じるかもしれません。
+        それぞれのオプションがどのように機能するか、すぐにはわからないことは理解できます。
+        しかし、オプションの数を見ただけでや、わからないオプションがあるという理由で低評価のレビューを残すのはお控えください。
+        すべてのオプションは (まだあなたの役には立たなくても) 誰かにとって役立つものです。
+    </string>
     <string name="title_advanced_hint_setup">メイン画面のウィザードをタップするとアカウントを設定できます。</string>
     <string name="title_advanced_section_main">メイン</string>
     <string name="title_advanced_section_synchronize">受信</string>
@@ -520,6 +526,7 @@
     <string name="title_advanced_indentation">会話スレッドの中の受信/送信メッセージの左/右インデント</string>
     <string name="title_advanced_highlight_unread">未読メッセージをハイライト表示する</string>
     <string name="title_advanced_account_color">カラーストライプまたはドットを表示する</string>
+    <string name="title_advanced_account_color_size">カラーストライプの幅</string>
     <string name="title_advanced_avatars">連絡先の写真を表示する</string>
     <string name="title_advanced_bimi">Brand Indicators for Message Identification (BIMI) を表示する</string>
     <string name="title_advanced_bimi_vmc">有効な VMC 証明書を必須にする</string>
@@ -641,6 +648,7 @@
     <string name="title_advanced_reset_importance">移動するメッセージの重要度をリセットする</string>
     <string name="title_advanced_star_snoozed">スヌーズしたメッセージに自動でスターを付ける</string>
     <string name="title_advanced_star_unsnoozed">スヌーズ解除したメッセージから自動でスターを外す</string>
+    <string name="title_advanced_important_unsnoozed">スヌーズを解除したメッセージを自動で重要にマークする</string>
     <string name="title_advanced_auto_important">スター付きメッセージを自動で重要にマークする</string>
     <string name="title_advanced_cancel_snooze">メッセージを移動するときスヌーズをキャンセルする</string>
     <string name="title_advanced_auto_block_sender">メッセージを迷惑メールとして報告したとき、差出人を自動でブロックする</string>
@@ -666,6 +674,7 @@
     <string name="title_advanced_notify_suppress_in_call">通話終了まで通知を遅らせる</string>
     <string name="title_advanced_notify_suppress_in_car">Android Auto の接続が解除されるまで通知を遅らせる</string>
     <string name="title_advanced_notify_summary">まとめ通知のみ表示する</string>
+    <string name="title_advanced_notify_subject">通知で件名を表示する</string>
     <string name="title_advanced_notify_preview">通知にメッセージプレビューを表示する</string>
     <string name="title_advanced_notify_preview_all">全文をプレビューする</string>
     <string name="title_advanced_notify_preview_only">プレビューテキストが準備できた通知のみ表示する</string>
@@ -769,6 +778,7 @@
     <string name="title_advanced_class_min_difference">最小分類差: %1$s %%</string>
     <string name="title_advanced_show_filtered">ルールが適用された場合、フィルターアイコンを表示する</string>
     <string name="title_advanced_haptic_feedback">重要なアクションでの触覚フィードバック</string>
+    <string name="title_advanced_haptic_feedback_swipe">左/右スワイプの触覚フィードバック</string>
     <string name="title_advanced_language">言語</string>
     <string name="title_advanced_language_system">システム</string>
     <string name="title_advanced_integrations_hint">以下のクラウドサービスはアプリの一部ではありません。すべての支払いはアプリ開発者ではなく、クラウドサービスに直接支払われます。</string>
@@ -1154,6 +1164,7 @@
     <string name="title_hint_operations">操作を削除するとメッセージが消失し、同期の問題が発生する可能性があります</string>
     <string name="title_op_title_headers">ヘッダーをダウンロードしています</string>
     <string name="title_op_title_raw">元のメッセージをダウンロードしています</string>
+    <string name="title_op_title_add">メッセージのアップロード中</string>
     <string name="title_folder_name">フォルダー名</string>
     <string name="title_display_name">表示名</string>
     <string name="title_show_folders">隠しフォルダーを表示する</string>
@@ -2358,9 +2369,9 @@
         <item>ドット</item>
     </string-array>
     <string-array name="accountColorSizes">
-        <item>Narrow</item>
+        <item>細</item>
         <item>標準</item>
-        <item>Wide</item>
+        <item>太</item>
     </string-array>
     <string-array name="contactTypes">
         <item>宛先</item>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
index 140bfc6670..ffb93bc30a 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_welcome">FairEmail — atvērtā pirmkoda e-pasta lietotne, kas ir vērsta uz privātumu un drošību. Šī iemesla dēļ dažas iespējas var darboties citādāk nekā pierasts.</string>
     <string name="app_limitations">Piemēram, ziņojumi pēc noklusējuma tiek pārveidoti, lai noņemtu nedrošus elementus un uzlabotu lasāmību, un saišu atvēršanu ir nepieciešams apstiprināt drošības dēļ. Abas iespējas var atspējot, ja ir tāda vēlme.</string>
     <string name="app_unsupported">Nepilnības tieši šīs ierīces Android versijā rada avārijas</string>
+    <string name="app_data_loss">Visi dati var tikt pazaudēti</string>
     <string name="app_updated">Pēdējo reizi atjaunināta: %1$s</string>
     <string name="app_download">Lejupielādēta no: %1$s</string>
     <string name="channel_update">Atjauninājumi</string>
@@ -34,10 +35,12 @@
         <item quantity="one">%1$d pielikums</item>
         <item quantity="other">%1$d pielikumi</item>
     </plurals>
+    <string name="title_junk_hint">Tavs e-pasta pakalpojuma sniedzējs ir atbildīgs par mēstuļu aizturēšanu. E-pasta lietotnei nav visu nepieciešamo datu, lai to paveiktu uzticami.</string>
     <string name="title_block">Aizturēt %1$s</string>
     <string name="title_block_sender">Aizturēt sūtītāju</string>
     <string name="title_block_sender_domain">Aizturēt domēnu \'%1$s\'</string>
     <string name="title_blocked_senders">Aizturētie sūtītāji</string>
+    <string name="title_notification_waiting">Gaida atbilstošu savienojumu</string>
     <string name="menu_setup">Iestatījumi</string>
     <string name="menu_faq">Atbalsts</string>
     <string name="menu_translate">Palīdzēt tulkot</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8cab9f8d69..e4548aacae 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -162,6 +162,7 @@
     <string name="title_setup_intro">A criação de uma conta tem apenas três passos e, depois disso, você poderá enviar e receber e-mails</string>
     <string name="title_setup_simple">Não há necessidade de alteração de nenhuma das opções</string>
     <string name="title_setup_issue">O FairEmail foi desenvolvido para ajudar a proteger sua privacidade e representa literalmente milhares de horas de trabalho. Se você tiver qualquer problema, por favor, entre em contato comigo antes de deixar uma análise ruim. Ficarei feliz em ajudar!</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">O FairEmail não exibe anúncios e não rastreia nem analisa seu comportamento.</string>
     <string name="title_setup_quick_accounts">Adicionar ou alterar contas</string>
     <string name="title_setup_quick_support">Alguns fornecedores dificultam a adição de uma conta. Por favor, não culpe a FairEmail por isso, mas peça apoio em seu lugar.</string>
     <string name="title_setup_quick_hint">O endereço de e-mail inserido é usado para consultar o servidor de e-mail e autoconfig.thunderbird.net para informações de configuração</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index ae88988c0a..68f646a5e8 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -158,6 +158,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_setup_intro">Bir hesap oluşturmak sadece üç adımdan oluşur ve bundan sonra e-posta gönderip alabilirsiniz</string>
     <string name="title_setup_simple">Başka herhangi bir ayarı değiştirmeye gerek yoktur</string>
     <string name="title_setup_issue">FairEmail, gizliliğinizi korumanıza yardımcı olmak için geliştirildi ve kelimenin tam anlamıyla binlerce saatlik çalışmayı temsil ediyor. Herhangi bir sorununuz varsa, lütfen kötü bir yorum bırakmadan önce destek için benimle iletişime geçin. Yardım etmekten mutluluk duyarim!</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail reklam göstermez ve davranışlarınızı izlemez veya analiz etmez.</string>
     <string name="title_setup_quick_accounts">Hesap ekle veya değiştir</string>
     <string name="title_setup_quick_support">Bazı sağlayıcılar hesap eklemeyi zorlaştırır. Lütfen bunun için FairEmail\'i suçlamayın, bunun yerine destek isteyin.</string>
     <string name="title_setup_quick_hint">Girilen e-posta adresi, yapılandırma bilgileri için e-posta sunucusunu ve autoconfig.thunderbird.net\'i sorgulamak için kullanılır</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a95397356b..92050e836a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -8,7 +8,7 @@
     <string name="app_unsupported">此特定设备的该 Android 版本中的 Bug 会导致崩溃</string>
     <string name="app_data_loss">所有数据可能都会丢失</string>
     <string name="app_continue">仍然继续</string>
-    <string name="app_exit">再按一次退出</string>
+    <string name="app_exit">再按一次返回键退出</string>
     <string name="app_cake">剩余存储空间不足</string>
     <string name="app_cake_remaining">设备上剩余的存储空间： %1$s</string>
     <string name="app_cake_required">需要的最小存储空间： %1$s</string>
@@ -148,6 +148,7 @@
     <string name="title_setup_intro">设置一个账户只需三步，之后您就可以发送和接收电子邮件了</string>
     <string name="title_setup_simple">无需更改任何其他选项</string>
     <string name="title_setup_issue">FairEmail 是为了帮助您保护隐私而开发的，毫不夸张地说，我在它身上花了数千小时。如果有任何问题，请在留下差评前先联系我获取支持。我很乐意帮忙！</string>
+    <string name="title_setup_analytics" comment="title_setup_analytics&#10;Notice text in the welcome section of the main settings screen.&#10;The remark about Bugsnag was removed because Bugsnag was removed.">FairEmail 不会显示广告，也不会跟踪或分析您的行为。</string>
     <string name="title_setup_quick_accounts">添加或更改账户</string>
     <string name="title_setup_quick_support">有些邮件服务提供商很难添加账户，对此请不要责怪 FairEmail，而应向提供商寻求支持。</string>
     <string name="title_setup_quick_hint">输入的邮箱地址用于查询电子邮件服务器和 autoconfig.thunderbird.net 以获取配置信息</string>
@@ -415,7 +416,7 @@
     <string name="title_advanced_compose_monospaced">纯文本邮件使用等宽字体</string>
     <string name="title_advanced_auto_identity">自动选择新邮件的身份</string>
     <string name="title_advanced_prefix_once">答复或抄送邮件时, 主题前的Re或CC只出现一次</string>
-    <string name="title_advanced_prefix_count">在邮件主题的前缀“回复(Re)”后显示计数</string>
+    <string name="title_advanced_prefix_count">在邮件主题的前缀“回复（Re）”后显示计数</string>
     <string name="title_advanced_separate_reply">在回复/转发标题之前插入一条水平线</string>
     <string name="title_advanced_extended_reply">使用扩展的回复/转发头</string>
     <string name="title_advanced_template_reply">回复/转发标头模板</string>
@@ -442,7 +443,7 @@
     <string name="title_advanced_plain_only">默认仅发送纯文本</string>
     <string name="title_advanced_plain_only_reply">仅在回复纯文本邮件时自动使用纯文本</string>
     <string name="title_advanced_flow">纯文本中采用可流动换行格式（format=flowed）</string>
-    <string name="title_advanced_usenet_signature">Usenet签名公约（RFC3676）</string>
+    <string name="title_advanced_usenet_signature">Usenet 签名公约</string>
     <string name="title_advanced_remove_signatures">移除公认的签名</string>
     <string name="title_advanced_receipt">请求回执时</string>
     <string name="title_advanced_forward_new">转发时开始新对话</string>
@@ -505,7 +506,7 @@
     <string name="title_advanced_nav_pinned_count">在固定导航菜单中显示未读邮件的数量</string>
     <string name="title_advanced_show_unexposed">为新收到的未读邮件的账号/文件夹显示星标</string>
     <string name="title_advanced_startup">在启动屏幕上显示</string>
-    <string name="title_advanced_cards">使用卡片样式而非表单样式 (即主页会话间有间隔)</string>
+    <string name="title_advanced_cards">使用卡片样式而非表单样式 （即主页会话间有间隔）</string>
     <string name="title_advanced_category">账户类别可以通过主设置屏幕在高级账户选项中配置</string>
     <string name="title_advanced_cards_beige">使用卡牌风格时使用米色背景(仅适用于浅色主题)</string>
     <string name="title_advanced_tabular_background">使用表格样式时，使用卡片颜色作为背景色</string>
@@ -546,7 +547,7 @@
     <string name="title_advanced_name_email">显示名称和电子邮件地址</string>
     <string name="title_advanced_replace_name">优先使用联系人姓名而不是发送用的名称</string>
     <string name="title_advanced_only_name">仅显示联系人姓名</string>
-    <string name="title_advanced_distinguish_contacts">下划线发件人(当其为本地发送给的联系人时)</string>
+    <string name="title_advanced_distinguish_contacts">下划线发件人（当其为本地发送给的联系人时）</string>
     <string name="title_advanced_show_recipients">在邮件头中显示收件人</string>
     <string name="title_advanced_reverse_addresses">显示已发送邮件的收件人</string>
     <string name="title_advanced_font_size_sender">发件人文本大小</string>
@@ -689,7 +690,7 @@
     <string name="title_advanced_notify_action_flag">标星</string>
     <string name="title_advanced_notify_action_seen">已读</string>
     <string name="title_advanced_notify_action_hide">隐藏</string>
-    <string name="title_advanced_notify_action_snooze">打盹</string>
+    <string name="title_advanced_notify_action_snooze">稍后提醒</string>
     <string name="title_advanced_notify_remove">轻击通知时移除新邮件通知</string>
     <string name="title_advanced_notify_clear">查看邮件列表时移除新邮件通知</string>
     <string name="title_advanced_notify_subtext">显示账户或文件夹名称为子文本</string>
@@ -760,7 +761,8 @@
     <string name="title_advanced_import_key">导入私钥</string>
     <string name="title_advanced_manage_keys">管理私钥</string>
     <string name="title_advanced_ca">已安装的 CA 证书</string>
-    <string name="title_advanced_manage_keys_hint">        这将打开Android安全设置页面        密钥和证书一般可以在 “高级—加密和凭证” 选项中找到
+    <string name="title_advanced_manage_keys_hint">        这将打开Android安全设置页面
+        密钥和证书一般可以在 “高级—加密和凭证” 选项中找到
     </string>
     <string name="title_advanced_power_menu">添加操作到 Android 电源菜单</string>
     <string name="title_advanced_send_self">将 \'发送给自己\' 添加到 Android 的分享菜单</string>