Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs_colors.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs_colors.po
index 30f4a86dc99..d1442700f3a 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-zh_CN/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: 2003-12-27 23:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -14,6 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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-zh_CN/messages/tdepim/kmailcvt.po b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
index 091dc0d6529..113755289de 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-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: 2005-08-03 22:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -30,54 +30,6 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT 导入工具"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "第一步：选择过滤器"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "第二步：导入..."
-
-#: 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
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005，KMailCVT 开发者"
-
-#: 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 "导入 Evolution 1.x 本地邮件和文件夹结构"
@@ -526,6 +478,54 @@ msgstr "无法将信件添加到 KMail 的文件夹 %1 中"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "在将信件添加到 KMail 的文件夹 %1 时出错"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT 导入工具"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "第一步：选择过滤器"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "第二步：导入..."
+
+#: 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
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005，KMailCVT 开发者"
+
+#: 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
 #, no-c-format
 msgid "From:"