Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-en_GB/messages/tdelibs/tdelibs_colors.po b/tde-i18n-en_GB/messages/tdelibs/tdelibs_colors.po
index 5876b7d7500..d5b3ae2a4f7 100644
--- a/tde-i18n-en_GB/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-en_GB/messages/tdelibs/tdelibs_colors.po
@@ -5,7 +5,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: 2003-10-14 14:16+0100\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\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-en_GB/messages/tdepim/kmailcvt.po b/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
index 0394c973851..7615876c63f 100644
--- a/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
@@ -6,7 +6,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: 2005-12-30 13:44+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -28,54 +28,6 @@ msgid ""
 "Your emails"
 msgstr "malcolm.hunter@gmx.co.uk"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT Import Tool"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Step 1: Select Filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Step 2: Importing..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import in progress"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import finished"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Written by %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail Import Filters"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, The KMailCVT developers"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Original author"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Maintainer & New filters"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "New GUI & cleanups"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Import Evolution 1.x Local Mails and Folder Structure"
@@ -551,6 +503,54 @@ msgstr "Cannot add message to folder %1 in KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Error while adding message to folder %1 in KMail"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT Import Tool"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Step 1: Select Filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Step 2: Importing..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import in progress"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import finished"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Written by %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail Import Filters"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, The KMailCVT developers"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Original author"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Maintainer & New filters"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "New GUI & cleanups"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"