Merge translation files from master branch.

2 files changed, 85 insertions, 10 deletions

diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po b/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po
index 54d3a2063c1..d98397d1bf4 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audiocd_encoder_vorbis\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2022-07-19 20:16+0000\n"
 "PO-Revision-Date: 2005-08-02 16:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -199,12 +199,22 @@ msgid "Add &track information"
 msgstr "添加音轨信息(&T)"
 
 #: encodervorbisconfig.ui:371
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Add a description of the song to the file header. This makes it easy for the "
-"user to get advanced song information shown by his media player. You can get "
-"this information automatically via the Internet. Look at the <i>\"CDDB "
+"user to get advanced song information shown by their media player. You can "
+"get this information automatically via the Internet. Look at the <i>\"CDDB "
 "Retrieval\"</i> control module for details."
 msgstr ""
 "在文件头添加歌曲描述。这使得用户在媒体播放机中显示歌曲的高级信息更加方便。您"
 "可以从 Internet 上自动获取此信息。请查看<i>“CDDB 获取”</i>控制模块中的细节。"
+
+#~ msgid ""
+#~ "Add a description of the song to the file header. This makes it easy for "
+#~ "the user to get advanced song information shown by his media player. You "
+#~ "can get this information automatically via the Internet. Look at the <i>"
+#~ "\"CDDB Retrieval\"</i> control module for details."
+#~ msgstr ""
+#~ "在文件头添加歌曲描述。这使得用户在媒体播放机中显示歌曲的高级信息更加方便。"
+#~ "您可以从 Internet 上自动获取此信息。请查看<i>“CDDB 获取”</i>控制模块中的细"
+#~ "节。"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmail.po b/tde-i18n-zh_CN/messages/tdepim/kmail.po
index 659b1a12f85..74903290708 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmail.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 3.5\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-01-29 14:12+0800\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
@@ -2291,12 +2291,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 "
@@ -2306,7 +2307,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, "
@@ -7259,15 +7260,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 "
@@ -14486,3 +14488,66 @@ msgstr ""
 
 #~ msgid "Attaching Image Failed"
 #~ msgstr "附加图像失败"
+
+#~ 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>信件投递通知策略</h3><p>MDN 是一组通常称为“阅读回执”的确认邮件。信"
+#~ "件作者可以请求接收人的邮件程序发回处理回执，从而得知他的信件被如何处理了。"
+#~ "常用的处理类型有<b>已显示</b>(即已读)、<b>已删除</b>和<b>已分发</b>(即已转"
+#~ "发)。</p><p>可以用如下的选项控制 KMail 如何发送 MDN 回复：</p><ul><li><em>"
+#~ "忽略</em>：忽略任何回执请求。不自动发送 MDN 回复(推荐)。</li><li><em>询问"
+#~ "</em>：只有在询问用户允许后才回复请求。这样您可以只有选择地对某些信件发送 "
+#~ "MDN 回复，但对其它信件则拒绝或者忽略 MDN 请求。</li><li><em>拒绝</em>：总"
+#~ "是发送<b>拒绝</b>通知。这只比总是发送 MDN 回复<em>稍微</em>好一点。来信的"
+#~ "作者仍然知道他的信件被处理了，只是无法判断是被删除还是阅读过。</"
+#~ "li><li><em>总是发送</em>：总是发送所请求的处理回执。这意味着来信的作者将知"
+#~ "道他的信件已被处理，而且知道它是如何被处理的(已显示、删除等等)。强烈建议您"
+#~ "不要使用这个选项，但因为它对某些场合很有意义，比如客户关系协调，所以软件还"
+#~ "是提供这个功能。</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"
+#~ "一个含有可选事件的面向全公司的文件夹应使用“无人”设定，因为不能确知会有谁参"
+#~ "与此事件。"