Merge translation files from master branch.

1 files changed, 77 insertions, 6 deletions

diff --git a/tde-i18n-ja/messages/tdepim/kmail.po b/tde-i18n-ja/messages/tdepim/kmail.po
index 4c9b16c6116..ab9cc94accd 100644
--- a/tde-i18n-ja/messages/tdepim/kmail.po
+++ b/tde-i18n-ja/messages/tdepim/kmail.po
@@ -9,7 +9,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-02-08 21:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -2377,12 +2377,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 "
@@ -2392,7 +2393,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, "
@@ -7550,15 +7551,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 "
@@ -14714,3 +14716,72 @@ msgstr ""
 
 #~ msgid "Show folder quick search line edit"
 #~ 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>メッセージの送信者が開封通知を要求すると、"
+#~ "受信者側のメールプログラムはそれに対す返事を自動的に生成します。この返事に"
+#~ "よって、送信者はメッセージに「起こったこと」を知ることができます。「起こっ"
+#~ "たこと」には、「表示された (読まれた)」「削除された」「転送された」などが"
+#~ "あります。</p><p>KMail が開封通知要求をどのように扱うかを、以下のオプショ"
+#~ "ンから選択できます。</p><ul><li>[無視] (推奨) すべての開封通知要求を無視し"
+#~ "ます。自動的に開封通知が送られることはありません。</li><li>[確認] 毎回ユー"
+#~ "ザに確認して、許可されたもののみを送ります。これを選択すると、一部のメッ"
+#~ "セージに対してのみ開封通知を送ることができます。</li><li>[拒否] 常に「拒否"
+#~ "された」という通知を返します。これは「常に送信」するのとほとんど同じです。"
+#~ "メッセージの送信者は、読まれたか、削除されたかは知ることはできませんが、そ"
+#~ "れでも送信したメッセージが届いたことは分かります。</li><li>[常に送信] 開封"
+#~ "通知要求があれば、常に開封通知を送信します。メッセージの送信者はいつメッ"
+#~ "セージが受け取られたかだけでなく、読まれたか、削除されたかも知ることができ"
+#~ "ます。このオプションはお勧めしません。これは顧客管理などで意味があるので、"
+#~ "一応用意しているだけです。</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"
+#~ "使用例: ボスが秘書とフォルダを共有している場合、ボスのみが会議に対して「予"
+#~ "定有り」とマークされるべきです。よって、秘書はフォルダの管理権を持たないの"
+#~ "で、ボスが「Admins」を選択します。\n"
+#~ "一方、作業グループがグループミーティングについてカレンダーを共有している場"
+#~ "合、フォルダのすべての読者がこのミーティングに対して「予定有り」とマークさ"
+#~ "れなければなりません。\n"
+#~ "自由参加のイベントを含む全社的なフォルダであれば、誰がこれらのイベントに参"
+#~ "加するか不明なので、「Nobody」を使うべきです。"