Merge translation files from master branch.

1 files changed, 17 insertions, 17 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
index f1830634499..227dae0eea8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmenergy\n"
-"POT-Creation-Date: 2018-12-06 17:06+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
 "PO-Revision-Date: 2004-01-05 00:19+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -27,7 +27,7 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: energy.cpp:145
+#: energy.cpp:149
 msgid ""
 "<h1>Display Power Control</h1> If your display supports power saving "
 "features, you can configure them using this module.<p> There are three "
@@ -42,50 +42,50 @@ msgstr ""
 "的时间就越长。<p>要把显示器从节能状态唤醒，您可以轻轻挪动鼠标，或者按下一个不"
 "致产生副作用的键，如“Shift”键。"
 
-#: energy.cpp:181
+#: energy.cpp:185
 msgid "&Enable display power management"
 msgstr "启用显示器能源管理(&E)"
 
-#: energy.cpp:185
+#: energy.cpp:189
 msgid "Check this option to enable the power saving features of your display."
 msgstr "选中此选项将启用您的显示器的节能功能。"
 
-#: energy.cpp:189
+#: energy.cpp:193
 #, fuzzy
 msgid "&Enable specific display power management"
 msgstr "启用显示器能源管理(&E)"
 
-#: energy.cpp:195
+#: energy.cpp:199
 msgid "Your display does not support power saving."
 msgstr "您的显示器没有节能功能。"
 
-#: energy.cpp:202
+#: energy.cpp:206
 msgid "Learn more about the Energy Star program"
 msgstr "更多地了解关于能源之星程序"
 
-#: energy.cpp:212
+#: energy.cpp:216
 msgid "&Standby after:"
 msgstr "待机前等(&S)："
 
-#: energy.cpp:214 energy.cpp:225 energy.cpp:237
+#: energy.cpp:218 energy.cpp:229 energy.cpp:241
 msgid " min"
 msgstr "分钟"
 
-#: energy.cpp:215 energy.cpp:226 energy.cpp:238
+#: energy.cpp:219 energy.cpp:230 energy.cpp:242
 msgid "Disabled"
 msgstr "禁用"
 
-#: energy.cpp:218
+#: energy.cpp:222
 msgid ""
 "Choose the period of inactivity after which the display should enter "
 "\"standby\" mode. This is the first level of power saving."
 msgstr "选择显示器进入“待机”模式前的空闲状态的时间。这是第一级节能。"
 
-#: energy.cpp:223
+#: energy.cpp:227
 msgid "S&uspend after:"
 msgstr "休眠(&U)："
 
-#: energy.cpp:229
+#: energy.cpp:233
 msgid ""
 "Choose the period of inactivity after which the display should enter "
 "\"suspend\" mode. This is the second level of power saving, but may not be "
@@ -94,11 +94,11 @@ msgstr ""
 "选择显示器进入“休眠”模式前的空闲状态的时间。这是第二级节能，但是对于某些显示"
 "器来说，可能和第一级没有什么区别。"
 
-#: energy.cpp:235
+#: energy.cpp:239
 msgid "&Power off after:"
 msgstr "关闭电源(&P)："
 
-#: energy.cpp:241
+#: energy.cpp:245
 msgid ""
 "Choose the period of inactivity after which the display should be powered "
 "off. This is the greatest level of power saving that can be achieved while "
@@ -107,10 +107,10 @@ msgstr ""
 "选择关闭显示器电源前的空闲状态的时间。这是显示器物理上处于开启状态时所能达到"
 "的最大级别的节能。"
 
-#: energy.cpp:252
+#: energy.cpp:256
 msgid "Configure KPowersave..."
 msgstr ""
 
-#: energy.cpp:258
+#: energy.cpp:262
 msgid "Configure TDEPowersave..."
 msgstr ""