Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-zh_TW/messages/tdelibs/tdelibs_colors.po b/tde-i18n-zh_TW/messages/tdelibs/tdelibs_colors.po
index ba6d8642545..e4007a7e946 100644
--- a/tde-i18n-zh_TW/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-zh_TW/messages/tdelibs/tdelibs_colors.po
@@ -4,7 +4,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: 2005-08-09 16:00+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -13,6 +13,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_TW/messages/tdepim/kmailcvt.po b/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
index 42ce3f3c8bf..f67e174c8f6 100644
--- a/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt1\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-13 08:36+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -32,54 +32,6 @@ msgid ""
 "Your emails"
 msgstr "id5id5@tcts1.seed.net.tw, acelan@kde.linux.org.tw"
 
-#: 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 "新的 GUI 設計"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "匯入 Evolution 1.x 的信件"
@@ -525,6 +477,54 @@ msgstr "無法在 %1 信件夾新增郵件"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "當在信件夾 %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 "新的 GUI 設計"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"