Merge translation files from master branch.

1 files changed, 69 insertions, 75 deletions

diff --git a/tde-i18n-af/messages/tdepim/kalarm.po b/tde-i18n-af/messages/tdepim/kalarm.po
index f032cf9d663..25fdc48c398 100644
--- a/tde-i18n-af/messages/tdepim/kalarm.po
+++ b/tde-i18n-af/messages/tdepim/kalarm.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kalarm 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: 2002-11-07 11:37+0200\n"
 "Last-Translator: WEB-Translator <http://kde.af.org.za>\n"
 "Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -874,51 +874,45 @@ 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
 #, fuzzy
 msgid "Recurrence has already expired"
 msgstr "Alarm tyd het alreeds verstrek"
 
-#: editdlg.cpp:1433
+#: editdlg.cpp:1426
 msgid ""
 "Reminder period must be less than the recurrence interval, unless '%1' is "
 "checked."
 msgstr ""
 
-#: editdlg.cpp:1447
+#: editdlg.cpp:1441
 #, fuzzy
 msgid ""
 "The duration of a repetition within the recurrence must be less than the "
 "recurrence interval minus any reminder period"
 msgstr "Die alarm's herhaling tipe of herhaling interval."
 
-#: 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 ""
 "Doen jy rerig wil hê na stuur die e-pos nou na die gespesifiseer "
 "ontvanger(s)?"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "Confirm Email"
 msgstr "Bevestig E-pos"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "&Send"
 msgstr "Stuur"
 
-#: editdlg.cpp:1488
+#: editdlg.cpp:1482
 #, c-format
 msgid ""
 "Command executed:\n"
@@ -927,14 +921,14 @@ msgstr ""
 "Opdrag uitgevoerde:\n"
 "%1"
 
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
 #, c-format
 msgid ""
 "\n"
 "Bcc: %1"
 msgstr ""
 
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
 #, fuzzy
 msgid ""
 "Email sent to:\n"
@@ -943,16 +937,16 @@ msgstr ""
 "E-pos gestuur na:\n"
 "%1"
 
-#: 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"
@@ -961,11 +955,11 @@ msgstr ""
 "Ongeldige e-pos adres:\n"
 "%1"
 
-#: editdlg.cpp:1744
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr "Nee e-pos adres gespesifiseer"
 
-#: editdlg.cpp:1761
+#: editdlg.cpp:1755
 #, fuzzy, c-format
 msgid ""
 "Invalid email attachment:\n"
@@ -974,33 +968,33 @@ msgstr ""
 "Ongeldige e-pos adres:\n"
 "%1"
 
-#: editdlg.cpp:1790
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr "Vertoon die alarm boodskap nou"
 
-#: editdlg.cpp:1807
+#: editdlg.cpp:1801
 #, fuzzy
 msgid "Display the file now"
 msgstr "Vertoon die teks lêer nou"
 
-#: editdlg.cpp:1819
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr "Uitvoer die gespesifiseer opdrag nou"
 
-#: editdlg.cpp:1830
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr "Stuur die e-pos na die gespesifiseer geäddresseerdes nou"
 
-#: editdlg.cpp:1904
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr "Kies Lêer na Aanheg"
 
-#: editdlg.cpp:2011
+#: editdlg.cpp:2005
 #, fuzzy
 msgid "Please select a file to display"
 msgstr "Kies 'n teks lêer na vertoon."
 
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -1008,7 +1002,7 @@ msgstr ""
 "%1\n"
 "nie gevind"
 
-#: editdlg.cpp:2014
+#: editdlg.cpp:2008
 #, fuzzy
 msgid ""
 "%1\n"
@@ -1017,7 +1011,7 @@ msgstr ""
 "%1\n"
 "is 'n gids"
 
-#: editdlg.cpp:2015
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -1025,7 +1019,7 @@ msgstr ""
 "%1\n"
 "is nie leesbaar"
 
-#: editdlg.cpp:2016
+#: editdlg.cpp:2010
 #, fuzzy
 msgid ""
 "%1\n"
@@ -2879,216 +2873,216 @@ msgstr "Einde datum is vroeër as begin datum"
 msgid "End date/time is earlier than start date/time"
 msgstr "Einde datum/tyd is vroeër as begin datum/tyd"
 
-#: recurrenceedit.cpp:734
+#: recurrenceedit.cpp:641
 #, fuzzy
 msgid ""
 "_: Date cannot be earlier than start date\n"
 "start date"
 msgstr "Datum kan nie wees vroeër as %1"
 
