diff --git a/po/zh_CN.po b/po/zh_CN.po
index 28343cf2eadfc8aa808d01f08ca6eecd05447aa6..8d8782027c6d808491ea3332c944792beba2278f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,13 +8,14 @@
 # Hunt Xu <huntxu@live.cn>, 2008-2011
 # 玉堂白鹤 <yjwork@qq.com>, 2013-2014
 # 周潇波 <zhouxiaobo.500@gmail.com>, 2014-2015
+# 玉堂白鹤 <yjwork@qq.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Xfce4-power-manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-29 18:30+0200\n"
-"PO-Revision-Date: 2015-01-10 11:25+0000\n"
-"Last-Translator: 周潇波 <zhouxiaobo.500@gmail.com>\n"
+"POT-Creation-Date: 2015-02-07 12:30+0100\n"
+"PO-Revision-Date: 2015-02-11 01:16+0000\n"
+"Last-Translator: 玉堂白鹤 <yjwork@qq.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/xfce4-power-manager/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,327 +23,357 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/interfaces/xfpm-settings.ui.h:1
+#: ../data/interfaces/xfpm-settings.ui.h:1 ../settings/xfpm-settings.c:626
+#: ../settings/xfpm-settings.c:641 ../settings/xfpm-settings.c:668
+#: ../settings/xfpm-settings.c:1551
+msgid "Never"
+msgstr "从不"
+
+#: ../data/interfaces/xfpm-settings.ui.h:2
+msgid "When the screensaver is activated"
+msgstr "当屏保被激活"
+
+#: ../data/interfaces/xfpm-settings.ui.h:3
+msgid "When the screensaver is deactivated"
+msgstr "当屏保被禁用"
+
+#: ../data/interfaces/xfpm-settings.ui.h:4
 msgid "Nothing"
 msgstr "æ— "
 
-#: ../data/interfaces/xfpm-settings.ui.h:2
+#: ../data/interfaces/xfpm-settings.ui.h:5
 #: ../settings/xfpm-settings-main.c:142 ../src/xfpm-main.c:425
 msgid "Xfce Power Manager"
 msgstr "Xfce 电源管理器"
 
-#: ../data/interfaces/xfpm-settings.ui.h:3
+#: ../data/interfaces/xfpm-settings.ui.h:6
 msgid "Power manager settings"
 msgstr "电源管理器设置"
 
-#: ../data/interfaces/xfpm-settings.ui.h:4
+#: ../data/interfaces/xfpm-settings.ui.h:7
 msgid "When power button is pressed:"
 msgstr "按下电源按钮时："
 
-#: ../data/interfaces/xfpm-settings.ui.h:5
+#: ../data/interfaces/xfpm-settings.ui.h:8
 msgid "When sleep button is pressed:"
 msgstr "按下睡眠按钮时："
 
-#: ../data/interfaces/xfpm-settings.ui.h:6
+#: ../data/interfaces/xfpm-settings.ui.h:9
 msgid "When hibernate button is pressed:"
 msgstr "按下休眠按钮时："
 
-#: ../data/interfaces/xfpm-settings.ui.h:7
+#: ../data/interfaces/xfpm-settings.ui.h:10
 msgid "Handle display brightness _keys"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:8
+#: ../data/interfaces/xfpm-settings.ui.h:11
 msgid "<b>Buttons</b>"
 msgstr "<b>按钮</b>"
 
-#: ../data/interfaces/xfpm-settings.ui.h:9
+#: ../data/interfaces/xfpm-settings.ui.h:12
 msgid "On battery"
 msgstr "使用电池"
 
-#: ../data/interfaces/xfpm-settings.ui.h:10 ../common/xfpm-power-common.c:430
+#: ../data/interfaces/xfpm-settings.ui.h:13 ../common/xfpm-power-common.c:444
 msgid "Plugged in"
 msgstr "插入电源"
 
