Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-nb/messages/tdelibs/tdelibs_colors.po b/tde-i18n-nb/messages/tdelibs/tdelibs_colors.po
index 9fe92c169be..539b91284b3 100644
--- a/tde-i18n-nb/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-nb/messages/tdelibs/tdelibs_colors.po
@@ -7,7 +7,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-20 13:39+0100\n"
 "Last-Translator: Bjørn Steensrud <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -17,6 +17,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-nb/messages/tdepim/kmailcvt.po b/tde-i18n-nb/messages/tdepim/kmailcvt.po
index d4553b3502e..5e46a5647f1 100644
--- a/tde-i18n-nb/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nb/messages/tdepim/kmailcvt.po
@@ -15,7 +15,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-01-28 15:44+0100\n"
 "Last-Translator: Lars Risan <[email protected]>\n"
 "Language-Team: Norsk bokmål <[email protected]>\n"
@@ -39,54 +39,6 @@ msgstr ""
 "[email protected],[email protected],[email protected], axelb@skolelinux."
 "no"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Importverktøy for KMail"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Trinn 1: Velg filter "
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Trinn 2: Importerer …"
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Holder på å importere"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Ferdig med å importere"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrevet av %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importfiltre for KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000–2003 KMailCVT-utviklerne"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Opprinnelig forfatter"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Vedlikeholder og nye filtre"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nytt grensesnitt og opprydding"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importer lokale e-poster og mappestrukturen fra Evolution 1.x"
@@ -560,6 +512,54 @@ msgstr "Klarte ikke legge til melding i mappa %1 i KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Det oppsto en feil når meldinga ble lagt til mappa %1 i KMail"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Importverktøy for KMail"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Trinn 1: Velg filter "
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Trinn 2: Importerer …"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Holder på å importere"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Ferdig med å importere"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrevet av %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importfiltre for KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000–2003 KMailCVT-utviklerne"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Opprinnelig forfatter"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Vedlikeholder og nye filtre"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nytt grensesnitt og opprydding"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"