Merge translation files from master branch.

2 files changed, 88 insertions, 10 deletions

diff --git a/tde-i18n-ko/messages/tdemultimedia/audiocd_encoder_vorbis.po b/tde-i18n-ko/messages/tdemultimedia/audiocd_encoder_vorbis.po
index 8b807638cf6..b3697f01968 100644
--- a/tde-i18n-ko/messages/tdemultimedia/audiocd_encoder_vorbis.po
+++ b/tde-i18n-ko/messages/tdemultimedia/audiocd_encoder_vorbis.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: audiocd_encoder_vorbis\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2022-07-19 20:16+0000\n"
 "PO-Revision-Date: 2007-12-04 19:29+0900\n"
 "Last-Translator: Park Shinjo <peremen@gmail.com>\n"
 "Language-Team: Korean <cho.sungjae@gmail.com>\n"
@@ -206,13 +206,23 @@ msgid "Add &track information"
 msgstr "트랙 정보 추가(&T)"
 
 #: encodervorbisconfig.ui:371
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "Add a description of the song to the file header. This makes it easy for the "
-"user to get advanced song information shown by his media player. You can get "
-"this information automatically via the Internet. Look at the <i>\"CDDB "
+"user to get advanced song information shown by their media player. You can "
+"get this information automatically via the Internet. Look at the <i>\"CDDB "
 "Retrieval\"</i> control module for details."
 msgstr ""
 "파일 헤더에 노래에 관한 정보를 추가합니다. 미디어 재생기를 통해서 노래 정보"
 "를 쉽게 가져올 수 있도록 도와줍니다. 이 정보는 인터넷을 통해서 얻을 수 있습니"
 "다. \"CDDB 가져오기\" 제어 모듈을 참고하십시오."
+
+#~ msgid ""
+#~ "Add a description of the song to the file header. This makes it easy for "
+#~ "the user to get advanced song information shown by his media player. You "
+#~ "can get this information automatically via the Internet. Look at the <i>"
+#~ "\"CDDB Retrieval\"</i> control module for details."
+#~ msgstr ""
+#~ "파일 헤더에 노래에 관한 정보를 추가합니다. 미디어 재생기를 통해서 노래 정"
+#~ "보를 쉽게 가져올 수 있도록 도와줍니다. 이 정보는 인터넷을 통해서 얻을 수 "
+#~ "있습니다. \"CDDB 가져오기\" 제어 모듈을 참고하십시오."
diff --git a/tde-i18n-ko/messages/tdepim/kmail.po b/tde-i18n-ko/messages/tdepim/kmail.po
index 1de44fa2b10..ae11ca4532a 100644
--- a/tde-i18n-ko/messages/tdepim/kmail.po
+++ b/tde-i18n-ko/messages/tdepim/kmail.po
@@ -17,7 +17,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-01-30 21:04+0900\n"
 "Last-Translator: Youngbin Park <shrike@nate.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
@@ -2370,12 +2370,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 "
@@ -2385,7 +2386,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, "
@@ -7574,15 +7575,16 @@ msgid "Generate free/&busy and activate alarms for:"
 msgstr "free/busy 활성알람 생성 :"
 
 #: 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 "
@@ -14713,3 +14715,69 @@ msgstr ""
 
 #~ msgid "Always encr&ypt to self"
 #~ msgstr "항상 스스로 암호화하기(&Y)"
+
+#~ 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> (i.e. 읽음), <b>삭제됨</b> , <b>전송됨</b> "
+#~ "(e.g. 보내짐) 과 같습니다.</p><p>MDN KMail 전송에는 다음 옵션들이 가능합니"
+#~ "다:</p><ul><li><em>무시</em>: 모든 수신 확인 요청을 무시합니다. 아무런 MDN"
+#~ "도 보내지지 않습니다.(권장)</li><li><em>묻기</em>: 사용자의 허가를 묻습니"
+#~ "다. 이를 통해 선택한 메일에 대해서만 MDN을 보내줄 수 있습니다.</"
+#~ "li><li><em>거부</em>: 항상 <b>거부됨</b> 알림을 보냅니다. 이는 모든 MDN에 "
+#~ "답하는 것 보다 <em>조금</em> 낫습니다. 여전히 보낸이는 메일이 지워졌거나 "
+#~ "읽혔는지만을 모를 뿐 메일이 사용자에게 인식되었다는 것은 알 수 있습니다.</"
+#~ "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 ""
+#~ "이 설정은 freebusy목록에서 \"busy\"기간에 어느 유저가 이 디렉터리를 공유하"
+#~ "게 되는지, 그리고 이 디렉터리의 이벤트나 작업의 알람을 어떻게 볼 것인지를 "
+#~ "결정합니다. 이 설정은 달력과 작업 디렉터리에만 적용됩니다.(작업의 경우, "
+#~ "이 설정은 오직 알람사용에만 적용됩니다.)\n"
+#~ "\n"
+#~ "예를 들어, 만약 사장님이 비서와 디렉터리를 공유하고 있다면, 오직 사장님만 "
+#~ "약속으로 인해 busy상태를 설정할 수 있고, \"관리자\"를 선택하여 그의 비서"
+#~ "가 이 디렉터리에 대해 관리자 권한을 가질 수 없도록 설정할 수 있습니다.\n"
+#~ "만약 작업그룹이 그룹 미팅을 위한 달력을 공유하고 있다면, 디렉터리의 모든 "
+#~ "그룹원들은 busy상태가 됩니다.\n"
+#~ "회사 전체에 공유되는 디렉터리에는 이벤트 옵션으로 \"Nobody\"옵션을 제공하"
+#~ "며, 이 옵션은 해당 이벤트에 누가 가는지 모르도록 설정할 수 있습니다."