Merge translation files from master branch.

2 files changed, 63 insertions, 51 deletions

diff --git a/tde-i18n-tg/messages/tdelibs/tdelibs_colors.po b/tde-i18n-tg/messages/tdelibs/tdelibs_colors.po
index 47c84e5e181..5a4fb560823 100644
--- a/tde-i18n-tg/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-tg/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: 2004-02-04 17:03+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajik.net>\n"
 "Language-Team: Тоҷикӣ\n"
@@ -16,6 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\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-tg/messages/tdepim/kmailcvt.po b/tde-i18n-tg/messages/tdepim/kmailcvt.po
index 9efa337b56a..b1f122aa4e1 100644
--- a/tde-i18n-tg/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-tg/messages/tdepim/kmailcvt.po
@@ -12,7 +12,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: 2005-09-16 16:50+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -41,55 +41,6 @@ msgid ""
 msgstr ""
 "rkovacs@khujand.org, youth_opportunities@tajikngo.org, MarinaKL@tajikngo.org"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Импорти KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Қадами 1: интихоби Филтер"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Қадами 2 : Импорт кардан"
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Импорт рафта истодааст"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Импорт тамом шуд"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Навистаги %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Филтерҳои импорти KMail"
-
-#: main.cpp:35
-#, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, The KMailCVT developers"
-
-#: 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 "Нави GUT & тозаги"
-
 #: filter_evolution.cxx:31
 #, fuzzy
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
@@ -560,6 +511,55 @@ msgstr "Хабар ба феҳристи %1 гузошта намешавад д
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Хатоги дар вақти гузоштани хабар ба феҳристи %1 дар KMail"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Импорти KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Қадами 1: интихоби Филтер"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Қадами 2 : Импорт кардан"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Импорт рафта истодааст"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Импорт тамом шуд"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Навистаги %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Филтерҳои импорти KMail"
+
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, The KMailCVT developers"
+
+#: 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 "Нави GUT & тозаги"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"