-#: ../data/interfaces/xfpm-settings.ui.h:11
+#: ../data/interfaces/xfpm-settings.ui.h:14
 msgid "When laptop lid is closed:"
 msgstr "合上笔记本盖时："
 
-#: ../data/interfaces/xfpm-settings.ui.h:12
+#: ../data/interfaces/xfpm-settings.ui.h:15
 msgid "<b>Laptop Lid</b>"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:13
+#: ../data/interfaces/xfpm-settings.ui.h:16
 msgid "Show notifications"
 msgstr "显示通知"
 
-#: ../data/interfaces/xfpm-settings.ui.h:14
+#: ../data/interfaces/xfpm-settings.ui.h:17
 msgid "<b>Appearance</b>"
 msgstr "<b>外观</b>"
 
-#: ../data/interfaces/xfpm-settings.ui.h:15
+#: ../data/interfaces/xfpm-settings.ui.h:18
 msgid "General"
 msgstr "一般"
 
-#: ../data/interfaces/xfpm-settings.ui.h:16
+#: ../data/interfaces/xfpm-settings.ui.h:19
 msgid "When inactive for"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:17
+#: ../data/interfaces/xfpm-settings.ui.h:20
 msgid "System sleep mode:"
 msgstr "系统睡眠模式:"
 
-#: ../data/interfaces/xfpm-settings.ui.h:18
+#: ../data/interfaces/xfpm-settings.ui.h:21
 msgid "<b>System power saving</b>"
 msgstr "<b>系统节电</b>"
 
-#: ../data/interfaces/xfpm-settings.ui.h:19
+#: ../data/interfaces/xfpm-settings.ui.h:22
 msgid "Critical battery power level:"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:20
+#: ../data/interfaces/xfpm-settings.ui.h:23
 msgid "On critical battery power:"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:21
+#: ../data/interfaces/xfpm-settings.ui.h:24
 msgid "<b>Critical power</b>"
 msgstr "<b>电量不足</b>"
 
-#: ../data/interfaces/xfpm-settings.ui.h:22
+#: ../data/interfaces/xfpm-settings.ui.h:25
 msgid "Lock screen when system is going for sleep"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:23
+#: ../data/interfaces/xfpm-settings.ui.h:26
 msgid "<b>Security</b>"
 msgstr "<b>安全性</b>"
 
-#: ../data/interfaces/xfpm-settings.ui.h:24
+#: ../data/interfaces/xfpm-settings.ui.h:27
 msgid "System"
 msgstr "系统"
 
-#: ../data/interfaces/xfpm-settings.ui.h:25
+#: ../data/interfaces/xfpm-settings.ui.h:28
 msgid "Handle display power management"
 msgstr "显示器电源管理"
 
-#: ../data/interfaces/xfpm-settings.ui.h:26
+#: ../data/interfaces/xfpm-settings.ui.h:29
 msgid "Blank after"
 msgstr "在之后空白"
 
-#: ../data/interfaces/xfpm-settings.ui.h:27
+#: ../data/interfaces/xfpm-settings.ui.h:30
 msgid "Put to sleep after"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:28
+#: ../data/interfaces/xfpm-settings.ui.h:31
 msgid "Switch off after"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:29
+#: ../data/interfaces/xfpm-settings.ui.h:32
 msgid "<b>Display power management settings</b>"
 msgstr "<b>显示电源管理器设置</b>"
 
-#: ../data/interfaces/xfpm-settings.ui.h:30
+#: ../data/interfaces/xfpm-settings.ui.h:33
 msgid "On inactivity reduce to"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:31
+#: ../data/interfaces/xfpm-settings.ui.h:34
 msgid "Reduce after"
 msgstr "在之后降低"
 
-#: ../data/interfaces/xfpm-settings.ui.h:32
+#: ../data/interfaces/xfpm-settings.ui.h:35
 msgid "<b>Brightness reduction</b>"
 msgstr ""
 
