diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3e2f93b3e..75a226a73 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,16 +2,17 @@
 # This file is put in the public domain.
 # Emfox Zhou <emfox@zju.edu.cn>, 2005.
 # gao stone <gaoghy@gmail.com>, 2008.
-# Aron Xu <happyaron.xu@gmail.com>, 2008, 2009, 2010.
 # Luo Jie <lililjlj@gmail.com>, 2009.
 # eexpress <exp.exp@gmail.com>, 2009.
 # 玉堂白鹤 <yjwork.xfce@gmail.com>, 2010
 # squeeze <squeeze@189.cn>, 2012.
+# Yunqiang Su <wzssyqa@gmail.com>, 2012.
+# Aron Xu <happyaron.xu@gmail.com>, 2008, 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-12-21 00:52+0800\n"
+"POT-Creation-Date: 2012-12-22 02:33+0800\n"
 "PO-Revision-Date: 2012-12-20 22:40+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -32,7 +33,7 @@ msgstr "关于 Enlightenment"
 #: ../src/bin/e_theme_about.c:24 ../src/modules/conf/e_conf.c:179
 #: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:877
 #: ../src/modules/everything/evry_plug_windows.c:452
-#: ../src/modules/fileman/e_fwin.c:2528 ../src/modules/mixer/app_mixer.c:520
+#: ../src/modules/fileman/e_fwin.c:2528 ../src/modules/mixer/app_mixer.c:550
 msgid "Close"
 msgstr "关闭"
 
@@ -52,9 +53,9 @@ msgid ""
 "it.<br><br>To contact us please visit:<br><hilight>http://www.enlightenment."
 "org</><br><br>"
 msgstr ""
-"<title>版权 &copy; 2000-2012 Enlightenment 开发团队</><br><br>"
-"我们希望您向我们编写这个软件时一样喜欢使用它。<br><br>"
-"联系我们请访问：<br><hilight>http://www.enlightenment.org</><br><br>"
+"<title>版权 &copy; 2000-2012 Enlightenment 开发团队</><br><br>我们希望您向我"
+"们编写这个软件时一样喜欢使用它。<br><br>联系我们请访问：<br><hilight>http://"
+"www.enlightenment.org</><br><br>"
 
 #: ../src/bin/e_about.c:69
 msgid "<title>The Team</><br><br>"
@@ -83,8 +84,8 @@ msgstr "杀死"
 #: ../src/bin/e_actions.c:2222 ../src/bin/e_actions.c:2282
 #: ../src/bin/e_actions.c:2342 ../src/bin/e_actions.c:2407
 #: ../src/bin/e_actions.c:2472 ../src/bin/e_confirm_dialog.c:53
-#: ../src/bin/e_desklock.c:1313 ../src/bin/e_fm.c:10411
-#: ../src/bin/e_fm.c:10777 ../src/bin/e_screensaver.c:191
+#: ../src/bin/e_desklock.c:1313 ../src/bin/e_fm.c:10412
+#: ../src/bin/e_fm.c:10778 ../src/bin/e_screensaver.c:191
 #: ../src/modules/quickaccess/e_mod_quickaccess.c:1264
 msgid "No"
 msgstr "否"
@@ -102,7 +103,7 @@ msgstr "您确定要退出吗 Enlightenment？"
 #: ../src/bin/e_actions.c:2280 ../src/bin/e_actions.c:2340
 #: ../src/bin/e_actions.c:2405 ../src/bin/e_actions.c:2470
 #: ../src/bin/e_confirm_dialog.c:52 ../src/bin/e_desklock.c:1311
-#: ../src/bin/e_fm.c:10414 ../src/bin/e_screensaver.c:189
+#: ../src/bin/e_fm.c:10415 ../src/bin/e_screensaver.c:189
 #: ../src/modules/quickaccess/e_mod_quickaccess.c:1264
 msgid "Yes"
 msgstr "是"
@@ -158,7 +159,7 @@ msgstr "您确定要休眠您的电脑吗？"
 msgid "Window : Actions"
 msgstr "窗口：动作"
 
-#: ../src/bin/e_actions.c:2947 ../src/bin/e_fm.c:11542
+#: ../src/bin/e_actions.c:2947 ../src/bin/e_fm.c:11543
 #: ../src/bin/e_int_border_menu.c:669
 msgid "Move"
 msgstr "移动"
@@ -180,12 +181,12 @@ msgstr "菜单"
 msgid "Window Menu"
 msgstr "窗口菜单"
 
-#: ../src/bin/e_actions.c:2977 ../src/bin/e_int_border_menu.c:1051
+#: ../src/bin/e_actions.c:2977 ../src/bin/e_int_border_menu.c:1052
 #: ../src/modules/winlist/e_int_config_winlist.c:216
 msgid "Raise"
 msgstr "提升"
 
-#: ../src/bin/e_actions.c:2982 ../src/bin/e_int_border_menu.c:1059
+#: ../src/bin/e_actions.c:2982 ../src/bin/e_int_border_menu.c:1060
 msgid "Lower"
 msgstr "降低"
 
@@ -337,7 +338,7 @@ msgstr "切换粘附状态"
 #: ../src/modules/comp/e_mod_config.c:444
 #: ../src/modules/comp/e_mod_config.c:753
 #: ../src/modules/conf_window_manipulation/e_int_config_clientlist.c:101
-#: ../src/modules/fileman/e_mod_menu.c:425
+#: ../src/modules/fileman/e_mod_menu.c:426
 #: ../src/modules/ibox/e_mod_config.c:166
 msgid "Desktop"
 msgstr "桌面"
@@ -550,7 +551,7 @@ msgstr "跳转到桌面... 或开始..."
 #: ../src/bin/e_actions.c:3260 ../src/bin/e_actions.c:3262
 #: ../src/bin/e_actions.c:3264 ../src/bin/e_actions.c:3266
 #: ../src/bin/e_actions.c:3269 ../src/bin/e_actions.c:3271
-#: ../src/bin/e_actions.c:3273 ../src/modules/backlight/e_mod_main.c:493
+#: ../src/bin/e_actions.c:3273 ../src/modules/backlight/e_mod_main.c:509
 #: ../src/modules/conf_display/e_mod_main.c:17
 #: ../src/modules/conf_randr/e_mod_main.c:19
 #: ../src/modules/ibox/e_mod_config.c:135 ../src/modules/shot/e_mod_main.c:745
@@ -679,7 +680,7 @@ msgstr "显示主窗口"
 
 #: ../src/bin/e_actions.c:3335
 msgid "Show Favorites Menu"
-msgstr "显示“我的最爱”菜单"
+msgstr "显示收藏菜单"
 
 #: ../src/bin/e_actions.c:3337
 msgid "Show All Applications Menu"
@@ -760,8 +761,8 @@ msgstr ""
 #: ../src/modules/conf_applications/e_int_config_apps.c:275
 #: ../src/modules/conf_display/e_int_config_desklock_fsel.c:87
 #: ../src/modules/conf_intl/e_int_config_imc.c:818
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:430
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:583
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:427
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:580
 #: ../src/modules/conf_theme/e_int_config_startup.c:258
 #: ../src/modules/conf_theme/e_int_config_theme.c:732
 #: ../src/modules/conf_theme/e_int_config_theme.c:1106
@@ -796,7 +797,7 @@ msgstr "立即休眠"
 msgid "Lock"
 msgstr "锁定"
 
-#: ../src/bin/e_actions.c:3438 ../src/bin/e_int_menus.c:1354
+#: ../src/bin/e_actions.c:3438 ../src/bin/e_int_menus.c:1357
 msgid "Cleanup Windows"
 msgstr "重新排列窗口"
 
@@ -841,7 +842,7 @@ msgstr "选择"
 
 #: ../src/bin/e_color_dialog.c:47 ../src/bin/e_eap_editor.c:862
 #: ../src/bin/e_eap_editor.c:925 ../src/bin/e_entry_dialog.c:64
-#: ../src/bin/e_fm.c:9958 ../src/bin/e_fm_prop.c:625
+#: ../src/bin/e_fm.c:9959 ../src/bin/e_fm_prop.c:625
 #: ../src/bin/e_import_dialog.c:194 ../src/bin/e_import_config_dialog.c:537
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:637
 #: ../src/modules/conf_intl/e_int_config_imc_import.c:124
@@ -894,15 +895,15 @@ msgid ""
 "%s<br><br>to:<br>%s<br><br>The rest of the write has been aborted for safety."
 "<br>"
 msgstr ""
-"Enlightenment 在将 <br>%s<br><br> 的配置文件移动至 <br>%s<br><br> 时出错，其他"
-"写操作已安全中止。<br>"
+"Enlightenment 在将 <br>%s<br><br> 的配置文件移动至 <br>%s<br><br> 时出错，其"
+"他写操作已安全中止。<br>"
 
 #. buttons at the bottom
 #. Some buttons
 #: ../src/bin/e_config.c:1732 ../src/bin/e_config.c:2366
 #: ../src/bin/e_config_dialog.c:278 ../src/bin/e_eap_editor.c:860
 #: ../src/bin/e_eap_editor.c:923 ../src/bin/e_entry_dialog.c:63
-#: ../src/bin/e_exec.c:613 ../src/bin/e_fm.c:9957 ../src/bin/e_fm.c:10683
+#: ../src/bin/e_exec.c:613 ../src/bin/e_fm.c:9958 ../src/bin/e_fm.c:10684
 #: ../src/bin/e_fm_prop.c:624 ../src/bin/e_import_config_dialog.c:536
 #: ../src/bin/e_int_border_remember.c:318
 #: ../src/bin/e_int_border_remember.c:507 ../src/bin/e_module.c:431
@@ -1217,7 +1218,7 @@ msgstr "在终端中运行"
 msgid "Show in Menus"
 msgstr "显示在菜单中"
 
-#: ../src/bin/e_eap_editor.c:791 ../src/bin/e_fm.c:8763 ../src/bin/e_fm.c:8923
+#: ../src/bin/e_eap_editor.c:791 ../src/bin/e_fm.c:8764 ../src/bin/e_fm.c:8924
 #: ../src/bin/e_int_border_remember.c:763
 #: ../src/modules/xkbswitch/e_mod_config.c:334
 msgid "Options"
@@ -1232,7 +1233,7 @@ msgstr "为 %s 选择一个图标"
 msgid "Select an Executable"
 msgstr "选择一个可执行文件"
 
-#: ../src/bin/e_entry.c:480 ../src/bin/e_fm.c:9108 ../src/bin/e_fm.c:10776
+#: ../src/bin/e_entry.c:480 ../src/bin/e_fm.c:9109 ../src/bin/e_fm.c:10777
 #: ../src/bin/e_shelf.c:1792 ../src/bin/e_shelf.c:2475
 #: ../src/modules/conf_dialogs/e_int_config_profiles.c:135
 #: ../src/modules/conf_dialogs/e_int_config_profiles.c:339
@@ -1252,15 +1253,15 @@ msgstr "选择一个可执行文件"
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/bin/e_entry.c:490 ../src/bin/e_fm.c:9019
+#: ../src/bin/e_entry.c:490 ../src/bin/e_fm.c:9020
 msgid "Cut"
 msgstr "剪切"
 
-#: ../src/bin/e_entry.c:499 ../src/bin/e_fm.c:9033 ../src/bin/e_fm.c:11537
+#: ../src/bin/e_entry.c:499 ../src/bin/e_fm.c:9034 ../src/bin/e_fm.c:11538
 msgid "Copy"
 msgstr "复制"
 
-#: ../src/bin/e_entry.c:509 ../src/bin/e_fm.c:8824 ../src/bin/e_fm.c:9046
+#: ../src/bin/e_entry.c:509 ../src/bin/e_fm.c:8825 ../src/bin/e_fm.c:9047
 msgid "Paste"
 msgstr "粘贴"
 
@@ -1450,12 +1451,12 @@ msgid "Can't eject device"
 msgstr "无法弹出设备"
 
 #. FIXME: this can be made more clear
