Merge translation files from master branch.

2 files changed, 64 insertions, 52 deletions

diff --git a/tde-i18n-af/messages/tdelibs/tdelibs_colors.po b/tde-i18n-af/messages/tdelibs/tdelibs_colors.po
index 494d5077991..504a4179855 100644
--- a/tde-i18n-af/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-af/messages/tdelibs/tdelibs_colors.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs_colors stable\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-04-25 16:33+0200\n"
 "Last-Translator: Juanita Franz <juanita.franz@vr-web.de>\n"
 "Language-Team: AFRIKAANS <translate-discuss-af@lists.sourceforge.net>\n"
@@ -11,6 +11,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\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-af/messages/tdepim/kmailcvt.po b/tde-i18n-af/messages/tdepim/kmailcvt.po
index da37dfb9e73..593a3fc7e0d 100644
--- a/tde-i18n-af/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-af/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt VERSION\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-10-09 15:41+0200\n"
 "PO-Revision-Date: 2002-11-07 11:35+0200\n"
 "Last-Translator: WEB-Translator <http://kde.af.org.za>\n"
 "Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -26,56 +26,6 @@ msgid ""
 "Your emails"
 msgstr "frix@expertron.co.za"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr ""
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: kmailcvt.cpp:34
-#, fuzzy
-msgid "Step 2: Importing..."
-msgstr "In voer..."
-
-#: kmailcvt.cpp:76
-#, fuzzy
-msgid "Import in progress"
-msgstr "In voer Outlook Express 4"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr ""
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr ""
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr ""
-
-#: main.cpp:36
-msgid "Original author"
-msgstr ""
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr ""
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
@@ -486,6 +436,56 @@ msgstr "Kan nie voeg by boodskap na kabinet %1 in Kpos"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fout terwyl bygesit boodskap na kabinet %1 in Kpos"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr ""
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: kmailcvt.cpp:34
+#, fuzzy
+msgid "Step 2: Importing..."
+msgstr "In voer..."
+
+#: kmailcvt.cpp:76
+#, fuzzy
+msgid "Import in progress"
+msgstr "In voer Outlook Express 4"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr ""
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr ""
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr ""
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr ""
+
+#: main.cpp:36
+msgid "Original author"
+msgstr ""
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
+
 #: kimportpagedlg.ui:91
 #, fuzzy, no-c-format
 msgid "From:"