Merge translation files from master branch.

1 files changed, 77 insertions, 78 deletions

diff --git a/tde-i18n-cy/messages/tdepim/kalarm.po b/tde-i18n-cy/messages/tdepim/kalarm.po
index da9830c5444..c2b56340279 100644
--- a/tde-i18n-cy/messages/tdepim/kalarm.po
+++ b/tde-i18n-cy/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: 2004-02-25 13:46+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -871,52 +871,43 @@ msgstr ""
 msgid "Template name is already in use"
 msgstr ""
 
-#: editdlg.cpp:1387
-#, fuzzy
-msgid ""
-"The date/time in the Alarm tab does not match the recurrence settings "
-"specified in the Recurrence tab."
-msgstr ""
-"Pa mor aml yr ail-ddigwydda'r larwm.\n"
-" Ffurfweddir yr ail-ddigwydd yn y tab Ail-ddigwydd."
-
-#: editdlg.cpp:1405
+#: editdlg.cpp:1398
 msgid "Recurrence has already expired"
 msgstr "Mae'r ail-ddigwyddiad eisioes wedi darfod"
 
-#: editdlg.cpp:1433
+#: editdlg.cpp:1426
 #, fuzzy
 msgid ""
 "Reminder period must be less than the recurrence interval, unless '%1' is "
 "checked."
 msgstr "Rhaid i'r adeg atgof fod yn fyrach na'r cyfnod ail-ddigwydd"
 
-#: 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 "Rhaid i'r adeg atgof fod yn fyrach na'r cyfnod ail-ddigwydd"
 
-#: 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 "A ydych wir am anfon yr ebost nawr at y derbynw(y)r penodedig?"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "Confirm Email"
 msgstr "Cadarnhau Ebost"
 
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
 msgid "&Send"
 msgstr "&Anfon"
 
-#: editdlg.cpp:1488
+#: editdlg.cpp:1482
 #, c-format
 msgid ""
 "Command executed:\n"
@@ -925,7 +916,7 @@ msgstr ""
 "Gweithredwyd y gorchymyn:\n"
 " %1"
 
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
 #, c-format
 msgid ""
 "\n"
@@ -934,7 +925,7 @@ msgstr ""
 "\n"
 "Bcc: %1"
 
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
 msgid ""
 "Email sent to:\n"
 "%1%2"
@@ -942,16 +933,16 @@ msgstr ""
 "Anfonwyd ebost at:\n"
 " %1%2"
 
-#: editdlg.cpp:1557 messagewin.cpp:1543
+#: editdlg.cpp:1551 messagewin.cpp:1543
 msgid "Defer Alarm"
 msgstr "Gohirio'r Larwm"
 
-#: 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"
@@ -960,11 +951,11 @@ msgstr ""
 "Cyfeiriad ebost annilys:\n"
 " %1"
 
-#: editdlg.cpp:1744
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr "Ni benodwyd cyfeiriad ebost"
 
-#: editdlg.cpp:1761
+#: editdlg.cpp:1755
 #, c-format
 msgid ""
 "Invalid email attachment:\n"
@@ -973,32 +964,32 @@ msgstr ""
 "Atodiad ebost annilys:\n"
 " %1"
 
-#: editdlg.cpp:1790
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr "Dangos y neges larwm nawr"
 
-#: editdlg.cpp:1807
+#: editdlg.cpp:1801
 msgid "Display the file now"
 msgstr "Dangos y ffeil destun nawr"
 
-#: editdlg.cpp:1819
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr "Gweithredu'r gorchymyn penodedig nawr"
 
-#: editdlg.cpp:1830
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr "Anfon yr ebost at y cyfeiriadau penodedig nawr"
 
-#: editdlg.cpp:1904
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr "Dewiswch Ffeil i'w Atodi"
 
-#: editdlg.cpp:2011
+#: editdlg.cpp:2005
 #, fuzzy
 msgid "Please select a file to display"
 msgstr "Dewiswch ffeil destun i'w dangos."
 
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -1006,7 +997,7 @@ msgstr ""
 "%1\n"
 " heb ei chanfod"
 
-#: editdlg.cpp:2014
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
@@ -1014,7 +1005,7 @@ msgstr ""
 "Mae %1\n"
 " yn gyfeiriadur"
 
-#: editdlg.cpp:2015
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -1022,7 +1013,7 @@ msgstr ""
 "Nid yw %1\n"
 " yn ddarllenadwy"
 
-#: editdlg.cpp:2016
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -2888,202 +2879,202 @@ msgstr "Mae'r dyddiad gorffen cyn y dyddiad dechrau"
 msgid "End date/time is earlier than start date/time"
 msgstr "Mae'r dyddiad/amser gorffen cyn y dyddiad/amser dechrau"
 
-#: recurrenceedit.cpp:734
+#: recurrenceedit.cpp:641
 msgid ""
 "_: Date cannot be earlier than start date\n"
 "start date"
 msgstr "dyddiad dechrau"
 
-#: recurrenceedit.cpp:1124
+#: recurrenceedit.cpp:1031
 msgid "Recur e&very"
 msgstr "Ail-ddigwydd &pob"
 
-#: recurrenceedit.cpp:1192
+#: recurrenceedit.cpp:1099
 msgid "hours:minutes"
 msgstr "awr:munud"
 
