From 1160db62b919caee7a35f2aa15a5cf67d65f26f1 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 9 Dec 2020 12:30:05 +0100
Subject: [PATCH] Crowdin sync

---
 app/src/main/res/values-es-rES/strings.xml |  2 +
 app/src/main/res/values-pl-rPL/strings.xml |  2 +
 app/src/main/res/values-zh-rTW/strings.xml | 65 +++++++++++++++++++---
 docs/FAQ-es-rES.md                         | 20 +++----
 docs/FAQ-zh-rTW.md                         | 24 ++++----
 5 files changed, 82 insertions(+), 31 deletions(-)

diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 08e87434de..8bbfe3e9fc 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -463,6 +463,7 @@
     <string name="title_advanced_unseen_hint">Algunos proveedores no soportan esto correctamente, lo que puede causar la sincronización de ninguno o todos los mensajes</string>
     <string name="title_advanced_deleted_unseen">Cuando está desactivado, los mensajes no leídos se mantienen en el dispositivo para siempre</string>
     <string name="title_advanced_sync_kept_hint">Esto transferirá datos adicionales y consumirá energía adicional de batería, especialmente si hay muchos mensajes almacenados en el dispositivo</string>
+    <string name="title_advanced_gmail_thread_hint">Esto sólo se aplica a los mensajes recibidos recientemente y puede romper los grupos existentes</string>
     <string name="title_advanced_sync_folders_hint">Desactivar esto reducirá el uso de datos y batería, pero también desactivará la actualización de la lista de carpetas</string>
     <string name="title_advanced_lookup_mx_hint">Esto comprobará si existen registros DNS MX</string>
     <string name="title_advanced_sync_delay_hint">Esto ralentizará la sincronización de mensajes</string>
@@ -599,6 +600,7 @@
     <string name="title_no_inbox">Bandeja de entrada no encontrada</string>
     <string name="title_no_drafts">No hay carpeta de borradores</string>
     <string name="title_no_junk_folder">No hay ninguna carpeta de spam seleccionada para esta cuenta</string>
+    <string name="title_no_composable">El envío de correos electrónicos requiere que se configure una identidad y que se seleccione una carpeta de borradores en los ajustes de la cuenta (configuración paso 1)</string>
     <string name="title_no_standard">Este proveedor utiliza un protocolo de correo electrónico propietario y por lo tanto no es posible utilizar clientes de correo de terceros</string>
     <string name="title_no_idle">Este proveedor no es compatible con mensajes push. Esto retrasará la recepción de nuevos mensajes y aumentará el uso de batería.</string>
     <string name="title_no_utf8">Este proveedor no es compatible con UTF-8</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 0d99a422dc..da2ef39806 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -483,6 +483,7 @@
     <string name="title_advanced_unseen_hint">Niektórzy dostawcy nie obsługują tego poprawnie, co może powodować brak synchronizacji lub synchronizację wszystkich wiadomości</string>
     <string name="title_advanced_deleted_unseen">Kiedy wyłączone, nieprzeczytane wiadomości są zawsze przechowywane w urządzeniu</string>
     <string name="title_advanced_sync_kept_hint">Spowoduje to użycie dodatkowych danych i zużycie dodatkowej energii baterii, zwłaszcza jeśli w urządzeniu przechowywanych jest wiele wiadomości</string>
+    <string name="title_advanced_gmail_thread_hint">Dotyczy to tylko nowo odebranych wiadomości i może uszkodzić istniejące grupy</string>
     <string name="title_advanced_sync_folders_hint">Wyłączenie tej opcji nieco zmniejszy zużycie danych i baterii, ale wyłączy także aktualizację listy folderów</string>
     <string name="title_advanced_lookup_mx_hint">To sprawdzi, czy istnieją rekordy MX DNS</string>
     <string name="title_advanced_sync_delay_hint">Wydłuży to synchronizację wiadomości</string>
@@ -619,6 +620,7 @@
     <string name="title_no_inbox">Nie znaleziono skrzynki odbiorczej</string>
     <string name="title_no_drafts">Brak folderu szkiców</string>
     <string name="title_no_junk_folder">Dla tego konta nie wybrano folderu spam</string>
+    <string name="title_no_composable">Wysyłanie wiadomości e-maili wymaga skonfigurowania tożsamości i folderu szkiców (do wyboru w ustawieniach konta, konfiguracja krok 1)</string>
     <string name="title_no_standard">Ten dostawca korzysta z zastrzeżonego protokołu e-mail i dlatego nie jest możliwe korzystanie z klientów e-mail firm trzecich</string>
     <string name="title_no_idle">Ten dostawca nie obsługuje wiadomości push. To opóźni otrzymywanie nowych wiadomości i zwiększy zużycie baterii.</string>
     <string name="title_no_utf8">Ten dostawca nie wspiera UTF-8</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 13e48b65de..55113cb224 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -9,6 +9,7 @@
     <string name="app_cake">儲存空間不足</string>
     <string name="channel_service">接收</string>
     <string name="channel_send">寄送</string>
