Merge translation files from master branch.

3 files changed, 57 insertions, 55 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kdcop.po b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
index a5752e9da0c..a8a175c2dda 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdcop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2020-05-11 13:04+0200\n"
+"POT-Creation-Date: 2020-05-28 02:58+0200\n"
 "PO-Revision-Date: 2004-01-05 00:28+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -43,105 +43,105 @@ msgstr "%1 (默认)"
 msgid "Welcome to the TDE DCOP browser"
 msgstr "欢迎使用 TDE DCOP 浏览器"
 
-#: kdcopwindow.cpp:294
+#: kdcopwindow.cpp:295
 msgid "Application"
 msgstr "应用程序"
 
-#: kdcopwindow.cpp:316
+#: kdcopwindow.cpp:317
 msgid "&Execute"
 msgstr "执行(&E)"
 
-#: kdcopwindow.cpp:326
+#: kdcopwindow.cpp:327
 msgid "Execute the selected DCOP call."
 msgstr "执行选中的 DCOP 调用。"
 
-#: kdcopwindow.cpp:328
+#: kdcopwindow.cpp:329
 msgid "Language Mode"
 msgstr "语言模式"
 
-#: kdcopwindow.cpp:336
+#: kdcopwindow.cpp:337
 msgid "Set the current language export."
 msgstr "设置当前的语言导出。"
 
-#: kdcopwindow.cpp:355
+#: kdcopwindow.cpp:356
 msgid "DCOP Browser"
 msgstr "DCOP 浏览器"
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "No parameters found."
 msgstr "找不到参数。"
 
-#: kdcopwindow.cpp:402
+#: kdcopwindow.cpp:403
 msgid "DCOP Browser Error"
 msgstr "DCOP 浏览器错误"
 
-#: kdcopwindow.cpp:418
+#: kdcopwindow.cpp:419
 #, c-format
 msgid "Call Function %1"
 msgstr "调用函数 %1"
 
-#: kdcopwindow.cpp:422
+#: kdcopwindow.cpp:423
 msgid "Name"
 msgstr "名称"
 
-#: kdcopwindow.cpp:423
+#: kdcopwindow.cpp:424
 msgid "Type"
 msgstr "类型"
 
-#: kdcopwindow.cpp:424
+#: kdcopwindow.cpp:425
 msgid "Value"
 msgstr "值"
 
-#: kdcopwindow.cpp:631
+#: kdcopwindow.cpp:632
 msgid "X"
 msgstr "X"
 
-#: kdcopwindow.cpp:632
+#: kdcopwindow.cpp:633
 msgid "Y"
 msgstr "Y"
 
-#: kdcopwindow.cpp:662 kdcopwindow.cpp:789
+#: kdcopwindow.cpp:663 kdcopwindow.cpp:790
 #, c-format
 msgid "Cannot handle datatype %1"
 msgstr "无法处理数据类型 %1"
 
-#: kdcopwindow.cpp:824
+#: kdcopwindow.cpp:825
 msgid "DCOP call failed"
 msgstr "DCOP 调用失败"
 
-#: kdcopwindow.cpp:826
+#: kdcopwindow.cpp:827
 #, c-format
 msgid "<p>DCOP call failed.</p>%1"
 msgstr "<p>DCOP 调用失败。</p>%1"
 
-#: kdcopwindow.cpp:837
+#: kdcopwindow.cpp:838
 msgid ""
 "<p>Application is still registered with DCOP; I do not know why this call "
 "failed.</p>"
 msgstr "<p>程序仍然登记在 DCOP 中；不知道为什么该调用失败。</p>"
 
-#: kdcopwindow.cpp:849
+#: kdcopwindow.cpp:850
 msgid "<p>The application appears to have unregistered with DCOP.</p>"
 msgstr "<p>程序看起来已经在 DCOP 中注销。</p>"
 
-#: kdcopwindow.cpp:865
+#: kdcopwindow.cpp:866
 msgid "DCOP call %1 executed"
 msgstr "DCOP 调用 %1 已执行"
 
-#: kdcopwindow.cpp:874
+#: kdcopwindow.cpp:875
 msgid "<strong>%1</strong>"
 msgstr "<strong>%1</strong>"
 
-#: kdcopwindow.cpp:881
+#: kdcopwindow.cpp:882
 #, c-format
 msgid "Unknown type %1."
 msgstr "未知类型 %1。"
 
-#: kdcopwindow.cpp:887
+#: kdcopwindow.cpp:888
 msgid "No returned values"
 msgstr "没有返回值"
 
-#: kdcopwindow.cpp:1092
+#: kdcopwindow.cpp:1093
 #, c-format
 msgid "Do not know how to demarshal %1"
 msgstr "不知道如何散列 %1"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po b/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
index 29158e5974d..78ada420095 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix 3.4\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-05-28 02:59+0200\n"
 "PO-Revision-Date: 2005-07-17 09:54+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -57,7 +57,7 @@ msgstr "配置全局快捷键(&G)..."
 msgid "Hardware &Information"
 msgstr "硬件信息(&I)"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:400
+#: kmix.cpp:120 kmixdockwidget.cpp:418
 msgid "Hide Mixer Window"
 msgstr "隐藏混音器窗口"
 
@@ -151,19 +151,19 @@ msgstr "静音(&U)"
 msgid "Select Master Channel..."
 msgstr "选择主声道..."
 
-#: kmixdockwidget.cpp:183
+#: kmixdockwidget.cpp:201
 msgid "Mixer cannot be found"
 msgstr "找不到混音器"
 
-#: kmixdockwidget.cpp:194
+#: kmixdockwidget.cpp:212
 msgid "Volume at %1%"
 msgstr "音量为 %1%"
 
-#: kmixdockwidget.cpp:196
+#: kmixdockwidget.cpp:214
 msgid " (Muted)"
 msgstr " (已静音)"
 
-#: kmixdockwidget.cpp:404
+#: kmixdockwidget.cpp:422
 msgid "Show Mixer Window"
 msgstr "显示混音器窗口"
 
@@ -632,11 +632,11 @@ msgstr ""
 "kmix：您没有权限访问混音器设备。\n"
 "请求您的系统管理员修改 /dev/audioctl 以便允许访问。"
 
-#: mixertoolbox.cpp:225
+#: mixertoolbox.cpp:237
 msgid "Sound drivers supported:"
 msgstr "支持的声音驱动程序："
 
-#: mixertoolbox.cpp:226
+#: mixertoolbox.cpp:238
 msgid "Sound drivers used:"
 msgstr "使用的声音驱动程序："
 
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 "电量达到给定范围后，将会触发下面指定的动作"