Merge translation files from master branch.

1 files changed, 70 insertions, 6 deletions

diff --git a/tde-i18n-zh_TW/messages/tdepim/kmail.po b/tde-i18n-zh_TW/messages/tdepim/kmail.po
index d4b34e7cd29..6ce26e67ff3 100644
--- a/tde-i18n-zh_TW/messages/tdepim/kmail.po
+++ b/tde-i18n-zh_TW/messages/tdepim/kmail.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2022-04-06 20:16+0000\n"
+"POT-Creation-Date: 2022-07-19 20:15+0000\n"
 "PO-Revision-Date: 2008-08-01 15:33+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -2293,12 +2293,13 @@ msgstr ""
 "您還是可以選擇將這個功能打開。</p></qt>"
 
 #: configuredialog.cpp:3767
+#, fuzzy
 msgid ""
 "<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
 "generalization of what is commonly called <b>read receipt</b>. The message "
 "author requests a disposition notification to be sent and the receiver's "
 "mail program generates a reply from which the author can learn what happened "
-"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"to their message. Common disposition types include <b>displayed</b> (i.e. "
 "read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
 "following options are available to control KMail's sending of MDNs:</"
 "p><ul><li><em>Ignore</em>: Ignores any request for disposition "
@@ -2308,7 +2309,7 @@ msgid ""
 "or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
 "<b>denied</b> notification. This is only <em>slightly</em> better than "
 "always sending MDNs. The author will still know that the messages has been "
-"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"acted upon, they just cannot tell whether it was deleted or read etc.</"
 "li><li><em>Always send</em>: Always sends the requested disposition "
 "notification. That means that the author of the message gets to know when "
 "the message was acted upon and, in addition, what happened to it (displayed, "
@@ -7207,15 +7208,16 @@ msgid "Generate free/&busy and activate alarms for:"
 msgstr "設定忙碌或空閒標記並提醒(&B)："
 
 #: kmfolderdia.cpp:539
+#, fuzzy
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
 "tasks in this folder. The setting applies to Calendar and Task folders only "
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
-"Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins"
-"\", since the secretary has no admin rights on the folder.\n"
+"Example use cases: if the boss shares a folder with their secretary, only "
+"the boss should be marked as busy for their meetings, so they should select "
+"\"Admins\", since the secretary has no admin rights on the folder.\n"
 "On the other hand if a working group shares a Calendar for group meetings, "
 "all readers of the folders should be marked as busy for meetings.\n"
 "A company-wide folder with optional events in it would use \"Nobody\" since "
@@ -14095,3 +14097,65 @@ msgstr ""
 
 #~ msgid "Op&en"
 #~ msgstr "開啟(&E)"
+
+#~ msgid ""
+#~ "<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+#~ "generalization of what is commonly called <b>read receipt</b>. The "
+#~ "message author requests a disposition notification to be sent and the "
+#~ "receiver's mail program generates a reply from which the author can learn "
+#~ "what happened to his message. Common disposition types include "
+#~ "<b>displayed</b> (i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. "
+#~ "forwarded).</p><p>The following options are available to control KMail's "
+#~ "sending of MDNs:</p><ul><li><em>Ignore</em>: Ignores any request for "
+#~ "disposition notifications. No MDN will ever be sent automatically "
+#~ "(recommended).</li><li><em>Ask</em>: Answers requests only after asking "
+#~ "the user for permission. This way, you can send MDNs for selected "
+#~ "messages while denying or ignoring them for others.</li><li><em>Deny</"
+#~ "em>: Always sends a <b>denied</b> notification. This is only "
+#~ "<em>slightly</em> better than always sending MDNs. The author will still "
+#~ "know that the messages has been acted upon, he just cannot tell whether "
+#~ "it was deleted or read etc.</li><li><em>Always send</em>: Always sends "
+#~ "the requested disposition notification. That means that the author of the "
+#~ "message gets to know when the message was acted upon and, in addition, "
+#~ "what happened to it (displayed, deleted, etc.). This option is strongly "
+#~ "discouraged, but since it makes much sense e.g. for customer relationship "
+#~ "management, it has been made available.</li></ul></qt>"
+#~ msgstr ""
+#~ "<qt><h3>信件處理通知(MDN)</h3><p>MDN 有點像張收據。發信人在信件中加入 "
+#~ "MDN，而收信人的收信軟體會發出一個通知給發信人，告訴發信人這封信是被收件人"
+#~ "如何處理。通常處理的方式包括：<b>被顯示</b>（也就是被開啟）、<b>被刪除</b>"
+#~ "以及<b>被發送</b>（也就是被轉寄）。</p> <p>KMail 可以依如下選項選擇要如何"
+#~ "回應 MDN：</p> <ul><li><em>忽略</em>：忽略任何 MDN 的要求。KMail 不會回覆"
+#~ "任何 MDN 要求。（建議選項）</li> <li><em>詢問使用者</em>：詢問使用者是否要"
+#~ "回覆 MDN。</li> <li><em>回覆拒絕</em>：對所有 MDN 都回覆<b>拒絕</"
+#~ "b>(denied)。這其實只比「自動回覆」要好<em>一點點</em>而已，KMail 還是會對"
+#~ "每個 MDN 都做回覆，只是發信人分不出這封信是被開啟還是直接被刪除。</li> "
+#~ "<li><em>自動回覆</em>：系統會自動回覆 MDN。我們完全不建議使用這個選項，但"
+#~ "是因為這對處理顧客回應之類的事情是有作用的，所以還是讓您選擇。</li></ul></"
+#~ "qt>"
+
+#~ msgid ""
+#~ "This setting defines which users sharing this folder should get \"busy\" "
+#~ "periods in their freebusy lists and should see the alarms for the events "
+#~ "or tasks in this folder. The setting applies to Calendar and Task folders "
+#~ "only (for tasks, this setting is only used for alarms).\n"
+#~ "\n"
+#~ "Example use cases: if the boss shares a folder with his secretary, only "
+#~ "the boss should be marked as busy for his meetings, so he should select "
+#~ "\"Admins\", since the secretary has no admin rights on the folder.\n"
+#~ "On the other hand if a working group shares a Calendar for group "
+#~ "meetings, all readers of the folders should be marked as busy for "
+#~ "meetings.\n"
+#~ "A company-wide folder with optional events in it would use \"Nobody\" "
+#~ "since it is not known who will go to those events."
+#~ msgstr ""
+#~ "這個設定是針對日曆或行事曆資料夾（設定在行事曆上時，只用於提醒通知），設定"
+#~ "哪些使用者在讀取這個資料夾的內容時，可以在清單中標記「忙碌」或「空閒」，並"
+#~ "收到提醒通知。\n"
+#~ "\n"
+#~ "例如：如果老闆開了一個資料夾跟秘書共享，應該只有老闆可以設定是否忙碌，因此"
+#~ "應該他應該將此設定設為「管理者」。\n"
+#~ "再舉個例，如果一群共同進行一個專案的同事共享一份日曆設定，那設定會議時，所"
+#~ "有人都應該同時被標上忙碌，並收到通知。\n"
+#~ "如果是全公司都可以看到的資料夾紀錄某些事件，那就應該設定成「無」，因為不確"
+#~ "定有哪些人會參與這些事件。"