Merge translation files from master branch.

2 files changed, 94 insertions, 100 deletions

diff --git a/tde-i18n-en_GB/messages/tdepim/kalarm.po b/tde-i18n-en_GB/messages/tdepim/kalarm.po
index 34ab317c6b1..40717596ac9 100644
--- a/tde-i18n-en_GB/messages/tdepim/kalarm.po
+++ b/tde-i18n-en_GB/messages/tdepim/kalarm.po
@@ -6,7 +6,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: 2007-09-21 02:28+0100\n"
 "Last-Translator: David Jarvie <software@astrojar.org.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -867,17 +867,11 @@ msgstr "You must enter a name for the alarm template"
 msgid "Template name is already in use"
 msgstr "Template name is already in use"
 
-#: 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 "Recurrence has already expired"
 
-#: editdlg.cpp:1433
+#: editdlg.cpp:1426
 msgid ""
 "Reminder period must be less than the recurrence interval, unless '%1' is "
 "checked."
@@ -885,7 +879,7 @@ msgstr ""
 "Reminder period must be less than the recurrence interval, unless '%1' is "
 "ticked."
 
-#: editdlg.cpp:1447
+#: editdlg.cpp:1441
 #, fuzzy
 msgid ""
 "The duration of a repetition within the recurrence must be less than the "
@@ -894,7 +888,7 @@ msgstr ""
 "Simple alarm repetition duration must be less than the recurrence interval "
 "minus any reminder period"
 
-#: editdlg.cpp:1454
+#: editdlg.cpp:1448
 #, fuzzy
 msgid ""
 "For a repetition within the recurrence, its period must be in units of days "
@@ -903,20 +897,20 @@ msgstr ""
 "Simple alarm repetition period must be in units of days or weeks for a date-"
 "only alarm"
 
-#: editdlg.cpp:1476
+#: editdlg.cpp:1470
 msgid "Do you really want to send the email now to the specified recipient(s)?"
 msgstr ""
 "Do you really want to send the email now to the specified recipient(s)?"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "Confirm Email"
 msgstr "Confirm Email"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "&Send"
 msgstr "&Send"
 
-#: editdlg.cpp:1488
+#: editdlg.cpp:1482
 #, c-format
 msgid ""
 "Command executed:\n"
@@ -925,7 +919,7 @@ msgstr ""
 "Command executed:\n"
 "%1"
 
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
 #, c-format
 msgid ""
 "\n"
@@ -934,7 +928,7 @@ msgstr ""
 "\n"
 "Bcc: %1"
 
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
 msgid ""
 "Email sent to:\n"
 "%1%2"
@@ -942,17 +936,17 @@ msgstr ""
 "Email sent to:\n"
 "%1%2"
 
-#: editdlg.cpp:1557 messagewin.cpp:1543
+#: editdlg.cpp:1551 messagewin.cpp:1543
 msgid "Defer Alarm"
 msgstr "Defer Alarm"
 
-#: 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"
@@ -961,11 +955,11 @@ msgstr ""
 "Invalid email address:\n"
 "%1"
 
-#: editdlg.cpp:1744
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr "No email address specified"
 
-#: editdlg.cpp:1761
+#: editdlg.cpp:1755
 #, c-format
 msgid ""
 "Invalid email attachment:\n"
@@ -974,31 +968,31 @@ msgstr ""
 "Invalid email attachment:\n"
 "%1"
 
-#: editdlg.cpp:1790
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr "Display the alarm message now"
 
-#: editdlg.cpp:1807
+#: editdlg.cpp:1801
 msgid "Display the file now"
 msgstr "Display the file now"
 
-#: editdlg.cpp:1819
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr "Execute the specified command now"
 
-#: editdlg.cpp:1830
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr "Send the email to the specified addressees now"
 
-#: editdlg.cpp:1904
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr "Choose File to Attach"
 