-#: ../src/bin/e_fm.c:6565 ../src/bin/e_fm.c:6598 ../src/bin/e_fm.c:9493
-#: ../src/bin/e_fm.c:9505 ../src/bin/e_fm.c:9608 ../src/bin/e_fm.c:9613
-#: ../src/bin/e_fm.c:9629 ../src/bin/e_fm.c:9634 ../src/bin/e_fm.c:10261
-#: ../src/bin/e_fm.c:10264 ../src/bin/e_fm.c:10267 ../src/bin/e_fm.c:10294
-#: ../src/bin/e_fm.c:10298 ../src/bin/e_fm.c:10301 ../src/bin/e_fm.c:10359
-#: ../src/bin/e_fm.c:10584 ../src/bin/e_fm_prop.c:254
+#: ../src/bin/e_fm.c:6565 ../src/bin/e_fm.c:6598 ../src/bin/e_fm.c:9494
+#: ../src/bin/e_fm.c:9506 ../src/bin/e_fm.c:9609 ../src/bin/e_fm.c:9614
+#: ../src/bin/e_fm.c:9630 ../src/bin/e_fm.c:9635 ../src/bin/e_fm.c:10262
+#: ../src/bin/e_fm.c:10265 ../src/bin/e_fm.c:10268 ../src/bin/e_fm.c:10295
+#: ../src/bin/e_fm.c:10299 ../src/bin/e_fm.c:10302 ../src/bin/e_fm.c:10360
+#: ../src/bin/e_fm.c:10585 ../src/bin/e_fm_prop.c:254
 #: ../src/bin/e_shelf.c:2343
 msgid "Error"
 msgstr "错误"
@@ -1465,58 +1466,58 @@ msgstr "错误"
 msgid "The recent DND operation requested for '%s' has failed."
 msgstr ""
 
-#: ../src/bin/e_fm.c:8681 ../src/modules/fileman/e_mod_config.c:357
+#: ../src/bin/e_fm.c:8682 ../src/modules/fileman/e_mod_config.c:357
 msgid "Case Sensitive"
 msgstr "区分大小写"
 
-#: ../src/bin/e_fm.c:8687 ../src/modules/fileman/e_mod_config.c:360
+#: ../src/bin/e_fm.c:8688 ../src/modules/fileman/e_mod_config.c:360
 msgid "Sort By Extension"
 msgstr "按扩展名排序"
 
-#: ../src/bin/e_fm.c:8693 ../src/modules/fileman/e_mod_config.c:363
+#: ../src/bin/e_fm.c:8694 ../src/modules/fileman/e_mod_config.c:363
 msgid "Sort By Modification Time"
 msgstr "按修改时间排序"
 
-#: ../src/bin/e_fm.c:8699 ../src/modules/fileman/e_mod_config.c:366
+#: ../src/bin/e_fm.c:8700 ../src/modules/fileman/e_mod_config.c:366
 msgid "Sort By Size"
 msgstr "按大小排序"
 
-#: ../src/bin/e_fm.c:8708 ../src/modules/fileman/e_mod_config.c:374
+#: ../src/bin/e_fm.c:8709 ../src/modules/fileman/e_mod_config.c:374
 msgid "Directories First"
 msgstr "目录优先"
 
-#: ../src/bin/e_fm.c:8714 ../src/modules/fileman/e_mod_config.c:378
+#: ../src/bin/e_fm.c:8715 ../src/modules/fileman/e_mod_config.c:378
 msgid "Directories Last"
 msgstr "目录置后"
 
-#: ../src/bin/e_fm.c:8747 ../src/bin/e_fm.c:8907
+#: ../src/bin/e_fm.c:8748 ../src/bin/e_fm.c:8908
 #: ../src/modules/fileman/e_mod_config.c:302
 msgid "View Mode"
 msgstr "显示模式"
 
-#: ../src/bin/e_fm.c:8756 ../src/bin/e_fm.c:8916
+#: ../src/bin/e_fm.c:8757 ../src/bin/e_fm.c:8917
 #: ../src/modules/everything/evry_config.c:503
 #: ../src/modules/fileman/e_mod_config.c:382
 msgid "Sorting"
 msgstr "排序"
 
-#: ../src/bin/e_fm.c:8774 ../src/bin/e_fm.c:8934
+#: ../src/bin/e_fm.c:8775 ../src/bin/e_fm.c:8935
 msgid "Refresh View"
 msgstr "刷新视图"
 
-#: ../src/bin/e_fm.c:8785 ../src/bin/e_fm.c:8946
+#: ../src/bin/e_fm.c:8786 ../src/bin/e_fm.c:8947
 msgid "New..."
 msgstr "新建..."
 
-#: ../src/bin/e_fm.c:8805 ../src/bin/e_fm.c:8967 ../src/bin/e_fm.c:8998
+#: ../src/bin/e_fm.c:8806 ../src/bin/e_fm.c:8968 ../src/bin/e_fm.c:8999
 msgid "Actions..."
 msgstr "动作..."
 
-#: ../src/bin/e_fm.c:8832 ../src/bin/e_fm.c:9054 ../src/bin/e_fm.c:11550
+#: ../src/bin/e_fm.c:8833 ../src/bin/e_fm.c:9055 ../src/bin/e_fm.c:11551
 msgid "Link"
 msgstr "连接"
 
-#: ../src/bin/e_fm.c:9116 ../src/bin/e_fm.c:10413 ../src/bin/e_shelf.c:2470
+#: ../src/bin/e_fm.c:9117 ../src/bin/e_fm.c:10414 ../src/bin/e_shelf.c:2470
 #: ../src/modules/conf_shelves/e_int_config_shelf.c:140
 #: ../src/modules/quickaccess/e_mod_config.c:226
 #: ../src/modules/quickaccess/e_mod_config.c:274
@@ -1524,43 +1525,43 @@ msgstr "连接"
 msgid "Rename"
 msgstr "重命名"
 
-#: ../src/bin/e_fm.c:9135
+#: ../src/bin/e_fm.c:9136
 msgid "Unmount"
 msgstr "卸载"
 
-#: ../src/bin/e_fm.c:9140
+#: ../src/bin/e_fm.c:9141
 msgid "Mount"
 msgstr "挂载"
 
-#: ../src/bin/e_fm.c:9145
+#: ../src/bin/e_fm.c:9146
 msgid "Eject"
 msgstr "弹出"
 
-#: ../src/bin/e_fm.c:9160 ../src/bin/e_int_border_remember.c:742
+#: ../src/bin/e_fm.c:9161 ../src/bin/e_int_border_remember.c:742
 #: ../src/modules/ibar/e_mod_main.c:871
 msgid "Properties"
 msgstr "属性"
 
-#: ../src/bin/e_fm.c:9168
+#: ../src/bin/e_fm.c:9169
 msgid "Application Properties"
 msgstr "应用程序属性"
 
-#: ../src/bin/e_fm.c:9176 ../src/bin/e_fm_prop.c:115
+#: ../src/bin/e_fm.c:9177 ../src/bin/e_fm_prop.c:115
 msgid "File Properties"
 msgstr "文件属性"
 
-#: ../src/bin/e_fm.c:9392
+#: ../src/bin/e_fm.c:9393
 msgid "Use default"
 msgstr "使用默认"
 
 #. ob = e_widget_radio_add(evas, _("Icons"), 0, rg);
 #. e_widget_disabled_set(ob, 1);
 #. e_widget_framelist_object_append(of, ob);
-#: ../src/bin/e_fm.c:9422 ../src/modules/fileman/e_mod_config.c:307
+#: ../src/bin/e_fm.c:9423 ../src/modules/fileman/e_mod_config.c:307
 msgid "Grid Icons"
 msgstr "网格图标"
 
-#: ../src/bin/e_fm.c:9430 ../src/modules/fileman/e_mod_config.c:309
+#: ../src/bin/e_fm.c:9431 ../src/modules/fileman/e_mod_config.c:309
 msgid "Custom Icons"
 msgstr "自定义图标"
 
@@ -1570,190 +1571,190 @@ msgstr "自定义图标"
 #. ob = e_widget_radio_add(evas, _("Custom Smart Grid Icons"), 4, rg);
 #. e_widget_disabled_set(ob, 1);
 #. e_widget_framelist_object_append(of, ob);
-#: ../src/bin/e_fm.c:9438 ../src/modules/everything/evry_config.c:430
+#: ../src/bin/e_fm.c:9439 ../src/modules/everything/evry_config.c:430
 #: ../src/modules/everything/evry_config.c:460
 #: ../src/modules/fileman/e_mod_config.c:317
 msgid "List"
 msgstr "列表"
 
 #. / GENERAL SETTNGS ///
-#: ../src/bin/e_fm.c:9446 ../src/modules/everything/evry_config.c:458
+#: ../src/bin/e_fm.c:9447 ../src/modules/everything/evry_config.c:458
 msgid "Default View"
 msgstr "默认查看器"
 
 #. show the icon size as selected (even if it might be influnced by e_scale)
 #. if (e_scale > 0.0)
 #. *   icon_size /= e_scale;
-#: ../src/bin/e_fm.c:9468
+#: ../src/bin/e_fm.c:9469
 #, c-format
 msgid "Icon Size (%d)"
 msgstr "图标大小  (%d)"
 
-#: ../src/bin/e_fm.c:9493
+#: ../src/bin/e_fm.c:9494
 msgid "Could not create a directory!"
 msgstr "无法创建目录！"
 
-#: ../src/bin/e_fm.c:9505
+#: ../src/bin/e_fm.c:9506
 msgid "Could not create a file!"
 msgstr "无法创建文件！"
 
-#: ../src/bin/e_fm.c:9519 ../src/bin/e_fm.c:9544
+#: ../src/bin/e_fm.c:9520 ../src/bin/e_fm.c:9545
 #: ../src/modules/conf_paths/e_int_config_paths.c:206
 msgid "New Directory"
 msgstr "新建目录"
 
-#: ../src/bin/e_fm.c:9519 ../src/bin/e_fm.c:9544
+#: ../src/bin/e_fm.c:9520 ../src/bin/e_fm.c:9545
 msgid "New File"
 msgstr "新建文件"
 
-#: ../src/bin/e_fm.c:9608 ../src/bin/e_fm.c:9629
+#: ../src/bin/e_fm.c:9609 ../src/bin/e_fm.c:9630
 msgid "Already creating a new file for this directory!"
 msgstr "已经在此目录中创建了一个新的文件。"
 
-#: ../src/bin/e_fm.c:9613 ../src/bin/e_fm.c:9634
+#: ../src/bin/e_fm.c:9614 ../src/bin/e_fm.c:9635
 #, c-format
 msgid "%s can't be written to!"
 msgstr "不能写入 %s ！"
 
-#: ../src/bin/e_fm.c:9653
+#: ../src/bin/e_fm.c:9654
 msgid "Directory"
 msgstr "目录"
 
-#: ../src/bin/e_fm.c:9658
+#: ../src/bin/e_fm.c:9659
 #: ../src/modules/conf_applications/e_int_config_defapps.c:312
 msgid "File"
 msgstr "文件"
 
-#: ../src/bin/e_fm.c:9689
+#: ../src/bin/e_fm.c:9690
 msgid "Inherit parent settings"
 msgstr "继承上一级设定"
 
-#: ../src/bin/e_fm.c:9698
+#: ../src/bin/e_fm.c:9699
 msgid "Show Hidden Files"
 msgstr "显示隐藏文件"
 
-#: ../src/bin/e_fm.c:9710
+#: ../src/bin/e_fm.c:9711
 msgid "Remember Ordering"
 msgstr "记住顺序"
 
-#: ../src/bin/e_fm.c:9719
+#: ../src/bin/e_fm.c:9720
 msgid "Sort Now"
 msgstr "现在排序"
 
-#: ../src/bin/e_fm.c:9727
+#: ../src/bin/e_fm.c:9728
 msgid "Single Click Activation"
 msgstr "启用单击"
 
-#: ../src/bin/e_fm.c:9738 ../src/modules/fileman/e_mod_config.c:394
+#: ../src/bin/e_fm.c:9739 ../src/modules/fileman/e_mod_config.c:394
 msgid "Secure Deletion"
 msgstr "安全删除"
 
-#: ../src/bin/e_fm.c:9751
+#: ../src/bin/e_fm.c:9752
 msgid "File Manager Settings"
 msgstr "文件管理器设置"
 
-#: ../src/bin/e_fm.c:9756
+#: ../src/bin/e_fm.c:9757
 msgid "File Icon Settings"
 msgstr "文件图标设置"
 
-#: ../src/bin/e_fm.c:9834 ../src/bin/e_fm.c:10050
+#: ../src/bin/e_fm.c:9835 ../src/bin/e_fm.c:10051
 msgid "Set background..."
 msgstr "设置背景..."
 
-#: ../src/bin/e_fm.c:9842
+#: ../src/bin/e_fm.c:9843
 msgid "Clear background"
 msgstr "清除背景"
 
-#: ../src/bin/e_fm.c:9849 ../src/bin/e_fm.c:10078
+#: ../src/bin/e_fm.c:9850 ../src/bin/e_fm.c:10079
 msgid "Set overlay..."
 msgstr "设定覆盖..."
 
-#: ../src/bin/e_fm.c:9855
+#: ../src/bin/e_fm.c:9856
 msgid "Clear overlay"
 msgstr "设定覆盖"
 
