Merge translation files from master branch.

1 files changed, 82 insertions, 6 deletions

diff --git a/tde-i18n-ru/messages/tdepim/kmail.po b/tde-i18n-ru/messages/tdepim/kmail.po
index 73aeebf04a7..5b948bac2b8 100644
--- a/tde-i18n-ru/messages/tdepim/kmail.po
+++ b/tde-i18n-ru/messages/tdepim/kmail.po
@@ -8,7 +8,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: 2022-02-12 17:01+0000\n"
 "Last-Translator: Alexander Golubev <fatzer2@gmail.com>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -2376,12 +2376,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 "
@@ -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, "
@@ -7660,15 +7661,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 "
@@ -14887,3 +14889,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 может осуществлять следующие виды обработки:</"
+#~ "p><ul><li><em>Игнорировать</em>: никакие уведомления не будут "
+#~ "отправляться (рекомендуется).</li><li><em>Спрашивать</em>: запрашивать "
+#~ "разрешение на отправку уведомлений. Таким способом вы можете "
+#~ "контролировать отправку уведомлений.</li><li><em>Отказать</em>: всегда "
+#~ "отправлять уведомление об <b>отказе</b>. Автор сообщения тем самым "
+#~ "узнаёт, что сообщение обработано, но не будет знать, каким именно образом."
+#~ "</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"
+#~ "Другой пример: при совместном использовании рабочей группой календаря для "
+#~ "планирования встреч требуется, чтобы все встречи в этой папке помечались "
+#~ "как занятое время для всех членов группы. В этом случае можно выбрать "
+#~ "вариант \"Для всех пользователей папки\". Для папки, содержащий события "
+#~ "компании, нужно выбрать вариант \"Нет\" поскольку заранее неизвестно кто "
+#~ "может присутствовать на этих событиях."