-#: editdlg.cpp:2011
+#: editdlg.cpp:2005
 msgid "Please select a file to display"
 msgstr "Please select a file to display"
 
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -1006,7 +1000,7 @@ msgstr ""
 "%1\n"
 "not found"
 
-#: editdlg.cpp:2014
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
@@ -1014,7 +1008,7 @@ msgstr ""
 "%1\n"
 "is a folder"
 
-#: editdlg.cpp:2015
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -1022,7 +1016,7 @@ msgstr ""
 "%1\n"
 "is not readable"
 
-#: editdlg.cpp:2016
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -2875,195 +2869,195 @@ msgstr "End date is earlier than start date"
 msgid "End date/time is earlier than start date/time"
 msgstr "End date/time is earlier than start date/time"
 
-#: recurrenceedit.cpp:734
+#: recurrenceedit.cpp:641
 msgid ""
 "_: Date cannot be earlier than start date\n"
 "start date"
 msgstr "start date"
 
-#: recurrenceedit.cpp:1124
+#: recurrenceedit.cpp:1031
 msgid "Recur e&very"
 msgstr "Recur e&very"
 
-#: recurrenceedit.cpp:1192
+#: recurrenceedit.cpp:1099
 msgid "hours:minutes"
 msgstr "hours:minutes"
 
-#: recurrenceedit.cpp:1193
+#: recurrenceedit.cpp:1100
 msgid "Enter the number of hours and minutes between repetitions of the alarm"
 msgstr "Enter the number of hours and minutes between repetitions of the alarm"
 
-#: recurrenceedit.cpp:1211
+#: recurrenceedit.cpp:1118
 msgid ""
 "_: On: Tuesday\n"
 "O&n:"
 msgstr "O&n:"
 
-#: recurrenceedit.cpp:1289
+#: recurrenceedit.cpp:1196
 msgid "No day selected"
 msgstr "No day selected"
 
-#: recurrenceedit.cpp:1318
+#: recurrenceedit.cpp:1225
 msgid "day(s)"
 msgstr "day(s)"
 
-#: recurrenceedit.cpp:1319
+#: recurrenceedit.cpp:1226
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr "Enter the number of days between repetitions of the alarm"
 
-#: recurrenceedit.cpp:1320
+#: recurrenceedit.cpp:1227
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr "Select the days of the week on which the alarm is allowed to occur"
 
-#: recurrenceedit.cpp:1331
+#: recurrenceedit.cpp:1238
 msgid "week(s)"
 msgstr "week(s)"
 
-#: recurrenceedit.cpp:1332
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr "Enter the number of weeks between repetitions of the alarm"
 
-#: recurrenceedit.cpp:1333
+#: recurrenceedit.cpp:1240
 msgid "Select the days of the week on which to repeat the alarm"
 msgstr "Select the days of the week on which to repeat the alarm"
 
-#: recurrenceedit.cpp:1356
+#: recurrenceedit.cpp:1263
 msgid ""
 "_: On day number in the month\n"
 "O&n day"
 msgstr "O&n day"
 
-#: recurrenceedit.cpp:1360
+#: recurrenceedit.cpp:1267
 msgid "Repeat the alarm on the selected day of the month"
 msgstr "Repeat the alarm on the selected day of the month"
 
-#: recurrenceedit.cpp:1366
+#: recurrenceedit.cpp:1273
 msgid ""
 "_: Last day of month\n"
 "Last"
 msgstr "Last"
 
-#: recurrenceedit.cpp:1369
+#: recurrenceedit.cpp:1276
 msgid "Select the day of the month on which to repeat the alarm"
 msgstr "Select the day of the month on which to repeat the alarm"
 
-#: recurrenceedit.cpp:1381
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr "On t&he"
 
-#: recurrenceedit.cpp:1386
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 
-#: recurrenceedit.cpp:1389
+#: recurrenceedit.cpp:1296
 msgid "1st"
 msgstr "1st"
 
-#: recurrenceedit.cpp:1390
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "2nd"
 