-#: ../src/bin/e_fm.c:10172 ../src/bin/e_fm.c:10508
+#: ../src/bin/e_fm.c:10173 ../src/bin/e_fm.c:10509
 #, c-format
 msgid "Rename %s to:"
 msgstr "重命名 %s 为："
 
-#: ../src/bin/e_fm.c:10174 ../src/bin/e_fm.c:10509
+#: ../src/bin/e_fm.c:10175 ../src/bin/e_fm.c:10510
 msgid "Rename File"
 msgstr "重命名文件"
 
-#: ../src/bin/e_fm.c:10261 ../src/bin/e_fm.c:10294
+#: ../src/bin/e_fm.c:10262 ../src/bin/e_fm.c:10295
 #, c-format
 msgid "%s already exists!"
 msgstr "%s 已存在！"
 
-#: ../src/bin/e_fm.c:10264 ../src/bin/e_fm.c:10298
+#: ../src/bin/e_fm.c:10265 ../src/bin/e_fm.c:10299
 #, c-format
 msgid "%s could not be renamed because it is protected"
 msgstr "%s 无法重命名，因为它是受保护的"
 
-#: ../src/bin/e_fm.c:10267 ../src/bin/e_fm.c:10301
+#: ../src/bin/e_fm.c:10268 ../src/bin/e_fm.c:10302
 msgid "Internal filemanager error :("
 msgstr "内部文件管理器错误 :("
 
-#: ../src/bin/e_fm.c:10355 ../src/bin/e_fm.c:10576
+#: ../src/bin/e_fm.c:10356 ../src/bin/e_fm.c:10577
 msgid "Retry"
 msgstr "重试"
 
-#: ../src/bin/e_fm.c:10356 ../src/bin/e_fm.c:10577 ../src/bin/e_fm.c:11558
+#: ../src/bin/e_fm.c:10357 ../src/bin/e_fm.c:10578 ../src/bin/e_fm.c:11559
 msgid "Abort"
 msgstr "关于"
 
-#: ../src/bin/e_fm.c:10412
+#: ../src/bin/e_fm.c:10413
 msgid "No to all"
 msgstr "全部选否"
 
-#: ../src/bin/e_fm.c:10415
+#: ../src/bin/e_fm.c:10416
 msgid "Yes to all"
 msgstr "全部选是"
 
-#: ../src/bin/e_fm.c:10418
+#: ../src/bin/e_fm.c:10419
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/bin/e_fm.c:10421
+#: ../src/bin/e_fm.c:10422
 #, c-format
 msgid "File already exists, overwrite?<br><hilight>%s</hilight>"
 msgstr "文件已经存在，覆盖吗？<br><hilight>%s</hilight>"
 
-#: ../src/bin/e_fm.c:10579
+#: ../src/bin/e_fm.c:10580
 msgid "Move Source"
 msgstr "移动源"
 
-#: ../src/bin/e_fm.c:10580
+#: ../src/bin/e_fm.c:10581
 msgid "Ignore this"
 msgstr "忽略"
 
-#: ../src/bin/e_fm.c:10581
+#: ../src/bin/e_fm.c:10582
 msgid "Ignore all"
 msgstr "忽略所有"
 
-#: ../src/bin/e_fm.c:10586
+#: ../src/bin/e_fm.c:10587
 #, c-format
 msgid "An error occurred while performing an operation.<br>%s"
 msgstr "执行操作时产生一个错误。<br>%s"
 
-#: ../src/bin/e_fm.c:10779
+#: ../src/bin/e_fm.c:10780
 msgid "Confirm Delete"
 msgstr "确认删除"
 
-#: ../src/bin/e_fm.c:10789
+#: ../src/bin/e_fm.c:10790
 #, c-format
 msgid "Are you sure you want to delete<br><hilight>%s</hilight>?"
 msgstr "您确定要删除 <br><hilight>%s</hilight> 吗？"
 
-#: ../src/bin/e_fm.c:10794
+#: ../src/bin/e_fm.c:10795
 #, c-format
 msgid ""
 "Are you sure you want to delete<br><hilight>all</hilight> the %d files "
 "in<br><hilight>%s</hilight>?"
 msgstr ""
 
-#: ../src/bin/e_fm.c:10804
+#: ../src/bin/e_fm.c:10805
 #, c-format
 msgid ""
 "Are you sure you want to delete<br>the %d selected file in<br><hilight>%s</"
@@ -1796,7 +1797,7 @@ msgstr "无法更改权限: %s"
 #: ../src/bin/e_fm_prop.c:390 ../src/bin/e_shelf.c:1123
 #: ../src/bin/e_shelf.c:2363 ../src/modules/comp/e_mod_config.c:493
 #: ../src/modules/conf_dialogs/e_int_config_profiles.c:316
-#: ../src/modules/conf_display/e_int_config_desk.c:192
+#: ../src/modules/conf_display/e_int_config_desk.c:188
 #: ../src/modules/conf_window_remembers/e_int_config_remembers.c:152
 msgid "Name:"
 msgstr "名字："
@@ -1861,7 +1862,7 @@ msgstr "其它："
 #: ../src/bin/e_widget_fsel.c:348
 #: ../src/modules/conf_theme/e_int_config_transitions.c:218
 #: ../src/modules/conf_theme/e_int_config_theme.c:1414
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:496
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:513
 msgid "Preview"
 msgstr "预览"
 
@@ -2182,7 +2183,7 @@ msgstr "记住这些行为锁"
 msgid "Window"
 msgstr "窗口"
 
-#: ../src/bin/e_int_border_menu.c:149 ../src/bin/e_int_border_menu.c:1011
+#: ../src/bin/e_int_border_menu.c:149 ../src/bin/e_int_border_menu.c:1012
 msgid "Always on Top"
 msgstr "总在上面"
 
@@ -2252,12 +2253,12 @@ msgstr "记住"
 msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"
 
-#: ../src/bin/e_int_border_menu.c:931
+#: ../src/bin/e_int_border_menu.c:932
 #, c-format
 msgid "Screen %d"
 msgstr "屏幕 %d"
 
-#: ../src/bin/e_int_border_menu.c:1022 ../src/bin/e_int_border_prop.c:157
+#: ../src/bin/e_int_border_menu.c:1023 ../src/bin/e_int_border_prop.c:157
 #: ../src/bin/e_int_border_prop.c:179 ../src/modules/comp/e_mod_config.c:458
 #: ../src/modules/comp/e_mod_config.c:767
 #: ../src/modules/conf_theme/e_int_config_fonts.c:100
@@ -2267,55 +2268,55 @@ msgstr "屏幕 %d"
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/bin/e_int_border_menu.c:1033
+#: ../src/bin/e_int_border_menu.c:1034
 msgid "Always Below"
 msgstr "置底"
 
-#: ../src/bin/e_int_border_menu.c:1077
+#: ../src/bin/e_int_border_menu.c:1078
 msgid "Pin to Desktop"
 msgstr "固定到桌面"
 
-#: ../src/bin/e_int_border_menu.c:1088
+#: ../src/bin/e_int_border_menu.c:1089
 msgid "Unpin from Desktop"
 msgstr "解除固定"
 
-#: ../src/bin/e_int_border_menu.c:1178
+#: ../src/bin/e_int_border_menu.c:1179
 msgid "Select Border Style"
 msgstr "选择边框样式"
 
-#: ../src/bin/e_int_border_menu.c:1190
+#: ../src/bin/e_int_border_menu.c:1191
 msgid "Use Enlightenment Default Icon Preference"
 msgstr "使用 Enlightenment 默认图标选项"
 
-#: ../src/bin/e_int_border_menu.c:1198
+#: ../src/bin/e_int_border_menu.c:1199
 msgid "Use Application Provided Icon"
 msgstr "使用应用程序提供的图标 "
 
-#: ../src/bin/e_int_border_menu.c:1206
+#: ../src/bin/e_int_border_menu.c:1207
 msgid "Use User Defined Icon"
 msgstr "使用用户自定义图标"
 
-#: ../src/bin/e_int_border_menu.c:1215 ../src/bin/e_int_border_remember.c:734
+#: ../src/bin/e_int_border_menu.c:1216 ../src/bin/e_int_border_remember.c:734
 msgid "Offer Resistance"
 msgstr "阻抗"
 
-#: ../src/bin/e_int_border_menu.c:1276
+#: ../src/bin/e_int_border_menu.c:1277
 msgid "Window List"
 msgstr "窗口列表"
 
-#: ../src/bin/e_int_border_menu.c:1286 ../src/modules/pager/e_mod_main.c:265
-#: ../src/modules/pager/e_mod_main.c:2916
-#: ../src/modules/pager/e_mod_main.c:2923
-#: ../src/modules/pager/e_mod_main.c:2930
-#: ../src/modules/pager/e_mod_main.c:2932
-#: ../src/modules/pager/e_mod_main.c:2934
-#: ../src/modules/pager/e_mod_main.c:2936
-#: ../src/modules/pager/e_mod_main.c:2938
-#: ../src/modules/pager/e_mod_main.c:2940
+#: ../src/bin/e_int_border_menu.c:1287 ../src/modules/pager/e_mod_main.c:265
+#: ../src/modules/pager/e_mod_main.c:2917
+#: ../src/modules/pager/e_mod_main.c:2924
+#: ../src/modules/pager/e_mod_main.c:2931
+#: ../src/modules/pager/e_mod_main.c:2933
+#: ../src/modules/pager/e_mod_main.c:2935
+#: ../src/modules/pager/e_mod_main.c:2937
+#: ../src/modules/pager/e_mod_main.c:2939
+#: ../src/modules/pager/e_mod_main.c:2941
 msgid "Pager"
 msgstr "分页器"
 
-#: ../src/bin/e_int_border_menu.c:1296 ../src/modules/wizard/page_180.c:24
+#: ../src/bin/e_int_border_menu.c:1297 ../src/modules/wizard/page_180.c:24
 msgid "Taskbar"
 msgstr "任务栏"
 
@@ -2441,7 +2442,7 @@ msgstr "ICCCM"
 
 #: ../src/bin/e_int_border_prop.c:444 ../src/bin/e_int_border_remember.c:651
 #: ../src/modules/comp/e_mod_config.c:392
-#: ../src/modules/comp/e_mod_config.c:702 ../src/modules/wizard/page_050.c:94
+#: ../src/modules/comp/e_mod_config.c:702 ../src/modules/wizard/page_050.c:95
 msgid "Title"
 msgstr "标题"
 
@@ -2477,7 +2478,7 @@ msgstr "基本尺寸"
 msgid "Resize Steps"
 msgstr "变换尺寸步骤"
 
-#: ../src/bin/e_int_border_prop.c:457 ../src/modules/wizard/page_050.c:127
+#: ../src/bin/e_int_border_prop.c:457 ../src/modules/wizard/page_050.c:128
 msgid "Sizing"
 msgstr "调整大小"
 
@@ -2553,7 +2554,7 @@ msgstr "请求位置"
 #: ../src/modules/everything/evry_plug_settings.c:183
 #: ../src/modules/ibar/e_mod_main.c:379 ../src/modules/ibar/e_mod_main.c:864
 #: ../src/modules/ibox/e_mod_main.c:302 ../src/modules/ibox/e_mod_main.c:678
-#: ../src/modules/pager/e_mod_main.c:876
+#: ../src/modules/pager/e_mod_main.c:877
 #: ../src/modules/temperature/e_mod_main.c:230
 #: ../src/modules/mixer/e_mod_main.c:777
 #: ../src/modules/connman/e_mod_main.c:459
@@ -2614,12 +2615,10 @@ msgstr ""
 "hilight>按钮，您的操作就会生效。<br>如果您不想，按下<hilight>取消</hilight>，"
 "那就什么都不会发生。"
 
-#: syq:FIXME
 #: ../src/bin/e_int_border_remember.c:498
 msgid "No match properties set"
 msgstr "没有匹配的属性被设定"
 
-#: syq:FIXME
 #: ../src/bin/e_int_border_remember.c:501
 msgid ""
 "You are trying to ask Enlightenment to remember to apply<br>properties (such "
@@ -2834,7 +2833,7 @@ msgstr "最常用程序"
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../src/bin/e_int_menus.c:193 ../src/bin/e_int_menus.c:1312
+#: ../src/bin/e_int_menus.c:193 ../src/bin/e_int_menus.c:1315
 #: ../src/modules/conf_window_manipulation/e_mod_main.c:17
 #: ../src/modules/conf_window_remembers/e_mod_main.c:14
 #: ../src/modules/everything/evry_plug_windows.c:425
@@ -2843,7 +2842,7 @@ msgstr "应用程序"
 msgid "Windows"
 msgstr "窗口"
 