+    <string name="channel_notification">電子郵件</string>
     <string name="channel_update">更新</string>
     <string name="channel_warning">警告</string>
     <string name="channel_error">錯誤</string>
@@ -226,14 +227,18 @@
     <string name="title_advanced_check_reply">在同步訊息時檢查回覆 email 的地址。</string>
     <string name="title_advanced_tune_keep_alive">自動調整保持活躍的間隔</string>
     <string name="title_advanced_keyboard">預設顯示鍵盤</string>
+    <string name="title_advanced_keyboard_no_fullscreen">避免全螢幕鍵盤</string>
     <string name="title_advanced_suggest_local">建議本機聯絡人</string>
     <string name="title_advanced_suggest_sent">建議在寄件備份中的郵件地址</string>
     <string name="title_advanced_suggest_received">建議在收件匣中的郵件地址</string>
     <string name="title_advanced_suggest_frequently">建議經常使用的郵件地址</string>
     <string name="title_advanced_compose_font">預設字體</string>
     <string name="title_advanced_prefix_once">在回覆或轉發郵件時，前綴只出現一次</string>
+    <string name="title_advanced_separate_reply">在 回覆/轉寄 標題前加入水平線</string>
     <string name="title_advanced_extended_reply">使用額外的回覆或轉發標頭</string>
+    <string name="title_advanced_write_below">在寄件人文字下方撰寫</string>
     <string name="title_advanced_quote_reply">引用回覆的文字</string>
+    <string name="title_advanced_limit_reply">限制嵌套引用數量</string>
     <string name="title_advanced_resize_reply">在回覆文字中重新設置圖片大小</string>
     <string name="title_advanced_signature_location">簽名位置</string>
     <string name="title_advanced_signature_reply">當回覆時使用簽名</string>
@@ -251,6 +256,7 @@
     <string name="title_advanced_roaming">漫遊時下載訊息及附件</string>
     <string name="title_advanced_rlah">像在家一樣漫遊</string>
     <string name="title_advanced_timeout">連線超時（秒）</string>
+    <string name="title_advanced_prefer_ip4">偏好使用IPv4而不是IPv6</string>
     <string name="title_advanced_ssl_harden">嚴格的 SSL 連線</string>
     <string name="title_advanced_manage_connectivity">管理連線方式</string>
     <string name="title_advanced_caption_general">一般</string>
@@ -289,6 +295,7 @@
     <string name="title_advanced_subject_top">主旨顯示於寄件者之前</string>
     <string name="title_advanced_subject_italic">把主旨斜體</string>
     <string name="title_advanced_subject_elipsed">當必須縮短主旨時</string>
+    <string name="title_advanced_highlight_color">醒目標記顏色</string>
     <string name="title_advanced_keywords">在郵件標頭中顯示關鍵字</string>
     <string name="title_advanced_labels">在郵件標頭顯示 Gmail 標籤</string>
     <string name="title_advanced_flags">顯示星號</string>
@@ -343,6 +350,7 @@
     <string name="title_advanced_notifications">管理通知</string>
     <string name="title_advanced_notifications_default">預設頻道</string>
     <string name="title_advanced_notifications_service">接收頻道</string>
+    <string name="title_advanced_notifications_newest_first">優先顯示最新通知</string>
     <string name="title_advanced_notifications_background">使用背景服務同步訊息</string>
     <string name="title_advanced_notifications_background_hint">背景服務可隨時被 Android 終止而不需要狀態欄通知</string>
     <string name="title_advanced_badge">在應用程式圖示中顯示新訊息數量</string>
@@ -361,11 +369,12 @@
     <string name="title_advanced_notify_action_reply">回覆</string>
     <string name="title_advanced_notify_action_reply_direct">直接回覆</string>
     <string name="title_advanced_notify_action_flag">加星號</string>
-    <string name="title_advanced_notify_action_seen">閱讀</string>
+    <string name="title_advanced_notify_action_seen">已讀</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_wearable_preview">只向穿戴式裝置發送有預覽的通知</string>
+    <string name="title_advanced_notify_messaging">使用Android「訊息樣式」通知格式</string>
     <string name="title_advanced_biometrics_notify">在使用生物識別認證時顯示通知內容</string>
     <string name="title_advanced_light">使用通知燈</string>
     <string name="title_advanced_sound">選擇通知音效</string>
