Merge translation files from master branch.

1 files changed, 49 insertions, 6 deletions

diff --git a/tde-i18n-tg/messages/tdepim/kmail.po b/tde-i18n-tg/messages/tdepim/kmail.po
index 437af0a96c4..60833d68abd 100644
--- a/tde-i18n-tg/messages/tdepim/kmail.po
+++ b/tde-i18n-tg/messages/tdepim/kmail.po
@@ -13,7 +13,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: 2005-09-17 13:29+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -2442,12 +2442,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 "
@@ -2457,7 +2458,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, "
@@ -7757,9 +7758,9 @@ msgid ""
 "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 "
@@ -15934,3 +15935,45 @@ msgstr ""
 
 #~ msgid "Extension"
 #~ 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> ва <b>кор карда шуд</b> (мисол, аз нав фиристодан)."
+#~ "</p><p>KMail метавонад якчанд намуди коркардро амалӣ гардонад:</"
+#~ "p><ul><li><em>Эътибор надодан</em>: ягон маълумот фиристода нахоҳад шуд "
+#~ "(тавсия карда мешавад).</li><li><em>Пурсиш</em>: пурсиши иҷозот ба "
+#~ "фиристодани иттилоот. Бо чунин тарз метавонед фиристодани иттилоотро "
+#~ "идора кунед.</li><li><em>Рад кардан</em>: доим иттилооти оиди <b>рад "
+#~ "кардан</b>-ро фиристодан. Муаллифи иттилоот бо чунин тарз мефаҳмад, ки "
+#~ "иттилоот кор карда шудааст, аммо намефаҳмад, ки бо чӣ тарз.</"
+#~ "li><li><em>Доим фиристодан</em>: Муаллифи иттилоот бо чунин тарз "
+#~ "мефаҳмад, ки иттилоот кор карда шудааст, ва мефаҳмад, ки бо чӣ тарз "
+#~ "шудааст. Агар ин дар корчаллонии мантиқии шумо лозим набошад, ин "
+#~ "параметрро сабт намудан тавсия намешавад.</li></ul> </qt>"