-#: recurrenceedit.cpp:1391
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "3rd"
 
-#: recurrenceedit.cpp:1392
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "4th"
 
-#: recurrenceedit.cpp:1393
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "5th"
 
-#: recurrenceedit.cpp:1394
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr "Last"
 
-#: recurrenceedit.cpp:1395
+#: recurrenceedit.cpp:1302
 msgid "2nd Last"
 msgstr "2nd Last"
 
-#: recurrenceedit.cpp:1396
+#: recurrenceedit.cpp:1303
 msgid "3rd Last"
 msgstr "3rd Last"
 
-#: recurrenceedit.cpp:1397
+#: recurrenceedit.cpp:1304
 msgid "4th Last"
 msgstr "4th Last"
 
-#: recurrenceedit.cpp:1398
+#: recurrenceedit.cpp:1305
 msgid "5th Last"
 msgstr "5th Last"
 
-#: recurrenceedit.cpp:1401
+#: recurrenceedit.cpp:1308
 msgid ""
 "_: Every (Monday...) in month\n"
 "Every"
 msgstr "Every"
 
-#: recurrenceedit.cpp:1404
+#: recurrenceedit.cpp:1311
 msgid "Select the week of the month in which to repeat the alarm"
 msgstr "Select the week of the month in which to repeat the alarm"
 
-#: recurrenceedit.cpp:1417
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr "Select the day of the week on which to repeat the alarm"
 
-#: recurrenceedit.cpp:1535
+#: recurrenceedit.cpp:1442
 msgid "month(s)"
 msgstr "month(s)"
 
-#: recurrenceedit.cpp:1536
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr "Enter the number of months between repetitions of the alarm"
 
-#: recurrenceedit.cpp:1547
+#: recurrenceedit.cpp:1454
 msgid "year(s)"
 msgstr "year(s)"
 
-#: recurrenceedit.cpp:1548
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr "Enter the number of years between repetitions of the alarm"
 
-#: 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 "Select the months of the year in which to repeat the alarm"
 
-#: recurrenceedit.cpp:1579
+#: recurrenceedit.cpp:1486
 msgid "February 2&9th alarm in non-leap years:"
 msgstr "February 2&9th alarm in non-leap years:"
 
-#: recurrenceedit.cpp:1582
+#: recurrenceedit.cpp:1489
 msgid ""
 "_: No date\n"
 "None"
 msgstr "None"
 
-#: recurrenceedit.cpp:1583
+#: recurrenceedit.cpp:1490
 msgid ""
 "_: 1st March (short form)\n"
 "1 Mar"
 msgstr "1 Mar"
 
-#: recurrenceedit.cpp:1584
+#: recurrenceedit.cpp:1491
 msgid ""
 "_: 28th February (short form)\n"
 "28 Feb"
 msgstr "28 Feb"
 
-#: recurrenceedit.cpp:1590
+#: recurrenceedit.cpp:1497
 msgid ""
 "Select which date, if any, the February 29th alarm should trigger in non-"
 "leap years"
@@ -3071,7 +3065,7 @@ msgstr ""
 "Select which date, if any, the February 29th alarm should trigger in non-"
 "leap years"
 
-#: recurrenceedit.cpp:1674
+#: recurrenceedit.cpp:1581
 msgid "No month selected"
 msgstr "No month selected"
 
diff --git a/tde-i18n-en_GB/messages/tdepim/libkpgp.po b/tde-i18n-en_GB/messages/tdepim/libkpgp.po
index 8f0e7d1ce87..4c2964eeaf0 100644
--- a/tde-i18n-en_GB/messages/tdepim/libkpgp.po
+++ b/tde-i18n-en_GB/messages/tdepim/libkpgp.po
@@ -5,7 +5,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: 2005-01-31 16:16+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -47,7 +47,7 @@ msgstr "Passphrase is too long, it must contain fewer than 1024 characters."
 msgid "Out of memory."
 msgstr "Out of memory."
 