@@ -373,6 +382,7 @@
     <string name="title_advanced_browse_links">將打開的連結轉向 Android</string>
     <string name="title_advanced_confirm_images">顯示圖片前確認</string>
     <string name="title_advanced_confirm_html">預設顯示重新格式化的郵件</string>
+    <string name="title_advanced_tracking">嘗試辨識和禁止追蹤器圖片</string>
     <string name="title_advanced_hide_timezone">傳送沒有時區資料的郵件</string>
     <string name="title_advanced_display_hidden">顯示隱藏的訊息內文</string>
     <string name="title_advanced_secure">從最近的應用程式中移除並防止截圖</string>
@@ -386,6 +396,7 @@
     <string name="title_advanced_openpgp">要使用的 OpenPGP 應用程式</string>
     <string name="title_advanced_autocrypt">使用 Autocrypt</string>
     <string name="title_advanced_autocrypt_mutual">Autocrypt 手動模式</string>
+    <string name="title_advanced_encrypt_subject">加密主旨</string>
     <string name="title_advanced_check_certificate">寄送時確認公鑰</string>
     <string name="title_advanced_manage_certificates">管理公鑰</string>
     <string name="title_advanced_import_key">匯入私鑰</string>
@@ -400,11 +411,15 @@
     <string name="title_advanced_language_detection">偵測訊息語言</string>
     <string name="title_advanced_fts">建立搜尋索引</string>
     <string name="title_advanced_fts_indexed">%1$d / %2$d 訊息被索引 (%3$s)</string>
+    <string name="title_advanced_language">語言</string>
+    <string name="title_advanced_language_system">系統</string>
     <string name="title_advanced_watchdog">定期確認 FairEmail 是否依舊運作</string>
     <string name="title_advanced_optimize">自動最佳化</string>
+    <string name="title_advanced_updates">檢查GitHub上的更新</string>
     <string name="title_advanced_experiments">嘗試實驗性功能</string>
     <string name="title_advanced_query_threads">限制資料庫平行存取</string>
     <string name="title_advanced_crash_reports">傳送錯誤報告</string>
+    <string name="title_advanced_protocol">紀錄協定日誌</string>
     <string name="title_advanced_debug">除錯模式</string>
     <string name="title_advanced_cleanup_attachments">刪除舊訊息的附件</string>
     <string name="title_advanced_cleanup">清理</string>
@@ -418,6 +433,7 @@
     <string name="title_advanced_unseen_hint">某些提供商不正確地支持此功能，這可能導致不同步或同步所有消息</string>
     <string name="title_advanced_deleted_unseen">禁用後，未讀郵件將永久保留在設備上</string>
     <string name="title_advanced_sync_kept_hint">這將傳輸額外的數據並消耗額外的電池電量，尤其是如果設備上存儲了大量消息時</string>
+    <string name="title_advanced_gmail_thread_hint">此僅套用至新接收的訊息且可能與已存在的群組不兼容</string>
     <string name="title_advanced_sync_folders_hint">停用此功能將在某種程度上減少資料和電池的使用，但是也會停用更新文件夾列表</string>
     <string name="title_advanced_lookup_mx_hint">這將檢查 DNS MX 記錄是否存在</string>
     <string name="title_advanced_sync_delay_hint">這將會減緩同步訊息的速度</string>
@@ -428,15 +444,18 @@
     <string name="title_advanced_metered_hint">計量網路通常是行動網路或付費 Wi-Fi 熱點</string>
     <string name="title_advanced_metered_warning">停用這個選項將停用在行動網路下接收和寄送郵件。</string>
     <string name="title_advanced_rlah_hint">假設在歐盟境內不漫遊</string>
+    <string name="title_advanced_tcp_keep_alive_hint">開啟此選項可能在某些裝置導致連線問題</string>
     <string name="title_advanced_timeout_hint">讀/寫時限將會被設置為連接時限的兩倍。更高的設置將導致更多的電力消耗。</string>
     <string name="title_advanced_ssl_harden_hint">啟用此功能將禁止弱 SSL 協議和加密方式，這可能導致連接問題</string>
     <string name="title_advanced_roaming_hint">漫遊時始終會擷取郵件標頭。 您可以在裝置中設定於漫遊時停用網際網路。</string>
     <string name="title_advanced_browse_hint">向下拉時擷取更多郵件</string>
     <string name="title_advanced_layout_hint">可以在消息視圖的頂部操作欄菜單中切換到更緊湊的佈局並更改消息文本大小</string>
     <string name="title_advanced_startup_hint">長按資料夾列表中的任何資料夾可以從整合收件匣列表中新增或刪除</string>