-#: ../src/bin/e_int_menus.c:203 ../src/bin/e_int_menus.c:1367
+#: ../src/bin/e_int_menus.c:203 ../src/bin/e_int_menus.c:1370
 msgid "Lost Windows"
 msgstr "丢失的窗口"
 
@@ -2870,33 +2869,33 @@ msgstr "书架"
 msgid "Show/Hide All Windows"
 msgstr "显示/隐藏所有窗口"
 
-#: ../src/bin/e_int_menus.c:701
+#: ../src/bin/e_int_menus.c:699
 msgid "No applications"
 msgstr "无应用程序"
 
-#: ../src/bin/e_int_menus.c:942
+#: ../src/bin/e_int_menus.c:944
 msgid "Set Virtual Desktops"
 msgstr "设定虚拟桌面"
 
-#: ../src/bin/e_int_menus.c:1318 ../src/bin/e_int_menus.c:1511
+#: ../src/bin/e_int_menus.c:1321 ../src/bin/e_int_menus.c:1514
 msgid "No windows"
 msgstr "无窗口"
 
-#: ../src/bin/e_int_menus.c:1424 ../src/bin/e_int_menus.c:1524
+#: ../src/bin/e_int_menus.c:1427 ../src/bin/e_int_menus.c:1527
 msgid "Untitled window"
 msgstr "未命名的窗口"
 
-#: ../src/bin/e_int_menus.c:1618 ../src/bin/e_shelf.c:1121
+#: ../src/bin/e_int_menus.c:1621 ../src/bin/e_shelf.c:1121
 #: ../src/bin/e_shelf.c:1636
 #: ../src/modules/conf_shelves/e_int_config_shelf.c:191
 msgid "Shelf"
 msgstr "书架"
 
-#: ../src/bin/e_int_menus.c:1686
+#: ../src/bin/e_int_menus.c:1689
 msgid "Add a Shelf"
 msgstr "添加书架"
 
-#: ../src/bin/e_int_menus.c:1693
+#: ../src/bin/e_int_menus.c:1696
 msgid "Delete a Shelf"
 msgstr "删除书架"
 
@@ -2947,7 +2946,6 @@ msgstr "鼠标移入时显示"
 msgid "Show on mouse click"
 msgstr "鼠标点击时显示"
 
-#: syq:FIXME
 #: ../src/bin/e_int_shelf_config.c:233
 msgid "Hide timeout"
 msgstr "隐藏超时"
@@ -4260,7 +4258,7 @@ msgid "Mount status:"
 msgstr "挂载状态:"
 
 #: ../src/bin/e_widget_filepreview.c:335
-#: ../src/modules/comp/e_mod_config.c:487 ../src/modules/mixer/app_mixer.c:394
+#: ../src/modules/comp/e_mod_config.c:487 ../src/modules/mixer/app_mixer.c:424
 msgid "Type:"
 msgstr "类型："
 
@@ -4288,7 +4286,7 @@ msgstr "读写"
 
 #: ../src/bin/e_widget_filepreview.c:530 ../src/bin/e_widget_filepreview.c:541
 msgid "Unmounted"
-msgstr "卸载"
+msgstr "已卸载"
 
 #: ../src/bin/e_widget_filepreview.c:640
 #, c-format
@@ -4298,12 +4296,12 @@ msgstr "您"
 #: ../src/bin/e_widget_filepreview.c:689
 #, c-format
 msgid "Protected"
-msgstr "受保护的"
+msgstr "受保护"
 
 #: ../src/bin/e_widget_filepreview.c:698 ../src/bin/e_widget_filepreview.c:707
 #, c-format
 msgid "Forbidden"
-msgstr "禁用"
+msgstr "禁止"
 
 #: ../src/bin/e_widget_fsel.c:334
 msgid "Add to Favorites"
@@ -4327,7 +4325,7 @@ msgstr "访问设置"
 msgid "Backlight"
 msgstr "背光"
 
-#: ../src/modules/backlight/e_mod_main.c:493
+#: ../src/modules/backlight/e_mod_main.c:509
 msgid "Backlight Controls"
 msgstr "背光控制"
 
@@ -4442,9 +4440,8 @@ msgid "Battery"
 msgstr "电池"
 
 #: ../src/modules/battery/e_mod_main.c:200
-#, fuzzy
 msgid "Power Management Timing"
-msgstr "电源管理"
+msgstr "电源管理时间"
 
 #: ../src/modules/battery/e_mod_main.c:458
 #: ../src/modules/battery/e_mod_main.c:493
@@ -4504,12 +4501,10 @@ msgstr "24 小时"
 msgid "Date"
 msgstr "日期"
 
-# 不知道E17这个啥意思，选的话，日期格式是 六，1 12月，2012
 #: ../src/modules/clock/e_mod_config.c:105
 msgid "Full"
 msgstr "完整"
 
-# 不知道E17这个啥意思，选的话，日期格式是 六，2012年12月1日
 #: ../src/modules/clock/e_mod_config.c:107
 msgid "Numbers"
 msgstr "数字"
@@ -4534,69 +4529,72 @@ msgstr "周末"
 
 #: ../src/modules/clock/e_mod_config.c:138
 msgid "Days"
-msgstr "天数"
+msgstr "平日"
 
 #: ../src/modules/clock/e_mod_main.c:865
 msgid "Toggle calendar"
 msgstr "切换日历"
 
-#: ../src/modules/comp/e_mod_comp.c:3700 ../src/modules/comp/e_mod_comp.c:3722
-#: ../src/modules/comp/e_mod_comp.c:4135 ../src/modules/comp/e_mod_comp.c:4145
+#: ../src/modules/comp/e_mod_comp.c:3710 ../src/modules/comp/e_mod_comp.c:3732
+#: ../src/modules/comp/e_mod_comp.c:4145 ../src/modules/comp/e_mod_comp.c:4155
 msgid "Compositor Error"
-msgstr "合成器出错"
+msgstr "合成器错误"
 
-#: ../src/modules/comp/e_mod_comp.c:3701
-#, fuzzy
+#: ../src/modules/comp/e_mod_comp.c:3711
 msgid "Another compositor is already running<br>on your display server."
-msgstr "其他合成器已经运行<br>在您的屏幕。"
+msgstr "已有其他和称其运行在您的显示服务器上。。"
 
-#: ../src/modules/comp/e_mod_comp.c:3723
+#: ../src/modules/comp/e_mod_comp.c:3733
 msgid ""
 "Your display server does not support the<br>compositor overlay window. This "
 "is needed<br>for it to function."
 msgstr ""
+"您的显示服务器不支持合成器覆盖窗口。<br>合成器必须此功能方可正常工作。"
 
-#: ../src/modules/comp/e_mod_comp.c:3797
+#: ../src/modules/comp/e_mod_comp.c:3807
 msgid "Compositor Warning"
 msgstr "合成器告警"
 
-#: ../src/modules/comp/e_mod_comp.c:3798
+#: ../src/modules/comp/e_mod_comp.c:3808
 msgid ""
 "Your display driver does not support OpenGL, or<br>no OpenGL engines were "
 "compiled or installed for<br>Evas or Ecore-Evas. Falling back to software "
 "engine."
 msgstr ""
+"您的显示服务器不支持 OpenGL<br> 或 Evas 及 Ecore-Evas 编译时没有开启任何<br>"
+"OpenGL 引擎。现在使用软件引擎。"
 
-#: ../src/modules/comp/e_mod_comp.c:4136
+#: ../src/modules/comp/e_mod_comp.c:4146
 msgid ""
 "Your display server does not support XComposite,<br>or Ecore-X was built "
 "without XComposite support.<br>Note that for composite support you will also "
 "need<br>XRender and XFixes support in X11 and Ecore."
 msgstr ""
+"您的显示服务器不支持 DComposite<br>或 Ecore 编译时为开启 XComposite 支持。<br>"
+"请注意为支持混成，您还需要在<br>X11 和 Ecore 中开启 XRender 和 XFixes 支持。"
 
-#: ../src/modules/comp/e_mod_comp.c:4146
+#: ../src/modules/comp/e_mod_comp.c:4156
 msgid ""
 "Your display server does not support XDamage<br>or Ecore was built without "
 "XDamage support."
 msgstr ""
+"您的显示服务器不支持 XDamage<br>或 Ecore 编译时未开启 XDamage 支持。"
 
 #: ../src/modules/comp/e_mod_config.c:106
 msgid "Composite Settings"
-msgstr "复合设置"
+msgstr "混成设置"
 
 #: ../src/modules/comp/e_mod_config.c:265
 msgid "Visible"
-msgstr ""
+msgstr "可见"
 
 #: ../src/modules/comp/e_mod_config.c:270
-#, fuzzy
 msgid "Focus-Out"
-msgstr "焦点"
+msgstr "失焦"
 
 #: ../src/modules/comp/e_mod_config.c:275
-#, fuzzy
 msgid "Focus-In"
-msgstr "焦点"
+msgstr "聚焦"
 
 #: ../src/modules/comp/e_mod_config.c:440
 #: ../src/modules/comp/e_mod_config.c:470
@@ -4691,7 +4689,6 @@ msgid "Style:"
 msgstr "风格:"
 
 #: ../src/modules/comp/e_mod_config.c:685
-#, fuzzy
 msgid "Edit Match"
 msgstr "编辑匹配"
 
@@ -4739,7 +4736,7 @@ msgid "Del"
 msgstr "删除"
 
 #: ../src/modules/comp/e_mod_config.c:1100
-#: ../src/modules/mixer/app_mixer.c:415
+#: ../src/modules/mixer/app_mixer.c:445
 msgid "Edit"
 msgstr "编辑"
 
@@ -4754,7 +4751,7 @@ msgstr "E"
 
 #: ../src/modules/comp/e_mod_config.c:1130
 msgid "Over"
-msgstr ""
+msgstr "上"
 
 #: ../src/modules/comp/e_mod_config.c:1134
 #: ../src/modules/conf_menus/e_int_config_menus.c:277
@@ -4783,7 +4780,7 @@ msgstr "同步窗口"
 
 #: ../src/modules/comp/e_mod_config.c:1179
 msgid "Loose sync"
-msgstr "丢失同步"
+msgstr "宽松同步"
 
 #: ../src/modules/comp/e_mod_config.c:1181
 msgid "Grab Server during draw"
@@ -4823,11 +4820,11 @@ msgstr "Tear-free 更新(VSynced)"
 
 #: ../src/modules/comp/e_mod_config.c:1205
 msgid "Texture from pixmap"
-msgstr ""
+msgstr "使用位图纹理"
 
 #: ../src/modules/comp/e_mod_config.c:1212
 msgid "Assume swapping method:"
-msgstr ""
+msgstr "默认交换方法："
 
 #: ../src/modules/comp/e_mod_config.c:1215
 msgid "Auto"
@@ -4835,11 +4832,11 @@ msgstr "自动"
 
 #: ../src/modules/comp/e_mod_config.c:1217
 msgid "Invalidate (full redraw)"
-msgstr "无效（完全重绘）"
+msgstr "设置无效(完全重绘)"
 
 #: ../src/modules/comp/e_mod_config.c:1219
 msgid "Copy from back to front"
-msgstr ""
+msgstr "从后方复制到前方"
 
 #: ../src/modules/comp/e_mod_config.c:1221
 msgid "Double buffered swaps"
@@ -4956,7 +4953,7 @@ msgstr "渲染"
 
 #: ../src/modules/comp/e_mod_main.c:43 ../src/modules/comp/e_mod_main.c:74
 msgid "Composite"
-msgstr "复合"
+msgstr "混成"
 
 #: ../src/modules/comp/e_mod_main.c:75
 msgid ""
@@ -5199,7 +5196,7 @@ msgstr "用户环境"
 
 #. create config diaolg for NULL object/data
 #: ../src/modules/conf_display/e_int_config_desks.c:52
-#: ../src/modules/pager/e_mod_main.c:884
+#: ../src/modules/pager/e_mod_main.c:885
 msgid "Virtual Desktops Settings"
 msgstr "虚拟桌面设置"
 
@@ -5243,7 +5240,7 @@ msgid "Wrap desktops around when flipping"
 msgstr "翻转时反转桌面？"
 
 #: ../src/modules/conf_display/e_int_config_desks.c:200
-#: ../src/modules/conf_display/e_int_config_desk.c:198
+#: ../src/modules/conf_display/e_int_config_desk.c:194
 msgid "Desktop Window Profile"
 msgstr "桌面窗口配置"
 
@@ -5257,7 +5254,7 @@ msgstr "桌面"
 
 #: ../src/modules/conf_display/e_int_config_desks.c:216
 msgid "Pane"