-#: ../data/interfaces/xfpm-settings.ui.h:33
+#: ../data/interfaces/xfpm-settings.ui.h:36
 msgid "Display"
 msgstr "显示"
 
-#: ../settings/xfpm-settings.c:605 ../settings/xfpm-settings.c:620
-#: ../settings/xfpm-settings.c:647
-msgid "Never"
-msgstr "从不"
+#: ../data/interfaces/xfpm-settings.ui.h:37
+msgid "Automatically lock the session:"
+msgstr ""
+
+#: ../data/interfaces/xfpm-settings.ui.h:38
+msgid "Delay locking after screensaver for"
+msgstr ""
+
+#: ../data/interfaces/xfpm-settings.ui.h:39
+msgid "<b>Light Locker</b>"
+msgstr ""
 
-#: ../settings/xfpm-settings.c:608
+#: ../data/interfaces/xfpm-settings.ui.h:40
+msgid "Security"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:629
 msgid "One minute"
 msgstr "一分钟"
 
-#: ../settings/xfpm-settings.c:610 ../settings/xfpm-settings.c:622
+#: ../settings/xfpm-settings.c:631 ../settings/xfpm-settings.c:643
+#: ../settings/xfpm-settings.c:1560
 msgid "Minutes"
 msgstr "分钟"
 
-#: ../settings/xfpm-settings.c:624 ../settings/xfpm-settings.c:631
-#: ../settings/xfpm-settings.c:632 ../settings/xfpm-settings.c:633
+#: ../settings/xfpm-settings.c:645 ../settings/xfpm-settings.c:652
+#: ../settings/xfpm-settings.c:653 ../settings/xfpm-settings.c:654
 msgid "One hour"
 msgstr "一小时"
 
-#: ../settings/xfpm-settings.c:632 ../settings/xfpm-settings.c:636
+#: ../settings/xfpm-settings.c:653 ../settings/xfpm-settings.c:657
 msgid "one minute"
 msgstr "一分钟"
 
-#: ../settings/xfpm-settings.c:633 ../settings/xfpm-settings.c:637
+#: ../settings/xfpm-settings.c:654 ../settings/xfpm-settings.c:658
 msgid "minutes"
 msgstr "分钟"
 
-#: ../settings/xfpm-settings.c:635 ../settings/xfpm-settings.c:636
-#: ../settings/xfpm-settings.c:637
+#: ../settings/xfpm-settings.c:656 ../settings/xfpm-settings.c:657
+#: ../settings/xfpm-settings.c:658
 msgid "hours"
 msgstr "小时"
 
-#: ../settings/xfpm-settings.c:649
+#: ../settings/xfpm-settings.c:670 ../settings/xfpm-settings.c:1553
 msgid "Seconds"
 msgstr "秒"
 
-#: ../settings/xfpm-settings.c:655
+#: ../settings/xfpm-settings.c:676
 msgid "%"
 msgstr "%"
 
-#: ../settings/xfpm-settings.c:829 ../settings/xfpm-settings.c:908
-#: ../settings/xfpm-settings.c:966 ../settings/xfpm-settings.c:1051
-#: ../settings/xfpm-settings.c:1139 ../settings/xfpm-settings.c:1247
-#: ../settings/xfpm-settings.c:1304 ../settings/xfpm-settings.c:1356
+#: ../settings/xfpm-settings.c:878 ../settings/xfpm-settings.c:957
+#: ../settings/xfpm-settings.c:1019 ../settings/xfpm-settings.c:1104
+#: ../settings/xfpm-settings.c:1196 ../settings/xfpm-settings.c:1304
+#: ../settings/xfpm-settings.c:1361 ../settings/xfpm-settings.c:1413
 #: ../src/xfpm-power.c:638
 msgid "Suspend"
 msgstr "挂起"
 