-#: 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 ""
 "You just entered an invalid passphrase.\n"
 "Do you want to try again, or cancel and view the message undecrypted?"
 
-#: 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 Warning"
 
-#: kpgp.cpp:282 kpgp.cpp:342
+#: kpgp.cpp:289 kpgp.cpp:349
 msgid "&Retry"
 msgstr "&Retry"
 
-#: 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 "
@@ -74,11 +74,11 @@ msgstr ""
 "Do you want to try again, continue and leave the message unsigned, or cancel "
 "sending the message?"
 
-#: kpgp.cpp:343 kpgp.cpp:371
+#: kpgp.cpp:350 kpgp.cpp:378
 msgid "Send &Unsigned"
 msgstr "Send &Unsigned"
 
-#: kpgp.cpp:365
+#: kpgp.cpp:372
 msgid ""
 "_: %1 = 'signing failed' error message\n"
 "%1\n"
@@ -87,7 +87,7 @@ msgstr ""
 "%1\n"
 "Do you want to send the message unsigned, or cancel sending the message?"
 
-#: kpgp.cpp:383
+#: kpgp.cpp:390
 msgid ""
 "_: %1 = 'bad keys' error message\n"
 "%1\n"
@@ -98,15 +98,15 @@ msgstr ""
 "Do you want to encrypt anyway, leave the message as-is, or cancel sending "
 "the message?"
 
-#: kpgp.cpp:390 kpgp.cpp:602
+#: kpgp.cpp:397 kpgp.cpp:609
 msgid "Send &Encrypted"
 msgstr "Send &Encrypted"
 
-#: kpgp.cpp:391 kpgp.cpp:583 kpgp.cpp:603
+#: kpgp.cpp:398 kpgp.cpp:590 kpgp.cpp:610
 msgid "Send &Unencrypted"
 msgstr "Send &Unencrypted"
 
-#: kpgp.cpp:410
+#: kpgp.cpp:417
 msgid ""
 "_: %1 = 'missing keys' error message\n"
 "%1\n"
@@ -115,11 +115,11 @@ msgstr ""
 "%1\n"
 "Do you want to leave the message as-is, or cancel sending the message?"
 
-#: kpgp.cpp:416
+#: kpgp.cpp:423
 msgid "&Send As-Is"
 msgstr "&Send As-Is"
 
-#: kpgp.cpp:427
+#: kpgp.cpp:434
 #, c-format
 msgid ""
 "The following error occurred:\n"
@@ -128,7 +128,7 @@ msgstr ""
 "The following error occurred:\n"
 "%1"
 
-#: kpgp.cpp:429
+#: kpgp.cpp:436
 msgid ""
 "This is the error message of %1:\n"
 "%2"
@@ -136,7 +136,7 @@ msgstr ""
 "This is the error message of %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."
@@ -144,7 +144,7 @@ msgstr ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 
-#: 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."
@@ -152,7 +152,7 @@ msgstr ""
 "You did not select an encryption key for any of the recipients of this "
 "message; therefore, the message will not be encrypted."
 
-#: 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."
@@ -160,7 +160,7 @@ msgstr ""
 "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."
 
-#: 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."
@@ -168,7 +168,7 @@ msgstr ""
 "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."
 
-#: kpgp.cpp:857
+#: kpgp.cpp:877
 msgid ""
 "This feature is\n"
 "still missing"
@@ -176,17 +176,17 @@ msgstr ""
 "This feature is\n"
 "still missing"
 
-#: 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 ""
 "You either do not have GnuPG/PGP installed or you chose not to use 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 "Encryption Key Selection"
 
-#: 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"
@@ -198,7 +198,7 @@ msgstr ""
 "\n"
 "Please re-select the key(s) which should be used for this recipient."
 
-#: 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"
@@ -210,7 +210,7 @@ msgstr ""
 "\n"
 "Select the key(s) which should be used for this recipient."
 
-#: 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"