-msgstr "框"
+msgstr "面板"
 
 #: ../src/modules/conf_display/e_int_config_desks.c:219
 msgid "Zoom"
@@ -5283,19 +5280,19 @@ msgstr "翻转动画"
 msgid "Desk Settings"
 msgstr "桌面设置"
 
-#: ../src/modules/conf_display/e_int_config_desk.c:191
+#: ../src/modules/conf_display/e_int_config_desk.c:187
 msgid "Desktop Name"
 msgstr "桌面名称"
 
-#: ../src/modules/conf_display/e_int_config_desk.c:199
+#: ../src/modules/conf_display/e_int_config_desk.c:195
 msgid "Profile Name:"
 msgstr "配置名称:"
 
-#: ../src/modules/conf_display/e_int_config_desk.c:206
+#: ../src/modules/conf_display/e_int_config_desk.c:202
 msgid "Desktop Wallpaper"
 msgstr "桌面壁纸"
 
-#: ../src/modules/conf_display/e_int_config_desk.c:212
+#: ../src/modules/conf_display/e_int_config_desk.c:208
 #: ../src/modules/fileman/e_int_config_mime.c:184
 msgid "Set"
 msgstr "设定"
@@ -5307,8 +5304,8 @@ msgstr "选择背景..."
 #. create dir radios
 #: ../src/modules/conf_display/e_int_config_desklock_fsel.c:84
 #: ../src/modules/conf_intl/e_int_config_imc.c:813
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:426
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:579
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:423
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:576
 #: ../src/modules/conf_theme/e_int_config_startup.c:253
 #: ../src/modules/conf_theme/e_int_config_theme.c:728
 #: ../src/modules/conf_theme/e_int_config_theme.c:1103
@@ -5376,13 +5373,13 @@ msgstr "%1.0f 秒"
 
 #: ../src/modules/conf_display/e_int_config_desklock.c:321
 msgid "Lock when idle time exceeded"
-msgstr "超出空闲时间就锁定"
+msgstr "空闲指定时间后锁定"
 
 #: ../src/modules/conf_display/e_int_config_desklock.c:326
 #: ../src/modules/conf_display/e_int_config_screensaver.c:166
 #, c-format
 msgid "%1.0f minutes"
-msgstr "%1.0f 分钟"
+msgstr "%1.0f 分"
 
 #: ../src/modules/conf_display/e_int_config_desklock.c:331
 msgid "Timers"
@@ -5437,7 +5434,7 @@ msgstr "当屏幕空白时挂起"
 
 #: ../src/modules/conf_display/e_int_config_screensaver.c:175
 msgid "Suspend even if AC"
-msgstr ""
+msgstr "使用交流电源时仍然挂起"
 
 #: ../src/modules/conf_display/e_int_config_screensaver.c:180
 msgid "Suspend delay"
@@ -5495,16 +5492,16 @@ msgstr "空闲淡出时间"
 #: ../src/modules/conf_display/e_int_config_dpms.c:164
 #, c-format
 msgid "%1.0f second(s)"
-msgstr "%1.0f 秒(s)"
+msgstr "%1.0f 秒"
 
 #: ../src/modules/conf_display/e_int_config_dpms.c:170
 msgid "Fade Time"
-msgstr "淡入淡出时间"
+msgstr "渐变时间"
 
 #: ../src/modules/conf_display/e_int_config_dpms.c:172
 #, c-format
 msgid "%1.1f second(s)"
-msgstr "%1.1f 秒(s)"
+msgstr "%1.1f 秒"
 
 #. Virtual desktop settings
 #: ../src/modules/conf_display/e_mod_main.c:21
@@ -5682,22 +5679,21 @@ msgstr "左下边缘"
 #: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1419
 #, c-format
 msgid "(left clickable)"
-msgstr ""
+msgstr "(左侧可点击)"
 
 #: ../src/modules/conf_edgebindings/e_int_config_edgebindings.c:1421
-#, fuzzy, c-format
+#, c-format
 msgid "(clickable)"
-msgstr "可点击的边"
+msgstr "(可点击)"
 
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:584
-#, fuzzy
 msgid "Signal Binding Error"
-msgstr "边缘绑定出错"
+msgstr "信号绑定出错"
 
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:574
 msgid "Signal and Source must NOT be blank!"
-msgstr ""
+msgstr "信号和源不能为空！"
 
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:585
 #, fuzzy, c-format
@@ -5709,25 +5705,31 @@ msgstr ""
 "按键绑定序列。"
 
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:634
-#, fuzzy
 msgid "Add Signal Binding"
-msgstr "ACPI 绑定"
+msgstr "添加信号绑定"
+
+#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:645
+msgid "Source:"
+msgstr "源："
+
+#: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:650
+msgid "Signal:"
+msgstr "信号："
 
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:804
 #: ../src/modules/conf_edgebindings/e_mod_main.c:25
 msgid "Signal Bindings"
-msgstr ""
+msgstr "信号绑定"
 
 #: ../src/modules/conf_edgebindings/e_int_config_signalbindings.c:865
-#, fuzzy
 msgid "Signal Bindings Settings"
-msgstr "边缘绑定设置"
+msgstr "信号绑定设置"
 
 #. Menus and dialogs
 #: ../src/modules/conf_edgebindings/e_mod_main.c:17
 #: ../src/modules/conf_interaction/e_mod_main.c:17
 #: ../src/modules/conf_keybindings/e_mod_main.c:17
-#: ../src/modules/mixer/app_mixer.c:281 ../src/modules/mixer/app_mixer.c:299
+#: ../src/modules/mixer/app_mixer.c:308 ../src/modules/mixer/app_mixer.c:326
 #: ../src/modules/xkbswitch/e_mod_main.c:71
 msgid "Input"
 msgstr "输入"
@@ -6127,7 +6129,7 @@ msgstr "管理器"
 
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:745
 msgid "Mouse Buttons"
-msgstr "鼠标按钮"
+msgstr "鼠标按键"
 
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:805
 msgid "Mouse Wheels"
@@ -6139,7 +6141,7 @@ msgstr "鼠标滚轮"
 #: ../src/modules/pager/e_mod_config.c:399
 #, c-format
 msgid "Left button"
-msgstr "左按钮"
+msgstr "左键"
 
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1180
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1194
@@ -6147,7 +6149,7 @@ msgstr "左按钮"
 #: ../src/modules/pager/e_mod_config.c:394
 #, c-format
 msgid "Right button"
-msgstr "右按钮"
+msgstr "右键"
 
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1183
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1199
@@ -6156,18 +6158,18 @@ msgstr "右按钮"
 #: ../src/modules/pager/e_mod_config.c:409
 #, c-format
 msgid "Button %i"
-msgstr "按钮 %i"
+msgstr "按键 %i"
 
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1189
 #: ../src/modules/pager/e_mod_config.c:388
 #, c-format
 msgid "Middle button"
-msgstr "中间按钮"
+msgstr "中键"
 
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1211
 #, c-format
 msgid "Extra button (%d)"
-msgstr "额外按钮 (%d)"
+msgstr "额外按键(%d)"
 
 #: ../src/modules/conf_keybindings/e_int_config_mousebindings.c:1227
 msgid "Mouse Wheel Up"
@@ -6205,9 +6207,9 @@ msgid "Main Menu"
 msgstr "主菜单"
 
 #: ../src/modules/conf_menus/e_int_config_menus.c:258
-#: ../src/modules/fileman/e_mod_menu.c:433
+#: ../src/modules/fileman/e_mod_menu.c:434
 msgid "Favorites"
-msgstr "我的最爱"
+msgstr "收藏"
 
 #: ../src/modules/conf_menus/e_int_config_menus.c:264
 msgid "Applications Display"
@@ -6323,7 +6325,7 @@ msgid "Themes"
 msgstr "主题"
 
 #: ../src/modules/conf_paths/e_int_config_paths.c:78
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:523
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:540
 #: ../src/modules/everything/evry_config.c:438
 #: ../src/modules/everything/evry_config.c:464
 msgid "Icons"
@@ -6370,7 +6372,7 @@ msgstr "引擎设定"
 #: ../src/modules/conf_performance/e_int_config_engine.c:87
 #: ../src/modules/conf_performance/e_int_config_engine.c:108
 msgid "Use ARGB instead of shaped windows"
-msgstr ""
+msgstr "使用 ARGB 替代普通窗口"
 
 #: ../src/modules/conf_performance/e_int_config_engine.c:110
 msgid ""
@@ -6378,6 +6380,8 @@ msgid ""
 "does not support composite.<br><br>Are you sure you wish to enable ARGB "
 "support?"
 msgstr ""
+"您已选择启用 ARGB 混成支持，但是您当前的<br>平不支持混成。<br><br>"
+"您确定要启用 ARGB 支持吗？"
 
 #: ../src/modules/conf_performance/e_int_config_engine.c:114
 msgid "Enable"
@@ -6463,7 +6467,7 @@ msgstr "允许级别"
 
 #: ../src/modules/conf_performance/e_int_config_powermanagement.c:129
 msgid "Time to defer power-hungry tasks"
-msgstr ""
+msgstr "推迟能耗较大任务的时间"
 
 #: ../src/modules/conf_performance/e_int_config_powermanagement.c:140
 msgid "Min"
@@ -6532,45 +6536,44 @@ msgstr "设置书架: 显示"
 #: ../src/modules/conf_shelves/e_int_config_shelf.c:388
 #, c-format
 msgid "Are you sure you want to delete \"%s\"?"
-msgstr "确定要删除此 \"%s\"?"
+msgstr "确定要删除 %s？"
 
 #: ../src/modules/conf_shelves/e_int_config_shelf.c:391
 msgid "Confirm Shelf Deletion"
-msgstr "确认书架删除"
+msgstr "确认删除书架"
 
 #: ../src/modules/conf_theme/e_int_config_wallpaper.c:103
 msgid "Wallpaper Settings"
 msgstr "壁纸设置"
 
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:436
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:589
-#, fuzzy
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:433
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:586
 msgid "Go up a directory"
-msgstr "到上一级目录"
+msgstr "向上一级目录"
 
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:468
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:614
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:465
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:611
 msgid "Use Theme Wallpaper"
 msgstr "使用主题墙纸"
 
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:473
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:619
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:470
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:616
 msgid "Picture..."
 msgstr "图片..."
 
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:635
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:632
 msgid "Where to place the Wallpaper"
 msgstr "壁纸位置"
 
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:636
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:633
 msgid "All Desktops"
 msgstr "所有桌面"
 
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:638
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:635
 msgid "This Desktop"
 msgstr "这个桌面"
 
-#: ../src/modules/conf_theme/e_int_config_wallpaper.c:640
+#: ../src/modules/conf_theme/e_int_config_wallpaper.c:637
 msgid "This Screen"
 msgstr "这个屏幕"
 
@@ -6597,11 +6600,11 @@ msgstr "激活标题边框"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:80
 msgid "Border Frame"
-msgstr ""
+msgstr "边缘帧"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:81
 msgid "Border Frame Active"
-msgstr ""
+msgstr "边缘帧活动"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:82
 msgid "Error Text"
@@ -6618,7 +6621,7 @@ msgstr "菜单标题"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:85
 msgid "Menu Title Active"
-msgstr "菜激活单标题"
+msgstr "菜单标题活动"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:86
 #: ../src/modules/conf_theme/e_int_config_fonts.c:60
@@ -6627,11 +6630,11 @@ msgstr "菜单项目"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:87
 msgid "Menu Item Active"
-msgstr "激活菜单条目"
+msgstr "菜单项活动"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:88
 msgid "Menu Item Disabled"
-msgstr "禁用菜单项"
+msgstr "菜单项已禁用"
 
 #: ../src/modules/conf_theme/e_int_config_color_classes.c:89
 #: ../src/modules/conf_theme/e_int_config_fonts.c:65
@@ -6889,15 +6892,15 @@ msgstr "Exebuf 命令"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:76
 msgid "Splash Title"
-msgstr "Splash 标题"
+msgstr "飞溅屏幕标题"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:77
 msgid "Splash Text"
-msgstr "Splash 文本"
+msgstr "飞溅屏幕文本"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:78
 msgid "Splash Version"
-msgstr "Splash 版本"
+msgstr "飞溅屏幕版本"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:79
 msgid "Digital Clock"
@@ -7041,79 +7044,79 @@ msgstr "自动"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:694
 msgid "Font Fallbacks"
-msgstr "字体回滚"
+msgstr "备用字体"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:695
 msgid "Fallback Name"
-msgstr "回滚名称"
+msgstr "备用名称"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:707
 msgid "Enable Fallbacks"