-#: ../settings/xfpm-settings.c:833 ../settings/xfpm-settings.c:1055
+#: ../settings/xfpm-settings.c:882 ../settings/xfpm-settings.c:1108
 msgid "Suspend operation not permitted"
 msgstr "不允许挂起操作"
 
-#: ../settings/xfpm-settings.c:837 ../settings/xfpm-settings.c:1059
+#: ../settings/xfpm-settings.c:886 ../settings/xfpm-settings.c:1112
 msgid "Suspend operation not supported"
 msgstr "不支持挂起操作"
 
-#: ../settings/xfpm-settings.c:843 ../settings/xfpm-settings.c:914
-#: ../settings/xfpm-settings.c:972 ../settings/xfpm-settings.c:1065
-#: ../settings/xfpm-settings.c:1145 ../settings/xfpm-settings.c:1253
-#: ../settings/xfpm-settings.c:1310 ../settings/xfpm-settings.c:1362
+#: ../settings/xfpm-settings.c:892 ../settings/xfpm-settings.c:963
+#: ../settings/xfpm-settings.c:1025 ../settings/xfpm-settings.c:1118
+#: ../settings/xfpm-settings.c:1202 ../settings/xfpm-settings.c:1310
+#: ../settings/xfpm-settings.c:1367 ../settings/xfpm-settings.c:1419
 #: ../src/xfpm-power.c:627
 msgid "Hibernate"
 msgstr "休眠"
 
-#: ../settings/xfpm-settings.c:847 ../settings/xfpm-settings.c:1069
+#: ../settings/xfpm-settings.c:896 ../settings/xfpm-settings.c:1122
 msgid "Hibernate operation not permitted"
 msgstr "不允许休眠操作"
 
-#: ../settings/xfpm-settings.c:851 ../settings/xfpm-settings.c:1073
+#: ../settings/xfpm-settings.c:900 ../settings/xfpm-settings.c:1126
 msgid "Hibernate operation not supported"
 msgstr "不支持休眠操作"
 
-#: ../settings/xfpm-settings.c:881 ../settings/xfpm-settings.c:1103
-#: ../settings/xfpm-settings.c:1445
+#: ../settings/xfpm-settings.c:930 ../settings/xfpm-settings.c:1156
+#: ../settings/xfpm-settings.c:1502 ../settings/xfpm-settings.c:1633
 msgid "Hibernate and suspend operations not supported"
 msgstr "不支持休眠和挂起操作"
 
-#: ../settings/xfpm-settings.c:886 ../settings/xfpm-settings.c:1108
-#: ../settings/xfpm-settings.c:1450
+#: ../settings/xfpm-settings.c:935 ../settings/xfpm-settings.c:1161
+#: ../settings/xfpm-settings.c:1507 ../settings/xfpm-settings.c:1638
 msgid "Hibernate and suspend operations not permitted"
 msgstr "不允许休眠和挂起操作"
 
-#: ../settings/xfpm-settings.c:903 ../settings/xfpm-settings.c:1242
-#: ../settings/xfpm-settings.c:1299 ../settings/xfpm-settings.c:1351
+#: ../settings/xfpm-settings.c:952 ../settings/xfpm-settings.c:1299
+#: ../settings/xfpm-settings.c:1356 ../settings/xfpm-settings.c:1408
 msgid "Do nothing"
 msgstr "什么都不做"
 
-#: ../settings/xfpm-settings.c:920 ../settings/xfpm-settings.c:1259
+#: ../settings/xfpm-settings.c:969 ../settings/xfpm-settings.c:1316
 #: ../src/xfpm-power.c:649
 msgid "Shutdown"
 msgstr "关机"
 
-#: ../settings/xfpm-settings.c:924 ../settings/xfpm-settings.c:1263
-#: ../settings/xfpm-settings.c:1314 ../settings/xfpm-settings.c:1366
+#: ../settings/xfpm-settings.c:973 ../settings/xfpm-settings.c:1320
+#: ../settings/xfpm-settings.c:1371 ../settings/xfpm-settings.c:1423
 msgid "Ask"
 msgstr "询问"
 
