Merge translation files from master branch.

3 files changed, 35 insertions, 7 deletions

diff --git a/tde-i18n-cy/messages/tdebase/tdeio_media.po b/tde-i18n-cy/messages/tdebase/tdeio_media.po
index 8955bd8a516..b7ebe4bddac 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_media.po
@@ -794,6 +794,20 @@ msgstr "Cymysg"
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgid "Unknown error"
+#~ msgstr "Anhysbys"
+
+#, fuzzy
+#~ msgid "%1 is already unlocked."
+#~ msgstr "Dyfais heb ei osod"
+
+#, fuzzy
+#~| msgid "Unknown device %1"
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Dyfais anhysbys %1"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
@@ -809,9 +823,6 @@ msgstr ""
 #~ "\n"
 #~ "Gwiriwch bod y ddisg wedi'i mewnosod yn gywir os gwelwch yn dda."
 
-#~ msgid "Unknown device %1"
-#~ msgstr "Dyfais anhysbys %1"
-
 #~ msgid "Device not accessible"
 #~ msgstr "Dyfais yn anghyrchadwy"
 
@@ -841,3 +852,6 @@ msgstr ""
 
 #~ msgid "%1%2 mounted at %3"
 #~ msgstr "%1%2 wedi'i osod ar %3"
+
+#~ msgid "Unknown device %1"
+#~ msgstr "Dyfais anhysbys %1"
diff --git a/tde-i18n-cy/messages/tdelibs/tdeio.po b/tde-i18n-cy/messages/tdelibs/tdeio.po
index f4f549b0774..2c73aee52c5 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeio.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeio.po
@@ -6469,6 +6469,11 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~| msgid "Unknown error"
+#~ msgid "Unknown unmount error."
+#~ msgstr "Gwall anhysbys"
+
+#, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "&Nodau Tudalen"
 
@@ -10805,9 +10810,6 @@ msgstr ""
 #~ "Methu agor rhaglengell '%1'.\n"
 #~ "%2"
 
-#~ msgid "Unknown error"
-#~ msgstr "Gwall anhysbys"
-
 #~ msgid ""
 #~ "Could not find 'kdemain' in '%1'.\n"
 #~ "%2"
@@ -16073,3 +16075,6 @@ msgstr ""
 
 #~ msgid "Cancel your edits?"
 #~ msgstr "Colli golygiadau?"
+
+#~ msgid "Unknown error"
+#~ msgstr "Gwall anhysbys"
diff --git a/tde-i18n-cy/messages/tdelibs/tdelibs.po b/tde-i18n-cy/messages/tdelibs/tdelibs.po
index 1a1c9d081b4..2aa7551721d 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-07-08 00:03+0200\n"
+"POT-Creation-Date: 2019-07-11 03:35+0200\n"
 "PO-Revision-Date: 2005-01-28 17:54+0000\n"
 "Last-Translator: Kevin Donnelly <kevin@dotmon.com>\n"
 "Language-Team: Cymraeg\n"
@@ -13501,6 +13501,15 @@ msgstr "Awgrymiad y Dydd"
 #~ msgstr "Gweithrediad"
 
 #, fuzzy
+#~| msgid ""
+#~| "Cannot create the file\n"
+#~| "\""
+#~ msgid "Cannot create temporary password file"
+#~ msgstr ""
+#~ "Methu creu'r ffeil \n"
+#~ "\""
+
+#, fuzzy
 #~ msgid ""
 #~ "The <b>K Desktop Environment</b> is written and maintained by the TDE "
 #~ "Team, a world-wide network of software engineers committed to <a href="