Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-eu/messages/tdelibs/tdelibs_colors.po b/tde-i18n-eu/messages/tdelibs/tdelibs_colors.po
index 327f634c983..7fde1a03d70 100644
--- a/tde-i18n-eu/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-eu/messages/tdelibs/tdelibs_colors.po
@@ -8,7 +8,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: 2005-11-21 23:45+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -18,6 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.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-eu/messages/tdepim/kmailcvt.po b/tde-i18n-eu/messages/tdepim/kmailcvt.po
index 51ad753308a..69f0680699e 100644
--- a/tde-i18n-eu/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-eu/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: 2007-01-07 20:15+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -37,54 +37,6 @@ msgstr ""
 "igaztanaga@gmail.com\n"
 "dooteo@euskalgnu.org"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT-en inportatzeko tresna"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. urratsa: hautatu iragazkia"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. urratsa: inportatzea..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Inportazioa martxan"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Inportazioa bukatuta"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1(e)k idatzita.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail-en inportatzeko iragazkiak"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT-en garatzaileak"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Jatorrizko egilea"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mantentzailea eta iragazki berriak"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI berria eta txukunketak"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Inportatu Evolution 1.x bertsioko posta eta karpeta-egitura"
@@ -559,6 +511,54 @@ msgstr "Ezin da mezua KMail-eko %1 karpetan gehitu"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Errorea KMail-eko %1 karpetan mezua gehitzean"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT-en inportatzeko tresna"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. urratsa: hautatu iragazkia"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. urratsa: inportatzea..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Inportazioa martxan"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Inportazioa bukatuta"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1(e)k idatzita.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail-en inportatzeko iragazkiak"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT-en garatzaileak"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Jatorrizko egilea"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mantentzailea eta iragazki berriak"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI berria eta txukunketak"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"