Merge translation files from master branch.

1 files changed, 24 insertions, 22 deletions

diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po b/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po
index c857a6a386a..981d4583e1e 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-05-11 04:05+0200\n"
+"POT-Creation-Date: 2020-05-28 01:29+0200\n"
 "PO-Revision-Date: 2004-01-15 21:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -151,24 +151,37 @@ msgstr "此按钮可用于启用 ACPI 助手应用程序"
 msgid "Version: %1"
 msgstr "版本：%1"
 
-#: acpi.cpp:172 apm.cpp:194
+#: acpi.cpp:170 apm.cpp:192
 msgid ""
-"You will need to supply a root password to allow the privileges of the "
-"klaptop_acpi_helper to change."
-msgstr "要更改 klaptop_acpi_helper 的权限，您需要提供 root 的密码。"
+"The %1 application does not seem to have the same size or checksum as when "
+"it was compiled we do NOT recommend you proceed with making it setuid-root "
+"without further investigation"
+msgstr ""
+"%1 应用程序好像与编译时的大小和校验和不同，我们不推荐您不进行过多的调查而将其"
+"设成 root 用户级"
 
-#: acpi.cpp:174 acpi.cpp:186 apm.cpp:174 apm.cpp:196 apm.cpp:208 sony.cpp:115
-#: sony.cpp:127
+#: acpi.cpp:173 acpi.cpp:185 acpi.cpp:197 apm.cpp:174 apm.cpp:195 apm.cpp:207
+#: apm.cpp:219 sony.cpp:115 sony.cpp:127
 msgid "KLaptopDaemon"
 msgstr "KLaptopDaemon"
 
-#: acpi.cpp:185
+#: acpi.cpp:173 apm.cpp:195
+msgid "Run Nevertheless"
+msgstr "仍然运行"
+
+#: acpi.cpp:183 apm.cpp:205
+msgid ""
+"You will need to supply a root password to allow the privileges of the "
+"klaptop_acpi_helper to change."
+msgstr "要更改 klaptop_acpi_helper 的权限，您需要提供 root 的密码。"
+
+#: acpi.cpp:196
 msgid ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please "
 "make sure that it is installed correctly."
 msgstr "无法启用 ACPI 助手，原因是找不到 tdesu。请确定该程序已经正确安装了。"
 
-#: acpi.cpp:268
+#: acpi.cpp:279
 msgid ""
 "<h1>ACPI Setup</h1>This module allows you to configure ACPI for your system"
 msgstr "<h1>ACPI 设置</h1>此模块让您设置系统里的 ACPI 功能"
@@ -257,14 +270,14 @@ msgid ""
 "it is installed correctly."
 msgstr "无法启用 %1，因为找不到 tdesu。请确定该程序已经正确安装。"
 
-#: apm.cpp:207
+#: apm.cpp:218
 msgid ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be "
 "found.  Please make sure that it is installed correctly."
 msgstr ""
 "无法启用软件挂起助手应用程序，因为找不到 tdesu。请确定该程序已经正确安装。"
 
-#: apm.cpp:271
+#: apm.cpp:282
 msgid ""
 "<h1>APM Setup</h1>This module allows you to configure APM for your system"
 msgstr "<h1>APM 设置</h1>此模块让您设置系统里的 APM 功能"
@@ -970,17 +983,6 @@ msgid ""
 msgstr "<h1>低电量警告</h1>本模块允许您设置在电池电量即将用完时发出提醒。"
 
 #~ msgid ""
-#~ "The %1 application does not seem to have the same size or checksum as "
-#~ "when it was compiled we do NOT recommend you proceed with making it "
-#~ "setuid-root without further investigation"
-#~ msgstr ""
-#~ "%1 应用程序好像与编译时的大小和校验和不同，我们不推荐您不进行过多的调查而"
-#~ "将其设成 root 用户级"
-
-#~ msgid "Run Nevertheless"
-#~ msgstr "仍然运行"
-
-#~ msgid ""
 #~ "When this amount of battery is left the actions enabled below will be "
 #~ "triggered"
 #~ msgstr "电量达到给定范围后，将会触发下面指定的动作"