-msgstr "启用回滚"
+msgstr "启用备用"
 
 #: ../src/modules/conf_theme/e_int_config_fonts.c:716
 msgid "Hinting / Fallbacks"
-msgstr "微调和回滚"
+msgstr "微调和备用"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:131
+#: ../src/modules/conf_theme/e_int_config_scale.c:132
 msgid "Factor"
 msgstr ""
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:179
+#: ../src/modules/conf_theme/e_int_config_scale.c:180
 msgid "Scale Settings"
 msgstr "缩放设置"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:231
+#: ../src/modules/conf_theme/e_int_config_scale.c:232
 msgid "DPI Scaling"
 msgstr "DPI 缩放"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:301
+#: ../src/modules/conf_theme/e_int_config_scale.c:302
 msgid "Don't Scale"
 msgstr "不缩放"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:304
+#: ../src/modules/conf_theme/e_int_config_scale.c:305
 msgid "Scale relative to screen DPI"
 msgstr "按屏幕 DPI 比例缩放"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:309
+#: ../src/modules/conf_theme/e_int_config_scale.c:310
 #, c-format
 msgid "Base DPI (Currently %i DPI)"
 msgstr "基准 DPI(当前 %i DPI)"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:313
+#: ../src/modules/conf_theme/e_int_config_scale.c:314
 #, c-format
 msgid "%1.0f DPI"
 msgstr "%1.0f DPI"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:317
+#: ../src/modules/conf_theme/e_int_config_scale.c:318
 msgid "Custom scaling factor"
 msgstr "自定义缩放系数"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:320
+#: ../src/modules/conf_theme/e_int_config_scale.c:321
 #, c-format
 msgid "%1.2f x"
 msgstr "%1.2f x"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:324
+#: ../src/modules/conf_theme/e_int_config_scale.c:325
 #: ../src/modules/conf_window_manipulation/e_int_config_window_geometry.c:213
 msgid "Policy"
 msgstr "策略"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:329
+#: ../src/modules/conf_theme/e_int_config_scale.c:330
 msgid "Minimum"
 msgstr "最小"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:332
-#: ../src/modules/conf_theme/e_int_config_scale.c:339
+#: ../src/modules/conf_theme/e_int_config_scale.c:333
+#: ../src/modules/conf_theme/e_int_config_scale.c:340
 #, c-format
 msgid "%1.2f times"
 msgstr "%1.0f 次"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:336
+#: ../src/modules/conf_theme/e_int_config_scale.c:337
 msgid "Maximum"
 msgstr "最大"
 
-#: ../src/modules/conf_theme/e_int_config_scale.c:343
+#: ../src/modules/conf_theme/e_int_config_scale.c:344
 msgid "Constraints"
 msgstr "约束"
 
@@ -7123,7 +7126,7 @@ msgstr "启动设置"
 
 #: ../src/modules/conf_theme/e_int_config_startup.c:317
 msgid "Show Splash Screen on Login"
-msgstr "登录时显示 Splash 飞溅屏幕"
+msgstr "登录时显示飞溅屏幕"
 
 #: ../src/modules/conf_theme/e_int_config_transitions.c:46
 msgid "Transition Settings"
@@ -7162,7 +7165,7 @@ msgstr "主题文件出错"
 #: ../src/modules/conf_theme/e_int_config_theme.c:611
 #, c-format
 msgid "%s is probably not an E17 theme!"
-msgstr "%s 可能不是一个E17主题！"
+msgstr "%s 可能不是一个 E17 主题！"
 
 #: ../src/modules/conf_theme/e_int_config_theme.c:773
 msgid " Import..."
@@ -7203,26 +7206,26 @@ msgstr "Elightenment 无法导入该主题。<br><br>您确定那是一个有效
 msgid "Enlightenment was unable to import the theme<br>due to a copy error."
 msgstr "Elightenment 无法导入该主题，复制错误。<br><br>"
 
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:58
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:61
 msgid "Application Theme Settings"
 msgstr "应用程序主题设置"
 
 #. ow = e_widget_check_add(evas, _("Use icon theme for applications"),
 #. *                        &(cfdata->match_e17_icon_theme));
 #. * e_widget_list_object_append(ol, ow, 0, 0, 0.0);
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:471
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:488
 msgid "Match Enlightenment theme if possible"
-msgstr "如果可能，匹配 Enlightenment 主题"
+msgstr "如果可能则匹配 Enlightenment 主题"
 
 #. ow = e_widget_check_add(evas, _("Set application theme"),
 #. *                               &(cfdata->enable_app_theme));
 #. * e_widget_list_object_append(o, ow, 0, 0, 0.0);
 #. >> advanced
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:480
-msgid "Enable Settings Daemon"
-msgstr "开启设置守护进程"
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:497
+msgid "Enable X Application Settings"
+msgstr "启用 X 应用程序设置"
 
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:484
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:501
 msgid "GTK Applications"
 msgstr "GTK 应用程序"
 
@@ -7230,11 +7233,11 @@ msgstr "GTK 应用程序"
 #. *                         &(cfdata->enable_icon_theme));
 #. * e_widget_on_change_hook_set(ow, _icon_theme_changed, cfdata);
 #. * e_widget_list_object_append(ol, ow, 0, 0, 0.0);
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:515
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:532
 msgid "Enable icon theme for applications"
 msgstr "允许应用程序使用图标主题"
 
-#: ../src/modules/conf_theme/e_int_config_xsettings.c:519
+#: ../src/modules/conf_theme/e_int_config_xsettings.c:536
 msgid "Enable icon theme for Enlightenment"
 msgstr "允许 Enlightenment 使用图标主题"
 
@@ -7288,7 +7291,7 @@ msgstr "窗口堆叠层"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_clientlist.c:134
 msgid "Most recently used"
-msgstr "最常使用的"
+msgstr "最近使用"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_clientlist.c:137
 msgid "Sort Order"
@@ -7428,19 +7431,16 @@ msgid "Decelerate"
 msgstr "减速"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:226
-#, fuzzy
 msgid "Pronounced Accelerate"
-msgstr "鼠标加速"
+msgstr "快速加速"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:231
-#, fuzzy
 msgid "Pronounced Decelerate"
-msgstr "减速"
+msgstr "快速减速"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:236
-#, fuzzy
 msgid "Pronounced Accelerate, then decelerate"
-msgstr "加速后减速"
+msgstr "快速加速后减速"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:241
 msgid "Bounce"
@@ -7455,23 +7455,20 @@ msgid "Shading"
 msgstr "阴影"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:261
-#, fuzzy
 msgid "Keep windows within the visual screen limits"
-msgstr "允许窗口位于全屏窗口之上"
+msgstr "保持窗口位于屏幕可见范围内"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:264
-#, fuzzy
 msgid "Allow windows partly out of the visual screen limits"
-msgstr "允许窗口位于全屏窗口之上"
+msgstr "允许窗口部分位于屏幕可见范围外"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:267
-#, fuzzy
 msgid "Allow windows completely out of visual screen limits"
-msgstr "允许窗口位于全屏窗口之上"
+msgstr "允许窗口完全位于屏幕可见范围外"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_display.c:270
 msgid "Screen Limits"
-msgstr "屏幕限制"
+msgstr "屏幕范围"
 
 #. create config diaolg for NULL object/data
 #: ../src/modules/conf_window_manipulation/e_int_config_focus.c:59
@@ -7734,11 +7731,11 @@ msgstr "窗口进程管理"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_process.c:95
 msgid "Kill process if unclosable"
-msgstr ""
+msgstr "如果无法关闭则杀死进程"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_process.c:97
 msgid "Kill process instead of client"
-msgstr ""
+msgstr "杀死进程而不是客户端"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_process.c:99
 msgid "Kill timeout:"
@@ -7750,7 +7747,7 @@ msgstr "Ping 客户端"
 
 #: ../src/modules/conf_window_manipulation/e_int_config_window_process.c:107
 msgid "Ping interval:"
-msgstr ""
+msgstr "Ping 间隔："
 
 #: ../src/modules/conf_window_manipulation/e_mod_main.c:19
 #: ../src/modules/wizard/page_060.c:27
@@ -7791,23 +7788,23 @@ msgstr "CPU 频率"
 
 #: ../src/modules/cpufreq/e_mod_main.c:183
 msgid "Fast (4 ticks)"
-msgstr "快 (4 ticks)"
+msgstr "快(4 ticks)"
 
 #: ../src/modules/cpufreq/e_mod_main.c:190
 msgid "Medium (8 ticks)"
-msgstr "中等 (8 ticks)"
+msgstr "中等(8 ticks)"
 
 #: ../src/modules/cpufreq/e_mod_main.c:197
 msgid "Normal (32 ticks)"
-msgstr "正常 (32 ticks)"
+msgstr "正常(32 ticks)"
 
 #: ../src/modules/cpufreq/e_mod_main.c:204
 msgid "Slow (64 ticks)"
-msgstr "慢 (64 ticks)"
+msgstr "慢(64 ticks)"
 
 #: ../src/modules/cpufreq/e_mod_main.c:211
 msgid "Very Slow (256 ticks)"
-msgstr "很慢 (256 ticks)"
+msgstr "很慢(256 ticks)"
 
 #: ../src/modules/cpufreq/e_mod_main.c:227
 msgid "Manual"
@@ -7816,7 +7813,7 @@ msgstr "手动"
 #: ../src/modules/cpufreq/e_mod_main.c:231
 #: ../src/modules/cpufreq/e_mod_main.c:267
 msgid "Lower Power Automatic"
-msgstr "自动低电量消耗"
+msgstr "自动降低电量消耗"
 
 #: ../src/modules/cpufreq/e_mod_main.c:233
 #: ../src/modules/cpufreq/e_mod_main.c:269
@@ -7826,12 +7823,12 @@ msgstr "自动交互"
 #: ../src/modules/cpufreq/e_mod_main.c:235
 #: ../src/modules/cpufreq/e_mod_main.c:271
 msgid "Minimum Speed"
-msgstr "最低速"
+msgstr "最低耗电"
 
 #: ../src/modules/cpufreq/e_mod_main.c:237
 #: ../src/modules/cpufreq/e_mod_main.c:273
 msgid "Maximum Speed"
-msgstr "最高速"
+msgstr "最高性能"
 
 #: ../src/modules/cpufreq/e_mod_main.c:250
 msgid "Restore CPU Power Policy"
@@ -7897,6 +7894,7 @@ msgid ""
 "The freqset binary in the cpufreq module<br>directory cannot be found (stat "
 "failed)"
 msgstr ""
+"Cpufreq 模块目录下的 freqset 二进制文件缺失。"
 
 #: ../src/modules/cpufreq/e_mod_main.c:1165
 msgid "Cpufreq Permissions Error"
@@ -7909,6 +7907,9 @@ msgid ""
 "have the<br>setuid bit set. Please ensure this is the<br>case. For example:"
 "<br><br>sudo chown root %s<br>sudo chmod u+s,a+x %s<br>"
 msgstr ""
+"Cpufreq 模块目录下的 freqset 二进制文件<br>的属主不是 root 或没有设置 setuid。<br>"
+"请确保其权限满足上述要求。<br>例如使用以下命令修改：<br><br>sudo chown root %s<br>"
+"sudo chmod u+s,a+x %s<br>"
 
 #: ../src/modules/dropshadow/e_mod_config.c:38
 msgid "Dropshadow Settings"
@@ -8211,9 +8212,8 @@ msgid "No plugins loaded"
 msgstr "没有载入插件"
 
 #: ../src/modules/everything/evry_plug_apps.c:1147
-#, fuzzy
 msgid "Exebuf"
-msgstr "类型缓冲"
+msgstr "执行缓冲"
 
 #: ../src/modules/everything/evry_plug_apps.c:1162
 #: ../src/modules/everything/evry_plug_apps.c:1209
@@ -8365,7 +8365,7 @@ msgstr "显示 %s 插件"
 #: ../src/modules/everything/evry_plugin.c:187
 #, c-format
 msgid "Browse %s"
-msgstr "浏览器 %s"
+msgstr "浏览 %s"
 
 #: ../src/modules/everything/evry_view_help.c:67
 msgid ""
@@ -8495,7 +8495,7 @@ msgstr "复制 %s 完成"
 #: ../src/modules/fileman_opinfo/e_mod_main.c:133
 #, c-format
 msgid "Copying %s (eta: %s)"
-msgstr "复制 %s (剩余: %s)"
+msgstr "复制 %s (剩余：%s)"
 
 #: ../src/modules/fileman/e_fwin.c:2994
 #: ../src/modules/fileman_opinfo/e_mod_main.c:139
@@ -8507,7 +8507,7 @@ msgstr "移动 %s 完成"
 #: ../src/modules/fileman_opinfo/e_mod_main.c:141
 #, c-format
 msgid "Moving %s (eta: %s)"
