Merge translation files from master branch.

2 files changed, 94 insertions, 100 deletions

diff --git a/tde-i18n-ko/messages/tdepim/kalarm.po b/tde-i18n-ko/messages/tdepim/kalarm.po
index 23a9545f5c9..e60f2302fb1 100644
--- a/tde-i18n-ko/messages/tdepim/kalarm.po
+++ b/tde-i18n-ko/messages/tdepim/kalarm.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kalarm\n"
-"POT-Creation-Date: 2019-01-13 18:48+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
 "PO-Revision-Date: 2008-01-30 21:05+0900\n"
 "Last-Translator: Sung-Jae, Cho\n"
 "Language-Team: Korean <cho.sungjae@gmail.com>\n"
@@ -855,24 +855,18 @@ msgstr "알람 템플릿의 이름을 입력해야 합니다."
 msgid "Template name is already in use"
 msgstr "템플릿 이름이 사용중입니다."
 
-#: editdlg.cpp:1387
-msgid ""
-"The date/time in the Alarm tab does not match the recurrence settings "
-"specified in the Recurrence tab."
-msgstr ""
-
-#: editdlg.cpp:1405
+#: editdlg.cpp:1398
 msgid "Recurrence has already expired"
 msgstr "재알람 시간이 지났습니다."
 
-#: editdlg.cpp:1433
+#: editdlg.cpp:1426
 msgid ""
 "Reminder period must be less than the recurrence interval, unless '%1' is "
 "checked."
 msgstr ""
 "'%1'이 체크되어 있지 않다면, 미리알림 기간이 재알람 간격보다 짧은 것입니다."
 
-#: editdlg.cpp:1447
+#: editdlg.cpp:1441
 #, fuzzy
 msgid ""
 "The duration of a repetition within the recurrence must be less than the "
@@ -881,26 +875,26 @@ msgstr ""
 "일반 알람 반복 기간은 재알람 간격에서 미리알림 알람 간격을 뺀 것보다 작아야 "
 "합니다."
 
-#: editdlg.cpp:1454
+#: editdlg.cpp:1448
 #, fuzzy
 msgid ""
 "For a repetition within the recurrence, its period must be in units of days "
 "or weeks for a date-only alarm"
 msgstr "하루 한번 알람인 일반 알람 반복 기간은 하루나 일주일 단위여야 합니다."
 
-#: editdlg.cpp:1476
+#: editdlg.cpp:1470
 msgid "Do you really want to send the email now to the specified recipient(s)?"
 msgstr "이메일을 지정한 수신인에게 보내시겠습니까?"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "Confirm Email"
 msgstr "이메일 확인"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "&Send"
 msgstr "전송(&S)"
 
-#: editdlg.cpp:1488
+#: editdlg.cpp:1482
 #, c-format
 msgid ""
 "Command executed:\n"
@@ -909,7 +903,7 @@ msgstr ""
 "실행한 명령:\n"
 "%1"
 
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
 #, c-format
 msgid ""
 "\n"
@@ -918,7 +912,7 @@ msgstr ""
 "\n"
 "숨은참조: %1"
 
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
 msgid ""
 "Email sent to:\n"
 "%1%2"
@@ -926,17 +920,17 @@ msgstr ""
 "여기로 이메일 전송:\n"
 "%1%2"
 
-#: editdlg.cpp:1557 messagewin.cpp:1543
+#: editdlg.cpp:1551 messagewin.cpp:1543
 msgid "Defer Alarm"
 msgstr "알람 연기"
 
-#: editdlg.cpp:1711
+#: editdlg.cpp:1705
 msgid ""
 "Log file must be the name or path of a local file, with write permission."
 msgstr ""
 "Log file must be the name or path of a local file, with write permission."
 
-#: editdlg.cpp:1737
+#: editdlg.cpp:1731
 #, c-format
 msgid ""
 "Invalid email address:\n"
@@ -945,11 +939,11 @@ msgstr ""
 "잘못된 이메일 주소:\n"
 "%1"
 
-#: editdlg.cpp:1744
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr "이메일 주소를 지정하지 않았습니다."
 
