Merge translation files from master branch.

1 files changed, 83 insertions, 6 deletions

diff --git a/tde-i18n-et/messages/tdepim/kmail.po b/tde-i18n-et/messages/tdepim/kmail.po
index 903cac5b538..42339029764 100644
--- a/tde-i18n-et/messages/tdepim/kmail.po
+++ b/tde-i18n-et/messages/tdepim/kmail.po
@@ -6,7 +6,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-07-28 13:25+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -2359,12 +2359,13 @@ msgstr ""
 "lülitada, kuid sa peaksid probleemist teadlik olema.</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 "
@@ -2374,7 +2375,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, "
@@ -7611,15 +7612,16 @@ msgid "Generate free/&busy and activate alarms for:"
 msgstr "Va&ba/hõivatud info saadetakse ja häired aktiveeritakse kasutajatele:"
 
 #: 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 "
@@ -15603,3 +15605,78 @@ msgstr ""
 #~ "Kui soovid midagi muuta, vajuta 'Tagasi' ja soorita vajalikud muutused. "
 #~ "Vastasel juhul vajuta 'Lõpeta', et saata signatuuri võtmepaar SK-le.\n"
 #~ "</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 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>Kirja kättesaamise/lugemise kinnituse reeglid</h3><p>Tavaliselt "
+#~ "<b>lugemiskinnituseks</b> kutsutava käitumise korral soovib kirja autor "
+#~ "saada vastavat teadet, mille peale saaja e-posti rakendus tekitab "
+#~ "vastuse, mis annab autorile teada tema kirja saatuse. Tavaliselt on "
+#~ "vastusteks <b>displayed</b> (vaadatud ehk siis loetud), <b>deleted</b> "
+#~ "(kustutatud) ja <b>dispatched</b> (nt. edastatud).</p><p>KMail võimaldab "
+#~ "kasutada kinnituste puhul järgmisi võimalusi.</"
+#~ "p><ul><li><em>Ignoreeritakse</em>: kõiki kinnituse soove ignoreeritakse "
+#~ "ja ühtegi kinnitust automaatselt ei saadeta (soovitatav).</"
+#~ "li><li><em>Küsitakse</em>: soovile vastatakse alles pärast kasutajalt loa "
+#~ "küsimist. Nii saab saata kinnituse ainult neile kirjadele, millele soovid "
+#~ "seda saata, teiste puhul aga soovi tagasi lükata või seda ignoreerida.</"
+#~ "li><li><em>Lükatakse tagasi</em>: alati saadetakse vastus <b>tagasi "
+#~ "lükatud</b>. See on ainult <em>natuke</em> parem kui alati kinnituse "
+#~ "saatmine. Autor saab teada, et tema kirjaga on midagi ette võetud, ta ei "
+#~ "saa teada ainult seda, kas seda loeti või kustutati kohe jne.</"
+#~ "li><li><em>Saadetakse alati</em>: soovitud kinnitus saadetakse alati. See "
+#~ "tähendab, et kirja autor saab teada, et tema kiri on pärale jõudnud, "
+#~ "samuti saab ta teada, mis sellega ette võeti (vaadati, kustutati jne.). "
+#~ "See ei ole üldse kohe soovitatav, aga kuivõrd sellel võib olla oma mõte "
+#~ "näiteks kliendihalduses, on see siiski võimalik.</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 ""
+#~ "Siin saab määrata, millised antud kausta tarbivad kasutajad peavad saama "
+#~ "oma vaba/hõivatud nimekirja \"hõivatuse\" teateid ja nägema kausta "
+#~ "sündmuste või ülesannete korral häiret. Määratlus kehtib ainult kalendri "
+#~ "ja ülesannete kausta kohta (ülesannete korral ainult häirete kohta).\n"
+#~ "\n"
+#~ "Kasutamisnäited: kui ülemus kasutab seda kausta koos sekretäriga, saab "
+#~ "ainult ülemus määrata end kohtumiste ajaks hõivatuks, milleks ta peab "
+#~ "valida \"administraatorid\", sest sekretäril pole antud kaustas "
+#~ "administraatori õigusi.\n"
+#~ "Kui aga töögrupp kasutab ühiselt kalendrit grupi kohtumiste tarbeks, "
+#~ "peaks kõigil kausta lugejatel olema õigus märkida end kohtumiste ajaks "
+#~ "hõivatuks.\n"
+#~ "Kogu firmat hõlmav kaust lisasündmuste jaoks peaks aga saama määratluse "
+#~ "\"Mitte keegi\", sest pole ju teada, kes sellistele sündmustele lähevad."