-msgstr "移动 %s (剩余: %s)"
+msgstr "移动 %s (剩余：%s)"
 
 #: ../src/modules/fileman/e_fwin.c:3001
 #: ../src/modules/fileman_opinfo/e_mod_main.c:147
@@ -8630,7 +8630,7 @@ msgstr "启用单击"
 
 #: ../src/modules/fileman/e_mod_config.c:391
 msgid "'cp+rm' instead of 'mv'"
-msgstr ""
+msgstr "使用 cp 和 rm 代替 mv"
 
 #: ../src/modules/fileman/e_mod_config.c:397
 msgid "Use Alternate Selection Modifiers"
@@ -8642,7 +8642,7 @@ msgstr "允许在桌面导航"
 
 #: ../src/modules/fileman/e_mod_config.c:404
 msgid "Max File Size For Thumbnailing"
-msgstr ""
+msgstr "生成缩略图的最大文件大小"
 
 #: ../src/modules/fileman/e_mod_config.c:410
 msgid "Spring Delay"
@@ -8669,11 +8669,11 @@ msgstr "在桌面上显示设备图标"
 
 #: ../src/modules/fileman/e_mod_config.c:442
 msgid "Mount volumes on insert"
-msgstr "插入介质后，立刻挂载"
+msgstr "插入介质后立即挂载"
 
 #: ../src/modules/fileman/e_mod_config.c:445
 msgid "Open filemanager on mount"
-msgstr "挂载后，打开文件管理器"
+msgstr "挂载后打开文件管理器"
 
 #: ../src/modules/fileman/e_mod_config.c:449
 msgid "Device"
@@ -8695,7 +8695,7 @@ msgstr "%1.1f"
 
 #: ../src/modules/fileman/e_mod_config.c:463
 msgid "Tooltip size (Screen percentage)"
-msgstr ""
+msgstr "提示大小(屏幕百分比)"
 
 #: ../src/modules/fileman/e_mod_config.c:465
 #, c-format
@@ -8715,27 +8715,27 @@ msgstr "文件管理器"
 msgid "Navigate"
 msgstr "导航"
 
-#: ../src/modules/fileman/e_mod_menu.c:238
+#: ../src/modules/fileman/e_mod_menu.c:239
 msgid "No listable items"
 msgstr "无可列项目"
 
-#: ../src/modules/fileman/e_mod_menu.c:317
+#: ../src/modules/fileman/e_mod_menu.c:318
 msgid "GTK Bookmarks"
 msgstr "GTK 书签"
 
-#: ../src/modules/fileman/e_mod_menu.c:411
+#: ../src/modules/fileman/e_mod_menu.c:412
 msgid "Current Directory"
 msgstr "当前目录"
 
-#: ../src/modules/fileman/e_mod_menu.c:417
+#: ../src/modules/fileman/e_mod_menu.c:418
 msgid "Home"
 msgstr "主目录"
 
-#: ../src/modules/fileman/e_mod_menu.c:447
+#: ../src/modules/fileman/e_mod_menu.c:448
 msgid "Root"
 msgstr "Root"
 
-#: ../src/modules/fileman/e_mod_menu.c:487
+#: ../src/modules/fileman/e_mod_menu.c:488
 msgid "Navigate..."
 msgstr "导航..."
 
@@ -8743,8 +8743,8 @@ msgstr "导航..."
 #, c-format
 msgid "Processing %d operation"
 msgid_plural "Processing %d operations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "正在处理 %d 个操作"
+msgstr[1] "正在处理 %d 个操作"
 
 #: ../src/modules/fileman_opinfo/e_mod_main.c:351
 msgid "Filemanager is idle"
@@ -8966,9 +8966,8 @@ msgstr "右边的窗口"
 #: ../src/modules/winlist/e_mod_main.c:209
 #: ../src/modules/winlist/e_mod_main.c:215
 #: ../src/modules/winlist/e_mod_main.c:221
-#, fuzzy
 msgid "Winlist Error"
-msgstr "挂载错误"
+msgstr "Winlist 错误"
 
 #: ../src/modules/winlist/e_mod_main.c:209
 msgid "Winlist cannot be activated from an edge binding"
@@ -8992,7 +8991,7 @@ msgstr "IBar 设定"
 
 #: ../src/modules/ibar/e_mod_config.c:102
 msgid "Selected source"
-msgstr ""
+msgstr "选中的源"
 
 #: ../src/modules/ibar/e_mod_config.c:114
 msgid "Setup"
@@ -9020,18 +9019,18 @@ msgstr ""
 
 #: ../src/modules/ibar/e_mod_config.c:179
 msgid "Create new IBar source"
-msgstr "创建新 IBar 条"
+msgstr "创建新 IBar 源"
 
 #: ../src/modules/ibar/e_mod_config.c:180
 msgid "Enter a name for this new source:"
-msgstr "为这个新条起个名字："
+msgstr "为这个新源起个名字："
 
 #: ../src/modules/ibar/e_mod_config.c:194
 #, c-format
 msgid ""
 "You requested to delete \"%s\".<br><br>Are you sure you want to delete this "
 "bar source?"
-msgstr "您正要删除\"%s\"。<br><br>确定删除这个 bar 吗？"
+msgstr "您正在删除 %s。<br><br>确定删除它吗？"
 
 #: ../src/modules/ibar/e_mod_config.c:198
 msgid "Are you sure you want to delete this bar source?"
@@ -9060,7 +9059,7 @@ msgstr "IBox 设定"
 
 #: ../src/modules/ibox/e_mod_config.c:98
 msgid "Expand When On Desktop"
-msgstr ""
+msgstr "在桌面上时展开"
 
 #: ../src/modules/ibox/e_mod_config.c:101
 msgid "Show Icon Label"
@@ -9148,7 +9147,7 @@ msgstr "%.0f 像素"
 
 #: ../src/modules/pager/e_mod_config.c:205
 msgid "Select and Slide button"
-msgstr "选择侧栏按键"
+msgstr "选择和滑动按钮"
 
 #: ../src/modules/pager/e_mod_config.c:207
 #: ../src/modules/pager/e_mod_config.c:215
@@ -9220,37 +9219,37 @@ msgstr ""
 "您不能在书架上使用鼠标右键，<br>因为右键已经被指定到上下文菜单。<br>此按键只"
 "能在弹出菜单工作。"
 
-#: ../src/modules/pager/e_mod_main.c:2923
+#: ../src/modules/pager/e_mod_main.c:2924
 msgid "Show Pager Popup"
 msgstr "显示分页器弹出窗口"
 
-#: ../src/modules/pager/e_mod_main.c:2930
+#: ../src/modules/pager/e_mod_main.c:2931
 msgid "Popup Desk Right"
 msgstr "弹出桌面向右"
 
-#: ../src/modules/pager/e_mod_main.c:2932
+#: ../src/modules/pager/e_mod_main.c:2933
 msgid "Popup Desk Left"
 msgstr "弹出桌面向左"
 
-#: ../src/modules/pager/e_mod_main.c:2934
+#: ../src/modules/pager/e_mod_main.c:2935
 msgid "Popup Desk Up"
 msgstr "弹出桌面向上"
 
-#: ../src/modules/pager/e_mod_main.c:2936
+#: ../src/modules/pager/e_mod_main.c:2937
 msgid "Popup Desk Down"
 msgstr "弹出桌面向下"
 
-#: ../src/modules/pager/e_mod_main.c:2938
+#: ../src/modules/pager/e_mod_main.c:2939
 msgid "Popup Desk Next"
 msgstr "弹出桌面向下一个"
 
-#: ../src/modules/pager/e_mod_main.c:2940
+#: ../src/modules/pager/e_mod_main.c:2941
 msgid "Popup Desk Previous"
 msgstr "弹出桌面向上一个"
 
 #: ../src/modules/physics/e_mod_config.c:46
 msgid "Physics Settings"
-msgstr "物理设置"
+msgstr "Physics 设置"
 
 #: ../src/modules/physics/e_mod_config.c:107
 msgid "Physics delay after drag"
@@ -9282,12 +9281,11 @@ msgstr "%1.1f m/s^2"
 
 #: ../src/modules/physics/e_mod_config.c:126
 msgid "Disable Movement"
-msgstr ""
+msgstr "禁用移动"
 
 #: ../src/modules/physics/e_mod_config.c:129
-#, fuzzy
 msgid "Disable Rotation"
-msgstr "旋转"
+msgstr "禁用旋转"
 
 #: ../src/modules/physics/e_mod_config.c:137
 msgid "Ignore Fullscreen"
@@ -9308,7 +9306,7 @@ msgstr "忽略"
 #: ../src/modules/physics/e_mod_main.c:29
 #: ../src/modules/physics/e_mod_main.c:47
 msgid "Physics"
-msgstr "物理"
+msgstr "Physics"
 
 #: ../src/modules/physics/e_mod_main.c:30
 msgid ""
@@ -9317,13 +9315,12 @@ msgid ""
 msgstr ""
 
 #: ../src/modules/physics/e_mod_main.c:68
-#, fuzzy
 msgid "Physics Error"
-msgstr "物理出错"
+msgstr "Physics 错误"
 
 #: ../src/modules/physics/e_mod_main.c:68
 msgid "The physics module could not be started"
-msgstr ""
+msgstr "Physics 模块无法启动"
 
 #: ../src/modules/syscon/e_int_config_syscon.c:43
 msgid "Syscon Settings"
@@ -9419,7 +9416,7 @@ msgstr "下一步"
 
 #: ../src/modules/wizard/e_wizard.c:266
 msgid "Please Wait..."
-msgstr "请等待..."
+msgstr "请稍候..."
 
 #. set up next/prev buttons
 #: ../src/modules/wizard/e_wizard.c:314
@@ -9439,7 +9436,7 @@ msgstr "配置文件"
 msgid "Adding missing App files"
 msgstr "添加缺失的应用程序文件"
 
-#: ../src/modules/wizard/page_050.c:129
+#: ../src/modules/wizard/page_050.c:130
 msgid "Select preferred size"
 msgstr "选择首选大小"
 
@@ -9457,7 +9454,7 @@ msgstr "网络管理"
 
 #: ../src/modules/wizard/page_110.c:17
 msgid "Connman network service not found"
-msgstr "Connman 网络服务未发现"
+msgstr "未发现 Connman 网络服务"
 
 #: ../src/modules/wizard/page_110.c:20
 msgid "Install Connman for network management support"
@@ -9465,7 +9462,7 @@ msgstr "为网络管理支持安装 Connman"
 
 #: ../src/modules/wizard/page_110.c:23
 msgid "Connman support disabled"
-msgstr "Connman 支持被禁用"
+msgstr "Connman 支持已禁用"
 
 #: ../src/modules/wizard/page_110.c:26
 msgid "Install/Enable Connman for network management support"
@@ -9473,11 +9470,11 @@ msgstr "为网络管理支持安装或启用 Connman"
 
 #: ../src/modules/wizard/page_110.c:156
 msgid "Checking to see if Connman exists"
-msgstr ""
+msgstr "正在检查 Connman 是否存在"
 
 #: ../src/modules/wizard/page_150.c:92
 msgid "Compositing"
-msgstr "复合"
+msgstr "混成"
 
 #: ../src/modules/wizard/page_150.c:94
 msgid "Transparent windows and effects"
@@ -9495,15 +9492,15 @@ msgstr ""
 
 #: ../src/modules/wizard/page_150.c:117
 msgid "Enable Compositing"
-msgstr "开启复合支持"
+msgstr "开启混成"
 
 #: ../src/modules/wizard/page_150.c:122
 msgid "Hardware Accelerated (OpenGL)"
-msgstr "硬件加速 (OpenGL)"
+msgstr "硬件加速(OpenGL)"
 
 #: ../src/modules/wizard/page_150.c:125
 msgid "Tear-free Rendering (OpenGL only)"
-msgstr "Tear-free 渲染 (仅 OpenGL)"
+msgstr "Tear-free 渲染(仅 OpenGL)"
 
 #: ../src/modules/wizard/page_170.c:24
 msgid "Updates"
@@ -9511,7 +9508,7 @@ msgstr "更新"
 
 #: ../src/modules/wizard/page_170.c:26
 msgid "Check for available updates"
-msgstr "检查可用的更新"
+msgstr "检查可用更新"
 
 #: ../src/modules/wizard/page_170.c:32
 msgid ""
@@ -9526,6 +9523,11 @@ msgid ""
 "not disable this as it<br>may leave you vulnerable or having to live<br>with "
 "bugs."
 msgstr ""