-#: ../settings/xfpm-settings.c:961 ../settings/xfpm-settings.c:1134
+#: ../settings/xfpm-settings.c:1014 ../settings/xfpm-settings.c:1191
 msgid "Switch off display"
 msgstr "关闭屏幕显示"
 
-#: ../settings/xfpm-settings.c:976 ../settings/xfpm-settings.c:1149
+#: ../settings/xfpm-settings.c:1029 ../settings/xfpm-settings.c:1206
 msgid "Lock screen"
 msgstr "锁屏"
 
-#: ../settings/xfpm-settings.c:1417
+#: ../settings/xfpm-settings.c:1474
 msgid "When all the power sources of the computer reach this charge level"
 msgstr "当所有计算机电源到达此电量级别"
 
-#: ../settings/xfpm-settings.c:1663
+#: ../settings/xfpm-settings.c:1555
+msgid "One Minute"
+msgstr ""
+
+#: ../settings/xfpm-settings.c:1892
 msgid "Device"
 msgstr "设备"
 
-#: ../settings/xfpm-settings.c:1685
+#: ../settings/xfpm-settings.c:1914
 msgid "Type"
 msgstr "类型"
 
-#: ../settings/xfpm-settings.c:1690
+#: ../settings/xfpm-settings.c:1919
 msgid "PowerSupply"
 msgstr "供电"
 
-#: ../settings/xfpm-settings.c:1691 ../src/xfpm-main.c:80
+#: ../settings/xfpm-settings.c:1920 ../src/xfpm-main.c:80
 msgid "True"
 msgstr "是"
 
-#: ../settings/xfpm-settings.c:1691 ../src/xfpm-main.c:80
+#: ../settings/xfpm-settings.c:1920 ../src/xfpm-main.c:80
 msgid "False"
 msgstr "否"
 
-#: ../settings/xfpm-settings.c:1698
+#: ../settings/xfpm-settings.c:1927
 msgid "Model"
 msgstr "型号"
 
-#: ../settings/xfpm-settings.c:1701
+#: ../settings/xfpm-settings.c:1930
 msgid "Technology"
 msgstr "技术"
 
-#: ../settings/xfpm-settings.c:1708
+#: ../settings/xfpm-settings.c:1937
 msgid "Current charge"
 msgstr "当前电量"
 
 #. TRANSLATORS: Unit here is Watt hour
-#: ../settings/xfpm-settings.c:1716 ../settings/xfpm-settings.c:1728
-#: ../settings/xfpm-settings.c:1740
+#: ../settings/xfpm-settings.c:1945 ../settings/xfpm-settings.c:1957
+#: ../settings/xfpm-settings.c:1969
 msgid "Wh"
 msgstr "瓦时"
 
-#: ../settings/xfpm-settings.c:1718
+#: ../settings/xfpm-settings.c:1947
 msgid "Fully charged (design)"
 msgstr ""
 
-#: ../settings/xfpm-settings.c:1731
+#: ../settings/xfpm-settings.c:1960
 msgid "Fully charged"
 msgstr "电量充满"
 
-#: ../settings/xfpm-settings.c:1742
+#: ../settings/xfpm-settings.c:1971
 msgid "Energy empty"
 msgstr "无电量"
 
 #. TRANSLATORS: Unit here is Volt
-#: ../settings/xfpm-settings.c:1750
+#: ../settings/xfpm-settings.c:1979
 msgid "V"
 msgstr "伏"
 
-#: ../settings/xfpm-settings.c:1752
+#: ../settings/xfpm-settings.c:1981
 msgid "Voltage"
 msgstr "电压"
 
-#: ../settings/xfpm-settings.c:1759
+#: ../settings/xfpm-settings.c:1988
 msgid "Vendor"
 msgstr "生产厂商"
 