-#: editdlg.cpp:1761
+#: editdlg.cpp:1755
 #, c-format
 msgid ""
 "Invalid email attachment:\n"
@@ -958,32 +952,32 @@ msgstr ""
 "잘못된 이메일 첨부:\n"
 "%1"
 
-#: editdlg.cpp:1790
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr "알람 메시지 지금 표시"
 
-#: editdlg.cpp:1807
+#: editdlg.cpp:1801
 msgid "Display the file now"
 msgstr "파일 지금 보기"
 
-#: editdlg.cpp:1819
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr "지정한 명령을 지금 실행"
 
-#: editdlg.cpp:1830
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr "지정한 주소로 지금 이메일 전송"
 
-#: editdlg.cpp:1904
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr "첨부파일 선택"
 
-#: editdlg.cpp:2011
+#: editdlg.cpp:2005
 #, fuzzy
 msgid "Please select a file to display"
 msgstr "표시할 문자 또는 이미지 파일을 선택하십시오."
 
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -991,7 +985,7 @@ msgstr ""
 "%1\n"
 "찾을수 없음."
 
-#: editdlg.cpp:2014
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
@@ -999,7 +993,7 @@ msgstr ""
 "%1\n"
 "은(는) 디렉터리 입니다."
 
-#: editdlg.cpp:2015
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -1007,7 +1001,7 @@ msgstr ""
 "%1\n"
 "을(를) 읽을수 없습니다."
 
-#: editdlg.cpp:2016
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -2860,201 +2854,201 @@ msgstr "시작 날짜 보다 종료 날짜가 더 빠름"
 msgid "End date/time is earlier than start date/time"
 msgstr "시작 날짜/시간 보다 종료 날짜/시간이 더 빠름"
 
-#: recurrenceedit.cpp:734
+#: recurrenceedit.cpp:641
 msgid ""
 "_: Date cannot be earlier than start date\n"
 "start date"
 msgstr "시작 날짜"
 
-#: recurrenceedit.cpp:1124
+#: recurrenceedit.cpp:1031
 msgid "Recur e&very"
 msgstr "다음 때마다 재알람(&V)"
 
-#: recurrenceedit.cpp:1192
+#: recurrenceedit.cpp:1099
 msgid "hours:minutes"
 msgstr "시:분"
 
-#: recurrenceedit.cpp:1193
+#: recurrenceedit.cpp:1100
 msgid "Enter the number of hours and minutes between repetitions of the alarm"
 msgstr "알람 반복 시간과 분 간격  입력"
 
-#: recurrenceedit.cpp:1211
+#: recurrenceedit.cpp:1118
 msgid ""
 "_: On: Tuesday\n"
 "O&n:"
 msgstr "다음 요일에(&N):"
 
-#: recurrenceedit.cpp:1289
+#: recurrenceedit.cpp:1196
 msgid "No day selected"
 msgstr "날짜가 선택되지 않았습니다."
 
-#: recurrenceedit.cpp:1318
+#: recurrenceedit.cpp:1225
 msgid "day(s)"
 msgstr "일"
 
-#: recurrenceedit.cpp:1319
+#: recurrenceedit.cpp:1226
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr "알람 반복기간 날짜 입력"
 
-#: recurrenceedit.cpp:1320
+#: recurrenceedit.cpp:1227
 #, fuzzy
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr "알람 반복기간 요일 선택"
 
-#: recurrenceedit.cpp:1331
+#: recurrenceedit.cpp:1238
 msgid "week(s)"
 msgstr "주"
 
-#: recurrenceedit.cpp:1332
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr "알람 반복기간 주 입력"
 
-#: recurrenceedit.cpp:1333
+#: recurrenceedit.cpp:1240
 msgid "Select the days of the week on which to repeat the alarm"
 msgstr "알람 반복기간 요일 선택"
 
-#: recurrenceedit.cpp:1356
+#: recurrenceedit.cpp:1263
 msgid ""
 "_: On day number in the month\n"
 "O&n day"
 msgstr ""
 
