Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-et/messages/tdelibs/tdelibs_colors.po b/tde-i18n-et/messages/tdelibs/tdelibs_colors.po
index c4388503d43..c2475bf7adc 100644
--- a/tde-i18n-et/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-et/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-09-25 16:41+0300\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.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-et/messages/tdepim/kmailcvt.po b/tde-i18n-et/messages/tdepim/kmailcvt.po
index a5994d7c0ac..63a54815304 100644
--- a/tde-i18n-et/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-et/messages/tdepim/kmailcvt.po
@@ -5,7 +5,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 11:39+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -27,54 +27,6 @@ msgid ""
 "Your emails"
 msgstr "pezz@tkwcy.ee"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT impordivahend"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. samm: filtri valimine"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. samm: importimine..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import käib"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import lõpetatud"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Kirjutanud %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMaili impordifiltrid"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005: KMailCVT arendajad"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Algne autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Hooldaja ja uued filtrid"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Uus GUI ja puhastustegevus"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Evolution 1.x kohalike kirjade ja kaustastruktuuri import"
@@ -544,6 +496,54 @@ msgstr "Kirja lisamine KMaili kausta %1 ebaõnnestus"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Kirja lisamisel KMaili kausta '%1' tekkis viga."
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT impordivahend"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. samm: filtri valimine"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. samm: importimine..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import käib"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import lõpetatud"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Kirjutanud %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMaili impordifiltrid"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005: KMailCVT arendajad"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Algne autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Hooldaja ja uued filtrid"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Uus GUI ja puhastustegevus"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"