+    <string name="title_advanced_beige_hint">僅使用淺色主題</string>
     <string name="title_advanced_date_hint">如果郵件按時間排序，則僅按日期分組</string>
     <string name="title_advanced_navbar_colorize_hint">這是否可行取決於Android版本和變量</string>
     <string name="title_advanced_threading_hint">彼此相關的群組訊息</string>
+    <string name="title_advanced_highlight_hint">主題的強調色將用於突出顯示</string>
     <string name="title_advanced_gravatars_hint">可能存在隱私風險</string>
     <string name="title_advanced_name_email_hint">禁用時，僅顯示名稱（如果可用）</string>
     <string name="title_advanced_preview_hint">僅在消息文本已被下載時可用</string>
@@ -444,6 +463,7 @@
     <string name="title_advanced_overview_mode_hint">這可能會導致字體很小</string>
     <string name="title_advanced_inline_hint">內聯圖像是消息中包含的圖像</string>
     <string name="title_advanced_parse_classes_hint">這將更準確地顯示消息，但可能會延遲</string>
+    <string name="title_advanced_language_detection_hint">是否支援語言偵測隨裝置製造商決定</string>
     <string name="title_advanced_autoexpand_hint">對話中只有一條消息或一條未讀消息時自動打開消息</string>
     <string name="title_advanced_autoseen_hint">可以在單個帳戶設置中禁用自動標記擴展後閱讀的郵件</string>
     <string name="title_advanced_autoclose_hint">當所有郵件都被存檔，發送或刪除時，自動關閉對話</string>
@@ -460,6 +480,7 @@
     <string name="title_advanced_notify_preview_all_hint">對於可顯示全文（最多5,000個字符）的可穿戴設備</string>
     <string name="title_advanced_notify_preview_only_hint">這會延遲通知的顯示，直到下載了消息文本為止</string>
     <string name="title_advanced_wearable_hint">通知僅在下載消息文本後發送到可穿戴設備</string>
+    <string name="title_advanced_messaging_hint">開啟後方支援Android Auto</string>
     <string name="title_advanced_move_hint">可以在帳戶設置中配置目標文件夾</string>
     <string name="title_advanced_notify_no_grouping">此Android版本不支持通知分組</string>
     <string name="title_advanced_notify_no_channels">這個Android版本不支援通知頻道</string>
@@ -467,9 +488,12 @@
     <string name="title_advanced_fts_hint">啟用此功能可增加搜尋效率，但也會增加電池和儲存空間的使用量</string>
     <string name="title_advanced_english_hint">這將會重起應用程式</string>
     <string name="title_advanced_experiments_hint">當前實驗功能列表</string>
+    <string name="title_advanced_protocol_hint">開啟此選項將增加電池以及儲存空間使用量!</string>
+    <string name="title_advanced_debug_hint">啟用額外的日誌記錄並在不同位置顯示調試信息</string>
     <string name="title_advanced_cleanup_attachments_hint">手動清除時，這將從不再同步的郵件中刪除附件</string>
     <string name="title_advanced_cleanup_hint">這將刪除所有臨時文件</string>
     <string name="title_advanced_never_favorite">從不喜歡</string>
+    <string name="title_advanced_edit_name">編輯名稱</string>
     <string name="title_advanced_swipe_actions">設置滑動動作</string>
     <string name="title_advanced_swipe_actions_hint">這將為所有IMAP帳戶設置左右滑動操作</string>
     <string name="title_select">選擇 &#8230;</string>
@@ -535,6 +559,7 @@
     <string name="title_no_name">姓名缺失</string>
     <string name="title_no_email">電子郵件地址缺失</string>
     <string name="title_email_invalid">電子郵件地址無效： \'%1$s\'</string>
+    <string name="title_address_duplicate">電子郵件地址 \'%1$s\' 複製</string>
     <string name="title_address_parse_error">地址 \'%1$s\' 無效: %2$s</string>
     <string name="title_no_account">帳戶遺失</string>
     <string name="title_no_host">主機名缺失</string>
@@ -570,6 +595,8 @@
     <string name="title_synchronize_now">馬上同步</string>
     <string name="title_synchronize_more">同步更多訊息</string>
     <string name="title_synchronize_enabled">同步</string>
+    <string name="title_synchronize_batch_enable">開啟同步</string>
+    <string name="title_synchronize_batch_disable">關閉同步</string>
     <string name="title_delete_local">刪除本機訊息</string>
     <string name="title_delete_browsed">刪除已瀏覽/搜尋的訊息</string>
     <string name="title_empty_trash">清空垃圾桶</string>
