Merge translation files from master branch.

2 files changed, 63 insertions, 51 deletions

diff --git a/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po b/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po
index 674f25a6df5..09c259cebd2 100644
--- a/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-cy/messages/tdelibs/tdelibs_colors.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs_colors\n"
-"POT-Creation-Date: 2020-10-07 19:49+0200\n"
+"POT-Creation-Date: 2020-10-08 04:28+0200\n"
 "PO-Revision-Date: 2004-09-06 10:40+0100\n"
 "Last-Translator: Kyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
 #: rgb.txt:2
 #, no-c-format
 msgid ""
diff --git a/tde-i18n-cy/messages/tdepim/kmailcvt.po b/tde-i18n-cy/messages/tdepim/kmailcvt.po
index 24766d9dcaa..d8584015e4c 100644
--- a/tde-i18n-cy/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-cy/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-10-09 15:41+0200\n"
 "PO-Revision-Date: 2004-01-08 21:25+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -30,55 +30,6 @@ msgid ""
 "Your emails"
 msgstr "kyfieithu@dotmon.com"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Erfyn Mewnforio KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Cam 1: Dewis Hidlen"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Cam 2: Mewnforio..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Mewnforio ar waith"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Mewnforio wedi gorffen"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Hidlenni Mewnforio KMail"
-
-#: main.cpp:35
-#, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI newydd a glanhadau"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
@@ -525,6 +476,55 @@ msgstr "Methu ychwanegu neges at blygell %1 yng KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Erfyn Mewnforio KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Cam 1: Dewis Hidlen"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Cam 2: Mewnforio..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Mewnforio ar waith"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Mewnforio wedi gorffen"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Hidlenni Mewnforio KMail"
+
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI newydd a glanhadau"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"