Merge translation files from master branch.

1 files changed, 69 insertions, 75 deletions

diff --git a/tde-i18n-zh_CN/messages/tdepim/kalarm.po b/tde-i18n-zh_CN/messages/tdepim/kalarm.po
index 9847ba82e0c..fe72f5ae181 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kalarm.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kalarm.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \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 13:58+0800\n"
 "Last-Translator: Lie_Ex <lilith.ex@g.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
@@ -828,47 +828,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"
@@ -877,7 +871,7 @@ msgstr ""
 "命令已执行：\n"
 "%1"
 
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
 #, c-format
 msgid ""
 "\n"
@@ -886,7 +880,7 @@ msgstr ""
 "\n"
 "密送：%1"
 
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
 msgid ""
 "Email sent to:\n"
 "%1%2"
@@ -894,16 +888,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"
@@ -912,11 +906,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"
@@ -925,31 +919,31 @@ 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
 msgid "Please select a file to display"
 msgstr "请选择要显示的文件"
 
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -957,7 +951,7 @@ msgstr ""
 "%1\n"
 "没有找到"
 
-#: 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"
@@ -2740,200 +2734,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 "第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 "非闰年中二月二十九日的提醒(&9)："
 
-#: 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 "没有选中的月"