Merge translation files from master branch.

2 files changed, 94 insertions, 100 deletions

diff --git a/tde-i18n-zh_TW/messages/tdepim/kalarm.po b/tde-i18n-zh_TW/messages/tdepim/kalarm.po
index adcf1fe9a71..a3c83c2051a 100644
--- a/tde-i18n-zh_TW/messages/tdepim/kalarm.po
+++ b/tde-i18n-zh_TW/messages/tdepim/kalarm.po
@@ -10,7 +10,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-02-19 08:26+0800\n"
 "Last-Translator: Franklin Weng <franklin at goodhorse dot idv dot tw>\n"
 "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
@@ -830,47 +830,41 @@ 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
 msgid ""
 "The duration of a repetition within the recurrence must be less than the "
 "recurrence interval minus any reminder period"
 msgstr "簡單重覆的間隔必須比循環間隔減去提醒時間間隔還要小。"
 
-#: editdlg.cpp:1454
+#: editdlg.cpp:1448
 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"
@@ -879,7 +873,7 @@ msgstr ""
 "指令執行：\n"
 "%1"
 
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
 #, c-format
 msgid ""
 "\n"
@@ -888,7 +882,7 @@ msgstr ""
 "\n"
 "Bcc: %1"
 
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
 msgid ""
 "Email sent to:\n"
 "%1%2"
@@ -896,16 +890,16 @@ 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 "紀錄檔必須是本地端的檔案，並且具有寫入權限。"
 
-#: editdlg.cpp:1737
+#: editdlg.cpp:1731
 #, c-format
 msgid ""
 "Invalid email address:\n"
@@ -914,11 +908,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"
@@ -927,37 +921,37 @@ msgstr ""
 "不正確的email附加檔\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
 msgid "Please select a file to display"
 msgstr "請選擇要顯示的檔案。"
 
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
 msgstr "找不到 %1"
 
-#: editdlg.cpp:2014
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
@@ -965,7 +959,7 @@ msgstr ""
 "%1\n"
 "是個目錄"
 
-#: editdlg.cpp:2015
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -973,7 +967,7 @@ msgstr ""
 "%1\n"
 "無法讀取"
 
-#: editdlg.cpp:2016
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -2744,200 +2738,200 @@ 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
 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 "於(&N)："
 
-#: 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 "第一"
 
-#: recurrenceedit.cpp:1390
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "第二"
 
-#: recurrenceedit.cpp:1391
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "第三"
 
-#: recurrenceedit.cpp:1392
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "第四"
 
-#: recurrenceedit.cpp:1393
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "第五"
 
-#: 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-zh_TW/messages/tdepim/libkpgp.po b/tde-i18n-zh_TW/messages/tdepim/libkpgp.po
index 3140cd4fbdc..c68a5b27800 100644
--- a/tde-i18n-zh_TW/messages/tdepim/libkpgp.po
+++ b/tde-i18n-zh_TW/messages/tdepim/libkpgp.po
@@ -4,7 +4,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: 2006-06-15 08:15+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -47,7 +47,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?"
@@ -55,16 +55,16 @@ msgstr ""
 "您輸入了不正確的密碼片語。\n"
 "您要再試一次，還是取消解密的動作？"
 
-#: 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 "
@@ -73,11 +73,11 @@ msgstr ""
 "您輸入了不正確的密碼片語。\n"
 "您要再試一次，或是不簽署信件而繼續，還是取消不發送此信件了？"
 
-#: kpgp.cpp:343 kpgp.cpp:371
+#: kpgp.cpp:350 kpgp.cpp:378
 msgid "Send &Unsigned"
 msgstr "不簽署發送"
 
-#: kpgp.cpp:365
+#: kpgp.cpp:372
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -86,7 +86,7 @@ msgstr ""
 "%1\n"
 "您要不簽署而發送此信件，還是取消不發送此信件了？"
 
-#: kpgp.cpp:383
+#: kpgp.cpp:390
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
@@ -96,15 +96,15 @@ msgstr ""
 "%1\n"
 "您要繼續做加密的動作，還是不加密，還是取消不發送此信件了？"
 
-#: 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"
@@ -113,11 +113,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"
@@ -126,7 +126,7 @@ msgstr ""
 "發生以下的錯誤：\n"
 "%1"
 
-#: kpgp.cpp:429
+#: kpgp.cpp:436
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -134,19 +134,19 @@ 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."
 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."
 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."
@@ -154,7 +154,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."
@@ -162,22 +162,22 @@ msgstr ""
 "您沒有對此信件的其中幾位收件者選擇加密金鑰，因此如果您加密此信件的話，這幾位"
 "收件者可能無法解密。"
 
-#: kpgp.cpp:857
+#: kpgp.cpp:877
 msgid ""
 "This feature is\n"
 "still missing"
 msgstr "這功能尚未實作。"
 
-#: 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"
@@ -189,7 +189,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"
@@ -201,7 +201,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"