Merge translation files from master branch.

3 files changed, 18 insertions, 18 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
index 874d02cfd5c..f6964464521 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2004-02-09 11:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -56,11 +56,11 @@ msgstr ""
 msgid "Also allow remote connections"
 msgstr "允许远程连接"
 
-#: main.cpp:183
+#: main.cpp:179
 msgid "The TDE Session Manager"
 msgstr "TDE 会话管理器"
 
-#: main.cpp:187
+#: main.cpp:183
 msgid "Maintainer"
 msgstr "维护者"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksysguard.po b/tde-i18n-zh_CN/messages/tdebase/ksysguard.po
index ae04d9c5ebf..6446c63f571 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksysguard.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksysguard.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksysguard\n"
-"POT-Creation-Date: 2019-11-28 03:15+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2005-08-09 13:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -1506,7 +1506,11 @@ msgstr "定时器设置"
 msgid "Use update interval of worksheet"
 msgstr "使用工作表的更新间隔"
 
-#: ksysguard.cc:64 ksysguard.cc:74
+#: ksysguard.cc:64
+msgid "TDE system guard"
+msgstr "TDE 系统卫士"
+
+#: ksysguard.cc:74 ksysguard.cc:556
 #, fuzzy
 msgid "KSysGuard"
 msgstr "TDE 系统卫士"
@@ -1602,10 +1606,6 @@ msgstr "仅显示本地主机的进程列表"
 msgid "Optional worksheet files to load"
 msgstr "其它要载入的工作表文件"
 
-#: ksysguard.cc:556
-msgid "TDE System Guard"
-msgstr "TDE 系统卫士"
-
 #: ksysguard.cc:558
 msgid "(c) 1996-2002 The KSysGuard Developers"
 msgstr "(C) 1996-2002，KSysGuard 开发者"
@@ -1696,7 +1696,7 @@ msgstr "CPU"
 msgid "Mem"
 msgstr "内存"
 
-#~ msgid "TDE system guard"
+#~ msgid "TDE System Guard"
 #~ msgstr "TDE 系统卫士"
 
 #~ msgid "#"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index 9f3fda9ea57..7396a31b069 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-08-01 05:09+0200\n"
+"POT-Creation-Date: 2019-12-05 01:24+0100\n"
 "PO-Revision-Date: 2006-04-30 16:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -6509,7 +6509,7 @@ msgstr "致命解析错误：%1 位于行 %2，列 %3"
 msgid "XML parsing error"
 msgstr "XML 解析错误"
 
-#: tdeinit/tdeinit.cpp:475
+#: tdeinit/tdeinit.cpp:476
 msgid ""
 "Unable to start new process.\n"
 "The system may have reached the maximum number of open files possible or the "
@@ -6519,7 +6519,7 @@ msgstr ""
 "系统已打开的文件数可能已经达到了极限，或者您所允许打开的文件数已经达到了极"
 "限。"
 
-#: tdeinit/tdeinit.cpp:497
+#: tdeinit/tdeinit.cpp:498
 msgid ""
 "Unable to create new process.\n"
 "The system may have reached the maximum number of processes possible or the "
@@ -6528,11 +6528,11 @@ msgstr ""
 "无法创建新进程。\n"
 "系统已创建的进程数可能已经达到了极限，或者您所允许创建进程数已经达到了极限。"
 
-#: tdeinit/tdeinit.cpp:589
+#: tdeinit/tdeinit.cpp:590
 msgid "Could not find '%1' executable."
 msgstr "找不到可执行程序“%1”。"
 
-#: tdeinit/tdeinit.cpp:605
+#: tdeinit/tdeinit.cpp:606
 msgid ""
 "Could not open library '%1'.\n"
 "%2"
@@ -6543,12 +6543,12 @@ msgstr ""
 #: ../dependencies/tqt3/src/network/qftp.cpp:1252
 #: ../dependencies/tqt3/src/network/qftp.cpp:1980
 #: ../dependencies/tqt3/src/network/qhttp.cpp:1226
-#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:606
-#: tdeinit/tdeinit.cpp:649
+#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:607
+#: tdeinit/tdeinit.cpp:650
 msgid "Unknown error"
 msgstr "未知的错误"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdeinit/tdeinit.cpp:649
 msgid ""
 "Could not find 'kdemain' in '%1'.\n"
 "%2"