-#: recurrenceedit.cpp:1124
+#: recurrenceedit.cpp:1031
 #, fuzzy
 msgid "Recur e&very"
 msgstr "Herhaal elke:"
 
-#: recurrenceedit.cpp:1192
+#: recurrenceedit.cpp:1099
 #, fuzzy
 msgid "hours:minutes"
 msgstr "Ure/Minute"
 
-#: recurrenceedit.cpp:1193
+#: recurrenceedit.cpp:1100
 #, fuzzy
 msgid "Enter the number of hours and minutes between repetitions of the alarm"
 msgstr "Invoer die tyd (in ure en minute) tussen repitisies van die alarm."
 
-#: recurrenceedit.cpp:1211
+#: recurrenceedit.cpp:1118
 msgid ""
 "_: On: Tuesday\n"
 "O&n:"
 msgstr "Op:"
 
-#: recurrenceedit.cpp:1289
+#: recurrenceedit.cpp:1196
 msgid "No day selected"
 msgstr ""
 
-#: recurrenceedit.cpp:1318
+#: recurrenceedit.cpp:1225
 #, fuzzy
 msgid "day(s)"
 msgstr "dag"
 
-#: recurrenceedit.cpp:1319
+#: recurrenceedit.cpp:1226
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr "Invoer die nommer van dae tussen repitisies van die alarm"
 
-#: recurrenceedit.cpp:1320
+#: recurrenceedit.cpp:1227
 #, fuzzy
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr "Kies die dag van die week op wat na herhaal die alarm"
 
-#: recurrenceedit.cpp:1331
+#: recurrenceedit.cpp:1238
 #, fuzzy
 msgid "week(s)"
 msgstr "Weke"
 
-#: recurrenceedit.cpp:1332
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr "Invoer die nommer van weke tussen repitisies van die alarm"
 
-#: recurrenceedit.cpp:1333
+#: recurrenceedit.cpp:1240
 #, fuzzy
 msgid "Select the days of the week on which to repeat the alarm"
 msgstr "Kies die dag van die week op wat na herhaal die alarm"
 
-#: 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 "Herhaal die alarm op die gekose dag van die maand"
 
-#: 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 "Kies die dag van die maand op wat na herhaal die alarm"
 
-#: recurrenceedit.cpp:1381
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr "Op die"
 
-#: recurrenceedit.cpp:1386
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr ""
 "Herhaal die alarm op een dag van die week, in die gekose week van die maand"
 
-#: 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 "3de"
 
-#: recurrenceedit.cpp:1392
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "4de"
 
-#: recurrenceedit.cpp:1393
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "5de"
 
-#: recurrenceedit.cpp:1394
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr ""
 
-#: recurrenceedit.cpp:1395
+#: recurrenceedit.cpp:1302
 #, fuzzy
 msgid "2nd Last"
 msgstr "Laaste"
 
-#: recurrenceedit.cpp:1396
+#: recurrenceedit.cpp:1303
 #, fuzzy
 msgid "3rd Last"
 msgstr "Laaste"
 
-#: recurrenceedit.cpp:1397
+#: recurrenceedit.cpp:1304
 #, fuzzy
 msgid "4th Last"
 msgstr "Laaste"
 
-#: recurrenceedit.cpp:1398
+#: recurrenceedit.cpp:1305
 #, fuzzy
 msgid "5th Last"
 msgstr "Laaste"
 
-#: 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 "Kies die week van die maand in wat na herhaal die alarm"
 
-#: recurrenceedit.cpp:1417
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr "Kies die dag van die week op wat na herhaal die alarm"
 
-#: recurrenceedit.cpp:1535
+#: recurrenceedit.cpp:1442
 #, fuzzy
 msgid "month(s)"
 msgstr "Maande"
 
-#: recurrenceedit.cpp:1536
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr "Invoer die nommer van maande tussen repitisies van die alarm"
 
-#: recurrenceedit.cpp:1547
+#: recurrenceedit.cpp:1454
 #, fuzzy
 msgid "year(s)"
 msgstr "Jare"
 
-#: recurrenceedit.cpp:1548
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr "Invoer die nommer van jare tussen repitisies van die alarm"
 
-#: recurrenceedit.cpp:1553
+#: recurrenceedit.cpp:1460
 msgid ""
 "_: List of months to select\n"
 "Months:"
 msgstr ""
 
-#: recurrenceedit.cpp:1572
+#: recurrenceedit.cpp:1479
 #, fuzzy
 msgid "Select the months of the year in which to repeat the alarm"
 msgstr "Kies die maand van die jaar in wat na herhaal die alarm"
 
-#: 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 ""