Merge translation files from master branch.

1 files changed, 83 insertions, 6 deletions

diff --git a/tde-i18n-nn/messages/tdepim/kmail.po b/tde-i18n-nn/messages/tdepim/kmail.po
index da1c241886d..7bf1d0b455a 100644
--- a/tde-i18n-nn/messages/tdepim/kmail.po
+++ b/tde-i18n-nn/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: 2006-07-23 19:03+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -2380,12 +2380,13 @@ msgstr ""
 "for problem det kan føra til.</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 "
@@ -2395,7 +2396,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, "
@@ -7633,15 +7634,16 @@ msgid "Generate free/&busy and activate alarms for:"
 msgstr "Generer &ledig/oppteken og slå på alarmar for:"
 
 #: 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 "
@@ -15450,3 +15452,78 @@ msgstr ""
 
 #~ msgid "The signing operation failed for an unknown reason."
 #~ msgstr "Signeringsoperasjonen feila av ukjent grunn."
+
+#~ 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>Handtering av forespørslar om meldingskvittering</"
+#~ "h3><p>Meldingskvittering vert på engelsk forkorta <b></b>MDN (Message "
+#~ "Disposition Notification). Forfattaren av meldinga ber om ei "
+#~ "tilbakemelding på e-posten han sender. Mottakaren sitt e-postprogram "
+#~ "sender eit svar som fortel forfattaren kva som hendte med meldinga. "
+#~ "Vanlege tilbakemeldingar er <b>vist</b> (dvs. lest), <b>sletta</b> og "
+#~ "<b>oversendt</b> (t.d. vidaresendt).</p><p>Desse vala er tilgjengeleg for "
+#~ "å kontrollera sending av meldingskvitteringar i KMail:</"
+#~ "p><ul><li><em>Ignorer</em>: Ignorerer alle forespørslar om "
+#~ "meldingskvitteringar. Ingen kvitteringar vil bli sendt automatisk "
+#~ "(tilrådd).</li><li><em>Spør</em>: Sender meldingskvittering berre etter "
+#~ "at brukaren er spurt om det. På denne måten kan du senda kvitteringar for "
+#~ "enkelte meldingar, medan du avviser eller ignorerer andre.</"
+#~ "li><li><em>Avvis</em>: Sender alltid ei <b>avvist</b>-kvittering. Dette "
+#~ "er berre <em>litt</em> betre enn å alltid senda kvitteringar. Forfattaren "
+#~ "vil framleis vita at meldingane er handsama. Han kan berre ikkje vita om "
+#~ "ho er sletta eller lest osv.</li><li><em>Send alltid</em>: Sender alltid "
+#~ "kvittering når det blir førespurt. Dette tyder at forfattaren av meldinga "
+#~ "får vita når meldinga er blitt handsama, i tillegg kva som hendte med "
+#~ "henne (vist, sletta osv.). Dette valet vert sterkt fråråda, men sidan det "
+#~ "er ønskeleg for handtering av kundeforhold til dømes, så er det gjort "
+#~ "tilgjengeleg.</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 ""
+#~ "Denne innstillinga styrer kva for brukarar som delar denne mappa som får "
+#~ "sjå når du er oppteken eller ledig. Dei vil få melding om hendingane "
+#~ "eller oppgåvene i denne mappa. Dette valet gjeld berre for kalender- og "
+#~ "oppgåvemappene. (For oppgåver gjeld innstillinga berre for alarmar.)\n"
+#~ "\n"
+#~ "Moglege bruksområde: Dersom sjefen deler ei mappe med sekretæren sin, "
+#~ "skal berre sjefen vera markert som oppteken for dette møtet. Difor bør "
+#~ "han velja «Administratorar», sidan sekretæren ikkje har "
+#~ "administratortilgang til mappa.\n"
+#~ "Dersom ei arbeidsgruppe deler ein kalender for gruppemøte, vil alle som "
+#~ "kan lesa mappa vera markerte som opptekne for møta.\n"
+#~ "Ei mappe som heile firmaet brukar med valfrie hendingar vil bruka "
+#~ "«Ingen», sidan ingen veit kven som kjem til å koma på desse hendingane."