@@ -678,6 +705,7 @@
     <string name="title_spam">垃圾郵件</string>
     <string name="title_move">移動</string>
     <string name="title_copy_btn">複製</string>
+    <string name="title_keywords_btn">關鍵字</string>
     <string name="title_unsubscribe">取消訂閱</string>
     <string name="title_message_rule">建立規則</string>
     <string name="title_no_junk">不是垃圾郵件</string>
@@ -756,9 +784,10 @@
     <string name="title_via_identity">透過：</string>
     <string name="title_sent">已發送：</string>
     <string name="title_received">已接受：</string>
+    <string name="title_stored">已儲存:</string>
     <string name="title_size">大小：</string>
     <string name="title_language">語言：</string>
-    <string name="title_subject">學科：</string>
+    <string name="title_subject">主旨：</string>
     <string name="title_attachment">附件：</string>
     <string name="title_body_hint">你的訊息</string>
     <string name="title_discard">丟棄</string>
@@ -779,11 +808,17 @@
     <string name="title_style_size_medium">中</string>
     <string name="title_style_size_large">大</string>
     <string name="title_style_color">顏色 &#8230;</string>
+    <string name="title_style_align">對齊</string>
+    <string name="title_style_align_start">置頭</string>
+    <string name="title_style_align_center">置中</string>
+    <string name="title_style_align_end">置尾</string>
     <string name="title_style_list">清單</string>
     <string name="title_style_list_bullets">項目符號</string>
     <string name="title_style_list_numbered">已編號</string>
     <string name="title_style_font">字體</string>
     <string name="title_style_font_default">預設</string>
+    <string name="title_style_blockquote">引用文字方塊</string>
+    <string name="title_style_strikethrough">刪除線</string>
     <string name="title_style_clear">清除格式</string>
     <string name="title_style_link">插入連結</string>
     <string name="title_add_image">添加圖片</string>
@@ -791,6 +826,7 @@
     <string name="title_add_image_attach">附加</string>
     <string name="title_add_image_resize">調整大小</string>
     <string name="title_add_image_privacy">刪除隱私敏感數據</string>
+    <string name="title_add_image_privacy_remark">地理位置，序列號，文件名稱等</string>
     <string name="title_add_resize_pixels">&lt; %1$d 像素</string>
     <string name="title_add_image_select">選擇文件</string>
     <string name="title_add_attachment">添加附件</string>
@@ -821,10 +857,11 @@
     <string name="title_extra_missing">用戶名缺失</string>
     <string name="title_to_missing">收件者缺失</string>
     <string name="title_pgp_reminder">PGP密鑰可用</string>
-    <string name="title_subject_reminder">主題為空</string>
+    <string name="title_subject_reminder">主旨為空</string>
     <string name="title_text_reminder">訊息為空</string>
     <string name="title_attachment_keywords">附件，附件，附件，包括</string>
     <string name="title_attachment_reminder">您打算添加附件嗎？</string>
+    <string name="title_plain_reminder">所有文字格式將會遺失</string>
     <string name="title_size_reminder">郵件（%1$s）大於服務器限制（%2$s）</string>
     <string name="title_attachments_missing">並非所有附件都已下載</string>
     <string name="title_dialog_hint">可以通過頂部操作欄中的三點菜單再次啟用此對話框</string>
@@ -834,6 +871,7 @@
     <string name="title_queued">正在傳送訊息</string>
     <string name="title_queued_at">消息將被發送 %1$s</string>
     <string name="title_sign">簽署</string>
+    <string name="title_verify">驗證</string>
     <string name="title_encrypt">加密</string>
     <string name="title_decrypt">解密</string>
     <string name="title_resync">重新同步</string>
@@ -855,7 +893,7 @@
     <string name="title_signature_sender">寄件人地址</string>
     <string name="title_signature_email">簽名地址</string>
     <string name="title_signature_mismatch">寄件人的電子郵件地址和簽名不相符</string>
-    <string name="title_signature_subject">標題</string>
+    <string name="title_signature_subject">主旨</string>
     <string name="title_signature_validity">有效期</string>
     <string name="title_signature_outdated">該公鑰當前無效</string>
     <string name="title_signature_store">商店</string>
@@ -870,7 +908,7 @@
     <string name="title_search_use_index">使用搜尋索引</string>
     <string name="title_search_in_senders">在寄件人中（來自）</string>
     <string name="title_search_in_recipients">在收件人（收件人，抄送）中</string>
-    <string name="title_search_in_subject">主題</string>
+    <string name="title_search_in_subject">在主旨中搜尋</string>
     <string name="title_search_in_keywords">在關鍵字中（如果支持）</string>
     <string name="title_search_in_message">在訊息文字中</string>
     <string name="title_search_with">將搜尋限制為</string>
