Merge translation files from master branch.

3 files changed, 18 insertions, 18 deletions

diff --git a/tde-i18n-cy/messages/tdebase/ksmserver.po b/tde-i18n-cy/messages/tdebase/ksmserver.po
index 78a7cef2163..f068f6ba113 100644
--- a/tde-i18n-cy/messages/tdebase/ksmserver.po
+++ b/tde-i18n-cy/messages/tdebase/ksmserver.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2003-12-27 12:17+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -57,11 +57,11 @@ msgstr ""
 msgid "Also allow remote connections"
 msgstr "Caniatáu cysylltiadau pell hefyd."
 
-#: main.cpp:183
+#: main.cpp:179
 msgid "The TDE Session Manager"
 msgstr "Trefnydd Sesiynau TDE"
 
-#: main.cpp:187
+#: main.cpp:183
 msgid "Maintainer"
 msgstr "Cynhaliwr"
 
diff --git a/tde-i18n-cy/messages/tdebase/ksysguard.po b/tde-i18n-cy/messages/tdebase/ksysguard.po
index 74edc7690e4..3b92777287d 100644
--- a/tde-i18n-cy/messages/tdebase/ksysguard.po
+++ b/tde-i18n-cy/messages/tdebase/ksysguard.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksysguard\n"
-"POT-Creation-Date: 2019-11-28 03:15+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2003-07-16 16:12+0100\n"
 "Last-Translator: KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -1564,7 +1564,11 @@ msgstr "Gosodiadau Cyfrifydd Amser"
 msgid "Use update interval of worksheet"
 msgstr "Defnyddio egwyl diweddaru  o weithlen"
 
-#: ksysguard.cc:64 ksysguard.cc:74
+#: ksysguard.cc:64
+msgid "TDE system guard"
+msgstr "Gwarchodwr Cysawd TDE"
+
+#: ksysguard.cc:74 ksysguard.cc:556
 #, fuzzy
 msgid "KSysGuard"
 msgstr "Gwarchodwr Cysawd TDE"
@@ -1667,10 +1671,6 @@ msgstr "Dangos rhestr brosesau'r gwesteiwr lleol yn unig"
 msgid "Optional worksheet files to load"
 msgstr "Ffeiliau gweithlenni dewisol i'w llwytho"
 
-#: ksysguard.cc:556
-msgid "TDE System Guard"
-msgstr "Gwarchodwr Cysawd TDE"
-
 #: ksysguard.cc:558
 msgid "(c) 1996-2002 The KSysGuard Developers"
 msgstr "(h)(c) 1996-2002 Datblygwyr KSysGuard"
@@ -1762,7 +1762,7 @@ msgstr "CPU"
 msgid "Mem"
 msgstr "Cof"
 
-#~ msgid "TDE system guard"
+#~ msgid "TDE System Guard"
 #~ msgstr "Gwarchodwr Cysawd TDE"
 
 #~ msgid "#"
diff --git a/tde-i18n-cy/messages/tdelibs/tdelibs.po b/tde-i18n-cy/messages/tdelibs/tdelibs.po
index bf519e49438..ab344ee7085 100644
--- a/tde-i18n-cy/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-cy/messages/tdelibs/tdelibs.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-08-01 05:09+0200\n"
+"POT-Creation-Date: 2019-12-05 01:24+0100\n"
 "PO-Revision-Date: 2005-01-28 17:54+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
@@ -6592,25 +6592,25 @@ msgstr "gwall gramadegu angheuol: %1 yn llinell %2, colofn %3"
 msgid "XML parsing error"
 msgstr "Gwall gramadegu XML"
 
-#: tdeinit/tdeinit.cpp:475
+#: tdeinit/tdeinit.cpp:476
 msgid ""
 "Unable to start new process.\n"
 "The system may have reached the maximum number of open files possible or the "
 "maximum number of open files that you are allowed to use has been reached."
 msgstr ""
 
-#: tdeinit/tdeinit.cpp:497
+#: tdeinit/tdeinit.cpp:498
 msgid ""
 "Unable to create new process.\n"
 "The system may have reached the maximum number of processes possible or the "
 "maximum number of processes that you are allowed to use has been reached."
 msgstr ""
 
-#: tdeinit/tdeinit.cpp:589
+#: tdeinit/tdeinit.cpp:590
 msgid "Could not find '%1' executable."
 msgstr "Methu canfod gweithredadwyn '%1'"
 
-#: tdeinit/tdeinit.cpp:605
+#: tdeinit/tdeinit.cpp:606
 msgid ""
 "Could not open library '%1'.\n"
 "%2"
@@ -6621,12 +6621,12 @@ msgstr ""
 #: ../dependencies/tqt3/src/network/qftp.cpp:1252
 #: ../dependencies/tqt3/src/network/qftp.cpp:1980
 #: ../dependencies/tqt3/src/network/qhttp.cpp:1226
-#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:606
-#: tdeinit/tdeinit.cpp:649
+#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:607
+#: tdeinit/tdeinit.cpp:650
 msgid "Unknown error"
 msgstr "Gwall anhysbys"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdeinit/tdeinit.cpp:649
 msgid ""
 "Could not find 'kdemain' in '%1'.\n"
 "%2"