+"Enlightenment 能够检查<br>新版本、安全更新、普通更新<br>和可用的附加组件。<br>"
+"<br>这项功能可以帮助您及时了解<br>可用的错误修复和安全更新。<br>使用这项服务时，"
+"Enlightenment<br>需要连接到 enlightenment.org 并<br>传输一些信息。诸如用户名、"
+"<br>密码和个人文件在内的任何个人信息都不会被传送。<br>如果您不希望如此，请将其<br>"
+"禁用。我们强烈建议您不禁用此功能<br>，以确保您能远离已知的软件缺陷。"
 
 #: ../src/modules/wizard/page_170.c:53
 msgid "Enable update checking"
@@ -9537,53 +9539,53 @@ msgstr "信息"
 
 #: ../src/modules/wizard/page_180.c:32
 msgid "A taskbar can be added to<br>show open windows and applications."
-msgstr ""
+msgstr "可以添加任务栏以显示打开的窗口和应用程序。"
 
 #: ../src/modules/wizard/page_180.c:38
 msgid "Enable Taskbar"
 msgstr "启用任务栏"
 
-#: ../src/modules/mixer/app_mixer.c:165
+#: ../src/modules/mixer/app_mixer.c:192
 msgid "Capture"
 msgstr "捕捉"
 
-#: ../src/modules/mixer/app_mixer.c:167
+#: ../src/modules/mixer/app_mixer.c:194
 msgid "Playback"
 msgstr "回放"
 
-#: ../src/modules/mixer/app_mixer.c:287
+#: ../src/modules/mixer/app_mixer.c:314
 msgid "Output"
 msgstr "输出"
 
-#: ../src/modules/mixer/app_mixer.c:363
+#: ../src/modules/mixer/app_mixer.c:393
 msgid "Cards"
 msgstr "声卡"
 
-#: ../src/modules/mixer/app_mixer.c:376 ../src/modules/mixer/conf_gadget.c:279
+#: ../src/modules/mixer/app_mixer.c:406 ../src/modules/mixer/conf_gadget.c:279
 msgid "Channels"
 msgstr "声道"
 
-#: ../src/modules/mixer/app_mixer.c:386
+#: ../src/modules/mixer/app_mixer.c:416
 msgid "Card:"
 msgstr "声卡："
 
-#: ../src/modules/mixer/app_mixer.c:390
+#: ../src/modules/mixer/app_mixer.c:420
 msgid "Channel:"
 msgstr "声道："
 
-#: ../src/modules/mixer/app_mixer.c:398
+#: ../src/modules/mixer/app_mixer.c:428
 msgid "Left:"
 msgstr "左："
 
-#: ../src/modules/mixer/app_mixer.c:403
+#: ../src/modules/mixer/app_mixer.c:433
 msgid "Right:"
 msgstr "右："
 
-#: ../src/modules/mixer/app_mixer.c:408 ../src/modules/mixer/e_mod_main.c:697
+#: ../src/modules/mixer/app_mixer.c:438 ../src/modules/mixer/e_mod_main.c:697
 msgid "Mute"
 msgstr "静音"
 
-#: ../src/modules/mixer/app_mixer.c:411 ../src/modules/mixer/conf_gadget.c:195
+#: ../src/modules/mixer/app_mixer.c:441 ../src/modules/mixer/conf_gadget.c:195
 msgid "Lock Sliders"
 msgstr "锁定滚动条"
 
@@ -9593,7 +9595,7 @@ msgstr "锁定后显示滚动条"
 
 #: ../src/modules/mixer/conf_gadget.c:206
 msgid "Show Popup on volume change via keybindings"
-msgstr ""
+msgstr "使用快捷键调整音量时显示弹出菜单"
 
 #: ../src/modules/mixer/conf_gadget.c:317
 msgid "Sound Cards"
@@ -9664,15 +9666,16 @@ msgid ""
 "This module wants to execute an external application EConnMan that does not "
 "exist.<br>Please install <b>EConnMan</b> application."
 msgstr ""
+"此模块需要执行外部程序 EConnMan，但该程序不存在。<br>"
+"请安装 <b>EConnMan</b>。"
 
 #: ../src/modules/connman/e_mod_main.c:315
 msgid "Wifi On"
 msgstr "Wifi 开启"
 
 #: ../src/modules/quickaccess/e_mod_config.c:226
-#, fuzzy
 msgid "Enter a unique name for this entry"
-msgstr "为这个新条起个名字："
+msgstr "为新条目起一个名字："
 
 #: ../src/modules/quickaccess/e_mod_config.c:247
 msgid "Disable Warning Dialogs"
@@ -9680,7 +9683,7 @@ msgstr "禁用警告对话框"
 
 #: ../src/modules/quickaccess/e_mod_config.c:249
 msgid "Disable Startup Tutorial"
-msgstr ""
+msgstr "禁用启动教程"
 
 #: ../src/modules/quickaccess/e_mod_config.c:283
 msgid "Entries"
@@ -9796,7 +9799,7 @@ msgstr "更多帮助"
 
 #: ../src/modules/quickaccess/e_mod_quickaccess.c:484
 msgid "The requested Quickaccess entry does not exist!"
-msgstr ""
+msgstr "请求的快速访问条目不存在！"
 
 #: ../src/modules/quickaccess/e_mod_quickaccess.c:651
 msgid "Keybind Error"
@@ -9888,7 +9891,7 @@ msgstr "快速访问演示"
 
 #: ../src/modules/quickaccess/e_mod_quickaccess.c:1202
 msgid "This is a demo dialog used in the Quickaccess tutorial"
-msgstr ""
+msgstr "这是在快速访问教程中的一个对话框示例。"
 
 #: ../src/modules/quickaccess/e_mod_quickaccess.c:1224
 msgid ""
@@ -9915,7 +9918,7 @@ msgid "quick access name/identifier"
 msgstr ""
 
 #: ../src/modules/systray/e_mod_main.c:497
-#: ../src/modules/systray/e_mod_main.c:935
+#: ../src/modules/systray/e_mod_main.c:949
 msgid "Systray Error"
 msgstr "系统托盘出错"
 
@@ -9923,19 +9926,19 @@ msgstr "系统托盘出错"
 msgid "Systray cannot set its background invisible to match its shelf."
 msgstr ""
 
-#: ../src/modules/systray/e_mod_main.c:926
+#: ../src/modules/systray/e_mod_main.c:940
 msgid "Another systray exists"
 msgstr "有另一个系统托盘存在"
 
-#: ../src/modules/systray/e_mod_main.c:927
+#: ../src/modules/systray/e_mod_main.c:941
 msgid "There can be only one systray gadget and another one already exists."
 msgstr "只允许一个系统托盘的组件，目前已经有了一个。"
 
-#: ../src/modules/systray/e_mod_main.c:936
+#: ../src/modules/systray/e_mod_main.c:950
 msgid "Systray cannot work in a shelf that is set to below everything."
 msgstr ""
 
-#: ../src/modules/systray/e_mod_main.c:1147
+#: ../src/modules/systray/e_mod_main.c:1161
 msgid "Systray"
 msgstr "系统托盘"
 
@@ -9957,6 +9960,7 @@ msgid ""
 "File has an unspecified extension.<br>Please use '.jpg' or '.png' "
 "extensions<br>only as other formats are not<br>supported currently."
 msgstr ""
+"文件没有扩展名。<br>请使用 .jpg 或 .png，<br>其他格式尚不支持。"
 
 #: ../src/modules/shot/e_mod_main.c:277
 msgid "Select screenshot save location"
@@ -9978,7 +9982,7 @@ msgstr "错误 - 上传失败"
 #: ../src/modules/shot/e_mod_main.c:408
 #, c-format
 msgid "Upload failed with status code:<br>%i"
-msgstr "上传失败，状态码:<br>%i"
+msgstr "上传失败，状态码：<br>%i"
 
 #: ../src/modules/shot/e_mod_main.c:452
 msgid "Error - Can't create file"
@@ -9996,7 +10000,7 @@ msgstr "错误 - 不能打开文件"
 #: ../src/modules/shot/e_mod_main.c:472
 #, c-format
 msgid "Cannot open temporary file '%s': %s"
-msgstr "不能打开临时文件 '%s': %s"
+msgstr "不能打开临时文件 %s: %s"
 
 #: ../src/modules/shot/e_mod_main.c:480
 msgid "Error - Bad size"
@@ -10005,7 +10009,7 @@ msgstr "错误 - 大小错误"
 #: ../src/modules/shot/e_mod_main.c:481
 #, c-format
 msgid "Cannot get size of file '%s'"
-msgstr "无法获取文件 '%s' 的大小"
+msgstr "无法获取文件 %s 的大小"
 
 #: ../src/modules/shot/e_mod_main.c:491
 msgid "Error - Can't allocate memory"
@@ -10014,7 +10018,7 @@ msgstr "错误 - 无法分配内存"
 #: ../src/modules/shot/e_mod_main.c:492
 #, c-format
 msgid "Cannot allocate memory for picture: %s"
-msgstr "无法为图像  %s 分配内存 "
+msgstr "无法为图像 %s 分配内存 "
 
 #: ../src/modules/shot/e_mod_main.c:499
 msgid "Error - Can't read picture"
@@ -10033,9 +10037,8 @@ msgid "Uploading ..."
 msgstr "上传中..."
 
 #: ../src/modules/shot/e_mod_main.c:532
-#, fuzzy
 msgid "Screenshot is available at this location:"
-msgstr "选择截图保存位置"
+msgstr "截图保存位置："
 
 #: ../src/modules/shot/e_mod_main.c:541
 msgid "Hide"
@@ -10050,10 +10053,11 @@ msgid ""
 "This image will be uploaded<br>to enlightenment.org. It will be publicly "
 "visible."
 msgstr ""
+"这张图片将被上传至<br>enlightenment.org，对所有人可见。"
 
 #: ../src/modules/shot/e_mod_main.c:568
 msgid "Confirm"
-msgstr "确认"
+msgstr "确定"
 
 #: ../src/modules/shot/e_mod_main.c:669
 msgid "Where to put Screenshot..."
@@ -10149,9 +10153,8 @@ msgid "Tiling"
 msgstr "平铺"
 
 #: ../src/modules/tiling/e_mod_tiling.c:4083
-#, fuzzy
 msgid "Toggle floating"
-msgstr "切换日历"
+msgstr "切换悬浮"
 
 #: ../src/modules/tiling/e_mod_tiling.c:4086
 msgid "Add a stack"
@@ -10190,13 +10193,12 @@ msgid "Move window down"
 msgstr "下移窗口"
 
 #: ../src/modules/tiling/e_mod_tiling.c:4115
-#, fuzzy
 msgid "Adjust transitions"
-msgstr "变换"
+msgstr "调整过渡"
 
 #: ../src/modules/tiling/e_mod_tiling.c:4118
 msgid "Focus a particular window"
-msgstr ""
+msgstr "聚焦到特定窗口"
 
 #: ../src/modules/tiling/e_mod_tiling.c:4122
 msgid "Send to upper right corner"
@@ -10208,11 +10210,11 @@ msgstr "发送到左上角"
 
 #: ../src/modules/tiling/e_mod_tiling.c:4128
 msgid "Send to lower right corner"
-msgstr ""
+msgstr "发送到右下角"
 
 #: ../src/modules/tiling/e_mod_tiling.c:4131
 msgid "Send to lower left corner"
-msgstr ""
+msgstr "发送到左下角"
 
 #: ../src/modules/xkbswitch/e_mod_config.c:73
 msgid "Keyboard Settings"
@@ -10236,7 +10238,7 @@ msgstr "添加新配置"
 
 #: ../src/modules/xkbswitch/e_mod_config.c:496
 msgid "Available"
-msgstr "可用的"
+msgstr "可用"
 
 #: ../src/modules/xkbswitch/e_mod_config.c:503
 #, fuzzy
@@ -10279,8 +10281,8 @@ msgid ""
 "Enlightenment is in <b>offline</b> mode.<br>During offline mode, modules "
 "that use network will stop polling remote services."
 msgstr ""
-"Enlightenment 处于<b>脱机</b>模式。<br>在脱机模式下，使用网络的模块"
-"将不会查询远程服务。。"
+"Enlightenment 处于<b>脱机</b>模式。<br>在脱机模式下，使用网络的模块将不会查询"
+"远程服务。。"
 
 #: ../src/modules/notification/e_mod_main.c:96
 msgid "Exited Offline Mode"
@@ -10366,3 +10368,6 @@ msgstr ""
 #: ../src/modules/notification/e_mod_config.c:144
 msgid "Use multiple monitor geometry"
 msgstr ""
+
+#~ msgid "Enable Settings Daemon"
+#~ msgstr "开启设置守护进程"