Merge translation files from master branch.

1 files changed, 53 insertions, 6 deletions

diff --git a/tde-i18n-fi/messages/tdepim/kmail.po b/tde-i18n-fi/messages/tdepim/kmail.po
index dfa50d9abfe..d97d28a35aa 100644
--- a/tde-i18n-fi/messages/tdepim/kmail.po
+++ b/tde-i18n-fi/messages/tdepim/kmail.po
@@ -12,7 +12,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: 2007-10-30 21:58+0200\n"
 "Last-Translator: Mikko Piippo <piippo@cc.helsinki.fi>\n"
 "Language-Team:  <fi@li.org>\n"
@@ -2390,12 +2390,13 @@ msgstr ""
 "käyttöön liittyvät ongelmat.</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 "
@@ -2405,7 +2406,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, "
@@ -7660,9 +7661,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 "
@@ -15504,3 +15505,49 @@ msgstr ""
 #~ "On suositeltavaa jättää tämä asetus valituksi maksimaalisen "
 #~ "turvallisuuden takaamiseksi.\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>Tilailmoituskäytäntö</h3> <p>Viestin tilailmoitukset (MDN, "
+#~ "Message Disposition Notification) tarkoittavat yksinkertaistaen "
+#~ "<p>viestin automaattista kuittaamista</p>. Lähettäjä pyytäessä tällaista "
+#~ "ilmoitusta luo vastaanottajan sähköpostiohjelma automaattisesti "
+#~ "vastausviestin, josta lähettäjälle selviää mitä hänen viestilleen "
+#~ "tapahtuu. Yleisimpiin tilailmoitustyyppeihin kuuluvat <b>luettu</b>, "
+#~ "<b>poistettu</b> ja <b>välitetty</b>.</p> <p>KMail tarjoaa seuraavat "
+#~ "vaihtoehdot tilailmoituspyyntöjen käsittelyyn:</p> <ul> <li><em>Hylkää</"
+#~ "em>: Jättää huomiotta kaikki tilailmoituspyynnöt. Tilailmoituksia ei "
+#~ "lähetetä (suositeltu).</li> <li><em>Kysy</em>: Kysyy käyttäjän lupaa "
+#~ "tilailmoituspyyntöihin vastaamiseen. Tällöin voidaan vastata vain "
+#~ "valittuihin tilailmoituspyyntöihin jättäen muut huomiotta.</li> "
+#~ "<li><em>Evää</em>: Lähettää aina <b>evätty</b>-tilailmoituksen. Tämä on "
+#~ "vain <em>hieman</em> parempi vaihtoehto kuin tilailmoitusten lähettäminen "
+#~ "aina. Viestin lähettäjä saa tällöinkin tietää, että hänen viestinsä on "
+#~ "vastaanotettu, mutta hänelle ei selviä, mitä viestille on tapahtunut "
+#~ "(luettiinko se, poistettiinko se jne.)</li> <li><em>Lähetä aina</em>: "
+#~ "Lähettää aina pyydetyt tilailmoitukset. Tämä tarkoittaa, että lähettäjä "
+#~ "saa tietää milloin hänen viestiään käsiteltiin ja mitä sille tapahtui "
+#~ "(luettiin, poistettiin jne.). Tätä vaihtoehtoa ei suositella, mutta se on "
+#~ "valittavissa koska siitä voi olla hyötyä esimerkiksi asiakassuhteiden "
+#~ "hallinnassa.</li></ul></qt>"