Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-fr/messages/tdelibs/tdelibs_colors.po b/tde-i18n-fr/messages/tdelibs/tdelibs_colors.po
index 7dce4693ea4..f80c0d36f93 100644
--- a/tde-i18n-fr/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-fr/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-09-28 16:03+0200\n"
 "Last-Translator: Matthieu Robin <[email protected]>\n"
 "Language-Team: Français <[email protected]>\n"
@@ -17,6 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2beta3\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-fr/messages/tdepim/kmailcvt.po b/tde-i18n-fr/messages/tdepim/kmailcvt.po
index 216e7d8c6a3..e5bfc4bdc06 100644
--- a/tde-i18n-fr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fr/messages/tdepim/kmailcvt.po
@@ -16,7 +16,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: 2008-08-12 16:17+0200\n"
 "Last-Translator: Pierre Buard <[email protected]>\n"
 "Language-Team: Français <[email protected]>\n"
@@ -40,54 +40,6 @@ msgstr ""
 "[email protected],[email protected],[email protected],nicolas."
 "[email protected]"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Outils d'importation de KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Étape 1 : sélection d'un filtre"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Étape 2 : importation..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importation en cours"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importation terminée"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Écrit par %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtres d'importation de KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Les développeurs de KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Auteur initial"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mainteneur et nouveaux filtres"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nouvelle interface graphique et des nettoyages"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importer les messages et la structure des dossiers d'Evolution 1.x"
@@ -574,6 +526,54 @@ msgstr "Impossible d'ajouter le message au dossier « %1 » dans KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Problème en ajoutant le message au dossier « %1 » dans KMail"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Outils d'importation de KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Étape 1 : sélection d'un filtre"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Étape 2 : importation..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importation en cours"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importation terminée"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Écrit par %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtres d'importation de KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Les développeurs de KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Auteur initial"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mainteneur et nouveaux filtres"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nouvelle interface graphique et des nettoyages"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"