@@ -898,13 +936,13 @@
     <string name="title_sort_on_starred">已加星標</string>
     <string name="title_sort_on_priority">優先</string>
     <string name="title_sort_on_sender">寄件人</string>
-    <string name="title_sort_on_subject">主題</string>
+    <string name="title_sort_on_subject">主旨</string>
     <string name="title_sort_on_size">尺寸</string>
     <string name="title_sort_on_attachments">附件</string>
     <string name="title_sort_on_hidden">隱藏</string>
     <string name="title_sort_ascending">最舊的優先</string>
     <string name="title_filter">過濾掉</string>
-    <string name="title_filter_seen">讀</string>
+    <string name="title_filter_seen">已讀</string>
     <string name="title_filter_unflagged">未加星標</string>
     <string name="title_filter_unknown">不明寄件者</string>
     <string name="title_filter_hidden">隱藏</string>
@@ -927,6 +965,7 @@
     <string name="title_answer_reply">回复模板</string>
     <string name="title_answer_name">模板名稱</string>
     <string name="title_answer_group">模板組（可選）</string>
+    <string name="title_answer_standard">預設</string>
     <string name="title_answer_favorite">喜愛</string>
     <string name="title_answer_hide">從菜單隱藏</string>
     <string name="title_answer_text">範本文字</string>
@@ -955,7 +994,7 @@
     <string name="title_rule_sender">寄件人包含</string>
     <string name="title_rule_sender_known">寄件人是聯絡人</string>
     <string name="title_rule_recipient">收件者包含</string>
-    <string name="title_rule_subject">主題包含</string>
+    <string name="title_rule_subject">主旨包含</string>
     <string name="title_rule_attachments">有附件</string>
     <string name="title_rule_header">標頭包含</string>
     <string name="title_rule_time">間隔時間</string>
@@ -975,6 +1014,10 @@
     <string name="title_rule_answer_remark">對於任何會話，只會發送一個回复，以避免回复循環</string>
     <string name="title_rule_name_missing">規則名稱缺失</string>
     <string name="title_rule_condition_missing">條件缺失</string>
+    <string name="title_rule_folder_missing">缺少資料夾</string>
+    <string name="title_rule_identity_missing">缺少身份</string>
+    <string name="title_rule_answer_missing">缺少模板</string>
+    <string name="title_rule_keyword_missing">缺少關鍵字</string>
     <string name="title_rule_automation_hint">這將發送意圖%1$s和額外的%2$s</string>
     <string name="title_rule_execute">立即執行</string>
     <string name="title_rule_applied">受影響的消息：%1$d</string>
@@ -987,7 +1030,7 @@
     <string name="title_rule_tts_data">安裝語音數據</string>
     <string name="title_rule_tts_prefix">新消息</string>
     <string name="title_rule_tts_from">從</string>
-    <string name="title_rule_tts_subject">主題</string>
+    <string name="title_rule_tts_subject">主旨</string>
     <string name="title_rule_tts_content">文字</string>
     <string name="title_legend_section_synchronize">同步化</string>
     <string name="title_legend_section_folders">資料夾</string>
@@ -995,10 +1038,13 @@
     <string name="title_legend_section_compose">撰寫</string>
     <string name="title_legend_section_keyboard">鍵盤</string>
     <string name="title_legend_oauth">OAuth授權</string>
+    <string name="title_legend_folder_connected">資料夾已連結</string>
+    <string name="title_legend_folder_disconnected">資料夾未連結</string>
     <string name="title_legend_download_on">自動下載郵件內容</string>
     <string name="title_legend_download_off">按需下載消息內容</string>
     <string name="title_legend_synchronize_on">同步</string>
     <string name="title_legend_synchronize_off">同步關閉</string>
+    <string name="title_legend_synchronize_poll">週期性同步</string>
     <string name="title_legend_disconnected">斷線</string>
     <string name="title_legend_connecting">連接中</string>
     <string name="title_legend_connected">已連接</string>
@@ -1039,6 +1085,7 @@
     <string name="title_legend_forwarded">已轉發</string>
     <string name="title_legend_plain_only">僅純文本</string>
     <string name="title_legend_receipt">已要求收據</string>
+    <string name="title_legend_auto_submitted">已自動寄送</string>
     <string name="title_legend_attachment">有附件</string>
     <string name="title_legend_flagged">最喜歡</string>
     <string name="title_legend_contacts">管理聯絡人</string>