-#: ../settings/xfpm-settings.c:1764
+#: ../settings/xfpm-settings.c:1993
 msgid "Serial"
 msgstr "序列号"
 
-#: ../settings/xfpm-settings.c:1833
+#: ../settings/xfpm-settings.c:2062
 msgid "Attribute"
 msgstr "属性"
 
-#: ../settings/xfpm-settings.c:1840
+#: ../settings/xfpm-settings.c:2069
 msgid "Value"
 msgstr "值"
 
-#: ../settings/xfpm-settings.c:2053
+#: ../settings/xfpm-settings.c:2282
 msgid "Check your power manager installation"
 msgstr "检查您的电源管理器安装"
 
-#: ../settings/xfpm-settings.c:2123
+#: ../settings/xfpm-settings.c:2352
 msgid "Devices"
 msgstr "设备"
 
@@ -509,63 +540,63 @@ msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../common/xfpm-power-common.c:357
+#: ../common/xfpm-power-common.c:371
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Fully charged (%0.0f%%, %s runtime)"
 msgstr ""
 
-#: ../common/xfpm-power-common.c:365
+#: ../common/xfpm-power-common.c:379
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Fully charged (%0.0f%%)"
 msgstr "<b>%s %s</b>\n电量已满 (%0.0f%%)"
 
-#: ../common/xfpm-power-common.c:375
+#: ../common/xfpm-power-common.c:389
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Charging (%0.0f%%, %s)"
 msgstr "<b>%s %s</b>\n正在充电 (%0.0f%%, %s)"
 
-#: ../common/xfpm-power-common.c:383
+#: ../common/xfpm-power-common.c:397
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Charging (%0.0f%%)"
 msgstr "<b>%s %s</b>\n正在充电 (%0.0f%%)"
 
-#: ../common/xfpm-power-common.c:393
+#: ../common/xfpm-power-common.c:407
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Discharging (%0.0f%%, %s)"
 msgstr "<b>%s %s</b>\n未充电 (%0.0f%%, %s)"
 
-#: ../common/xfpm-power-common.c:401
+#: ../common/xfpm-power-common.c:415
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Discharging (%0.0f%%)"
 msgstr "<b>%s %s</b>\n未充电(%0.0f%%)"
 
-#: ../common/xfpm-power-common.c:408
+#: ../common/xfpm-power-common.c:422
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Waiting to discharge (%0.0f%%)"
 msgstr "<b>%s %s</b>\n等待拔出电源 (%0.0f%%)"
 
-#: ../common/xfpm-power-common.c:414
+#: ../common/xfpm-power-common.c:428
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "Waiting to charge (%0.0f%%)"
 msgstr "<b>%s %s</b>\n等待充电 (%0.0f%%)"
 
-#: ../common/xfpm-power-common.c:420
+#: ../common/xfpm-power-common.c:434
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
@@ -574,26 +605,26 @@ msgstr "<b>%s %s</b>\n为空"
 
 #. On the 2nd line we want to know if the power cord is plugged
 #. * in or not
-#: ../common/xfpm-power-common.c:429
+#: ../common/xfpm-power-common.c:443
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"
 "%s"
 msgstr "<b>%s %s</b>\n%s"
 
-#: ../common/xfpm-power-common.c:430
+#: ../common/xfpm-power-common.c:444
 msgid "Not plugged in"
 msgstr "未插入电源"
 
 #. Desktop pc with no battery, just display the vendor and model,
 #. * which will probably just be Computer
-#: ../common/xfpm-power-common.c:436
+#: ../common/xfpm-power-common.c:450
 #, c-format
 msgid "<b>%s %s</b>"
 msgstr "<b>%s %s</b>"
 
 #. unknown device state, just display the percentage
-#: ../common/xfpm-power-common.c:441
+#: ../common/xfpm-power-common.c:455
 #, c-format
 msgid ""
 "<b>%s %s</b>\n"