Merge translation files from master branch.

1 files changed, 82 insertions, 6 deletions

diff --git a/tde-i18n-sr/messages/tdepim/kmail.po b/tde-i18n-sr/messages/tdepim/kmail.po
index ebf5b1cd9c2..7fb4e0ba045 100644
--- a/tde-i18n-sr/messages/tdepim/kmail.po
+++ b/tde-i18n-sr/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: 2008-08-16 13:31+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -2376,12 +2376,13 @@ msgstr ""
 "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 "
@@ -2391,7 +2392,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, "
@@ -7694,15 +7695,16 @@ msgid "Generate free/&busy and activate alarms for:"
 msgstr "Направи слободно/&заузето и активирај аларме за:"
 
 #: 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 "
@@ -14947,3 +14949,77 @@ msgstr ""
 
 #~ msgid "Op&en"
 #~ 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-овог слања MDN-ова служе следеће опције:</"
+#~ "p><ul><li><em>Игнориши</em>: Игнорише било какве захтеве за обавештавање. "
+#~ "Ниједан MDN никада аутоматски неће бити послат (препоручљиво).</"
+#~ "li><li><em>Питај</em>: Одговара на захтев тек пошто упита корисника за "
+#~ "дозволу. На овај начин можете слати MDN-ове за одабране поруке, док ћете "
+#~ "их игнорисати или одбијати за остале.</li><li><em>Одбиј</em>: Увек шаље "
+#~ "<b>одбијено</b> обавештење. Ово је само <em>мало</em> боље од слања MDN-"
+#~ "ова увек. Писац ће још увек знати да је нешто рађено са поруком, али не "
+#~ "може рећи да ли је обрисана, прочитана итд.</li><li><em>Шаљи увек</em>: "
+#~ "Увек шаље обавештење о распоређивању. Ово значи да писац поруке сазнаје "
+#~ "када је нешто рађено са поруком и још шта јој се догодило (приказана, "
+#~ "обрисана, итд.) Ова опција се никако не препоручује, али пошто има смисла "
+#~ "за рецимо управљање односа према муштеријама, учињена је доступном.</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 ""
+#~ "Ово подешавање дефинише који корисници који деле ову фасциклу треба да "
+#~ "добију „заузете“ периоде у својој слободно/заузето листи и виде аларме за "
+#~ "догађаје или задатке у овој фасцикли. Подешавање се примењује само на "
+#~ "фасцикле календара и задатака (за задатке, ово подешавање користи се само "
+#~ "за аларме).\n"
+#~ "\n"
+#~ "Пример употребе: Ако шеф дели фасциклу са својом секретарицом, само шеф "
+#~ "треба да буде означен као заузет током састанака. Зато би требало да "
+#~ "изабере „Администратори“, пошто секретарица нема администраторских права "
+#~ "за фасциклу.\n"
+#~ "С друге стране, ако радна група дели календар за састанке групе, сви "
+#~ "читаоци фасцикле треба да буду означени као заузети током састанака.\n"
+#~ "Фасцикла за целу компанију са опционим догађајима у себи би користила "
+#~ "„Нико“, пошто није познато ко ће ићи на те догађаје."