diff --git a/docs/FAQ-es-rES.md b/docs/FAQ-es-rES.md
index 2bdbdc6c1e..75e243454e 100644
--- a/docs/FAQ-es-rES.md
+++ b/docs/FAQ-es-rES.md
@@ -575,27 +575,27 @@ Vea [estas Preguntas Frecuentes](#user-content-faq33) sobre la edición del nomb
 <a name="faq12"></a>
 **(12) ¿Cómo funciona el cifrado/descifrado?**
 
-Communication with email servers is always encrypted, unless you explicitly turned this off. This question is about optional end-to-end encryption with PGP or S/MIME. The sender and recipient should first agree on this and exchange signed messages to transfer their public key to be able to send encrypted messages.
+La comunicación con los servidores de correo-e siempre está encriptada, a menos que lo desactive explícitamente. Esta pregunta se refiere al cifrado opcional de extremo a extremo con PGP o S/MIME. El remitente y destinario primero deberían acordar esto e intercambiar mensajes firmados para transferir su clave pública para poder enviar mensajes encriptados.
 
 *General*
 
-Please [see here](https://en.wikipedia.org/wiki/Public-key_cryptography) about how public/private key encryption works.
+Por favor, [vea aquí](https://en.wikipedia.org/wiki/Public-key_cryptography) sobre cómo funciona el cifrado con clave pública/privada.
 
-Encryption in short:
+Cifrado en resumen:
 
 * Los mensajes **salientes** se cifran con la **clave pública** del destinatario
 * Los mensajes **entrantes** se descifran con la **clave privada** del destinatario
 
-Signing in short:
+Firma en resumen:
 
 * Los mensajes **salientes** se firman con la **clave privada** del remitente
 * Los mensajes **entrantes** se verifican con la **clave pública** del remitente
 
-To sign/encrypt a message, just select the appropriate method in the send dialog. You can always open the send dialog using the three-dots overflow menu in case you selected *Don't show again* before.
+Para firmar/cifrar un mensaje, solo seleccione el método apropiado en el dialogo de envío. Siempre puede abrir el dialogo de envío usando el menú de tres puntos en caso de que haya seleccionado *No mostrar de nuevo* antes.
 
 To verify a signature or to decrypt a received message, open the message and just tap the gesture or padlock icon just below the message action bar.
 
-The first time you send a signed/encrypted message you might be asked for a sign key. FairEmail will automatically store the selected sign key in the used identity for the next time. If you need to reset the sign key, just save the identity or long press the identity in the list of identities and select *Reset sign key*. The selected sign key is visible in the list of identities. If need to select a key on a case by case basis, you can create multiple identities for the same account with the same email address.
+La primera vez que envíe un mensaje firmado/cifrado puede que se le pida una clave de firma. FairEmail automáticamente almacenará las claves de firma seleccionadas en la identidad utilizada para la próxima vez. Si necesita reiniciar la clave de firma, solo guarde la identidad o mantenga pulsada la identidad en la lista de identidades y selecciones *Reiniciar clave de firma*. La clave de firma seleccionada es visible en la lista de identidades. Si es necesario seleccionar una clave caso por caso, puede crear múltiples identidades para la misma cuenta con la misma dirección de correo-e.
 
 In the privacy settings you can select the default encryption method (PGP or S/MIME), enable *Sign by default*, *Encrypt by default* and *Automatically decrypt messages*, but be aware that automatic decryption is not possible if user interaction is required, like selecting a key or reading a security token.
 
@@ -603,17 +603,17 @@ The to be encrypted message text/attachments and the decrypted message text/atta
 
 *PGP*
 
-You'll need to install and configure [OpenKeychain](https://f-droid.org/en/packages/org.sufficientlysecure.keychain/) first. FairEmail was tested with OpenKeychain version 5.4. Later versions will most likely be compatible, but earlier versions might not be.
+Necesitará instalar y configurar [OpenKeychain](https://f-droid.org/en/packages/org.sufficientlysecure.keychain/) primero. FairEmail ha sido probado con OpenKeychain versión 5.4. Later versions will most likely be compatible, but earlier versions might not be.
 
-**Important**: the OpenKeychain app is known to (silently) crash when the calling app (FairEmail) is not authorized yet and is getting an existing public key. You can workaround this by trying to send a signed/encrypted message to a sender with an unknown public key.
+**Important**: the OpenKeychain app is known to (silently) crash when the calling app (FairEmail) is not authorized yet and is getting an existing public key. Puede solucionar esto tratando de enviar un mensaje firmado/cifrado al remitente con una clave pública desconocida.
 
-**Important**: if the OpenKeychain app cannot find a key (anymore), you might need to reset a previously selected key. This can be done by long pressing an identity in the list of identities (Setup, step 2, Manage).
+**Importante**: si la aplicación OpenKeychain (ya) no puede encontrar una clave, puede que necesite restablecer una clave seleccionada previamente. Esto puede hacerse al mantener pulsada una identidad en la lista de identidades (Configuración, paso 2, Administrar).
 
 **Important**: to let apps like FairEmail reliably connect to the OpenKeychain service to encrypt/decrypt messages, it might be necessary to disable battery optimizations for the OpenKeychain app.
 
 **Important**: the OpenKeychain app reportedly needs contacts permission to work correctly.
 
-**Important**: on some Android versions / devices it is necessary to enable *Show popups while running in background* in the additional permissions of the Android app settings of the OpenKeychain app. Without this permission the draft will be saved, but the OpenKeychain popup to confirm/select might not appear.
+**Important**: on some Android versions / devices it is necessary to enable *Show popups while running in background* in the additional permissions of the Android app settings of the OpenKeychain app. Sin este permiso el borrador se guardará, pero la ventana emergente de OpenKeychain para confirmar/seleccionar puede que no aparezca.
 
 FairEmail will send the [Autocrypt](https://autocrypt.org/) header for use by other email clients, but only for signed and encrypted messages because too many email servers have problems with the often long Autocrypt header. Note that the most secure way to start an encrypted email exchange is by sending signed messages first. Received Autocrypt headers will be sent to the OpenKeychain app for storage on verifying a signature or decrypting a message.
 
diff --git a/docs/FAQ-zh-rTW.md b/docs/FAQ-zh-rTW.md
index 8cc7da0637..24183659a3 100644
--- a/docs/FAQ-zh-rTW.md
+++ b/docs/FAQ-zh-rTW.md
@@ -121,8 +121,8 @@ The design is based on many discussions and if you like you can discuss about it
 
 ## 常見問題
 
-* [(1) Which permissions are needed and why?](#user-content-faq1)
-* [(2) Why is there a permanent notification shown?](#user-content-faq2)
+* [(1) 我需要給予什麼權限和為什麼需要這些權限?](#user-content-faq1)
+* [(2) 為什麼有個沒辦法清除的通知在狀態欄?](#user-content-faq2)
 * [(3) What are operations and why are they pending?](#user-content-faq3)
 * [(4) How can I use an invalid security certificate / empty password / plain text connection?](#user-content-faq4)
 * [(5) How can I customize the message view?](#user-content-faq5)
@@ -133,16 +133,16 @@ The design is based on many discussions and if you like you can discuss about it
 * [~~(11) Why is POP not supported?~~](#user-content-faq11)
 * [~~(10) What does 'UIDPLUS not supported' mean?~~](#user-content-faq10)
 * [(12) How does encryption/decryption work?](#user-content-faq12)
-* [(13) How does search on device/server work?](#user-content-faq13)
-* [(14) How can I set up an Outlook / Live / Hotmail account?](#user-content-faq14)
-* [(15) Why does the message text keep loading?](#user-content-faq15)
-* [(16) Why are messages not being synchronized?](#user-content-faq16)
-* [~~(17) Why does manual synchronize not work?~~](#user-content-faq17)
-* [(18) Why is the message preview not always shown?](#user-content-faq18)
-* [(19) Why are the pro features so expensive?](#user-content-faq19)
-* [(20) Can I get a refund?](#user-content-faq20)
-* [(21) How do I enable the notification light?](#user-content-faq21)
-* [(22) What does account/folder error ... mean?](#user-content-faq22)
+* [(13) 在 裝置/伺服器 搜尋是如何運作的?](#user-content-faq13)
+* [(14) 我如何建立 Outlook / Live / Hotmail 帳號?](#user-content-faq14)
+* [(15) 為什麼訊息文字一直在載入中?](#user-content-faq15)
+* [(16) 為什麼訊息沒有被同步?](#user-content-faq16)
+* [~~(17) 為什麼手動同步無法運作?~~](#user-content-faq17)
+* [(18) 為什麼訊息預覽並非每次顯示?](#user-content-faq18)
+* [(19) 為什麼專業版功能如此昂貴?](#user-content-faq19)
+* [(20) 我可以退款嗎?](#user-content-faq20)
+* [(21) 如何啟用訊息通知LED燈?](#user-content-faq21)
+* [(22) 帳號/資料夾 錯誤代表什麼意思?](#user-content-faq22)
 * [(23) Why do I get alert .. ?](#user-content-faq23)
 * [(24) What is browse messages on the server?](#user-content-faq24)
 * [(25) Why can't I select/open/save an image, attachment or a file?](#user-content-faq25)