Merge translation files from master branch.

2 files changed, 14 insertions, 9 deletions

diff --git a/tde-i18n-zh_CN/messages/tdepim/kmail.po b/tde-i18n-zh_CN/messages/tdepim/kmail.po
index 8911171eb43..3828fa9be0c 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmail.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmail.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 3.5\n"
-"POT-Creation-Date: 2019-04-21 19:42+0200\n"
+"POT-Creation-Date: 2019-04-21 21:15+0200\n"
 "PO-Revision-Date: 2008-01-29 14:12+0800\n"
 "Last-Translator: Lie_Ex <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -14046,6 +14046,11 @@ msgstr ""
 "<p align=\"right\"><em>由 David F. Newman 提供</em></p>\n"
 
 #, fuzzy
+#~| msgid "Message Structure Viewer"
+#~ msgid "Show Message Structure"
+#~ msgstr "信件结构查看器"
+
+#, fuzzy
 #~ msgid "Clear"
 #~ msgstr "过时清除"
 
diff --git a/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po b/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po
index 07dc6f2b975..7eec4dab52c 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klaptopdaemon\n"
-"POT-Creation-Date: 2019-01-13 18:52+0100\n"
+"POT-Creation-Date: 2019-05-05 19:00+0200\n"
 "PO-Revision-Date: 2005-08-04 04:08+0800\n"
 "Last-Translator: Li Zongliang <[email protected]>\n"
 "Language-Team: zh_CN <[email protected]>\n"
@@ -450,7 +450,7 @@ msgstr ""
 "\n"
 "您的系统不支持挂起/待机功能"
 
-#: portable.cpp:1049 portable.cpp:2189 portable.cpp:2595 portable.cpp:2890
+#: portable.cpp:1049 portable.cpp:2189 portable.cpp:2602 portable.cpp:2928
 msgid "No PCMCIA controller detected"
 msgstr "没有检查到 PCMCIA 控制器"
 
@@ -507,19 +507,19 @@ msgstr ""
 "理员身份登录的话，可能该设备有问题；否则请联系您的本地系统管理员，向他要求"
 "对 /dev/apm 的读写权限。"
 
-#: portable.cpp:2157 portable.cpp:2562
+#: portable.cpp:2157 portable.cpp:2569
 msgid "Your kernel lacks support for Advanced Power Management."
 msgstr "您的系统内核缺乏高级电源管理支持。"
 
-#: portable.cpp:2161 portable.cpp:2566
+#: portable.cpp:2161 portable.cpp:2573
 msgid "There was a generic error while opening /dev/apm."
 msgstr "打开 /dev/apm 时发生一般性错误。"
 
-#: portable.cpp:2166 portable.cpp:2571
+#: portable.cpp:2166 portable.cpp:2578
 msgid "APM has most likely been disabled."
 msgstr "APM 功能很有可能被禁用了。"
 
-#: portable.cpp:2556
+#: portable.cpp:2563
 msgid ""
 "There is no /dev/apm file on this system. Please review the NetBSD "
 "documentation on how to create a device node for the APM device driver (man "
@@ -528,7 +528,7 @@ msgstr ""
 "此系统中没有 /dev/apm 文件。关于如何为 APM 设备驱动程序创建一个设备节点，请阅"
 "读 NetBSD 手册 (man 4 apm)。"
 
-#: portable.cpp:2559
+#: portable.cpp:2566
 msgid ""
 "Your system has the proper device node for APM support, however you cannot "
 "access it. If you have APM compiled into the kernel this should not happen."
@@ -536,7 +536,7 @@ msgstr ""
 "您的系统中有 APM 支持所需要的设备节点，然而您不能访问它。如果您的系统内核中已"
 "编译进 APM 支持，这是不应该发生的。"
 
-#: portable.cpp:2866
+#: portable.cpp:2904
 msgid ""
 "Your computer or operating system is not supported by the current version of "
 "the\n"