Merge translation files from master branch.

2 files changed, 62 insertions, 60 deletions

diff --git a/tde-i18n-de/messages/tdelibs/tdelibs_colors.po b/tde-i18n-de/messages/tdelibs/tdelibs_colors.po
index d4c5471ab56..a195b9661d4 100644
--- a/tde-i18n-de/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-de/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: 2019-08-27 20:45+0000\n"
 "Last-Translator: Chris <[email protected]>\n"
 "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
@@ -18,6 +18,18 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Weblate 3.8\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 "Chris (TDE)"
+
+#. 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 "(Keine Email)"
+
 #: rgb.txt:2
 #, no-c-format
 msgid ""
@@ -3188,13 +3200,3 @@ msgid ""
 "_: color\n"
 "LightGreen"
 msgstr "Hellgrün"
-
-#~ msgid ""
-#~ "_: NAME OF TRANSLATORS\n"
-#~ "Your names"
-#~ msgstr "Chris (TDE)"
-
-#~ msgid ""
-#~ "_: EMAIL OF TRANSLATORS\n"
-#~ "Your emails"
-#~ msgstr "(Keine Email)"
diff --git a/tde-i18n-de/messages/tdepim/kmailcvt.po b/tde-i18n-de/messages/tdepim/kmailcvt.po
index ed0de5c6aac..8e51b6cbc16 100644
--- a/tde-i18n-de/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-de/messages/tdepim/kmailcvt.po
@@ -10,7 +10,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: 2019-11-23 19:56+0000\n"
 "Last-Translator: Chris <[email protected]>\n"
 "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
@@ -34,54 +34,6 @@ msgid ""
 "Your emails"
 msgstr "[email protected], [email protected]"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Dienstprogramm KMailCVT zum Importieren"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. Schritt: Filter auswählen"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. Schritt: Importieren ..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importvorgang läuft"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import abgeschlossen"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Geschrieben von %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importfilter für KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Die Entwickler von KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Ursprünglicher Autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Betreuer & Neue Filter"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Neue Oberfläche & Überarbeitungen"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importieren von Evolution 1.x E-Mails und Ordnerlisten"
@@ -568,6 +520,54 @@ msgstr "Nachricht kann nicht zu Ordner %1 in KMail hinzugefügt werden"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fehler beim Hinzufügen der Nachricht zu Ordner %1 in KMail"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Dienstprogramm KMailCVT zum Importieren"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. Schritt: Filter auswählen"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. Schritt: Importieren ..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importvorgang läuft"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import abgeschlossen"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Geschrieben von %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importfilter für KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Die Entwickler von KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Ursprünglicher Autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Betreuer & Neue Filter"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Neue Oberfläche & Überarbeitungen"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"