Merge translation files from master branch.

1 files changed, 54 insertions, 6 deletions

diff --git a/tde-i18n-mk/messages/tdepim/kmail.po b/tde-i18n-mk/messages/tdepim/kmail.po
index 2dc9da24537..c31a54d52e9 100644
--- a/tde-i18n-mk/messages/tdepim/kmail.po
+++ b/tde-i18n-mk/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: 2007-04-19 00:53+0200\n"
 "Last-Translator: Bozidar Proevski <[email protected]>\n"
 "Language-Team: Macedonian <[email protected]>\n"
@@ -2371,12 +2371,13 @@ msgstr ""
 "но треба да сте свесни за можните проблеми.</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 "
@@ -2386,7 +2387,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, "
@@ -7587,9 +7588,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 "
@@ -14506,3 +14507,50 @@ msgstr ""
 
 #~ msgid "Signature &algorithm:"
 #~ 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>Известувањата за статусот на пораките (ИСП) се обопштување на она "
+#~ "што се нарекува <b>„признаница за прием“</b>. Авторот на пораката бара да "
+#~ "му биде испратено известување за статусот, а програмата за е-пошта на "
+#~ "примачот генерира одговор од кој авторот може да дознае што се случило со "
+#~ "неговата порака. Меѓу најчестите типови на известувања спаѓаат "
+#~ "<b>прикажана</b> (т.е. прочитана), <b>избришана</b> и <b>испорачана</b> "
+#~ "(пр. препратена) итн.</p><p>Достапни се следните опции за регулирање на "
+#~ "испраќањето на известувања од КПошта:</p><ul><li><em>Игнорирај</em>: "
+#~ "Игнорира какво било барање за известување за статус. Никакво известување "
+#~ "нема да биде испратено автоматски (препорачано).</li><li><em>Прашај</em>: "
+#~ "Испраќа известувања само откако ќе добие дозвола од корисникот. На овој "
+#~ "начин може да испраќате известувања за одредени пораки, а да ги "
+#~ "игнорирате другите.</li><li><em>Одбиј</em>: Секогаш испраќа известување "
+#~ "<b>одбиена</b>. Ова е <em>нешто</em> подобро отколку секогаш да се "
+#~ "испраќаат известувања. Авторот ќе дознае дали врз пораката било "
+#~ "дејствувано, само нема да знае дали таа била избришана, прочитана или "
+#~ "нешто друго.</li><li><em>Испрати секогаш</em>: Секогаш го испраќа "
+#~ "бараното известување за статус. Тоа значи дека авторот на пораката ќе "
+#~ "знае дали врз пораката било дејствувано, и додатно ќе знае што точно се "
+#~ "случило со пораката (прикажана, избришана итн.). Оваа опција воопшто не "
+#~ "се препорачува, но бидејќи има смисол на пример за менаџирање на односи "
+#~ "со клиентите, постои како можност.</li></ul></qt>"