Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-sl/messages/tdelibs/tdelibs_colors.po b/tde-i18n-sl/messages/tdelibs/tdelibs_colors.po
index 229d68e5e47..12a562aaf26 100644
--- a/tde-i18n-sl/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-sl/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: 2003-11-06 19:43+0100\n"
 "Last-Translator: Gregor Rakar <gregor.rakar@kiss.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -16,6 +16,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-sl/messages/tdepim/kmailcvt.po b/tde-i18n-sl/messages/tdepim/kmailcvt.po
index 62971e648ad..b34448c9360 100644
--- a/tde-i18n-sl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sl/messages/tdepim/kmailcvt.po
@@ -9,7 +9,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: 2006-06-27 03:38+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -33,54 +33,6 @@ msgid ""
 "Your emails"
 msgstr "gregor.rakar@kiss.si,andrej.vernekar@moj.net,jlp@holodeck1.com"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Uvozno orodje KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Korak 1: Izbira filtra"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Korak 2: Uvažanje ..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Uvažanje poteka"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Uvažanje končano"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napisal(a) %1</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Uvozni filtri za KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000-2005, razvijalci KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Prvotni avtor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Vzdrževalec in novi filtri"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nov grafičen vmesnik in čiščenje"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Uvozi krajevno pošto in zgradbo map iz Evolution 1.x"
@@ -554,6 +506,54 @@ msgstr "V KMail ni moč dodati sporočila v mapo %1."
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Napaka pri dodajanju sporočila v mapo %1 v KMailu."
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Uvozno orodje KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Korak 1: Izbira filtra"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Korak 2: Uvažanje ..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Uvažanje poteka"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Uvažanje končano"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napisal(a) %1</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Uvozni filtri za KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000-2005, razvijalci KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Prvotni avtor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Vzdrževalec in novi filtri"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nov grafičen vmesnik in čiščenje"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"