Merge translation files from master branch.

1 files changed, 53 insertions, 6 deletions

diff --git a/tde-i18n-bs/messages/tdepim/kmail.po b/tde-i18n-bs/messages/tdepim/kmail.po
index e5133f290c2..30d229d5daa 100644
--- a/tde-i18n-bs/messages/tdepim/kmail.po
+++ b/tde-i18n-bs/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: 2004-12-12 16:40-0800\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@linux.org.ba>\n"
@@ -2419,12 +2419,13 @@ msgstr ""
 "opciju, ali trebate biti svjesni mogućeg problema.</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 "
@@ -2434,7 +2435,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, "
@@ -7785,9 +7786,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 "
@@ -15828,3 +15829,49 @@ msgstr ""
 
 #~ msgid "queued"
 #~ msgstr "čeka na slanje"
+
+#~ 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>Politika obavješenja o stanju poruke</h3> <p>MDN (Message "
+#~ "Disposition Notification) je opštiji slučaj onoga što se obično zove "
+#~ "<b>potvrda čitanja</b>. Autor poruke je zatražio da bude poslano "
+#~ "obavještenje o stanju, tj. da e-mail program primatelja generiše odgovor "
+#~ "iz kojeg autor može saznati šta se desilo sa njegovom/njenom porukom. "
+#~ "Uobičajene vrsta stanja su <b>prikazana</b> (tj. pročitana poruka), "
+#~ "<b>obrisana</b> i <b>poslana</b> (tj. proslijeđena poruka).</"
+#~ "p><p>Dostupne su sljedeće opcije za kontrolu KMailovog slanja MDNova:</"
+#~ "p><ul><li><em>Ignoriši</em>: Ignoriše sve zahtjeve za obavještenjima o "
+#~ "stanju. MDNovi neće nikada biti poslani automatski (preporučeno).</"
+#~ "li><li><em>Pitaj</em>: Odgovor će biti poslan tek nakon što se dobije "
+#~ "dozvola od korisnika. Na ovaj način možete slati MDNove za poruke za koje "
+#~ "to želite učiniti, odbijajući ili ignorišući ostale.</li> <li><em>Odbij</"
+#~ "em>: Uvijek šalje obavještenje da je poruka <b>odbijena</b>. Ovo je tek  "
+#~ "<em>neznatno</em> bolje od slanja običnog MDNa. Autor će i dalje znati da "
+#~ "je poruka primljena i da je na nju reagovano, jedino neće znati kako (da "
+#~ "li je poruka obrisana, pročitana itd.</li> <li><em>Uvijek šalji</em>: "
+#~ "Uvijek šalje traženo obavještenje o stanju. Ovo znači da će autor poruke "
+#~ "znati da li je reagovano na poruku kao i šta se desilo s njom (da li je "
+#~ "prikazana, obrisana itd.). Ova opcija se ne preporučuje, ali pošto ona "
+#~ "može biti korisna npr. za odjel odnosa s javnošću, ostavljena je kao "
+#~ "mogućnost.</li></ul></qt>"