-#: recurrenceedit.cpp:1360
+#: recurrenceedit.cpp:1267
 msgid "Repeat the alarm on the selected day of the month"
 msgstr "한 달에 선택된 날에 알람 반복"
 
-#: recurrenceedit.cpp:1366
+#: recurrenceedit.cpp:1273
 msgid ""
 "_: Last day of month\n"
 "Last"
 msgstr "이 날에"
 
-#: recurrenceedit.cpp:1369
+#: recurrenceedit.cpp:1276
 msgid "Select the day of the month on which to repeat the alarm"
 msgstr "알람 반복할 한 달의 날짜 선택"
 
-#: recurrenceedit.cpp:1381
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr "이 요일에(&H)"
 
-#: recurrenceedit.cpp:1386
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr "달의 선택된 주에 지정한 요일에 알람 반복"
 
-#: recurrenceedit.cpp:1389
+#: recurrenceedit.cpp:1296
 msgid "1st"
 msgstr "1일"
 
-#: recurrenceedit.cpp:1390
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "2일"
 
-#: recurrenceedit.cpp:1391
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "3일"
 
-#: recurrenceedit.cpp:1392
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "4일"
 
-#: recurrenceedit.cpp:1393
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "5일"
 
-#: recurrenceedit.cpp:1394
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr "마지막 요일"
 
-#: recurrenceedit.cpp:1395
+#: recurrenceedit.cpp:1302
 msgid "2nd Last"
 msgstr "두 번째 마지막"
 
-#: recurrenceedit.cpp:1396
+#: recurrenceedit.cpp:1303
 msgid "3rd Last"
 msgstr "세 번째 마지막"
 
-#: recurrenceedit.cpp:1397
+#: recurrenceedit.cpp:1304
 msgid "4th Last"
 msgstr "네 번째 마지막"
 
-#: recurrenceedit.cpp:1398
+#: recurrenceedit.cpp:1305
 msgid "5th Last"
 msgstr "다섯 번째 마지막"
 
-#: recurrenceedit.cpp:1401
+#: recurrenceedit.cpp:1308
 msgid ""
 "_: Every (Monday...) in month\n"
 "Every"
 msgstr ""
 
-#: recurrenceedit.cpp:1404
+#: recurrenceedit.cpp:1311
 msgid "Select the week of the month in which to repeat the alarm"
 msgstr "알람 반복할 한 달의 주 선택"
 
-#: recurrenceedit.cpp:1417
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr "알람 반복할 한 주의 날짜 선택"
 
-#: recurrenceedit.cpp:1535
+#: recurrenceedit.cpp:1442
 msgid "month(s)"
 msgstr "월"
 
-#: recurrenceedit.cpp:1536
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr "알람 반복 기간 개월 단위로 입력"
 
-#: recurrenceedit.cpp:1547
+#: recurrenceedit.cpp:1454
 msgid "year(s)"
 msgstr "년"
 
-#: recurrenceedit.cpp:1548
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr "알람 반복 기간 년 단위 입력"
 
-#: recurrenceedit.cpp:1553
+#: recurrenceedit.cpp:1460
 msgid ""
 "_: List of months to select\n"
 "Months:"
 msgstr ""
 
-#: recurrenceedit.cpp:1572
+#: recurrenceedit.cpp:1479
 msgid "Select the months of the year in which to repeat the alarm"
 msgstr "알람을 반복할 달 선택"
 
-#: recurrenceedit.cpp:1579
+#: recurrenceedit.cpp:1486
 msgid "February 2&9th alarm in non-leap years:"
 msgstr ""
 
-#: recurrenceedit.cpp:1582
+#: recurrenceedit.cpp:1489
 msgid ""
 "_: No date\n"
 "None"
 msgstr ""
 
-#: recurrenceedit.cpp:1583
+#: recurrenceedit.cpp:1490
 msgid ""
 "_: 1st March (short form)\n"
 "1 Mar"
 msgstr ""
 
-#: recurrenceedit.cpp:1584
+#: recurrenceedit.cpp:1491
 msgid ""
 "_: 28th February (short form)\n"
 "28 Feb"
 msgstr ""
 
