Merge translation files from master branch.

2 files changed, 63 insertions, 57 deletions

diff --git a/tde-i18n-cy/messages/tdebase/kasbarextension.po b/tde-i18n-cy/messages/tdebase/kasbarextension.po
index ba57e7d34b5..3e48f28619c 100644
--- a/tde-i18n-cy/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-cy/messages/tdebase/kasbarextension.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-18 01:58+0200\n"
 "PO-Revision-Date: 2004-06-30 11:42+0100\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -405,19 +405,17 @@ msgstr "Galluogi dangosydd &addasu"
 
 #: kasprefsdlg.cpp:421
 #, fuzzy
-msgid ""
-"Enables the display of a progress bar in the label of windows show are "
-"progress indicators."
+msgid "Enables the display of a progress indicator in the label of windows."
 msgstr ""
 "Galluoga dangos eicon cyflwr disg llipa ar gyfer ffenestri â dogfen "
 "addasiedig ynddynt."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 #, fuzzy
 msgid "Enable &attention indicator"
 msgstr "Galluogi dangosydd &addasu"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 #, fuzzy
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
@@ -425,17 +423,17 @@ msgstr ""
 "Galluoga dangos eicon cyflwr disg llipa ar gyfer ffenestri â dogfen "
 "addasiedig ynddynt."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr ""
 
-#: kasprefsdlg.cpp:434
+#: kasprefsdlg.cpp:433
 msgid ""
 "Enables frames around inactive items, if you want the bar to disappear into "
 "the background you should probably uncheck this option."
 msgstr ""
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -560,6 +558,14 @@ msgstr ""
 msgid "NET WM Specification Info"
 msgstr "Gwybodaeth Penodiad NET WM"
 
+#, fuzzy
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr ""
+#~ "Galluoga dangos eicon cyflwr disg llipa ar gyfer ffenestri â dogfen "
+#~ "addasiedig ynddynt."
+
 #~ msgid " Pixels"
 #~ msgstr " Picseli"
 
diff --git a/tde-i18n-cy/messages/tdebase/ktip.po b/tde-i18n-cy/messages/tdebase/ktip.po
index 4152879eada..eab735889ad 100644
--- a/tde-i18n-cy/messages/tdebase/ktip.po
+++ b/tde-i18n-cy/messages/tdebase/ktip.po
@@ -1686,54 +1686,6 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
-#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
-#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
-#~ "Acrobat Reader,\n"
-#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
-#~ msgstr ""
-#~ "<p> Eisiau pwer argrraffu TDE mewn rhaglenni di-TDE? </p>\n"
-#~ " <p> Yna defnyddiwch <strong>'kprinter'</strong> fel \"gorchymyn argraffu"
-#~ "\". \n"
-#~ " Yn gweithio efo Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-#~ " StarOffice, OpenOffice, unrhyw raglen GNOME a llawer mwy...</p>\n"
-#~ " <center>\n"
-#~ " <img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
-
-#~ msgid ""
-#~ "<p>\n"
-#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
-#~ " choice.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
-#~ "you back to\n"
-#~ " the first tip.</i>\n"
-#~ "</p>\n"
-#~ msgstr ""
-#~ "<p>\n"
-#~ " Cewch adael i TDE droi'r <b>NumLock</b> YMLAEN neu I FFWRDD wrth "
-#~ "gychwyn.\n"
-#~ " </p>\n"
-#~ " <p>\n"
-#~ " Agorwch y Ganolfan Reoli->Ymylolion->Bysellfwrdd a gwnewch eich dewis.\n"
-#~ " </p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>Dyma'r cynghoryn olaf yn y gronfa ddata cynghorion.  Bydd\n"
-#~ "clicio \"Nesaf\" yn mynd â chi yn ôl i'r cyghoryn cyntaf.</i>\n"
-#~ "</p>\n"
-
-#, fuzzy
-#~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
 #~ "<A HREF=\"http://www.kde.org/\">TDE web site</A>. There are\n"
@@ -1858,3 +1810,51 @@ msgstr ""
 #~ "\"Nesaf\" yn mynd â chi'n ôl i'r cynghoryn cyntaf\n"
 #~ " </p>\n"
 #~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
+#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
+#~ "Acrobat Reader,\n"
+#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
+#~ msgstr ""
+#~ "<p> Eisiau pwer argrraffu TDE mewn rhaglenni di-TDE? </p>\n"
+#~ " <p> Yna defnyddiwch <strong>'kprinter'</strong> fel \"gorchymyn argraffu"
+#~ "\". \n"
+#~ " Yn gweithio efo Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
+#~ " StarOffice, OpenOffice, unrhyw raglen GNOME a llawer mwy...</p>\n"
+#~ " <center>\n"
+#~ " <img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ " <p align=\"right\"><em>Cyfrannwyd gan Kurt Pfeifle</em></p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
+#~ " choice.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
+#~ "you back to\n"
+#~ " the first tip.</i>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ " Cewch adael i TDE droi'r <b>NumLock</b> YMLAEN neu I FFWRDD wrth "
+#~ "gychwyn.\n"
+#~ " </p>\n"
+#~ " <p>\n"
+#~ " Agorwch y Ganolfan Reoli->Ymylolion->Bysellfwrdd a gwnewch eich dewis.\n"
+#~ " </p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>Dyma'r cynghoryn olaf yn y gronfa ddata cynghorion.  Bydd\n"
+#~ "clicio \"Nesaf\" yn mynd â chi yn ôl i'r cyghoryn cyntaf.</i>\n"
+#~ "</p>\n"