Merge translation files from master branch.

1 files changed, 0 insertions, 37 deletions

diff --git a/tde-i18n-zh_CN/messages/tdepim/kmail.po b/tde-i18n-zh_CN/messages/tdepim/kmail.po
index da27d304165..604fe632b09 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmail.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmail.po
@@ -2292,28 +2292,6 @@ msgstr ""
 
 #: 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. 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>"
 msgid ""
 "<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
 "generalization of what is commonly called <b>read receipt</b>. The message "
@@ -7283,20 +7261,6 @@ 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"
-#| "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."
 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 "
@@ -9315,7 +9279,6 @@ msgstr "链接另存为..."
 
 #: kmreaderwin.cpp:623
 #, fuzzy
-#| msgid "Message Structure Viewer"
 msgid "Show Message Structure"
 msgstr "信件结构查看器"