-#: recurrenceedit.cpp:1590
+#: recurrenceedit.cpp:1497
 msgid ""
 "Select which date, if any, the February 29th alarm should trigger in non-"
 "leap years"
 msgstr ""
 
-#: recurrenceedit.cpp:1674
+#: recurrenceedit.cpp:1581
 msgid "No month selected"
 msgstr "달이 선택되지 않았습니다."
 
diff --git a/tde-i18n-ko/messages/tdepim/libkpgp.po b/tde-i18n-ko/messages/tdepim/libkpgp.po
index 4579921df20..fdebde3d5cd 100644
--- a/tde-i18n-ko/messages/tdepim/libkpgp.po
+++ b/tde-i18n-ko/messages/tdepim/libkpgp.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpgp\n"
-"POT-Creation-Date: 2019-01-13 18:48+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
 "PO-Revision-Date: 2004-11-08 14:11+0900\n"
 "Last-Translator: root <root@localhost.localdomain>\n"
 "Language-Team:  <ko@li.org>\n"
@@ -53,7 +53,7 @@ msgstr "암호문 너무 깁니다. 1024자 이하여야 합니다."
 msgid "Out of memory."
 msgstr "메모리 부족"
 
-#: kpgp.cpp:279
+#: kpgp.cpp:286
 msgid ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
@@ -62,16 +62,16 @@ msgstr ""
 "다시 시도하시겠습니까, 아니면 취소하고 암호화 해제가 되지 않은 채 메시지를 보"
 "시겠습니까?"
 
-#: kpgp.cpp:282 kpgp.cpp:341 kpgp.cpp:370 kpgp.cpp:389 kpgp.cpp:415
-#: kpgp.cpp:582 kpgp.cpp:601
+#: kpgp.cpp:289 kpgp.cpp:348 kpgp.cpp:377 kpgp.cpp:396 kpgp.cpp:422
+#: kpgp.cpp:589 kpgp.cpp:608
 msgid "PGP Warning"
 msgstr "PGP 경고"
 
-#: kpgp.cpp:282 kpgp.cpp:342
+#: kpgp.cpp:289 kpgp.cpp:349
 msgid "&Retry"
 msgstr "재시도(&R)"
 
-#: kpgp.cpp:336
+#: kpgp.cpp:343
 msgid ""
 "You entered an invalid passphrase.\n"
 "Do you want to try again, continue and leave the message unsigned, or cancel "
@@ -81,11 +81,11 @@ msgstr ""
 "다시 시도하여 계속하여 메시지를 서명하지 않은 채로 두겠습니까, 아니면 메시지 "
 "전송을 취소하시겠습니까?"
 
-#: kpgp.cpp:343 kpgp.cpp:371
+#: kpgp.cpp:350 kpgp.cpp:378
 msgid "Send &Unsigned"
 msgstr "서명하지 않은 채 보내기(&U)"
 
-#: kpgp.cpp:365
+#: kpgp.cpp:372
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -95,7 +95,7 @@ msgstr ""
 "메시지를 서명하지 않은 채로 보내시겠습니까, 아니면 메시지 전송을 취소하시겠습"
 "니까?"
 
-#: kpgp.cpp:383
+#: kpgp.cpp:390
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
@@ -106,15 +106,15 @@ msgstr ""
 "그냥 암호화 하여 메시지를 원래대로 두겠습니까, 아니면 메시지 전송을 취소하시"
 "겠습니까?"
 
-#: kpgp.cpp:390 kpgp.cpp:602
+#: kpgp.cpp:397 kpgp.cpp:609
 msgid "Send &Encrypted"
 msgstr "암호화하여 전송(&E)"
 
-#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
+#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
 msgid "Send &Unencrypted"
 msgstr "암호화하지 않고 전송(&U)"
 
-#: kpgp.cpp:410
+#: kpgp.cpp:417
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -123,11 +123,11 @@ msgstr ""
 "%1\n"
 "메시지를 원래대로 두겠습니까, 아니면 메시지 전송을 취소하시겠습니까?"
 