-#: recurrenceedit.cpp:1193
+#: recurrenceedit.cpp:1100
 msgid "Enter the number of hours and minutes between repetitions of the alarm"
 msgstr "Rhowch y nifer o oriau a munudau rhwng ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1211
+#: recurrenceedit.cpp:1118
 msgid ""
 "_: On: Tuesday\n"
 "O&n:"
 msgstr "A&r:"
 
-#: recurrenceedit.cpp:1289
+#: recurrenceedit.cpp:1196
 msgid "No day selected"
 msgstr "Dim diwrnod wedi'i ddewis"
 
-#: recurrenceedit.cpp:1318
+#: recurrenceedit.cpp:1225
 msgid "day(s)"
 msgstr "diwrnod"
 
-#: recurrenceedit.cpp:1319
+#: recurrenceedit.cpp:1226
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr "Rhowch y nifer o ddiwrnodau rhwng ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1320
+#: recurrenceedit.cpp:1227
 #, fuzzy
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr "Dewiswch ddiwrnod yr wythnos i ailadrodd y larwm arni"
 
-#: recurrenceedit.cpp:1331
+#: recurrenceedit.cpp:1238
 msgid "week(s)"
 msgstr "wythnos"
 
-#: recurrenceedit.cpp:1332
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr "Rhowch y nifer o wythnosau rhwng ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1333
+#: recurrenceedit.cpp:1240
 msgid "Select the days of the week on which to repeat the alarm"
 msgstr "Dewiswch ddiwrnod yr wythnos i ailadrodd y larwm arni"
 
-#: 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 "Ailadrodd y larwm ar y diwrnod dewisiedig o'r mis"
 
-#: recurrenceedit.cpp:1366
+#: recurrenceedit.cpp:1273
 msgid ""
 "_: Last day of month\n"
 "Last"
 msgstr "Olaf"
 
-#: recurrenceedit.cpp:1369
+#: recurrenceedit.cpp:1276
 msgid "Select the day of the month on which to repeat the alarm"
 msgstr "Dewiswch ba ddiwrnod o'r mis i ailadrodd y larwm arno"
 
-#: recurrenceedit.cpp:1381
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr "Ar &y"
 
-#: recurrenceedit.cpp:1386
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr ""
 "Ailadrodd y larwm ar un diwrnod o'r wythnos, yn wythnos ddewisiedig y mis"
 
-#: recurrenceedit.cpp:1389
+#: recurrenceedit.cpp:1296
 msgid "1st"
 msgstr "1af"
 
-#: recurrenceedit.cpp:1390
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "2il"
 
-#: recurrenceedit.cpp:1391
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "3ydd"
 
-#: recurrenceedit.cpp:1392
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "4ydd"
 
-#: recurrenceedit.cpp:1393
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "5ed"
 
-#: recurrenceedit.cpp:1394
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr "Olaf"
 
-#: recurrenceedit.cpp:1395
+#: recurrenceedit.cpp:1302
 msgid "2nd Last"
 msgstr "Ail Olaf"
 
-#: recurrenceedit.cpp:1396
+#: recurrenceedit.cpp:1303
 msgid "3rd Last"
 msgstr "Trydydd Olaf"
 
-#: recurrenceedit.cpp:1397
+#: recurrenceedit.cpp:1304
 msgid "4th Last"
 msgstr "Pedwerydd Olaf"
 
-#: recurrenceedit.cpp:1398
+#: recurrenceedit.cpp:1305
 msgid "5th Last"
 msgstr "Pumed Olaf"
 
-#: 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 "Dewiswch wythnos o'r mis i ailadrodd y larwm ynddi"
 
-#: recurrenceedit.cpp:1417
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr "Dewiswch ddiwrnod yr wythnos i ailadrodd y larwm arni"
 
-#: recurrenceedit.cpp:1535
+#: recurrenceedit.cpp:1442
 msgid "month(s)"
 msgstr "mis"
 
-#: recurrenceedit.cpp:1536
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr "Rhowch y nifer o fisoedd rhwng ailadroddion y larwm"
 
-#: recurrenceedit.cpp:1547
+#: recurrenceedit.cpp:1454
 msgid "year(s)"
 msgstr "blwyddyn"
 
-#: recurrenceedit.cpp:1548
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr "Rhowch y nifer o flynyddoedd rhwn ailadroddion y larwm"
 
-#: 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 "Dewiswch fis o'r flwyddyn i ailadrodd y larwm ynddi"
 
-#: 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 "Dim"
 
-#: 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 "Dim mis wedi'i ddewis"
 
@@ -3572,6 +3563,14 @@ msgid "&Actions"
 msgstr "&Gweithredoedd"
 
 #, fuzzy
+#~ msgid ""
+#~ "The date/time in the Alarm tab does not match the recurrence settings "
+#~ "specified in the Recurrence tab."
+#~ msgstr ""
+#~ "Pa mor aml yr ail-ddigwydda'r larwm.\n"
+#~ " Ffurfweddir yr ail-ddigwydd yn y tab Ail-ddigwydd."
+
+#, fuzzy
 #~ msgid "&Delete"
 #~ msgstr "&Datddileu"