-#: kpgp.cpp:416
+#: kpgp.cpp:423
 msgid "&Send As-Is"
 msgstr "원래대로 보내기(&S)"
 
-#: kpgp.cpp:427
+#: kpgp.cpp:434
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -136,7 +136,7 @@ msgstr ""
 "다음의 오류가 발생했습니다.:\n"
 "%1"
 
-#: kpgp.cpp:429
+#: kpgp.cpp:436
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -144,7 +144,7 @@ msgstr ""
 "%1 의 오류 메시지 입니다.:\n"
 "%2"
 
-#: kpgp.cpp:574
+#: kpgp.cpp:581
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
@@ -152,7 +152,7 @@ msgstr ""
 "이 메시지의 수신인을 위한 암호키를 선택하지 않으셨습니다. 그러므로, 메시지는 "
 "암호화되지 않습니다."
 
-#: kpgp.cpp:577
+#: kpgp.cpp:584
 msgid ""
 "You did not select an encryption key for any of the recipients of this "
 "message; therefore, the message will not be encrypted."
@@ -160,7 +160,7 @@ msgstr ""
 "이 메시지의 모든 수신인에 대하여 암호키를 선택하지 않으셨습니다. 그러므로, 메"
 "시지는 암호화되지 않습니다."
 
-#: kpgp.cpp:593
+#: kpgp.cpp:600
 msgid ""
 "You did not select an encryption key for one of the recipients; this person "
 "will not be able to decrypt the message if you encrypt it."
@@ -168,7 +168,7 @@ msgstr ""
 "이 메시지의 수신인 중 한 명의 암호키를 선택하지 않으셨습니다. 이 사람은 당신"
 "이 메시지를 암호화하여 보낸다면 그것을 해제할 수 없습니다."
 
-#: kpgp.cpp:596
+#: kpgp.cpp:603
 msgid ""
 "You did not select encryption keys for some of the recipients; these persons "
 "will not be able to decrypt the message if you encrypt it."
@@ -176,7 +176,7 @@ msgstr ""
 "이 메시지의 수신인 중 몇 명의 암호키를 선택하지 않으셨습니다. 이들은 당신이 "
 "메시지를 암호화하여 보낸다면 그것을 해제할 수 없습니다."
 
-#: kpgp.cpp:857
+#: kpgp.cpp:877
 msgid ""
 "This feature is\n"
 "still missing"
@@ -184,17 +184,17 @@ msgstr ""
 "이 부분이 \n"
 "여전히 비어있습니다."
 
-#: kpgp.cpp:905 kpgp.cpp:940 kpgp.cpp:976
+#: kpgp.cpp:925 kpgp.cpp:960 kpgp.cpp:996
 msgid ""
 "You either do not have GnuPG/PGP installed or you chose not to use GnuPG/PGP."
 msgstr ""
 "GnuPG/PGP를 설치하지 않았거나, GnuPG/PGP를 사용하지 않도록 선택했습니다."
 
-#: kpgp.cpp:1191 kpgp.cpp:1255 kpgp.cpp:1281 kpgpui.cpp:1527 kpgpui.cpp:1539
+#: kpgp.cpp:1211 kpgp.cpp:1275 kpgp.cpp:1301 kpgpui.cpp:1527 kpgpui.cpp:1539
 msgid "Encryption Key Selection"
 msgstr "암호 키 선택"
 
-#: kpgp.cpp:1195
+#: kpgp.cpp:1215
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -206,7 +206,7 @@ msgstr ""
 "\n"
 "이 수신인들을 위한 암호 키들을 다시 선택해 주십시오."
 
-#: kpgp.cpp:1259
+#: kpgp.cpp:1279
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"
@@ -218,7 +218,7 @@ msgstr ""
 "\n"
 "이 수신인들을 위해 사용될 키들을 선택해 주십시오."
 
-#: kpgp.cpp:1285
+#: kpgp.cpp:1305
 msgid ""
 "_: if in your language something like 'key(s)' isn't possible please use the "
 "plural in the translation\n"